Revert "Remove LIBINTL_DEP"

This reverts commit e874cbd3879843a83e4bcc4b54cd7107387b1df6.
The patch was wrong.  LIBINTL_DEP is needed with an in-tree gettext.

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 54f6a5469682977d1027604739dfd6b644c2c23e..b3d97d478eacc03769bbbb73384cc0d039ec6792 100644 (file)
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -367,6 +367,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBINTL_DEP = @LIBINTL_DEP@
 LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@

diff --git a/bfd/configure b/bfd/configure
index d65a73f4a192ea40b7ef4ed2914fe0447bab2cea..6458974951eb026be53deb153b3536563a25ed98 100755 (executable)
--- a/bfd/configure
+++ b/bfd/configure
@@ -669,6 +669,7 @@ INSTOBJEXT
 DATADIRNAME
 CATALOGS
 INCINTL
+LIBINTL_DEP
 POSUB
 LTLIBINTL
 LIBINTL
@@ -11154,7 +11155,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11157 "configure"
+#line 11158 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11260,7 +11261,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11263 "configure"
+#line 11264 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14550,6 +14551,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
 if test x"$USE_NLS" != xyes; then

diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 4bc61918b4738014b1842d05425d8747afeb18c4..ad571b60546decd9485c21cb89211aa465374aed 100644 (file)
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -226,28 +226,30 @@ development.exp: $(BFDDIR)/development.sh
 installcheck-local:
        /bin/sh $(srcdir)/sanity.sh $(bindir)
 
-# There's no global DEPENDENCIES.  So, we must explicitly list everything.
-size_DEPENDENCIES =      $(LIBIBERTY) $(BFDLIB)
-objdump_DEPENDENCIES =   $(LIBIBERTY) $(BFDLIB) $(OPCODES) $(LIBCTF) $(OBJDUMP_PRIVATE_OFILES) $(LIBSFRAME)
-nm_new_DEPENDENCIES =    $(LIBIBERTY) $(BFDLIB)
-ar_DEPENDENCIES =        $(LIBIBERTY) $(BFDLIB)
-strings_DEPENDENCIES =   $(LIBIBERTY) $(BFDLIB)
-strip_new_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-ranlib_DEPENDENCIES =    $(LIBIBERTY) $(BFDLIB)
-cxxfilt_DEPENDENCIES =   $(LIBIBERTY) $(BFDLIB)
-objcopy_DEPENDENCIES =   $(LIBIBERTY) $(BFDLIB)
-srconv_DEPENDENCIES =    $(LIBIBERTY) $(BFDLIB)
-sysdump_DEPENDENCIES =   $(LIBIBERTY) $(BFDLIB)
-coffdump_DEPENDENCIES =  $(LIBIBERTY) $(BFDLIB)
-dlltool_DEPENDENCIES =   $(LIBIBERTY) $(BFDLIB)
-windres_DEPENDENCIES =   $(LIBIBERTY) $(BFDLIB)
-windmc_DEPENDENCIES =    $(LIBIBERTY) $(BFDLIB)
-addr2line_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-readelf_DEPENDENCIES =   $(LIBIBERTY) $(LIBCTF_NOBFD) $(LIBSFRAME)
-elfedit_DEPENDENCIES =   $(LIBIBERTY)
-dllwrap_DEPENDENCIES =   $(LIBIBERTY)
-bfdtest1_DEPENDENCIES =  $(LIBIBERTY) $(BFDLIB)
-bfdtest2_DEPENDENCIES =  $(LIBIBERTY) $(BFDLIB)
+# There's no global DEPENDENCIES.  So, we must explicitly list everything
+# which depends on libintl, since we don't know whether LIBINTL_DEP will be
+# non-empty until configure time.  Ugh!
+size_DEPENDENCIES =      $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+objdump_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) $(OPCODES) $(LIBCTF) $(OBJDUMP_PRIVATE_OFILES) $(LIBSFRAME)
+nm_new_DEPENDENCIES =    $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+ar_DEPENDENCIES =        $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+strings_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+strip_new_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+ranlib_DEPENDENCIES =    $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+cxxfilt_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+objcopy_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+srconv_DEPENDENCIES =    $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+sysdump_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+coffdump_DEPENDENCIES =  $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+dlltool_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+windres_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+windmc_DEPENDENCIES =    $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+addr2line_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+readelf_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY) $(LIBCTF_NOBFD) $(LIBSFRAME)
+elfedit_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY)
+dllwrap_DEPENDENCIES =   $(LIBINTL_DEP) $(LIBIBERTY)
+bfdtest1_DEPENDENCIES =  $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+bfdtest2_DEPENDENCIES =  $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
 
 LDADD = $(BFDLIB) $(LIBIBERTY) $(LIBINTL)
 

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 2b8961acf57abf9e19736398b0e1e2b33dd813db..67fa5b3b8d9bac57551bdc224a8b2df3aef1a172 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -528,6 +528,7 @@ LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBINTL_DEP = @LIBINTL_DEP@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -766,28 +767,30 @@ CC_FOR_TARGET = ` \
   fi`
 
 
