diff options
Diffstat (limited to 'gettext-tools')
| -rw-r--r-- | gettext-tools/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-tools/Makefile.am | 2 | ||||
| -rw-r--r-- | gettext-tools/configure.ac | 2 | ||||
| -rw-r--r-- | gettext-tools/libgettextpo/ChangeLog | 6 | ||||
| -rw-r--r-- | gettext-tools/libgettextpo/Makefile.am | 14 |
5 files changed, 27 insertions, 2 deletions
diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index 666b8c7..cfe9d1e 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,8 @@ +2006-10-20 Bruno Haible <bruno@clisp.org> + + * Makefile.am (ACLOCAL_AMFLAGS): Add -I libgettextpo/gnulib-m4. + * configure.ac: Also invoke gtpo_EARLY, gtpo_INIT. + 2006-10-18 Bruno Haible <bruno@clisp.org> * woe32dll/gettextsrc-exports.c: Add {input,output}_format_*. diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am index 7a731e2..9d92c32 100644 --- a/gettext-tools/Makefile.am +++ b/gettext-tools/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-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 +ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4 SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 tests examples diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index 1a4114c..88f49da 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -84,6 +84,7 @@ AC_EXEEXT dnl Make sure we see all GNU and Solaris extensions. gl_EARLY +gtpo_EARLY dnl Check for build configuration. gl_WOE32_DLL @@ -131,6 +132,7 @@ gt_OPENMP dnl Checks for header files, functions and declarations. gl_INIT +gtpo_INIT dnl Checks for header files. AC_CHECK_HEADERS(pwd.h) diff --git a/gettext-tools/libgettextpo/ChangeLog b/gettext-tools/libgettextpo/ChangeLog index a89ccb2..ef31051 100644 --- a/gettext-tools/libgettextpo/ChangeLog +++ b/gettext-tools/libgettextpo/ChangeLog @@ -1,3 +1,9 @@ +2006-10-20 Bruno Haible <bruno@clisp.org> + + * Makefile.am (config.h): Treat .lo files like .o files. Define + DLL_VARIABLE to empty. Avoid warning when config.h is included twice. + Add special hack for obstack_free. + 2006-10-16 Bruno Haible <bruno@clisp.org> * gettext-po.h.in: New file, moved here from ../src/. diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am index 2faadef..c114440 100644 --- a/gettext-tools/libgettextpo/Makefile.am +++ b/gettext-tools/libgettextpo/Makefile.am @@ -111,15 +111,26 @@ endif BUILT_SOURCES += config.h config.h: { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + : "Avoid double inclusion, to avoid a warning about redefinition of DLL_VARIABLE."; \ + echo '#ifndef GTPO_CONFIG_H'; \ + echo '#define GTPO_CONFIG_H'; \ + echo; \ echo '#include "../config.h"'; \ + : "Turn all gettext() calls into dgettext() calls."; \ echo '#define DEFAULT_TEXT_DOMAIN "gettext-tools"'; \ + : "All code is collected in a single library,"; \ + : "No references to variables in other libraries exist."; \ + echo '#undef DLL_VARIABLE'; \ + echo '#define DLL_VARIABLE'; \ + echo; \ + echo '#endif /* GTPO_CONFIG_H */'; \ } > config.h; \ $(MAKE) $(BUILT_SOURCES) || { rm -f config.h; exit 1; }; \ if test -n "$(HAVE_GLOBAL_SYMBOL_PIPE)"; then \ { \ for f in $(libgettextpo_la_AUXSOURCES) $(libgnu_la_SOURCES) $(libgnu_la_LIBADD); do \ case $$f in \ - *.c | *.$(OBJEXT) ) \ + *.c | *.$(OBJEXT) | *.lo ) \ sf=`echo "$$f" | sed -e 's,\\.[^.]*$$,,'`.c; \ of=`echo "$$f" | sed -e 's,^.*/,,' -e 's,\\.[^.]*$$,,'`.$(OBJEXT); \ $(COMPILE) -c $(srcdir)/$$sf || { rm -f config.h; exit 1; }; \ @@ -130,6 +141,7 @@ config.h: done; \ } 5>&1 \ | sed -e 's,.* ,,' | LC_ALL=C sort | LC_ALL=C uniq \ + | sed -e 's,^obstack_free$$,_obstack_free,' \ | sed -e 's,^\(.*\)$$,#define \1 libgettextpo_\1,' > config.h-t; \ cat config.h-t >> config.h; \ fi |