diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | aczsh.m4 | 6 | ||||
| -rw-r--r-- | configure.in | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 4a4f6fb1a..435aaa21c 100644 --- a/ChangeLog +++ b/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=..., diff --git a/aczsh.m4 b/aczsh.m4 index 329c38431..e835dcede 100644 --- a/aczsh.m4 +++ b/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)]) diff --git a/configure.in b/configure.in index f76aff044..51a40ed10 100644 --- a/configure.in +++ b/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 |