diff options
Diffstat (limited to 'gettext-tools')
23 files changed, 161 insertions, 119 deletions
diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index def1444..ce0b010 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,5 +1,32 @@ 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. 2006-07-30 Bruno Haible <bruno@clisp.org> diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am index 7627f53..cac3562 100644 --- 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 3be6334..3670767 100644 --- 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 c3c21b3..91b2e8d 100644 --- 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 f20a894..4b99805 100755 --- 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 f20a894..4b99805 100755 --- 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 8b5c473..bde254c 100755 --- 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 8b5c473..bde254c 100755 --- 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 8b5c473..bde254c 100755 --- 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 4c1870e..463d622 100644 --- 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 b5a8b75..9b0d125 100644 --- 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 4a0b971..df9fc22 100644 --- 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 9b0a589..d0cec3b 100644 --- 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 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 a3cdf48..d68a6a5 100644 --- 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 edfc6d4..4a5141e 100644 --- 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 b3e16f4..b3a6fdb 100644 --- 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 5a72a13..bfa4507 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,5 +1,12 @@ 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. (catenate_msgdomain_list): Use c_strstr instead of strstr. * msgl-charset.c: Include c-strstr.h instead of strstr.h. diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am index ea76767..5a47262 100644 --- 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 220b367..d328c9d 100644 --- 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 8322e6c..ec7d481 100644 --- 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 b4e3276..c81d9cc 100755 --- 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 c47928d..70345d2 100755 --- 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 |