From: Bruno Haible <bruno@clisp.org>
Date: Thu, 20 Nov 2003 12:19:36 +0000 (+0000)
Subject: AM_NLS is not needed. (It's required by AM_PO_SUBDIRS.)
X-Git-Tag: v0.13~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ab11a38dcd4586c3e27c68de97b63048f5eb29a;p=thirdparty%2Fgettext.git

AM_NLS is not needed. (It's required by AM_PO_SUBDIRS.)
---

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 95f2f06ae..e081ab7f2 100644
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-20  Bruno Haible  <bruno@clisp.org>
+
+	* hello-*/configure.ac: Remove AM_NLS invocation.
+	* po/xsmallpot.sh: Don't keep AM_NLS lines.
+
 2003-11-19  Bruno Haible  <bruno@clisp.org>
 
 	* po/de.po: Update from Karl Eichwalder <ke@suse.de>.
diff --git a/gettext-tools/examples/hello-c++-qt/configure.ac b/gettext-tools/examples/hello-c++-qt/configure.ac
index 941b4ee19..2cf0034be 100644
--- a/gettext-tools/examples/hello-c++-qt/configure.ac
+++ b/gettext-tools/examples/hello-c++-qt/configure.ac
@@ -16,7 +16,6 @@ FUN_CHECK_PTHREAD
 FUN_CHECK_QT(220)
 
 dnl Support for the po directory.
-AM_NLS
 AM_PO_SUBDIRS
 
 AC_CONFIG_FILES([Makefile])
diff --git a/gettext-tools/examples/hello-clisp/configure.ac b/gettext-tools/examples/hello-clisp/configure.ac
index 2769441ea..56828c6f2 100644
--- a/gettext-tools/examples/hello-clisp/configure.ac
+++ b/gettext-tools/examples/hello-clisp/configure.ac
@@ -30,7 +30,6 @@ prefix="$save_prefix"
 AC_SUBST(localedir)
 
 dnl Support for the po directory.
-AM_NLS
 AM_PO_SUBDIRS
 
 AC_CONFIG_FILES([Makefile hello.lisp])
diff --git a/gettext-tools/examples/hello-gawk/configure.ac b/gettext-tools/examples/hello-gawk/configure.ac
index 31032802b..602a7d0de 100644
--- a/gettext-tools/examples/hello-gawk/configure.ac
+++ b/gettext-tools/examples/hello-gawk/configure.ac
@@ -30,7 +30,6 @@ prefix="$save_prefix"
 AC_SUBST(localedir)
 
 dnl Support for the po directory.
-AM_NLS
 AM_PO_SUBDIRS
 
 AC_CONFIG_FILES([Makefile])
diff --git a/gettext-tools/examples/hello-java-awt/configure.ac b/gettext-tools/examples/hello-java-awt/configure.ac
index 70c63ad47..e606b58b6 100644
--- a/gettext-tools/examples/hello-java-awt/configure.ac
+++ b/gettext-tools/examples/hello-java-awt/configure.ac
@@ -59,7 +59,6 @@ LIBINTL_JAR="$basedir"/share/gettext/libintl.jar
 AC_SUBST([LIBINTL_JAR])
 
 dnl Support for the po directory.
-AM_NLS
 AM_PO_SUBDIRS
 
 AC_CONFIG_FILES([Makefile])
diff --git a/gettext-tools/examples/hello-java-swing/configure.ac b/gettext-tools/examples/hello-java-swing/configure.ac
index 6abdc3d6b..45bbe31ea 100644
--- a/gettext-tools/examples/hello-java-swing/configure.ac
+++ b/gettext-tools/examples/hello-java-swing/configure.ac
@@ -59,7 +59,6 @@ LIBINTL_JAR="$basedir"/share/gettext/libintl.jar
 AC_SUBST([LIBINTL_JAR])
 
 dnl Support for the po directory.
-AM_NLS
 AM_PO_SUBDIRS
 
 AC_CONFIG_FILES([Makefile])
diff --git a/gettext-tools/examples/hello-java/configure.ac b/gettext-tools/examples/hello-java/configure.ac
index 8536f0006..b0932521d 100644
--- a/gettext-tools/examples/hello-java/configure.ac
+++ b/gettext-tools/examples/hello-java/configure.ac
@@ -59,7 +59,6 @@ LIBINTL_JAR="$basedir"/share/gettext/libintl.jar
 AC_SUBST([LIBINTL_JAR])
 
 dnl Support for the po directory.
-AM_NLS
 AM_PO_SUBDIRS
 
 AC_CONFIG_FILES([Makefile])
diff --git a/gettext-tools/examples/hello-librep/configure.ac b/gettext-tools/examples/hello-librep/configure.ac
index 22a19743c..0a762255c 100644
--- a/gettext-tools/examples/hello-librep/configure.ac
+++ b/gettext-tools/examples/hello-librep/configure.ac
@@ -30,7 +30,6 @@ prefix="$save_prefix"
 AC_SUBST(localedir)
 
 dnl Support for the po directory.
-AM_NLS
 AM_PO_SUBDIRS
 
 AC_CONFIG_FILES([Makefile hello.jl])
diff --git a/gettext-tools/examples/hello-pascal/configure.ac b/gettext-tools/examples/hello-pascal/configure.ac
index acbc29016..2f0bb04a5 100644
--- a/gettext-tools/examples/hello-pascal/configure.ac
+++ b/gettext-tools/examples/hello-pascal/configure.ac
@@ -30,7 +30,6 @@ prefix="$save_prefix"
 AC_SUBST(localedir)
 
 dnl Support for the po directory.
-AM_NLS
 AM_PO_SUBDIRS
 
 AC_CONFIG_FILES([Makefile])
diff --git a/gettext-tools/examples/hello-perl/configure.ac b/gettext-tools/examples/hello-perl/configure.ac
index 920382f05..6d5b64fc4 100644
--- a/gettext-tools/examples/hello-perl/configure.ac
+++ b/gettext-tools/examples/hello-perl/configure.ac
@@ -30,7 +30,6 @@ prefix="$save_prefix"
 AC_SUBST(localedir)
 
 dnl Support for the po directory.
-AM_NLS
 AM_PO_SUBDIRS
 
 AC_CONFIG_FILES([Makefile])
diff --git a/gettext-tools/examples/hello-php/configure.ac b/gettext-tools/examples/hello-php/configure.ac
index fed6b4dab..6a9a975aa 100644
--- a/gettext-tools/examples/hello-php/configure.ac
+++ b/gettext-tools/examples/hello-php/configure.ac
@@ -30,7 +30,6 @@ prefix="$save_prefix"
 AC_SUBST(localedir)
 
 dnl Support for the po directory.
-AM_NLS
 AM_PO_SUBDIRS
 
 AC_CONFIG_FILES([Makefile])
diff --git a/gettext-tools/examples/hello-python/configure.ac b/gettext-tools/examples/hello-python/configure.ac
index 30b9fb0c3..a6d65a955 100644
--- a/gettext-tools/examples/hello-python/configure.ac
+++ b/gettext-tools/examples/hello-python/configure.ac
@@ -29,7 +29,6 @@ prefix="$save_prefix"
 AC_SUBST(localedir)
 
 dnl Support for the po directory.
-AM_NLS
 AM_PO_SUBDIRS
 
 AC_CONFIG_FILES([Makefile hello.py])
diff --git a/gettext-tools/examples/hello-sh/configure.ac b/gettext-tools/examples/hello-sh/configure.ac
index c34eb741d..2a1de3045 100644
--- a/gettext-tools/examples/hello-sh/configure.ac
+++ b/gettext-tools/examples/hello-sh/configure.ac
@@ -22,7 +22,6 @@ prefix="$save_prefix"
 AC_SUBST(localedir)
 
 dnl Support for the po directory.
-AM_NLS
 AM_PO_SUBDIRS
 
 AC_CONFIG_FILES([Makefile])
diff --git a/gettext-tools/examples/hello-smalltalk/configure.ac b/gettext-tools/examples/hello-smalltalk/configure.ac
index 52b642279..bc0e415ef 100644
--- a/gettext-tools/examples/hello-smalltalk/configure.ac
+++ b/gettext-tools/examples/hello-smalltalk/configure.ac
@@ -30,7 +30,6 @@ prefix="$save_prefix"
 AC_SUBST(localedir)
 
 dnl Support for the po directory.
-AM_NLS
 AM_PO_SUBDIRS
 
 AC_CONFIG_FILES([Makefile hello.st])
diff --git a/gettext-tools/examples/hello-tcl-tk/configure.ac b/gettext-tools/examples/hello-tcl-tk/configure.ac
index 3541e8c71..bad0a8a06 100644
--- a/gettext-tools/examples/hello-tcl-tk/configure.ac
+++ b/gettext-tools/examples/hello-tcl-tk/configure.ac
@@ -30,7 +30,6 @@ prefix="$save_prefix"
 AC_SUBST(pkgdatadir)
 
 dnl Support for the po directory.
-AM_NLS
 AM_PO_SUBDIRS
 
 AC_CONFIG_FILES([Makefile])
diff --git a/gettext-tools/examples/hello-tcl/configure.ac b/gettext-tools/examples/hello-tcl/configure.ac
index a65aa7615..0cae2de80 100644
--- a/gettext-tools/examples/hello-tcl/configure.ac
+++ b/gettext-tools/examples/hello-tcl/configure.ac
@@ -30,7 +30,6 @@ prefix="$save_prefix"
 AC_SUBST(pkgdatadir)
 
 dnl Support for the po directory.
-AM_NLS
 AM_PO_SUBDIRS
 
 AC_CONFIG_FILES([Makefile])
diff --git a/gettext-tools/examples/hello-ycp/configure.ac b/gettext-tools/examples/hello-ycp/configure.ac
index 3b0303ecb..c7c9e3d0a 100644
--- a/gettext-tools/examples/hello-ycp/configure.ac
+++ b/gettext-tools/examples/hello-ycp/configure.ac
@@ -20,7 +20,6 @@ localedir=/usr/share/YaST2/locale
 AC_SUBST(localedir)
 
 dnl Support for the po directory.
-AM_NLS
 AM_PO_SUBDIRS
 
 AC_CONFIG_FILES([Makefile])
diff --git a/gettext-tools/examples/po/xsmallpot.sh b/gettext-tools/examples/po/xsmallpot.sh
index 1a8f1bb55..db68f9aa2 100755
--- a/gettext-tools/examples/po/xsmallpot.sh
+++ b/gettext-tools/examples/po/xsmallpot.sh
@@ -15,7 +15,7 @@ case $directory in
   hello-c++-kde)
     ./autogen.sh
     sed -e 's,tmp-,,' < configure.in > configure.ac
-    grep '^\(AC_INIT\|AC_CONFIG\|AM_INIT\|AM_CONDITIONAL\|AM_GNU_GETTEXT\|AM_NLS\|AM_PO_SUBDIRS\|AC_OUTPUT\)' configure.ac > configure.in
+    grep '^\(AC_INIT\|AC_CONFIG\|AM_INIT\|AM_CONDITIONAL\|AM_GNU_GETTEXT\|AM_PO_SUBDIRS\|AC_OUTPUT\)' configure.ac > configure.in
     rm -f configure.ac 
     autoconf
     ./configure
@@ -24,7 +24,7 @@ case $directory in
     ./autogen.sh
     ;;
   *)
-    grep '^\(AC_INIT\|AC_CONFIG\|AM_INIT\|AM_CONDITIONAL\|AM_GNU_GETTEXT\|AM_NLS\|AM_PO_SUBDIRS\|AC_OUTPUT\)' configure.ac > configure.in
+    grep '^\(AC_INIT\|AC_CONFIG\|AM_INIT\|AM_CONDITIONAL\|AM_GNU_GETTEXT\|AM_PO_SUBDIRS\|AC_OUTPUT\)' configure.ac > configure.in
     rm -f configure.ac 
     ./autogen.sh
     ./configure