-# There's no global DEPENDENCIES.  So, we must explicitly list everything.
-size_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-objdump_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB) $(OPCODES) $(LIBCTF) $(OBJDUMP_PRIVATE_OFILES) $(LIBSFRAME)
-nm_new_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-ar_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-strings_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-strip_new_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-ranlib_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-cxxfilt_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-objcopy_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-srconv_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-sysdump_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-coffdump_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-dlltool_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-windres_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-windmc_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-addr2line_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-readelf_DEPENDENCIES = $(LIBIBERTY) $(LIBCTF_NOBFD) $(LIBSFRAME)
-elfedit_DEPENDENCIES = $(LIBIBERTY)
-dllwrap_DEPENDENCIES = $(LIBIBERTY)
-bfdtest1_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
-bfdtest2_DEPENDENCIES = $(LIBIBERTY) $(BFDLIB)
+# There's no global DEPENDENCIES.  So, we must explicitly list everything
+# which depends on libintl, since we don't know whether LIBINTL_DEP will be
+# non-empty until configure time.  Ugh!
+size_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+objdump_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) $(OPCODES) $(LIBCTF) $(OBJDUMP_PRIVATE_OFILES) $(LIBSFRAME)
+nm_new_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+ar_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+strings_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+strip_new_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+ranlib_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+cxxfilt_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+objcopy_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+srconv_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+sysdump_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+coffdump_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+dlltool_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+windres_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+windmc_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+addr2line_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+readelf_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(LIBCTF_NOBFD) $(LIBSFRAME)
+elfedit_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY)
+dllwrap_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY)
+bfdtest1_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
+bfdtest2_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB)
 LDADD = $(BFDLIB) $(LIBIBERTY) $(LIBINTL)
 size_SOURCES = size.c $(BULIBS)
 objcopy_SOURCES = objcopy.c not-strip.c rename.c $(WRITE_DEBUG_SRCS) $(BULIBS)

diff --git a/binutils/configure b/binutils/configure
index 3d72573ca91739212db7fd22c8c4a97e1d68e6b0..c948b85abd784ea4392dafa442c6b71b7debacd2 100755 (executable)
--- a/binutils/configure
+++ b/binutils/configure
@@ -668,6 +668,7 @@ INSTOBJEXT
 DATADIRNAME
 CATALOGS
 INCINTL
+LIBINTL_DEP
 POSUB
 LTLIBINTL
 LIBINTL
@@ -11080,7 +11081,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11083 "configure"
+#line 11084 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11186,7 +11187,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11189 "configure"
+#line 11190 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14614,6 +14615,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
 if test x"$USE_NLS" != xyes; then

diff --git a/config/gettext-sister.m4 b/config/gettext-sister.m4
index 960bf873c9362078609f33fd8546b54e64f1f80d..5bb385fd0def09f0d875052792e3f70787bb927f 100644 (file)
--- a/config/gettext-sister.m4
+++ b/config/gettext-sister.m4
@@ -28,6 +28,7 @@ m4_popdef([gettext_builddir])
 
 AC_SUBST([USE_NLS])
 AC_SUBST([LIBINTL])
