security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

* configure.ac: Locate libbz2 for bzip2 compression support.

Browse Source
This commit is contained in:
David Shaw 2003-10-31 05:39:41 +00:00
parent 869c6bb7e4
commit d3cd27c3b6
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2003-10-30 David Shaw <dshaw@jabberwocky.com>
* configure.ac: Locate libbz2 for bzip2 compression support.
2003-10-26 David Shaw <dshaw@jabberwocky.com> 2003-10-26 David Shaw <dshaw@jabberwocky.com>
* NEWS: Note --symmetric --encrypt and the improved config file * NEWS: Note --symmetric --encrypt and the improved config file

37
configure.ac
View File

@ -119,6 +119,7 @@ use_aes=yes
use_twofish=yes use_twofish=yes
use_sha256=yes use_sha256=yes
use_sha512=yes use_sha512=yes
use_bzip2=yes
use_exec=yes use_exec=yes
AC_ARG_ENABLE(minimal, AC_ARG_ENABLE(minimal,
@ -130,6 +131,7 @@ AC_ARG_ENABLE(minimal,
use_twofish=no use_twofish=no
use_sha256=no use_sha256=no
use_sha512=no use_sha512=no
use_bzip2=no
use_exec=no) use_exec=no)
AC_MSG_CHECKING([whether to enable the IDEA cipher]) AC_MSG_CHECKING([whether to enable the IDEA cipher])
@ -211,6 +213,13 @@ AC_ARG_ENABLE(sha512,
use_sha512=$enableval) use_sha512=$enableval)
AC_MSG_RESULT($use_sha512) AC_MSG_RESULT($use_sha512)
dnl BZLIB is defined only after we confirm the library is available later
AC_MSG_CHECKING([whether to enable the BZIP2 compression algorithm])
AC_ARG_ENABLE(bzip2,
AC_HELP_STRING([--disable-bzip2],[disable the BZIP2 compression algorithm]),
use_bzip2=$enableval)
AC_MSG_RESULT($use_bzip2)
AC_MSG_CHECKING([whether to enable external program execution]) AC_MSG_CHECKING([whether to enable external program execution])
AC_ARG_ENABLE(exec, AC_ARG_ENABLE(exec,
AC_HELP_STRING([--disable-exec],[disable all external program execution]), AC_HELP_STRING([--disable-exec],[disable all external program execution]),
@ -996,6 +1005,34 @@ if test "$use_local_zlib" = yes ; then
else else
AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, false) AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, false)
fi fi
if test "$use_bzip2" = yes ; then
_cppflags="${CPPFLAGS}"
_ldflags="${LDFLAGS}"
AC_ARG_WITH(bzip2,
AC_HELP_STRING([--with-bzip2=DIR],[look for bzip2 in DIR]),
[
if test -d "$withval" ; then
CPPFLAGS="${CPPFLAGS} -I$withval/include"
LDFLAGS="${LDFLAGS} -L$withval/lib"
fi
],withval="")
if test "$withval" != no ; then
AC_CHECK_HEADER(bzlib.h,
AC_CHECK_LIB(bz2,BZ2_bzCompressInit,
[
have_bz2=yes
ZLIBS="$ZLIBS -lbz2"
AC_DEFINE(HAVE_BZIP2,1,
[Defined if the bz2 compression library is available])
],
CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
fi
fi
AM_CONDITIONAL(ENABLE_BZIP2_SUPPORT,test x"$have_bz2" = "xyes")
AC_SUBST(ZLIBS) AC_SUBST(ZLIBS)