Modified the configure script and Makefiles so that systems that do

not include zlib by default will pick it up from the compile line.
This commit is contained in:
Tim Edwards
2022-05-28 17:51:20 -04:00
parent c001de3d9d
commit c997f4cccf
5 changed files with 18 additions and 6 deletions
+6
View File
@@ -660,6 +660,7 @@ LIB_SPECS_GRNULL
LIB_SPECS_NOSTUB
LIB_SPECS
INC_SPECS
ZLIB_FLAG
EXTRA_LIB_SPECS
SHLIB_LIB_SPECS
LDDL_FLAGS
@@ -5043,6 +5044,7 @@ else
fi
ZLIB_FLAG=""
if test "x$enable_compression" = "xyes" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
$as_echo_n "checking for gzopen in -lz... " >&6; }
@@ -5082,8 +5084,11 @@ fi
$as_echo "$ac_cv_lib_z_gzopen" >&6; }
if test "x$ac_cv_lib_z_gzopen" = xyes; then :
$as_echo "#define HAVE_ZLIB 1" >>confdefs.h
ZLIB_FLAG=" -lz"
fi
fi
@@ -8246,6 +8251,7 @@ fi
fi
if test "$GCC" = "yes" ; then
+6 -1
View File
@@ -185,8 +185,12 @@ AC_ARG_ENABLE(compression,
[enable_compression=yes])
dnl Check for zlib
ZLIB_FLAG=""
if test "x$enable_compression" = "xyes" ; then
AC_CHECK_LIB([z],[gzopen],[AC_DEFINE([HAVE_ZLIB],[1],["zlib compression"])])
AC_CHECK_LIB([z],[gzopen],[
AC_DEFINE([HAVE_ZLIB],[1],["zlib compression"])
ZLIB_FLAG=" -lz"
])
fi
dnl Check for some C99 functions
@@ -1759,6 +1763,7 @@ if test $usingTcl ; then
AC_SUBST(EXTRA_LIB_SPECS)
AC_SUBST(LDFLAGS)
AC_SUBST(ZLIB_FLAG)
AC_SUBST(INC_SPECS)
AC_SUBST(LIB_SPECS)
AC_SUBST(LIB_SPECS_NOSTUB)
+1 -1
View File
@@ -62,7 +62,7 @@ MCPP = @MCPP@
MSED = @MSED@
RANLIB = @RANLIB@
SHDLIB_EXT = @SHDLIB_EXT@
LDDL_FLAGS = ${LDFLAGS} @LDDL_FLAGS@
ZLIB_FLAG = @ZLIB_FLAG@
LD_RUN_PATH = @LD_RUN_PATH@
LIB_SPECS = @LIB_SPECS@
LIB_SPECS_NOSTUB = @LIB_SPECS_NOSTUB@