summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorBrian Aker <brian@tangent.org>2012-12-05 01:20:14 -0500
committerBrian Aker <brian@tangent.org>2012-12-05 01:20:14 -0500
commit1be40ecaa30f7560280d9c2dc708de3aee20a198 (patch)
treeeb7aef2fb3954af9fbc34a46d8123a89d840d40e /configure.ac
parent73979f31a4a1e1a885c75791942176542d7efd49 (diff)
parent37c91080586edd50cc18f67600332cefe5e3aab0 (diff)
downloadlibmemcached-1be40ecaa30f7560280d9c2dc708de3aee20a198.tar.gz
Merge trunk.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac11
1 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 7ba72125..5c166a11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,12 +218,13 @@ AC_CHECK_LIB([rt],[clock_gettime],
AC_DEFINE([HAVE_CLOCK_GETTIME],[1],[Have clock_gettime])],
[AC_DEFINE([HAVE_CLOCK_GETTIME],[0],[Have clock_gettime])])
-# Check for the ability to call dlopen
+# Check for the ability to call dlopen (used in libhostile)
AS_IF([test "x$enable_shared" = xyes],
- [AC_CHECK_LIB([dl],[dlopen],
- [AC_SUBST([DL_LIB],[-ldl])
- AC_DEFINE([HAVE_LIBDL],[1],[Have dlopen])])],
- [AC_DEFINE([HAVE_LIBDL],[0],[Have dlopen])])
+ [AX_CHECK_LIBRARY([DL],[dlfcn.h],[dl],
+ [AC_DEFINE([HAVE_LIBDL],[1],[Have dlopen])
+ AC_CHECK_LIB([dl],[dlopen],[AC_DEFINE([HAVE_DLOPEN],[1],[Have dlopen])])
+ AC_CHECK_LIB([dl],[dladdr],[AC_DEFINE([HAVE_DLADDR],[1],[Have dladdr])])])
+ ])
AC_CHECK_HEADERS([atomic.h])
AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],