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 c134c13cbbfad983374d580a6a9b5a51a14b3469..809686646adbead808ea9fbbe41527d48e098e8c 100644 (file)
--- 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-10-15  Patrick Mansfield <patmans@us.ibm.com>
 
        * Makefile.def: To avoid problems running with parallel makes,

diff --git a/Makefile.def b/Makefile.def
index a1a07d75b5b641ca84585bc2df1e2e65ffc3d8ba..85463fbe4b8d92796bbbba383bab81af4ea4b4d5 100644 (file)
--- 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 69e14dbb9c54c7c53d282ec203c02ff905bc02ed..21b83628ae2035c619e326183ce93b2366fddbf3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -51499,10 +51499,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 c26f3f8a15078e0687101f2d24fc5f4b503206a8..6a041d794acd7f4a1082ac017a0a5a83583cc1ca 100644 (file)
--- 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-23  Joel Brobecker  <brobecker@adacore.com>
 
        * buildsym.c (free_pending_blocks): Remove commented-out code.

diff --git a/gdb/configure b/gdb/configure
index dccc23375155011376f06bde7456157248c697e8..4e16b61d245d3588b6819d68da501361354cf33b 100755 (executable)
--- a/gdb/configure
+++ b/gdb/configure
@@ -21913,7 +21913,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 d42d3fe9996aa942c034c42d482d3ef7ae1a48f4..aa8113453b03b6dc5dfb639bebeb05068118bb8f 100644 (file)
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1301,7 +1301,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>