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

Removing unused '*_support' variables. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4708 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-04-03 10:52:27 +00:00
parent 7cf7f42546
commit a4c0c2f6ec
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2014-04-03 Benno Schulenberg <bensberg@justemail.net>
* configure.ac: Remove unused '*_support' variables.
2014-04-02 Benno Schulenberg <bensberg@justemail.net> 2014-04-02 Benno Schulenberg <bensberg@justemail.net>
* configure.ac, doc/Makefile.am: Try to build the info documentation * configure.ac, doc/Makefile.am: Try to build the info documentation
only when 'makeinfo' is available. Patch partly by Mike Frysinger. only when 'makeinfo' is available. Patch partly by Mike Frysinger.

20
configure.ac
View File

@ -60,10 +60,7 @@ AC_ARG_ENABLE(debug,
AS_HELP_STRING([--enable-debug], [Enable debugging (disabled by default)])) AS_HELP_STRING([--enable-debug], [Enable debugging (disabled by default)]))
if test "x$enable_debug" = xyes; then if test "x$enable_debug" = xyes; then
AC_DEFINE(DEBUG, 1, [Define this to enable debug messages and assert warnings.]) AC_DEFINE(DEBUG, 1, [Define this to enable debug messages and assert warnings.])
debug_support=yes else
fi
if test x$debug_support != xyes; then
AC_DEFINE(NDEBUG, 1, [Shut up assert warnings :-)]) AC_DEFINE(NDEBUG, 1, [Shut up assert warnings :-)])
fi fi
@ -71,7 +68,6 @@ AC_ARG_ENABLE(tiny,
AS_HELP_STRING([--enable-tiny], [Disable features for the sake of size])) AS_HELP_STRING([--enable-tiny], [Disable features for the sake of size]))
if test "x$enable_tiny" = xyes; then 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(NANO_TINY, 1, [Define this to make the nano executable as small as possible.])
tiny_support=yes
AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.]) AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.]) 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_JUSTIFY, 1, [Define this to disable the justify routines.])
@ -89,7 +85,6 @@ AC_ARG_ENABLE(extra,
AS_HELP_STRING([--disable-extra], [Disable extra features, currently only easter eggs])) AS_HELP_STRING([--disable-extra], [Disable extra features, currently only easter eggs]))
if test "x$enable_extra" != xno; then if test "x$enable_extra" != xno; then
AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.])
extra_support=yes
fi fi
AC_ARG_ENABLE(browser, AC_ARG_ENABLE(browser,
@ -173,7 +168,6 @@ AC_ARG_ENABLE(multibuffer,
AS_HELP_STRING([--disable-multibuffer], [Disable multiple file buffers])) AS_HELP_STRING([--disable-multibuffer], [Disable multiple file buffers]))
if test "x$enable_multibuffer" != xno; then if test "x$enable_multibuffer" != xno; then
AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.])
multibuffer_support=yes
fi fi
AC_ARG_ENABLE(nanorc, AC_ARG_ENABLE(nanorc,
@ -218,7 +212,6 @@ int main(void)
}], }],
[AC_MSG_RESULT(yes) [AC_MSG_RESULT(yes)
AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.]) AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
slang_support=yes
CURSES_LIB_WIDE=yes CURSES_LIB_WIDE=yes
if test x$with_slang != xyes; then if test x$with_slang != xyes; then
CURSES_LIB="-L${with_slang}/lib -lslang" CURSES_LIB="-L${with_slang}/lib -lslang"
@ -244,7 +237,7 @@ int main(void)
return 0; return 0;
}], }],
[AC_MSG_RESULT(yes) [AC_MSG_RESULT(yes)
AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.]) slang_support=yes AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
CURSES_LIB_WIDE=yes CURSES_LIB_WIDE=yes
if test x$with_slang != xyes; then if test x$with_slang != xyes; then
CURSES_LIB="-L${with_slang}/lib -lslang $tcap" CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
@ -265,7 +258,7 @@ int main(void)
return 0; return 0;
}], }],
[AC_MSG_RESULT(yes) [AC_MSG_RESULT(yes)
AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.]) slang_support=yes AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
CURSES_LIB_WIDE=yes CURSES_LIB_WIDE=yes
if test x$with_slang != xyes; then if test x$with_slang != xyes; then
CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm" CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
@ -302,7 +295,7 @@ int main(void)
return 0; return 0;
}], }],
[AC_MSG_RESULT(yes) [AC_MSG_RESULT(yes)
AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.]) slang_support=yes AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
if test x$with_slang != xyes; then if test x$with_slang != xyes; then
CURSES_LIB="-L${with_slang}/lib -lslang" CURSES_LIB="-L${with_slang}/lib -lslang"
else else
@ -327,7 +320,7 @@ int main(void)
return 0; return 0;
}], }],
[AC_MSG_RESULT(yes) [AC_MSG_RESULT(yes)
AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.]) slang_support=yes AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
if test x$with_slang != xyes; then if test x$with_slang != xyes; then
CURSES_LIB="-L${with_slang}/lib -lslang $tcap" CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
else else
@ -347,7 +340,7 @@ int main(void)
return 0; return 0;
}], }],
[AC_MSG_RESULT(yes) [AC_MSG_RESULT(yes)
AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.]) slang_support=yes AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
if test x$with_slang != xyes; then if test x$with_slang != xyes; then
CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm" CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
else else
@ -377,7 +370,6 @@ int main(void)
if test x$CURSES_LIB_NAME = xslang; then if test x$CURSES_LIB_NAME = xslang; then
AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.]) AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.])
tiny_support=yes
AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.]) AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.]) 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_JUSTIFY, 1, [Define this to disable the justify routines.])