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 /gas | |
| 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 'gas')
| -rw-r--r-- | gas/Makefile.am | 2 | ||||
| -rw-r--r-- | gas/Makefile.in | 3 | ||||
| -rwxr-xr-x | gas/configure | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/gas/Makefile.am b/gas/Makefile.am index e8c4202..b9b9e18 100644 --- 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 274704b..b575163 100644 --- 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 3942fcb..0cebc4e 100755 --- 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 |