aboutsummaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2010-01-30 21:22:17 -0500
committerTheodore Ts'o <tytso@mit.edu>2010-01-31 18:49:08 -0500
commit2d07b3ad98bfe1db5fb1071f53a5338ab6c35522 (patch)
tree5569434a7e4a85b015c6ad0e3933ea09ae42f8a4 /configure.in
parent2884320016e633d987203c0286a9dbf9e62a3fd4 (diff)
parentc70674387ee0c038bca16098f7869181beeabe0a (diff)
downloade2fsprogs-2d07b3ad98bfe1db5fb1071f53a5338ab6c35522.tar.gz
e2fsprogs-2d07b3ad98bfe1db5fb1071f53a5338ab6c35522.tar.xz
e2fsprogs-2d07b3ad98bfe1db5fb1071f53a5338ab6c35522.zip
Merge branch 'maint' into next
Conflicts: configure lib/ext2fs/alloc_tables.c misc/mke2fs.c
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in16
1 files changed, 8 insertions, 8 deletions
diff --git a/configure.in b/configure.in
index cd2c246e..7b05f292 100644
--- a/configure.in
+++ b/configure.in
@@ -63,6 +63,14 @@ AC_SUBST(E2FSPROGS_VERSION)
AC_SUBST(E2FSPROGS_PKGVER)
AC_CANONICAL_HOST
dnl
+dnl Check to see if libdl exists for the sake of dlopen
+dnl
+DLOPEN_LIB=''
+AC_CHECK_LIB(dl, dlopen,
+[DLOPEN_LIB=-ldl
+AC_DEFINE(HAVE_DLOPEN)])
+AC_SUBST(DLOPEN_LIB)
+dnl
dnl Use diet libc
dnl
WITH_DIET_LIBC=
@@ -818,14 +826,6 @@ SOCKET_LIB=''
AC_CHECK_LIB(socket, socket, [SOCKET_LIB=-lsocket])
AC_SUBST(SOCKET_LIB)
dnl
-dnl Check to see if libdl exists for the sake of dlopen
-dnl
-DLOPEN_LIB=''
-AC_CHECK_LIB(dl, dlopen,
-[DLOPEN_LIB=-ldl
-AC_DEFINE(HAVE_DLOPEN)])
-AC_SUBST(DLOPEN_LIB)
-dnl
dnl See if optreset exists
dnl
AC_MSG_CHECKING(for optreset)