nano

commit 463db0dbcceb9e9334bbc392e6ea01f996352f28
parent 55543ad42f794095fc7d4bde1ef927686f1f3497
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Thu, 27 Mar 2014 10:15:43 +0000

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

Diffstat:
M
ChangeLog
 | 
3
+++
M
configure.ac
 | 
10
++++++++--

2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+2014-03-27  Mike Frysinger  <vapier@gentoo.org>.
+	* configure.ac - Make --disable-nanorc with --enable-color barf.
+
 2014-03-26  Benno Schulenberg  <bensberg@justemail.net>
 	* configure.ac - Word, tab, and comment tweaks.
 	* src/global.c - Some comment tweaks, and whitespace trimmings.
diff --git 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