Add a configure.ac file also in the gettext-tools/examples/ subdirectory.

8 files changed, 98 insertions, 42 deletions

diff --git a/ChangeLog b/ChangeLog
index 47b8ec8..4426e3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-29  Bruno Haible  <bruno@clisp.org>
+
+	* autogen.sh: Recurse also into the gettext-tools/examples directory
+	and update the PO files there.
+
 2006-06-27  Bruno Haible  <bruno@clisp.org>
 
 	* PACKAGING: Don't mention isc-posix.m4.
diff --git a/autogen.sh b/autogen.sh
index 4c17b6e..75eed57 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -51,7 +51,13 @@ cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS
  autoconf
  autoheader && touch config.h.in
  automake
- (cd examples/po && make update-po)
+)
+
+(cd gettext-tools/examples
+ aclocal -I ../../gettext-runtime/m4 -I ../../m4
+ autoconf
+ automake
+ ./configure && (cd po && make update-po) && make distclean
 )
 
 cp -p autoconf-lib-link/config.rpath build-aux/config.rpath
diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index aab72f8..cbfa630 100644
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-29  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac: Remove AC_CONFIG_FILES for files in examples subdir.
+
 2006-06-27  Bruno Haible  <bruno@clisp.org>
 
 	* configure.ac: Remove AC_ISC_POSIX invocation.
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index cf85260..cd5759e 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -385,9 +385,4 @@ AC_CONFIG_FILES([m4/Makefile])
 AC_CONFIG_FILES([tests/Makefile],
                 [FIX_MAKEFILE_COMPILE])
 
-AC_CONFIG_FILES([examples/Makefile],
-                [FIX_MAKEFILE_DISTRIB])
-AC_CONFIG_FILES([examples/installpaths])
-AC_CONFIG_FILES([examples/po/Makefile], [AM_POSTPROCESS_PO_MAKEFILE])
-
 AC_OUTPUT
diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 83f2dae..3f29a80 100644
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-29  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac: New file.
+	* Makefile.am (AUTOMAKE_OPTIONS): Drop gnits, use foreign instead.
+	* po/Makefile.am (POTFILES): Remove examples/ prefix.
+
 2006-06-27  Bruno Haible  <bruno@clisp.org>
 
 	* hello-c/{autoclean.sh,m4/Makefile.am}: Remove isc-posix.m4.
diff --git a/gettext-tools/examples/Makefile.am b/gettext-tools/examples/Makefile.am
index d5bc310..f2fa67a 100644
--- a/gettext-tools/examples/Makefile.am
+++ b/gettext-tools/examples/Makefile.am
@@ -17,7 +17,7 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.2 gnits
+AUTOMAKE_OPTIONS = 1.2 foreign
 SUBDIRS = po
 EXTRA_DIST =
 
diff --git a/gettext-tools/examples/configure.ac b/gettext-tools/examples/configure.ac
new file mode 100644
index 0000000..112f514
--- /dev/null
+++ b/gettext-tools/examples/configure.ac
@@ -0,0 +1,40 @@
+dnl Configuration for the gettext-tools/examples directory of GNU gettext
+dnl Copyright (C) 2006 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software Foundation,
+dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+dnl Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.57)
+AC_INIT
+AC_CONFIG_SRCDIR(installpaths.in)
+AC_CONFIG_AUX_DIR(../../build-aux)
+. $srcdir/../../version.sh
+AM_INIT_AUTOMAKE(gettext-examples, $VERSION_NUMBER)
+
+dnl Installation directories.
+test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'
+
+AM_PO_SUBDIRS
+
+aclocaldir='${datadir}/aclocal'
+AC_SUBST(aclocaldir)
+
+AC_CONFIG_FILES([Makefile],
+                [FIX_MAKEFILE_DISTRIB])
+AC_CONFIG_FILES([installpaths])
+AC_CONFIG_FILES([po/Makefile], [AM_POSTPROCESS_PO_MAKEFILE])
+
+AC_OUTPUT
diff --git a/gettext-tools/examples/po/Makefile.am b/gettext-tools/examples/po/Makefile.am
index d43b217..38505c5 100644
--- a/gettext-tools/examples/po/Makefile.am
+++ b/gettext-tools/examples/po/Makefile.am
@@ -21,41 +21,41 @@ AUTOMAKE_OPTIONS = 1.5 gnits
 
 # List of files which contain translatable strings.
 POTFILES = \
