Don't undefine macros if not defined.

2 files changed, 27 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f2ccbe9d..e5e921053 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-01  Peter Stephenson  <pws@csr.com>
+
+	* 14644: configure.in: only undefine M4 macros if they are
+	defined, since new autoconf complains.  Undefining the macros
+	in question is probably only a historical curiosity.
+
 2001-06-01  Clint Adams  <clint@zsh.org>
 
 	* 14635: Completion/Unix/Command/_gdb: presume
diff --git a/configure.in b/configure.in
index d35a43f19..6ae33d9b0 100644
--- a/configure.in
+++ b/configure.in
@@ -52,7 +52,7 @@ dnl Handle setting of compile flags (CPPFLAGS, CFLAGS, LDFLAGS, LIBS).
 zsh_COMPILE_FLAGS($CPPFLAGS, $CFLAGS, $LDFLAGS, $LIBS)
 
 dnl Do you want to debug zsh?
-undefine([zsh-debug])dnl
+ifdef([zsh-debug],undefine([zsh-debug]))dnl
 AC_ARG_ENABLE(zsh-debug,
 [  --enable-zsh-debug         compile with debug code and debugger symbols],
 [if test x$enableval = xyes; then
@@ -60,7 +60,7 @@ AC_ARG_ENABLE(zsh-debug,
 fi])
 
 dnl Do you want zsh memory allocation routines.
-undefine([zsh-mem])dnl
+ifdef([zsh-mem],undefine([zsh-mem]))dnl
 AC_ARG_ENABLE(zsh-mem,
 [  --enable-zsh-mem           compile with zsh memory allocation routines],
 [if test x$enableval = xyes; then
@@ -68,7 +68,7 @@ AC_ARG_ENABLE(zsh-mem,
 fi])
 
 dnl Do you want to debug zsh memory allocation routines.
-undefine([zsh-mem-debug])dnl
+ifdef([zsh-mem-debug],undefine([zsh-mem-debug]))dnl
 AC_ARG_ENABLE(zsh-mem-debug,
 [  --enable-zsh-mem-debug     debug zsh memory allocation routines],
 [if test x$enableval = xyes; then
@@ -76,7 +76,7 @@ AC_ARG_ENABLE(zsh-mem-debug,
 fi])
 
 dnl Do you want to print warnings when errors in memory allocation.
-undefine([zsh-mem-warning])dnl
+ifdef([zsh-mem-warning],undefine([zsh-mem-warning]))dnl
 AC_ARG_ENABLE(zsh-mem-warning,
 [  --enable-zsh-mem-warning   print warnings for errors in memory allocation],
 [if test x$enableval = xyes; then
@@ -84,7 +84,7 @@ AC_ARG_ENABLE(zsh-mem-warning,
 fi])
 
 dnl Do you want to turn on error checking for free().
-undefine([zsh-secure-free])dnl
+ifdef([zsh-secure-free],undefine([zsh-secure-free]))dnl
 AC_ARG_ENABLE(zsh-secure-free,
 [  --enable-zsh-secure-free   turn on error checking for free()],
 [if test x$enableval = xyes; then
@@ -93,7 +93,7 @@ fi])
 
 dnl Do you want debugging information on internal hash tables.
 dnl This turns on the `hashinfo' builtin command.
-undefine([zsh-hash-debug])dnl
+ifdef([zsh-hash-debug],undefine([zsh-hash-debug]))dnl
 AC_ARG_ENABLE(zsh-hash-debug,
 [  --enable-zsh-hash-debug    turn on debugging of internal hash tables],
 [if test x$enableval = xyes; then
@@ -101,12 +101,12 @@ AC_ARG_ENABLE(zsh-hash-debug,
 fi])
 
 dnl Pathnames for global zsh scripts
-undefine([etcdir])dnl
+ifdef([etcdir],undefine([etcdir]))dnl
 AC_ARG_ENABLE(etcdir,
 [  --enable-etcdir=DIR        the default directory for global zsh scripts],
 [etcdir="$enableval"], [etcdir=/etc])
 
-undefine([zshenv])dnl
+ifdef([zshenv],undefine([zshenv]))dnl
 AC_ARG_ENABLE(zshenv,
 [  --enable-zshenv=FILE       the full pathname of the global zshenv script],
 [zshenv="$enableval"],
@@ -119,7 +119,7 @@ if test "x$zshenv" != xno; then
   AC_DEFINE_UNQUOTED(GLOBAL_ZSHENV, "$zshenv")
 fi
 
-undefine([zshrc])dnl
+ifdef([zshrc],undefine([zshrc]))dnl
 AC_ARG_ENABLE(zshrc,
 [  --enable-zshrc=FILE        the full pathname of the global zshrc script],
 [zshrc="$enableval"],
@@ -132,7 +132,7 @@ if test "x$zshrc" != xno; then
   AC_DEFINE_UNQUOTED(GLOBAL_ZSHRC, "$zshrc")
 fi
 
-undefine([zprofile])dnl
+ifdef([zprofile],undefine([zprofile]))dnl
 AC_ARG_ENABLE(zprofile,
 [  --enable-zprofile=FILE     the full pathname of the global zprofile script],
 [zprofile="$enableval"],
@@ -145,7 +145,7 @@ if test "x$zprofile" != xno; then
   AC_DEFINE_UNQUOTED(GLOBAL_ZPROFILE, "$zprofile")
 fi
 
-undefine([zlogin])dnl
+ifdef([zlogin],undefine([zlogin]))dnl
 AC_ARG_ENABLE(zlogin,
 [  --enable-zlogin=FILE       the full pathname of the global zlogin script],
 [zlogin="$enableval"],
@@ -158,7 +158,7 @@ if test "x$zlogin" != xno; then
   AC_DEFINE_UNQUOTED(GLOBAL_ZLOGIN, "$zlogin")
 fi
 
-undefine([zlogout])dnl
+ifdef([zlogout],undefine([zlogout]))dnl
 AC_ARG_ENABLE(zlogout,
 [  --enable-zlogout=FILE      the full pathname of the global zlogout script],
 [zlogout="$enableval"],
@@ -178,19 +178,19 @@ AC_SUBST(zlogin)dnl
 AC_SUBST(zlogout)dnl
 
 dnl Do you want large file support, if available?
-undefine([lfs])dnl
+ifdef([lfs],undefine([lfs]))dnl
 AC_ARG_ENABLE(lfs,
 [  --disable-lfs              turn off support for large files],
 [lfs="$enableval"], [lfs=yes])
 
 dnl Do you want dynamically loaded binary modules.
-undefine([dynamic])dnl
+ifdef([dynamic],undefine([dynamic]))dnl
 AC_ARG_ENABLE(dynamic,
 [  --disable-dynamic          turn off dynamically loaded binary modules],
 [dynamic="$enableval"], [dynamic=yes])
 
 dnl Do you want to disable restricted on r* commands
-undefine([restricted-r])dnl
+ifdef([restricted-r],undefine([restricted-r]))dnl
 AC_ARG_ENABLE(restricted-r,
 [  --disable-restricted-r     turn off r* invocation for restricted shell],
 [if test x$enableval = xyes; then
@@ -213,7 +213,7 @@ AC_ARG_ENABLE(ansi2knr,
 [  --enable-ansi2knr          translate source to K&R C before compiling],
 [ansi2knr="$enableval"], [ansi2knr=default])
 
-undefine([fndir])dnl
+ifdef([fndir],undefine([fndir]))dnl
 AC_ARG_ENABLE(fndir,
 [  --enable-fndir=DIR         the directory in which to install functions],
 dnl ${VERSION} to be determined at compile time.
@@ -223,7 +223,7 @@ else
   fndir="$enableval"
 fi], [fndir=${datadir}/${tzsh_name}/'${VERSION}'/functions])
 
-undefine([sitefndir])dnl
+ifdef([sitefndir],undefine([sitefndir]))dnl
 AC_ARG_ENABLE(sitefndir,
 [  --enable-site-fndir=DIR    same for site functions (not version specific)],
 [if test $enableval = yes; then
@@ -232,7 +232,7 @@ else
   sitefndir="$enableval"
 fi], [sitefndir=${datadir}/${tzsh_name}/site-functions])
 
-undefine([function_subdirs])
+ifdef([function_subdirs],undefine([function_subdirs]))
 AC_ARG_ENABLE(function-subdirs,
 [  --enable-function-subdirs  install functions in subdirectories])
 
@@ -248,7 +248,7 @@ AC_SUBST(sitefndir)dnl
 AC_SUBST(FUNCTIONS_SUBDIRS)dnl
 
 dnl Do you want maildir support?
-undefine([maildir_support])dnl
+ifdef([maildir_support],undefine([maildir_support]))dnl
 AC_ARG_ENABLE(maildir-support,
 [  --enable-maildir-support   enable maildir support in MAIL and MAILPATH],
 [if test x$enableval = xyes; then
@@ -256,7 +256,7 @@ AC_ARG_ENABLE(maildir-support,
 fi])
 
 dnl Do you want to set a maximum function depth?
-undefine([max_function_depth])dnl
+ifdef([max_function_depth],undefine([max_function_depth]))dnl
 AC_ARG_ENABLE(max-function-depth,
 [  --enable-max-function-depth=MAX   limit function depth to MAX],
 [if test x$enableval = xyes; then
@@ -419,7 +419,7 @@ fi
 
 AC_MSG_CHECKING(what to set MAXJOB to)
 dnl Do you want to alter the maximum job table size?
-undefine([max_jobtable_size])dnl
+ifdef([max_jobtable_size],undefine([max_jobtable_size]))dnl
 AC_ARG_ENABLE(max-jobtable-size,
 [  --enable-max-jobtable-size=MAX    limit job table size to MAX],