From 2f40bdfab133efafb1d6ca4e5237fe359d3e4211 Mon Sep 17 00:00:00 2001
From: jkratoch <jkratoch>
Date: Fri, 5 Nov 2010 01:50:17 +0000
Subject: [PATCH] gdb/ 	Fix configure --enable-plugins --without-python. 
 * configure.ac (for ELF support in BFD) <"$plugins" = "yes">: New. 	*
 configure: Regenerate.

---
 gdb/ChangeLog    | 6 ++++++
 gdb/configure    | 8 ++++++++
 gdb/configure.ac | 8 ++++++++
 3 files changed, 22 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index af9fe6cb74..9ea16e95ce 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 2010-11-05  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
+	Fix configure --enable-plugins --without-python.
+	* configure.ac (for ELF support in BFD) <"$plugins" = "yes">: New.
+	* configure: Regenerate.
+
+2010-11-05  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
 	* solib.c (solib_read_symbols): Call exception_fprintf even without
 	FROM_TTY.  Print also so->so_name.
 
diff --git a/gdb/configure b/gdb/configure
index dd3d04cf93..6d920c6fc3 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -14937,6 +14937,10 @@ OLD_LIBS=$LIBS
 CFLAGS="$CFLAGS -I${srcdir}/../include -I../bfd -I${srcdir}/../bfd"
 LDFLAGS="$LDFLAGS -L../bfd -L../libiberty"
 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"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF support in BFD" >&5
 $as_echo_n "checking for ELF support in BFD... " >&6; }
@@ -14972,6 +14976,10 @@ if test $gdb_cv_var_elf = yes; then
 
 $as_echo "#define HAVE_ELF 1" >>confdefs.h
 
+  # -ldl is provided by bfd/Makfile.am (LIBDL) <PLUGINS>.
+  if test "$plugins" = "yes"; then
+    OLD_LIBS="-ldl $OLD_LIBS"
+  fi
 fi
 CFLAGS=$OLD_CFLAGS
 LDFLAGS=$OLD_LDFLAGS
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 1f00c924be..a16c87cc0b 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1838,6 +1838,10 @@ OLD_LIBS=$LIBS
 CFLAGS="$CFLAGS -I${srcdir}/../include -I../bfd -I${srcdir}/../bfd"
 LDFLAGS="$LDFLAGS -L../bfd -L../libiberty"
 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(
@@ -1851,6 +1855,10 @@ if test $gdb_cv_var_elf = yes; then
   CONFIG_OBS="$CONFIG_OBS elfread.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"
+  fi
 fi
 CFLAGS=$OLD_CFLAGS
 LDFLAGS=$OLD_LDFLAGS
-- 
2.11.0