mirror of https://github.com/fadden/nulib2.git
Upgraded to most recent autoconf. Un-nested some directives.
This commit is contained in:
parent
5b1f00dd9d
commit
8effea7000
File diff suppressed because it is too large
Load Diff
|
@ -38,8 +38,19 @@ AC_ARG_ENABLE(deflate,
|
|||
[ ], [ enable_deflate=yes ])
|
||||
if test $enable_deflate = "yes"; then
|
||||
dnl Check for zlib. Make sure it comes with zlib.h.
|
||||
AC_CHECK_LIB(z, deflate,
|
||||
AC_CHECK_HEADER(zlib.h, LIBS="$LIBS -lz"))
|
||||
dnl AC_CHECK_LIB(z, deflate,
|
||||
dnl AC_CHECK_HEADER(zlib.h, LIBS="$LIBS -lz"))
|
||||
got_zlibh=false
|
||||
AC_CHECK_LIB(z, deflate, got_libz=true, got_libz=false)
|
||||
if $got_libz; then
|
||||
AC_CHECK_HEADER(zlib.h, got_zlibh=true LIBS="$LIBS -lz")
|
||||
fi
|
||||
if $got_zlibh; then
|
||||
echo " (found libz and zlib.h, enabling deflate)"
|
||||
AC_DEFINE(ENABLE_DEFLATE)
|
||||
else
|
||||
echo " (couldn't find libz and zlib.h, not enabling deflate)"
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(bzip2,
|
||||
|
@ -47,8 +58,19 @@ AC_ARG_ENABLE(bzip2,
|
|||
[ ], [ enable_bzip2=no ])
|
||||
if test $enable_bzip2 = "yes"; then
|
||||
dnl Check for libbz2. Make sure it comes with bzlib.h.
|
||||
AC_CHECK_LIB(bz2, BZ2_bzCompress,
|
||||
AC_CHECK_HEADER(bzlib.h, LIBS="$LIBS -lbz2"))
|
||||
dnl AC_CHECK_LIB(bz2, BZ2_bzCompress,
|
||||
dnl AC_CHECK_HEADER(bzlib.h, LIBS="$LIBS -lbz2"))
|
||||
got_bzlibh=false
|
||||
AC_CHECK_LIB(bz2, BZ2_bzCompress, got_libbz=true, got_libbz=false)
|
||||
if $got_libbz; then
|
||||
AC_CHECK_HEADER(bzlib.h, got_bzlibh=true LIBS="$LIBS -lbz2")
|
||||
fi
|
||||
if $got_bzlibh; then
|
||||
echo " (found libbz2 and bzlib.h, enabling bzip2)"
|
||||
AC_DEFINE(ENABLE_BZIP2)
|
||||
else
|
||||
echo " (couldn't find libbz2 and bzlib.h, not enabling bzip2)"
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
|
|
Loading…
Reference in New Issue