diff options
| author | Alan Modra <amodra@gmail.com> | 2024-06-20 21:14:24 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2024-06-20 21:15:27 +0930 |
| commit | 56f39033698b22a89571b345e5133b486822df1d (patch) | |
| tree | 341ee99d646d3efef302612b3ef3210be785aca0 /ld | |
| parent | e874cbd3879843a83e4bcc4b54cd7107387b1df6 (diff) | |
| download | gdb-56f39033698b22a89571b345e5133b486822df1d.zip gdb-56f39033698b22a89571b345e5133b486822df1d.tar.gz gdb-56f39033698b22a89571b345e5133b486822df1d.tar.bz2 | |
Revert "Remove LIBINTL_DEP"
This reverts commit e874cbd3879843a83e4bcc4b54cd7107387b1df6.
The patch was wrong. LIBINTL_DEP is needed with an in-tree gettext.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/Makefile.am | 2 | ||||
| -rw-r--r-- | ld/Makefile.in | 3 | ||||
| -rwxr-xr-x | ld/configure | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/ld/Makefile.am b/ld/Makefile.am index d760f13..6a9833e 100644 --- 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 e5495a0..8639e78 100644 --- 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 e98874f..4e8de84 100755 --- 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 |