From 463db0dbcceb9e9334bbc392e6ea01f996352f28 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Thu, 27 Mar 2014 10:15:43 +0000 Subject: [PATCH] Making --disable-nanorc with --enable-color barf. Patch by Mike Frysinger. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4688 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 3 +++ configure.ac | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a025073f..bb4fbd10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2014-03-27 Mike Frysinger . + * configure.ac - Make --disable-nanorc with --enable-color barf. + 2014-03-26 Benno Schulenberg * configure.ac - Word, tab, and comment tweaks. * src/global.c - Some comment tweaks, and whitespace trimmings. diff --git a/configure.ac b/configure.ac index c692de3d..c3d7f07e 100644 --- a/configure.ac +++ b/configure.ac @@ -146,10 +146,16 @@ fi AC_ARG_ENABLE(color, AS_HELP_STRING([--disable-color], [Disable color and syntax highlighting])) +if test "x$enable_nanorc" = xno; then + if test "x$enable_color" = xyes; then + AC_MSG_ERROR([--enable-color cannot work with --disable-nanorc]) + else + enable_color=no + fi +fi if test "x$enable_color" != xno; then if test x$ac_cv_header_regex_h = xyes; then - AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) - nanorc_support=yes + enable_nanorc=yes AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes elif test "x$enable_color" = xyes; then -- 2.39.5