Start using gnulib.

diff --git a/ChangeLog b/ChangeLog
index dbb390cf7bc9f8c0dd870ea90ed736921708bf99..5b7789ec8ff2129c8a2f1a49e4c9eecfa1ce7956 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-30  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-local: New directory.
+       * autogen.sh: Invoke gnulib-tool inside gettext-tools directory.
+       Append gettext-tools/gnulib-m4 to the macro search path.
+
 2006-07-30  Bruno Haible  <bruno@clisp.org>
 
        * build-aux/csharpcomp.sh.in: Move here from

diff --git a/autogen.sh b/autogen.sh
index 7dec7ba6631648d9d7e0f48be2d63968fc42d71b..d2637b1eae65efccb45a26c631717ec489e76eb3 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,6 +3,8 @@
 # configure files with new versions of autoconf or automake.
 #
 # This script requires autoconf-2.60 and automake-1.8.2..1.9 in the PATH.
+# It also requires the GNULIB_TOOL environment variable pointing to the
+# gnulib-tool script in a gnulib checkout.
 
 # Copyright (C) 2003-2006 Free Software Foundation, Inc.
 #
@@ -28,6 +30,98 @@ else
   quick=false
 fi
 
+if test -n "$GNULIB_TOOL"; then
+  # In gettext-runtime:
+  # In gettext-tools:
+  GNULIB_MODULES_FOR_SRC='
+  alloca-opt
+  atexit
+  backupfile
+  basename
+  binary-io
+  bison-i18n
+  byteswap
+  c-ctype
+  c-strcase
+  c-strcasestr
+  c-strstr
+  clean-temp
+  closeout
+  copy-file
+  csharpcomp
+  csharpexec
+  error
+  error-progname
+  execute
+  exit
+  findprog
+  fnmatch-posix
+  fstrcmp
+  full-write
+  fwriteerror
+  gcd
+  getline
+  getopt
+  gettext-h
+  hash
+  iconv
+  iconvstring
+  javacomp
+  javaexec
+  linebreak
+  localcharset
+  lock
+  memmove
+  memset
+  minmax
+  obstack
+  pathname
+  pipe
+  progname
+  propername
+  relocatable
+  relocwrapper
+  sh-quote
+  stdbool
+  stpcpy
+  stpncpy
+  strcspn
+  strpbrk
+  strtol
+  strtoul
+  ucs4-utf8
+  unistd
+  unlocked-io
+  utf8-ucs4
+  utf16-ucs4
+  vasprintf
+  wait-process
+  xalloc
+  xallocsa
+  xerror
+  xsetenv
+  xvasprintf
+  '
+  # Not yet used. Add some files to gettext-tools-misc instead.
+  GNULIB_MODULES_FOR_LIBGREP='
+  error
+  exitfail
+  gettext-h
+  hard-locale
+  obstack
+  regex
+  stdbool
+  xalloc
+  '
+  GNULIB_MODULES_OTHER='
+  gettext-tools-misc
+  gcj
+  java
+  '
+  $GNULIB_TOOL --dir=gettext-tools --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --libtool --local-dir=gnulib-local \
+    --import $GNULIB_MODULES_FOR_SRC $GNULIB_MODULES_OTHER
+fi
+
 aclocal
 autoconf
 automake
