security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

* configure.ac: AM_CONDITIONAL must not be used inside an if/then.

Browse Source
This commit is contained in:
David Shaw 2006-12-08 04:39:56 +00:00
parent abfdbea116
commit d382fece03
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2006-12-07 David Shaw <dshaw@jabberwocky.com>
* configure.ac: AM_CONDITIONAL must not be used inside an if/then.
2006-12-07 Werner Koch <wk@g10code.com> 2006-12-07 Werner Koch <wk@g10code.com>
* configure.ac: Remove GNUPG_DATADIR for non-W32 systems. * configure.ac: Remove GNUPG_DATADIR for non-W32 systems.

25
configure.ac
View File

@ -354,18 +354,18 @@ dnl LDAP is defined only after we confirm the library is available later
[enable email keyserver interface only]), [enable email keyserver interface only]),
try_mailto=$enableval, try_mailto=no) try_mailto=$enableval, try_mailto=no)
AC_MSG_RESULT($try_mailto) 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 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_MSG_CHECKING([whether the included zlib is requested])
AC_ARG_WITH(included-zlib, AC_ARG_WITH(included-zlib,
[ --with-included-zlib use the zlib code included here], [ --with-included-zlib use the zlib code included here],
@ -1197,13 +1197,12 @@ else
fi fi
if test "$use_local_zlib" = yes ; then 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 ) AC_CONFIG_LINKS(zlib.h:zlib/zlib.h zconf.h:zlib/zconf.h )
ZLIBS="../zlib/libzlib.a" ZLIBS="../zlib/libzlib.a"
else
AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, false)
fi fi
AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, test "$use_local_zlib" = yes)
if test "$use_bzip2" = yes ; then if test "$use_bzip2" = yes ; then
_cppflags="${CPPFLAGS}" _cppflags="${CPPFLAGS}"
_ldflags="${LDFLAGS}" _ldflags="${LDFLAGS}"