aboutsummaryrefslogtreecommitdiff
path: root/gdb/configure.ac
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2013-01-02 14:54:17 +0000
committerTom Tromey <tromey@redhat.com>2013-01-02 14:54:17 +0000
commitdef63ff00a1e687b2463b4ec6ce249722223242e (patch)
treeb4e99cefbe56617fb61a34f208126991ab33b0d0 /gdb/configure.ac
parent517bb291f28f940b186e9dc899eb621f71839e82 (diff)
downloadgdb-def63ff00a1e687b2463b4ec6ce249722223242e.zip
gdb-def63ff00a1e687b2463b4ec6ce249722223242e.tar.gz
gdb-def63ff00a1e687b2463b4ec6ce249722223242e.tar.bz2
* acinclude.m4 (GDB_AC_CHECK_BFD): New macro.
* configure.ac: Use GDB_AC_CHECK_BFD. * configure: Rebuild.
Diffstat (limited to 'gdb/configure.ac')
-rw-r--r--gdb/configure.ac29
1 files changed, 3 insertions, 26 deletions
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 385f55c..a27bc92 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -2015,40 +2015,17 @@ esac
AC_SUBST(WIN32LIBS)
# Add ELF support to GDB, but only if BFD includes ELF support.
-OLD_CFLAGS=$CFLAGS
-OLD_LDFLAGS=$LDFLAGS
-OLD_LIBS=$LIBS
-# Put the old CFLAGS/LDFLAGS last, in case the user's (C|LD)FLAGS
-# points somewhere with bfd, with -I/foo/lib and -L/foo/lib. We
-# always want our bfd.
-CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS"
-LDFLAGS="-L../bfd -L../libiberty $LDFLAGS"
-intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
-# -ldl is provided by bfd/Makfile.am (LIBDL) <PLUGINS>.
-if test "$plugins" = "yes"; then
- LIBS="-ldl $LIBS"
-fi
-LIBS="-lbfd -liberty $intl $LIBS"
-AC_CACHE_CHECK([for ELF support in BFD], gdb_cv_var_elf,
-[AC_TRY_LINK(
-[#include <stdlib.h>
-#include "bfd.h"
-#include "elf-bfd.h"
-],
-[bfd *abfd = NULL; bfd_get_elf_phdr_upper_bound (abfd); ],
-gdb_cv_var_elf=yes, gdb_cv_var_elf=no)])
+GDB_AC_CHECK_BFD([for ELF support in BFD], gdb_cv_var_elf,
+ [bfd_get_elf_phdr_upper_bound (NULL)], elf-bfd.h)
if test $gdb_cv_var_elf = yes; then
CONFIG_OBS="$CONFIG_OBS elfread.o stap-probe.o"
AC_DEFINE(HAVE_ELF, 1,
[Define if ELF support should be included.])
# -ldl is provided by bfd/Makfile.am (LIBDL) <PLUGINS>.
if test "$plugins" = "yes"; then
- OLD_LIBS="-ldl $OLD_LIBS"
+ LIBS="-ldl $LIBS"
fi
fi
-CFLAGS=$OLD_CFLAGS
-LDFLAGS=$OLD_LDFLAGS
-LIBS=$OLD_LIBS
# Add any host-specific objects to GDB.
CONFIG_OBS="${CONFIG_OBS} ${gdb_host_obs}"