Start using gnulib.

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 91b2e8d238fffdb022857c33e50c67b0ce502085..d2a1df64fa8c7bcf69720ae4b0ceb22de40c48ca 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,15 @@
+2006-07-31  Bruno Haible  <bruno@clisp.org>
+
+       * hello-c/autogen.sh: Replace gettext-tools/lib with
+       gettext-tools/gnulib-lib.
+       * hello-c++/autogen.sh: Likewise.
+       * hello-objc/autogen.sh: Likewise.
+       * hello-csharp/autogen.sh: Update for changed locations of *.m4 files.
+       * hello-csharp-forms/autogen.sh: Likewise.
+       * hello-java/autogen.sh: Likewise.
+       * hello-java-awt/autogen.sh: Likewise.
+       * hello-java-swing/autogen.sh: Likewise.
+
 2006-07-30  Bruno Haible  <bruno@clisp.org>
 
        * hello-csharp*/autogen.sh: Update for changed location of

diff --git a/gettext-tools/examples/hello-c++/autogen.sh b/gettext-tools/examples/hello-c++/autogen.sh
index 6fa3cf39b032afad2e91c2c0f36c8d1c6ef5f743..32b3e5fbedca01c4b96191689be559abacab1820 100755 (executable)
--- a/gettext-tools/examples/hello-c++/autogen.sh
+++ b/gettext-tools/examples/hello-c++/autogen.sh
@@ -24,7 +24,7 @@ else
   fi
 fi
 
-cp -p ${GETTEXTSRCDIR-$GETTEXT_TOPSRCDIR/gettext-tools/lib}/gettext.h gettext.h
+cp -p ${GETTEXTSRCDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-lib}/gettext.h gettext.h
 
 autopoint -f # was: gettextize -f -c
 rm po/Makevars.template

diff --git a/gettext-tools/examples/hello-c/autogen.sh b/gettext-tools/examples/hello-c/autogen.sh
index ce55ded5dd6f8793b27909a7d4bffcdf0c8bea5d..6f62c07749f938c525962051d0bc2082b5fa2b53 100755 (executable)
--- a/gettext-tools/examples/hello-c/autogen.sh
+++ b/gettext-tools/examples/hello-c/autogen.sh
@@ -24,7 +24,7 @@ else
   fi
 fi
 
-cp -p ${GETTEXTSRCDIR-$GETTEXT_TOPSRCDIR/gettext-tools/lib}/gettext.h gettext.h
+cp -p ${GETTEXTSRCDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-lib}/gettext.h gettext.h
 
 autopoint -f # was: gettextize -f -c
 rm po/Makevars.template

diff --git a/gettext-tools/examples/hello-csharp-forms/autogen.sh b/gettext-tools/examples/hello-csharp-forms/autogen.sh
index 4b9980525531af31ff823c8d08fe55f1ea496e05..6f23ac7ff2a68355a2818395f5074fa010987de3 100755 (executable)
--- a/gettext-tools/examples/hello-csharp-forms/autogen.sh
+++ b/gettext-tools/examples/hello-csharp-forms/autogen.sh
@@ -29,10 +29,10 @@ cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4
 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4
 cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin
 
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharpcomp.m4 m4/csharpcomp.m4
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharpexec.m4 m4/csharpexec.m4
+cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/csharpcomp.m4 m4/csharpcomp.m4
+cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/csharpexec.m4 m4/csharpexec.m4
 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharpexec-test.exe m4/csharpexec-test.exe
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharp.m4 m4/csharp.m4
+cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/csharp.m4 m4/csharp.m4
 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/build-aux}/csharpcomp.sh.in csharpcomp.sh.in
 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/build-aux}/csharpexec.sh.in csharpexec.sh.in
 

diff --git a/gettext-tools/examples/hello-csharp/autogen.sh b/gettext-tools/examples/hello-csharp/autogen.sh
index 4b9980525531af31ff823c8d08fe55f1ea496e05..6f23ac7ff2a68355a2818395f5074fa010987de3 100755 (executable)
--- a/gettext-tools/examples/hello-csharp/autogen.sh
+++ b/gettext-tools/examples/hello-csharp/autogen.sh
@@ -29,10 +29,10 @@ cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4
 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4
 cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin
 
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharpcomp.m4 m4/csharpcomp.m4
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharpexec.m4 m4/csharpexec.m4
+cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/csharpcomp.m4 m4/csharpcomp.m4
+cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/csharpexec.m4 m4/csharpexec.m4
 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharpexec-test.exe m4/csharpexec-test.exe
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharp.m4 m4/csharp.m4
+cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/csharp.m4 m4/csharp.m4
 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/build-aux}/csharpcomp.sh.in csharpcomp.sh.in
 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/build-aux}/csharpexec.sh.in csharpexec.sh.in
 

