Use gnulib inside gettext-runtime directory.

15 files changed, 96 insertions, 43 deletions

diff --git a/ChangeLog b/ChangeLog
index de97e9d..8176354 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-31  Bruno Haible  <bruno@clisp.org>
+
+	* autogen.sh: Invoke gnulib-tool inside gettext-runtime directory.
+	Append gettext-runtime/gnulib-m4 to the macro search path; remove
+	references to gettext-tools from gettext-runtime.
+
 2006-08-02  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.am (SUBDIRS): Add gnulib-local.
diff --git a/autogen.sh b/autogen.sh
index f48d0de..16a6673 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -51,6 +51,32 @@ fi
 # Skip the gnulib-tool step if gnulib-tool was not found.
 if test -n "$GNULIB_TOOL"; then
   # In gettext-runtime:
+  GNULIB_MODULES_FOR_SRC='
+  atexit
+  basename
+  closeout
+  error
+  exit
+  getopt
+  gettext-h
+  memmove
+  progname
+  propername
+  relocatable
+  relocwrapper
+  stdbool
+  strtoul
+  unlocked-io
+  xalloc
+  '
+  GNULIB_MODULES_OTHER='
+  gettext-runtime-misc
+  csharpcomp-script
+  java
+  javacomp-script
+  '
+  $GNULIB_TOOL --dir=gettext-runtime --lib=libgrt --source-base=gnulib-lib --m4-base=gnulib-m4 --no-libtool --local-dir=gnulib-local \
+    --import $GNULIB_MODULES_FOR_SRC $GNULIB_MODULES_OTHER
   # In gettext-tools:
   GNULIB_MODULES_FOR_SRC='
   alloca-opt