@@ -39,7 +133,7 @@ automake
 )
 
 (cd gettext-runtime
- aclocal -I m4 -I ../gettext-tools/m4 -I ../autoconf-lib-link/m4 -I ../m4
+ aclocal -I m4 -I ../gettext-tools/m4 -I ../gettext-tools/gnulib-m4 -I ../autoconf-lib-link/m4 -I ../m4
  autoconf
  autoheader && touch config.h.in
  automake
@@ -55,7 +149,7 @@ automake
 cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS
 
 (cd gettext-tools
- aclocal -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4
+ aclocal -I m4 -I gnulib-m4 -I ../gettext-runtime/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 f134a0a90b32d87db48309fcb416281d0c628ee6..379134253d52a25af72f02cf81994d0f02f4a239 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,7 @@
+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

diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am
index 036c0e4f7d379a65c51c40a932f55a70f4f2638d..6d5bf1432ec8753ee26841ae37342671734e1cb6 100644 (file)
--- 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 1a5298c998ce31a89b602e714cc45186d0049dd6..f334e9b99cfd82b074d2683dfe26b0d78cfd27c5 100644 (file)
--- a/gettext-runtime/lib/ChangeLog
+++ b/gettext-runtime/lib/ChangeLog
@@ -1,3 +1,22 @@
+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.

diff --git a/gettext-runtime/lib/Makefile.am b/gettext-runtime/lib/Makefile.am
index 3d7ce0968a01ec688f5c7d22e3a6177f06d6dfa4..4ee8762d9d224fc0efd6622fcc5995a305e33f85 100644 (file)
--- 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 b464b158960414814c1d52154c3efa07ada7d90f..c3ba80dd82b8768d6e89cbd3b1c8ed294cdbeaaf 100644 (file)
--- 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 6b90f595b566ec2bdbf1eff2cc17db999bcb5ba6..94d971d19f46117483b445753a21f6e3d1595e70 100644 (file)
--- 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 60291d3b7fda4d444f9db294d5c45714584c1a0f..44318e8c06971820de2bd77680fb08a7b96fa3df 100644 (file)
--- 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 a447ff857d210fd8ef4dff7173dfd299d7d634b9..e128bebbec8c3b8401c447e9e98ef37143bf3794 100644 (file)
--- 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 096704a1ebe3a9e4eada6ba8802a6a9c5c16d8c5..4c27f7852c6b8120779fb64bca79dc247a199164 100644 (file)
--- 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 4fa5d560f0f440953e339692c1e578478111960b..49ce294c386134e5a6a8d90ab72dd4d2f2010f48 100644 (file)
--- 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 f94a3c2b27b9189cc395fa328d5f67548ce668ef..b704dc1e4947871f0a07c143aa81e36ec7928521 100644 (file)
--- 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 736d74a2f012a50c824e1bea0406e314cd4440c3..dbca7ef13c278ef0cb57e458d0bc60e8db3dee9f 100644 (file)
--- 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 1a5645b26374973f1a398e0e2463448257f58f87..6cdb6694413c420b678934d050af7d234aaac334 100644 (file)
--- 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 98cd12ffba732b6dffcf61eb8ab4e7318e91fd93..d5b90db1b824ae6cd0fb6dbb4a7ae4a4ccce24d6 100644 (file)
--- 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 6f4ff97acb8132f9f0fdb839ddafbd9364839940..cbfa768176f5c7dd3be02b2bf3995237e49767ea 100644 (file)
--- 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 8d45ae6e4cd98a48f6bb2bbbe6bff6d9f46bdab5..8f5f6203796957719293dfccaddd099013291031 100644 (file)
--- 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 5412811058e438e6d7ee66b0bc612ad1365ddd3f..bd9aabb420b2036cee38f8a13fb1e1b7cc164bf1 100644 (file)
--- 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 45a7d7c182635677b53b9c96658890b70d100d3e..33de8aefdc68af8b0c3bee56ab1efd3d7beb2049 100644 (file)
--- 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 a68b91723986cb4be3ef9b179260c51eed3f8f39..548c961cad3cc3445534692d3e0b08866310af87 100644 (file)
--- 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.

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index def1444e77bc93dc0ec70f801ac2c494eb75f089..ce0b010893636c380869259a710ce0e618f2bbb4 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,30 @@
+2006-07-30  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Append gnulib-m4 to search path.
+       (SUBDIRS): Replace lib with gnulib-lib.
+       (examplesbuildauxdir, examplesbuildaux_DATA): New variables.
+       * configure.ac (AC_PREREQ): Bump to 2.59.
+       (gl_EARLY): Invoke.
+       (AC_GNU_SOURCE, gl_USE_SYSTEM_EXTENSIONS): Remove invocations.
+       (gl_INIT): Invoke.
+       (limits.h, malloc.h, string.h, unistd.h, utime.h, values.h,
+       gl_STDARG_H, AM_STDBOOL_H, gl_HEADER_UNISTD, gl_AC_TYPE_UINTMAX_T,
+       AC_TYPE_MODE_T, gt_TYPE_SIG_ATOMIC_T, gl_SIZE_MAX, gl_ALLOCSA,
+       chown, getcwd, posix_spawn, raise, strerror, strtoul, uname, utime,
+       utimes, waitid, atexit, memmove, memset, stpcpy, strcspn, strpbrk,
+       vasprintf, AM_FUNC_GETLINE, getdelim, gl_EXITFAIL,
+       gl_FUNC_FNMATCH_POSIX, gl_GETOPT, gl_FUNC_EACCESS, gl_FUNC_STPNCPY,
+       gl_FUNC_STRTOUL, gl_FUNC_WCWIDTH, gl_MBSWIDTH, gt_PREREQ_BACKUPFILE,
+       gt_UNION_WAIT, gt_TMPDIR, gt_FUNC_MKDTEMP, gt_SIGNALBLOCKING,
+       gt_FUNC_SETENV, gl_FUNC_STRERROR, gl_FUNC_GLIBC_UNLOCKED_IO, gl_ERROR,
+       gl_QUOTEARG, gl_QUOTE, gl_PATHMAX, gl_FUNC_READLINK, gl_XREADLINK,
+       gl_CANONICALIZE, gl_XSIZE, gl_MINMAX, gl_LIST, gl_LOCK, gl_TLS,
+       gl_BYTESWAP): Remove tests done directly or indirectly by gl_INIT
+       or that are now unused.
+       (AC_CONFIG_FILES): Add gnulib-lib/Makefile, remove lib/Makefile.
+       Remove lib/javacomp.sh, lib/javaexec.sh, lib/csharpcomp.sh,
+       lib/csharpexec.sh.
+
 2006-07-30  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac: Don't test for the strstr function.

diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
index 7627f53c5fe7126e77385a54e92d3245e64ad3e2..cac35624434905ee84613e496800819b8161fac5 100644 (file)
--- a/gettext-tools/Makefile.am
+++ b/gettext-tools/Makefile.am
@@ -18,9 +18,9 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
-ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4
+ACLOCAL_AMFLAGS = -I m4 -I gnulib-m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4
 
-SUBDIRS = doc intl lib libgrep libuniname src po projects misc man m4 tests examples
+SUBDIRS = doc intl gnulib-lib libgrep libuniname src po projects misc man m4 tests examples
 
 EXTRA_DIST = misc/DISCLAIM
 MOSTLYCLEANFILES = core *.stackdump
@@ -32,6 +32,14 @@ gettextsrcdir = $(datadir)/gettext
 gettextsrc_SCRIPTS = ../autoconf-lib-link/config.rpath
 
 
+# Files installed for the examples.
+
+examplesbuildauxdir = $(docdir)/examples/build-aux
+examplesbuildaux_DATA = \
+  ../build-aux/javacomp.sh.in ../build-aux/javaexec.sh.in \
+  ../build-aux/csharpcomp.sh.in ../build-aux/csharpexec.sh.in
+
+
 # Files copied from other directories.
 
 all-local: $(srcdir)/ABOUT-NLS

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 3be63341fe9f2bdd6c8a7d2118b4e0f5a6c20e0f..36707679aad4a70e49f27eb1f2a5eee2f4a83e7f 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/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(src/msgfmt.c)
 AC_CONFIG_AUX_DIR(../build-aux)
@@ -83,8 +83,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
@@ -130,11 +129,11 @@ AC_SUBST([MSGMERGE_LIBM])
 dnl Test for compiler flags needed to support OpenMP.
 gt_OPENMP
 
+dnl Checks for header files, functions and declarations.
+gl_INIT
+
 dnl Checks for header files.
-AC_CHECK_HEADERS(limits.h malloc.h pwd.h string.h unistd.h utime.h values.h)
-gl_STDARG_H
-AM_STDBOOL_H
-gl_HEADER_UNISTD
+AC_CHECK_HEADERS(pwd.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
@@ -142,59 +141,19 @@ bh_C_SIGNED
 gl_AC_TYPE_UNSIGNED_LONG_LONG
 AC_TYPE_SIZE_T
 AC_CHECK_TYPES(ptrdiff_t)
-gl_AC_TYPE_UINTMAX_T
 gt_TYPE_SSIZE_T
 AC_TYPE_PID_T
-AC_TYPE_MODE_T
-gt_TYPE_SIG_ATOMIC_T
-gl_SIZE_MAX
 gl_GLIBC21
 if test $GLIBC21 = yes; then
   AC_CHECK_MEMBERS([struct __locale_struct.__names], , , [#include <xlocale.h>])
 fi
 
 dnl Checks for library functions.
-gl_ALLOCSA
-AC_CHECK_FUNCS([chown getcwd posix_spawn raise select strerror strtoul uname \
-utime utimes waitid])
-AC_REPLACE_FUNCS([atexit memmove memset stpcpy strcspn strpbrk vasprintf])
-AM_FUNC_GETLINE
-if test $am_cv_func_working_getline != yes; then
-  AC_CHECK_FUNCS(getdelim)
-fi
-gl_EXITFAIL
-gl_FUNC_FNMATCH_POSIX
-gl_GETOPT
-gl_FUNC_EACCESS
-gl_FUNC_STPNCPY
-gl_FUNC_STRTOUL
-gl_FUNC_WCWIDTH
-gl_MBSWIDTH
-gt_PREREQ_BACKUPFILE
+AC_CHECK_FUNCS([select])
 AC_FUNC_VFORK
-gt_UNION_WAIT
-gt_TMPDIR
-gt_FUNC_MKDTEMP
-gt_SIGNALBLOCKING
 gt_SIGINFO
-gt_FUNC_SETENV
-gl_FUNC_STRERROR
-gl_FUNC_GLIBC_UNLOCKED_IO
-gl_ERROR
-gl_QUOTEARG
-gl_QUOTE
-gl_PATHMAX
-gl_FUNC_READLINK
-gl_XREADLINK
-gl_CANONICALIZE
 gt_SETLOCALE
-gl_XSIZE
-gl_MINMAX
-gl_LIST
-gl_LOCK
-gl_TLS
 gt_LIBGREP
-gl_BYTESWAP
 AC_C_BIGENDIAN([endianness=1], [endianness=0],
   [echo "AC-C-BIGENDIAN fails to work on your system." | sed -e 's,-,_,g' 1>&2
    echo "Please report this as a bug to bug-autoconf@gnu.org" 1>&2
@@ -363,12 +322,8 @@ AC_CONFIG_FILES([intl/Makefile:../gettext-runtime/intl/Makefile.in], [
   mv intl/Makefile.tmp intl/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/javaexec.sh:../build-aux/javaexec.sh.in])
-AC_CONFIG_FILES([lib/csharpcomp.sh:../build-aux/csharpcomp.sh.in])
-AC_CONFIG_FILES([lib/csharpexec.sh:../build-aux/csharpexec.sh.in])
 
 AC_CONFIG_FILES([libgrep/Makefile],
                 [FIX_MAKEFILE_COMPILE])

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index c3c21b3ab5362a3ea2c5b24eb9dae04f12cee921..91b2e8d238fffdb022857c33e50c67b0ce502085 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-30  Bruno Haible  <bruno@clisp.org>
+
+       * hello-csharp*/autogen.sh: Update for changed location of
+       csharpcomp.sh.in and csharpexec.sh.in.
+       * hello-java*/autogen.sh: Update for changed location of
+       javacomp.sh.in and javaexec.sh.in.
+
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.msvc: Remove file.

diff --git a/gettext-tools/examples/hello-csharp-forms/autogen.sh b/gettext-tools/examples/hello-csharp-forms/autogen.sh
index f20a8947bf7c8550b755ad5be73a45ac198a7749..4b9980525531af31ff823c8d08fe55f1ea496e05 100755 (executable)
--- a/gettext-tools/examples/hello-csharp-forms/autogen.sh
+++ b/gettext-tools/examples/hello-csharp-forms/autogen.sh
@@ -33,8 +33,8 @@ cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharpcomp.m4 m4/
 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/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/lib}/csharpcomp.sh.in csharpcomp.sh.in
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/lib}/csharpexec.sh.in csharpexec.sh.in
+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
 
 aclocal -I m4
 

diff --git a/gettext-tools/examples/hello-csharp/autogen.sh b/gettext-tools/examples/hello-csharp/autogen.sh
index f20a8947bf7c8550b755ad5be73a45ac198a7749..4b9980525531af31ff823c8d08fe55f1ea496e05 100755 (executable)
--- a/gettext-tools/examples/hello-csharp/autogen.sh
+++ b/gettext-tools/examples/hello-csharp/autogen.sh
@@ -33,8 +33,8 @@ cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharpcomp.m4 m4/
 cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/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/lib}/csharpcomp.sh.in csharpcomp.sh.in
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/lib}/csharpexec.sh.in csharpexec.sh.in
+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
 
 aclocal -I m4
 

diff --git a/gettext-tools/examples/hello-java-awt/autogen.sh b/gettext-tools/examples/hello-java-awt/autogen.sh
index 8b5c473da8d22cfcb0b38318f52e64312f7d668a..bde254c1e9400d65d63d74922e22c6ca645d60e2 100755 (executable)
--- a/gettext-tools/examples/hello-java-awt/autogen.sh
+++ b/gettext-tools/examples/hello-java-awt/autogen.sh
@@ -32,8 +32,8 @@ cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.s
 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/lib}/javacomp.sh.in javacomp.sh.in
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/lib}/javaexec.sh.in javaexec.sh.in
+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
 
 aclocal -I m4
 

diff --git a/gettext-tools/examples/hello-java-swing/autogen.sh b/gettext-tools/examples/hello-java-swing/autogen.sh
index 8b5c473da8d22cfcb0b38318f52e64312f7d668a..bde254c1e9400d65d63d74922e22c6ca645d60e2 100755 (executable)
--- a/gettext-tools/examples/hello-java-swing/autogen.sh
+++ b/gettext-tools/examples/hello-java-swing/autogen.sh
@@ -32,8 +32,8 @@ cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.s
 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/lib}/javacomp.sh.in javacomp.sh.in
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/lib}/javaexec.sh.in javaexec.sh.in
+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
 
 aclocal -I m4
 

