From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 19 Sep 2014 01:11:33 +0000 (-0400)
Subject: fix build with configure --disable-uuid --disable-blkid --enable-profile
X-Git-Tag: v1.42.13~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5afdf37b56976e21dd861ae609b25329ac254afe;p=thirdparty%2Fe2fsprogs.git

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 <tytso@mit.edu>
---

diff --git a/configure b/configure
index ff80746e0..5de6ea272 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 926bc43df..80f49df25 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