Start using gnulib.

19 files changed, 75 insertions, 47 deletions

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index f134a0a..3791342 100644
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,5 +1,9 @@
 2006-07-30  Bruno Haible  <bruno@clisp.org>
 
+	* Makefile.am (ACLOCAL_AMFLAGS): Append ../gettext-tools/gnulib-m4.
+
+2006-07-30  Bruno Haible  <bruno@clisp.org>
+
 	* configure.ac: Update for changed location of javacomp.sh.in and
 	csharpcomp.sh.in.
 
diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am
index 036c0e4..6d5bf14 100644
--- a/gettext-runtime/Makefile.am
+++ b/gettext-runtime/Makefile.am
@@ -18,7 +18,7 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
-ACLOCAL_AMFLAGS = -I m4 -I ../gettext-tools/m4 -I ../autoconf-lib-link/m4 -I ../m4
+ACLOCAL_AMFLAGS = -I m4 -I ../gettext-tools/m4 -I ../gettext-tools/gnulib-m4 -I ../autoconf-lib-link/m4 -I ../m4
 
 MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@
 
diff --git a/gettext-runtime/lib/ChangeLog b/gettext-runtime/lib/ChangeLog
index 1a5298c..f334e9b 100644
--- a/gettext-runtime/lib/ChangeLog
+++ b/gettext-runtime/lib/ChangeLog
@@ -1,5 +1,24 @@
 2006-07-30  Bruno Haible  <bruno@clisp.org>
 
+	* Makefile.am (libgrt_a_SOURCES, LIBADD_SOURCE, AM_CPPFLAGS,
+	EXTRA_DIST, stdbool.h, alloca.h, getopt.h): Replace gettext-tools/lib
+	with gettext-tools/gnulib-lib.
+	* atexit.c: Refer to ../../gettext-tools/gnulib-lib directory.
+	* canonicalize.c: Likewise.
+	* error.h: Likewise.
+	* error.c: Likewise.
+	* getopt.c: Likewise.
+	* getopt1.c: Likewise.
+	* memmove.c: Likewise.
+	* readlink.c: Likewise.
+	* relocatable.c: Likewise.
+	* setenv.c: Likewise.
+	* strerror.c: Likewise.
+	* strtoul.c: Likewise.
+	* unsetenv.c: Likewise.
+
+2006-07-30  Bruno Haible  <bruno@clisp.org>
+
 	* Makefile.am (libgrt_a_SOURCES): Add c-strstr.h, c-strstr.c.
 
 2006-07-25  Bruno Haible  <bruno@clisp.org>
diff --git a/gettext-runtime/lib/Makefile.am b/gettext-runtime/lib/Makefile.am
index 3d7ce09..4ee8762 100644
--- a/gettext-runtime/lib/Makefile.am
+++ b/gettext-runtime/lib/Makefile.am
@@ -27,36 +27,36 @@ noinst_LIBRARIES = libgrt.a
 # Sources that are compiled on all platforms.
 
 libgrt_a_SOURCES = \
