cg_path_get_user_unit(): Did not correctly parse user-unit templates.

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index cf19681c851d6cb3c1913984b33471f2b471acbe..3c33888520d39fca0d83507e6cae4b439460f236 100644 (file)
--- 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
@@ -580,11 +580,13 @@ AM_CONDITIONAL(HAVE_ZLIB, [test "$have_zlib" = "yes"])
 
 # ------------------------------------------------------------------------------
 have_bzip2=no
-AC_ARG_ENABLE(bzip2, AS_HELP_STRING([--enable-bzip2], [Enable optional BZIP2 support]))
+AC_ARG_ENABLE(bzip2, AS_HELP_STRING([--enable-bzip2], [Disable optional BZIP2 support]))
 AS_IF([test "x$enable_bzip2" != "xno"], [
         AC_CHECK_HEADERS(bzlib.h,
-               [AC_DEFINE(HAVE_BZIP2, 1, [Define in BZIP2 is available]) have_bzip2=yes],
-               [AC_MSG_ERROR([*** BZIP2 support requested but headers not found])])
+                [AC_DEFINE(HAVE_BZIP2, 1, [Define in BZIP2 is available])
+                 have_bzip2=yes],
+                [AS_IF([test "x$have_bzip2" = xyes], [AC_MSG_ERROR([*** BZIP2 support requested but headers not found])])
+        ])
 ])
 AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"])