+AC_SUBST([LIBINTL_DEP])
 AC_SUBST([INCINTL])
 AC_SUBST([XGETTEXT])
 AC_SUBST([GMSGFMT])

diff --git a/gas/Makefile.am b/gas/Makefile.am
index e8c4202d4547cc09a2b224caa526aa73013cb2c0..b9b9e18be036096c8af331f7bef6f9581404b02e 100644 (file)
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -422,7 +422,7 @@ as_new_SOURCES = $(GAS_CFILES)
 as_new_LDADD = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
        $(extra_objects) $(GASLIBS) $(LIBINTL) $(LIBM) $(ZLIB) $(ZSTD_LIBS)
 as_new_DEPENDENCIES = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
-       $(extra_objects) $(GASLIBS)
+       $(extra_objects) $(GASLIBS) $(LIBINTL_DEP)
 EXTRA_as_new_SOURCES = $(CFILES) $(HFILES) $(TARGET_CPU_CFILES) \
        $(TARGET_CPU_HFILES) $(TARGET_EXTRA_FILES) $(TARG_ENV_CFILES) \
        $(OBJ_FORMAT_CFILES) $(OBJ_FORMAT_HFILES) \

diff --git a/gas/Makefile.in b/gas/Makefile.in
index 274704b5fb5f08e14cb4b8d963e960b01284e1d5..b57516369d721b394e68cf55d9e65b1677966ef8 100644 (file)
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -413,6 +413,7 @@ LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBINTL_DEP = @LIBINTL_DEP@
 LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -910,7 +911,7 @@ as_new_LDADD = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
        $(extra_objects) $(GASLIBS) $(LIBINTL) $(LIBM) $(ZLIB) $(ZSTD_LIBS)
 
 as_new_DEPENDENCIES = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
-       $(extra_objects) $(GASLIBS)
+       $(extra_objects) $(GASLIBS) $(LIBINTL_DEP)
 
 
 # The LoongArch lexical analyzer and parser.

diff --git a/gas/configure b/gas/configure
index 3942fcbf129fbad50a72669ab0dba9b1d4870209..0cebc4e0fa9e4b5eb385962f4e6593e8ca7d3dda 100755 (executable)
--- a/gas/configure
+++ b/gas/configure
@@ -653,6 +653,7 @@ INSTOBJEXT
 DATADIRNAME
 CATALOGS
 INCINTL
+LIBINTL_DEP
 POSUB
 LTLIBINTL
 LIBINTL
@@ -10774,7 +10775,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10777 "configure"
+#line 10778 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10880,7 +10881,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10883 "configure"
+#line 10884 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15137,6 +15138,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
 if test x"$USE_NLS" != xyes; then

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 0429a990b264ae1d897983c8aaad6fc6203c9a98..6f7f2af31e5c56c041dbbcf989428cff7af1779c 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -234,6 +234,7 @@ RDYNAMIC = @RDYNAMIC@
 
 # Where is the INTL library?  Typically in ../intl.
 INTL = @LIBINTL@
+INTL_DEPS = @LIBINTL_DEP@
 INTL_CFLAGS = @INCINTL@
 
 # Where is the ICONV library?  This will be empty if in libc or not available.
@@ -681,7 +682,7 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $(LIBCTF) $(BFD) $(ZLIB) $(ZSTD_LIBS) \
        $(GMPLIBS) $(SRCHIGH_LIBS) $(LIBXXHASH) $(PTHREAD_LIBS) \
        $(DEBUGINFOD_LIBS) $(LIBBABELTRACE_LIB)
 CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) $(CTF_DEPS) \
-       $(OPCODES) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) \
+       $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) \
        $(LIBSUPPORT)
 
 DIST = gdb

