From: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 4 Apr 2014 13:12:07 +0000 (+0000)
Subject: Moving the enabling stuff to after the disabling stuff.
X-Git-Tag: v2.3.3~209
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=9901170750dc1228c951847dee4e21d3ac0da75d;p=nano.git

Moving the enabling stuff to after the disabling stuff.


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

diff --git a/ChangeLog b/ChangeLog
index 1718a8b0..601adb20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
 	* src/{*.h,*.c}, configure.ac:Convert all occurrences of
 	#ifdef ENABLE_COLOR to #ifndef DISABLE_COLOR.⏎
 	* src/nano.h: Comment tweaks.
+	* configure.ac: Move the enabling stuff to after the disablers.
 
 2014-04-03  Benno Schulenberg  <bensberg@justemail.net>
 	* configure.ac: Remove unused '*_support' variables.
diff --git a/configure.ac b/configure.ac
index 4078f1d0..fb45cd51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,34 +56,6 @@ AC_CHECK_HEADERS(getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.
 
 dnl Checks for options.
 
-AC_ARG_ENABLE(debug,
-AS_HELP_STRING([--enable-debug], [Enable debugging (disabled by default)]))
-if test "x$enable_debug" = xyes; then
-    AC_DEFINE(DEBUG, 1, [Define this to enable debug messages and assert warnings.])
-else
-    AC_DEFINE(NDEBUG, 1, [Shut up assert warnings :-)])
-fi
-
-AC_ARG_ENABLE(tiny,
-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.])
-    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.])
-    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.])
-    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
-fi
-
 AC_ARG_ENABLE(browser,
 AS_HELP_STRING([--disable-browser], [Disable built-in file browser]))
 if test "x$enable_browser" = xno; then
@@ -184,6 +156,34 @@ if test "x$enable_wrapping_as_root" = xno; then
     AC_DEFINE(DISABLE_ROOTWRAPPING, 1, [Define this to disable text wrapping as root by default.])
 fi
 
+AC_ARG_ENABLE(debug,
+AS_HELP_STRING([--enable-debug], [Enable debugging (disabled by default)]))
+if test "x$enable_debug" = xyes; then
+    AC_DEFINE(DEBUG, 1, [Define this to enable debug messages and assert warnings.])
+else
+    AC_DEFINE(NDEBUG, 1, [Shut up assert warnings :-)])
+fi
+
+AC_ARG_ENABLE(tiny,
+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.])
+    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.])
+    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.])
+    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
+fi
+
 AM_CONDITIONAL(USE_COLOR, test x$color_support = xyes)
 AM_CONDITIONAL(USE_NANORC, test x$nanorc_support = xyes)