-  ../../gettext-tools/lib/allocsa.h ../../gettext-tools/lib/allocsa.c \
-  ../../gettext-tools/lib/basename.h ../../gettext-tools/lib/basename.c \
-  ../../gettext-tools/lib/c-ctype.h ../../gettext-tools/lib/c-ctype.c \
-  ../../gettext-tools/lib/c-strcase.h ../../gettext-tools/lib/c-strcasecmp.c \
-  ../../gettext-tools/lib/c-strstr.h ../../gettext-tools/lib/c-strstr.c \
-  ../../gettext-tools/lib/closeout.h ../../gettext-tools/lib/closeout.c \
-  ../../gettext-tools/lib/exit.h \
-  ../../gettext-tools/lib/fwriteerror.h ../../gettext-tools/lib/fwriteerror.c \
-  ../../gettext-tools/lib/gettext.h \
-  ../../gettext-tools/lib/iconvstring.h ../../gettext-tools/lib/iconvstring.c \
-  ../../gettext-tools/lib/localcharset.h ../../gettext-tools/lib/localcharset.c \
-  ../../gettext-tools/lib/pathmax.h \
-  ../../gettext-tools/lib/progname.h ../../gettext-tools/lib/progname.c ../../gettext-tools/lib/progreloc.c \
-  ../../gettext-tools/lib/propername.h ../../gettext-tools/lib/propername.c \
-  ../../gettext-tools/lib/strstr.h \
-  ../../gettext-tools/lib/unlocked-io.h \
-  ../../gettext-tools/lib/xalloc.h ../../gettext-tools/lib/xmalloc.c ../../gettext-tools/lib/xstrdup.c \
-  ../../gettext-tools/lib/xreadlink.h ../../gettext-tools/lib/xreadlink.c
+  ../../gettext-tools/gnulib-lib/allocsa.h ../../gettext-tools/gnulib-lib/allocsa.c \
+  ../../gettext-tools/gnulib-lib/basename.h ../../gettext-tools/gnulib-lib/basename.c \
+  ../../gettext-tools/gnulib-lib/c-ctype.h ../../gettext-tools/gnulib-lib/c-ctype.c \
+  ../../gettext-tools/gnulib-lib/c-strcase.h ../../gettext-tools/gnulib-lib/c-strcasecmp.c \
+  ../../gettext-tools/gnulib-lib/c-strstr.h ../../gettext-tools/gnulib-lib/c-strstr.c \
+  ../../gettext-tools/gnulib-lib/closeout.h ../../gettext-tools/gnulib-lib/closeout.c \
+  ../../gettext-tools/gnulib-lib/exit.h \
+  ../../gettext-tools/gnulib-lib/fwriteerror.h ../../gettext-tools/gnulib-lib/fwriteerror.c \
+  ../../gettext-tools/gnulib-lib/gettext.h \
+  ../../gettext-tools/gnulib-lib/iconvstring.h ../../gettext-tools/gnulib-lib/iconvstring.c \
+  ../../gettext-tools/gnulib-lib/localcharset.h ../../gettext-tools/gnulib-lib/localcharset.c \
+  ../../gettext-tools/gnulib-lib/pathmax.h \
+  ../../gettext-tools/gnulib-lib/progname.h ../../gettext-tools/gnulib-lib/progname.c ../../gettext-tools/gnulib-lib/progreloc.c \
+  ../../gettext-tools/gnulib-lib/propername.h ../../gettext-tools/gnulib-lib/propername.c \
+  ../../gettext-tools/gnulib-lib/strstr.h \
+  ../../gettext-tools/gnulib-lib/unlocked-io.h \
+  ../../gettext-tools/gnulib-lib/xalloc.h ../../gettext-tools/gnulib-lib/xmalloc.c ../../gettext-tools/gnulib-lib/xstrdup.c \
+  ../../gettext-tools/gnulib-lib/xreadlink.h ../../gettext-tools/gnulib-lib/xreadlink.c
 
 # Sources that are compiled only on platforms that lack the functions.
 
 LIBADD_SOURCE = \
   atexit.c \
-  ../../gettext-tools/lib/canonicalize.h canonicalize.c \
+  ../../gettext-tools/gnulib-lib/canonicalize.h canonicalize.c \
   error.h error.c \
-  getopt.c getopt1.c ../../gettext-tools/lib/getopt_int.h \
+  getopt.c getopt1.c ../../gettext-tools/gnulib-lib/getopt_int.h \
   memmove.c \
   readlink.c \
-  ../../gettext-tools/lib/relocatable.h relocatable.c \
-  ../../gettext-tools/lib/setenv.h setenv.c unsetenv.c \
+  ../../gettext-tools/gnulib-lib/relocatable.h relocatable.c \
+  ../../gettext-tools/gnulib-lib/setenv.h setenv.c unsetenv.c \
   strerror.c \
   strtoul.c
 
@@ -68,7 +68,7 @@ AM_CPPFLAGS = \
   -I. -I$(srcdir) \
   -I.. \
   -I../intl -I$(srcdir)/../intl \
-  -I../../gettext-tools/lib -I$(srcdir)/../../gettext-tools/lib
+  -I../../gettext-tools/gnulib-lib -I$(srcdir)/../../gettext-tools/gnulib-lib
 
 DEFS = -DEXEEXT=\"$(EXEEXT)\" -DDEPENDS_ON_LIBINTL=1 @DEFS@
 
@@ -79,36 +79,36 @@ EXTRA_DIST += $(LIBADD_SOURCE)
 
 # >>> gnulib module stdbool.
 BUILT_SOURCES += $(STDBOOL_H)
-EXTRA_DIST += ../../gettext-tools/lib/stdbool_.h
+EXTRA_DIST += ../../gettext-tools/gnulib-lib/stdbool_.h
 
 # The following is needed in order to create an <stdbool.h> when the system
 # doesn't have one that works.