diff --git a/gdb/configure b/gdb/configure
index 86b25ace8811df76deffb3ccdef717225b754907..15ececfefa26a8cce2febce0d06a3e1ecbeb944a 100755 (executable)
--- a/gdb/configure
+++ b/gdb/configure
@@ -775,6 +775,7 @@ INSTOBJEXT
 DATADIRNAME
 CATALOGS
 INCINTL
+LIBINTL_DEP
 POSUB
 LTLIBINTL
 LIBINTL
@@ -11498,7 +11499,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11501 "configure"
+#line 11502 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11604,7 +11605,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11607 "configure"
+#line 11608 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -24506,6 +24507,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
 if test x"$USE_NLS" != xyes; then

diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
index 05a52f5d554dbb4d1d2f12962d896fe24ba4293b..6148ccf9121bf3df9f751a79009d7e42f5bd53c7 100644 (file)
--- a/gdbserver/Makefile.in
+++ b/gdbserver/Makefile.in
@@ -114,6 +114,7 @@ include $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc
 
 # Where is the INTL library?  Typically in ../intl.
 INTL = @LIBINTL@
+INTL_DEPS = @LIBINTL_DEP@
 INTL_CFLAGS = @INCINTL@
 
 INCSUPPORT = \
@@ -366,7 +367,7 @@ install-html:
 clean-info:
 
 gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY) \
-               $(GDBSUPPORT)
+               $(INTL_DEPS) $(GDBSUPPORT)
        $(SILENCE) rm -f gdbserver$(EXEEXT)
        $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
                $(CXXFLAGS) \
@@ -375,7 +376,7 @@ gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY) \
                $(GDBSERVER_LIBS) $(XM_CLIBS) $(WIN32APILIBS) $(MAYBE_LIBICONV)
 
 gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY) \
-               $(GDBSUPPORT)
+               $(INTL_DEPS) $(GDBSUPPORT)
        $(SILENCE) rm -f gdbreplay$(EXEEXT)
        $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
                $(CXXFLAGS) \

diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in
index b28e57efa36ee6c3aed5d24b046d37b4b00606da..ee709112aaed218f4d03409477621caa58a56a1a 100644 (file)
--- a/gdbsupport/Makefile.in
+++ b/gdbsupport/Makefile.in
@@ -291,6 +291,7 @@ LARGEFILE_CPPFLAGS = @LARGEFILE_CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBINTL_DEP = @LIBINTL_DEP@
 LIBIPT = @LIBIPT@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@

diff --git a/gdbsupport/configure b/gdbsupport/configure
index 56f182e7f1f67486218ce9704640d6d86714ad9d..19b19c42c6f39a2ae2dfca7e0823c16f162b9971 100755 (executable)
--- a/gdbsupport/configure
+++ b/gdbsupport/configure
@@ -650,6 +650,7 @@ INSTOBJEXT
 DATADIRNAME
 CATALOGS
 INCINTL
+LIBINTL_DEP
 POSUB
 LTLIBINTL
 LIBINTL
@@ -10357,6 +10358,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
 if test x"$USE_NLS" != xyes; then

diff --git a/gold/Makefile.am b/gold/Makefile.am
index ef307adcb942a9c8b3d6bbdd817f21391c29bb78..ddd6a007438cc94467c41f38f60b10fc049cd3c6 100644 (file)
--- a/gold/Makefile.am
+++ b/gold/Makefile.am
@@ -185,7 +185,7 @@ libgold_a_SOURCES = $(CCFILES) $(HFILES) $(YFILES) $(DEFFILES)
 libgold_a_LIBADD = $(LIBOBJS)
 
 sources_var = main.cc
-deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY)
+deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
 ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) \
         $(THREADLIBS) $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
 ldflags_var = $(GOLD_LDFLAGS)
@@ -198,12 +198,13 @@ ld_new_LDFLAGS = $(ldflags_var)
 EXTRA_ld_new_SOURCES = $(TARGETSOURCES)
 
 incremental_dump_SOURCES = incremental-dump.cc
-incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY)
+incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY) \
+       $(LIBINTL_DEP)
 incremental_dump_LDADD = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \
         $(THREADLIBS) $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
 
 dwp_SOURCES = dwp.cc
