Make it work with automake-1.9.

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index b63be05b12a2ebfb114e1805804c03d56339c412..6e0fa7aed772b5185892561653937e591be39d44 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-07  Bruno Haible  <bruno@clisp.org>
+
+       * po/xsmallpot.sh: Keep AC_PROG_* and OBJC lines in configure.in.
+       * hello-objc/configure.ac: Assign OBJC through AC_SUBST.
+       * hello-objc-gnome/configure.ac: Likewise.
+       Needed to avoid error with automake-1.9.
+
 2004-03-21  Bruno Haible  <bruno@clisp.org>
 
        * po/es.po: Update from Max de Mendizábal <max@upn.mx>.

diff --git a/gettext-tools/examples/hello-objc-gnome/configure.ac b/gettext-tools/examples/hello-objc-gnome/configure.ac
index 60627041c67069b1294d10cf76b49becc00766ab..beb6d5301ce677de1031849b732c2932016c8f64 100644 (file)
--- a/gettext-tools/examples/hello-objc-gnome/configure.ac
+++ b/gettext-tools/examples/hello-objc-gnome/configure.ac
@@ -9,10 +9,8 @@ AC_CONFIG_SRCDIR(hello.m)
 AM_INIT_AUTOMAKE(hello-objc-gnome, 0)
 
 AC_PROG_CC
-OBJC=$CC
-AC_SUBST([OBJC])
-OBJCFLAGS=$CFLAGS
-AC_SUBST([OBJCFLAGS])
+AC_SUBST([OBJC],["$CC"])
+AC_SUBST([OBJCFLAGS],["$CFLAGS"])
 
 GNOME_INIT
 OBGNOME_INCLUDES=

diff --git a/gettext-tools/examples/hello-objc/configure.ac b/gettext-tools/examples/hello-objc/configure.ac
index 1126251a0c3683d8cfd963e4d567eda151ed94ad..fb9f15ecceca88ac6b0deaf95c47e75d0e58ba20 100644 (file)
--- a/gettext-tools/examples/hello-objc/configure.ac
+++ b/gettext-tools/examples/hello-objc/configure.ac
@@ -9,8 +9,7 @@ AC_CONFIG_SRCDIR(hello.m)
 AM_INIT_AUTOMAKE(hello-objc, 0)
 
 AC_PROG_CC
-OBJC="$CC"
-AC_SUBST(OBJC)
+AC_SUBST(OBJC,["$CC"])
 AC_CHECK_HEADERS([unistd.h])
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION(0.13.1)

diff --git a/gettext-tools/examples/po/xsmallpot.sh b/gettext-tools/examples/po/xsmallpot.sh
index db68f9aa21f0a581d1dd883d88e36587d9a4c85f..9d0c98f8980ad248c91560622981d8ea8cb22147 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_PO_SUBDIRS\|AC_OUTPUT\)' configure.ac > configure.in
+    grep '^\(AC_INIT\|AC_CONFIG\|AC_PROG_\|AC_SUBST(.*OBJC\|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_PO_SUBDIRS\|AC_OUTPUT\)' configure.ac > configure.in
+    grep '^\(AC_INIT\|AC_CONFIG\|AC_PROG_\|AC_SUBST(.*OBJC\|AM_INIT\|AM_CONDITIONAL\|AM_GNU_GETTEXT\|AM_PO_SUBDIRS\|AC_OUTPUT\)' configure.ac > configure.in
     rm -f configure.ac 
     ./autogen.sh
     ./configure