-stdbool.h: ../../gettext-tools/lib/stdbool_.h
-	sed -e 's/@''HAVE__BOOL''@/@HAVE__BOOL@/g' < $(srcdir)/../../gettext-tools/lib/stdbool_.h > stdbool.h
+stdbool.h: ../../gettext-tools/gnulib-lib/stdbool_.h
+	sed -e 's/@''HAVE__BOOL''@/@HAVE__BOOL@/g' < $(srcdir)/../../gettext-tools/gnulib-lib/stdbool_.h > stdbool.h
 MOSTLYCLEANFILES += stdbool.h
 # <<< gnulib module stdbool.
 
 
 # >>> gnulib module alloca.
 BUILT_SOURCES += $(ALLOCA_H)
-EXTRA_DIST += ../../gettext-tools/lib/alloca_.h
+EXTRA_DIST += ../../gettext-tools/gnulib-lib/alloca_.h
 
 # The following is needed in order to create an <alloca.h> when the system
 # doesn't have one that works with the given compiler.
-alloca.h: ../../gettext-tools/lib/alloca_.h
-	cp $(srcdir)/../../gettext-tools/lib/alloca_.h alloca.h
+alloca.h: ../../gettext-tools/gnulib-lib/alloca_.h
+	cp $(srcdir)/../../gettext-tools/gnulib-lib/alloca_.h alloca.h
 MOSTLYCLEANFILES += alloca.h
 # <<< gnulib module alloca.
 
 
 # >>> gnulib module getopt.
 BUILT_SOURCES += $(GETOPT_H)
-EXTRA_DIST += ../../gettext-tools/lib/getopt_.h ../../gettext-tools/lib/getopt_int.h
+EXTRA_DIST += ../../gettext-tools/gnulib-lib/getopt_.h ../../gettext-tools/gnulib-lib/getopt_int.h
 
 # The following is needed in order to create a <getopt.h> when the system
 # doesn't have one that works.
-getopt.h: ../../gettext-tools/lib/getopt_.h
-	cp $(srcdir)/../../gettext-tools/lib/getopt_.h getopt.h
+getopt.h: ../../gettext-tools/gnulib-lib/getopt_.h
+	cp $(srcdir)/../../gettext-tools/gnulib-lib/getopt_.h getopt.h
 MOSTLYCLEANFILES += getopt.h
 # <<< gnulib module getopt.
 
