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

* configure.ac: Change extra, multibuffer, color and rcfile to default to enabled 

I'm sure no one will complain about this :-P



git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4330 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Chris Allegretta 2008-09-30 15:30:51 +00:00
parent 8227d419bb
commit 025548ad29
2 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,4 +1,5 @@
2008-09-30 Chris Allegretta <chrisa@asty.org> 2008-09-30 Chris Allegretta <chrisa@asty.org>
* configure.ac: Change extra, multibuffer, color and rcfile to default to enabled
* python.nanorc, ruby.nanorc: Add header lines for python and ruby as well * python.nanorc, ruby.nanorc: Add header lines for python and ruby as well
2008-09-21 Chris Allegretta <chrisa@asty.org> 2008-09-21 Chris Allegretta <chrisa@asty.org>
* rcfile.c, color.c, nano.h: Add new capability for matching a syntax type by the "header" (1st line) * rcfile.c, color.c, nano.h: Add new capability for matching a syntax type by the "header" (1st line)

49
configure.ac
View File

@ -65,10 +65,11 @@ if test x$debug_support != xyes; then
fi fi
AC_ARG_ENABLE(extra, AC_ARG_ENABLE(extra,
[ --enable-extra Enable extra features, currently only easter eggs], [ --disable-extra Disable extra features, currently only easter eggs],
[if test x$enableval = xyes; then [if test x$enableval != xno; then
AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes
fi]) fi],
[AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes])
AC_ARG_ENABLE(tiny, AC_ARG_ENABLE(tiny,
[ --enable-tiny Disable features for the sake of size], [ --enable-tiny Disable features for the sake of size],
@ -139,8 +140,8 @@ AC_ARG_ENABLE(wrapping-as-root,
fi]) fi])
AC_ARG_ENABLE(color, AC_ARG_ENABLE(color,
[ --enable-color Enable color and syntax highlighting], [ --disable-color Disable color and syntax highlighting],
[if test x$enableval = xyes; then [if test x$enableval != xno; then
if test x$ac_cv_header_regex_h = xyes; 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 AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) 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
@ -148,30 +149,40 @@ AC_ARG_ENABLE(color,
AC_MSG_ERROR([ AC_MSG_ERROR([
*** The header file regex.h was not found. If you wish to use color *** The header file regex.h was not found. If you wish to use color
*** support this header file is required. Please either install C *** support this header file is required. Please either install C
*** libraries that include the regex.h file or do not call the configure *** libraries that include the regex.h file or call the configure
*** script with --enable-color.]) *** script with --disable-color.])
fi fi
fi]) fi], [
if test x$ac_cv_header_regex_h = xyes; then
AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) 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 call the configure
*** script with --disable-color.])
fi
])
AC_ARG_ENABLE(multibuffer, AC_ARG_ENABLE(multibuffer,
[ --enable-multibuffer Enable multiple file buffers], [ --disable-multibuffer Disable multiple file buffers],
[if test x$enableval = xyes; then [if test x$enableval != xno; then
AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
fi]) fi],
[AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes])
AC_ARG_ENABLE(nanorc, AC_ARG_ENABLE(nanorc,
[ --enable-nanorc Enable use of .nanorc files], [ --disable-nanorc Disable use of .nanorc files],
[if test x$enableval = xyes; then [if test x$enableval != xno; then
AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
fi]) fi],
[AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes])
AC_ARG_ENABLE(all, AC_ARG_ENABLE(all,
[ --enable-all Enable ALL extra nano functionality (kitchen sink option)], [ --enable-all Enable ALL extra nano functionality (ignored for compatibility as all options default to on)],
[if test x$enableval = xyes; then [if test x$enableval = xyes; then
AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes echo "--enable-all option no longer needed, ignoring for compatiblity"
AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes
AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes
fi]) fi])
if test x$color_support = xyes; then if test x$color_support = xyes; then