From d8bf887f2c7f57902732a92b4ee84f9416b51c86 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Fri, 4 Apr 2014 07:54:08 +0000 Subject: [PATCH] Allowing --enable-extra and --enable-multibuffer to override --enable-tiny. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4716 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 2 ++ configure.ac | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a694049..3fbc29af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-04-04 Benno Schulenberg * src/{files.c,nano.c}: Avoid two more compilation warnings. + * configure.ac: Allow --enable-extra and --enable-multibuffer + to override --enable-tiny. 2014-04-03 Benno Schulenberg * configure.ac: Remove unused '*_support' variables. diff --git a/configure.ac b/configure.ac index fa76f4aa..606c217d 100644 --- a/configure.ac +++ b/configure.ac @@ -69,11 +69,15 @@ AS_HELP_STRING([--enable-tiny], [Disable features for the sake of size])) if test "x$enable_tiny" = xyes; then AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.]) AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.]) - AC_DEFINE(DISABLE_EXTRA, 1, [Define this to disable extra stuff.]) + if test "x$enable_extra" = xno; then + AC_DEFINE(DISABLE_EXTRA, 1, [Define this to disable extra stuff.]) + fi AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.]) AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.]) AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.]) - AC_DEFINE(DISABLE_MULTIBUFFER, 1, [Define this to disable multiple file buffers.]) + if test "x$enable_multibuffer" = xno; then + AC_DEFINE(DISABLE_MULTIBUFFER, 1, [Define this to disable multiple file buffers.]) + fi AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).]) AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.]) AC_DEFINE(DISABLE_TABCOMP, 1, [Define this to disable the tab completion functions for files and search strings.]) -- 2.39.5