ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
master
David Lawrence Ramsey 2006-07-12 18:59:29 +00:00
parent 82697f2fcd
commit 84b9f4bd17
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -102,6 +102,11 @@ CVS code -
number of columns is extremely small. (DLR) number of columns is extremely small. (DLR)
- Don't display any blank space for the state if we're in the - Don't display any blank space for the state if we're in the
file browser, as Pico doesn't. (DLR) 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: - doc/syntax/c.nanorc:
- Since .i and .ii are preprocessed C and C++ output, colorize - Since .i and .ii are preprocessed C and C++ output, colorize
them here. (Mike Frysinger) them here. (Mike Frysinger)

14
configure.ac
View File

@ -141,8 +141,16 @@ fi])
AC_ARG_ENABLE(color, AC_ARG_ENABLE(color,
[ --enable-color Enable color and syntax highlighting], [ --enable-color Enable color and syntax highlighting],
[if test x$enableval = xyes; then [if test x$enableval = xyes; then
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_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 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]) fi])
AC_ARG_ENABLE(multibuffer, AC_ARG_ENABLE(multibuffer,
@ -273,8 +281,7 @@ int main(void)
*** The header file slcurses.h was not found. If you wish to use *** The header file slcurses.h was not found. If you wish to use
*** slang support this header file is required. Please either *** slang support this header file is required. Please either
*** install a version of slang that includes the slcurses.h file or *** 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 fi
if eval "test x$CURSES_LIB_NAME = x"; then if eval "test x$CURSES_LIB_NAME = x"; then
@ -358,8 +365,7 @@ int main(void)
*** The header file slcurses.h was not found. If you wish to use *** The header file slcurses.h was not found. If you wish to use
*** slang support this header file is required. Please either *** slang support this header file is required. Please either
*** install a version of slang that includes the slcurses.h file or *** 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 fi
if test "${_libs+set}" = "set"; then if test "${_libs+set}" = "set"; then