diff options
| author | Simon Josefsson <simon@josefsson.org> | 2008-01-08 10:31:12 +0100 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2008-01-08 10:31:12 +0100 |
| commit | 6be20c40bb1846c893d42c08191658eb37da6df0 (patch) | |
| tree | 9081371306f56aec7af7c00fbeac97add18bd4e6 | |
| parent | 2198763cfcee6289a8917bcf12de5f314ddf6183 (diff) | |
| download | gnutls-6be20c40bb1846c893d42c08191658eb37da6df0.tar.gz | |
Further LZO fixes.
| -rw-r--r-- | configure.in | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 37b676da1d..2bb5caa205 100644 --- a/configure.in +++ b/configure.in @@ -608,13 +608,11 @@ 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_CHECKING([whether to include LZO compression support]) AC_MSG_RESULT($use_lzo) +LZO_LIBS= if test "$use_lzo" = "yes"; then - AC_DEFINE(USE_LZO, 1, [whether to use the lzo compression]) - - LZO_LIBS= 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, [ @@ -628,10 +626,13 @@ if test "$use_lzo" = "yes"; then fi AC_SUBST(LZO_LIBS) -if test "$LZO_LIBS" = "-llzo"; then - AC_CHECK_HEADERS(lzo1x.h) -elif test "$LZO_LIBS" = "-llzo2"; then - AC_CHECK_HEADERS(lzo/lzo1x.h) +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") @@ -717,7 +718,7 @@ AC_CONFIG_FILES([Makefile po/Makefile.in \ includes/Makefile includes/gnutls/gnutls.h \ lib/Makefile lib/minitasn1/Makefile lib/x509/Makefile \ libextra/Makefile libextra/openpgp/Makefile libextra/opencdk/Makefile \ - libextra/minilzo/Makefile tests/openpgp/Makefile \ + tests/openpgp/Makefile \ src/Makefile \ src/cfg/Makefile src/cfg/platon/Makefile src/cfg/platon/str/Makefile \ lib/libgnutls-config libextra/libgnutls-extra-config \ |