]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
build-sys: use $build_libblkid
authorKarel Zak <kzak@redhat.com>
Thu, 27 Oct 2011 10:55:05 +0000 (12:55 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 3 Nov 2011 11:32:49 +0000 (12:32 +0100)
Signed-off-by: Karel Zak <kzak@redhat.com>
configure.ac

index 64e1d137b3ee7f1e7503b679a8b7ebc4d1f932ea..ddb417e99559bf61760037ea06ce0a8f52e13db3 100644 (file)
@@ -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