diff options
| author | David Shaw <[email protected]> | 2006-12-08 04:39:56 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-12-08 04:39:56 +0000 |
| commit | d382fece032ebb4710d96242f83ef3464595d76b (patch) | |
| tree | 2710d05dc5d93b3e7b0d7778c89db80a7f737727 | |
| parent | / (diff) | |
| download | gnupg-d382fece032ebb4710d96242f83ef3464595d76b.tar.gz gnupg-d382fece032ebb4710d96242f83ef3464595d76b.zip | |
* configure.ac: AM_CONDITIONAL must not be used inside an if/then.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 25 |
2 files changed, 16 insertions, 13 deletions
@@ -1,3 +1,7 @@ +2006-12-07 David Shaw <[email protected]> + + * configure.ac: AM_CONDITIONAL must not be used inside an if/then. + 2006-12-07 Werner Koch <[email protected]> * configure.ac: Remove GNUPG_DATADIR for non-W32 systems. diff --git a/configure.ac b/configure.ac index ceb5dccc5..89e745064 100644 --- a/configure.ac +++ b/configure.ac @@ -354,18 +354,18 @@ dnl LDAP is defined only after we confirm the library is available later [enable email keyserver interface only]), try_mailto=$enableval, try_mailto=no) AC_MSG_RESULT($try_mailto) - fi - - AC_MSG_CHECKING([whether keyserver exec-path is enabled]) - AC_ARG_ENABLE(keyserver-path, - AC_HELP_STRING([--disable-keyserver-path], - [disable the exec-path option for keyserver helpers]), - [if test "$enableval" = no ; then - disable_keyserver_path=yes - fi],enableval=yes) - AC_MSG_RESULT($enableval) fi + AC_MSG_CHECKING([whether keyserver exec-path is enabled]) + AC_ARG_ENABLE(keyserver-path, + AC_HELP_STRING([--disable-keyserver-path], + [disable the exec-path option for keyserver helpers]), + [if test "$enableval" = no ; then + disable_keyserver_path=yes + fi],enableval=yes) + AC_MSG_RESULT($enableval) +fi + AC_MSG_CHECKING([whether the included zlib is requested]) AC_ARG_WITH(included-zlib, [ --with-included-zlib use the zlib code included here], @@ -1197,13 +1197,12 @@ else fi if test "$use_local_zlib" = yes ; then - AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, true) AC_CONFIG_LINKS(zlib.h:zlib/zlib.h zconf.h:zlib/zconf.h ) ZLIBS="../zlib/libzlib.a" -else - AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, false) fi +AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, test "$use_local_zlib" = yes) + if test "$use_bzip2" = yes ; then _cppflags="${CPPFLAGS}" _ldflags="${LDFLAGS}" |