diff options
Diffstat (limited to 'gettext-tools')
| -rw-r--r-- | gettext-tools/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-tools/configure.ac | 7 | ||||
| -rw-r--r-- | gettext-tools/tests/ChangeLog | 17 | ||||
| -rw-r--r-- | gettext-tools/tests/Makefile.am | 17 |
4 files changed, 43 insertions, 3 deletions
diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index 766ef8e..d0b39d0 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,8 @@ +2005-03-20 Bruno Haible <bruno@clisp.org> + + * configure.ac: Test for field __names in struct __locale_struct. + Also define USE_IN_GETTEXT_TESTS. + 2005-04-11 Bruno Haible <bruno@clisp.org> * gettext-0.14.4 released. diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index b44a95e..61af08b 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -115,6 +115,10 @@ gt_TYPE_SSIZE_T AC_TYPE_PID_T AC_TYPE_MODE_T gt_TYPE_SIG_ATOMIC_T +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 @@ -168,6 +172,9 @@ AH_TOP([ #define DEFAULT_OUTPUT_ALIGNMENT 1 ]) AH_BOTTOM([ +/* Indicator for intl/ that it is compiled for testing purposes only. */ +#define USE_IN_GETTEXT_TESTS + /* A file name cannot consist of any character possible. INVALID_PATH_CHAR contains the characters not allowed. */ #if defined _MSC_VER || defined __MINGW32__ diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index 93e9706..7b45ca8 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,20 @@ +2005-03-20 Bruno Haible <bruno@clisp.org> + + * gettext-6: New file. + * gettext-6-prg.c: New file. + * gettext-6-1.po: New file. + * gettext-6-2.po: New file. + * gettext-7: New file. + * gettext-7-prg.c: New file. + * gettext-7.po: New file. + * Makefile.am (TESTS): Add gettext-6, gettext-7. + (EXTRA_DIST): Add gettext-6-1.po, gettext-6-2.po, gettext-7.po. + (noinst_PROGRAMS): Add gettext-6-prg, gettext-7-prg. + (gettext_6_prg_SOURCES, gettext_6_prg_CFLAGS, gettext_6_prg_LDADD): New + variables. + (gettext_7_prg_SOURCES, gettext_7_prg_CFLAGS, gettext_7_prg_LDADD): New + variables. + 2005-03-19 Bruno Haible <bruno@clisp.org> * gettext-3: New file. diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am index 41850c6..5422701 100644 --- a/gettext-tools/tests/Makefile.am +++ b/gettext-tools/tests/Makefile.am @@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies EXTRA_DIST = -TESTS = gettext-1 gettext-2 gettext-3 gettext-4 gettext-5 \ +TESTS = gettext-1 gettext-2 gettext-3 gettext-4 gettext-5 gettext-6 gettext-7 \ msgattrib-1 msgattrib-2 msgattrib-3 msgattrib-4 msgattrib-5 \ msgattrib-6 msgattrib-7 msgattrib-8 msgattrib-9 msgattrib-10 \ msgattrib-11 msgattrib-12 msgattrib-13 msgattrib-14 \ @@ -111,7 +111,8 @@ TESTS = gettext-1 gettext-2 gettext-3 gettext-4 gettext-5 \ EXTRA_DIST += $(TESTS) \ test.mo xg-c-1.ok.po mex-test2.ok msguniq-a.in msguniq-a.inp \ msguniq-a.out qttest_pl.po qttest_pl.qm ChangeLog.0 gettext-3-1.po \ - gettext-3-2.po gettext-4.po gettext-5.po + gettext-3-2.po gettext-4.po gettext-5.po gettext-6-1.po \ + gettext-6-2.po gettext-7.po XGETTEXT = ../src/xgettext @@ -172,7 +173,7 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@) @INTL_MACOSX_LIBS@ LDADD_yes = ../intl/libintl.la LDADD_no = ../intl/libgnuintl.la @LTLIBINTL@ -noinst_PROGRAMS = tstgettext tstngettext testlocale gettext-3-prg gettext-4-prg gettext-5-prg cake fc3 fc4 fc5 +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) @@ -186,6 +187,16 @@ gettext_4_prg_SOURCES = gettext-4-prg.c gettext_4_prg_LDADD = ../lib/libgettextlib.la $(LDADD) gettext_5_prg_SOURCES = gettext-5-prg.c gettext_5_prg_LDADD = ../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_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 cake_SOURCES = plural-1-prg.c setlocale.c cake_LDADD = ../lib/libgettextlib.la $(LDADD) fc3_SOURCES = format-c-3-prg.c setlocale.c |