From 83c3f951f6195e1a29b7e3412ad5231dacd4c237 Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Tue, 30 Sep 2008 16:47:57 +0000 Subject: [PATCH] make --enable-tiny disable the new enabled-by-default options as that's presumably the expected behavior git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4331 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 3 ++- configure.ac | 37 +++++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67dee537..74482d8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2008-09-30 Chris Allegretta - * configure.ac: Change extra, multibuffer, color and rcfile to default to enabled + * configure.ac: Change extra, multibuffer, color and rcfile configure options to default to enabled + --enable-tiny will now disable these options as well * python.nanorc, ruby.nanorc: Add header lines for python and ruby as well 2008-09-21 Chris Allegretta * rcfile.c, color.c, nano.h: Add new capability for matching a syntax type by the "header" (1st line) diff --git a/configure.ac b/configure.ac index 95ecee3c..b391c4d9 100644 --- a/configure.ac +++ b/configure.ac @@ -64,13 +64,6 @@ if test x$debug_support != xyes; then AC_DEFINE(NDEBUG, 1, [Shut up assert warnings :-)]) fi -AC_ARG_ENABLE(extra, -[ --disable-extra Disable extra features, currently only easter eggs], -[if test x$enableval != xno; then - AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes -fi], - [AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes]) - AC_ARG_ENABLE(tiny, [ --enable-tiny Disable features for the sake of size], [if test x$enableval = xyes; then @@ -85,6 +78,16 @@ AC_ARG_ENABLE(tiny, AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.]) fi]) + +AC_ARG_ENABLE(extra, +[ --disable-extra Disable extra features, currently only easter eggs], +[if test x$enableval != xno; then + AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes +fi], + [if test x$enable_tiny != xyes; then + AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes + fi]) + AC_ARG_ENABLE(browser, [ --disable-browser Disable built-in file browser], [if test x$enableval != xyes; then @@ -153,15 +156,17 @@ AC_ARG_ENABLE(color, *** script with --disable-color.]) 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([ + if test x$enable_tiny != 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_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 fi ]) @@ -170,14 +175,18 @@ AC_ARG_ENABLE(multibuffer, [if test x$enableval != xno; then AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes fi], - [AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes]) + [if test x$enable_tiny != xyes; then + AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes + fi]) AC_ARG_ENABLE(nanorc, [ --disable-nanorc Disable use of .nanorc files], [if test x$enableval != xno; then AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes fi], - [AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes]) + [if test x$enable_tiny != xyes; then + AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes + fi]) AC_ARG_ENABLE(all, [ --enable-all Enable ALL extra nano functionality (ignored for compatibility as all options default to on)],