Signed-off-by: Michael Jeanson <mjean...@efficios.com>
---
configure.ac | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/configure.ac b/configure.ac
index bf1ef6f2..fa0edc44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -217,15 +217,18 @@ AC_CHECK_LIB([rt], [clock_gettime, timer_create,
timer_settime, timer_delete])
AC_CHECK_LIB([dl], [dlopen], [
have_libdl=yes
libdl_name=dl
+ DL_LIBS="-ldl"
], [
# libdl not found, check for dlopen in libc.
AC_CHECK_LIB([c], [dlopen], [
have_libc_dl=yes
libdl_name=c
+ DL_LIBS="-lc"
], [
AC_MSG_ERROR([Cannot find dlopen in libdl nor libc. Use
[LDFLAGS]=-Ldir to specify their location.])
])
])
+AC_SUBST(DL_LIBS)
# Check if libdl has dlmopen support.
AH_TEMPLATE([HAVE_DLMOPEN], ["Define to 1 if dlmopen is available."])
@@ -570,20 +573,6 @@ AS_IF([test "x$with_lttng_ust" = "xyes"],
AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$with_lttng_ust" = "xyes"])
-
-# check for dlopen
-AC_CHECK_LIB([dl], [dlopen],
- [DL_LIBS="-ldl"],
- [
- #libdl not found, check for dlopen in libc.
- AC_CHECK_LIB([c], [dlopen],
- [DL_LIBS="-lc"],
- [AC_MSG_FAILURE([Cannot find dlopen in libdl nor libc. Use
[LDFLAGS]=-Ldir to specify their location.])]
- )
- ]
-)
-AC_SUBST(DL_LIBS)
-
# Check for fmemopen
AC_CHECK_LIB([c], [fmemopen],
[
--
2.17.1
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