diff --git a/gettext-tools/examples/hello-java/autogen.sh b/gettext-tools/examples/hello-java/autogen.sh
index 8b5c473da8d22cfcb0b38318f52e64312f7d668a..bde254c1e9400d65d63d74922e22c6ca645d60e2 100755 (executable)
--- a/gettext-tools/examples/hello-java/autogen.sh
+++ b/gettext-tools/examples/hello-java/autogen.sh
@@ -32,8 +32,8 @@ cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.s
 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/lib}/javacomp.sh.in javacomp.sh.in
-cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/lib}/javaexec.sh.in javaexec.sh.in
+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
 
 aclocal -I m4
 

diff --git a/gettext-tools/libgrep/ChangeLog b/gettext-tools/libgrep/ChangeLog
index 4c1870eb8fc01f145bd4e3f028c05da6abf4918a..463d622d5b8aabc61211b221e609fcb1eebfd0fa 100644 (file)
--- a/gettext-tools/libgrep/ChangeLog
+++ b/gettext-tools/libgrep/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-30  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (AM_CPPFLAGS): Replace ../lib with ../gnulib-lib.
+
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.msvc: Remove file.

diff --git a/gettext-tools/libgrep/Makefile.am b/gettext-tools/libgrep/Makefile.am
index b5a8b75b2a2792e2ed2769b50c2b627312f698e8..9b0d1253a9875256286030ac4c4d647aef14bbc3 100644 (file)
--- a/gettext-tools/libgrep/Makefile.am
+++ b/gettext-tools/libgrep/Makefile.am
@@ -47,4 +47,4 @@ libgrep_a_DEPENDENCIES = @LIBGREPOBJS@
 
 EXTRA_DIST += $(LIBADD_SOURCE)
 
