12601: Tweak --enable-cflags et al.

ChangeLog

@@ -1,3 +1,9 @@
+2000-08-13  Bart Schaefer  <schaefer@zsh.org>
+
+	* 12601: aczsh.m4, configure.in: configure --enable-cflags and the
+	like, i.e., with no =... part, should preserve the environment
+	values for CFLAGS etc. rather than erase them.
+
 2000-08-11  Peter Stephenson  <pws@csr.com>
 
 	* 12598: INSTALL, aczsh.m4, configure.in: --enable-cppflags=...,

aczsh.m4

@@ -631,18 +631,18 @@ AC_DEFUN(zsh_COMPILE_FLAGS,
     AC_ARG_ENABLE(cflags,
 	[  --enable-cflags=...        specify C compiler flags],
 	if test "$enableval" = "yes"
-	then CFLAGS="$1"
+	then CFLAGS="$2"
 	else CFLAGS="$enable_cflags"
 	fi)
     AC_ARG_ENABLE(ldflags,
 	[  --enable-ldflags=...       specify linker flags],
 	if test "$enableval" = "yes"
-	then LDFLAGS="$2"
+	then LDFLAGS="$3"
 	else LDFLAGS="$enable_ldflags"
 	fi)
     AC_ARG_ENABLE(libs,
 	[  --enable-libs=...          specify link libraries],
 	if test "$enableval" = "yes"
-	then LIBS="$3"
+	then LIBS="$4"
 	else LIBS="$enable_libs"
 	fi)])

configure.in

@@ -49,7 +49,7 @@ dnl Handle --program-prefix, --program-suffix, etc.
 zsh_ARG_PROGRAM
 
 dnl Handle setting of compile flags (CPPFLAGS, CFLAGS, LDFLAGS, LIBS).
-zsh_COMPILE_FLAGS
+zsh_COMPILE_FLAGS($CPPFLAGS, $CFLAGS, $LDFLAGS, $LIBS)
 
 dnl Do you want to debug zsh?
 undefine([zsh-debug])dnl