aboutsummaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2009-10-04 20:40:46 -0400
committerTheodore Ts'o <tytso@mit.edu>2009-10-04 20:40:46 -0400
commit95bcea9fc149e349865f9eb30988ad1b4e1c1342 (patch)
tree94c66672b4ac19fbcc97e9c7ea5d13f8d6c2c44e /configure.in
parent048786d7e87a6de698936b0cf25f1ab70d5c15bc (diff)
parent695706ca214d9d04666ee46a48f63f6127154a23 (diff)
downloade2fsprogs-95bcea9fc149e349865f9eb30988ad1b4e1c1342.tar.gz
e2fsprogs-95bcea9fc149e349865f9eb30988ad1b4e1c1342.tar.xz
e2fsprogs-95bcea9fc149e349865f9eb30988ad1b4e1c1342.zip
Merge branch 'maint' into next
Conflicts: configure configure.in misc/mke2fs.c
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in9
1 files changed, 8 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 4bb5b087..c278d83a 100644
--- a/configure.in
+++ b/configure.in
@@ -802,7 +802,14 @@ AC_CHECK_MEMBER(struct sockaddr.sa_len,
[#include <sys/types.h>
#include <sys/socket.h>])
dnl
-AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate)
+dnl This will add -lblkid to the AC_CHECK_FUNCS search if we are using
+dnl the system-provided blkid library
+dnl
+if test -n "$BLKID_CMT"; then
+ AC_SEARCH_LIBS([blkid_probe_all], [blkid])
+fi
+dnl
+AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate blkid_probe_get_topology2)
dnl
dnl Check to see if -lsocket is required (solaris) to make something
dnl that uses socket() to compile; this is needed for the UUID library