aboutsummaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2010-09-24 22:40:21 -0400
committerTheodore Ts'o <tytso@mit.edu>2010-09-24 22:40:21 -0400
commit9d92a201deec7bbb1911e6e5ee98abf3c83882d4 (patch)
treed5ee9d5e7d638a2bcf1037363a6109cdfbc61421 /configure.in
parentccc7cf032852dd5c84b227bafb481b1d158e2b5e (diff)
parent73fbe2323af6a2b4d807c80069657bf1449b3bff (diff)
downloade2fsprogs-9d92a201deec7bbb1911e6e5ee98abf3c83882d4.tar.gz
e2fsprogs-9d92a201deec7bbb1911e6e5ee98abf3c83882d4.tar.xz
e2fsprogs-9d92a201deec7bbb1911e6e5ee98abf3c83882d4.zip
Merge branch 'maint' into next
Conflicts: configure configure.in lib/ext2fs/ext2fs.h misc/mke2fs.c
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 4ea7bcd0..5e676881 100644
--- a/configure.in
+++ b/configure.in
@@ -853,7 +853,7 @@ 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_topology)
+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_topology mbstowcs)
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