From: Daniel Jacobowitz <drow@false.org>
Date: Tue, 23 Oct 2007 12:36:50 +0000 (+0000)
Subject: 	PR gdb/2336
X-Git-Tag: gdb_6_7_1-2007-10-29-release~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f3d89a40b1bb45f25d4b7da78b8fdd4b73c8a24;p=thirdparty%2Fbinutils-gdb.git

	PR gdb/2336
	* Makefile.def (dependencies): Make configure-gdb depend on
	all-intl.
	* Makefile.in: Regenerated.

	* configure.ac: Modify $LIBINTL before the BFD check.
	* configure: Regenerated.
---

diff --git a/ChangeLog b/ChangeLog
index 023e146eddb..92d238f21b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-23  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.def (dependencies): Make configure-gdb depend on
+	all-intl.
+	* Makefile.in: Regenerated.
+
 2007-09-15  Alan Modra  <amodra@bigpond.net.au>
 
 	* configure.ac: Correct makeinfo version check.
diff --git a/Makefile.def b/Makefile.def
index 3d9a95d6176..bb8ded3359e 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -316,10 +316,9 @@ dependencies = { module=all-gnattools; on=all-target-libada; };
 dependencies = { module=configure-mpfr; on=all-gmp; };
 
 // Host modules specific to gdb.
-dependencies = { module=configure-gdb; on=configure-intl; };
+dependencies = { module=configure-gdb; on=all-intl; };
 dependencies = { module=configure-gdb; on=configure-sim; };
 dependencies = { module=configure-gdb; on=all-bfd; };
-dependencies = { module=all-gdb; on=all-intl; };
 dependencies = { module=all-gdb; on=all-libiberty; };
 dependencies = { module=all-gdb; on=all-opcodes; };
 dependencies = { module=all-gdb; on=all-readline; };
diff --git a/Makefile.in b/Makefile.in
index 80b2474686a..310a78c4fc5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -51488,10 +51488,9 @@ configure-stageb3g2-mpfr: maybe-all-stageb3g2-gmp
 configure-stage4-mpfr: maybe-all-stage4-gmp
 configure-stageprofile-mpfr: maybe-all-stageprofile-gmp
 configure-stagefeedback-mpfr: maybe-all-stagefeedback-gmp
-configure-gdb: maybe-configure-intl
+configure-gdb: maybe-all-intl
 configure-gdb: maybe-configure-sim
 configure-gdb: maybe-all-bfd
-all-gdb: maybe-all-intl
 all-gdb: maybe-all-libiberty
 all-gdb: maybe-all-opcodes
 all-gdb: maybe-all-readline
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 25abd91a2d2..4f641804d39 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-23  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	PR gdb/2336
+	* configure.ac: Modify $LIBINTL before the BFD check.
+	* configure: Regenerated.
+
 2007-10-16  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* mi/mi-main.c (captured_mi_execute_command): Clear mi_error_message
diff --git a/gdb/configure b/gdb/configure
index de3f3c58a9f..7ec94f55633 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -21850,7 +21850,8 @@ OLD_LDFLAGS=$LDFLAGS
 OLD_LIBS=$LIBS
 CFLAGS="$CFLAGS -I${srcdir}/../include -I../bfd -I${srcdir}/../bfd"
 LDFLAGS="$LDFLAGS -L../bfd -L../libiberty"
-LIBS="$LIBS -lbfd -liberty $LIBINTL"
+intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
+LIBS="$LIBS -lbfd -liberty $intl"
 echo "$as_me:$LINENO: checking for ELF support in BFD" >&5
 echo $ECHO_N "checking for ELF support in BFD... $ECHO_C" >&6
 if test "${gdb_cv_var_elf+set}" = set; then
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 08f133260cd..e4008d2b0c5 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1291,7 +1291,8 @@ OLD_LDFLAGS=$LDFLAGS
 OLD_LIBS=$LIBS
 CFLAGS="$CFLAGS -I${srcdir}/../include -I../bfd -I${srcdir}/../bfd"
 LDFLAGS="$LDFLAGS -L../bfd -L../libiberty"
-LIBS="$LIBS -lbfd -liberty $LIBINTL"
+intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'`
+LIBS="$LIBS -lbfd -liberty $intl"
 AC_CACHE_CHECK([for ELF support in BFD], gdb_cv_var_elf,
 [AC_TRY_LINK(
 [#include <stdlib.h>