-dwp_DEPENDENCIES = libgold.a $(LIBIBERTY)
+dwp_DEPENDENCIES = libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
 dwp_LDADD = libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) $(THREADLIBS) \
        $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
 dwp_LDFLAGS = $(GOLD_LDFLAGS)

diff --git a/gold/Makefile.in b/gold/Makefile.in
index 996f5e036e03f9f27310899fb9560d8e234bda98..1e6b9c77fc1af4a233061e788ab295176c5f262c 100644 (file)
--- a/gold/Makefile.in
+++ b/gold/Makefile.in
@@ -569,6 +569,7 @@ LDFLAGS = @LDFLAGS@
 LFS_CFLAGS = @LFS_CFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBINTL_DEP = @LIBINTL_DEP@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
@@ -826,7 +827,7 @@ ALL_TARGETOBJS = \
 libgold_a_SOURCES = $(CCFILES) $(HFILES) $(YFILES) $(DEFFILES)
 libgold_a_LIBADD = $(LIBOBJS)
 sources_var = main.cc
-deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY)
+deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
 ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) \
         $(THREADLIBS) $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
 
@@ -837,12 +838,14 @@ ld_new_LDADD = $(ldadd_var)
 ld_new_LDFLAGS = $(ldflags_var)
 EXTRA_ld_new_SOURCES = $(TARGETSOURCES)
 incremental_dump_SOURCES = incremental-dump.cc
-incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY)
+incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY) \
+       $(LIBINTL_DEP)
+
 incremental_dump_LDADD = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \
         $(THREADLIBS) $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
 
 dwp_SOURCES = dwp.cc
