diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.in | 35 |
3 files changed, 28 insertions, 20 deletions
@@ -1,3 +1,8 @@ +Thu Jun 10 14:18:23 CEST 1999 Werner Koch <wk@isil.d.shuttle.de> + + + * configure.in (ZLIB,GDBM): Check both, header and lib. + Sat Jun 5 15:30:33 CEST 1999 Werner Koch <wk@isil.d.shuttle.de> * pkclist.c (key_present_in_pk_list): New (Michael). diff --git a/Makefile.am b/Makefile.am index 1651d0a4..9793c146 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,14 +31,6 @@ cvs-put: cvs-sync: cvs-get cvs-put -tobold-get: - rsync -Cavuzb --exclude scratch --exclude .deps \ - tobold:gnupg/ . - -tobold-put: - rsync -Cavuzb --exclude scratch --exclude .deps \ - . tobold:gnupg/ - .PHONY: cvs-get cvs-put cvs-sync diff --git a/configure.in b/configure.in index 2faf657c..a414e64d 100644 --- a/configure.in +++ b/configure.in @@ -224,10 +224,18 @@ AC_SUBST(USE_NLS) AC_SUBST(USE_INCLUDED_LIBINTL) fi +dnl +dnl There are lot of misconfigured systems. We include +dnl gdbm support only if the lib and the header is installed. +dnl if test "$try_gdbm" = yes; then -AC_CHECK_LIB(gdbm,gdbm_firstkey) +AC_CHECK_HEADERS(gdbm.h) +if test "$ac_cv_header_gdbm_h" = yes ; then + AC_CHECK_LIB(gdbm,gdbm_firstkey) +fi fi + dnl Solaris needs -lsocket and -lnsl. Unisys system includes dnl gethostbyname in libsocket but needs libnsl for socket. AC_CHECK_LIB(nsl, gethostbyname) @@ -494,26 +502,29 @@ AC_SUBST(MPI_SFLAGS) dnl Do we have zlib? Must do it here because Solaris failed dnl when compiling a conftest (due to the "-lz" from LIBS). +use_local_zlib=yes if test "$g10_force_zlib" = "yes"; then - ZLIBS="../zlib/libzlib.a" + : +else + AC_CHECK_HEADERS(zlib.h) + if test "$ac_cv_header_zlib_h" = yes ; then + AC_CHECK_LIB(z,deflateInit2_,use_local_zlib=no,:) + fi +fi + +if test "use_local_zlib" = yes ; then AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, true) GNUPG_LINK_FILES(zlib/zlib.h, zlib.h ) GNUPG_LINK_FILES(zlib/zconf.h, zconf.h ) + ZLIBS="../zlib/libzlib.a" else -AC_CHECK_HEADERS(zlib.h) -if test "$ac_cv_header_zlib_h" = yes ; then - LIBS="$LIBS -lz" - ZLIBS= AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, false) -else - ZLIBS="../zlib/libzlib.a" - AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, true) - GNUPG_LINK_FILES(zlib/zlib.h, zlib.h ) - GNUPG_LINK_FILES(zlib/zconf.h, zconf.h ) -fi + ZLIBS= + LIBS="-lz $LIBS" fi AC_SUBST(ZLIBS) + changequote(,)dnl tmp_pat='[a-zA-Z]' changequote([,])dnl |