-AM_CPPFLAGS = -I.. -I../lib -I$(top_srcdir)/lib -I../intl
+AM_CPPFLAGS = -I.. -I../gnulib-lib -I$(top_srcdir)/gnulib-lib -I../intl

diff --git a/gettext-tools/libuniname/ChangeLog b/gettext-tools/libuniname/ChangeLog
index 4a0b97147cd5a2e74ba700eb0611a546cb8a648b..df9fc2224b9c10a8de6df40bd29a10037296697b 100644 (file)
--- a/gettext-tools/libuniname/ChangeLog
+++ b/gettext-tools/libuniname/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-30  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (AM_CPPFLAGS, test_names_LDADD): Replace ../lib with
+       ../gnulib-lib.
+
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.msvc: Remove file.

diff --git a/gettext-tools/libuniname/Makefile.am b/gettext-tools/libuniname/Makefile.am
index 9b0a589ea0e0393286bcf5010f8090321af73945..d0cec3b4b199ab8e1b7324f09f3b0d8ad16fa3a1 100644 (file)
--- a/gettext-tools/libuniname/Makefile.am
+++ b/gettext-tools/libuniname/Makefile.am
@@ -25,7 +25,7 @@ noinst_LIBRARIES = libuniname.a
 
 libuniname_a_SOURCES = uniname.h uniname.c uninames.h
 
