diff options
| author | Werner Koch <[email protected]> | 1999-06-10 12:24:42 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 1999-06-10 12:24:42 +0000 |
| commit | b5f36dd0dd6af6ce30f8a51a71b382e90677fd97 (patch) | |
| tree | 4a0f77aefb7766ab9064a985325990133610204c /configure.in | |
| parent | See ChangeLog: Tue Jun 8 13:36:25 CEST 1999 Werner Koch (diff) | |
| download | gnupg-b5f36dd0dd6af6ce30f8a51a71b382e90677fd97.tar.gz gnupg-b5f36dd0dd6af6ce30f8a51a71b382e90677fd97.zip | |
See ChangeLog: Thu Jun 10 14:18:23 CEST 1999 Werner Koch
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/configure.in b/configure.in index 2faf657c2..a414e64d6 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 |