summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gettext-tools/examples/ChangeLog12
-rw-r--r--gettext-tools/examples/hello-c++-gnome/configure.ac4
-rw-r--r--gettext-tools/examples/hello-c++-kde/configure.in.in2
-rw-r--r--gettext-tools/examples/hello-c++-kde/m4/Makefile.am4
-rw-r--r--gettext-tools/examples/hello-c++/configure.ac4
-rw-r--r--gettext-tools/examples/hello-c-gnome/configure.ac4
-rw-r--r--gettext-tools/examples/hello-c-gnome/m4/Makefile.am4
-rw-r--r--gettext-tools/examples/hello-c/configure.ac4
-rw-r--r--gettext-tools/examples/hello-objc-gnome/configure.ac4
-rw-r--r--gettext-tools/examples/hello-objc/configure.ac4
10 files changed, 29 insertions, 17 deletions
diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index fba28b2..075847a 100644
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,5 +1,17 @@
2006-04-14 Bruno Haible <bruno@clisp.org>
+ * hello-c/configure.ac: Use gettext-0.15 infrastructure.
+ * hello-c-gnome/configure.ac: Likewise.
+ * hello-objc/configure.ac: Likewise.
+ * hello-objc-gnome/configure.ac: Likewise.
+ * hello-c++/configure.ac: Likewise.
+ * hello-c++-kde/configure.in.in: Likewise.
+ * hello-c++-gnome/configure.ac: Likewise.
+ * hello-c-gnome/m4/Makefile.am (EXTRA_DIST): Add lock.m4.
+ * hello-c++-kde/m4/Makefile.am (EXTRA_DIST): Likewise.
+
+2006-04-14 Bruno Haible <bruno@clisp.org>
+
Prepare for autoconf-2.60.
* hello-clisp/configure.ac: Set datarootdir before evaluating
${datadir}.
diff --git a/gettext-tools/examples/hello-c++-gnome/configure.ac b/gettext-tools/examples/hello-c++-gnome/configure.ac
index 987b44a..837e3d8 100644
--- a/gettext-tools/examples/hello-c++-gnome/configure.ac
+++ b/gettext-tools/examples/hello-c++-gnome/configure.ac
@@ -1,5 +1,5 @@
dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2006 Free Software Foundation, Inc.
dnl This file is in the public domain.
dnl
dnl Configuration file - processed by autoconf.
@@ -18,7 +18,7 @@ AC_SUBST([GTKMM_LIBS])
AC_CHECK_HEADERS([unistd.h])
AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.13.1)
+AM_GNU_GETTEXT_VERSION(0.15)
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([m4/Makefile])
diff --git a/gettext-tools/examples/hello-c++-kde/configure.in.in b/gettext-tools/examples/hello-c++-kde/configure.in.in
index 80b254b..21d5a96 100644
--- a/gettext-tools/examples/hello-c++-kde/configure.in.in
+++ b/gettext-tools/examples/hello-c++-kde/configure.in.in
@@ -2,5 +2,5 @@
AC_CHECK_HEADERS([unistd.h])
AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.13.1)
+AM_GNU_GETTEXT_VERSION(0.15)
AC_CONFIG_FILES([po/Makefile.in])
diff --git a/gettext-tools/examples/hello-c++-kde/m4/Makefile.am b/gettext-tools/examples/hello-c++-kde/m4/Makefile.am
index 5175620..73a56f5 100644
--- a/gettext-tools/examples/hello-c++-kde/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c++-kde/m4/Makefile.am
@@ -1,5 +1,5 @@
EXTRA_DIST = \
codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 \
inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 \
- lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 \
- ulonglong.m4 visibility.m4
+ lib-link.m4 lib-prefix.m4 lock.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 \
+ uintmax_t.m4 ulonglong.m4 visibility.m4
diff --git a/gettext-tools/examples/hello-c++/configure.ac b/gettext-tools/examples/hello-c++/configure.ac
index f79ae5f..e07c6da 100644
--- a/gettext-tools/examples/hello-c++/configure.ac
+++ b/gettext-tools/examples/hello-c++/configure.ac
@@ -1,5 +1,5 @@
dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2006 Free Software Foundation, Inc.
dnl This file is in the public domain.
dnl
dnl Configuration file - processed by autoconf.
@@ -11,7 +11,7 @@ AM_INIT_AUTOMAKE(hello-c++, 0)
AC_PROG_CXX
AC_CHECK_HEADERS([unistd.h])
AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.13.1)
+AM_GNU_GETTEXT_VERSION(0.15)
AC_LIB_LINKFLAGS([asprintf])
AC_CONFIG_FILES([Makefile])
diff --git a/gettext-tools/examples/hello-c-gnome/configure.ac b/gettext-tools/examples/hello-c-gnome/configure.ac
index 0abe8a4..41a6878 100644
--- a/gettext-tools/examples/hello-c-gnome/configure.ac
+++ b/gettext-tools/examples/hello-c-gnome/configure.ac
@@ -1,5 +1,5 @@
dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2006 Free Software Foundation, Inc.
dnl This file is in the public domain.
dnl
dnl Configuration file - processed by autoconf.
@@ -12,7 +12,7 @@ AC_PROG_CC
GNOME_INIT
AC_CHECK_HEADERS([unistd.h])
AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.13.1)
+AM_GNU_GETTEXT_VERSION(0.15)
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([m4/Makefile])
diff --git a/gettext-tools/examples/hello-c-gnome/m4/Makefile.am b/gettext-tools/examples/hello-c-gnome/m4/Makefile.am
index 22f5b23..c0e5dab 100644
--- a/gettext-tools/examples/hello-c-gnome/m4/Makefile.am
+++ b/gettext-tools/examples/hello-c-gnome/m4/Makefile.am
@@ -1,6 +1,6 @@
EXTRA_DIST = \
codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 \
inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 \
- lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 \
- ulonglong.m4 visibility.m4 \
+ lib-link.m4 lib-prefix.m4 lock.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 \
+ uintmax_t.m4 ulonglong.m4 visibility.m4 \
gnome.m4 gnome-gnorba-check.m4 gnome-orbit-check.m4
diff --git a/gettext-tools/examples/hello-c/configure.ac b/gettext-tools/examples/hello-c/configure.ac
index 7e73a16..6c4693a 100644
--- a/gettext-tools/examples/hello-c/configure.ac
+++ b/gettext-tools/examples/hello-c/configure.ac
@@ -1,5 +1,5 @@
dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2006 Free Software Foundation, Inc.
dnl This file is in the public domain.
dnl
dnl Configuration file - processed by autoconf.
@@ -11,7 +11,7 @@ AM_INIT_AUTOMAKE(hello-c, 0)
AC_PROG_CC
AC_CHECK_HEADERS([unistd.h])
AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.13.1)
+AM_GNU_GETTEXT_VERSION(0.15)
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([m4/Makefile])
diff --git a/gettext-tools/examples/hello-objc-gnome/configure.ac b/gettext-tools/examples/hello-objc-gnome/configure.ac
index beb6d53..ccc1005 100644
--- a/gettext-tools/examples/hello-objc-gnome/configure.ac
+++ b/gettext-tools/examples/hello-objc-gnome/configure.ac
@@ -1,5 +1,5 @@
dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2006 Free Software Foundation, Inc.
dnl This file is in the public domain.
dnl
dnl Configuration file - processed by autoconf.
@@ -22,7 +22,7 @@ AC_SUBST([OBGNOME_INCLUDES])
AC_CHECK_HEADERS([unistd.h])
AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.13.1)
+AM_GNU_GETTEXT_VERSION(0.15)
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([m4/Makefile])
diff --git a/gettext-tools/examples/hello-objc/configure.ac b/gettext-tools/examples/hello-objc/configure.ac
index fb9f15e..89b4015 100644
--- a/gettext-tools/examples/hello-objc/configure.ac
+++ b/gettext-tools/examples/hello-objc/configure.ac
@@ -1,5 +1,5 @@
dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2006 Free Software Foundation, Inc.
dnl This file is in the public domain.
dnl
dnl Configuration file - processed by autoconf.
@@ -12,7 +12,7 @@ AC_PROG_CC
AC_SUBST(OBJC,["$CC"])
AC_CHECK_HEADERS([unistd.h])
AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.13.1)
+AM_GNU_GETTEXT_VERSION(0.15)
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([m4/Makefile])