From: Benno Schulenberg <bensberg@justemail.net>
Date: Sun, 13 Apr 2014 21:05:57 +0000 (+0000)
Subject: Complaining about --enable-color and tiny without --enable-nanorc.
X-Git-Tag: v2.3.3~164
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=9cc64380e54c55e0cb275c696c0ad495dac08982;p=nano.git

Complaining about --enable-color and tiny without --enable-nanorc.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4766 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/ChangeLog b/ChangeLog
index dbf9d77f..cf91f1da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
 	* src/nano.c (version): Print the correct --enable/--disable option.
 	* configure.ac, src/*, doc/texinfo/nano.texi: Convert all occurrences
 	of #ifdef ENABLE_NANORC to #ifndef DISABLE_NANORC, and adapt for it.
+	* configure.ac: Complain about --enable-color without --enable-nanorc.
 
 2014-04-10  Benno Schulenberg  <bensberg@justemail.net>
 	* doc/syntax/Makefile.am: Add four recent syntaxes to the packlist.
diff --git a/configure.ac b/configure.ac
index b2bb2d20..f9889e1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,6 +175,10 @@ if test "x$enable_tiny" = xyes; then
     if test "x$enable_color" != xyes; then
 	AC_DEFINE(DISABLE_COLOR, 1, [Define this to disable syntax highlighting.])
 	color_support=no
+    else
+	if test "x$enable_nanorc" != xyes; then
+	    AC_MSG_ERROR([--enable-color with --enable-tiny cannot work without --enable-nanorc])
+	fi
     fi
     if test "x$enable_extra" != xyes; then
 	AC_DEFINE(DISABLE_EXTRA, 1, [Define this to disable extra stuff.])