-dwp_DEPENDENCIES = libgold.a $(LIBIBERTY)
+dwp_DEPENDENCIES = libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
 dwp_LDADD = libgold.a $(LIBIBERTY) $(GOLD_LDADD) $(LIBINTL) $(THREADLIBS) \
        $(LIBDL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
 

diff --git a/gold/configure b/gold/configure
index 66007ef7271250bf346bc879906710b3189e9423..a2674d6ecbb68b09e0c2418938d10118de8ccabf 100755 (executable)
--- a/gold/configure
+++ b/gold/configure
@@ -698,6 +698,7 @@ INSTOBJEXT
 DATADIRNAME
 CATALOGS
 INCINTL
+LIBINTL_DEP
 POSUB
 LTLIBINTL
 LIBINTL
@@ -8772,6 +8773,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
 if test x"$USE_NLS" != xyes; then

diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index 2fb2a539cb27549222afd2badecac598c3b79279..2f1348fd6e25edf73d8f59ea9e01134f5707f712 100644 (file)
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -118,7 +118,7 @@ check_LIBRARIES = libgoldtest.a
 libgoldtest_a_SOURCES = test.cc testmain.cc testfile.cc
 
 DEPENDENCIES = \
-       libgoldtest.a ../libgold.a ../../libiberty/libiberty.a
+       libgoldtest.a ../libgold.a ../../libiberty/libiberty.a $(LIBINTL_DEP)
 
 # The unittests themselves
 if NATIVE_OR_CROSS_LINKER

diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
index 1c7a4550bdebc7248191036d0beca665bcb4db08..9cf21df8d7dd5a0bb0a3b92dfa2496bc7dc883dd 100644 (file)
--- a/gold/testsuite/Makefile.in
+++ b/gold/testsuite/Makefile.in
@@ -2671,6 +2671,7 @@ LDFLAGS = @LDFLAGS@
 LFS_CFLAGS = @LFS_CFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBINTL_DEP = @LIBINTL_DEP@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
@@ -2903,7 +2904,7 @@ TESTS = $(check_SCRIPTS) $(check_PROGRAMS)
 check_LIBRARIES = libgoldtest.a
 libgoldtest_a_SOURCES = test.cc testmain.cc testfile.cc
 DEPENDENCIES = \
-       libgoldtest.a ../libgold.a ../../libiberty/libiberty.a
+       libgoldtest.a ../libgold.a ../../libiberty/libiberty.a $(LIBINTL_DEP)
 
 @NATIVE_OR_CROSS_LINKER_TRUE@object_unittest_SOURCES = object_unittest.cc
 @NATIVE_OR_CROSS_LINKER_TRUE@object_unittest_LDFLAGS = $(THREADFLAGS)

diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index 02c223668cca269913ec84e7ec671e62f300fd21..0b2b59915a916bb6d388b30d9122e68b99e4a4f0 100644 (file)
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -45,7 +45,7 @@ sources = basic_blocks.c call_graph.c cg_arcs.c cg_dfn.c \
        search_list.c symtab.c sym_ids.c utils.c \
        i386.c alpha.c vax.c sparc.c mips.c aarch64.c
 gprof_SOURCES = $(sources) flat_bl.c bsd_callg_bl.c fsf_callg_bl.c
-gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a
+gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a $(LIBINTL_DEP)
 gprof_LDADD = ../bfd/libbfd.la ../libiberty/libiberty.a $(LIBINTL)
 
 noinst_HEADERS = \

diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index 65b89c8fbe4a05dfe12e15c7f6b95f9f64befa55..a7398231030fe7983aa1126685a4edd3cb2bfd11 100644 (file)
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -352,6 +352,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBINTL_DEP = @LIBINTL_DEP@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -467,7 +468,7 @@ sources = basic_blocks.c call_graph.c cg_arcs.c cg_dfn.c \
        i386.c alpha.c vax.c sparc.c mips.c aarch64.c
 
 gprof_SOURCES = $(sources) flat_bl.c bsd_callg_bl.c fsf_callg_bl.c
-gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a
+gprof_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a $(LIBINTL_DEP)
 gprof_LDADD = ../bfd/libbfd.la ../libiberty/libiberty.a $(LIBINTL)
 noinst_HEADERS = \
        basic_blocks.h call_graph.h cg_arcs.h cg_dfn.h cg_print.h \

diff --git a/gprof/configure b/gprof/configure
index 297958d0ded8ac1384a241d7a49caf9d88914234..64f14fa0de798ec9a4e82e6b82333344f741e567 100755 (executable)
--- a/gprof/configure
+++ b/gprof/configure
@@ -649,6 +649,7 @@ INSTOBJEXT
 DATADIRNAME
 CATALOGS
 INCINTL
+LIBINTL_DEP
 POSUB
 LTLIBINTL
 LIBINTL
@@ -10652,7 +10653,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10655 "configure"
+#line 10656 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10758,7 +10759,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10761 "configure"
+#line 10762 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13310,6 +13311,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
 if test x"$USE_NLS" != xyes; then

diff --git a/ld/Makefile.am b/ld/Makefile.am
index d760f1344243c0ffdc904bde9d7fae539b8f8f20..6a9833e577598acdd4a8ae47f04410659f67b47b 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -658,7 +658,7 @@ ld_new_SOURCES = ldgram.y ldlex-wrapper.c lexsup.c ldlang.c mri.c ldctor.c ldmai
        ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c plugin.c \
        ldbuildid.c
 ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) \
-                     $(BFDLIB) $(LIBCTF) $(LIBIBERTY)
+                     $(BFDLIB) $(LIBCTF) $(LIBIBERTY) $(LIBINTL_DEP)
 ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBCTF) \
               $(LIBIBERTY) $(LIBINTL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)
 

diff --git a/ld/Makefile.in b/ld/Makefile.in
index e5495a03c2761c8e133c90983baa74abab4b6bb5..8639e782cdf9c086b9eaad7c6f722618a2f94896 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -425,6 +425,7 @@ LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBINTL_DEP = @LIBINTL_DEP@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -1035,7 +1036,7 @@ ld_new_SOURCES = ldgram.y ldlex-wrapper.c lexsup.c ldlang.c mri.c ldctor.c ldmai
        ldbuildid.c
 
 ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) \
