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 95f2f06ae88153b1071922aed5e0d459db372286..e081ab7f2f8597aa511d5acd77c7c9225e805ae5 100644 (file)
--- 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 941b4ee19f03f8e5933b02550fb415dfe7e61cfe..2cf0034beec03eff032789b42cc9016f3966967b 100644 (file)
--- 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 2769441ea154bad17ca2a983527cf24137e515b2..56828c6f2746152ccb7a623529364b82d4f8ac4d 100644 (file)
--- 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 31032802bd18fa8dcc93935fee388fa326f7074c..602a7d0de39a4d30728e356879c65b28fb1f8e43 100644 (file)
--- 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 70c63ad4786ee817fbd6581c085ba57fa7307ae8..e606b58b6b6278805923d51a55e64c6bbdba7cc1 100644 (file)
--- 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 6abdc3d6bf3e5151a6f5bef2878c251dc6452cc1..45bbe31eaab0cce2b6f8a37dce46dd3cbaa30d40 100644 (file)
--- 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 8536f0006837eae617a4251e845ac2138ccc542f..b0932521d22aca5e29ce88bee923031fdf36f849 100644 (file)
--- 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 22a19743c548ba4b97cc682dfb5fe27891ca2782..0a762255c622812e26b56721577849e1c61d7c82 100644 (file)
--- 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 acbc2901680387ff145e4eb07fc03b412de02545..2f0bb04a5e258100cf8292fd3d504fc6b04637a6 100644 (file)
--- 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 920382f0541cebefe18b53ec75310c76c9d1f3bd..6d5b64fc48f8f116a6aafb635c158afb128e0613 100644 (file)
--- 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 fed6b4dabe6a27a798aefed01b2663ef5d37cdd9..6a9a975aa63c938260402cb43029558e188f4c45 100644 (file)
--- 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 30b9fb0c3b5720ebff1692df523af2395b3500ed..a6d65a955becb14e726e4e9652be81b05caa3460 100644 (file)
--- 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 c34eb741d5ec7939be2ea728435596aaa57e3a99..2a1de3045e6589cfe74c01a2c89e0185e166ad6f 100644 (file)
--- 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 52b642279dca813090a8fa5477d7140a7af0416e..bc0e415ef6f8af4845ef19eb823c3b35a5d62bbb 100644 (file)
--- 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 3541e8c711f2cafa6f28881988f10b14be08b3ab..bad0a8a06278cc2c8e6a4da8ef07b674d1bf707c 100644 (file)
--- 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 a65aa7615e7444abc43a9bd6c82b69acd8961c6f..0cae2de80299b4e10d6133f9be53e3aad40e652c 100644 (file)
--- 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 3b0303ecbdb4d023178082ecef71c1f1422b0ab1..c7c9e3d0a71ff628f844557eefb65fb17e30a622 100644 (file)
--- 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 1a8f1bb55d9ebf1e39676f039015e230357dffb0..db68f9aa21f0a581d1dd883d88e36587d9a4c85f 100755 (executable)
--- 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