osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

On some platforms, to get dladdr() you need to link with -ldl. First 

try it without -ldl (in case the OS doesn't have it - not a good idea,
as it complicates the build process for cross-platform tools that might
require it on other platforms, but "not a good idea" never stopped UN*X
vendors in the past) and, if that fails, try it with -ldl.

svn path=/trunk/; revision=51309
This commit is contained in:
Guy Harris 2013-08-12 09:09:32 +00:00
parent f568d56df2
commit 70523b5014
2 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
acinclude.m4
View File

@ -637,6 +637,42 @@ AC_DEFUN([AC_WIRESHARK_PCAP_REMOTE_CHECK],
LIBS="$ac_save_LIBS"
])
#
# AC_WIRESHARK_CHECK_DLADDR
#
AC_DEFUN([AC_WIRESHARK_CHECK_DLADDR],
[
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$GLIB_LIBS $LIBS $1"
AC_TRY_RUN(
[
#define _GNU_SOURCE /* required on Linux, sigh */
#include <dlfcn.h>
int
main(void)
{
Dl_info info;
if (!dladdr((void *)main, &info))
return 1; /* failure */
return 0; /* assume success */
}
],
ac_cv_dladdr_finds_executable_path=yes,
ac_cv_dladdr_finds_executable_path=no,
[echo $ac_n "cross compiling; assumed OK... $ac_c"
ac_cv_dladdr_finds_executable_path=yes])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
if test x$ac_cv_dladdr_finds_executable_path = xyes
then
AC_DEFINE(DLADDR_FINDS_EXECUTABLE_PATH, 1, [Define if dladdr can be used to find the path of the executable])
fi
])
#
# AC_WIRESHARK_ZLIB_CHECK
#

31
configure.ac
View File

@ -1581,31 +1581,14 @@ fi
if test "$ac_cv_header_dlfcn_h" = "yes"
then
AC_MSG_CHECKING(whether dladdr can be used to find the pathname of an executable)
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$GLIB_LIBS $LIBS"
AC_TRY_RUN([
#define _GNU_SOURCE /* required on Linux, sigh */
#include <dlfcn.h>
int
main(void)
{
Dl_info info;
if (!dladdr((void *)main, &info))
return 1; /* failure */
return 0; /* assume success */
}
], ac_cv_dladdr_finds_executable_path=yes, ac_cv_dladdr_finds_executable_path=no,
[echo $ac_n "cross compiling; assumed OK... $ac_c"
ac_cv_dladdr_finds_executable_path=yes])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
if test x$ac_cv_dladdr_finds_executable_path = xyes
AC_WIRESHARK_CHECK_DLADDR
if test x$ac_cv_dladdr_finds_executable_path = xno
then
AC_DEFINE(DLADDR_FINDS_EXECUTABLE_PATH, 1, [Define if dladdr can be used to find the path of the executable])
#
# OK, try it with -ldl, in case you need that to get
# dladdr().
#
AC_WIRESHARK_CHECK_DLADDR(-ldl)
fi
AC_MSG_RESULT($ac_cv_dladdr_finds_executable_path)
fi