vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

configure.in: fix external libblkid test for static link 

External libblkid needs -luuid when linking statically.

Also fix up the bogus other-lib parameter in the libuuid test;
$LIBUUID is the null string, so it doesn't do anything other than
obfuscate the use of AC_CHECK_LIB.

Reported-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
maint-test
Theodore Ts'o 2014-07-05 00:27:02 -04:00
parent 5023510dd7
commit 2d7583bd42
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -5264,7 +5264,7 @@ if ${ac_cv_lib_uuid_uuid_generate+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-luuid $LIBUUID $LIBS"
LIBS="-luuid $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -5476,7 +5476,7 @@ if ${ac_cv_lib_blkid_blkid_get_cache+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lblkid $LIBBLKID $LIBS"
LIBS="-lblkid -luuid $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

6
configure.in
View File

@ -478,8 +478,7 @@ then
AC_CHECK_LIB(uuid, uuid_generate,
[LIBUUID=`$PKG_CONFIG --libs uuid`;
STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`],
[AC_MSG_ERROR([external uuid library not found])],
[$LIBUUID])
[AC_MSG_ERROR([external uuid library not found])])
UUID_CMT=#
AC_MSG_RESULT([Disabling private uuid library])
else
@ -530,8 +529,7 @@ then
AC_CHECK_LIB(blkid, blkid_get_cache,
[LIBBLKID=`$PKG_CONFIG --libs blkid`;
STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
[AC_MSG_ERROR([external blkid library not found])],
[$LIBBLKID])
[AC_MSG_ERROR([external blkid library not found])], -luuid)
BLKID_CMT=#
AC_MSG_RESULT([Disabling private blkid library])
else