From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 28 Jan 2015 02:21:56 +0000 (+0100)
Subject: build-sys: make xz and zlib build-time optional again
X-Git-Tag: v219~250
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6bf12f55aff33a588a1945d9d06aa31c164984fd;hp=5eeac515bf234a111f0e37355893dfb96926f676;p=elogind.git

build-sys: make xz and zlib build-time optional again
---

diff --git a/configure.ac b/configure.ac
index d576e0409..3c3388852 100644
--- a/configure.ac
+++ b/configure.ac
@@ -559,7 +559,7 @@ have_xz=no
 AC_ARG_ENABLE(xz, AS_HELP_STRING([--disable-xz], [Disable optional XZ support]))
 if test "x$enable_xz" != "xno"; then
         PKG_CHECK_MODULES(XZ, [ liblzma ],
-                [AC_DEFINE(HAVE_XZ, 1, [Define if XZ is available]) have_xz=yes])
+                [AC_DEFINE(HAVE_XZ, 1, [Define if XZ is available]) have_xz=yes], have_xz=no)
         if test "x$have_xz" = xno -a "x$enable_xz" = xyes; then
                 AC_MSG_ERROR([*** XZ support requested but libraries not found])
         fi
@@ -571,7 +571,7 @@ have_zlib=no
 AC_ARG_ENABLE(zlib, AS_HELP_STRING([--disable-zlib], [Disable optional ZLIB support]))
 if test "x$enable_zlib" != "xno"; then
         PKG_CHECK_MODULES(ZLIB, [ zlib ],
-                [AC_DEFINE(HAVE_ZLIB, 1, [Define if ZLIB is available]) have_zlib=yes])
+                [AC_DEFINE(HAVE_ZLIB, 1, [Define if ZLIB is available]) have_zlib=yes], have_zlib=no)
         if test "x$have_zlib" = xno -a "x$enable_zlib" = xyes; then
                 AC_MSG_ERROR([*** ZLIB support requested but libraries not found])
         fi