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 c134c13..8096866 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 a1a07d7..85463fb 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 69e14db..21b8362 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 c26f3f8..6a041d7 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 dccc233..4e16b61 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 d42d3fe..aa81134 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>