From 7d401345c278734f06ea79d88014f2c40d425e4f Mon Sep 17 00:00:00 2001 From: Jordi Mallach Date: Fri, 5 Jul 2002 23:46:31 +0000 Subject: [PATCH] Merged acconfig.h into configure.ac. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1229 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 4 ++- acconfig.h | 76 ---------------------------------------------------- configure.ac | 64 +++++++++++++++++++++---------------------- 3 files changed, 35 insertions(+), 109 deletions(-) delete mode 100644 acconfig.h diff --git a/ChangeLog b/ChangeLog index dfa58f05..0bb9f5e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -162,7 +162,9 @@ CVS Code - - Add support for the handled keyboard escape sequences in the help menu, as they are needed with some terminals (e.g. xterm with TERM=ansi). (DLR) -- configure.ac: Added ms to ALL_LINGUAS (Jordi). +- configure.ac: + - Added ms to ALL_LINGUAS (Jordi). + - Merged acconfig.h in (Jordi). - THANKS: - Completed a bit (Jordi). - Fixed David Benbennick's email address (David Benbennick). diff --git a/acconfig.h b/acconfig.h deleted file mode 100644 index ee7cc78d..00000000 --- a/acconfig.h +++ /dev/null @@ -1,76 +0,0 @@ -/* $Id$ */ - -/* Define this if you have the wresize function in your ncurses-type library */ -#undef HAVE_WRESIZE - -/* Define this if you have the resizeterm function in your ncurses-type library */ -#undef HAVE_RESIZETERM - -/* Define this if your curses lib has the _use_keypad flag */ -#undef HAVE_USEKEYPAD - -/* Define this if you have NLS */ -#undef ENABLE_NLS - -/* Define this is you have the catgets command */ -#undef HAVE_CATGETS - -/* Define this is you have GNU gettext */ -#undef HAVE_GETTEXT - -/* Define this for HAVE_LC_MESSAGES */ -#undef HAVE_LC_MESSAGES - -/* Define this if you have the stpcpy function (cool) */ -#undef HAVE_STPCPY - -/* Define this to make the nano executable as small as possible */ -#undef NANO_SMALL - -/* Define to use the slang wrappers for curses instead of native curses */ -#undef USE_SLANG - -/* Define this to enable the extra stuff */ -#undef NANO_EXTRA - -/* Define to disable the tab completion code Chris worked so hard on! */ -#undef DISABLE_TABCOMP - -/* Define this to disable the justify routine */ -#undef DISABLE_JUSTIFY - -/* Define this to disable the use(full|less) spelling functions */ -#undef DISABLE_SPELLER - -/* Define this to disable the ^G help menu */ -#undef DISABLE_HELP - -/* Define this to disable the built-in (crappy) file browser */ -#undef DISABLE_BROWSER - -/* Define this to disable any and all text wrapping */ -#undef DISABLE_WRAPPING - -/* Define this to disable the mouse functions */ -#undef DISABLE_MOUSE - -/* Define this to disable setting of the operating directory (chroot of sorts) */ -#undef DISABLE_OPERATINGDIR - -/* Define this to enable multiple file buffers */ -#undef ENABLE_MULTIBUFFER - -/* Define this to use the .nanorc file */ -#undef ENABLE_NANORC - -/* Define this if your curses library has the use_default_colors command */ -#undef HAVE_USE_DEFAULT_COLORS - -/* Define this to have syntax highlighting, requires ENABLE_NANORC too! */ -#undef ENABLE_COLOR - -/* Define this to enable undoing....something */ -#undef ENABLE_UNDO - -/* Shut up the assert warnings :-) */ -#undef NDEBUG diff --git a/configure.ac b/configure.ac index adec3a98..c229842b 100644 --- a/configure.ac +++ b/configure.ac @@ -18,54 +18,54 @@ AC_HEADER_STDC AC_CHECK_HEADERS(fcntl.h unistd.h malloc.h termios.h termio.h limits.h getopt.h regex.h) dnl Turn off assert statements. -AC_DEFINE(NDEBUG) +AC_DEFINE(NDEBUG, 1, [Shut up the assert warnings :-)]) dnl options AC_ARG_ENABLE(tiny, [ --enable-tiny Disable features for the sake of size (currently disables detailed help and i18n)], [if test x$enableval = xyes; then - AC_DEFINE(NANO_SMALL) tiny_support=yes - AC_DEFINE(DISABLE_TABCOMP) - AC_DEFINE(DISABLE_SPELLER) - AC_DEFINE(DISABLE_HELP) - AC_DEFINE(DISABLE_JUSTIFY) - AC_DEFINE(DISABLE_BROWSER) - AC_DEFINE(DISABLE_MOUSE) - AC_DEFINE(DISABLE_OPERATINGDIR) + AC_DEFINE(NANO_SMALL, 1, [Define this to make the nano executable as small as possible.]) tiny_support=yes + AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion code Chris worked so hard on!]) + AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the use(full|less) spelling functions.]) + AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the ^G help menu.]) + AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routine.]) + AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in (crappy) file browser.]) + AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse functions.]) + AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable setting of the operating directory (chroot of sorts).]) fi]) AC_ARG_ENABLE(extra, [ --enable-extra Enable extra (optional) functions, including easter eggs], [if test x$enableval = xyes; then - AC_DEFINE(NANO_EXTRA) extra_support=yes - AC_DEFINE(ENABLE_MULTIBUFFER) multibuffer_support=yes - AC_DEFINE(ENABLE_UNDO) undo_support=yes + AC_DEFINE(NANO_EXTRA, 1, [Define this to enable the extra stuff.]) extra_support=yes + AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes + AC_DEFINE(ENABLE_UNDO, 1, [Define this to enable undoing... something]) undo_support=yes fi]) AC_ARG_ENABLE(undo, [ --enable-undo Enable undo support], [if test x$enableval = xyes && test x$tiny_support != xyes; then - AC_DEFINE(ENABLE_UNDO) undo_support=yes + AC_DEFINE(ENABLE_UNDO, 1, [Define this to enable undoing... something.]) undo_support=yes fi]) AC_ARG_ENABLE(multibuffer, [ --enable-multibuffer Enable multiple file buffers], [if test x$enableval = xyes; then - AC_DEFINE(ENABLE_MULTIBUFFER) multibuffer_support=yes + AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes fi]) AC_ARG_ENABLE(nanorc, [ --enable-nanorc Enable use of .nanorc file], [if test x$enableval = xyes; then - AC_DEFINE(ENABLE_NANORC) nanorc_support=yes + AC_DEFINE(ENABLE_NANORC, 1, [Define this to use the .nanorc file.]) nanorc_support=yes fi]) AC_ARG_ENABLE(color, [ --enable-color Enable color and syntax highlighting], [if test x$enableval = xyes; then - AC_DEFINE(ENABLE_NANORC) nanorc_support=yes - AC_DEFINE(ENABLE_COLOR) color_support=yes + AC_DEFINE(ENABLE_NANORC, 1, [Define this to use the .nanorc file.]) nanorc_support=yes + AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires ENABLE_NANORC too!]) color_support=yes AC_MSG_WARN([ *********************************************************************** @@ -78,49 +78,49 @@ fi]) AC_ARG_ENABLE(tabcomp, [ --disable-tabcomp Disable tab completion code for a smaller binary], [if test x$enableval != xyes; then - AC_DEFINE(DISABLE_TABCOMP) + AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion code Chris worked so hard on!]) fi]) AC_ARG_ENABLE(justify, [ --disable-justify Disable justify/unjustify function], [if test x$enableval != xyes; then - AC_DEFINE(DISABLE_JUSTIFY) + AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routine.]) fi]) AC_ARG_ENABLE(speller, [ --disable-speller Disable spell checker function], [if test x$enableval != xyes; then - AC_DEFINE(DISABLE_SPELLER) + AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the use(full|less) spelling functions.]) fi]) AC_ARG_ENABLE(help, [ --disable-help Disable help function (^G)], [if test x$enableval != xyes; then - AC_DEFINE(DISABLE_HELP) + AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the ^G help menu.]) fi]) AC_ARG_ENABLE(browser, [ --disable-browser Disable mini file browser], [if test x$enableval != xyes; then - AC_DEFINE(DISABLE_BROWSER) + AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in (crappy) file browser.]) fi]) AC_ARG_ENABLE(wrapping, [ --disable-wrapping Disable all wrapping of text (and -w flag)], [if test x$enableval != xyes; then - AC_DEFINE(DISABLE_WRAPPING) + AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable any and all text wrapping.]) fi]) AC_ARG_ENABLE(mouse, [ --disable-mouse Disable mouse support (and -m flag)], [if test x$enableval != xyes; then - AC_DEFINE(DISABLE_MOUSE) + AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse functions.]) fi]) AC_ARG_ENABLE(operatingdir, [ --disable-operatingdir Disable setting of operating directory (chroot of sorts)], [if test x$enableval != xyes; then - AC_DEFINE(DISABLE_OPERATINGDIR) + AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable setting of the operating directory (chroot of sorts).]) fi]) AC_MSG_CHECKING([whether to use slang]) @@ -149,7 +149,7 @@ AC_ARG_WITH(slang, #include int main () { SLtt_initialize (NULL); return 0; }], [AC_MSG_RESULT(yes) - AC_DEFINE(USE_SLANG) + AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes if test "$with_slang" != "yes"; then CURSES_LIB="-L${with_slang}/lib -lslang" @@ -171,7 +171,7 @@ int main () { SLtt_initialize (NULL); return 0; }], #include int main () { SLtt_initialize (NULL); return 0; }], [AC_MSG_RESULT(yes) - AC_DEFINE(USE_SLANG) + AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes if test "$with_slang" != "yes"; then CURSES_LIB="-L${with_slang}/lib -lslang $tcap" @@ -188,7 +188,7 @@ int main () { SLtt_initialize (NULL); return 0; }], #include int main () { SLtt_initialize (NULL); return 0; }], [AC_MSG_RESULT(yes) - AC_DEFINE(USE_SLANG) + AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes if test "$with_slang" != "yes"; then CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm" @@ -272,10 +272,10 @@ else fi -AC_CHECK_LIB([$CURSES_LIB_NAME], use_default_colors, [AC_DEFINE(HAVE_USE_DEFAULT_COLORS)]) +AC_CHECK_LIB([$CURSES_LIB_NAME], use_default_colors, AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors command.])) if test x$slang_support != xyes; then - AC_CHECK_LIB([$CURSES_LIB_NAME], wresize, [AC_DEFINE(HAVE_WRESIZE)]) - AC_CHECK_LIB([$CURSES_LIB_NAME], resizeterm, [AC_DEFINE(HAVE_RESIZETERM)]) + AC_CHECK_LIB([$CURSES_LIB_NAME], wresize, AC_DEFINE(HAVE_WRESIZE, 1, [Define this if you have the wresize function in your ncurses-type library.])) + AC_CHECK_LIB([$CURSES_LIB_NAME], resizeterm, AC_DEFINE(HAVE_RESIZETERM, 1, [Define this if you have the resizeterm function in your ncurses-type library.])) # Taken from aumix (can't tell form the variable name?) AC_CACHE_CHECK([for private member _use_keypad in WINDOW], @@ -288,7 +288,7 @@ if test x$slang_support != xyes; then aumix_cv_struct_window_usekeypad=yes, aumix_cv_struct_window_usekeypad=no)]) if test $aumix_cv_struct_window_usekeypad = yes; then - AC_DEFINE(HAVE_USEKEYPAD) + AC_DEFINE(HAVE_USEKEYPAD, 1, [Define this if your curses lib has the _use_keypad flag.]) fi fi