From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Wed, 12 Jul 2006 18:59:29 +0000 (+0000)
Subject: in configure.ac, if regex.h isn't found, display an error message if we
X-Git-Tag: v1.9.99pre1~80
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=84b9f4bd174166bf81fe19b506b445eb848bd939;p=nano.git

in configure.ac, if regex.h isn't found, display an error message if we
try to enable color support; also, fix the spacing of the error message
displayed when slcurses.h isn't found


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

diff --git a/ChangeLog b/ChangeLog
index dfe37669..0a832732 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -102,6 +102,11 @@ CVS code -
 	  number of columns is extremely small. (DLR)
 	- Don't display any blank space for the state if we're in the
 	  file browser, as Pico doesn't. (DLR)
+- configure.ac:
+	- If regex.h isn't found, display an error message if we try to
+	  enable color support. (DLR)
+	- Fix the spacing of the error message displayed when slcurses.h
+	  isn't found. (DLR)
 - doc/syntax/c.nanorc:
 	- Since .i and .ii are preprocessed C and C++ output, colorize
 	  them here. (Mike Frysinger)
diff --git a/configure.ac b/configure.ac
index 54d33b18..40f13b09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,8 +141,16 @@ fi])
 AC_ARG_ENABLE(color,
 [  --enable-color          Enable color and syntax highlighting],
 [if test x$enableval = xyes; then
-    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use the .nanorc file.]) nanorc_support=yes
-    AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes
+    if test x$ac_cv_header_regex_h = xyes; then
+	AC_DEFINE(ENABLE_NANORC, 1, [Define this to use the .nanorc file.]) nanorc_support=yes
+	AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes
+    else
+	AC_MSG_ERROR([
+*** The header file regex.h was not found.  If you wish to use color
+*** support this header file is required.  Please either install C
+*** libraries that include the regex.h file or do not call the configure
+*** script with --enable-color.])
+    fi
 fi])
 
 AC_ARG_ENABLE(multibuffer,
@@ -270,11 +278,10 @@ int main(void)
     AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
     AC_MSG_WARN([*** Can not use slang when cross-compiling])),
 	    AC_MSG_ERROR([
-*** The header file slcurses.h was not found. If you wish to use
-*** slang support this header file is required. Please either
+*** The header file slcurses.h was not found.  If you wish to use
+*** slang support this header file is required.  Please either
 *** install a version of slang that includes the slcurses.h file or
-*** do not call the configure script with --with-slang
-	    ]))
+*** do not call the configure script with --with-slang.]))
 	fi
 
 	if eval "test x$CURSES_LIB_NAME = x"; then
@@ -355,11 +362,10 @@ int main(void)
     AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
     AC_MSG_WARN([*** Can not use slang when cross-compiling])),
 	    AC_MSG_ERROR([
-*** The header file slcurses.h was not found. If you wish to use
-*** slang support this header file is required. Please either
+*** The header file slcurses.h was not found.  If you wish to use
+*** slang support this header file is required.  Please either
 *** install a version of slang that includes the slcurses.h file or
-*** do not call the configure script with --with-slang
-	    ]))
+*** do not call the configure script with --with-slang.]))
 	fi
 
 	if test "${_libs+set}" = "set"; then