diff --git a/gettext-runtime/lib/atexit.c b/gettext-runtime/lib/atexit.c
index b464b15..c3ba80d 100644
--- a/gettext-runtime/lib/atexit.c
+++ b/gettext-runtime/lib/atexit.c
@@ -1 +1 @@
-#include "../../gettext-tools/lib/atexit.c"
+#include "../../gettext-tools/gnulib-lib/atexit.c"
diff --git a/gettext-runtime/lib/canonicalize.c b/gettext-runtime/lib/canonicalize.c
index 6b90f59..94d971d 100644
--- a/gettext-runtime/lib/canonicalize.c
+++ b/gettext-runtime/lib/canonicalize.c
@@ -1 +1 @@
-#include "../../gettext-tools/lib/canonicalize.c"
+#include "../../gettext-tools/gnulib-lib/canonicalize.c"
diff --git a/gettext-runtime/lib/error.c b/gettext-runtime/lib/error.c
index 60291d3..44318e8 100644
--- a/gettext-runtime/lib/error.c
+++ b/gettext-runtime/lib/error.c
@@ -1 +1 @@
-#include "../../gettext-tools/lib/error.c"
+#include "../../gettext-tools/gnulib-lib/error.c"
diff --git a/gettext-runtime/lib/error.h b/gettext-runtime/lib/error.h
index a447ff8..e128beb 100644
--- a/gettext-runtime/lib/error.h
+++ b/gettext-runtime/lib/error.h
@@ -1 +1 @@
-#include "../../gettext-tools/lib/error.h"
+#include "../../gettext-tools/gnulib-lib/error.h"
diff --git a/gettext-runtime/lib/getopt.c b/gettext-runtime/lib/getopt.c
index 096704a..4c27f78 100644
--- a/gettext-runtime/lib/getopt.c
+++ b/gettext-runtime/lib/getopt.c
@@ -1 +1 @@
-#include "../../gettext-tools/lib/getopt.c"
+#include "../../gettext-tools/gnulib-lib/getopt.c"
diff --git a/gettext-runtime/lib/getopt1.c b/gettext-runtime/lib/getopt1.c
index 4fa5d56..49ce294 100644
--- a/gettext-runtime/lib/getopt1.c
+++ b/gettext-runtime/lib/getopt1.c
@@ -1 +1 @@
-#include "../../gettext-tools/lib/getopt1.c"
+#include "../../gettext-tools/gnulib-lib/getopt1.c"
diff --git a/gettext-runtime/lib/memmove.c b/gettext-runtime/lib/memmove.c
index f94a3c2..b704dc1 100644
--- a/gettext-runtime/lib/memmove.c
+++ b/gettext-runtime/lib/memmove.c
@@ -1 +1 @@
-#include "../../gettext-tools/lib/memmove.c"
+#include "../../gettext-tools/gnulib-lib/memmove.c"
diff --git a/gettext-runtime/lib/readlink.c b/gettext-runtime/lib/readlink.c
index 736d74a..dbca7ef 100644
--- a/gettext-runtime/lib/readlink.c
+++ b/gettext-runtime/lib/readlink.c
@@ -1 +1 @@
-#include "../../gettext-tools/lib/readlink.c"
+#include "../../gettext-tools/gnulib-lib/readlink.c"
diff --git a/gettext-runtime/lib/relocatable.c b/gettext-runtime/lib/relocatable.c
index 1a5645b..6cdb669 100644
--- a/gettext-runtime/lib/relocatable.c
+++ b/gettext-runtime/lib/relocatable.c
@@ -1 +1 @@
-#include "../../gettext-tools/lib/relocatable.c"
+#include "../../gettext-tools/gnulib-lib/relocatable.c"
diff --git a/gettext-runtime/lib/setenv.c b/gettext-runtime/lib/setenv.c
index 98cd12f..d5b90db 100644
--- a/gettext-runtime/lib/setenv.c
+++ b/gettext-runtime/lib/setenv.c
@@ -1 +1 @@
-#include "../../gettext-tools/lib/setenv.c"
+#include "../../gettext-tools/gnulib-lib/setenv.c"
diff --git a/gettext-runtime/lib/strerror.c b/gettext-runtime/lib/strerror.c
index 6f4ff97..cbfa768 100644
--- a/gettext-runtime/lib/strerror.c
+++ b/gettext-runtime/lib/strerror.c
@@ -1 +1 @@
-#include "../../gettext-tools/lib/strerror.c"
+#include "../../gettext-tools/gnulib-lib/strerror.c"
diff --git a/gettext-runtime/lib/strtoul.c b/gettext-runtime/lib/strtoul.c
index 8d45ae6..8f5f620 100644
--- a/gettext-runtime/lib/strtoul.c
+++ b/gettext-runtime/lib/strtoul.c
@@ -1 +1 @@
-#include "../../gettext-tools/lib/strtoul.c"
+#include "../../gettext-tools/gnulib-lib/strtoul.c"
diff --git a/gettext-runtime/lib/unsetenv.c b/gettext-runtime/lib/unsetenv.c
index 5412811..bd9aabb 100644
--- a/gettext-runtime/lib/unsetenv.c
+++ b/gettext-runtime/lib/unsetenv.c
@@ -1 +1 @@
-#include "../../gettext-tools/lib/unsetenv.c"
+#include "../../gettext-tools/gnulib-lib/unsetenv.c"
diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog
index 45a7d7c..33de8ae 100644
--- a/gettext-runtime/src/ChangeLog
+++ b/gettext-runtime/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-30  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.am (AM_CPPFLAGS): Replace gettext-tools/lib with
+	gettext-tools/gnulib-lib.
+
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.msvc: Remove file.
diff --git a/gettext-runtime/src/Makefile.am b/gettext-runtime/src/Makefile.am
index a68b917..548c961 100644
--- a/gettext-runtime/src/Makefile.am
+++ b/gettext-runtime/src/Makefile.am
@@ -30,7 +30,7 @@ AM_CPPFLAGS = \
   -I.. \
   -I../intl -I$(srcdir)/../intl \
   -I../lib -I$(srcdir)/../lib \
-  -I../../gettext-tools/lib -I$(srcdir)/../../gettext-tools/lib
+  -I../../gettext-tools/gnulib-lib -I$(srcdir)/../../gettext-tools/gnulib-lib
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 # Source dependencies.