-                     $(BFDLIB) $(LIBCTF) $(LIBIBERTY)
+                     $(BFDLIB) $(LIBCTF) $(LIBIBERTY) $(LIBINTL_DEP)
 
 ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBCTF) \
               $(LIBIBERTY) $(LIBINTL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS)

diff --git a/ld/configure b/ld/configure
index e98874f9b30721ad0423880076e9c7c2b77b5937..4e8de8404182e6c95afa3b24e1c15083e41cb6c2 100755 (executable)
--- a/ld/configure
+++ b/ld/configure
@@ -667,6 +667,7 @@ INSTOBJEXT
 DATADIRNAME
 CATALOGS
 INCINTL
+LIBINTL_DEP
 POSUB
 LTLIBINTL
 LIBINTL
@@ -11682,7 +11683,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11685 "configure"
+#line 11686 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11788,7 +11789,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11791 "configure"
+#line 11792 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18099,6 +18100,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
 if test x"$USE_NLS" != xyes; then

diff --git a/libctf/Makefile.in b/libctf/Makefile.in
index d0644fc6dde9d0b7d5db14ddf84ee3afa900ce1a..54f5daa79eeac030edb948b84fdbd08a827138c6 100644 (file)
--- a/libctf/Makefile.in
+++ b/libctf/Makefile.in
@@ -470,6 +470,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBINTL_DEP = @LIBINTL_DEP@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@

diff --git a/libctf/configure b/libctf/configure
index 027ba03ac7f9bb123d5292b7c0889a086d7a3a0c..7466d56a18bc22d70eaf593e8ec55745968246b6 100755 (executable)
--- a/libctf/configure
+++ b/libctf/configure
@@ -684,6 +684,7 @@ INSTOBJEXT
 DATADIRNAME
 CATALOGS
 INCINTL
+LIBINTL_DEP
 POSUB
 LTLIBINTL
 LIBINTL
@@ -7401,6 +7402,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
 if test x"$USE_NLS" != xyes; then
@@ -13594,7 +13596,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13597 "configure"
+#line 13599 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13700,7 +13702,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13703 "configure"
+#line 13705 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index a9dc6b4b68c3388e6882c1f85b27da27fe3510e7..57aaed26da8d941a7e8814df55771b694c51a076 100644 (file)
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -324,6 +324,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBINTL_DEP = @LIBINTL_DEP@
 LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@

diff --git a/opcodes/configure b/opcodes/configure
index d8ca0427f35f79d88a2be5d85f4a762f10d436f8..050fd5ff0fffc4ac75068871a0b764b9327c5390 100755 (executable)
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -656,6 +656,7 @@ INSTOBJEXT
 DATADIRNAME
 CATALOGS
 INCINTL
+LIBINTL_DEP
 POSUB
 LTLIBINTL
 LIBINTL
@@ -11089,7 +11090,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11092 "configure"
+#line 11093 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11195,7 +11196,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11198 "configure"
+#line 11199 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13645,6 +13646,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
 if test x"$USE_NLS" != xyes; then
@@ -14344,6 +14346,8 @@ else
   BUILD_LIBS=-liberty
   BUILD_LIB_DEPS=
 fi
+BUILD_LIBS="$BUILD_LIBS $LIBINTL"
+BUILD_LIB_DEPS="$BUILD_LIB_DEPS $LIBINTL_DEP"
 
 
 

diff --git a/opcodes/configure.ac b/opcodes/configure.ac
index 09e2f04f3c57eddbc5eb5b0b7265535c093c6d5a..4d918e3ef9bd567a1d9dd7da97717c1d7a2da3b9 100644 (file)
--- a/opcodes/configure.ac
+++ b/opcodes/configure.ac
@@ -160,6 +160,8 @@ else
   BUILD_LIBS=-liberty
   BUILD_LIB_DEPS=
 fi
+BUILD_LIBS="$BUILD_LIBS $LIBINTL"
+BUILD_LIB_DEPS="$BUILD_LIB_DEPS $LIBINTL_DEP"
 
 AC_SUBST(BUILD_LIBS)
 AC_SUBST(BUILD_LIB_DEPS)