@@ -148,7 +174,7 @@ fi
 )
 
 (cd gettext-runtime
- aclocal -I m4 -I ../gettext-tools/m4 -I ../gettext-tools/gnulib-m4 -I ../autoconf-lib-link/m4 -I ../m4
+ aclocal -I m4 -I gnulib-m4 -I ../autoconf-lib-link/m4 -I ../m4
  autoconf
  autoheader && touch config.h.in
  automake
diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 3791342..adf1877 100644
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,20 @@
+2006-07-31  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.am (ACLOCAL_AMFLAGS): Append gnulib-m4. Remove
+	../gettext-tools/m4 and ../gettext-tools/gnulib-m4.
+	(SUBDIRS): Replace lib with gnulib-lib.
+	* configure.ac (AC_PREREQ): Bump to 2.59.
+	(gl_EARLY): Invoke.
+	(AC_GNU_SOURCE, gl_USE_SYSTEM_EXTENSIONS): Remove invocations.
+	(gl_INIT): Invoke.
+	(string.h, AM_STDBOOL_H, gl_ALLOCSA, strerror, strstr, atexit, memmove,
+	gl_GETOPT, gt_FUNC_SETENV, gl_FUNC_STRERROR, gl_FUNC_STRTOUL,
+	gl_FUNC_GLIBC_UNLOCKED_IO, gl_ERROR, gl_PATHMAX, gl_FUNC_READLINK,
+	gl_XREADLINK, gl_CANONICALIZE): Remove tests done directly or
+	indirectly by gl_INIT.
+	(AC_CONFIG_FILES): Add gnulib-lib/Makefile, remove lib/Makefile.
+	Remove lib/javacomp.sh, lib/csharpcomp.sh.
+
 2006-07-30  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.am (ACLOCAL_AMFLAGS): Append ../gettext-tools/gnulib-m4.
diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am
index 6d5bf14..9393ccb 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 ../gettext-tools/gnulib-m4 -I ../autoconf-lib-link/m4 -I ../m4
+ACLOCAL_AMFLAGS = -I m4 -I gnulib-m4 -I ../autoconf-lib-link/m4 -I ../m4
 
 MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@
 
@@ -29,7 +29,7 @@ SUBDIR_libasprintf = libasprintf
 else
 SUBDIR_libasprintf =
 endif
-SUBDIRS = doc intl intl-java intl-csharp lib $(SUBDIR_libasprintf) src po man m4 tests
+SUBDIRS = doc intl intl-java intl-csharp gnulib-lib $(SUBDIR_libasprintf) src po man m4 tests
 
 EXTRA_DIST = BUGS
 
diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index a5b4149..03f6426 100644
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -17,7 +17,7 @@ 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_PREREQ([2.59])
 AC_INIT
 AC_CONFIG_SRCDIR(intl/dcigettext.c)
 AC_CONFIG_AUX_DIR(../build-aux)
@@ -60,8 +60,7 @@ AC_OBJEXT
 AC_EXEEXT
 
 dnl Make sure we see all GNU and Solaris extensions.
-AC_GNU_SOURCE
-gl_USE_SYSTEM_EXTENSIONS
+gl_EARLY
 
 dnl Check for build configuration.
 gl_WOE32_DLL
@@ -76,27 +75,10 @@ dnl These are the only lines required to internationalize the package.
 dnl (OK, not quite, the AC_CONFIG_FILES has also some parts.)
 AM_GNU_GETTEXT(use-libtool, need-ngettext)
 
-dnl Checks for header files.
-AC_CHECK_HEADERS(string.h)
-AM_STDBOOL_H
-
-dnl Checks for typedefs, structures, and compiler characteristics.
+dnl Checks for header files, functions and declarations.
+gl_INIT
 AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-gl_ALLOCSA
-AC_CHECK_FUNCS([setlocale strerror strstr])
-AC_REPLACE_FUNCS([atexit memmove])
-gl_GETOPT
-gt_FUNC_SETENV
-gl_FUNC_STRERROR
-gl_FUNC_STRTOUL
-gl_FUNC_GLIBC_UNLOCKED_IO
-gl_ERROR
-gl_PATHMAX
-gl_FUNC_READLINK
-gl_XREADLINK
-gl_CANONICALIZE
+AC_CHECK_FUNCS([setlocale])
 
 dnl Put some default definitions into config.h.
 AH_BOTTOM([
@@ -158,10 +140,8 @@ AC_CONFIG_FILES([intl-java/Makefile])
 
 AC_CONFIG_FILES([intl-csharp/Makefile])
 
-AC_CONFIG_FILES([lib/Makefile],
+AC_CONFIG_FILES([gnulib-lib/Makefile],
                 [FIX_MAKEFILE_COMPILE])
-AC_CONFIG_FILES([lib/javacomp.sh:../build-aux/javacomp.sh.in])
-AC_CONFIG_FILES([lib/csharpcomp.sh:../build-aux/csharpcomp.sh.in])
 
 AC_CONFIG_FILES([src/Makefile],
                 [FIX_MAKEFILE_COMPILE])
diff --git a/gettext-runtime/intl-csharp/ChangeLog b/gettext-runtime/intl-csharp/ChangeLog
index 2352790..b8eae45 100644
--- a/gettext-runtime/intl-csharp/ChangeLog
+++ b/gettext-runtime/intl-csharp/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-31  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.am (CSHARPCOMP): Update for changed location of
+	csharpcomp.sh.
+
 2006-07-21  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.15 released.
diff --git a/gettext-runtime/intl-csharp/Makefile.am b/gettext-runtime/intl-csharp/Makefile.am
index 46864af..ea7a9fb 100644
--- a/gettext-runtime/intl-csharp/Makefile.am
+++ b/gettext-runtime/intl-csharp/Makefile.am
@@ -23,7 +23,7 @@ CLEANFILES =
 
 RM = rm -f
 
-CSHARPCOMP = $(SHELL) ../lib/csharpcomp.sh
+CSHARPCOMP = $(SHELL) ../csharpcomp.sh
 CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@
 
 
diff --git a/gettext-runtime/intl-java/ChangeLog b/gettext-runtime/intl-java/ChangeLog
index d380213..4dbd82b 100644
--- a/gettext-runtime/intl-java/ChangeLog
+++ b/gettext-runtime/intl-java/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-31  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.am (JAVACOMP): Update for changed location of javacomp.sh.
+
 2006-07-21  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.15 released.
diff --git a/gettext-runtime/intl-java/Makefile.am b/gettext-runtime/intl-java/Makefile.am
index 86a2bf7..0a2425b 100644
--- a/gettext-runtime/intl-java/Makefile.am
+++ b/gettext-runtime/intl-java/Makefile.am
@@ -26,7 +26,7 @@ RM = rm -f
 jardir = $(datadir)/gettext
 
 JAR = @JAR@
-JAVACOMP = $(SHELL) ../lib/javacomp.sh
+JAVACOMP = $(SHELL) ../javacomp.sh
 JAVADOC1 = test ! -d /usr/lib/jdk1.1.8 || env PATH=/usr/lib/jdk1.1.8/bin:$$PATH javadoc
 JAVADOC2 = test ! -d /usr/lib/jdk1.3.1 || env PATH=/usr/lib/jdk1.3.1/bin:$$PATH javadoc
 
diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index 2f67d45..db2741a 100644
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-31  Bruno Haible  <bruno@clisp.org>
+
+	* POTFILES.in: Refer to gnulib-lib/ instead of ../gettext-tools/lib/.
+
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
 	* Rules-msvc: Remove file.
diff --git a/gettext-runtime/po/POTFILES.in b/gettext-runtime/po/POTFILES.in
index 5c2329e..cbff73f 100644
--- a/gettext-runtime/po/POTFILES.in
+++ b/gettext-runtime/po/POTFILES.in
@@ -1,14 +1,14 @@
 # List of files which contain translatable strings.
-# Copyright (C) 1995, 1998, 2001-2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1998, 2001-2003, 2005-2006 Free Software Foundation, Inc.
 
 # For updating this file, look at the result of:
-#   $ LC_ALL=C grep -l '[^A-Za-z_]_(' {lib,src}/*.[chly]
+#   $ LC_ALL=C grep -l '[^A-Za-z_]_(' {gnulib-lib,src}/*.[chly]
 
-# Files from the compatibility library
-../gettext-tools/lib/closeout.c
-../gettext-tools/lib/error.c
-../gettext-tools/lib/getopt.c
-../gettext-tools/lib/xmalloc.c
+# Files from the portability library
+gnulib-lib/closeout.c
+gnulib-lib/error.c
+gnulib-lib/getopt.c
+gnulib-lib/xmalloc.c
 
 # Package source files
 src/envsubst.c
diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog
index 33de8ae..19e88f7 100644
--- a/gettext-runtime/src/ChangeLog
+++ b/gettext-runtime/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-31  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.am (AM_CPPFLAGS, LDADD, RELOCATABLE_SRC_DIR,
+	RELOCATABLE_BUILD_DIR): Replace lib and ../gettext-tools/lib with
+	gnulib-lib.
+
 2006-07-30  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.am (AM_CPPFLAGS): Replace gettext-tools/lib with
diff --git a/gettext-runtime/src/Makefile.am b/gettext-runtime/src/Makefile.am
index 548c961..289d360 100644
--- a/gettext-runtime/src/Makefile.am
+++ b/gettext-runtime/src/Makefile.am
@@ -29,8 +29,7 @@ AM_CPPFLAGS = \
   -I. -I$(srcdir) \
   -I.. \
   -I../intl -I$(srcdir)/../intl \
-  -I../lib -I$(srcdir)/../lib \
-  -I../../gettext-tools/gnulib-lib -I$(srcdir)/../../gettext-tools/gnulib-lib
+  -I../gnulib-lib -I$(srcdir)/../gnulib-lib
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 # Source dependencies.
@@ -40,7 +39,7 @@ envsubst_SOURCES = envsubst.c
 
 # Link dependencies.
 # Need @LTLIBICONV@ because iconvstring.c uses iconv().
-LDADD = ../lib/libgrt.a @LTLIBINTL@ @LTLIBICONV@
+LDADD = ../gnulib-lib/libgrt.a @LTLIBINTL@ @LTLIBICONV@
 
 # Specify installation directory, for --enable-relocatable.
 gettext_CFLAGS = -DINSTALLDIR=\"$(bindir)\"
@@ -58,7 +57,7 @@ DISTCLEANFILES += gettext.sh
 
 # Support for relocatability.
 RELOCATABLE_LIBRARY_PATH = $(libdir)
-RELOCATABLE_SRC_DIR = $(top_srcdir)/../gettext-tools/lib
-RELOCATABLE_BUILD_DIR = ../lib
+RELOCATABLE_SRC_DIR = $(top_srcdir)/gnulib-lib
+RELOCATABLE_BUILD_DIR = ../gnulib-lib
 RELOCATABLE_CONFIG_H_DIR = ..
 @SET_RELOCATABLE@
diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 309194b..ed54514 100644
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-31  Bruno Haible  <bruno@clisp.org>
+
+	* modules/gettext-runtime-misc: New file.
+	* Makefile.am (EXTRA_DIST): Add it.
+
 2006-08-02  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.am: New file.
diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 5ee0100..75dd021 100644
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -112,6 +112,7 @@ modules/gcj \
 modules/gen-lbrkprop \
 modules/getline \
 modules/getndelim2 \
+modules/gettext-runtime-misc \
 modules/gettext-tools-misc \
 modules/hash \
 modules/iconvstring \