-  examples/hello-c/hello.c \
-  examples/hello-c-gnome/hello.c \
-  examples/hello-c++/hello.cc \
-  examples/hello-c++-qt/hello.cc \
-  examples/hello-c++-kde/hello.cc \
-  examples/hello-c++-kde/hellowindow.h \
-  examples/hello-c++-kde/hellowindow.cc \
-  examples/hello-c++-gnome/hello.cc \
-  examples/hello-c++-wxwidgets/hello.cc \
-  examples/hello-objc/hello.m \
-  examples/hello-objc-gnustep/main.m \
-  examples/hello-objc-gnustep/AppController.h \
-  examples/hello-objc-gnustep/AppController.m \
-  examples/hello-objc-gnustep/Hello.h \
-  examples/hello-objc-gnustep/Hello.m \
-  examples/hello-objc-gnome/hello.m \
-  examples/hello-sh/hello.sh \
-  examples/hello-python/hello.py.in \
-  examples/hello-clisp/hello.lisp.in \
-  examples/hello-librep/hello.jl.in \
-  examples/hello-guile/hello.scm \
-  examples/hello-smalltalk/hello.st.in \
-  examples/hello-java/Hello.java \
-  examples/hello-java-awt/Hello.java \
-  examples/hello-java-swing/Hello.java \
-  examples/hello-csharp/hello.cs \
-  examples/hello-csharp-forms/hello.cs \
-  examples/hello-gawk/hello.awk \
-  examples/hello-pascal/hello.pas \
-  examples/hello-ycp/hello.ycp \
-  examples/hello-tcl/hello.tcl \
-  examples/hello-tcl-tk/hello.tcl \
-  examples/hello-perl/hello-1.pl.in \
-  examples/hello-perl/hello-2.pl.in \
-  examples/hello-php/hello.php
+  hello-c/hello.c \
+  hello-c-gnome/hello.c \
+  hello-c++/hello.cc \
+  hello-c++-qt/hello.cc \
+  hello-c++-kde/hello.cc \
+  hello-c++-kde/hellowindow.h \
+  hello-c++-kde/hellowindow.cc \
+  hello-c++-gnome/hello.cc \
+  hello-c++-wxwidgets/hello.cc \
+  hello-objc/hello.m \
+  hello-objc-gnustep/main.m \
+  hello-objc-gnustep/AppController.h \
+  hello-objc-gnustep/AppController.m \
+  hello-objc-gnustep/Hello.h \
+  hello-objc-gnustep/Hello.m \
+  hello-objc-gnome/hello.m \
+  hello-sh/hello.sh \
+  hello-python/hello.py.in \
+  hello-clisp/hello.lisp.in \
+  hello-librep/hello.jl.in \
+  hello-guile/hello.scm \
+  hello-smalltalk/hello.st.in \
+  hello-java/Hello.java \
+  hello-java-awt/Hello.java \
+  hello-java-swing/Hello.java \
+  hello-csharp/hello.cs \
+  hello-csharp-forms/hello.cs \
+  hello-gawk/hello.awk \
+  hello-pascal/hello.pas \
+  hello-ycp/hello.ycp \
+  hello-tcl/hello.tcl \
+  hello-tcl-tk/hello.tcl \
+  hello-perl/hello-1.pl.in \
+  hello-perl/hello-2.pl.in \
+  hello-php/hello.php
 
 # List of small POT files.
 SMALLPOTS = \