diff options
author | mkuvyrkov <mkuvyrkov> | 2010-02-23 19:16:16 +0000 |
---|---|---|
committer | mkuvyrkov <mkuvyrkov> | 2010-02-23 19:16:16 +0000 |
commit | dec1ff82828c0b4204098cca0098f57fbeb798a0 (patch) | |
tree | 18ffb3201e79d70a60ba6bc20c8914ac0fb0d6f9 /gdb/gdbserver/configure | |
parent | 467de4645f4a796e272b2177b371fc746c50d5f2 (diff) | |
download | gdb-dec1ff82828c0b4204098cca0098f57fbeb798a0.tar.gz |
* configure.ac: Check for libdl. If it is not available link against
static libthread_db.
* configure: Regenerate.
Diffstat (limited to 'gdb/gdbserver/configure')
-rwxr-xr-x | gdb/gdbserver/configure | 71 |
1 files changed, 63 insertions, 8 deletions
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index 47bd81a1c40..79470f2587f 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -4286,15 +4286,64 @@ $as_echo "$bfd_cv_have_sys_procfs_type_elf_fpregset_t" >&6; } fi +old_LIBS="$LIBS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBDL 1 +_ACEOF + + LIBS="-ldl $LIBS" + +fi + +LIBS="$old_LIBS" + srv_thread_depfiles= srv_libs= USE_THREAD_DB= if test "$srv_linux_thread_db" = "yes"; then - srv_libs="-ldl" - old_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -rdynamic" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "$ac_cv_lib_dl_dlopen" = "yes"; then + srv_libs="-ldl" + old_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -rdynamic" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4313,7 +4362,10 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$old_LDFLAGS" + LDFLAGS="$old_LDFLAGS" + else + srv_libs="-lthread_db" + fi srv_thread_depfiles="thread-db.o proc-service.o" USE_THREAD_DB="-DUSE_THREAD_DB" @@ -4353,14 +4405,17 @@ fi # Check whether --with-libthread-db was given. if test "${with_libthread_db+set}" = set; then : withval=$with_libthread_db; srv_libthread_db_path="${withval}" - -$as_echo "#define USE_LIBTHREAD_DB_DIRECTLY 1" >>confdefs.h - srv_libs="$srv_libthread_db_path" fi +if test "$srv_libs" != "" -a "$srv_libs" != "-ldl"; then + +$as_echo "#define USE_LIBTHREAD_DB_DIRECTLY 1" >>confdefs.h + +fi + if test "$srv_xmlfiles" != ""; then srv_xmlbuiltin="xml-builtin.o" |