-AM_CPPFLAGS = -I.. -I../lib -I$(top_srcdir)/lib
+AM_CPPFLAGS = -I.. -I../gnulib-lib -I$(top_srcdir)/gnulib-lib
 
 EXTRA_DIST += gen-uninames
 
@@ -36,6 +36,6 @@ TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) $(SHELL)
 noinst_PROGRAMS = test-names
 # INTL_MACOSX_LIBS is needed because libgettextlib.la depends on libintl.la
 # but libtool doesn't put -Wl,-framework options into .la files.
-test_names_LDADD = libuniname.a ../lib/libgettextlib.la @INTL_MACOSX_LIBS@
+test_names_LDADD = libuniname.a ../gnulib-lib/libgettextlib.la @INTL_MACOSX_LIBS@
 
 EXTRA_DIST += $(TESTS) UnicodeDataNames.txt

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
new file mode 100644 (file)
index 0000000..ce2fe2e
--- /dev/null
+++ b/gettext-tools/m4/ChangeLog
@@ -0,0 +1,18 @@
+2006-07-30  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (examplesbuildaux_DATA): Refer to ../gnulib-m4 directory.
+
+       * alloca.m4: Moved to ../../gnulib-local/m4/alloca.m4.
+       * backupfile.m4: Moved to ../../gnulib-local/m4/backupfile.m4.
+       * bison-i18n.m4: Moved to ../../gnulib-local/m4/bison-i18n.m4.
+       * canonicalize.m4: Moved to ../../gnulib-local/m4/canonicalize.m4.
+       * gcj.m4: Moved to ../../gnulib-local/m4/gcj.m4.
+       * getline.m4: Moved to ../../gnulib-local/m4/getline.m4.
+       * getndelim2.m4: Moved to ../../gnulib-local/m4/getndelim2.m4.
+       * java.m4: Moved to ../../gnulib-local/m4/java.m4.
+       * relocatable.m4: Moved to ../../gnulib-local/m4/relocatable.m4.
+       * unionwait.m4: Moved to ../../gnulib-local/m4/unionwait.m4.
+       * xreadlink.m4: Moved to ../../gnulib-local/m4/xreadlink.m4.
+
+
+See gnulib-local/m4/ChangeLog.1 for earlier changes.

diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am
index a3cdf48bf0ba48626a8983f90c6f8ab14a8c2688..d68a6a553b2b73261b47031cc1e6a7aac2113913 100644 (file)
--- a/gettext-tools/m4/Makefile.am
+++ b/gettext-tools/m4/Makefile.am
@@ -39,8 +39,8 @@ aclocal_DATA = \
 
 examplesbuildauxdir = $(docdir)/examples/build-aux
 examplesbuildaux_DATA = \
