* Makefile.am (HFILES): Add itbl-lex.h.

	(itbl-lex.o, itbl-parse.o): Depend on itbl-lex.h
	* Makefile.in: Regenerate.
	* configure: Regenerate.
	* po/POTFILES.in: Regenerate.

diff --git a/gas/Makefile.am b/gas/Makefile.am
index 58dfb4e15380f617922be81f3304c5433125b407..450852ac750ddda5b94959549d9a267b1bed17ee 100644 (file)
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -221,6 +221,7 @@ HFILES = \
        frags.h \
        hash.h \
        input-file.h \
+       itbl-lex.h \
        itbl-ops.h \
        listing.h \
        macro.h \
@@ -653,9 +654,9 @@ $(srcdir)/config/m68k-parse.h: ; @true
 # The instruction table specification lexical analyzer and parser.
 
 itbl-lex.c: $(srcdir)/itbl-lex.l
-itbl-lex.o: itbl-lex.c itbl-parse.h
+itbl-lex.o: itbl-lex.c itbl-parse.h $(srcdir)/itbl-lex.h
 
-itbl-parse.o: itbl-parse.c itbl-parse.h $(srcdir)/itbl-ops.h
+itbl-parse.o: itbl-parse.c itbl-parse.h $(srcdir)/itbl-ops.h $(srcdir)/itbl-lex.h
 
 itbl-ops.o: $(srcdir)/itbl-ops.c $(srcdir)/itbl-ops.h itbl-parse.h
 

diff --git a/gas/Makefile.in b/gas/Makefile.in
index 28c40384eda3b6d99ed82cc23390f162f671663e..85400c6ce64ff6bfcbeabac36f4e05187a44fe57 100644 (file)
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -448,6 +448,7 @@ HFILES = \
        frags.h \
        hash.h \
        input-file.h \
+       itbl-lex.h \
        itbl-ops.h \
        listing.h \
        macro.h \
@@ -3063,9 +3064,9 @@ $(srcdir)/config/m68k-parse.h: ; @true
 # The instruction table specification lexical analyzer and parser.
 
 itbl-lex.c: $(srcdir)/itbl-lex.l
-itbl-lex.o: itbl-lex.c itbl-parse.h
+itbl-lex.o: itbl-lex.c itbl-parse.h $(srcdir)/itbl-lex.h
 
-itbl-parse.o: itbl-parse.c itbl-parse.h $(srcdir)/itbl-ops.h
+itbl-parse.o: itbl-parse.c itbl-parse.h $(srcdir)/itbl-ops.h $(srcdir)/itbl-lex.h
 
 itbl-ops.o: $(srcdir)/itbl-ops.c $(srcdir)/itbl-ops.h itbl-parse.h
 

diff --git a/gas/configure b/gas/configure
index d4994f4a3623673c3790063baddd1346c990020d..47c8a867780e1a70ece57d6a9fa652ed37de1268 100755 (executable)
--- a/gas/configure
+++ b/gas/configure
@@ -8035,11 +8035,6 @@ echo "${ECHO_T}$USE_NLS" >&6
     USE_INCLUDED_LIBINTL=no
 
         if test "$USE_NLS" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_NLS 1
-_ACEOF
-
       echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
 
@@ -8829,6 +8824,13 @@ echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6
 
 
 
+    if test "x$CATOBJEXT" != "x"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_NLS 1
+_ACEOF
+
+    fi
 
 
    if test "x$CATOBJEXT" != "x"; then

diff --git a/gas/po/POTFILES.in b/gas/po/POTFILES.in
index 4f3e765be8caa50b531aa349d96b607c26470fbb..c926fd497743a911c235206268aa9e651d583a2b 100644 (file)
--- a/gas/po/POTFILES.in
+++ b/gas/po/POTFILES.in
@@ -178,6 +178,7 @@ input-file.c
 input-file.h
 input-scrub.c
 input-scrub.c
+itbl-lex.h
 itbl-ops.c
 itbl-ops.h
 listing.c