From: Bruno Haible Date: Wed, 8 Sep 2004 11:32:05 +0000 (+0000) Subject: Make it work with automake-1.9. X-Git-Tag: v0.14.2~230 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb96c758cae8794f7f479c145dbdb9221f05f5f7;p=thirdparty%2Fgettext.git Make it work with automake-1.9. --- diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog index b63be05b1..6e0fa7aed 100644 --- a/gettext-tools/examples/ChangeLog +++ b/gettext-tools/examples/ChangeLog @@ -1,3 +1,10 @@ +2004-09-07 Bruno Haible + + * 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 * po/es.po: Update from Max de Mendizábal . diff --git a/gettext-tools/examples/hello-objc-gnome/configure.ac b/gettext-tools/examples/hello-objc-gnome/configure.ac index 60627041c..beb6d5301 100644 --- 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 1126251a0..fb9f15ecc 100644 --- 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 db68f9aa2..9d0c98f89 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_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