[Asterisk-code-review] BuildSystem: Enable dladdr on non-Linux platforms like FreeBSD. (asterisk[13])

George Joseph asteriskteam at digium.com
Mon Mar 19 11:13:21 CDT 2018


George Joseph has submitted this change and it was merged. ( https://gerrit.asterisk.org/8490 )

Change subject: BuildSystem: Enable dladdr on non-Linux platforms like FreeBSD.
......................................................................

BuildSystem: Enable dladdr on non-Linux platforms like FreeBSD.

ASTERISK-27641

Change-Id: I587e8ba0123c70fc10cfd8b0ac3299551f61d84b
---
M configure
M configure.ac
2 files changed, 52 insertions(+), 0 deletions(-)

Approvals:
  Corey Farrell: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit



diff --git a/configure b/configure
index 3442d57..f86b41b 100755
--- a/configure
+++ b/configure
@@ -19129,6 +19129,41 @@
     conftest$ac_exeext conftest.$ac_ext
 LIBS=${old_LIBS}
 
+# re-check without -ldl
+# Non-Linux platforms like FreeBSD and NetBSD do not need a library libdl.so.
+if test "${PBX_DLADDR}" = "0"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dladdr in dlfcn.h without -ldl" >&5
+$as_echo_n "checking for dladdr in dlfcn.h without -ldl... " >&6; }
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _GNU_SOURCE 1
+#include <dlfcn.h>
+int
+main ()
+{
+dladdr((void *)0, (void *)0)
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		PBX_DLADDR=1
+
+
+$as_echo "#define HAVE_DLADDR 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+
 # PKGCONFIG is used in later tests
 
 
diff --git a/configure.ac b/configure.ac
index d9148c0..a72022a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1405,6 +1405,23 @@
 )
 LIBS=${old_LIBS}
 
+# re-check without -ldl
+# Non-Linux platforms like FreeBSD and NetBSD do not need a library libdl.so.
+if test "${PBX_DLADDR}" = "0"; then
+	AC_MSG_CHECKING(for dladdr in dlfcn.h without -ldl)
+	AC_LINK_IFELSE(
+		[AC_LANG_PROGRAM([#define _GNU_SOURCE 1
+#include <dlfcn.h>],
+			[dladdr((void *)0, (void *)0)]
+		)],
+		AC_MSG_RESULT(yes)
+		PBX_DLADDR=1
+		AC_SUBST([PBX_DLADDR])
+		AC_DEFINE([HAVE_DLADDR], 1, [Define to 1 if your system has the dladdr() GNU extension]),
+		AC_MSG_RESULT(no)
+	)
+fi
+
 # PKGCONFIG is used in later tests
 PKG_PROG_PKG_CONFIG()
 

-- 
To view, visit https://gerrit.asterisk.org/8490
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-MessageType: merged
Gerrit-Change-Id: I587e8ba0123c70fc10cfd8b0ac3299551f61d84b
Gerrit-Change-Number: 8490
Gerrit-PatchSet: 1
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180319/02e0b24a/attachment.html>


More information about the asterisk-code-review mailing list