diff options
| -rw-r--r-- | Makefile.in | 14 | ||||
| -rw-r--r-- | aclocal.m4 | 130 | ||||
| -rw-r--r-- | config.h.in | 3 | ||||
| -rwxr-xr-x | configure | 876 | ||||
| -rw-r--r-- | doc/Makefile.in | 4 | ||||
| -rw-r--r-- | doc/gettext.info | 188 | ||||
| -rw-r--r-- | doc/gettext.info-1 | 15 | ||||
| -rw-r--r-- | doc/gettext.info-2 | 19 | ||||
| -rw-r--r-- | doc/gettext.info-4 | 25 | ||||
| -rw-r--r-- | doc/gettext.info-5 | 14 | ||||
| -rw-r--r-- | doc/version.texi | 2 | ||||
| -rw-r--r-- | lib/Makefile.in | 96 | ||||
| -rw-r--r-- | m4/Makefile.in | 6 | ||||
| -rw-r--r-- | misc/Makefile.in | 2 | ||||
| -rw-r--r-- | po/da.gmo | bin | 17551 -> 17299 bytes | |||
| -rw-r--r-- | po/de.gmo | bin | 28231 -> 27819 bytes | |||
| -rw-r--r-- | po/el.gmo | bin | 29370 -> 28984 bytes | |||
| -rw-r--r-- | po/es.gmo | bin | 30188 -> 29793 bytes | |||
| -rw-r--r-- | po/fr.gmo | bin | 28057 -> 27668 bytes | |||
| -rw-r--r-- | po/ja.gmo | bin | 0 -> 29054 bytes | |||
| -rw-r--r-- | po/ko.gmo | bin | 17185 -> 16932 bytes | |||
| -rw-r--r-- | po/nl.gmo | bin | 18044 -> 17758 bytes | |||
| -rw-r--r-- | po/nn.gmo | bin | 0 -> 5148 bytes | |||
| -rw-r--r-- | po/no.gmo | bin | 21126 -> 20740 bytes | |||
| -rw-r--r-- | po/pl.gmo | bin | 27278 -> 26903 bytes | |||
| -rw-r--r-- | po/pt.gmo | bin | 11496 -> 11044 bytes | |||
| -rw-r--r-- | po/sl.gmo | bin | 9490 -> 9094 bytes | |||
| -rw-r--r-- | po/sv.gmo | bin | 17437 -> 17227 bytes | |||
| -rw-r--r-- | po/tr.gmo | bin | 29300 -> 26953 bytes | |||
| -rw-r--r-- | src/Makefile.in | 99 | ||||
| -rw-r--r-- | src/po-gram-gen.c | 225 | ||||
| -rw-r--r-- | src/po-gram-gen.h | 8 | ||||
| -rw-r--r-- | tests/Makefile.in | 24 |
33 files changed, 1055 insertions, 695 deletions
diff --git a/Makefile.in b/Makefile.in index 6cfe7c5..7dd6e5f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -66,6 +66,7 @@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ INTLLIBS = @INTLLIBS@ @@ -79,6 +80,7 @@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ @@ -98,8 +100,11 @@ ACLOCAL_AMFLAGS = -I m4 gettextsrcdir = $(datadir)/gettext gettextsrc_DATA = ABOUT-NLS -EXTRA_DIST = BUGS DISCLAIM README.gemtext aclocal.sh -SUBDIRS = doc lib intl src po m4 misc tests +SUBDIRS = doc intl lib src po m4 misc tests + +MAINTAINERCLEANFILES = djgpp/README djgpp/config.sed djgpp/fnchange.lst +EXTRA_DIST = BUGS DISCLAIM README.gemtext aclocal.sh djgpp/Makefile.maint djgpp/README.in djgpp/config.bat djgpp/config.in djgpp/config.site djgpp/edtests.bat djgpp/fnchange.in djgpp/tscript.sed $(MAINTAINERCLEANFILES) + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h @@ -128,7 +133,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(ACLOCAL_M4): configure.in m4/c-bs-a.m4 m4/codeset.m4 m4/gettext.m4 \ m4/iconv.m4 m4/inttypes_h.m4 m4/isc-posix.m4 \ m4/lcmessage.m4 m4/libtool.m4 m4/progtest.m4 \ - m4/setlocale.m4 m4/uintmax_t.m4 m4/ulonglong.m4 + m4/setlocale.m4 m4/signed.m4 m4/uintmax_t.m4 \ + m4/ulonglong.m4 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -314,6 +320,7 @@ distdir: $(DISTFILES) -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) + $(mkinstalldirs) $(distdir)/djgpp @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -374,6 +381,7 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-recursive @@ -125,9 +125,27 @@ for am_file in <<$1>>; do done<<>>dnl>>) changequote([,]))]) +#serial 1 +# This test replaces the one in autoconf. +# Currently this macro should have the same name as the autoconf macro +# because gettext's gettext.m4 (distributed in the automake package) +# still uses it. Otherwise, the use in gettext.m4 makes autoheader +# give these diagnostics: +# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX +# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX + +undefine([AC_ISC_POSIX]) + +AC_DEFUN([AC_ISC_POSIX], + [ + dnl This test replaces the obsolescent AC_ISC_POSIX kludge. + AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) + ] +) + # serial 40 AC_PROG_LIBTOOL -AC_DEFUN(AC_PROG_LIBTOOL, +AC_DEFUN([AC_PROG_LIBTOOL], [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl # Save cache, so that ltconfig can load it @@ -157,7 +175,7 @@ AC_SUBST(LIBTOOL)dnl exec 5>>./config.log ]) -AC_DEFUN(AC_LIBTOOL_SETUP, +AC_DEFUN([AC_LIBTOOL_SETUP], [AC_PREREQ(2.13)dnl AC_REQUIRE([AC_ENABLE_SHARED])dnl AC_REQUIRE([AC_ENABLE_STATIC])dnl @@ -237,16 +255,16 @@ esac ]) # AC_LIBTOOL_DLOPEN - enable checks for dlopen support -AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) +AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's -AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) +AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) # AC_ENABLE_SHARED - implement the --enable-shared flag # Usage: AC_ENABLE_SHARED[(DEFAULT)] # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to # `yes'. -AC_DEFUN(AC_ENABLE_SHARED, [dnl +AC_DEFUN([AC_ENABLE_SHARED], [dnl define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(shared, changequote(<<, >>)dnl @@ -272,14 +290,14 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl ]) # AC_DISABLE_SHARED - set the default shared flag to --disable-shared -AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_ENABLE_SHARED(no)]) # AC_ENABLE_STATIC - implement the --enable-static flag # Usage: AC_ENABLE_STATIC[(DEFAULT)] # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to # `yes'. -AC_DEFUN(AC_ENABLE_STATIC, [dnl +AC_DEFUN([AC_ENABLE_STATIC], [dnl define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(static, changequote(<<, >>)dnl @@ -305,7 +323,7 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl ]) # AC_DISABLE_STATIC - set the default static flag to --disable-static -AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_DEFUN([AC_DISABLE_STATIC], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_ENABLE_STATIC(no)]) @@ -313,7 +331,7 @@ AC_ENABLE_STATIC(no)]) # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to # `yes'. -AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl +AC_DEFUN([AC_ENABLE_FAST_INSTALL], [dnl define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(fast-install, changequote(<<, >>)dnl @@ -339,11 +357,11 @@ enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl ]) # AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install -AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_DEFUN([AC_DISABLE_FAST_INSTALL], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_ENABLE_FAST_INSTALL(no)]) # AC_PROG_LD - find the path to the GNU or non-GNU linker -AC_DEFUN(AC_PROG_LD, +AC_DEFUN([AC_PROG_LD], [AC_ARG_WITH(gnu-ld, [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) @@ -413,7 +431,7 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) AC_PROG_LD_GNU ]) -AC_DEFUN(AC_PROG_LD_GNU, +AC_DEFUN([AC_PROG_LD_GNU], [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld, [# I'd rather use --version here, but apparently some GNU ld's only accept -v. if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then @@ -424,7 +442,7 @@ fi]) ]) # AC_PROG_NM - find the path to a BSD-compatible name lister -AC_DEFUN(AC_PROG_NM, +AC_DEFUN([AC_PROG_NM], [AC_MSG_CHECKING([for BSD-compatible nm]) AC_CACHE_VAL(ac_cv_path_NM, [if test -n "$NM"; then @@ -458,7 +476,7 @@ AC_MSG_RESULT([$NM]) ]) # AC_CHECK_LIBM - check for math library -AC_DEFUN(AC_CHECK_LIBM, +AC_DEFUN([AC_CHECK_LIBM], [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case "$lt_target" in @@ -485,7 +503,7 @@ esac # '${top_srcdir}/' (note the single quotes!). If your package is not # flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. -AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl case "$enable_ltdl_convenience" in no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; "") enable_ltdl_convenience=yes @@ -506,7 +524,7 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl # not flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. # In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_CHECK_LIB(ltdl, main, [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], [if test x"$enable_ltdl_install" = xno; then @@ -527,40 +545,36 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ]) dnl old names -AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl -AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl -AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl -AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl -AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl -AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl -AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl +AC_DEFUN([AM_PROG_LIBTOOL], [indir([AC_PROG_LIBTOOL])])dnl +AC_DEFUN([AM_ENABLE_SHARED], [indir([AC_ENABLE_SHARED], $@)])dnl +AC_DEFUN([AM_ENABLE_STATIC], [indir([AC_ENABLE_STATIC], $@)])dnl +AC_DEFUN([AM_DISABLE_SHARED], [indir([AC_DISABLE_SHARED], $@)])dnl +AC_DEFUN([AM_DISABLE_STATIC], [indir([AC_DISABLE_STATIC], $@)])dnl +AC_DEFUN([AM_PROG_LD], [indir([AC_PROG_LD])])dnl +AC_DEFUN([AM_PROG_NM], [indir([AC_PROG_NM])])dnl dnl This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL])dnl #serial 1 -# This test replaces the one in autoconf. -# Currently this macro should have the same name as the autoconf macro -# because gettext's gettext.m4 (distributed in the automake package) -# still uses it. Otherwise, the use in gettext.m4 makes autoheader -# give these diagnostics: -# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX -# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX -undefine([AC_ISC_POSIX]) +dnl From Bruno Haible. -AC_DEFUN(AC_ISC_POSIX, - [ - dnl This test replaces the obsolescent AC_ISC_POSIX kludge. - AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) - ] -) +AC_DEFUN(bh_C_SIGNED, +[ + AC_CACHE_CHECK([for signed], bh_cv_c_signed, + [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)]) + if test $bh_cv_c_signed = no; then + AC_DEFINE(signed, , + [Define to empty if the C compiler doesn't support this keyword.]) + fi +]) #serial 3 dnl From Paul Eggert. -AC_DEFUN(AC_C_BACKSLASH_A, +AC_DEFUN([AC_C_BACKSLASH_A], [ AC_CACHE_CHECK([whether backslash-a works in strings], ac_cv_c_backslash_a, [AC_TRY_COMPILE([], @@ -584,7 +598,7 @@ AC_DEFUN(AC_C_BACKSLASH_A, dnl From Paul Eggert. -AC_DEFUN(jm_AC_TYPE_UNSIGNED_LONG_LONG, +AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], [ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;], @@ -620,7 +634,7 @@ AC_PREREQ(2.13) # Define uintmax_t to `unsigned long' or `unsigned long long' # if <inttypes.h> does not exist. -AC_DEFUN(jm_AC_TYPE_UINTMAX_T, +AC_DEFUN([jm_AC_TYPE_UINTMAX_T], [ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) if test $jm_ac_cv_header_inttypes_h = no; then @@ -641,7 +655,7 @@ dnl From Paul Eggert. # Define HAVE_INTTYPES_H if <inttypes.h> exists, # doesn't clash with <sys/types.h>, and declares uintmax_t. -AC_DEFUN(jm_AC_HEADER_INTTYPES_H, +AC_DEFUN([jm_AC_HEADER_INTTYPES_H], [ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, [AC_TRY_COMPILE( @@ -675,20 +689,24 @@ AC_DEFUN(AM_FUNC_ERROR_AT_LINE, # Check for setlocale declaration. -AC_DEFUN(gt_SETLOCALE,[ +AC_DEFUN([gt_SETLOCALE],[ AC_CHECK_HEADERS([locale.h]) AC_MSG_CHECKING([for setlocale declaration]) AC_CACHE_VAL(gt_cv_proto_setlocale, [ AC_TRY_COMPILE([ #include <stdlib.h> #include <locale.h> +extern +#ifdef __cplusplus +"C" +#endif #if defined(__STDC__) || defined(__cplusplus) -char* setlocale (int category, char* locale); +char *setlocale (int category, char *locale); #else -char* setlocale(); +char *setlocale(); #endif ], [], gt_cv_proto_setlocale_arg1="", gt_cv_proto_setlocale_arg1="const") -gt_cv_proto_setlocale="extern char* setlocale (int, $gt_cv_proto_setlocale_arg1 char*);"]) +gt_cv_proto_setlocale="extern char *setlocale (int category, $gt_cv_proto_setlocale_arg1 char *locale);"]) gt_cv_proto_setlocale=`echo "[$]gt_cv_proto_setlocale" | tr -s ' ' | sed -e 's/( /(/'` AC_MSG_RESULT([$]{ac_t:- }[$]gt_cv_proto_setlocale) @@ -731,7 +749,7 @@ dnl GNU format catalogs when building on a platform with an X/Open gettext), dnl but we keep it in order not to force irrelevant filename changes on the dnl maintainers. dnl -AC_DEFUN(AM_WITH_NLS, +AC_DEFUN([AM_WITH_NLS], [AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS AC_ARG_ENABLE(nls, @@ -827,6 +845,12 @@ return (int) gettext ("") + _nl_msg_cat_cntr], LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi + dnl If iconv() is in a separate libiconv library, then anyone linking + dnl with libintl{.a,.so} also needs to link with libiconv. + if test -n "$LIBICONV" && test -n "$INTLLIBS"; then + INTLLIBS="$INTLLIBS $LIBICONV" + fi + dnl Test whether we really found GNU xgettext. if test "$XGETTEXT" != ":"; then dnl If it is no GNU xgettext we define it as : so that the @@ -884,7 +908,7 @@ return (int) gettext ("") + _nl_msg_cat_cntr], ]) dnl Usage: Just like AM_WITH_NLS, which see. -AC_DEFUN(AM_GNU_GETTEXT, +AC_DEFUN([AM_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl @@ -989,7 +1013,7 @@ __argz_count __argz_stringify __argz_next]) dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN(AM_PATH_PROG_WITH_TEST, +AC_DEFUN([AM_PATH_PROG_WITH_TEST], [# Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) @@ -1029,7 +1053,7 @@ AC_SUBST($1)dnl dnl From Bruno Haible. -AC_DEFUN(AM_ICONV, +AC_DEFUN([AM_ICONV], [ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and dnl those with the standalone portable libiconv installed). @@ -1067,12 +1091,12 @@ extern "C" #endif #if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t* outbytesleft); +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); #else size_t iconv(); #endif ], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t* outbytesleft);"]) + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` AC_MSG_RESULT([$]{ac_t:- }[$]am_cv_proto_iconv) @@ -1090,7 +1114,7 @@ size_t iconv(); dnl From Bruno Haible. -AC_DEFUN(AM_LANGINFO_CODESET, +AC_DEFUN([AM_LANGINFO_CODESET], [ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, [AC_TRY_LINK([#include <langinfo.h>], @@ -1114,7 +1138,7 @@ AC_DEFUN(AM_LANGINFO_CODESET, # serial 2 -AC_DEFUN(AM_LC_MESSAGES, +AC_DEFUN([AM_LC_MESSAGES], [if test $ac_cv_header_locale_h = yes; then AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], diff --git a/config.h.in b/config.h.in index e974b72..b03151b 100644 --- a/config.h.in +++ b/config.h.in @@ -199,6 +199,9 @@ /* Make sure we see all GNU extensions. */ #undef _GNU_SOURCE +/* Define to empty if the C compiler doesn't support this keyword. */ +#undef signed + /* Define if backslash-a works in C strings. */ #undef HAVE_C_BACKSLASH_A @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.9 +# From configure.in Revision: 1.14 @@ -25,6 +25,19 @@ +#serial 1 +# This test replaces the one in autoconf. +# Currently this macro should have the same name as the autoconf macro +# because gettext's gettext.m4 (distributed in the automake package) +# still uses it. Otherwise, the use in gettext.m4 makes autoheader +# give these diagnostics: +# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX +# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX + + + + + # serial 40 AC_PROG_LIBTOOL @@ -104,14 +117,6 @@ #serial 1 -# This test replaces the one in autoconf. -# Currently this macro should have the same name as the autoconf macro -# because gettext's gettext.m4 (distributed in the automake package) -# still uses it. Otherwise, the use in gettext.m4 makes autoheader -# give these diagnostics: -# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX -# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX - @@ -778,7 +783,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:782: checking for a BSD compatible install" >&5 +echo "configure:787: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -831,7 +836,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:835: checking whether build environment is sane" >&5 +echo "configure:840: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -888,7 +893,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:892: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:897: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -934,7 +939,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:938: checking for working aclocal" >&5 +echo "configure:943: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -947,7 +952,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:951: checking for working autoconf" >&5 +echo "configure:956: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -960,7 +965,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:964: checking for working automake" >&5 +echo "configure:969: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -973,7 +978,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:977: checking for working autoheader" >&5 +echo "configure:982: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -986,7 +991,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:990: checking for working makeinfo" >&5 +echo "configure:995: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -999,16 +1004,16 @@ else fi +RELEASE_DATE=2001-03-09 - -ALL_LINGUAS="da de el es fr ko nl no no@nynorsk pl pt sl sv tr" +ALL_LINGUAS="da de el es fr ja ko nl nn no pl pt sl sv tr" # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1012: checking for $ac_word" >&5 +echo "configure:1017: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1038,7 +1043,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1042: checking for $ac_word" >&5 +echo "configure:1047: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1089,7 +1094,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1093: checking for $ac_word" >&5 +echo "configure:1098: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1121,7 +1126,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1125: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1130: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1132,12 +1137,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1136 "configure" +#line 1141 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1163,12 +1168,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1167: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1172: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1172: checking whether we are using GNU C" >&5 +echo "configure:1177: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1177,7 +1182,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1196,7 +1201,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1200: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1205: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1227,6 +1232,298 @@ else fi fi +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# ./install, which can be erroneously created by make from ./install.sh. +echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +echo "configure:1248: checking for a BSD compatible install" >&5 +if test -z "$INSTALL"; then +if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + for ac_dir in $PATH; do + # Account for people who put trailing slashes in PATH elements. + case "$ac_dir/" in + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + if test -f $ac_dir/$ac_prog; then + if test $ac_prog = install && + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + else + ac_cv_path_install="$ac_dir/$ac_prog -c" + break 2 + fi + fi + done + ;; + esac + done + IFS="$ac_save_IFS" + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL="$ac_cv_path_install" + else + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the path is relative. + INSTALL="$ac_install_sh" + fi +fi +echo "$ac_t""$INSTALL" 1>&6 + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +for ac_prog in 'bison -y' byacc +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1305: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YACC"; then + ac_cv_prog_YACC="$YACC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YACC="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YACC="$ac_cv_prog_YACC" +if test -n "$YACC"; then + echo "$ac_t""$YACC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YACC" && break +done +test -n "$YACC" || YACC="yacc" + + + +# Make sure we can run config.sub. +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : +else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +fi + +echo $ac_n "checking host system type""... $ac_c" 1>&6 +echo "configure:1343: checking host system type" >&5 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; +esac + +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$host" 1>&6 + + + + echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 +echo "configure:1366: checking for strerror in -lcposix" >&5 +ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lcposix $LIBS" +cat > conftest.$ac_ext <<EOF +#line 1374 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char strerror(); + +int main() { +strerror() +; return 0; } +EOF +if { (eval echo configure:1385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LIBS="$LIBS -lcposix" +else + echo "$ac_t""no" 1>&6 +fi + + + + +echo $ac_n "checking for object suffix""... $ac_c" 1>&6 +echo "configure:1409: checking for object suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + rm -f conftest* +echo 'int i = 1;' > conftest.$ac_ext +if { (eval echo configure:1415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + for ac_file in conftest.*; do + case $ac_file in + *.c) ;; + *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;; + esac + done +else + { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; } +fi +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_objext" 1>&6 +OBJEXT=$ac_cv_objext +ac_objext=$ac_cv_objext + +echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +echo "configure:1433: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1438 "configure" +#include "confdefs.h" + +int main() { + +#ifndef __CYGWIN__ +#define __CYGWIN__ __CYGWIN32__ +#endif +return __CYGWIN__; +; return 0; } +EOF +if { (eval echo configure:1449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_cygwin" 1>&6 +CYGWIN= +test "$ac_cv_cygwin" = yes && CYGWIN=yes +echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 +echo "configure:1466: checking for mingw32 environment" >&5 +if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1471 "configure" +#include "confdefs.h" + +int main() { +return __MINGW32__; +; return 0; } +EOF +if { (eval echo configure:1478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_mingw32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_mingw32=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_mingw32" 1>&6 +MINGW32= +test "$ac_cv_mingw32" = yes && MINGW32=yes + + +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:1497: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN" = yes || test "$MINGW32" = yes; then + ac_cv_exeext=.exe +else + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= + if { (eval echo configure:1507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + else + { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +fi +fi + +EXEEXT="" +test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +echo "$ac_t""${ac_cv_exeext}" 1>&6 +ac_exeext=$EXEEXT + + # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@ -1296,35 +1593,8 @@ else enable_fast_install=yes fi - -# Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } -fi - -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1307: checking host system type" >&5 - -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac - -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$host" 1>&6 - echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1328: checking build system type" >&5 +echo "configure:1598: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1344,7 +1614,7 @@ echo "$ac_t""$build" 1>&6 # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1348: checking for $ac_word" >&5 +echo "configure:1618: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1383,7 +1653,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1387: checking for ld used by GCC" >&5 +echo "configure:1657: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1407,10 +1677,10 @@ echo "configure:1387: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1411: checking for GNU ld" >&5 +echo "configure:1681: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1414: checking for non-GNU ld" >&5 +echo "configure:1684: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1445,7 +1715,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1449: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1719: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1461,7 +1731,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1465: checking for BSD-compatible nm" >&5 +echo "configure:1735: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1497,7 +1767,7 @@ NM="$ac_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1501: checking whether ln -s works" >&5 +echo "configure:1771: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1546,8 +1816,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" case "$lt_target" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1550 "configure"' > conftest.$ac_ext - if { (eval echo configure:1551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1820 "configure"' > conftest.$ac_ext + if { (eval echo configure:1821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1568,19 +1838,19 @@ case "$lt_target" in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:1572: checking whether the C compiler needs -belf" >&5 +echo "configure:1842: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1577 "configure" +#line 1847 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -1682,148 +1952,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' exec 5>>./config.log - echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:1687: checking for strerror in -lcposix" >&5 -ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lcposix $LIBS" -cat > conftest.$ac_ext <<EOF -#line 1695 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char strerror(); - -int main() { -strerror() -; return 0; } -EOF -if { (eval echo configure:1706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="$LIBS -lcposix" -else - echo "$ac_t""no" 1>&6 -fi - - - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# ./install, which can be erroneously created by make from ./install.sh. -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1740: checking for a BSD compatible install" >&5 -if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac - done - IFS="$ac_save_IFS" - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL="$ac_install_sh" - fi -fi -echo "$ac_t""$INSTALL" 1>&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -for ac_prog in 'bison -y' byacc -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1797: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$YACC"; then - ac_cv_prog_YACC="$YACC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YACC="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -YACC="$ac_cv_prog_YACC" -if test -n "$YACC"; then - echo "$ac_t""$YACC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$YACC" && break -done -test -n "$YACC" || YACC="yacc" - - cat >> confdefs.h <<\EOF #define _GNU_SOURCE 1 EOF @@ -1831,7 +1959,7 @@ EOF echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1835: checking how to run the C preprocessor" >&5 +echo "configure:1963: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1846,13 +1974,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1850 "configure" +#line 1978 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1863,13 +1991,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1867 "configure" +#line 1995 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1880,13 +2008,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1884 "configure" +#line 2012 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1911,12 +2039,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1915: checking for ANSI C header files" >&5 +echo "configure:2043: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1920 "configure" +#line 2048 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1924,7 +2052,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1941,7 +2069,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1945 "configure" +#line 2073 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1959,7 +2087,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1963 "configure" +#line 2091 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1980,7 +2108,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1984 "configure" +#line 2112 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1991,7 +2119,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2018,17 +2146,17 @@ for ac_hdr in limits.h malloc.h string.h unistd.h values.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2022: checking for $ac_hdr" >&5 +echo "configure:2150: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2027 "configure" +#line 2155 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2056,12 +2184,12 @@ done echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2060: checking for working const" >&5 +echo "configure:2188: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2065 "configure" +#line 2193 "configure" #include "confdefs.h" int main() { @@ -2110,7 +2238,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:2114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2131,21 +2259,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2135: checking for inline" >&5 +echo "configure:2263: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 2142 "configure" +#line 2270 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:2149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2171,13 +2299,47 @@ EOF esac + echo $ac_n "checking for signed""... $ac_c" 1>&6 +echo "configure:2304: checking for signed" >&5 +if eval "test \"`echo '$''{'bh_cv_c_signed'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 2309 "configure" +#include "confdefs.h" + +int main() { +signed char x; +; return 0; } +EOF +if { (eval echo configure:2316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + bh_cv_c_signed=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + bh_cv_c_signed=no +fi +rm -f conftest* +fi + +echo "$ac_t""$bh_cv_c_signed" 1>&6 + if test $bh_cv_c_signed = no; then + cat >> confdefs.h <<\EOF +#define signed +EOF + + fi + + echo $ac_n "checking whether backslash-a works in strings""... $ac_c" 1>&6 -echo "configure:2176: checking whether backslash-a works in strings" >&5 +echo "configure:2338: checking whether backslash-a works in strings" >&5 if eval "test \"`echo '$''{'ac_cv_c_backslash_a'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2181 "configure" +#line 2343 "configure" #include "confdefs.h" int main() { @@ -2191,7 +2353,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_backslash_a=yes else @@ -2213,12 +2375,12 @@ EOF echo $ac_n "checking for unsigned long long""... $ac_c" 1>&6 -echo "configure:2217: checking for unsigned long long" >&5 +echo "configure:2379: checking for unsigned long long" >&5 if eval "test \"`echo '$''{'ac_cv_type_unsigned_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2222 "configure" +#line 2384 "configure" #include "confdefs.h" unsigned long long ull = 1; int i = 63; int main() { @@ -2226,7 +2388,7 @@ unsigned long long ullmax = (unsigned long long) -1; return ull << i | ull >> i | ullmax / ull | ullmax % ull; ; return 0; } EOF -if { (eval echo configure:2230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_type_unsigned_long_long=yes else @@ -2247,12 +2409,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2251: checking for off_t" >&5 +echo "configure:2413: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2256 "configure" +#line 2418 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2280,12 +2442,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2284: checking for size_t" >&5 +echo "configure:2446: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2289 "configure" +#line 2451 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2313,19 +2475,19 @@ EOF fi echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6 -echo "configure:2317: checking for ptrdiff_t" >&5 +echo "configure:2479: checking for ptrdiff_t" >&5 if eval "test \"`echo '$''{'am_cv_type_ptrdiff_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2322 "configure" +#line 2484 "configure" #include "confdefs.h" #include <stddef.h> int main() { ptrdiff_t p ; return 0; } EOF -if { (eval echo configure:2329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_type_ptrdiff_t=yes else @@ -2347,12 +2509,12 @@ EOF echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6 -echo "configure:2351: checking for inttypes.h" >&5 +echo "configure:2513: checking for inttypes.h" >&5 if eval "test \"`echo '$''{'jm_ac_cv_header_inttypes_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2356 "configure" +#line 2518 "configure" #include "confdefs.h" #include <sys/types.h> #include <inttypes.h> @@ -2360,7 +2522,7 @@ int main() { uintmax_t i = (uintmax_t) -1; ; return 0; } EOF -if { (eval echo configure:2364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* jm_ac_cv_header_inttypes_h=yes else @@ -2397,19 +2559,19 @@ EOF # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2401: checking for working alloca.h" >&5 +echo "configure:2563: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2406 "configure" +#line 2568 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2430,12 +2592,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2434: checking for alloca" >&5 +echo "configure:2596: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2439 "configure" +#line 2601 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -2463,7 +2625,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:2467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2495,12 +2657,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2499: checking whether alloca needs Cray hooks" >&5 +echo "configure:2661: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2504 "configure" +#line 2666 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -2525,12 +2687,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2529: checking for $ac_func" >&5 +echo "configure:2691: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2534 "configure" +#line 2696 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2553,7 +2715,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2580,7 +2742,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2584: checking stack direction for C alloca" >&5 +echo "configure:2746: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2588,7 +2750,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 2592 "configure" +#line 2754 "configure" #include "confdefs.h" find_stack_direction () { @@ -2607,7 +2769,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:2611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2629,12 +2791,12 @@ EOF fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2633: checking for vprintf" >&5 +echo "configure:2795: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2638 "configure" +#line 2800 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vprintf(); below. */ @@ -2657,7 +2819,7 @@ vprintf(); ; return 0; } EOF -if { (eval echo configure:2661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2681,12 +2843,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2685: checking for _doprnt" >&5 +echo "configure:2847: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2690 "configure" +#line 2852 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char _doprnt(); below. */ @@ -2709,7 +2871,7 @@ _doprnt(); ; return 0; } EOF -if { (eval echo configure:2713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2736,12 +2898,12 @@ fi for ac_func in getcwd mblen memcpy strchr strerror uname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2740: checking for $ac_func" >&5 +echo "configure:2902: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2745 "configure" +#line 2907 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2764,7 +2926,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2792,12 +2954,12 @@ for ac_func in getline memmove memset stpcpy stpncpy strcspn \ strncasecmp strstr strtoul vasprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2796: checking for $ac_func" >&5 +echo "configure:2958: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2801 "configure" +#line 2963 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2820,7 +2982,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2850,12 +3012,12 @@ if test $ac_cv_func_getline != yes; then for ac_func in getdelim do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2854: checking for $ac_func" >&5 +echo "configure:3016: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2859 "configure" +#line 3021 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2878,7 +3040,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2905,12 +3067,12 @@ done fi echo $ac_n "checking for parse_printf_format""... $ac_c" 1>&6 -echo "configure:2909: checking for parse_printf_format" >&5 +echo "configure:3071: checking for parse_printf_format" >&5 if eval "test \"`echo '$''{'ac_cv_func_parse_printf_format'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2914 "configure" +#line 3076 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char parse_printf_format(); below. */ @@ -2933,7 +3095,7 @@ parse_printf_format(); ; return 0; } EOF -if { (eval echo configure:2937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_parse_printf_format=yes" else @@ -2963,19 +3125,19 @@ else fi echo $ac_n "checking for error_at_line""... $ac_c" 1>&6 -echo "configure:2967: checking for error_at_line" >&5 +echo "configure:3129: checking for error_at_line" >&5 if eval "test \"`echo '$''{'am_cv_lib_error_at_line'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2972 "configure" +#line 3134 "configure" #include "confdefs.h" int main() { error_at_line(0, 0, "", 0, ""); ; return 0; } EOF -if { (eval echo configure:2979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_error_at_line=yes else @@ -2998,17 +3160,17 @@ for ac_hdr in locale.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3002: checking for $ac_hdr" >&5 +echo "configure:3164: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3007 "configure" +#line 3169 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3035,28 +3197,32 @@ fi done echo $ac_n "checking for setlocale declaration""... $ac_c" 1>&6 -echo "configure:3039: checking for setlocale declaration" >&5 +echo "configure:3201: checking for setlocale declaration" >&5 if eval "test \"`echo '$''{'gt_cv_proto_setlocale'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3045 "configure" +#line 3207 "configure" #include "confdefs.h" #include <stdlib.h> #include <locale.h> +extern +#ifdef __cplusplus +"C" +#endif #if defined(__STDC__) || defined(__cplusplus) -char* setlocale (int category, char* locale); +char *setlocale (int category, char *locale); #else -char* setlocale(); +char *setlocale(); #endif int main() { ; return 0; } EOF -if { (eval echo configure:3060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gt_cv_proto_setlocale_arg1="" else @@ -3066,7 +3232,7 @@ else gt_cv_proto_setlocale_arg1="const" fi rm -f conftest* -gt_cv_proto_setlocale="extern char* setlocale (int, $gt_cv_proto_setlocale_arg1 char*);" +gt_cv_proto_setlocale="extern char *setlocale (int category, $gt_cv_proto_setlocale_arg1 char *locale);" fi gt_cv_proto_setlocale=`echo "$gt_cv_proto_setlocale" | tr -s ' ' | sed -e 's/( /(/'` @@ -3082,17 +3248,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3086: checking for $ac_hdr" >&5 +echo "configure:3252: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3091 "configure" +#line 3257 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3121,12 +3287,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3125: checking for $ac_func" >&5 +echo "configure:3291: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3130 "configure" +#line 3296 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3149,7 +3315,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3174,7 +3340,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:3178: checking for working mmap" >&5 +echo "configure:3344: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3182,7 +3348,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 3186 "configure" +#line 3352 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -3322,7 +3488,7 @@ main() } EOF -if { (eval echo configure:3326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -3350,17 +3516,17 @@ stdlib.h string.h unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3354: checking for $ac_hdr" >&5 +echo "configure:3520: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3359 "configure" +#line 3525 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3391,12 +3557,12 @@ setenv setlocale stpcpy strchr strcasecmp strdup tsearch \ __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3395: checking for $ac_func" >&5 +echo "configure:3561: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3400 "configure" +#line 3566 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3419,7 +3585,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3446,7 +3612,7 @@ done echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:3450: checking for iconv" >&5 +echo "configure:3616: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3454,7 +3620,7 @@ else am_cv_func_iconv="no, consider installing libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext <<EOF -#line 3458 "configure" +#line 3624 "configure" #include "confdefs.h" #include <stdlib.h> #include <iconv.h> @@ -3464,7 +3630,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:3468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -3476,7 +3642,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext <<EOF -#line 3480 "configure" +#line 3646 "configure" #include "confdefs.h" #include <stdlib.h> #include <iconv.h> @@ -3486,7 +3652,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:3490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -3507,13 +3673,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:3511: checking for iconv declaration" >&5 +echo "configure:3677: checking for iconv declaration" >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3517 "configure" +#line 3683 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3523,7 +3689,7 @@ extern "C" #endif #if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t* outbytesleft); +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); #else size_t iconv(); #endif @@ -3532,7 +3698,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3702: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -3542,7 +3708,7 @@ else am_cv_proto_iconv_arg1="const" fi rm -f conftest* - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t* outbytesleft);" + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" fi am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` @@ -3561,19 +3727,19 @@ EOF echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:3565: checking for nl_langinfo and CODESET" >&5 +echo "configure:3731: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3570 "configure" +#line 3736 "configure" #include "confdefs.h" #include <langinfo.h> int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:3577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -3596,19 +3762,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:3600: checking for LC_MESSAGES" >&5 +echo "configure:3766: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3605 "configure" +#line 3771 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:3612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -3629,7 +3795,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:3633: checking whether NLS is requested" >&5 +echo "configure:3799: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -3650,7 +3816,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:3654: checking whether included gettext is requested" >&5 +echo "configure:3820: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -3667,17 +3833,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:3671: checking for libintl.h" >&5 +echo "configure:3837: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3676 "configure" +#line 3842 "configure" #include "confdefs.h" #include <libintl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3694,12 +3860,12 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 -echo "configure:3698: checking for GNU gettext in libc" >&5 +echo "configure:3864: checking for GNU gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3703 "configure" +#line 3869 "configure" #include "confdefs.h" #include <libintl.h> extern int _nl_msg_cat_cntr; @@ -3708,7 +3874,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:3712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext_libc=yes else @@ -3724,14 +3890,14 @@ echo "$ac_t""$gt_cv_func_gnugettext_libc" 1>&6 if test "$gt_cv_func_gnugettext_libc" != "yes"; then echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 -echo "configure:3728: checking for GNU gettext in libintl" >&5 +echo "configure:3894: checking for GNU gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else gt_save_LIBS="$LIBS" LIBS="$LIBS -lintl" cat > conftest.$ac_ext <<EOF -#line 3735 "configure" +#line 3901 "configure" #include "confdefs.h" #include <libintl.h> extern int _nl_msg_cat_cntr; @@ -3740,7 +3906,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:3744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext_libintl=yes else @@ -3765,7 +3931,7 @@ EOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3769: checking for $ac_word" >&5 +echo "configure:3935: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3799,12 +3965,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3803: checking for $ac_func" >&5 +echo "configure:3969: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3808 "configure" +#line 3974 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3827,7 +3993,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3854,7 +4020,7 @@ done # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3858: checking for $ac_word" >&5 +echo "configure:4024: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3890,7 +4056,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3894: checking for $ac_word" >&5 +echo "configure:4060: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3943,7 +4109,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3947: checking for $ac_word" >&5 +echo "configure:4113: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3977,7 +4143,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3981: checking for $ac_word" >&5 +echo "configure:4147: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4013,7 +4179,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4017: checking for $ac_word" >&5 +echo "configure:4183: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4052,6 +4218,10 @@ fi LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi + if test -n "$LIBICONV" && test -n "$INTLLIBS"; then + INTLLIBS="$INTLLIBS $LIBICONV" + fi + if test "$XGETTEXT" != ":"; then if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; @@ -4100,7 +4270,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:4104: checking for catalogs to be installed" >&5 +echo "configure:4274: checking for catalogs to be installed" >&5 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -4164,7 +4334,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4168: checking for $ac_word" >&5 +echo "configure:4338: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_EMACS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4202,7 +4372,7 @@ test -n "$EMACS" || EMACS="no" if test $EMACS != "no"; then echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6 -echo "configure:4206: checking where .elc files should go" >&5 +echo "configure:4376: checking where .elc files should go" >&5 lispdir="\$(datadir)/emacs/site-lisp" emacs_flavor=`echo "$EMACS" | sed -e 's,^.*/,,'` if test "x$prefix" = "xNONE"; then @@ -4235,6 +4405,12 @@ aclocaldir='${datadir}/aclocal' test -d intl || mkdir intl echo "GNU gettext library from $PACKAGE-$VERSION" > intl/VERSION +cat > intl/ChangeLog.inst <<EOF +$RELEASE_DATE GNU <bug-gnu-utils@gnu.org> + + * Version $VERSION released. + +EOF trap '' 1 2 15 cat > confcache <<\EOF @@ -4383,11 +4559,14 @@ s%@AUTOHEADER@%$AUTOHEADER%g s%@MAKEINFO@%$MAKEINFO%g s%@SET_MAKE@%$SET_MAKE%g s%@CC@%$CC%g +s%@YACC@%$YACC%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g s%@host_vendor@%$host_vendor%g s%@host_os@%$host_os%g +s%@OBJEXT@%$OBJEXT%g +s%@EXEEXT@%$EXEEXT%g s%@build@%$build%g s%@build_alias@%$build_alias%g s%@build_cpu@%$build_cpu%g @@ -4396,7 +4575,6 @@ s%@build_os@%$build_os%g s%@RANLIB@%$RANLIB%g s%@LN_S@%$LN_S%g s%@LIBTOOL@%$LIBTOOL%g -s%@YACC@%$YACC%g s%@CPP@%$CPP%g s%@ALLOCA@%$ALLOCA%g s%@LIBOBJS@%$LIBOBJS%g diff --git a/doc/Makefile.in b/doc/Makefile.in index 9e161ab..3640954 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -68,6 +68,7 @@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ INTLLIBS = @INTLLIBS@ @@ -80,6 +81,7 @@ LN_S = @LN_S@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ @@ -95,7 +97,7 @@ AUTOMAKE_OPTIONS = 1.2 gnits SED = sed -MAKEINFO = LANG= LANGUAGE= @MAKEINFO@ +MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@ info_TEXINFOS = gettext.texi gettext_TEXINFOS = iso-apdx.texi diff --git a/doc/gettext.info b/doc/gettext.info index b941c63..a4b8055 100644 --- a/doc/gettext.info +++ b/doc/gettext.info @@ -33,103 +33,103 @@ translation approved by the Foundation. Indirect: gettext.info-1: 1411 -gettext.info-2: 49199 -gettext.info-3: 97209 -gettext.info-4: 146607 -gettext.info-5: 196054 +gettext.info-2: 49514 +gettext.info-3: 98183 +gettext.info-4: 147581 +gettext.info-5: 197086 Tag Table: (Indirect) Node: Top1411 -Node: Introduction6886 -Node: Why8742 -Ref: Why-Footnote-111832 -Node: Concepts11988 -Node: Aspects15401 -Node: Files21458 -Node: Overview23726 -Node: Basics34338 -Node: Installation35168 -Node: PO Files37135 -Ref: PO Files-Footnote-144147 -Node: Main PO Commands44259 -Node: Entry Positioning49199 -Node: Normalizing54450 -Node: Sources58902 -Node: Triggering60172 -Node: Mark Keywords62528 -Node: Marking66078 -Node: c-format73719 -Node: Special cases77469 -Node: Initial80331 -Node: xgettext Invocation80653 -Node: C Sources Context84481 -Node: Compendium89460 -Node: Updating90163 -Node: msgmerge Invocation90803 -Node: Translated Entries90977 -Node: Fuzzy Entries92268 -Node: Untranslated Entries95370 -Node: Obsolete Entries97209 -Node: Modifying Translations100341 -Node: Modifying Comments108159 -Node: Subedit112466 -Node: Auxiliary116243 -Node: Binaries119313 -Node: msgfmt Invocation119577 -Node: MO Files122203 -Node: Users130289 -Node: Matrix131770 -Node: Installers132973 -Node: End Users134143 -Node: Programmers134772 -Node: catgets135946 -Node: Interface to catgets137351 -Node: Problems with catgets139352 -Node: gettext140250 -Node: Interface to gettext141708 -Node: Ambiguities144050 -Node: Locating Catalogs146607 -Ref: Locating Catalogs-Footnote-1147658 -Ref: Locating Catalogs-Footnote-2147768 -Node: Charset conversion147917 -Node: Plural forms150359 -Ref: Plural forms-Footnote-1160137 -Node: GUI program problems160229 -Node: Optimized gettext165332 -Node: Comparison166665 -Node: Using libintl.a171090 -Node: gettext grok171861 -Node: Temp Programmers174493 -Node: Temp Implementations174933 -Node: Temp catgets176299 -Node: Temp WSI177986 -Node: Temp Notes179974 -Node: Translators180463 -Node: Trans Intro 0180842 -Node: Trans Intro 1183491 -Node: Discussions185355 -Node: Organization188511 -Node: Central Coordination190492 -Node: National Teams191620 -Node: Sub-Cultures194132 -Node: Organizational Ideas195051 -Node: Mailing Lists196054 -Node: Information Flow197857 -Node: Maintainers199990 -Node: Flat and Non-Flat201749 -Node: Prerequisites203510 -Node: gettextize Invocation207619 -Node: Adjusting Files211191 -Node: po/POTFILES.in212414 -Node: configure.in213353 -Node: aclocal215479 -Node: acconfig216658 -Node: Makefile217256 -Node: src/Makefile219444 -Node: Conclusion221841 -Node: History222330 -Node: References225790 -Node: Country Codes227345 +Node: Introduction6887 +Node: Why8743 +Ref: Why-Footnote-111833 +Node: Concepts11989 +Node: Aspects15402 +Node: Files21459 +Node: Overview23727 +Node: Basics34653 +Node: Installation35483 +Node: PO Files37450 +Ref: PO Files-Footnote-144462 +Node: Main PO Commands44574 +Node: Entry Positioning49514 +Node: Normalizing54765 +Node: Sources59217 +Node: Triggering60487 +Node: Mark Keywords63502 +Node: Marking67052 +Node: c-format74693 +Node: Special cases78443 +Node: Initial81305 +Node: xgettext Invocation81627 +Node: C Sources Context85455 +Node: Compendium90434 +Node: Updating91137 +Node: msgmerge Invocation91777 +Node: Translated Entries91951 +Node: Fuzzy Entries93242 +Node: Untranslated Entries96344 +Node: Obsolete Entries98183 +Node: Modifying Translations101315 +Node: Modifying Comments109133 +Node: Subedit113440 +Node: Auxiliary117217 +Node: Binaries120287 +Node: msgfmt Invocation120551 +Node: MO Files123177 +Node: Users131263 +Node: Matrix132744 +Node: Installers133947 +Node: End Users135117 +Node: Programmers135746 +Node: catgets136920 +Node: Interface to catgets138325 +Node: Problems with catgets140326 +Node: gettext141224 +Node: Interface to gettext142682 +Node: Ambiguities145024 +Node: Locating Catalogs147581 +Ref: Locating Catalogs-Footnote-1148728 +Ref: Locating Catalogs-Footnote-2148953 +Node: Charset conversion149102 +Node: Plural forms151544 +Ref: Plural forms-Footnote-1161322 +Node: GUI program problems161414 +Node: Optimized gettext166517 +Node: Comparison167850 +Node: Using libintl.a172122 +Node: gettext grok172893 +Node: Temp Programmers175525 +Node: Temp Implementations175965 +Node: Temp catgets177331 +Node: Temp WSI179018 +Node: Temp Notes181006 +Node: Translators181495 +Node: Trans Intro 0181874 +Node: Trans Intro 1184523 +Node: Discussions186387 +Node: Organization189543 +Node: Central Coordination191524 +Node: National Teams192652 +Node: Sub-Cultures195164 +Node: Organizational Ideas196083 +Node: Mailing Lists197086 +Node: Information Flow198889 +Node: Maintainers201022 +Node: Flat and Non-Flat202781 +Node: Prerequisites204542 +Node: gettextize Invocation208651 +Node: Adjusting Files212223 +Node: po/POTFILES.in213446 +Node: configure.in214385 +Node: aclocal216511 +Node: acconfig217690 +Node: Makefile218288 +Node: src/Makefile220476 +Node: Conclusion222873 +Node: History223363 +Node: References226823 +Node: Language Codes228378 End Tag Table diff --git a/doc/gettext.info-1 b/doc/gettext.info-1 index e238daf..d7cdd42 100644 --- a/doc/gettext.info-1 +++ b/doc/gettext.info-1 @@ -50,7 +50,7 @@ GNU `gettext' utilities * Maintainers:: The Maintainer's View * Conclusion:: Concluding Remarks -* Country Codes:: ISO 639 country codes +* Language Codes:: ISO 639 language codes --- The Detailed Node Listing --- @@ -577,8 +577,17 @@ in a central header file: Doing this allows you to prepare the sources for internationalization. Later when you feel ready for the step to use the `gettext' library -simply remove these definitions, include `libintl.h' and link against -`libintl.a'. That is all you have to change. +simply replace these definitions by the following: + + #include <libintl.h> + #define _(String) gettext (String) + #define gettext_noop(String) (String) + #define N_(String) gettext_noop (String) + + and link against `libintl.a' or `libintl.so'. Note that on GNU +systems, you don't need to link with `libintl' because the `gettext' +library functions are already contained in GNU libc. That is all you +have to change. Once the C sources have been modified, the `xgettext' program is used to find and extract all translatable strings, and create an diff --git a/doc/gettext.info-2 b/doc/gettext.info-2 index 9048a29..36352bd 100644 --- a/doc/gettext.info-2 +++ b/doc/gettext.info-2 @@ -320,17 +320,30 @@ code above by a sequence of `setlocale' lines { ... - setlocale (LC_TIME, ""); + setlocale (LC_CTYPE, ""); setlocale (LC_MESSAGES, ""); ... } -or to switch for and back to the character class in question. On all -POSIX conformant systems the locale categories `LC_CTYPE', +On all POSIX conformant systems the locale categories `LC_CTYPE', `LC_COLLATE', `LC_MONETARY', `LC_NUMERIC', and `LC_TIME' are available. On some modern systems there is also a locale `LC_MESSAGES' which is called on some old, XPG2 compliant systems `LC_RESPONSES'. + Note that changing the `LC_CTYPE' also affects the functions +declared in the `<ctype.h>' standard header. If this is not desirable +in your application (for example in a compiler's parser), you can use a +set of substitute functions which hardwire the C locale, such as found +in the `<c-ctype.h>' and `<c-ctype.c>' files in the gettext source +distribution. + + It is also possible to switch the locale forth and back between the +environment dependent locale and the C locale, but this approach is +normally avoided because a `setlocale' call is expensive, because it is +tedious to determine the places where a locale switch is needed in a +large program's source, and because switching a locale is not +multithread-safe. + File: gettext.info, Node: Mark Keywords, Next: Marking, Prev: Triggering, Up: Sources diff --git a/doc/gettext.info-4 b/doc/gettext.info-4 index 0bb950e..e3c0b23 100644 --- a/doc/gettext.info-4 +++ b/doc/gettext.info-4 @@ -51,13 +51,17 @@ library, and for packages adhering to its conventions, it's: /usr/local/share/locale LOCALE is the value of the locale whose name is this `LC_CATEGORY'. -For `gettext' and `dgettext' this locale is always `LC_MESSAGES'. -`dcgettext' specifies the locale by the third argument.(1) (2) +For `gettext' and `dgettext' this `LC_CATEGORY' is always +`LC_MESSAGES'.(1) The value of the locale is determined through +`setlocale (LC_CATEGORY, NULL)'. (2) `dcgettext' specifies the locale +category by the third argument. ---------- Footnotes ---------- (1) Some system, eg Ultrix, don't have `LC_MESSAGES'. Here we use a -more or less arbitrary value for it. +more or less arbitrary value for it, namely 1729, the smallest positive +integer which can be represented in two different ways as the sum of +two cubes. (2) When the system does not support `setlocale' its behavior in setting the locale values is simulated by looking at the environment @@ -565,16 +569,11 @@ program which does not depend on translations to be available, but which can use any that becomes available. The same procedure can be done for the `gettext_noop' invocations -(*note Special cases::). First you can define `gettext_noop' to a -no-op macro and later use the definition from `libintl.h'. Because -this name is not used in Suns implementation of `libintl.h', you should -consider the following code for your project: - - #ifdef gettext_noop - # define N_(String) gettext_noop (String) - #else - # define N_(String) (String) - #endif +(*note Special cases::). One usually defines `gettext_noop' as a no-op +macro. So you should consider the following code for your project: + + #define gettext_noop(String) (String) + #define N_(String) gettext_noop (String) `N_' is a short form similar to `_'. The `Makefile' in the `po/' directory of GNU `gettext' knows by default both of the mentioned short diff --git a/doc/gettext.info-5 b/doc/gettext.info-5 index 61a1c7f..03411a4 100644 --- a/doc/gettext.info-5 +++ b/doc/gettext.info-5 @@ -618,7 +618,7 @@ modifications needed in `src/Makefile.in': -File: gettext.info, Node: Conclusion, Next: Country Codes, Prev: Maintainers, Up: Top +File: gettext.info, Node: Conclusion, Next: Language Codes, Prev: Maintainers, Up: Top Concluding Remarks ****************** @@ -734,14 +734,14 @@ This site is mirrored in: together with French translations of many Linux-related documents. -File: gettext.info, Node: Country Codes, Prev: Conclusion, Up: Top +File: gettext.info, Node: Language Codes, Prev: Conclusion, Up: Top -Country Codes -************* +Language Codes +************** - The ISO 639 standard defines two character codes for many countries. -All abreviations for countries or languages used in the Translation -Project should come from this standard. + The ISO 639 standard defines two character codes for many languages. +All abbreviations for languages used in the Translation Project should +come from this standard. `aa' Afar. diff --git a/doc/version.texi b/doc/version.texi index 947f5f7..4f39b30 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,3 +1,3 @@ -@set UPDATED 31 January 2001 +@set UPDATED 9 March 2001 @set EDITION 0.10.36 @set VERSION 0.10.36 diff --git a/lib/Makefile.in b/lib/Makefile.in index e9480da..3ce86ba 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -68,6 +68,7 @@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ INTLLIBS = @INTLLIBS@ @@ -81,6 +82,7 @@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ @@ -96,31 +98,40 @@ AUTOMAKE_OPTIONS = 1.2 gnits noinst_LIBRARIES = libnlsut.a -EXTRA_DIST = alloca.c error.c getline.c memset.c memmove.c printf-prs.c stpcpy.c stpncpy.c strcasecmp.c strcspn.c strncasecmp.c strstr.c strtol.c strtoul.c vasprintf.c +EXTRA_DIST = alloca.c config.charset error.c getline.c memset.c memmove.c printf-prs.c ref-add.sin ref-del.sin stpcpy.c stpncpy.c strcasecmp.c strcspn.c strncasecmp.c strstr.c strtol.c strtoul.c vasprintf.c gen-lbrkprop.c 3level.h -libnlsut_a_SOURCES = basename.c fstrcmp.c getopt.c getopt1.c hash.c obstack.c xgetcwd.c xmalloc.c xstrdup.c +libnlsut_a_SOURCES = basename.c c-ctype.c concatpath.c fstrcmp.c getopt.c getopt1.c hash.c linebreak.c localcharset.c obstack.c xgetcwd.c xmalloc.c xstrdup.c libnlsut_a_LIBADD = @ALLOCA@ @LIBOBJS@ -noinst_HEADERS = error.h fstrcmp.h getline.h getopt.h hash.h obstack.h printf-parse.h printf.h system.h pathmax.h +noinst_HEADERS = c-ctype.h error.h fstrcmp.h getline.h getopt.h hash.h lbrkprop.h linebreak.h obstack.h printf-parse.h printf.h system.h pathmax.h -INCLUDES = -I../intl +DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@ +INCLUDES = -I. -I$(srcdir) -I.. -I../intl + +charset_alias = $(DESTDIR)$(libdir)/charset.alias +charset_tmp = $(DESTDIR)$(libdir)/charset.tmp + +SUFFIXES = .sed .sin + +CLEANFILES = charset.alias ref-add.sed ref-del.sed mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) - -DEFS = @DEFS@ -I. -I$(srcdir) -I.. CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libnlsut_a_DEPENDENCIES = @ALLOCA@ @LIBOBJS@ -libnlsut_a_OBJECTS = basename.o fstrcmp.o getopt.o getopt1.o hash.o \ -obstack.o xgetcwd.o xmalloc.o xstrdup.o +libnlsut_a_OBJECTS = basename.$(OBJEXT) c-ctype.$(OBJEXT) \ +concatpath.$(OBJEXT) fstrcmp.$(OBJEXT) getopt.$(OBJEXT) \ +getopt1.$(OBJEXT) hash.$(OBJEXT) linebreak.$(OBJEXT) \ +localcharset.$(OBJEXT) obstack.$(OBJEXT) xgetcwd.$(OBJEXT) \ +xmalloc.$(OBJEXT) xstrdup.$(OBJEXT) AR = ar CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -143,7 +154,7 @@ OBJECTS = $(libnlsut_a_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .lo .o .s +.SUFFIXES: .S .c .lo .o .obj .s .sed .sin $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps lib/Makefile @@ -164,6 +175,11 @@ maintainer-clean-noinstLIBRARIES: .c.o: $(COMPILE) -c $< +# FIXME: We should only use cygpath when building on Windows, +# and only if it is available. +.c.obj: + $(COMPILE) -c `cygpath -w $<` + .s.o: $(COMPILE) -c $< @@ -172,6 +188,7 @@ maintainer-clean-noinstLIBRARIES: mostlyclean-compile: -rm -f *.o core *.core + -rm -f *.$(OBJEXT) clean-compile: @@ -256,7 +273,7 @@ check-am: all-am check: check-am installcheck-am: installcheck: installcheck-am -install-exec-am: +install-exec-am: install-exec-local install-exec: install-exec-am install-data-am: @@ -265,9 +282,9 @@ install-data: install-data-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: +uninstall-am: uninstall-local uninstall: uninstall-am -all-am: Makefile $(LIBRARIES) $(HEADERS) +all-am: Makefile $(LIBRARIES) $(HEADERS) all-local all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install @@ -277,6 +294,7 @@ installdirs: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) @@ -316,12 +334,54 @@ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - +dvi-am dvi check check-am installcheck-am installcheck \ +install-exec-local install-exec-am install-exec install-data-am \ +install-data install-am install uninstall-local uninstall-am uninstall \ +all-local all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean + + +# The following is needed in order to install a simple file in $(libdir) +# which is shared with other installed packages. We use a list of referencing +# packages so that "make uninstall" will remove the file if and only if it +# is not used by another installed package. +# On systems with glibc-2.1 or newer, the file is redundant, therefore we +# avoid installing it. + +all-local: charset.alias ref-add.sed ref-del.sed +install-exec-local: all-local + $(mkinstalldirs) $(DESTDIR)$(libdir) + if test -f $(charset_alias); then \ + sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ + $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ + rm -f $(charset_tmp) ; \ + else \ + if test @GLIBC21@ = no; then \ + sed -f ref-add.sed charset.alias > $(charset_tmp) ; \ + $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ + rm -f $(charset_tmp) ; \ + fi ; \ + fi + +uninstall-local: all-local + if test -f $(charset_alias); then \ + sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \ + if grep '^# Packages using this file: $$' $(charset_tmp) \ + > /dev/null; then \ + rm -f $(charset_alias); \ + else \ + $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \ + fi; \ + rm -f $(charset_tmp); \ + fi + +charset.alias: config.charset + $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ + mv t-$@ $@ +.sin.sed: + sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@ + mv t-$@ $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/m4/Makefile.in b/m4/Makefile.in index 908e1c8..edd6af9 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -68,6 +68,7 @@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ INTLLIBS = @INTLLIBS@ @@ -81,6 +82,7 @@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ @@ -92,12 +94,12 @@ YACC = @YACC@ lispdir = @lispdir@ aclocaldir = @aclocaldir@ -aclocal_DATA = gettext.m4 isc-posix.m4 lcmessage.m4 progtest.m4 +aclocal_DATA = codeset.m4 gettext.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 # Generate this list with # find . -type f -name '*.m4' -printf '%f\n'|sort |fmt |tr '\012' @ \ # |sed 's/@$/%/;s/@/ \\@/g' |tr @% '\012\012' -EXTRA_DIST = README c-bs-a.m4 codeset.m4 gettext.m4 iconv.m4 inttypes_h.m4 isc-posix.m4 lcmessage.m4 libtool.m4 progtest.m4 setlocale.m4 uintmax_t.m4 ulonglong.m4 +EXTRA_DIST = README c-bs-a.m4 codeset.m4 gettext.m4 iconv.m4 inttypes_h.m4 isc-posix.m4 lcmessage.m4 libtool.m4 progtest.m4 setlocale.m4 signed.m4 uintmax_t.m4 ulonglong.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h diff --git a/misc/Makefile.in b/misc/Makefile.in index 4a49b77..42f6599 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -68,6 +68,7 @@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ INTLLIBS = @INTLLIBS@ @@ -81,6 +82,7 @@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ Binary files differBinary files differBinary files differBinary files differBinary files differdiff --git a/po/ja.gmo b/po/ja.gmo Binary files differBinary files differBinary files differnew file mode 100644 index 0000000..eb13d09 --- /dev/null +++ b/po/ja.gmo diff --git a/po/nn.gmo b/po/nn.gmo Binary files differBinary files differBinary files differBinary files differBinary files differBinary files differBinary files differnew file mode 100644 index 0000000..dc84e9a --- /dev/null +++ b/po/nn.gmo diff --git a/src/Makefile.in b/src/Makefile.in index 62d1e4a..e179b88 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -67,6 +67,7 @@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ INTLLIBS = @INTLLIBS@ @@ -80,6 +81,7 @@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ @@ -94,7 +96,7 @@ AUTOMAKE_OPTIONS = 1.2 gnits bin_PROGRAMS = gettext msgcmp msgfmt msgmerge msgunfmt xgettext msgcomm -noinst_HEADERS = pos.h message.h po-gram.h po-hash.h po-lex.h po.h open-po.h str-list.h xget-lex.h dir-list.h po-gram-gen.h po-hash-gen.h +noinst_HEADERS = pos.h message.h po-gram.h po-hash.h po-lex.h po.h open-po.h str-list.h write-po.h xget-lex.h dir-list.h po-gram-gen.h po-hash-gen.h EXTRA_DIST = FILES @@ -116,56 +118,71 @@ msgcmp_SOURCES = message.c msgcmp.c open-po.c po-gram-gen.y po-hash-gen.y po-lex msgfmt_SOURCES = msgfmt.c open-po.c po-gram-gen.y po-hash-gen.y po-lex.c po.c str-list.c message.c dir-list.c -msgmerge_SOURCES = message.c msgmerge.c open-po.c po-gram-gen.y po-hash-gen.y po-lex.c po.c str-list.c dir-list.c +msgmerge_SOURCES = message.c msgmerge.c open-po.c po-gram-gen.y po-hash-gen.y po-lex.c po.c str-list.c dir-list.c write-po.c -msgunfmt_SOURCES = message.c msgunfmt.c str-list.c -xgettext_SOURCES = message.c open-po.c po-gram-gen.y po-hash-gen.y po-lex.c po.c str-list.c xget-lex.c xgettext.c dir-list.c +msgunfmt_SOURCES = message.c msgunfmt.c str-list.c write-po.c +xgettext_SOURCES = message.c open-po.c po-gram-gen.y po-hash-gen.y po-lex.c po.c str-list.c xget-lex.c xgettext.c dir-list.c write-po.c -msgcomm_SOURCES = msgcomm.c message.c po-gram-gen.y po-hash-gen.y po-lex.c open-po.c po.c str-list.c dir-list.c +msgcomm_SOURCES = msgcomm.c message.c po-gram-gen.y po-hash-gen.y po-lex.c open-po.c po.c str-list.c dir-list.c write-po.c +# Link dependencies. +# po-lex.c and po.c may need -liconv. +# write-po.c pulls in linebreak.c which may need -liconv. +msgcmp_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ +msgfmt_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ +msgmerge_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ +msgunfmt_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ +xgettext_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ +msgcomm_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ + BUILT_SOURCES = po-gram-gen.c po-hash-gen.c po-gram-gen.h po-hash-gen.h DISTCLEANFILES = po-gram-gen2.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = +bin_PROGRAMS = gettext$(EXEEXT) msgcmp$(EXEEXT) msgfmt$(EXEEXT) \ +msgmerge$(EXEEXT) msgunfmt$(EXEEXT) xgettext$(EXEEXT) msgcomm$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -gettext_OBJECTS = gettext.o +gettext_OBJECTS = gettext.$(OBJEXT) gettext_LDADD = $(LDADD) gettext_DEPENDENCIES = ../lib/libnlsut.a gettext_LDFLAGS = -msgcmp_OBJECTS = message.o msgcmp.o open-po.o po-gram-gen.o \ -po-hash-gen.o po-lex.o po.o str-list.o dir-list.o -msgcmp_LDADD = $(LDADD) +msgcmp_OBJECTS = message.$(OBJEXT) msgcmp.$(OBJEXT) open-po.$(OBJEXT) \ +po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) po-lex.$(OBJEXT) \ +po.$(OBJEXT) str-list.$(OBJEXT) dir-list.$(OBJEXT) msgcmp_DEPENDENCIES = ../lib/libnlsut.a msgcmp_LDFLAGS = -msgfmt_OBJECTS = msgfmt.o open-po.o po-gram-gen.o po-hash-gen.o \ -po-lex.o po.o str-list.o message.o dir-list.o -msgfmt_LDADD = $(LDADD) +msgfmt_OBJECTS = msgfmt.$(OBJEXT) open-po.$(OBJEXT) \ +po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) po-lex.$(OBJEXT) \ +po.$(OBJEXT) str-list.$(OBJEXT) message.$(OBJEXT) dir-list.$(OBJEXT) msgfmt_DEPENDENCIES = ../lib/libnlsut.a msgfmt_LDFLAGS = -msgmerge_OBJECTS = message.o msgmerge.o open-po.o po-gram-gen.o \ -po-hash-gen.o po-lex.o po.o str-list.o dir-list.o -msgmerge_LDADD = $(LDADD) +msgmerge_OBJECTS = message.$(OBJEXT) msgmerge.$(OBJEXT) \ +open-po.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ +po-lex.$(OBJEXT) po.$(OBJEXT) str-list.$(OBJEXT) dir-list.$(OBJEXT) \ +write-po.$(OBJEXT) msgmerge_DEPENDENCIES = ../lib/libnlsut.a msgmerge_LDFLAGS = -msgunfmt_OBJECTS = message.o msgunfmt.o str-list.o -msgunfmt_LDADD = $(LDADD) +msgunfmt_OBJECTS = message.$(OBJEXT) msgunfmt.$(OBJEXT) \ +str-list.$(OBJEXT) write-po.$(OBJEXT) msgunfmt_DEPENDENCIES = ../lib/libnlsut.a msgunfmt_LDFLAGS = -xgettext_OBJECTS = message.o open-po.o po-gram-gen.o po-hash-gen.o \ -po-lex.o po.o str-list.o xget-lex.o xgettext.o dir-list.o -xgettext_LDADD = $(LDADD) +xgettext_OBJECTS = message.$(OBJEXT) open-po.$(OBJEXT) \ +po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) po-lex.$(OBJEXT) \ +po.$(OBJEXT) str-list.$(OBJEXT) xget-lex.$(OBJEXT) xgettext.$(OBJEXT) \ +dir-list.$(OBJEXT) write-po.$(OBJEXT) xgettext_DEPENDENCIES = ../lib/libnlsut.a xgettext_LDFLAGS = -msgcomm_OBJECTS = msgcomm.o message.o po-gram-gen.o po-hash-gen.o \ -po-lex.o open-po.o po.o str-list.o dir-list.o -msgcomm_LDADD = $(LDADD) +msgcomm_OBJECTS = msgcomm.$(OBJEXT) message.$(OBJEXT) \ +po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) po-lex.$(OBJEXT) \ +open-po.$(OBJEXT) po.$(OBJEXT) str-list.$(OBJEXT) dir-list.$(OBJEXT) \ +write-po.$(OBJEXT) msgcomm_DEPENDENCIES = ../lib/libnlsut.a msgcomm_LDFLAGS = YLWRAP = $(srcdir)/ylwrap @@ -189,7 +206,7 @@ OBJECTS = $(gettext_OBJECTS) $(msgcmp_OBJECTS) $(msgfmt_OBJECTS) $(msgmerge_OBJE all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .lo .o .s .y +.SUFFIXES: .S .c .lo .o .obj .s .y $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps src/Makefile @@ -226,6 +243,11 @@ uninstall-binPROGRAMS: .c.o: $(COMPILE) -c $< +# FIXME: We should only use cygpath when building on Windows, +# and only if it is available. +.c.obj: + $(COMPILE) -c `cygpath -w $<` + .s.o: $(COMPILE) -c $< @@ -234,6 +256,7 @@ uninstall-binPROGRAMS: mostlyclean-compile: -rm -f *.o core *.core + -rm -f *.$(OBJEXT) clean-compile: @@ -261,32 +284,32 @@ distclean-libtool: maintainer-clean-libtool: -gettext: $(gettext_OBJECTS) $(gettext_DEPENDENCIES) - @rm -f gettext +gettext$(EXEEXT): $(gettext_OBJECTS) $(gettext_DEPENDENCIES) + @rm -f gettext$(EXEEXT) $(LINK) $(gettext_LDFLAGS) $(gettext_OBJECTS) $(gettext_LDADD) $(LIBS) -msgcmp: $(msgcmp_OBJECTS) $(msgcmp_DEPENDENCIES) - @rm -f msgcmp +msgcmp$(EXEEXT): $(msgcmp_OBJECTS) $(msgcmp_DEPENDENCIES) + @rm -f msgcmp$(EXEEXT) $(LINK) $(msgcmp_LDFLAGS) $(msgcmp_OBJECTS) $(msgcmp_LDADD) $(LIBS) -msgfmt: $(msgfmt_OBJECTS) $(msgfmt_DEPENDENCIES) - @rm -f msgfmt +msgfmt$(EXEEXT): $(msgfmt_OBJECTS) $(msgfmt_DEPENDENCIES) + @rm -f msgfmt$(EXEEXT) $(LINK) $(msgfmt_LDFLAGS) $(msgfmt_OBJECTS) $(msgfmt_LDADD) $(LIBS) -msgmerge: $(msgmerge_OBJECTS) $(msgmerge_DEPENDENCIES) - @rm -f msgmerge +msgmerge$(EXEEXT): $(msgmerge_OBJECTS) $(msgmerge_DEPENDENCIES) + @rm -f msgmerge$(EXEEXT) $(LINK) $(msgmerge_LDFLAGS) $(msgmerge_OBJECTS) $(msgmerge_LDADD) $(LIBS) -msgunfmt: $(msgunfmt_OBJECTS) $(msgunfmt_DEPENDENCIES) - @rm -f msgunfmt +msgunfmt$(EXEEXT): $(msgunfmt_OBJECTS) $(msgunfmt_DEPENDENCIES) + @rm -f msgunfmt$(EXEEXT) $(LINK) $(msgunfmt_LDFLAGS) $(msgunfmt_OBJECTS) $(msgunfmt_LDADD) $(LIBS) -xgettext: $(xgettext_OBJECTS) $(xgettext_DEPENDENCIES) - @rm -f xgettext +xgettext$(EXEEXT): $(xgettext_OBJECTS) $(xgettext_DEPENDENCIES) + @rm -f xgettext$(EXEEXT) $(LINK) $(xgettext_LDFLAGS) $(xgettext_OBJECTS) $(xgettext_LDADD) $(LIBS) -msgcomm: $(msgcomm_OBJECTS) $(msgcomm_DEPENDENCIES) - @rm -f msgcomm +msgcomm$(EXEEXT): $(msgcomm_OBJECTS) $(msgcomm_DEPENDENCIES) + @rm -f msgcomm$(EXEEXT) $(LINK) $(msgcomm_LDFLAGS) $(msgcomm_OBJECTS) $(msgcomm_LDADD) $(LIBS) .y.c: $(SHELL) $(YLWRAP) "$(YACC)" $< y.tab.c $*.c y.tab.h $*.h -- $(AM_YFLAGS) $(YFLAGS) diff --git a/src/po-gram-gen.c b/src/po-gram-gen.c index d3d2f88..164e6ff 100644 --- a/src/po-gram-gen.c +++ b/src/po-gram-gen.c @@ -80,13 +80,18 @@ static long plural_counter; -#line 97 "po-gram-gen.y" +#define check_obsolete(value1,value2) \ + if ((value1).obsolete != (value2).obsolete) \ + po_gram_error_at_line (&(value2).pos, _("inconsistent use of #~")); + + +#line 102 "po-gram-gen.y" typedef union { - char *string; - long number; - lex_pos_ty pos; - struct msgstr_def rhs; + struct { char *string; lex_pos_ty pos; int obsolete; } string; + struct { long number; lex_pos_ty pos; int obsolete; } number; + struct { lex_pos_ty pos; int obsolete; } pos; + struct { struct msgstr_def rhs; lex_pos_ty pos; int obsolete; } rhs; } YYSTYPE; #include <stdio.h> @@ -98,11 +103,11 @@ typedef union -#define YYFINAL 30 +#define YYFINAL 28 #define YYFLAG -32768 #define YYNTBASE 14 -#define YYTRANSLATE(x) ((unsigned)(x) <= 265 ? yytranslate[x] : 24) +#define YYTRANSLATE(x) ((unsigned)(x) <= 265 ? yytranslate[x] : 22) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -137,25 +142,24 @@ static const char yytranslate[] = { 0, #if YYDEBUG != 0 static const short yyprhs[] = { 0, 0, 1, 4, 7, 10, 13, 16, 21, 26, 30, - 34, 37, 40, 42, 45, 51, 53, 55, 57, 60 + 34, 37, 40, 42, 45, 51, 53, 56 }; static const short yyrhs[] = { -1, - 14, 23, 0, 14, 15, 0, 14, 16, 0, 14, - 1, 0, 4, 13, 0, 20, 22, 21, 22, 0, - 20, 22, 17, 18, 0, 20, 22, 17, 0, 20, - 22, 18, 0, 20, 22, 0, 7, 22, 0, 19, - 0, 18, 19, 0, 21, 10, 12, 11, 22, 0, - 6, 0, 8, 0, 13, 0, 22, 13, 0, 3, - 0 + 14, 21, 0, 14, 15, 0, 14, 16, 0, 14, + 1, 0, 4, 13, 0, 6, 20, 8, 20, 0, + 6, 20, 17, 18, 0, 6, 20, 17, 0, 6, + 20, 18, 0, 6, 20, 0, 7, 20, 0, 19, + 0, 18, 19, 0, 8, 10, 12, 11, 20, 0, + 13, 0, 20, 13, 0, 3, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 115, 116, 117, 118, 119, 123, 130, 135, 140, 146, - 152, 160, 168, 172, 185, 202, 209, 216, 220, 235 + 120, 121, 122, 123, 124, 128, 135, 149, 164, 172, + 180, 189, 200, 204, 219, 241, 245, 263 }; #endif @@ -165,54 +169,54 @@ static const short yyrline[] = { 0, static const char * const yytname[] = { "$","error","$undefined.","COMMENT", "DOMAIN","JUNK","MSGID","MSGID_PLURAL","MSGSTR","NAME","'['","']'","NUMBER", "STRING","msgfmt","domain","message","msgid_pluralform","pluralform_list","pluralform", -"msgid","msgstr","string_list","comment", NULL +"string_list","comment", NULL }; #endif static const short yyr1[] = { 0, 14, 14, 14, 14, 14, 15, 16, 16, 16, 16, - 16, 17, 18, 18, 19, 20, 21, 22, 22, 23 + 16, 17, 18, 18, 19, 20, 20, 21 }; static const short yyr2[] = { 0, 0, 2, 2, 2, 2, 2, 4, 4, 3, 3, - 2, 2, 1, 2, 5, 1, 1, 1, 2, 1 + 2, 2, 1, 2, 5, 1, 2, 1 }; static const short yydefact[] = { 1, - 0, 5, 20, 0, 16, 3, 4, 0, 2, 6, - 18, 11, 0, 17, 19, 9, 10, 13, 0, 12, - 8, 0, 14, 0, 7, 0, 0, 15, 0, 0 + 0, 5, 18, 0, 0, 3, 4, 2, 6, 16, + 11, 0, 0, 17, 9, 10, 13, 12, 0, 7, + 0, 8, 14, 0, 0, 15, 0, 0 }; static const short yydefgoto[] = { 1, - 6, 7, 16, 17, 18, 8, 22, 12, 9 + 6, 7, 15, 16, 17, 11, 8 }; static const short yypact[] = {-32768, - 1,-32768,-32768, -10,-32768,-32768,-32768, -2,-32768,-32768, --32768, 2, -2,-32768,-32768, 9, 9,-32768, 3, 5, - 9, 10,-32768, 7, 5, 11, -2, 5, 21,-32768 + 2,-32768,-32768, -1, 1,-32768,-32768,-32768,-32768,-32768, + 3, 1, -6,-32768, 9, 9,-32768, 5, 7, 5, + 10, 9,-32768, 11, 1, 5, 21,-32768 }; static const short yypgoto[] = {-32768, --32768,-32768,-32768, 8, -9,-32768, 13, -13,-32768 +-32768,-32768,-32768, 8, -7, -12,-32768 }; -#define YYLAST 25 +#define YYLAST 23 -static const short yytable[] = { 20, - 29, 2, 10, 3, 4, 25, 5, 23, 13, 14, - 11, 23, 24, 28, 15, 11, 14, 15, 26, 24, - 30, 27, 0, 21, 19 +static const short yytable[] = { 18, + 20, 27, 2, 19, 3, 4, 10, 5, 23, 12, + 13, 9, 26, 10, 23, 14, 21, 14, 24, 19, + 28, 25, 22 }; -static const short yycheck[] = { 13, - 0, 1, 13, 3, 4, 19, 6, 17, 7, 8, - 13, 21, 10, 27, 13, 13, 8, 13, 12, 10, - 0, 11, -1, 16, 12 +static const short yycheck[] = { 12, + 13, 0, 1, 10, 3, 4, 13, 6, 16, 7, + 8, 13, 25, 13, 22, 13, 8, 13, 12, 10, + 0, 11, 15 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple" @@ -758,125 +762,150 @@ yyreduce: switch (yyn) { case 6: -#line 124 "po-gram-gen.y" +#line 129 "po-gram-gen.y" { - po_callback_domain (yyvsp[0].string); + po_callback_domain (yyvsp[0].string.string); ; break;} case 7: -#line 131 "po-gram-gen.y" +#line 136 "po-gram-gen.y" { - po_callback_message (yyvsp[-2].string, &yyvsp[-3].pos, NULL, - yyvsp[0].string, strlen (yyvsp[0].string) + 1, &yyvsp[-1].pos); + check_obsolete (yyvsp[-3].pos, yyvsp[-2].string); + check_obsolete (yyvsp[-3].pos, yyvsp[-1].pos); + check_obsolete (yyvsp[-3].pos, yyvsp[0].string); + if (!yyvsp[-3].pos.obsolete || pass_obsolete_entries) + po_callback_message (yyvsp[-2].string.string, &yyvsp[-3].pos.pos, NULL, + yyvsp[0].string.string, strlen (yyvsp[0].string.string) + 1, &yyvsp[-1].pos.pos); + else + { + free (yyvsp[-2].string.string); + free (yyvsp[0].string.string); + } ; break;} case 8: -#line 136 "po-gram-gen.y" +#line 150 "po-gram-gen.y" { - po_callback_message (yyvsp[-2].string, &yyvsp[-3].pos, yyvsp[-1].string, - yyvsp[0].rhs.msgstr, yyvsp[0].rhs.msgstr_len, &yyvsp[0].rhs.pos); + check_obsolete (yyvsp[-3].pos, yyvsp[-2].string); + check_obsolete (yyvsp[-3].pos, yyvsp[-1].string); + check_obsolete (yyvsp[-3].pos, yyvsp[0].rhs); + if (!yyvsp[-3].pos.obsolete || pass_obsolete_entries) + po_callback_message (yyvsp[-2].string.string, &yyvsp[-3].pos.pos, yyvsp[-1].string.string, + yyvsp[0].rhs.rhs.msgstr, yyvsp[0].rhs.rhs.msgstr_len, &yyvsp[0].rhs.pos); + else + { + free (yyvsp[-2].string.string); + free (yyvsp[-1].string.string); + free (yyvsp[0].rhs.rhs.msgstr); + } ; break;} case 9: -#line 141 "po-gram-gen.y" +#line 165 "po-gram-gen.y" { - po_gram_error_at_line (&yyvsp[-2].pos, _("missing `msgstr[]' section")); - free (yyvsp[-1].string); - free (yyvsp[0].string); + check_obsolete (yyvsp[-2].pos, yyvsp[-1].string); + check_obsolete (yyvsp[-2].pos, yyvsp[0].string); + po_gram_error_at_line (&yyvsp[-2].pos.pos, _("missing `msgstr[]' section")); + free (yyvsp[-1].string.string); + free (yyvsp[0].string.string); ; break;} case 10: -#line 147 "po-gram-gen.y" +#line 173 "po-gram-gen.y" { - po_gram_error_at_line (&yyvsp[-2].pos, _("missing `msgid_plural' section")); - free (yyvsp[-1].string); - free (yyvsp[0].rhs.msgstr); + check_obsolete (yyvsp[-2].pos, yyvsp[-1].string); + check_obsolete (yyvsp[-2].pos, yyvsp[0].rhs); + po_gram_error_at_line (&yyvsp[-2].pos.pos, _("missing `msgid_plural' section")); + free (yyvsp[-1].string.string); + free (yyvsp[0].rhs.rhs.msgstr); ; break;} case 11: -#line 153 "po-gram-gen.y" +#line 181 "po-gram-gen.y" { - po_gram_error_at_line (&yyvsp[-1].pos, _("missing `msgstr' section")); - free (yyvsp[0].string); + check_obsolete (yyvsp[-1].pos, yyvsp[0].string); + po_gram_error_at_line (&yyvsp[-1].pos.pos, _("missing `msgstr' section")); + free (yyvsp[0].string.string); ; break;} case 12: -#line 161 "po-gram-gen.y" +#line 190 "po-gram-gen.y" { + check_obsolete (yyvsp[-1].pos, yyvsp[0].string); plural_counter = 0; - yyval.string = yyvsp[0].string; + yyval.string.string = yyvsp[0].string.string; + yyval.string.pos = yyvsp[-1].pos.pos; + yyval.string.obsolete = yyvsp[-1].pos.obsolete; ; break;} case 13: -#line 169 "po-gram-gen.y" +#line 201 "po-gram-gen.y" { yyval.rhs = yyvsp[0].rhs; ; break;} case 14: -#line 173 "po-gram-gen.y" +#line 205 "po-gram-gen.y" { - yyval.rhs.msgstr = (char *) xmalloc (yyvsp[-1].rhs.msgstr_len + yyvsp[0].rhs.msgstr_len); - memcpy (yyval.rhs.msgstr, yyvsp[-1].rhs.msgstr, yyvsp[-1].rhs.msgstr_len); - memcpy (yyval.rhs.msgstr + yyvsp[-1].rhs.msgstr_len, yyvsp[0].rhs.msgstr, yyvsp[0].rhs.msgstr_len); - yyval.rhs.msgstr_len = yyvsp[-1].rhs.msgstr_len + yyvsp[0].rhs.msgstr_len; + check_obsolete (yyvsp[-1].rhs, yyvsp[0].rhs); + yyval.rhs.rhs.msgstr = (char *) xmalloc (yyvsp[-1].rhs.rhs.msgstr_len + yyvsp[0].rhs.rhs.msgstr_len); + memcpy (yyval.rhs.rhs.msgstr, yyvsp[-1].rhs.rhs.msgstr, yyvsp[-1].rhs.rhs.msgstr_len); + memcpy (yyval.rhs.rhs.msgstr + yyvsp[-1].rhs.rhs.msgstr_len, yyvsp[0].rhs.rhs.msgstr, yyvsp[0].rhs.rhs.msgstr_len); + yyval.rhs.rhs.msgstr_len = yyvsp[-1].rhs.rhs.msgstr_len + yyvsp[0].rhs.rhs.msgstr_len; + free (yyvsp[-1].rhs.rhs.msgstr); + free (yyvsp[0].rhs.rhs.msgstr); yyval.rhs.pos = yyvsp[-1].rhs.pos; - free (yyvsp[-1].rhs.msgstr); - free (yyvsp[0].rhs.msgstr); + yyval.rhs.obsolete = yyvsp[-1].rhs.obsolete; ; break;} case 15: -#line 186 "po-gram-gen.y" +#line 220 "po-gram-gen.y" { - if (yyvsp[-2].number != plural_counter) + check_obsolete (yyvsp[-4].pos, yyvsp[-3].pos); + check_obsolete (yyvsp[-4].pos, yyvsp[-2].number); + check_obsolete (yyvsp[-4].pos, yyvsp[-1].pos); + check_obsolete (yyvsp[-4].pos, yyvsp[0].string); + if (yyvsp[-2].number.number != plural_counter) { if (plural_counter == 0) - po_gram_error_at_line (&yyvsp[-4].pos, _("first plural form has nonzero index")); + po_gram_error_at_line (&yyvsp[-4].pos.pos, _("first plural form has nonzero index")); else - po_gram_error_at_line (&yyvsp[-4].pos, _("plural form has wrong index")); + po_gram_error_at_line (&yyvsp[-4].pos.pos, _("plural form has wrong index")); } plural_counter++; - yyval.rhs.msgstr = yyvsp[0].string; - yyval.rhs.msgstr_len = strlen (yyvsp[0].string) + 1; - yyval.rhs.pos = yyvsp[-4].pos; + yyval.rhs.rhs.msgstr = yyvsp[0].string.string; + yyval.rhs.rhs.msgstr_len = strlen (yyvsp[0].string.string) + 1; + yyval.rhs.pos = yyvsp[-4].pos.pos; + yyval.rhs.obsolete = yyvsp[-4].pos.obsolete; ; break;} case 16: -#line 203 "po-gram-gen.y" -{ - yyval.pos = gram_pos; - ; - break;} -case 17: -#line 210 "po-gram-gen.y" -{ - yyval.pos = gram_pos; - ; - break;} -case 18: -#line 217 "po-gram-gen.y" +#line 242 "po-gram-gen.y" { yyval.string = yyvsp[0].string; ; break;} -case 19: -#line 221 "po-gram-gen.y" +case 17: +#line 246 "po-gram-gen.y" { size_t len1; size_t len2; - len1 = strlen (yyvsp[-1].string); - len2 = strlen (yyvsp[0].string); - yyval.string = (char *) xmalloc (len1 + len2 + 1); - stpcpy (stpcpy (yyval.string, yyvsp[-1].string), yyvsp[0].string); - free (yyvsp[-1].string); - free (yyvsp[0].string); + check_obsolete (yyvsp[-1].string, yyvsp[0].string); + len1 = strlen (yyvsp[-1].string.string); + len2 = strlen (yyvsp[0].string.string); + yyval.string.string = (char *) xmalloc (len1 + len2 + 1); + stpcpy (stpcpy (yyval.string.string, yyvsp[-1].string.string), yyvsp[0].string.string); + free (yyvsp[-1].string.string); + free (yyvsp[0].string.string); + yyval.string.pos = yyvsp[-1].string.pos; + yyval.string.obsolete = yyvsp[-1].string.obsolete; ; break;} -case 20: -#line 236 "po-gram-gen.y" +case 18: +#line 264 "po-gram-gen.y" { - po_callback_comment (yyvsp[0].string); + po_callback_comment (yyvsp[0].string.string); ; break;} } @@ -1101,4 +1130,4 @@ yyerrhandle: } return 1; } -#line 240 "po-gram-gen.y" +#line 268 "po-gram-gen.y" diff --git a/src/po-gram-gen.h b/src/po-gram-gen.h index 9eabb33..40602c3 100644 --- a/src/po-gram-gen.h +++ b/src/po-gram-gen.h @@ -1,9 +1,9 @@ typedef union { - char *string; - long number; - lex_pos_ty pos; - struct msgstr_def rhs; + struct { char *string; lex_pos_ty pos; int obsolete; } string; + struct { long number; lex_pos_ty pos; int obsolete; } number; + struct { lex_pos_ty pos; int obsolete; } pos; + struct { struct msgstr_def rhs; lex_pos_ty pos; int obsolete; } rhs; } YYSTYPE; #define COMMENT 257 #define DOMAIN 258 diff --git a/tests/Makefile.in b/tests/Makefile.in index e9aad79..0338d13 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -68,6 +68,7 @@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +EXEEXT = @EXEEXT@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ INTLLIBS = @INTLLIBS@ @@ -81,6 +82,7 @@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ POFILES = @POFILES@ POSUB = @POSUB@ @@ -107,7 +109,7 @@ TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) PATH=.:../src:$$PATH GETTEXT= # Two auxiliary programs used by the tests. INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ -LDADD = ../intl/libintl.la +LDADD = ../intl/libintl.la @LIBICONV@ EXTRA_PROGRAMS = tstgettext cake tstgettext_SOURCES = tstgettext.c setlocale.c tstgettext_LDADD = ../lib/libnlsut.a $(LDADD) @@ -119,10 +121,10 @@ CONFIG_CLEAN_FILES = CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -tstgettext_OBJECTS = tstgettext.o setlocale.o +tstgettext_OBJECTS = tstgettext.$(OBJEXT) setlocale.$(OBJEXT) tstgettext_DEPENDENCIES = ../lib/libnlsut.a ../intl/libintl.la tstgettext_LDFLAGS = -cake_OBJECTS = plural-1-prg.o setlocale.o +cake_OBJECTS = plural-1-prg.$(OBJEXT) setlocale.$(OBJEXT) cake_LDADD = $(LDADD) cake_DEPENDENCIES = ../intl/libintl.la cake_LDFLAGS = @@ -143,7 +145,7 @@ OBJECTS = $(tstgettext_OBJECTS) $(cake_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .lo .o .s +.SUFFIXES: .S .c .lo .o .obj .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps tests/Makefile @@ -155,6 +157,11 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status .c.o: $(COMPILE) -c $< +# FIXME: We should only use cygpath when building on Windows, +# and only if it is available. +.c.obj: + $(COMPILE) -c `cygpath -w $<` + .s.o: $(COMPILE) -c $< @@ -163,6 +170,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status mostlyclean-compile: -rm -f *.o core *.core + -rm -f *.$(OBJEXT) clean-compile: @@ -190,12 +198,12 @@ distclean-libtool: maintainer-clean-libtool: -tstgettext: $(tstgettext_OBJECTS) $(tstgettext_DEPENDENCIES) - @rm -f tstgettext +tstgettext$(EXEEXT): $(tstgettext_OBJECTS) $(tstgettext_DEPENDENCIES) + @rm -f tstgettext$(EXEEXT) $(LINK) $(tstgettext_LDFLAGS) $(tstgettext_OBJECTS) $(tstgettext_LDADD) $(LIBS) -cake: $(cake_OBJECTS) $(cake_DEPENDENCIES) - @rm -f cake +cake$(EXEEXT): $(cake_OBJECTS) $(cake_DEPENDENCIES) + @rm -f cake$(EXEEXT) $(LINK) $(cake_LDFLAGS) $(cake_OBJECTS) $(cake_LDADD) $(LIBS) tags: TAGS |