From 4f3b364bec160fea2c7ec16da073df18abe25a66 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 27 Oct 2011 12:55:05 +0200 Subject: [PATCH] build-sys: use $build_libblkid Signed-off-by: Karel Zak --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 64e1d137b3..ddb417e995 100644 --- a/configure.ac +++ b/configure.ac @@ -345,16 +345,16 @@ AC_ARG_ENABLE([libblkid], AS_HELP_STRING([--disable-libblkid], [do not build libblkid and many related utilities]), [], enable_libblkid=yes ) +build_libblkid=$enable_libblkid AC_SUBST([LIBBLKID_DATE]) AC_SUBST([LIBBLKID_VERSION]) AC_SUBST([LIBBLKID_VERSION_INFO]) -AM_CONDITIONAL(BUILD_LIBBLKID, test "x$enable_libblkid" = xyes) AC_DEFINE_UNQUOTED(LIBBLKID_VERSION, "$LIBBLKID_VERSION", [libblkid version string]) AC_DEFINE_UNQUOTED(LIBBLKID_DATE, "$LIBBLKID_DATE", [libblkid date string]) - -if test "x$enable_libblkid" = xyes; then +if test "x$build_libblkid" = xyes; then AC_DEFINE(HAVE_LIBBLKID, 1, [Define to 1 if you have the -lblkid.]) fi +AM_CONDITIONAL(BUILD_LIBBLKID, test "x$build_libblkid" = xyes) dnl dnl libmount @@ -411,7 +411,7 @@ as) esac -case "$enable_libblkid:$build_libmount" in +case "$build_libblkid:$build_libmount" in no:yes) AC_MSG_ERROR([cannot enable libmount when libblkid is disabled]) ;; esac -- 2.47.3