X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=configure.in;h=5f08abc3b00960473f7b6165f026504c637227cd;hb=0de7092708f09b5bfcdc10fcf74b7413e0292827;hp=4f7e6132250900abf3883a08ebe00a1861069bb7;hpb=51050544b5bf5d4a39b5ea06e8c808df0c7b267c;p=tools%2Fe2fsprogs.git

diff --git a/configure.in b/configure.in
index 4f7e613..5f08abc 100644
--- a/configure.in
+++ b/configure.in
@@ -124,7 +124,6 @@ then
 else
     AC_MSG_RESULT([[(none)]])
 fi
-AC_USE_SYSTEM_EXTENSIONS
 dnl
 dnl Set default values for library extentions.  Will be dealt with after
 dnl parsing configuration opions, which may modify these
@@ -478,8 +477,8 @@ 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])])
+	PROFILED_LIBUUID=$LIBUUID
 	UUID_CMT=#
 	AC_MSG_RESULT([Disabling private uuid library])
 else
@@ -530,9 +529,9 @@ 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=#
+	PROFILED_LIBBLKID=$LIBBLKID
 	AC_MSG_RESULT([Disabling private blkid library])
 else
 	LIBBLKID='$(LIB)/libblkid'$LIB_EXT
@@ -785,8 +784,14 @@ else
 fi]
 ,
 AC_DEFINE(USE_UUIDD, 1)
-UUIDD_CMT=""
-AC_MSG_RESULT([Building uuidd by default])
+if test -z "$UUID_CMT"
+then
+	UUIDD_CMT=""
+	AC_MSG_RESULT([Building uuidd by default])
+else
+	UUIDD_CMT="#"
+	AC_MSG_RESULT([Disabling uuidd by default])
+fi
 )
 AC_SUBST(UUIDD_CMT)
 dnl
@@ -1061,10 +1066,15 @@ AC_CHECK_FUNCS(m4_flatten([
 	posix_fadvise64
 	posix_memalign
 	prctl
+	pread
+	pwrite
+	pread64
+	pwrite64
 	secure_getenv
 	setmntent
 	setresgid
 	setresuid
+	snprintf
 	srandom
 	stpcpy
 	strcasecmp
@@ -1076,6 +1086,7 @@ AC_CHECK_FUNCS(m4_flatten([
 	sysconf
 	usleep
 	utime
+	utimes
 	valloc
 ]))
 dnl
@@ -1296,15 +1307,13 @@ if test -n "$WITH_DIET_LIBC" ; then
 	INCLUDES="$INCLUDES -D_REENTRANT"
 fi
 AC_SUBST(INCLUDES)
+AM_MKINSTALLDIRS
 dnl
 dnl Build CFLAGS
 dnl
 if test $cross_compiling = no; then
    BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
    BUILD_LDFLAGS="$LDFLAGS"
-else
-   BUILD_CFLAGS=
-   BUILD_LDFLAGS=
 fi
 AC_SUBST(BUILD_CFLAGS)
 AC_SUBST(BUILD_LDFLAGS)