-  gcj.m4 javacomp.m4 javaexec.m4 \
-  csharpcomp.m4 csharpexec.m4 csharpexec-test.exe
+  ../gnulib-m4/gcj.m4 ../gnulib-m4/javacomp.m4 ../gnulib-m4/javaexec.m4 \
+  ../gnulib-m4/csharpcomp.m4 ../gnulib-m4/csharpexec.m4 csharpexec-test.exe
 
 # Generate this list with
 # find . -type f -name '*.m4' -printf '%f\n' | sort | tr '\012' @ | sed 's/@$/%/;s/@/ \\@/g' | tr @% '\012\012'

diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index edfc6d43aef7fc29780fcbd0ae167888a63041a7..4a5141e33fdaa510b5f13399b631fe7c0a361ee8 100644 (file)
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-31  Bruno Haible  <bruno@clisp.org>
+
+       * POTFILES.in: Refer to gnulib-lib/ instead of lib/. Drop xerror.c.
+
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
        * Rules-msvc: Remove file.

diff --git a/gettext-tools/po/POTFILES.in b/gettext-tools/po/POTFILES.in
index b3e16f471157e10aad892bbca3839aefcb025ff1..b3a6fdbf5fddfd782b836d7ed3202e92d1d5c862 100644 (file)
--- a/gettext-tools/po/POTFILES.in
+++ b/gettext-tools/po/POTFILES.in
@@ -2,28 +2,28 @@
 # Copyright (C) 1995, 1998, 2001-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
-lib/argmatch.c
-lib/closeout.c
-lib/copy-file.c
-lib/csharpcomp.c
-lib/csharpexec.c
-lib/error.c
-lib/execute.c
-lib/getopt.c
-lib/javacomp.c
-lib/javaexec.c
-lib/javaversion.c
-lib/obstack.c
-lib/pipe.c
-lib/quotearg.c
-lib/w32spawn.h
-lib/wait-process.c
-lib/xerror.c
-lib/xmalloc.c
-lib/xsetenv.c
+# Files from the portability library
+gnulib-lib/argmatch.c
+gnulib-lib/clean-temp.c
+gnulib-lib/closeout.c
+gnulib-lib/copy-file.c
+gnulib-lib/csharpcomp.c
+gnulib-lib/csharpexec.c
+gnulib-lib/error.c
+gnulib-lib/execute.c
+gnulib-lib/getopt.c
+gnulib-lib/javacomp.c
+gnulib-lib/javaexec.c
+gnulib-lib/javaversion.c
+gnulib-lib/obstack.c
+gnulib-lib/pipe.c
+gnulib-lib/quotearg.c
+gnulib-lib/w32spawn.h
+gnulib-lib/wait-process.c
+gnulib-lib/xmalloc.c
+gnulib-lib/xsetenv.c
 
 # Package source files
 src/file-list.c

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 5a72a13dd83ba5b3a1c443c8e90ccf2ca91ecc3a..bfa4507040130698dffcf36dc003bf84d0535bb4 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-30  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (AM_CPPFLAGS, LDADD, libgettextsrc_la_LDFLAGS,
+       libgettextpo_la_LDFLAGS, recode_sr_latin_LDADD, RELOCATABLE_SRC_DIR,
+       RELOCATABLE_BUILD_DIR): Replace ../lib with ../gnulib-lib.
+       (JAVACOMP, CSHARPCOMP): Remove lib/ from pathname.
+
 2006-07-30  Bruno Haible  <bruno@clisp.org>
 
        * msgl-cat.c: Include c-strstr.h instead of strstr.h.

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index ea767673ac29837c1bb176dd37d11abee24008ea..5a47262b09700dd412ca4b4bc62fb7459d2a8744 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -69,7 +69,7 @@ AM_CPPFLAGS = \
   -I.. \
   -I$(top_srcdir)/libgrep \
   -I$(top_srcdir)/libuniname \
-  -I../lib -I$(top_srcdir)/lib \
+  -I../gnulib-lib -I$(top_srcdir)/gnulib-lib \
   -I../intl -I$(top_srcdir)/../gettext-runtime/intl
 DEFS = \
   -DLOCALEDIR=\"$(localedir)\" -DBISON_LOCALEDIR=\"$(BISON_LOCALEDIR)\" \
@@ -80,15 +80,15 @@ DEFS = \
   -DLIBDIR=\"$(libdir)\" \
   -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
   -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
-LDADD = ../lib/libgettextlib.la @LTLIBINTL@
+LDADD = ../gnulib-lib/libgettextlib.la @LTLIBINTL@
 
 SED = sed
 YACC = @YACC@ -d
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 JAR = @JAR@
-JAVACOMP = $(SHELL) ../lib/javacomp.sh
-CSHARPCOMP = $(SHELL) ../lib/csharpcomp.sh
+JAVACOMP = $(SHELL) ../javacomp.sh
+CSHARPCOMP = $(SHELL) ../csharpcomp.sh
 CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@
 
 # Linking with C++ libraries is needed _only_ on mingw and Cygwin.
@@ -215,13 +215,13 @@ hostname_SOURCES = hostname.c
 urlget_SOURCES = urlget.c
 
 # How to build libgettextsrc.la.
