diff options
| author | Werner Koch <wk@gnupg.org> | 1998-02-13 21:58:50 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 1998-02-13 21:58:50 +0100 |
| commit | f477447d9af4097e8c5d4c15a3dd381237e93ee2 (patch) | |
| tree | a655392c92fed02f06ebf503bf10b835b56e54e0 /configure.in | |
| parent | added assembler stuff for hppa (diff) | |
| download | gnupg2-f477447d9af4097e8c5d4c15a3dd381237e93ee2.tar.xz gnupg2-f477447d9af4097e8c5d4c15a3dd381237e93ee2.zip | |
added option exportV0-2-6
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 33e1f2f17..1a29bf7a2 100644 --- a/configure.in +++ b/configure.in @@ -162,26 +162,26 @@ AC_SUBST(MPI_EXTRA_ASM_OBJS) dnl Do we have zlib? Must do it here because Solaris failed dnl when compiling a conftest (due to the "-lz" from LIBS). -ZLIBS= -ZLIB_SUBDIR= if test "$g10_force_zlib" = "yes"; then - ZLIBS="\${top_srcdir}/zlib/libzlib.a" - ZLIB_SUBDIR=zlib + ZLIBS="-L\${top_srcdir}/zlib -lzlib" + AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, true) WK_LINK_FILES(zlib/zlib.h, zlib.h ) WK_LINK_FILES(zlib/zconf.h, zconf.h ) 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="\${top_srcdir}/zlib/libzlib.a" - ZLIB_SUBDIR=zlib + ZLIBS="-L\${top_srcdir}/zlib -lzlib" + AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, true) WK_LINK_FILES(zlib/zlib.h, zlib.h ) WK_LINK_FILES(zlib/zconf.h, zconf.h ) fi fi AC_SUBST(ZLIBS) -AC_SUBST(ZLIB_SUBDIR) + dnl checking whether we have other cipher source files CIPHER_EXTRA_OBJS="" |