diff options
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | lib/m4/hooks.m4 | 31 | ||||
| -rw-r--r-- | libextra/configure.ac | 30 |
3 files changed, 35 insertions, 31 deletions
@@ -13,6 +13,11 @@ See the end for copying conditions. Reported by Kevin Quick <quick@sparq.org> in <https://savannah.gnu.org/support/index.php?106454>. +** libgnutls-extra: Make building with LZO compression work again. +Build failure reported by Arfrever Frehtes Taifersar Arahesis +<arfrever.fta@gmail.com> in +<http://permalink.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/3194>. + ** doc: Change license on the manual to GFDLv1.3+. ** doc: GTK-DOC fixes for new splitted configuration system. diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4 index e66ff40e0f..f7f0ec1360 100644 --- a/lib/m4/hooks.m4 +++ b/lib/m4/hooks.m4 @@ -78,7 +78,36 @@ AC_DEFUN([LIBGNUTLS_HOOKS], AC_MSG_CHECKING([whether to use the included minitasn1]) AC_MSG_RESULT($included_libtasn1) AM_CONDITIONAL(ENABLE_MINITASN1, test "$included_libtasn1" = "yes") - + + AC_ARG_WITH(lzo, + AS_HELP_STRING([--with-lzo], [use experimental LZO compression]), + use_lzo=$withval, use_lzo=no) + AC_MSG_CHECKING([whether to include LZO compression support]) + AC_MSG_RESULT($use_lzo) + LZO_LIBS= + if test "$use_lzo" = "yes"; then + AC_CHECK_LIB(lzo2, lzo1x_1_compress, LZO_LIBS=-llzo2) + if test "$LZO_LIBS" = ""; then + AC_CHECK_LIB(lzo, lzo1x_1_compress, LZO_LIBS=-llzo, [ + use_lzo=no + AC_MSG_WARN( + *** + *** Could not find liblzo or liblzo2. Disabling LZO compression. + ) + ]) + fi + fi + AC_SUBST(LZO_LIBS) + if test "$use_lzo" = "yes"; then + AC_DEFINE(USE_LZO, 1, [whether to use the LZO compression]) + if test "$LZO_LIBS" = "-llzo"; then + AC_CHECK_HEADERS(lzo1x.h) + elif test "$LZO_LIBS" = "-llzo2"; then + AC_CHECK_HEADERS(lzo/lzo1x.h) + fi + fi + AM_CONDITIONAL(USE_LZO, test "$use_lzo" = "yes") + AC_MSG_CHECKING([whether C99 macros are supported]) AC_TRY_COMPILE(, [ diff --git a/libextra/configure.ac b/libextra/configure.ac index a2e6edfc72..f051782068 100644 --- a/libextra/configure.ac +++ b/libextra/configure.ac @@ -38,36 +38,6 @@ AC_PROG_LIBTOOL LIBGNUTLS_HOOKS LIBGNUTLS_EXTRA_HOOKS -AC_ARG_WITH(lzo, - AS_HELP_STRING([--with-lzo], [use experimental LZO compression]), - use_lzo=$withval, - use_lzo=no) -AC_MSG_CHECKING([whether to include LZO compression support]) -AC_MSG_RESULT($use_lzo) -LZO_LIBS= -if test "$use_lzo" = "yes"; then - AC_CHECK_LIB(lzo2, lzo1x_1_compress, LZO_LIBS=-llzo2) - if test "$LZO_LIBS" = ""; then - AC_CHECK_LIB(lzo, lzo1x_1_compress, LZO_LIBS=-llzo, [ - use_lzo=no - AC_MSG_WARN( -*** -*** Could not find liblzo or liblzo2. Disabling LZO compression. -) - ]) - fi -fi -AC_SUBST(LZO_LIBS) -if test "$use_lzo" = "yes"; then - AC_DEFINE(USE_LZO, 1, [whether to use the LZO compression]) - if test "$LZO_LIBS" = "-llzo"; then - AC_CHECK_HEADERS(lzo1x.h) - elif test "$LZO_LIBS" = "-llzo2"; then - AC_CHECK_HEADERS(lzo/lzo1x.h) - fi -fi -AM_CONDITIONAL(USE_LZO, test "$use_lzo" = "yes") - xgl_INIT LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS" |