-# Need ../lib/libgettextlib.la.
+# Need ../gnulib-lib/libgettextlib.la.
 # Need @LTLIBINTL@ because many source files use gettext().
 # Need @LTLIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c
 # use iconv().
 libgettextsrc_la_LDFLAGS = \
   -release @VERSION@ \
-  ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc @LTNOUNDEF@
+  ../gnulib-lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc @LTNOUNDEF@
 
 # Tell the mingw or Cygwin linker which symbols to export.
 if WOE32DLL
@@ -239,11 +239,11 @@ install-exec-clean:
 
 # How to build libgettextpo.la.
 # Need libgettextsrc.la.
-# Need ../lib/libgettextlib.la because of xmalloc.
+# Need ../gnulib-lib/libgettextlib.la because of xmalloc.
 libgettextpo_la_LDFLAGS = \
   -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
   -rpath $(libdir) \
-  libgettextsrc.la ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc @LTNOUNDEF@
+  libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc @LTNOUNDEF@
 # Build order. Only needed for "make -j[N]".
 libgettextpo_la_DEPENDENCIES = libgettextsrc.la
 
@@ -276,7 +276,7 @@ msggrep_LDADD = $(LIBGREP) libgettextsrc.la @INTL_MACOSX_LIBS@
 msginit_LDADD = ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \
                 libgettextsrc.la @INTL_MACOSX_LIBS@
 msguniq_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@
-recode_sr_latin_LDADD = ../lib/libgettextlib.la @INTL_MACOSX_LIBS@
+recode_sr_latin_LDADD = ../gnulib-lib/libgettextlib.la @INTL_MACOSX_LIBS@
 
 # Specify installation directory, for --enable-relocatable.
 msgcmp_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"
@@ -484,7 +484,7 @@ uninstall-tcl:
 
 # Support for relocatability.
 RELOCATABLE_LIBRARY_PATH = $(libdir)
-RELOCATABLE_SRC_DIR = $(top_srcdir)/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/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 220b367f07650ce4f8c48b2ef62e0662302793e4..d328c9d4315c72a8d7667c65febde79c0cefe367 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-30  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (AM_CPPFLAGS, *_LDADD*): Replace ../lib with
+       ../gnulib-lib.
+       * lang-csharp (CSHARPCOMP, CSHARPEXEC): Remove lib/ from pathname.
+       * lang-java (JAVACOMP, JAVAEXEC): Remove lib/ from pathname.
+
 2006-07-25  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.msvc: Remove file.

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index 8322e6c2cc53ae177751711cfb5f0aa0a90f1552..ec7d48128893182a2efc7dc94cbf97913dda9e56 100644 (file)
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -131,7 +131,7 @@ XGETTEXT = ../src/xgettext
 # For debugging memory leaks and memory allocation bugs.
 # You should build with --disable-shared when using valgrind.
 CHECKER =
-#CHECKER = valgrind --tool=memcheck --suppressions=$(srcdir)/../lib/allocsa.valgrind --num-callers=20 --leak-check=yes --leak-resolution=high --show-reachable=yes
+#CHECKER = valgrind --tool=memcheck --suppressions=$(srcdir)/../gnulib-lib/allocsa.valgrind --num-callers=20 --leak-check=yes --leak-resolution=high --show-reachable=yes
 #CHECKER = valgrind --tool=massif --format=html --depth=10 --alloc-fn=xmalloc --alloc-fn=xrealloc --stacks=no
 
 TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
@@ -181,7 +181,7 @@ xg-c-1.ok.po: $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c
 # Three auxiliary programs used by the tests.
 AM_CPPFLAGS = \
   -I.. \
-  -I../lib -I$(top_srcdir)/lib \
+  -I../gnulib-lib -I$(top_srcdir)/gnulib-lib \
   -I../intl
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 # INTL_MACOSX_LIBS is needed because the programs depend on libintl.la
@@ -192,35 +192,35 @@ LDADD_no = ../intl/libgnuintl.la @LTLIBTHREAD@ @LTLIBINTL@
 noinst_PROGRAMS = tstgettext tstngettext testlocale gettext-3-prg gettext-4-prg gettext-5-prg gettext-6-prg gettext-7-prg cake fc3 fc4 fc5
 tstgettext_SOURCES = tstgettext.c setlocale.c
 tstgettext_CFLAGS = -DINSTALLDIR=\".\"
-tstgettext_LDADD = ../lib/libgettextlib.la $(LDADD)
+tstgettext_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
 tstngettext_SOURCES = tstngettext.c setlocale.c
 tstngettext_CFLAGS = -DINSTALLDIR=\".\"
-tstngettext_LDADD = ../lib/libgettextlib.la $(LDADD)
+tstngettext_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
 testlocale_SOURCES = testlocale.c
 gettext_3_prg_SOURCES = gettext-3-prg.c
-gettext_3_prg_LDADD = ../lib/libgettextlib.la $(LDADD)
+gettext_3_prg_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
 gettext_4_prg_SOURCES = gettext-4-prg.c