diff --git a/gettext-tools/examples/hello-java-awt/autogen.sh b/gettext-tools/examples/hello-java-awt/autogen.sh
index bde254c1e9400d65d63d74922e22c6ca645d60e2..559bf18761f906b7b2888ec09304967c8d79a6b3 100755 (executable)
--- a/gettext-tools/examples/hello-java-awt/autogen.sh
+++ b/gettext-tools/examples/hello-java-awt/autogen.sh
@@ -29,9 +29,9 @@ cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4
 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4
 cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin
 
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/gcj.m4 m4/gcj.m4
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/javacomp.m4 m4/javacomp.m4
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/javaexec.m4 m4/javaexec.m4
+cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/gcj.m4 m4/gcj.m4
+cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/javacomp.m4 m4/javacomp.m4
+cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/javaexec.m4 m4/javaexec.m4
 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/build-aux}/javacomp.sh.in javacomp.sh.in
 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/build-aux}/javaexec.sh.in javaexec.sh.in
 

diff --git a/gettext-tools/examples/hello-java-swing/autogen.sh b/gettext-tools/examples/hello-java-swing/autogen.sh
index bde254c1e9400d65d63d74922e22c6ca645d60e2..559bf18761f906b7b2888ec09304967c8d79a6b3 100755 (executable)
--- a/gettext-tools/examples/hello-java-swing/autogen.sh
+++ b/gettext-tools/examples/hello-java-swing/autogen.sh
@@ -29,9 +29,9 @@ cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4
 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4
 cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin
 
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/gcj.m4 m4/gcj.m4
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/javacomp.m4 m4/javacomp.m4
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/javaexec.m4 m4/javaexec.m4
+cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/gcj.m4 m4/gcj.m4
+cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/javacomp.m4 m4/javacomp.m4
+cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/javaexec.m4 m4/javaexec.m4
 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/build-aux}/javacomp.sh.in javacomp.sh.in
 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/build-aux}/javaexec.sh.in javaexec.sh.in
 

diff --git a/gettext-tools/examples/hello-java/autogen.sh b/gettext-tools/examples/hello-java/autogen.sh
index bde254c1e9400d65d63d74922e22c6ca645d60e2..559bf18761f906b7b2888ec09304967c8d79a6b3 100755 (executable)
--- a/gettext-tools/examples/hello-java/autogen.sh
+++ b/gettext-tools/examples/hello-java/autogen.sh
@@ -29,9 +29,9 @@ cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/po.m4 m4/po.m4
 cp -p ${ACLOCALDIR-$GETTEXT_TOPSRCDIR/gettext-runtime/m4}/progtest.m4 m4/progtest.m4
 cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.sin po/remove-potcdate.sin
 
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/gcj.m4 m4/gcj.m4
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/javacomp.m4 m4/javacomp.m4
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/javaexec.m4 m4/javaexec.m4
+cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/gcj.m4 m4/gcj.m4
+cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/javacomp.m4 m4/javacomp.m4
+cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-m4}/javaexec.m4 m4/javaexec.m4
 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/build-aux}/javacomp.sh.in javacomp.sh.in
 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/build-aux}/javaexec.sh.in javaexec.sh.in
 

diff --git a/gettext-tools/examples/hello-objc/autogen.sh b/gettext-tools/examples/hello-objc/autogen.sh
index ce55ded5dd6f8793b27909a7d4bffcdf0c8bea5d..6f62c07749f938c525962051d0bc2082b5fa2b53 100755 (executable)
--- a/gettext-tools/examples/hello-objc/autogen.sh
+++ b/gettext-tools/examples/hello-objc/autogen.sh
@@ -24,7 +24,7 @@ else
   fi
 fi
 
-cp -p ${GETTEXTSRCDIR-$GETTEXT_TOPSRCDIR/gettext-tools/lib}/gettext.h gettext.h
+cp -p ${GETTEXTSRCDIR-$GETTEXT_TOPSRCDIR/gettext-tools/gnulib-lib}/gettext.h gettext.h
 
 autopoint -f # was: gettextize -f -c
 rm po/Makevars.template