From 5afdf37b56976e21dd861ae609b25329ac254afe Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 18 Sep 2014 21:11:33 -0400 Subject: [PATCH] fix build with configure --disable-uuid --disable-blkid --enable-profile We need to make sure PROFILED_LIBUUID and PROFILED_LIBBLKID are defined when we are using the system uuid and blkid libraries. Signed-off-by: Theodore Ts'o --- configure | 2 ++ configure.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configure b/configure index ff80746..5de6ea2 100755 --- a/configure +++ b/configure @@ -5302,6 +5302,7 @@ else as_fn_error $? "external uuid library not found" "$LINENO" 5 fi + PROFILED_LIBUUID=$LIBUUID UUID_CMT=# { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling private uuid library" >&5 $as_echo "Disabling private uuid library" >&6; } @@ -5515,6 +5516,7 @@ else fi BLKID_CMT=# + PROFILED_LIBBLKID=$LIBBLKID { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling private blkid library" >&5 $as_echo "Disabling private blkid library" >&6; } else diff --git a/configure.in b/configure.in index 926bc43..80f49df 100644 --- a/configure.in +++ b/configure.in @@ -479,6 +479,7 @@ then [LIBUUID=`$PKG_CONFIG --libs uuid`; STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`], [AC_MSG_ERROR([external uuid library not found])]) + PROFILED_LIBUUID=$LIBUUID UUID_CMT=# AC_MSG_RESULT([Disabling private uuid library]) else @@ -531,6 +532,7 @@ then STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`], [AC_MSG_ERROR([external blkid library not found])], -luuid) BLKID_CMT=# + PROFILED_LIBBLKID=$LIBBLKID AC_MSG_RESULT([Disabling private blkid library]) else LIBBLKID='$(LIB)/libblkid'$LIB_EXT -- 1.8.3.1