-gettext_4_prg_LDADD = ../lib/libgettextlib.la $(LDADD)
+gettext_4_prg_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
 gettext_5_prg_SOURCES = gettext-5-prg.c
-gettext_5_prg_LDADD = ../lib/libgettextlib.la $(LDADD)
+gettext_5_prg_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
 gettext_6_prg_SOURCES = gettext-6-prg.c
 gettext_6_prg_CFLAGS = $(gettext_6_prg_CFLAGS_@GLIBC2@)
 gettext_6_prg_CFLAGS_yes = -DUSE_POSIX_THREADS
 gettext_6_prg_LDADD = $(gettext_6_prg_LDADD_@GLIBC2@)
-gettext_6_prg_LDADD_yes = ../lib/libgettextlib.la $(LDADD) -lpthread
+gettext_6_prg_LDADD_yes = ../gnulib-lib/libgettextlib.la $(LDADD) -lpthread
 gettext_7_prg_SOURCES = gettext-7-prg.c
 gettext_7_prg_CFLAGS = $(gettext_7_prg_CFLAGS_@GLIBC2@)
 gettext_7_prg_CFLAGS_yes = -DUSE_POSIX_THREADS
 gettext_7_prg_LDADD = $(gettext_7_prg_LDADD_@GLIBC2@)
-gettext_7_prg_LDADD_yes = ../lib/libgettextlib.la $(LDADD) -lpthread
+gettext_7_prg_LDADD_yes = ../gnulib-lib/libgettextlib.la $(LDADD) -lpthread
 cake_SOURCES = plural-1-prg.c setlocale.c
-cake_LDADD = ../lib/libgettextlib.la $(LDADD)
+cake_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
 fc3_SOURCES = format-c-3-prg.c setlocale.c
-fc3_LDADD = ../lib/libgettextlib.la $(LDADD)
+fc3_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
 fc4_SOURCES = format-c-4-prg.c setlocale.c
-fc4_LDADD = ../lib/libgettextlib.la $(LDADD)
+fc4_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
 fc5_SOURCES = format-c-5-prg.c
-fc5_LDADD = ../lib/libgettextlib.la $(LDADD)
+fc5_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
 
 # Clean up after Solaris cc.
 clean-local:

diff --git a/gettext-tools/tests/lang-csharp b/gettext-tools/tests/lang-csharp
index b4e3276b174a39620c27058845d2c8e126874b9b..c81d9cc2725cc717bd7449d1af3be91fccae86d1 100755 (executable)
--- a/gettext-tools/tests/lang-csharp
+++ b/gettext-tools/tests/lang-csharp
@@ -48,7 +48,7 @@ class Program {
 EOF
 
 tmpfiles="$tmpfiles program.exe"
-: ${CSHARPCOMP="/bin/sh ../lib/csharpcomp.sh"}
+: ${CSHARPCOMP="/bin/sh ../csharpcomp.sh"}
 ${CSHARPCOMP} -o program.exe -L ../../gettext-runtime/intl-csharp -l GNU.Gettext program.cs || exit 1
 
 tmpfiles="$tmpfiles prog.pot"
@@ -152,7 +152,7 @@ EOF
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
-: ${CSHARPEXEC="/bin/sh ../lib/csharpexec.sh"}
+: ${CSHARPEXEC="/bin/sh ../csharpexec.sh"}
 if test $LOCALE_FR != none; then
   LANGUAGE= LC_ALL=$LOCALE_FR ${CSHARPEXEC} -L ../../gettext-runtime/intl-csharp program.exe 2 > prog.out || exit 1
   ${DIFF} prog.ok prog.out || exit 1

diff --git a/gettext-tools/tests/lang-java b/gettext-tools/tests/lang-java
index c47928d1e11bb2b169aaeedc65ae72798d7e55d5..70345d2c114feb7af37753a63c06fefedcd04a78 100755 (executable)
--- a/gettext-tools/tests/lang-java
+++ b/gettext-tools/tests/lang-java
@@ -72,7 +72,7 @@ cat <<\EOF >> Program.java
 EOF
 
 tmpfiles="$tmpfiles Program.class"
-: ${JAVACOMP="/bin/sh ../lib/javacomp.sh"}
+: ${JAVACOMP="/bin/sh ../javacomp.sh"}
 CLASSPATH=../../gettext-runtime/intl-java/libintl.jar ${JAVACOMP} -d . Program.java || exit 1
 
 tmpfiles="$tmpfiles prog.pot"
@@ -175,7 +175,7 @@ EOF
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
-: ${JAVAEXEC="/bin/sh ../lib/javaexec.sh"}
+: ${JAVAEXEC="/bin/sh ../javaexec.sh"}
 if test $LOCALE_FR != none; then
   LANGUAGE= LC_ALL=$LOCALE_FR CLASSPATH=.:../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 > prog.out || exit 1
   ${DIFF} prog.ok prog.out || exit 1