diff options
| -rw-r--r-- | ABOUT-NLS | 240 | ||||
| -rw-r--r-- | Makefile.in | 11 | ||||
| -rw-r--r-- | aclocal.m4 | 129 | ||||
| -rw-r--r-- | config.h.in | 3 | ||||
| -rwxr-xr-x | configure | 956 | ||||
| -rw-r--r-- | doc/Makefile.in | 4 | ||||
| -rw-r--r-- | intl-java/Makefile.in | 5 | ||||
| -rw-r--r-- | intl/plural.c | 35 | ||||
| -rw-r--r-- | lib/Makefile.in | 119 | ||||
| -rw-r--r-- | m4/Makefile.in | 2 | ||||
| -rw-r--r-- | man/Makefile.in | 2 | ||||
| -rw-r--r-- | misc/Makefile.in | 2 | ||||
| -rw-r--r-- | projects/Makefile.in | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 308 | ||||
| -rw-r--r-- | src/x-java.c | 1 | ||||
| -rw-r--r-- | tests/Makefile.in | 14 | ||||
| -rw-r--r-- | tests/xg-test1.ok.po | 148 |
17 files changed, 1183 insertions, 798 deletions
@@ -164,128 +164,132 @@ Available Packages ================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of September +matrix shows the current state of internationalization, as of November 2001. The matrix shows, in regard of each package, for which languages PO files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO files bg cs da de el en eo es et fi fr gl he hr id it ja - +----------------------------------------------------+ - a2ps | [] [] [] | - bash | [] [] [] [] | - bfd | | - binutils | [] | - bison | [] [] [] [] [] | - clisp | [] [] [] [] | - cpio | [] [] [] [] [] | - diffutils | [] [] [] [] [] [] [] | - enscript | [] [] | - error | [] [] | - fetchmail | | - fileutils | [] [] [] [] [] [] [] [] | - findutils | [] [] [] [] [] [] [] [] | - flex | [] [] [] | - freetype | | - gas | | - gawk | [] [] | - gcal | | - gcc | | - gettext | [] [] [] [] [] [] [] [] [] [] | - gnupg | [] [] [] [] [] [] [] | - gprof | | - grep | [] [] [] [] [] [] [] [] | - hello | [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] | - indent | [] [] [] [] [] | - jpilot | [] | - kbd | | - ld | [] | - libc | [] [] [] [] [] [] [] [] | - lilypond | [] | - lynx | [] [] [] [] | - m4 | [] [] [] [] [] [] [] [] | - make | [] [] [] [] [] [] | - mysecretdiary | [] | - nano | [] [] [] | - opcodes | | - parted | [] [] [] | - ptx | [] [] [] [] [] [] [] | - python | | - recode | [] [] [] [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] [] [] [] [] [] [] [] | - sharutils | [] [] [] [] [] [] [] [] | - sketch | | - soundtracker | [] [] [] | - sp | | - tar | [] [] [] [] [] [] [] [] | - texinfo | [] [] [] [] [] [] | - textutils | [] [] [] [] [] [] [] [] | - util-linux | [] [] | - wdiff | [] [] [] | - wget | [] [] [] [] [] [] [] [] [] [] | - +----------------------------------------------------+ - bg cs da de el en eo es et fi fr gl he hr id it ja - 0 14 24 32 11 1 8 23 13 1 33 22 4 0 7 9 18 + Ready PO files bg ca cs da de el en eo es et fi fr gl he hr hu id it + +-------------------------------------------------------+ + a2ps | [] [] [] [] | + bash | [] [] [] [] | + bfd | [] | + binutils | [] | + bison | [] [] [] [] | + clisp | [] [] [] [] | + cpio | [] [] [] [] [] | + diffutils | [] [] [] [] [] [] [] | + enscript | [] [] | + error | [] [] [] | + fetchmail | [] | + fileutils | [] [] [] [] [] [] [] | + findutils | [] [] [] [] [] [] [] [] | + flex | [] [] [] | + freetype | | + gas | [] | + gawk | [] [] | + gcal | | + gcc | [] | + gettext | [] [] [] [] [] [] [] [] [] | + gnupg | [] [] [] [] [] [] | + gprof | [] | + grep | [] [] [] [] [] [] [] [] | + hello | [] [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] | + indent | [] [] [] [] [] | + jpilot | [] [] [] | + jwhois | | + kbd | | + ld | [] | + libc | [] [] [] [] [] [] [] [] | + lilypond | [] | + lynx | [] [] [] | + m4 | [] [] [] [] [] [] [] | + make | [] [] [] [] [] | + mysecretdiary | [] | + nano | [] [] [] [] [] [] | + nano_1_0 | [] [] [] [] [] [] | + opcodes | [] | + parted | [] [] [] | + ptx | [] [] [] [] [] [] [] | + python | | + recode | [] [] [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] [] [] | + sh-utils | [] [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] [] | + sketch | | + soundtracker | [] [] [] | + sp | | + tar | [] [] [] [] [] [] [] | + texinfo | [] [] [] [] [] | + textutils | [] [] [] [] [] [] [] | + util-linux | [] [] [] | + wdiff | [] [] [] | + wget | [] [] [] [] [] [] [] [] [] | + +-------------------------------------------------------+ + bg ca cs da de el en eo es et fi fr gl he hr hu id it + 0 3 14 31 35 11 1 8 24 13 1 39 23 4 0 2 8 9 - ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh - +----------------------------------------------------+ - a2ps | [] [] [] | 6 - bash | | 4 - bfd | | 0 - binutils | | 1 - bison | [] | 6 - clisp | [] | 5 - cpio | [] [] [] [] [] | 10 - diffutils | [] [] [] [] | 11 - enscript | [] [] [] | 5 - error | [] [] | 4 - fetchmail | | 0 - fileutils | [] [] [] [] [] [] [] [] [] | 17 - findutils | [] [] [] [] [] [] [] [] | 16 - flex | [] [] [] | 6 - freetype | | 0 - gas | | 0 - gawk | [] | 3 - gcal | | 0 - gcc | | 0 - gettext | [] [] [] [] [] [] [] [] | 18 - gnupg | [] [] [] | 10 - gprof | | 0 - grep | [] [] [] [] | 12 - hello | [] [] [] [] [] [] [] [] [] [] [] | 22 - id-utils | [] [] [] | 6 - indent | [] [] [] [] [] [] [] | 12 - jpilot | | 1 - kbd | [] | 1 - ld | | 1 - libc | [] [] [] [] [] [] [] [] | 16 - lilypond | [] [] | 3 - lynx | [] [] [] [] | 8 - m4 | [] [] [] [] | 12 - make | [] [] [] [] [] [] | 12 - mysecretdiary | | 1 - nano | [] | 4 - opcodes | [] | 1 - parted | [] [] | 5 - ptx | [] [] [] [] [] [] [] [] | 15 - python | | 0 - recode | [] [] [] [] | 13 - sed | [] [] [] [] [] [] [] | 19 - sh-utils | [] [] [] [] [] [] [] [] [] [] [] | 21 - sharutils | [] [] [] | 11 - sketch | | 0 - soundtracker | | 3 - sp | | 0 - tar | [] [] [] [] [] [] [] | 15 - texinfo | [] | 7 - textutils | [] [] [] [] [] [] [] [] | 16 - util-linux | [] [] | 4 - wdiff | [] [] [] [] | 7 - wget | [] [] [] [] [] [] [] | 17 - +----------------------------------------------------+ - 33 teams ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh - 53 domains 9 1 6 20 0 6 17 1 13 25 10 11 23 21 2 2 387 + ja ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh + +-------------------------------------------------------+ + a2ps | [] [] [] [] | 8 + bash | | 4 + bfd | | 1 + binutils | [] | 2 + bison | [] [] [] | 7 + clisp | [] | 5 + cpio | [] [] [] [] [] [] | 11 + diffutils | [] [] [] [] | 11 + enscript | [] [] [] | 5 + error | [] [] | 5 + fetchmail | | 1 + fileutils | [] [] [] [] [] [] [] [] [] [] | 17 + findutils | [] [] [] [] [] [] [] [] | 16 + flex | [] [] [] | 6 + freetype | | 0 + gas | | 1 + gawk | [] | 3 + gcal | | 0 + gcc | | 1 + gettext | [] [] [] [] [] [] [] [] [] [] | 19 + gnupg | [] [] [] [] | 10 + gprof | | 1 + grep | [] [] [] [] | 12 + hello | [] [] [] [] [] [] [] [] [] [] [] [] | 23 + id-utils | [] [] [] | 6 + indent | [] [] [] [] [] [] [] | 12 + jpilot | | 3 + jwhois | | 0 + kbd | [] | 1 + ld | [] | 2 + libc | [] [] [] [] [] [] [] [] [] | 17 + lilypond | [] [] [] | 4 + lynx | [] [] [] [] [] | 8 + m4 | [] [] [] [] [] | 12 + make | [] [] [] [] [] [] [] | 12 + mysecretdiary | | 1 + nano | [] [] [] | 9 + nano_1_0 | [] | 7 + opcodes | [] [] | 3 + parted | [] [] | 5 + ptx | [] [] [] [] [] [] [] [] | 15 + python | | 0 + recode | [] [] [] [] | 13 + sed | [] [] [] [] [] [] [] [] [] | 20 + sh-utils | [] [] [] [] [] [] [] [] [] [] [] [] | 21 + sharutils | [] [] [] [] | 11 + sketch | | 0 + soundtracker | | 3 + sp | | 0 + tar | [] [] [] [] [] [] [] [] | 15 + texinfo | [] [] | 7 + textutils | [] [] [] [] [] [] [] [] [] | 16 + util-linux | [] [] [] | 6 + wdiff | [] [] [] [] | 7 + wget | [] [] [] [] [] [] [] [] | 17 + +-------------------------------------------------------+ + 35 teams ja ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh + 55 domains 18 10 1 6 19 0 6 17 1 13 25 11 11 30 23 3 2 422 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -298,7 +302,7 @@ distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a distribution. - If September 2001 seems to be old, you may fetch a more recent copy + If November 2001 seems to be old, you may fetch a more recent copy of this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date matrix with full percentage details can be found at `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. diff --git a/Makefile.in b/Makefile.in index 8ed8c2a..6be6805 100644 --- a/Makefile.in +++ b/Makefile.in @@ -78,12 +78,19 @@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ HAVE_GCJ = @HAVE_GCJ@ +HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@ HAVE_GIJ = @HAVE_GIJ@ +HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@ HAVE_JAVAC = @HAVE_JAVAC@ +HAVE_JAVAC_IN_PATH = @HAVE_JAVAC_IN_PATH@ +HAVE_JAVA_IN_PATH = @HAVE_JAVA_IN_PATH@ HAVE_JAVA_JVM = @HAVE_JAVA_JVM@ HAVE_JIKES = @HAVE_JIKES@ +HAVE_JIKES_IN_PATH = @HAVE_JIKES_IN_PATH@ HAVE_JRE = @HAVE_JRE@ +HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@ HAVE_JVIEW = @HAVE_JVIEW@ +HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ @@ -99,6 +106,8 @@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTALLOCA = @LTALLOCA@ +LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ @@ -128,7 +137,7 @@ gettextsrc_DATA = ABOUT-NLS SUBDIRS = doc intl intl-java lib src po man m4 projects misc tests -EXTRA_DIST = BUGS DISCLAIM README.gemtext \ +EXTRA_DIST = BUGS DISCLAIM README.gemtext README-alpha \ djgpp/Makefile.maint djgpp/README.in djgpp/README \ djgpp/config.bat djgpp/config.in djgpp/config.sed \ djgpp/config.site djgpp/edtests.bat djgpp/fnchange.in \ @@ -592,15 +592,28 @@ AC_DEFUN([gt_JAVACOMP], if test -n "$JAVAC"; then ac_result="$JAVAC" else - if gcj --version 2>/dev/null | grep '^[3-9]' >/dev/null; then + pushdef([AC_MSG_CHECKING],[:])dnl + pushdef([AC_CHECKING],[:])dnl + pushdef([AC_MSG_RESULT],[:])dnl + AC_CHECK_PROG(HAVE_GCJ_IN_PATH, gcj, yes) + AC_CHECK_PROG(HAVE_JAVAC_IN_PATH, javac, yes) + AC_CHECK_PROG(HAVE_JIKES_IN_PATH, jikes, yes) + popdef([AC_MSG_RESULT])dnl + popdef([AC_CHECKING])dnl + popdef([AC_MSG_CHECKING])dnl + if test -n "$HAVE_GCJ_IN_PATH" \ + && gcj --version 2>/dev/null | grep '^[3-9]' >/dev/null; then HAVE_GCJ=1 ac_result="gcj -C" else - if (javac -version >/dev/null 2>/dev/null || test $? -le 2); then + if test -n "$HAVE_JAVAC_IN_PATH" \ + && (javac -version >/dev/null 2>/dev/null || test $? -le 2); then HAVE_JAVAC=1 ac_result="javac" else - if (jikes >/dev/null 2>/dev/null || test $? = 1) && ( + if test -n "$HAVE_JIKES_IN_PATH" \ + && (jikes >/dev/null 2>/dev/null || test $? = 1) \ + && ( # See if the existing CLASSPATH is sufficient to make jikes work. cat > conftest.java <<EOF public class conftest { @@ -649,19 +662,33 @@ AC_DEFUN([gt_JAVAEXEC], if test -n "$JAVA"; then ac_result="$JAVA" else - if gij --version >/dev/null 2>/dev/null; then + pushdef([AC_MSG_CHECKING],[:])dnl + pushdef([AC_CHECKING],[:])dnl + pushdef([AC_MSG_RESULT],[:])dnl + AC_CHECK_PROG(HAVE_GIJ_IN_PATH, gij, yes) + AC_CHECK_PROG(HAVE_JAVA_IN_PATH, java, yes) + AC_CHECK_PROG(HAVE_JRE_IN_PATH, jre, yes) + AC_CHECK_PROG(HAVE_JVIEW_IN_PATH, jview, yes) + popdef([AC_MSG_RESULT])dnl + popdef([AC_CHECKING])dnl + popdef([AC_MSG_CHECKING])dnl + if test -n "$HAVE_GIJ_IN_PATH" \ + && gij --version >/dev/null 2>/dev/null; then HAVE_GIJ=1 ac_result="gij" else - if java -version >/dev/null 2>/dev/null; then + if test -n "$HAVE_JAVA_IN_PATH" \ + && java -version >/dev/null 2>/dev/null; then HAVE_JAVA_JVM=1 ac_result="java" else - if (jre >/dev/null 2>/dev/null || test $? = 1); then + if test -n "$HAVE_JRE_IN_PATH" \ + && (jre >/dev/null 2>/dev/null || test $? = 1); then HAVE_JRE=1 ac_result="jre" else - if (jview -? >/dev/null 2>/dev/null || test $? = 1); then + if test -n "$HAVE_JVIEW_IN_PATH" \ + && (jview -? >/dev/null 2>/dev/null || test $? = 1); then HAVE_JVIEW=1 ac_result="jview" else @@ -4391,7 +4418,7 @@ AC_DEFUN([gt_FUNC_MKDTEMP], [ AC_REPLACE_FUNCS(mkdtemp) AC_STAT_MACROS_BROKEN - AC_CHECK_HEADERS(fcntl.h stdint.h sys/time.h time.h unistd.h) + AC_CHECK_HEADERS(fcntl.h inttypes.h stdint.h sys/time.h time.h unistd.h) AC_CHECK_FUNCS(gettimeofday) ]) @@ -4732,52 +4759,56 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" || test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions to use GNU gettext tools. CATOBJEXT=.gmo - - dnl Search for GNU msgfmt in the PATH. - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - - dnl Search for GNU xgettext in the PATH. - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :) - - dnl Search for GNU msgmerge 0.11 or newer in the PATH. - AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, - [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) - - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. - dnl Test whether we really found GNU msgfmt. - if test "$GMSGFMT" != ":"; then - dnl If it is no GNU msgfmt we define it as : so that the - dnl Makefiles still can work. - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then - : ; - else - AC_MSG_RESULT( - [found msgfmt program is not GNU msgfmt; ignore it]) - GMSGFMT=":" - fi - fi - - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. - 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 - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi fi dnl We need to process the po/ directory. POSUB=po fi + + dnl Perform the following tests also if --disable-nls has been given, + dnl because they are needed for "make dist" to work. + + dnl Search for GNU msgfmt in the PATH. + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + + dnl Search for GNU xgettext in the PATH. + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :) + + dnl Search for GNU msgmerge 0.11 or newer in the PATH. + AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, + [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) + + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. + dnl Test whether we really found GNU msgfmt. + if test "$GMSGFMT" != ":"; then + dnl If it is no GNU msgfmt we define it as : so that the + dnl Makefiles still can work. + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then + : ; + else + AC_MSG_RESULT( + [found msgfmt program is not GNU msgfmt; ignore it]) + GMSGFMT=":" + fi + fi + + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. + 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 + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi + AC_OUTPUT_COMMANDS( [for ac_file in $CONFIG_FILES; do # Support "outfile[:infile[:infile...]]" diff --git a/config.h.in b/config.h.in index 28fb5e9..1715cc8 100644 --- a/config.h.in +++ b/config.h.in @@ -256,6 +256,9 @@ /* Define if you have the <fcntl.h> header file. */ #undef HAVE_FCNTL_H +/* Define if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + /* Define if you have the <limits.h> header file. */ #undef HAVE_LIMITS_H @@ -959,7 +959,7 @@ fi # Define the identity of the package. PACKAGE=gettext -VERSION=0.11 +VERSION=0.11-pre1 cat >> confdefs.h <<EOF #define PACKAGE "$PACKAGE" EOF @@ -1583,15 +1583,103 @@ rm -f conftest* if test -n "$JAVAC"; then ac_result="$JAVAC" else - if gcj --version 2>/dev/null | grep '^3-9' >/dev/null; then + # Extract the first word of "gcj", so it can be a program name with args. +set dummy gcj; ac_word=$2 +: +if eval "test \"`echo '$''{'ac_cv_prog_HAVE_GCJ_IN_PATH'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$HAVE_GCJ_IN_PATH"; then + ac_cv_prog_HAVE_GCJ_IN_PATH="$HAVE_GCJ_IN_PATH" # 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_HAVE_GCJ_IN_PATH="yes" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +HAVE_GCJ_IN_PATH="$ac_cv_prog_HAVE_GCJ_IN_PATH" +if test -n "$HAVE_GCJ_IN_PATH"; then + : +else + : +fi + + # Extract the first word of "javac", so it can be a program name with args. +set dummy javac; ac_word=$2 +: +if eval "test \"`echo '$''{'ac_cv_prog_HAVE_JAVAC_IN_PATH'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$HAVE_JAVAC_IN_PATH"; then + ac_cv_prog_HAVE_JAVAC_IN_PATH="$HAVE_JAVAC_IN_PATH" # 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_HAVE_JAVAC_IN_PATH="yes" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +HAVE_JAVAC_IN_PATH="$ac_cv_prog_HAVE_JAVAC_IN_PATH" +if test -n "$HAVE_JAVAC_IN_PATH"; then + : +else + : +fi + + # Extract the first word of "jikes", so it can be a program name with args. +set dummy jikes; ac_word=$2 +: +if eval "test \"`echo '$''{'ac_cv_prog_HAVE_JIKES_IN_PATH'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$HAVE_JIKES_IN_PATH"; then + ac_cv_prog_HAVE_JIKES_IN_PATH="$HAVE_JIKES_IN_PATH" # 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_HAVE_JIKES_IN_PATH="yes" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +HAVE_JIKES_IN_PATH="$ac_cv_prog_HAVE_JIKES_IN_PATH" +if test -n "$HAVE_JIKES_IN_PATH"; then + : +else + : +fi + + if test -n "$HAVE_GCJ_IN_PATH" \ + && gcj --version 2>/dev/null | grep '^3-9' >/dev/null; then HAVE_GCJ=1 ac_result="gcj -C" else - if (javac -version >/dev/null 2>/dev/null || test $? -le 2); then + if test -n "$HAVE_JAVAC_IN_PATH" \ + && (javac -version >/dev/null 2>/dev/null || test $? -le 2); then HAVE_JAVAC=1 ac_result="javac" else - if (jikes >/dev/null 2>/dev/null || test $? = 1) && ( + if test -n "$HAVE_JIKES_IN_PATH" \ + && (jikes >/dev/null 2>/dev/null || test $? = 1) \ + && ( # See if the existing CLASSPATH is sufficient to make jikes work. cat > conftest.java <<EOF public class conftest { @@ -1625,7 +1713,7 @@ EOF # Extract the first word of "jar", so it can be a program name with args. set dummy jar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1629: checking for $ac_word" >&5 +echo "configure:1717: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_JAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1660,9 +1748,9 @@ fi echo $ac_n "checking for Java virtual machine""... $ac_c" 1>&6 -echo "configure:1664: checking for Java virtual machine" >&5 +echo "configure:1752: checking for Java virtual machine" >&5 cat > conftest.$ac_ext <<EOF -#line 1666 "configure" +#line 1754 "configure" #include "confdefs.h" #if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ @@ -1684,19 +1772,135 @@ rm -f conftest* if test -n "$JAVA"; then ac_result="$JAVA" else - if gij --version >/dev/null 2>/dev/null; then + # Extract the first word of "gij", so it can be a program name with args. +set dummy gij; ac_word=$2 +: +if eval "test \"`echo '$''{'ac_cv_prog_HAVE_GIJ_IN_PATH'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$HAVE_GIJ_IN_PATH"; then + ac_cv_prog_HAVE_GIJ_IN_PATH="$HAVE_GIJ_IN_PATH" # 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_HAVE_GIJ_IN_PATH="yes" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +HAVE_GIJ_IN_PATH="$ac_cv_prog_HAVE_GIJ_IN_PATH" +if test -n "$HAVE_GIJ_IN_PATH"; then + : +else + : +fi + + # Extract the first word of "java", so it can be a program name with args. +set dummy java; ac_word=$2 +: +if eval "test \"`echo '$''{'ac_cv_prog_HAVE_JAVA_IN_PATH'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$HAVE_JAVA_IN_PATH"; then + ac_cv_prog_HAVE_JAVA_IN_PATH="$HAVE_JAVA_IN_PATH" # 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_HAVE_JAVA_IN_PATH="yes" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +HAVE_JAVA_IN_PATH="$ac_cv_prog_HAVE_JAVA_IN_PATH" +if test -n "$HAVE_JAVA_IN_PATH"; then + : +else + : +fi + + # Extract the first word of "jre", so it can be a program name with args. +set dummy jre; ac_word=$2 +: +if eval "test \"`echo '$''{'ac_cv_prog_HAVE_JRE_IN_PATH'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$HAVE_JRE_IN_PATH"; then + ac_cv_prog_HAVE_JRE_IN_PATH="$HAVE_JRE_IN_PATH" # 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_HAVE_JRE_IN_PATH="yes" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +HAVE_JRE_IN_PATH="$ac_cv_prog_HAVE_JRE_IN_PATH" +if test -n "$HAVE_JRE_IN_PATH"; then + : +else + : +fi + + # Extract the first word of "jview", so it can be a program name with args. +set dummy jview; ac_word=$2 +: +if eval "test \"`echo '$''{'ac_cv_prog_HAVE_JVIEW_IN_PATH'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$HAVE_JVIEW_IN_PATH"; then + ac_cv_prog_HAVE_JVIEW_IN_PATH="$HAVE_JVIEW_IN_PATH" # 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_HAVE_JVIEW_IN_PATH="yes" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +HAVE_JVIEW_IN_PATH="$ac_cv_prog_HAVE_JVIEW_IN_PATH" +if test -n "$HAVE_JVIEW_IN_PATH"; then + : +else + : +fi + + if test -n "$HAVE_GIJ_IN_PATH" \ + && gij --version >/dev/null 2>/dev/null; then HAVE_GIJ=1 ac_result="gij" else - if java -version >/dev/null 2>/dev/null; then + if test -n "$HAVE_JAVA_IN_PATH" \ + && java -version >/dev/null 2>/dev/null; then HAVE_JAVA_JVM=1 ac_result="java" else - if (jre >/dev/null 2>/dev/null || test $? = 1); then + if test -n "$HAVE_JRE_IN_PATH" \ + && (jre >/dev/null 2>/dev/null || test $? = 1); then HAVE_JRE=1 ac_result="jre" else - if (jview -? >/dev/null 2>/dev/null || test $? = 1); then + if test -n "$HAVE_JVIEW_IN_PATH" \ + && (jview -? >/dev/null 2>/dev/null || test $? = 1); then HAVE_JVIEW=1 ac_result="jview" else @@ -1730,7 +1934,7 @@ 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:1734: checking host system type" >&5 +echo "configure:1938: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1753,7 +1957,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:1757: checking for strerror in -lcposix" >&5 +echo "configure:1961: 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 @@ -1761,7 +1965,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <<EOF -#line 1765 "configure" +#line 1969 "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 @@ -1772,7 +1976,7 @@ int main() { strerror() ; return 0; } EOF -if { (eval echo configure:1776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1980: \"$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 @@ -1796,13 +2000,13 @@ fi echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1800: checking for object suffix" >&5 +echo "configure:2004: 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:1806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1820,12 +2024,12 @@ OBJEXT=$ac_cv_objext ac_objext=$ac_cv_objext echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1824: checking for Cygwin environment" >&5 +echo "configure:2028: 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 1829 "configure" +#line 2033 "configure" #include "confdefs.h" int main() { @@ -1836,7 +2040,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:1840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1853,19 +2057,19 @@ 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:1857: checking for mingw32 environment" >&5 +echo "configure:2061: 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 1862 "configure" +#line 2066 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:1869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1884,7 +2088,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1888: checking for executable suffix" >&5 +echo "configure:2092: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1894,7 +2098,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:2102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1985,7 +2189,7 @@ else fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1989: checking build system type" >&5 +echo "configure:2193: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -2014,7 +2218,7 @@ ac_prog=ld if test "$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:2018: checking for ld used by GCC" >&5 +echo "configure:2222: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -2044,10 +2248,10 @@ echo "configure:2018: 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:2048: checking for GNU ld" >&5 +echo "configure:2252: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:2051: checking for non-GNU ld" >&5 +echo "configure:2255: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2082,7 +2286,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:2086: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:2290: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2099,7 +2303,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:2103: checking for $LD option to reload object files" >&5 +echo "configure:2307: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2111,7 +2315,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:2115: checking for BSD-compatible nm" >&5 +echo "configure:2319: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2149,7 +2353,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2153: checking whether ln -s works" >&5 +echo "configure:2357: 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 @@ -2170,7 +2374,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2174: checking how to recognise dependant libraries" >&5 +echo "configure:2378: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2353,7 +2557,7 @@ fi # Check for command to grab the raw symbol name followed by C symbol from nm. echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6 -echo "configure:2357: checking command to parse $NM output" >&5 +echo "configure:2561: checking command to parse $NM output" >&5 if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2429,10 +2633,10 @@ void nm_test_func(){} int main(){nm_test_var='a';nm_test_func();return(0);} EOF - if { (eval echo configure:2433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo configure:2436: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then + if { (eval echo configure:2640: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -2483,7 +2687,7 @@ EOF save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo configure:2487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo configure:2691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then pipe_works=yes fi LIBS="$save_LIBS" @@ -2529,17 +2733,17 @@ for ac_hdr in dlfcn.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2533: checking for $ac_hdr" >&5 +echo "configure:2737: 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 2538 "configure" +#line 2742 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2747: \"$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* @@ -2574,7 +2778,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2578: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2782: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2636,7 +2840,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2640: checking for file" >&5 +echo "configure:2844: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2707,7 +2911,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2711: checking for $ac_word" >&5 +echo "configure:2915: 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 @@ -2739,7 +2943,7 @@ if test -n "$ac_tool_prefix"; then # 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:2743: checking for $ac_word" >&5 +echo "configure:2947: 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 @@ -2774,7 +2978,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2778: checking for $ac_word" >&5 +echo "configure:2982: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2806,7 +3010,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2810: checking for $ac_word" >&5 +echo "configure:3014: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2855,8 +3059,8 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2859 "configure"' > conftest.$ac_ext - if { (eval echo configure:2860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 3063 "configure"' > conftest.$ac_ext + if { (eval echo configure:3064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2877,7 +3081,7 @@ case $host in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2881: checking whether the C compiler needs -belf" >&5 +echo "configure:3085: 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 @@ -2890,14 +3094,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2894 "configure" +#line 3098 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3105: \"$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 @@ -3010,7 +3214,7 @@ set dummy $CC compiler="$2" echo $ac_n "checking for objdir""... $ac_c" 1>&6 -echo "configure:3014: checking for objdir" >&5 +echo "configure:3218: checking for objdir" >&5 rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then @@ -3037,7 +3241,7 @@ test -z "$pic_mode" && pic_mode=default # in isolation, and that seeing it set (from the cache) indicates that # the associated values are set (in the cache) correctly too. echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 -echo "configure:3041: checking for $compiler option to produce PIC" >&5 +echo "configure:3245: checking for $compiler option to produce PIC" >&5 if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3189,21 +3393,21 @@ else # Check to make sure the pic_flag actually works. echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6 -echo "configure:3193: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 +echo "configure:3397: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat > conftest.$ac_ext <<EOF -#line 3200 "configure" +#line 3404 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:3207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* case $host_os in hpux9* | hpux10* | hpux11*) @@ -3255,7 +3459,7 @@ if test -n "$lt_cv_prog_cc_shlib"; then fi echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6 -echo "configure:3259: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 +echo "configure:3463: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3263,14 +3467,14 @@ else save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat > conftest.$ac_ext <<EOF -#line 3267 "configure" +#line 3471 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:3274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_prog_cc_static_works=yes else @@ -3297,7 +3501,7 @@ can_build_shared="$lt_cv_prog_cc_can_build_shared" # Check to see if options -o and -c are simultaneously supported by compiler echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 -echo "configure:3301: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo "configure:3505: checking if $compiler supports -c -o file.$ac_objext" >&5 if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3316,7 +3520,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:3320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:3524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -3345,7 +3549,7 @@ echo "$ac_t""$compiler_c_o" 1>&6 if test x"$compiler_c_o" = x"yes"; then # Check to see if we can write to a .lo echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6 -echo "configure:3349: checking if $compiler supports -c -o file.lo" >&5 +echo "configure:3553: checking if $compiler supports -c -o file.lo" >&5 if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3354,14 +3558,14 @@ else save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -c -o conftest.lo" cat > conftest.$ac_ext <<EOF -#line 3358 "configure" +#line 3562 "configure" #include "confdefs.h" int main() { int some_variable = 0; ; return 0; } EOF -if { (eval echo configure:3365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -3391,7 +3595,7 @@ hard_links="nottested" if test "$compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 -echo "configure:3395: checking if we can lock with hard links" >&5 +echo "configure:3599: checking if we can lock with hard links" >&5 hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no @@ -3410,20 +3614,20 @@ fi if test "$GCC" = yes; then # Check to see if options -fno-rtti -fno-exceptions are supported by compiler echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6 -echo "configure:3414: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo "configure:3618: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo "int some_variable = 0;" > conftest.$ac_ext save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" compiler_rtti_exceptions=no cat > conftest.$ac_ext <<EOF -#line 3420 "configure" +#line 3624 "configure" #include "confdefs.h" int main() { int some_variable = 0; ; return 0; } EOF -if { (eval echo configure:3427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -3450,7 +3654,7 @@ fi # See if the linker supports building shared libraries. echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6 -echo "configure:3454: checking whether the linker ($LD) supports shared libraries" >&5 +echo "configure:3658: checking whether the linker ($LD) supports shared libraries" >&5 allow_undefined_flag= no_undefined_flag= @@ -4066,7 +4270,7 @@ test "$ld_shlibs" = no && can_build_shared=no # Check hardcoding attributes. echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 -echo "configure:4070: checking how to hardcode library paths into programs" >&5 +echo "configure:4274: checking how to hardcode library paths into programs" >&5 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var"; then @@ -4094,7 +4298,7 @@ echo "$ac_t""$hardcode_action" 1>&6 striplib= old_striplib= echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6 -echo "configure:4098: checking whether stripping libraries is possible" >&5 +echo "configure:4302: checking whether stripping libraries is possible" >&5 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" @@ -4108,7 +4312,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown # PORTME Fill in your ld.so characteristics echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 -echo "configure:4112: checking dynamic linker characteristics" >&5 +echo "configure:4316: checking dynamic linker characteristics" >&5 library_names_spec= libname_spec='lib$name' soname_spec= @@ -4494,7 +4698,7 @@ test "$dynamic_linker" = no && can_build_shared=no # Report the final consequences. echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 -echo "configure:4498: checking if libtool supports shared libraries" >&5 +echo "configure:4702: checking if libtool supports shared libraries" >&5 echo "$ac_t""$can_build_shared" 1>&6 if test "$hardcode_action" = relink; then @@ -4533,7 +4737,7 @@ else *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4537: checking for dlopen in -ldl" >&5 +echo "configure:4741: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4541,7 +4745,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4545 "configure" +#line 4749 "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 @@ -4552,7 +4756,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:4556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4760: \"$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 @@ -4571,12 +4775,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:4575: checking for dlopen" >&5 +echo "configure:4779: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4580 "configure" +#line 4784 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen(); below. */ @@ -4599,7 +4803,7 @@ dlopen(); ; return 0; } EOF -if { (eval echo configure:4603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -4617,12 +4821,12 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:4621: checking for shl_load" >&5 +echo "configure:4825: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4626 "configure" +#line 4830 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load(); below. */ @@ -4645,7 +4849,7 @@ shl_load(); ; return 0; } EOF -if { (eval echo configure:4649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -4663,7 +4867,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 -echo "configure:4667: checking for dlopen in -lsvld" >&5 +echo "configure:4871: checking for dlopen in -lsvld" >&5 ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4671,7 +4875,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsvld $LIBS" cat > conftest.$ac_ext <<EOF -#line 4675 "configure" +#line 4879 "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 @@ -4682,7 +4886,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:4686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4890: \"$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 @@ -4701,7 +4905,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:4705: checking for shl_load in -ldld" >&5 +echo "configure:4909: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4709,7 +4913,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <<EOF -#line 4713 "configure" +#line 4917 "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 @@ -4720,7 +4924,7 @@ int main() { shl_load() ; return 0; } EOF -if { (eval echo configure:4724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4928: \"$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 @@ -4773,7 +4977,7 @@ fi LIBS="$lt_cv_dlopen_libs $LIBS" echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 -echo "configure:4777: checking whether a program can dlopen itself" >&5 +echo "configure:4981: checking whether a program can dlopen itself" >&5 if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4783,7 +4987,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 4787 "configure" +#line 4991 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -4844,7 +5048,7 @@ int main () exit (status); } EOF - if { (eval echo configure:4848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + if { (eval echo configure:5052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in @@ -4867,7 +5071,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6 if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 -echo "configure:4871: checking whether a statically linked program can dlopen itself" >&5 +echo "configure:5075: checking whether a statically linked program can dlopen itself" >&5 if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4877,7 +5081,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 4881 "configure" +#line 5085 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -4938,7 +5142,7 @@ int main () exit (status); } EOF - if { (eval echo configure:4942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + if { (eval echo configure:5146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in @@ -4987,14 +5191,14 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 -echo "configure:4991: checking whether -lc should be explicitly linked in" >&5 +echo "configure:5195: checking whether -lc should be explicitly linked in" >&5 if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else $rm conftest* echo 'static int dummy;' > conftest.$ac_ext - if { (eval echo configure:4998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:5202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then soname=conftest lib=conftest libobjs=conftest.$ac_objext @@ -5007,7 +5211,7 @@ else libname=conftest save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo configure:5011: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } + if { (eval echo configure:5215: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } then lt_cv_archive_cmds_need_lc=no else @@ -5592,12 +5796,12 @@ EOF echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:5596: checking for ANSI C header files" >&5 +echo "configure:5800: 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 5601 "configure" +#line 5805 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -5605,7 +5809,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5609: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5813: \"$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* @@ -5622,7 +5826,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 5626 "configure" +#line 5830 "configure" #include "confdefs.h" #include <string.h> EOF @@ -5640,7 +5844,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 5644 "configure" +#line 5848 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -5661,7 +5865,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 5665 "configure" +#line 5869 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -5672,7 +5876,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:5676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5699,17 +5903,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:5703: checking for $ac_hdr" >&5 +echo "configure:5907: 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 5708 "configure" +#line 5912 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5917: \"$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* @@ -5736,13 +5940,13 @@ fi done echo $ac_n "checking for stdbool.h""... $ac_c" 1>&6 -echo "configure:5740: checking for stdbool.h" >&5 +echo "configure:5944: checking for stdbool.h" >&5 if eval "test \"`echo '$''{'gt_cv_header_stdbool_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5746 "configure" +#line 5950 "configure" #include "confdefs.h" #include <stdbool.h> #if false @@ -5759,7 +5963,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gt_cv_header_stdbool_h=yes else @@ -5785,12 +5989,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5789: checking for working const" >&5 +echo "configure:5993: 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 5794 "configure" +#line 5998 "configure" #include "confdefs.h" int main() { @@ -5839,7 +6043,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:5843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5860,21 +6064,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:5864: checking for inline" >&5 +echo "configure:6068: 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 5871 "configure" +#line 6075 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:5878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -5901,19 +6105,19 @@ esac echo $ac_n "checking for signed""... $ac_c" 1>&6 -echo "configure:5905: checking for signed" >&5 +echo "configure:6109: 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 5910 "configure" +#line 6114 "configure" #include "confdefs.h" int main() { signed char x; ; return 0; } EOF -if { (eval echo configure:5917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bh_cv_c_signed=yes else @@ -5935,12 +6139,12 @@ EOF echo $ac_n "checking whether backslash-a works in strings""... $ac_c" 1>&6 -echo "configure:5939: checking whether backslash-a works in strings" >&5 +echo "configure:6143: 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 5944 "configure" +#line 6148 "configure" #include "confdefs.h" int main() { @@ -5954,7 +6158,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_backslash_a=yes else @@ -5976,12 +6180,12 @@ EOF echo $ac_n "checking for unsigned long long""... $ac_c" 1>&6 -echo "configure:5980: checking for unsigned long long" >&5 +echo "configure:6184: 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 5985 "configure" +#line 6189 "configure" #include "confdefs.h" unsigned long long ull = 1; int i = 63; int main() { @@ -5989,7 +6193,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:5993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6197: \"$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 @@ -6010,12 +6214,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:6014: checking for off_t" >&5 +echo "configure:6218: 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 6019 "configure" +#line 6223 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -6043,12 +6247,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:6047: checking for size_t" >&5 +echo "configure:6251: 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 6052 "configure" +#line 6256 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -6076,19 +6280,19 @@ EOF fi echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6 -echo "configure:6080: checking for ptrdiff_t" >&5 +echo "configure:6284: 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 6085 "configure" +#line 6289 "configure" #include "confdefs.h" #include <stddef.h> int main() { ptrdiff_t p ; return 0; } EOF -if { (eval echo configure:6092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_type_ptrdiff_t=yes else @@ -6110,12 +6314,12 @@ EOF echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6 -echo "configure:6114: checking for inttypes.h" >&5 +echo "configure:6318: 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 6119 "configure" +#line 6323 "configure" #include "confdefs.h" #include <sys/types.h> #include <inttypes.h> @@ -6123,7 +6327,7 @@ int main() { uintmax_t i = (uintmax_t) -1; ; return 0; } EOF -if { (eval echo configure:6127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* jm_ac_cv_header_inttypes_h=yes else @@ -6158,12 +6362,12 @@ EOF echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:6162: checking for ssize_t" >&5 +echo "configure:6366: checking for ssize_t" >&5 if eval "test \"`echo '$''{'gt_cv_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6167 "configure" +#line 6371 "configure" #include "confdefs.h" #include <sys/types.h> @@ -6174,7 +6378,7 @@ int main() { int x = sizeof (ssize_t *) + sizeof (ssize_t); ; return 0; } EOF -if { (eval echo configure:6178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gt_cv_ssize_t=yes else @@ -6195,12 +6399,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:6199: checking for pid_t" >&5 +echo "configure:6403: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6204 "configure" +#line 6408 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -6231,19 +6435,19 @@ fi # 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:6235: checking for working alloca.h" >&5 +echo "configure:6439: 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 6240 "configure" +#line 6444 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:6247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6451: \"$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 @@ -6264,12 +6468,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:6268: checking for alloca" >&5 +echo "configure:6472: 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 6273 "configure" +#line 6477 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -6297,7 +6501,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:6301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6505: \"$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 @@ -6329,12 +6533,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:6333: checking whether alloca needs Cray hooks" >&5 +echo "configure:6537: 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 6338 "configure" +#line 6542 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -6359,12 +6563,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:6363: checking for $ac_func" >&5 +echo "configure:6567: 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 6368 "configure" +#line 6572 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6387,7 +6591,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6595: \"$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 @@ -6414,7 +6618,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:6418: checking stack direction for C alloca" >&5 +echo "configure:6622: 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 @@ -6422,7 +6626,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 6426 "configure" +#line 6630 "configure" #include "confdefs.h" find_stack_direction () { @@ -6441,7 +6645,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:6445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6649: \"$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 @@ -6463,12 +6667,12 @@ EOF fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:6467: checking for vprintf" >&5 +echo "configure:6671: 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 6472 "configure" +#line 6676 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vprintf(); below. */ @@ -6491,7 +6695,7 @@ vprintf(); ; return 0; } EOF -if { (eval echo configure:6495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6699: \"$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 @@ -6515,12 +6719,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:6519: checking for _doprnt" >&5 +echo "configure:6723: 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 6524 "configure" +#line 6728 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char _doprnt(); below. */ @@ -6543,7 +6747,7 @@ _doprnt(); ; return 0; } EOF -if { (eval echo configure:6547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6751: \"$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 @@ -6571,12 +6775,12 @@ for ac_func in getcwd mblen memcpy posix_spawn putc_unlocked raise select \ strerror uname utime utimes do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6575: checking for $ac_func" >&5 +echo "configure:6779: 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 6580 "configure" +#line 6784 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6599,7 +6803,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6807: \"$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 @@ -6627,12 +6831,12 @@ for ac_func in memset stpcpy stpncpy strcspn \ strcasecmp strncasecmp strpbrk strstr strtoul vasprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6631: checking for $ac_func" >&5 +echo "configure:6835: 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 6636 "configure" +#line 6840 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6655,7 +6859,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6863: \"$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 @@ -6683,12 +6887,12 @@ done am_getline_needs_run_time_check=no echo $ac_n "checking for getline""... $ac_c" 1>&6 -echo "configure:6687: checking for getline" >&5 +echo "configure:6891: checking for getline" >&5 if eval "test \"`echo '$''{'ac_cv_func_getline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6692 "configure" +#line 6896 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getline(); below. */ @@ -6711,7 +6915,7 @@ getline(); ; return 0; } EOF -if { (eval echo configure:6715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getline=yes" else @@ -6733,7 +6937,7 @@ fi if test $am_getline_needs_run_time_check = yes; then echo $ac_n "checking for working getline function""... $ac_c" 1>&6 -echo "configure:6737: checking for working getline function" >&5 +echo "configure:6941: checking for working getline function" >&5 if eval "test \"`echo '$''{'am_cv_func_working_getline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6742,7 +6946,7 @@ else am_cv_func_working_getline=no else cat > conftest.$ac_ext <<EOF -#line 6746 "configure" +#line 6950 "configure" #include "confdefs.h" # include <stdio.h> @@ -6761,7 +6965,7 @@ else } EOF -if { (eval echo configure:6765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then am_cv_func_working_getline=yes else @@ -6787,12 +6991,12 @@ if test $am_cv_func_working_getline != yes; then for ac_func in getdelim do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6791: checking for $ac_func" >&5 +echo "configure:6995: 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 6796 "configure" +#line 7000 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6815,7 +7019,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7023: \"$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 @@ -6846,17 +7050,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6850: checking for $ac_hdr" >&5 +echo "configure:7054: 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 6855 "configure" +#line 7059 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7064: \"$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* @@ -6885,12 +7089,12 @@ done for ac_func in isascii iswcntrl iswprint mbsinit wcwidth do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6889: checking for $ac_func" >&5 +echo "configure:7093: 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 6894 "configure" +#line 7098 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6913,7 +7117,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7121: \"$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 @@ -6939,19 +7143,19 @@ done echo $ac_n "checking whether mbrtowc and mbstate_t are properly declared""... $ac_c" 1>&6 -echo "configure:6943: checking whether mbrtowc and mbstate_t are properly declared" >&5 +echo "configure:7147: checking whether mbrtowc and mbstate_t are properly declared" >&5 if eval "test \"`echo '$''{'jm_cv_func_mbrtowc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6948 "configure" +#line 7152 "configure" #include "confdefs.h" #include <wchar.h> int main() { mbstate_t state; return ! (sizeof state && mbrtowc); ; return 0; } EOF -if { (eval echo configure:6955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* jm_cv_func_mbrtowc=yes else @@ -6973,12 +7177,12 @@ EOF echo $ac_n "checking whether wcwidth is declared""... $ac_c" 1>&6 -echo "configure:6977: checking whether wcwidth is declared" >&5 +echo "configure:7181: checking whether wcwidth is declared" >&5 if eval "test \"`echo '$''{'ac_cv_have_decl_wcwidth'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6982 "configure" +#line 7186 "configure" #include "confdefs.h" /* AIX 3.2.5 declares wcwidth in <string.h>. */ @@ -6997,7 +7201,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_decl_wcwidth=yes else @@ -7025,17 +7229,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7029: checking for $ac_hdr" >&5 +echo "configure:7233: 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 7034 "configure" +#line 7238 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7243: \"$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* @@ -7063,12 +7267,12 @@ done echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:7067: checking for mbstate_t" >&5 +echo "configure:7271: checking for mbstate_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7072 "configure" +#line 7276 "configure" #include "confdefs.h" #if HAVE_STDLIB_H @@ -7079,7 +7283,7 @@ int main() { mbstate_t x; return sizeof x; ; return 0; } EOF -if { (eval echo configure:7083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_mbstate_t=yes else @@ -7104,12 +7308,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:7108: checking for $ac_hdr that defines DIR" >&5 +echo "configure:7312: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7113 "configure" +#line 7317 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -7117,7 +7321,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:7121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -7142,7 +7346,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:7146: checking for opendir in -ldir" >&5 +echo "configure:7350: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7150,7 +7354,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 7154 "configure" +#line 7358 "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 @@ -7161,7 +7365,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:7165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7369: \"$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 @@ -7183,7 +7387,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:7187: checking for opendir in -lx" >&5 +echo "configure:7391: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7191,7 +7395,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 7195 "configure" +#line 7399 "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 @@ -7202,7 +7406,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:7206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7410: \"$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 @@ -7227,7 +7431,7 @@ fi echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 -echo "configure:7231: checking whether closedir returns void" >&5 +echo "configure:7435: checking whether closedir returns void" >&5 if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7235,13 +7439,13 @@ else ac_cv_func_closedir_void=yes else cat > conftest.$ac_ext <<EOF -#line 7239 "configure" +#line 7443 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_header_dirent> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF -if { (eval echo configure:7245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_closedir_void=no else @@ -7267,17 +7471,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7271: checking for $ac_hdr" >&5 +echo "configure:7475: 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 7276 "configure" +#line 7480 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7485: \"$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* @@ -7304,7 +7508,7 @@ fi done echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:7308: checking for long file names" >&5 +echo "configure:7512: checking for long file names" >&5 if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7350,12 +7554,12 @@ fi for ac_func in pathconf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7354: checking for $ac_func" >&5 +echo "configure:7558: 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 7359 "configure" +#line 7563 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7378,7 +7582,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7586: \"$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 @@ -7406,17 +7610,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7410: checking for $ac_hdr" >&5 +echo "configure:7614: 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 7415 "configure" +#line 7619 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7624: \"$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* @@ -7445,17 +7649,17 @@ done ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:7449: checking for vfork.h" >&5 +echo "configure:7653: checking for vfork.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 7454 "configure" +#line 7658 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7663: \"$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* @@ -7480,18 +7684,18 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:7484: checking for working vfork" >&5 +echo "configure:7688: checking for working vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then echo $ac_n "checking for vfork""... $ac_c" 1>&6 -echo "configure:7490: checking for vfork" >&5 +echo "configure:7694: checking for vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7495 "configure" +#line 7699 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vfork(); below. */ @@ -7514,7 +7718,7 @@ vfork(); ; return 0; } EOF -if { (eval echo configure:7518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -7536,7 +7740,7 @@ fi ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext <<EOF -#line 7540 "configure" +#line 7744 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -7631,7 +7835,7 @@ main() { } } EOF -if { (eval echo configure:7635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -7657,12 +7861,12 @@ fi for ac_func in waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7661: checking for $ac_func" >&5 +echo "configure:7865: 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 7666 "configure" +#line 7870 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7685,7 +7889,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7893: \"$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 @@ -7710,12 +7914,12 @@ fi done echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:7714: checking for union wait" >&5 +echo "configure:7918: checking for union wait" >&5 if eval "test \"`echo '$''{'gt_cv_union_wait'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7719 "configure" +#line 7923 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -7738,7 +7942,7 @@ pid = waitpid (-1, &status, 0); ; return 0; } EOF -if { (eval echo configure:7742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_union_wait=yes else @@ -7760,12 +7964,12 @@ echo "$ac_t""$gt_cv_union_wait" 1>&6 echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:7764: checking whether stat file-mode macros are broken" >&5 +echo "configure:7968: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7769 "configure" +#line 7973 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -7818,12 +8022,12 @@ fi for ac_func in __secure_getenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7822: checking for $ac_func" >&5 +echo "configure:8026: 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 7827 "configure" +#line 8031 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7846,7 +8050,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8054: \"$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 @@ -7875,12 +8079,12 @@ done for ac_func in mkdtemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7879: checking for $ac_func" >&5 +echo "configure:8083: 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 7884 "configure" +#line 8088 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7903,7 +8107,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8111: \"$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 @@ -7930,12 +8134,12 @@ done echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:7934: checking whether stat file-mode macros are broken" >&5 +echo "configure:8138: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7939 "configure" +#line 8143 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -7985,21 +8189,21 @@ EOF fi - for ac_hdr in fcntl.h stdint.h sys/time.h time.h unistd.h + for ac_hdr in fcntl.h inttypes.h stdint.h sys/time.h time.h unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7993: checking for $ac_hdr" >&5 +echo "configure:8197: 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 7998 "configure" +#line 8202 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8207: \"$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* @@ -8028,12 +8232,12 @@ done for ac_func in gettimeofday do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8032: checking for $ac_func" >&5 +echo "configure:8236: 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 8037 "configure" +#line 8241 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8056,7 +8260,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8264: \"$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 @@ -8084,7 +8288,7 @@ done signals_not_posix= cat > conftest.$ac_ext <<EOF -#line 8088 "configure" +#line 8292 "configure" #include "confdefs.h" #include <signal.h> EOF @@ -8099,12 +8303,12 @@ rm -f conftest* if test -z "$signals_not_posix"; then echo $ac_n "checking for sigprocmask""... $ac_c" 1>&6 -echo "configure:8103: checking for sigprocmask" >&5 +echo "configure:8307: checking for sigprocmask" >&5 if eval "test \"`echo '$''{'ac_cv_func_sigprocmask'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8108 "configure" +#line 8312 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char sigprocmask(); below. */ @@ -8127,7 +8331,7 @@ sigprocmask(); ; return 0; } EOF -if { (eval echo configure:8131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sigprocmask=yes" else @@ -8153,12 +8357,12 @@ fi echo $ac_n "checking for signal handlers with siginfo_t""... $ac_c" 1>&6 -echo "configure:8157: checking for signal handlers with siginfo_t" >&5 +echo "configure:8361: checking for signal handlers with siginfo_t" >&5 if eval "test \"`echo '$''{'gt_cv_siginfo_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8162 "configure" +#line 8366 "configure" #include "confdefs.h" #include <signal.h> @@ -8171,7 +8375,7 @@ action.sa_sigaction = (void *) 0; ; return 0; } EOF -if { (eval echo configure:8175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gt_cv_siginfo_t=yes else @@ -8195,12 +8399,12 @@ EOF for ac_func in setenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8199: checking for $ac_func" >&5 +echo "configure:8403: 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 8204 "configure" +#line 8408 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8223,7 +8427,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8431: \"$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 @@ -8253,17 +8457,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8257: checking for $ac_hdr" >&5 +echo "configure:8461: 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 8262 "configure" +#line 8466 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8471: \"$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* @@ -8292,12 +8496,12 @@ done for ac_func in tsearch do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8296: checking for $ac_func" >&5 +echo "configure:8500: 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 8301 "configure" +#line 8505 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8320,7 +8524,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8528: \"$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 @@ -8347,13 +8551,13 @@ done echo $ac_n "checking if errno is properly declared""... $ac_c" 1>&6 -echo "configure:8351: checking if errno is properly declared" >&5 +echo "configure:8555: checking if errno is properly declared" >&5 if eval "test \"`echo '$''{'gt_cv_var_errno_declaration'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8357 "configure" +#line 8561 "configure" #include "confdefs.h" #include <errno.h> extern struct { int foo; } errno; @@ -8361,7 +8565,7 @@ int main() { errno.foo = 1; ; return 0; } EOF -if { (eval echo configure:8365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gt_cv_var_errno_declaration=no else @@ -8384,13 +8588,13 @@ EOF echo $ac_n "checking if environ is properly declared""... $ac_c" 1>&6 -echo "configure:8388: checking if environ is properly declared" >&5 +echo "configure:8592: checking if environ is properly declared" >&5 if eval "test \"`echo '$''{'gt_cv_var_environ_declaration'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8394 "configure" +#line 8598 "configure" #include "confdefs.h" #include <unistd.h> extern struct { int foo; } environ; @@ -8398,7 +8602,7 @@ int main() { environ.foo = 1; ; return 0; } EOF -if { (eval echo configure:8402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gt_cv_var_environ_declaration=no else @@ -8421,19 +8625,19 @@ EOF echo $ac_n "checking for error_at_line""... $ac_c" 1>&6 -echo "configure:8425: checking for error_at_line" >&5 +echo "configure:8629: 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 8430 "configure" +#line 8634 "configure" #include "confdefs.h" int main() { error_at_line(0, 0, "", 0, ""); ; return 0; } EOF -if { (eval echo configure:8437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8641: \"$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 @@ -8456,17 +8660,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:8460: checking for $ac_hdr" >&5 +echo "configure:8664: 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 8465 "configure" +#line 8669 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8674: \"$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* @@ -8493,13 +8697,13 @@ fi done echo $ac_n "checking for setlocale declaration""... $ac_c" 1>&6 -echo "configure:8497: checking for setlocale declaration" >&5 +echo "configure:8701: 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 8503 "configure" +#line 8707 "configure" #include "confdefs.h" #include <stdlib.h> @@ -8518,7 +8722,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gt_cv_proto_setlocale_arg1="" else @@ -8545,17 +8749,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8549: checking for $ac_hdr" >&5 +echo "configure:8753: 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 8554 "configure" +#line 8758 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8763: \"$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* @@ -8584,12 +8788,12 @@ done for ac_func in gethostname gethostbyname inet_ntop do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8588: checking for $ac_func" >&5 +echo "configure:8792: 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 8593 "configure" +#line 8797 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8612,7 +8816,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8820: \"$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 @@ -8638,13 +8842,13 @@ done echo $ac_n "checking for IPv6 sockets""... $ac_c" 1>&6 -echo "configure:8642: checking for IPv6 sockets" >&5 +echo "configure:8846: checking for IPv6 sockets" >&5 if eval "test \"`echo '$''{'gt_cv_socket_ipv6'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8648 "configure" +#line 8852 "configure" #include "confdefs.h" #include <sys/types.h> @@ -8654,7 +8858,7 @@ int main() { int x = AF_INET6; struct in6_addr y; struct sockaddr_in6 z; ; return 0; } EOF -if { (eval echo configure:8658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gt_cv_socket_ipv6=yes else @@ -8679,7 +8883,7 @@ EOF # 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:8683: checking for $ac_word" >&5 +echo "configure:8887: 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 @@ -8710,17 +8914,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:8714: checking for $ac_hdr" >&5 +echo "configure:8918: 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 8719 "configure" +#line 8923 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8928: \"$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* @@ -8749,12 +8953,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8753: checking for $ac_func" >&5 +echo "configure:8957: 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 8758 "configure" +#line 8962 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8777,7 +8981,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8985: \"$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 @@ -8802,7 +9006,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:8806: checking for working mmap" >&5 +echo "configure:9010: 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 @@ -8810,7 +9014,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 8814 "configure" +#line 9018 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -8950,7 +9154,7 @@ main() } EOF -if { (eval echo configure:8954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9158: \"$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 @@ -8974,12 +9178,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:8978: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:9182: checking whether we are using the GNU C Library 2.1 or newer" >&5 if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8983 "configure" +#line 9187 "configure" #include "confdefs.h" #include <features.h> @@ -9015,17 +9219,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:9019: checking for $ac_hdr" >&5 +echo "configure:9223: 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 9024 "configure" +#line 9228 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9233: \"$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* @@ -9056,12 +9260,12 @@ geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9060: checking for $ac_func" >&5 +echo "configure:9264: 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 9065 "configure" +#line 9269 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9084,7 +9288,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:9088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9292: \"$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 @@ -9124,7 +9328,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:9128: checking for iconv" >&5 +echo "configure:9332: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9132,7 +9336,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext <<EOF -#line 9136 "configure" +#line 9340 "configure" #include "confdefs.h" #include <stdlib.h> #include <iconv.h> @@ -9142,7 +9346,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:9146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -9154,7 +9358,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext <<EOF -#line 9158 "configure" +#line 9362 "configure" #include "confdefs.h" #include <stdlib.h> #include <iconv.h> @@ -9164,7 +9368,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:9168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9372: \"$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 @@ -9185,13 +9389,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:9189: checking for iconv declaration" >&5 +echo "configure:9393: 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 9195 "configure" +#line 9399 "configure" #include "confdefs.h" #include <stdlib.h> @@ -9210,7 +9414,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -9239,19 +9443,19 @@ EOF echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:9243: checking for nl_langinfo and CODESET" >&5 +echo "configure:9447: 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 9248 "configure" +#line 9452 "configure" #include "confdefs.h" #include <langinfo.h> int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:9255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -9274,19 +9478,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:9278: checking for LC_MESSAGES" >&5 +echo "configure:9482: 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 9283 "configure" +#line 9487 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:9290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9494: \"$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 @@ -9308,7 +9512,7 @@ EOF fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:9312: checking whether NLS is requested" >&5 +echo "configure:9516: 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" @@ -9330,7 +9534,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:9334: checking whether included gettext is requested" >&5 +echo "configure:9538: 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" @@ -9350,17 +9554,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:9354: checking for libintl.h" >&5 +echo "configure:9558: 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 9359 "configure" +#line 9563 "configure" #include "confdefs.h" #include <libintl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9568: \"$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* @@ -9377,12 +9581,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:9381: checking for GNU gettext in libc" >&5 +echo "configure:9585: checking for GNU gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext2_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9386 "configure" +#line 9590 "configure" #include "confdefs.h" #include <libintl.h> extern int _nl_msg_cat_cntr; @@ -9391,7 +9595,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:9395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext2_libc=yes else @@ -9407,14 +9611,14 @@ echo "$ac_t""$gt_cv_func_gnugettext2_libc" 1>&6 if test "$gt_cv_func_gnugettext2_libc" != "yes"; then echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 -echo "configure:9411: checking for GNU gettext in libintl" >&5 +echo "configure:9615: checking for GNU gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext2_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else gt_save_LIBS="$LIBS" LIBS="$LIBS -lintl $LIBICONV" cat > conftest.$ac_ext <<EOF -#line 9418 "configure" +#line 9622 "configure" #include "confdefs.h" #include <libintl.h> extern int _nl_msg_cat_cntr; @@ -9423,7 +9627,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:9427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext2_libintl=yes else @@ -9470,12 +9674,12 @@ EOF for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9474: checking for $ac_func" >&5 +echo "configure:9678: 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 9479 "configure" +#line 9683 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9498,7 +9702,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:9502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9706: \"$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 @@ -9537,11 +9741,16 @@ done if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then CATOBJEXT=.gmo + fi - # Extract the first word of "msgfmt", so it can be a program name with args. + POSUB=po + 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:9545: checking for $ac_word" >&5 +echo "configure:9754: 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 @@ -9572,10 +9781,10 @@ else echo "$ac_t""no" 1>&6 fi - # Extract the first word of "gmsgfmt", so it can be a program name with args. + # 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:9579: checking for $ac_word" >&5 +echo "configure:9788: 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 @@ -9609,10 +9818,10 @@ else fi - # Extract the first word of "xgettext", so it can be a program name with args. + # 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:9616: checking for $ac_word" >&5 +echo "configure:9825: 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 @@ -9644,10 +9853,10 @@ else fi - # Extract the first word of "msgmerge", so it can be a program name with args. + # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9651: checking for $ac_word" >&5 +echo "configure:9860: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGMERGE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9679,27 +9888,24 @@ else fi - if test "$GMSGFMT" != ":"; then - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then - : ; - else - echo "$ac_t""found msgfmt program is not GNU msgfmt; ignore it" 1>&6 - GMSGFMT=":" - fi - fi - - if test "$XGETTEXT" != ":"; then - if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then - : ; - else - echo "$ac_t""found xgettext program is not GNU xgettext; ignore it" 1>&6 - XGETTEXT=":" - fi - fi + if test "$GMSGFMT" != ":"; then + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then + : ; + else + echo "$ac_t""found msgfmt program is not GNU msgfmt; ignore it" 1>&6 + GMSGFMT=":" fi + fi - POSUB=po + if test "$XGETTEXT" != ":"; then + if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then + : ; + else + echo "$ac_t""found xgettext program is not GNU xgettext; ignore it" 1>&6 + XGETTEXT=":" + fi fi + @@ -9712,7 +9918,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:9716: checking for $ac_word" >&5 +echo "configure:9922: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9745,7 +9951,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:9749: checking version of bison" >&5 +echo "configure:9955: checking version of bison" >&5 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -9796,7 +10002,7 @@ if test "${with_lispdir+set}" = set; then withval="$with_lispdir" lispdir="$withval" echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6 -echo "configure:9800: checking where .elc files should go" >&5 +echo "configure:10006: checking where .elc files should go" >&5 echo "$ac_t""$lispdir" 1>&6 else @@ -9808,7 +10014,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:9812: checking for $ac_word" >&5 +echo "configure:10018: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_EMACS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9841,7 +10047,7 @@ test -n "$EMACS" || EMACS="no" if test $EMACS != "no"; then if test x${lispdir+set} != xset; then echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6 -echo "configure:9845: checking where .elc files should go" >&5 +echo "configure:10051: checking where .elc files should go" >&5 if eval "test \"`echo '$''{'am_cv_lispdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9868,7 +10074,7 @@ ac_aux_dir_abs=`cd $ac_aux_dir && pwd` # Extract the first word of "dvips", so it can be a program name with args. set dummy dvips; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9872: checking for $ac_word" >&5 +echo "configure:10078: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DVIPS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9904,7 +10110,7 @@ fi # Extract the first word of "texi2pdf", so it can be a program name with args. set dummy texi2pdf; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9908: checking for $ac_word" >&5 +echo "configure:10114: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TEXI2PDF'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9940,7 +10146,7 @@ fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9944: checking for $ac_word" >&5 +echo "configure:10150: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9986,6 +10192,11 @@ $RELEASE_DATE GNU <bug-gnu-gettext@gnu.org> EOF +LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'` + +LTALLOCA=`echo "$ALLOCA" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'` + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -10157,6 +10368,9 @@ s%@YACC@%$YACC%g s%@LEX@%$LEX%g s%@LEX_OUTPUT_ROOT@%$LEX_OUTPUT_ROOT%g s%@CPP@%$CPP%g +s%@HAVE_GCJ_IN_PATH@%$HAVE_GCJ_IN_PATH%g +s%@HAVE_JAVAC_IN_PATH@%$HAVE_JAVAC_IN_PATH%g +s%@HAVE_JIKES_IN_PATH@%$HAVE_JIKES_IN_PATH%g s%@JAVAC@%$JAVAC%g s%@CLASSPATH@%$CLASSPATH%g s%@CLASSPATH_SEPARATOR@%$CLASSPATH_SEPARATOR%g @@ -10165,6 +10379,10 @@ s%@HAVE_JAVAC@%$HAVE_JAVAC%g s%@HAVE_JIKES@%$HAVE_JIKES%g s%@JAR@%$JAR%g s%@BUILDJAVA@%$BUILDJAVA%g +s%@HAVE_GIJ_IN_PATH@%$HAVE_GIJ_IN_PATH%g +s%@HAVE_JAVA_IN_PATH@%$HAVE_JAVA_IN_PATH%g +s%@HAVE_JRE_IN_PATH@%$HAVE_JRE_IN_PATH%g +s%@HAVE_JVIEW_IN_PATH@%$HAVE_JVIEW_IN_PATH%g s%@JAVA@%$JAVA%g s%@HAVE_GIJ@%$HAVE_GIJ%g s%@HAVE_JAVA_JVM@%$HAVE_JAVA_JVM%g @@ -10215,6 +10433,8 @@ s%@DVIPS@%$DVIPS%g s%@TEXI2PDF@%$TEXI2PDF%g s%@PERL@%$PERL%g s%@CROSS_COMPILING@%$CROSS_COMPILING%g +s%@LTLIBOBJS@%$LTLIBOBJS%g +s%@LTALLOCA@%$LTALLOCA%g CEOF EOF diff --git a/doc/Makefile.in b/doc/Makefile.in index 71f47bc..fb05c17 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -98,6 +98,8 @@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTALLOCA = @LTALLOCA@ +LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ @@ -148,7 +150,7 @@ gettext_TEXINFOS = \ iso-639.texi iso-3166.texi -EXTRA_DIST = iso-639.sed iso-3166.sed ISO_639 ISO_3166 nls.texi matrix.texi $(EXTRA_DIST_html) +EXTRA_DIST = iso-639.sed iso-3166.sed ISO_639 ISO_3166 nls.texi matrix.texi $(EXTRA_DIST_html) texi2html EXTRA_DIST_html = $(wildcard gettext_*.html) CLEANFILES = gettext.pdf gettext.html diff --git a/intl-java/Makefile.in b/intl-java/Makefile.in index cf15bbd..7570308 100644 --- a/intl-java/Makefile.in +++ b/intl-java/Makefile.in @@ -98,6 +98,8 @@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTALLOCA = @LTALLOCA@ +LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ @@ -126,6 +128,8 @@ AUTOMAKE_OPTIONS = 1.2 gnits jardir = $(datadir)/gettext JAVACOMP = $(SHELL) ../lib/javacomp.sh +EXTRA_DIST = gnu/gettext/GettextResource.java + CLEANFILES = libintl.jar gnu/gettext/*.class subdir = intl-java mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -163,6 +167,7 @@ top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) + $(mkinstalldirs) $(distdir)/gnu/gettext @for file in $(DISTFILES); do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ diff --git a/intl/plural.c b/intl/plural.c index d2668e5..0b3ed92 100644 --- a/intl/plural.c +++ b/intl/plural.c @@ -50,6 +50,7 @@ # include <config.h> #endif +#include <stddef.h> #include <stdlib.h> #include "plural-exp.h" @@ -62,13 +63,13 @@ #define YYLEX_PARAM &((struct parse_args *) arg)->cp #define YYPARSE_PARAM arg -#line 48 "plural.y" +#line 49 "plural.y" typedef union { unsigned long int num; enum operator op; struct expression *exp; } YYSTYPE; -#line 54 "plural.y" +#line 55 "plural.y" /* Prototypes for local functions. */ static struct expression *new_exp PARAMS ((int nargs, enum operator op, @@ -230,8 +231,8 @@ static const short yyrhs[] = { 17, #if YYDEBUG != 0 static const short yyrline[] = { 0, - 173, 181, 185, 189, 193, 197, 201, 205, 209, 213, - 217, 222 + 174, 182, 186, 190, 194, 198, 202, 206, 210, 214, + 218, 223 }; #endif @@ -841,7 +842,7 @@ yyreduce: switch (yyn) { case 1: -#line 174 "plural.y" +#line 175 "plural.y" { if (yyvsp[0].exp == NULL) YYABORT; @@ -849,68 +850,68 @@ case 1: ; break;} case 2: -#line 182 "plural.y" +#line 183 "plural.y" { yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 3: -#line 186 "plural.y" +#line 187 "plural.y" { yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 4: -#line 190 "plural.y" +#line 191 "plural.y" { yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 5: -#line 194 "plural.y" +#line 195 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 6: -#line 198 "plural.y" +#line 199 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 7: -#line 202 "plural.y" +#line 203 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 8: -#line 206 "plural.y" +#line 207 "plural.y" { yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp); ; break;} case 9: -#line 210 "plural.y" +#line 211 "plural.y" { yyval.exp = new_exp_1 (lnot, yyvsp[0].exp); ; break;} case 10: -#line 214 "plural.y" +#line 215 "plural.y" { yyval.exp = new_exp_0 (var); ; break;} case 11: -#line 218 "plural.y" +#line 219 "plural.y" { if ((yyval.exp = new_exp_0 (num)) != NULL) yyval.exp->val.num = yyvsp[0].num; ; break;} case 12: -#line 223 "plural.y" +#line 224 "plural.y" { yyval.exp = yyvsp[-1].exp; ; @@ -1137,7 +1138,7 @@ yyerrhandle: } return 1; } -#line 228 "plural.y" +#line 229 "plural.y" void diff --git a/lib/Makefile.in b/lib/Makefile.in index 7708dd0..739393c 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -99,6 +99,8 @@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTALLOCA = @LTALLOCA@ +LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ @@ -122,22 +124,23 @@ lispdir = @lispdir@ AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies -noinst_LIBRARIES = libnlsut.a +lib_LTLIBRARIES = libgettextlib.la # Sources that are compiled on all platforms. -libnlsut_a_SOURCES = addext.c argmatch.c backupfile.c basename.c c-ctype.c \ -concatpath.c copy-file.c execute.c findprog.c fstrcmp.c full-write.c gcd.c \ -getopt.c getopt1.c hash.c javacomp.c javaexec.c linebreak.c localcharset.c \ -mbswidth.c obstack.c pipe-bidi.c pipe-in.c pipe-out.c progname.c safe-read.c \ -sh-quote.c tmpdir.c wait-process.c xerror.c xgetcwd.c xmalloc.c xstrdup.c +libgettextlib_la_SOURCES = addext.c argmatch.c backupfile.c basename.c \ +c-ctype.c concatpath.c copy-file.c execute.c findprog.c fstrcmp.c \ +full-write.c gcd.c getopt.c getopt1.c hash.c javacomp.c javaexec.c \ +linebreak.c localcharset.c mbswidth.c obstack.c pipe-bidi.c pipe-in.c \ +pipe-out.c progname.c safe-read.c sh-quote.c tmpdir.c wait-process.c xerror.c \ +xgetcwd.c xmalloc.c xstrdup.c -libnlsut_a_HEADER = argmatch.h backupfile.h basename.h c-ctype.h copy-file.h \ -execute.h findprog.h fstrcmp.h full-write.h gcd.h getopt.h hash.h javacomp.h \ -javaexec.h lbrkprop.h linebreak.h mbswidth.h obstack.h pathmax.h pipe.h \ -progname.h safe-read.h sh-quote.h system.h tmpdir.h utf8-ucs4.h utf16-ucs4.h \ -wait-process.h xerror.h xmalloc.h +libgettextlib_la_HEADER = argmatch.h backupfile.h basename.h c-ctype.h \ +copy-file.h execute.h findprog.h fstrcmp.h full-write.h gcd.h getopt.h hash.h \ +javacomp.h javaexec.h lbrkprop.h linebreak.h mbswidth.h obstack.h pathmax.h \ +pipe.h progname.h safe-read.h sh-quote.h system.h tmpdir.h utf8-ucs4.h \ +utf16-ucs4.h wait-process.h xerror.h xmalloc.h @@ -155,11 +158,20 @@ UNUSED_SOURCE = memmove.c UNUSED_HEADER = -libnlsut_a_LIBADD = @ALLOCA@ @LIBOBJS@ + +# How to build libgettextlib.la. +libgettextlib_la_LIBADD = @LTALLOCA@ @LTLIBOBJS@ + +# Need @INTLLIBS@ because many source files use gettext(). +# Need @LIBICONV@ because linebreak.c uses iconv(). +libgettextlib_la_LDFLAGS = \ + -release @VERSION@ \ + @INTLLIBS@ @LIBICONV@ -no-undefined + # List of files to be distributed. -noinst_HEADERS = $(libnlsut_a_HEADER) $(LIBADD_HEADER) $(UNUSED_HEADER) +noinst_HEADERS = $(libgettextlib_la_HEADER) $(LIBADD_HEADER) $(UNUSED_HEADER) EXTRA_DIST = classpath.c config.charset ref-add.sin ref-del.sin \ $(LIBADD_SOURCE) $(UNUSED_SOURCE) \ @@ -181,22 +193,17 @@ subdir = lib mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = javacomp.sh javaexec.sh -LIBRARIES = $(noinst_LIBRARIES) - -libnlsut_a_AR = $(AR) cru -libnlsut_a_DEPENDENCIES = @ALLOCA@ @LIBOBJS@ -am_libnlsut_a_OBJECTS = addext.$(OBJEXT) argmatch.$(OBJEXT) \ - backupfile.$(OBJEXT) basename.$(OBJEXT) c-ctype.$(OBJEXT) \ - concatpath.$(OBJEXT) copy-file.$(OBJEXT) execute.$(OBJEXT) \ - findprog.$(OBJEXT) fstrcmp.$(OBJEXT) full-write.$(OBJEXT) \ - gcd.$(OBJEXT) getopt.$(OBJEXT) getopt1.$(OBJEXT) hash.$(OBJEXT) \ - javacomp.$(OBJEXT) javaexec.$(OBJEXT) linebreak.$(OBJEXT) \ - localcharset.$(OBJEXT) mbswidth.$(OBJEXT) obstack.$(OBJEXT) \ - pipe-bidi.$(OBJEXT) pipe-in.$(OBJEXT) pipe-out.$(OBJEXT) \ - progname.$(OBJEXT) safe-read.$(OBJEXT) sh-quote.$(OBJEXT) \ - tmpdir.$(OBJEXT) wait-process.$(OBJEXT) xerror.$(OBJEXT) \ - xgetcwd.$(OBJEXT) xmalloc.$(OBJEXT) xstrdup.$(OBJEXT) -libnlsut_a_OBJECTS = $(am_libnlsut_a_OBJECTS) +LTLIBRARIES = $(lib_LTLIBRARIES) + +libgettextlib_la_DEPENDENCIES = @LTALLOCA@ @LTLIBOBJS@ +am_libgettextlib_la_OBJECTS = addext.lo argmatch.lo backupfile.lo \ + basename.lo c-ctype.lo concatpath.lo copy-file.lo execute.lo \ + findprog.lo fstrcmp.lo full-write.lo gcd.lo getopt.lo \ + getopt1.lo hash.lo javacomp.lo javaexec.lo linebreak.lo \ + localcharset.lo mbswidth.lo obstack.lo pipe-bidi.lo pipe-in.lo \ + pipe-out.lo progname.lo safe-read.lo sh-quote.lo tmpdir.lo \ + wait-process.lo xerror.lo xgetcwd.lo xmalloc.lo xstrdup.lo +libgettextlib_la_OBJECTS = $(am_libgettextlib_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ @@ -210,7 +217,7 @@ CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CFLAGS = @CFLAGS@ -DIST_SOURCES = $(libnlsut_a_SOURCES) +DIST_SOURCES = $(libgettextlib_la_SOURCES) HEADERS = $(noinst_HEADERS) DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in \ @@ -218,7 +225,7 @@ DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in \ javaexec.sh.in memset.c mkdtemp.c setenv.c stpcpy.c stpncpy.c \ strcasecmp.c strcspn.c strncasecmp.c strpbrk.c strstr.c \ strtoul.c vasprintf.c -SOURCES = $(libnlsut_a_SOURCES) +SOURCES = $(libgettextlib_la_SOURCES) all: all-am @@ -244,15 +251,27 @@ javacomp.sh: $(top_builddir)/config.status javacomp.sh.in cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status javaexec.sh: $(top_builddir)/config.status javaexec.sh.in cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(libdir) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ + else :; fi; \ + done -AR = ar +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + done -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libnlsut.a: $(libnlsut_a_OBJECTS) $(libnlsut_a_DEPENDENCIES) - -rm -f libnlsut.a - $(libnlsut_a_AR) libnlsut.a $(libnlsut_a_OBJECTS) $(libnlsut_a_LIBADD) - $(RANLIB) libnlsut.a +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +libgettextlib.la: $(libgettextlib_la_OBJECTS) $(libgettextlib_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgettextlib_la_LDFLAGS) $(libgettextlib_la_OBJECTS) $(libgettextlib_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) core *.core @@ -325,9 +344,10 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) $(HEADERS) all-local +all-am: Makefile $(LTLIBRARIES) $(HEADERS) all-local installdirs: + $(mkinstalldirs) $(DESTDIR)$(libdir) install: install-am install-exec: install-exec-am @@ -356,7 +376,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ mostlyclean-am distclean: distclean-am @@ -374,7 +394,7 @@ info-am: install-data-am: -install-exec-am: install-exec-local +install-exec-am: install-exec-local install-libLTLIBRARIES install-info: install-info-am @@ -391,21 +411,22 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool -uninstall-am: uninstall-info-am uninstall-local +uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES uninstall-local .PHONY: GTAGS all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES distclean distclean-compile \ + clean-libLTLIBRARIES clean-libtool distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ dvi-am info info-am install install-am install-data \ install-data-am install-exec install-exec-am install-exec-local \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool tags uninstall \ - uninstall-am uninstall-info-am uninstall-local + install-info install-info-am install-libLTLIBRARIES install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + tags uninstall uninstall-am uninstall-info-am \ + uninstall-libLTLIBRARIES uninstall-local -all-local: @STDBOOL_H@ +all-local execute.lo javacomp.lo javaexec.lo pipe-bidi.lo pipe-in.lo pipe-out.lo progname.lo wait-process.lo xerror.lo: @STDBOOL_H@ stdbool.h: stdbool.h.in cp $(srcdir)/stdbool.h.in stdbool.h diff --git a/m4/Makefile.in b/m4/Makefile.in index c2fbee4..38b0e7e 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -99,6 +99,8 @@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTALLOCA = @LTALLOCA@ +LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ diff --git a/man/Makefile.in b/man/Makefile.in index a2c5d5a..56e7898 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -98,6 +98,8 @@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTALLOCA = @LTALLOCA@ +LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ diff --git a/misc/Makefile.in b/misc/Makefile.in index 9f6e48e..ceafece 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -99,6 +99,8 @@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTALLOCA = @LTALLOCA@ +LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ diff --git a/projects/Makefile.in b/projects/Makefile.in index 8a4e07f..8d83ce7 100644 --- a/projects/Makefile.in +++ b/projects/Makefile.in @@ -99,6 +99,8 @@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTALLOCA = @LTALLOCA@ +LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ diff --git a/src/Makefile.in b/src/Makefile.in index 98017e1..9570952 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -78,12 +78,19 @@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ HAVE_GCJ = @HAVE_GCJ@ +HAVE_GCJ_IN_PATH = @HAVE_GCJ_IN_PATH@ HAVE_GIJ = @HAVE_GIJ@ +HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@ HAVE_JAVAC = @HAVE_JAVAC@ +HAVE_JAVAC_IN_PATH = @HAVE_JAVAC_IN_PATH@ +HAVE_JAVA_IN_PATH = @HAVE_JAVA_IN_PATH@ HAVE_JAVA_JVM = @HAVE_JAVA_JVM@ HAVE_JIKES = @HAVE_JIKES@ +HAVE_JIKES_IN_PATH = @HAVE_JIKES_IN_PATH@ HAVE_JRE = @HAVE_JRE@ +HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@ HAVE_JVIEW = @HAVE_JVIEW@ +HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ @@ -98,6 +105,8 @@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTALLOCA = @LTALLOCA@ +LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ @@ -129,14 +138,19 @@ msgattrib msgcat msgcomm msgconv msgen msgexec msggrep msginit msguniq noinst_PROGRAMS = hostname urlget +lib_LTLIBRARIES = libgettextsrc.la + noinst_HEADERS = pos.h message.h po-gram.h po-hash.h po-charset.h po-lex.h \ po.h open-po.h read-po.h str-list.h write-po.h dir-list.h file-list.h \ po-gram-gen.h po-hash-gen.h msgl-charset.h msgl-equal.h msgl-iconv.h \ -msgl-ascii.h msgl-cat.h msgl-english.h msgfmt.h read-mo.h write-mo.h \ -po-time.h xgettext.h x-c.h x-po.h x-java.h x-ycp.h x-rst.h +msgl-ascii.h msgl-cat.h msgl-english.h msgfmt.h msgunfmt.h read-mo.h \ +write-mo.h read-java.h write-java.h po-time.h format.h xgettext.h x-c.h \ +x-po.h x-java.h x-ycp.h x-rst.h + +EXTRA_DIST = FILES project-id \ +gnu/gettext/DumpResource.java gnu/gettext/GetURL.java -EXTRA_DIST = FILES localedir = $(datadir)/locale jardir = $(datadir)/gettext @@ -148,7 +162,7 @@ INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/lib -I../intl \ DEFS = -DLOCALEDIR=\"$(localedir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \ -DLIBDIR=\"$(libdir)\" -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@ -LDADD = ../lib/libnlsut.a @INTLLIBS@ +LDADD = ../lib/libgettextlib.la @INTLLIBS@ SED = sed JAVACOMP = $(SHELL) ../lib/javacomp.sh @@ -171,45 +185,60 @@ format-c.c format-java.c format-lisp.c format-python.c format-pascal.c \ format-ycp.c +# libgettextsrc contains all code that is needed by at least two programs. +libgettextsrc_la_SOURCES = \ +$(COMMON_SOURCE) read-po.c write-po.c msgl-ascii.c msgl-iconv.c msgl-equal.c \ +msgl-cat.c msgl-english.c file-list.c msgl-charset.c po-time.c \ +$(FORMAT_SOURCE) + + # Source dependencies. gettext_SOURCES = gettext.c ngettext_SOURCES = ngettext.c -msgcmp_SOURCES = msgcmp.c $(COMMON_SOURCE) -msgfmt_SOURCES = msgfmt.c $(COMMON_SOURCE) msgl-ascii.c msgl-iconv.c write-mo.c write-java.c plural.c plural-eval.c $(FORMAT_SOURCE) -msgmerge_SOURCES = msgmerge.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-equal.c -msgunfmt_SOURCES = msgunfmt.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c read-mo.c read-java.c -xgettext_SOURCES = xgettext.c $(COMMON_SOURCE) msgl-ascii.c write-po.c file-list.c po-time.c x-c.c x-po.c x-java.l x-ycp.c x-rst.c $(FORMAT_SOURCE) -msgattrib_SOURCES = msgattrib.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c -msgcat_SOURCES = msgcat.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-iconv.c msgl-cat.c file-list.c -msgcomm_SOURCES = msgcomm.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-iconv.c msgl-cat.c file-list.c -msgconv_SOURCES = msgconv.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-iconv.c -msgen_SOURCES = msgen.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-english.c -msgexec_SOURCES = msgexec.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-charset.c -msggrep_SOURCES = msggrep.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-charset.c -msginit_SOURCES = msginit.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-english.c po-time.c -msguniq_SOURCES = msguniq.c $(COMMON_SOURCE) msgl-ascii.c write-po.c read-po.c msgl-iconv.c msgl-cat.c +msgcmp_SOURCES = msgcmp.c +msgfmt_SOURCES = msgfmt.c write-mo.c write-java.c plural.c plural-eval.c +msgmerge_SOURCES = msgmerge.c +msgunfmt_SOURCES = msgunfmt.c read-mo.c read-java.c +xgettext_SOURCES = xgettext.c x-c.c x-po.c x-java.l x-ycp.c x-rst.c +msgattrib_SOURCES = msgattrib.c +msgcat_SOURCES = msgcat.c +msgcomm_SOURCES = msgcomm.c +msgconv_SOURCES = msgconv.c +msgen_SOURCES = msgen.c +msgexec_SOURCES = msgexec.c +msggrep_SOURCES = msggrep.c +msginit_SOURCES = msginit.c +msguniq_SOURCES = msguniq.c hostname_SOURCES = hostname.c urlget_SOURCES = urlget.c +# How to build libgettextsrc.la. +# Need ../lib/libgettextlib.la. +# Need @INTLLIBS@ because many source files use gettext(). +# Need @LIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c use +# iconv(). +libgettextsrc_la_LDFLAGS = \ + -release @VERSION@ \ + ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ -no-undefined + + # 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@ -msgattrib_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -msgcat_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -msgcomm_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -msgconv_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -msgen_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -msgexec_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ -msggrep_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ +msgcmp_LDADD = libgettextsrc.la +msgfmt_LDADD = libgettextsrc.la +msgmerge_LDADD = libgettextsrc.la +msgunfmt_LDADD = libgettextsrc.la +xgettext_LDADD = libgettextsrc.la +msgattrib_LDADD = libgettextsrc.la +msgcat_LDADD = libgettextsrc.la +msgcomm_LDADD = libgettextsrc.la +msgconv_LDADD = libgettextsrc.la +msgen_LDADD = libgettextsrc.la +msgexec_LDADD = libgettextsrc.la +msggrep_LDADD = libgettextsrc.la msginit_LDADD = ../intl/localealias.$(OBJEXT) ../intl/localename.$(OBJEXT) \ - ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ + libgettextsrc.la -msguniq_LDADD = ../lib/libnlsut.a @INTLLIBS@ @LIBICONV@ +msguniq_LDADD = libgettextsrc.la # Special rules for bison and flex generated files. @@ -222,6 +251,16 @@ subdir = src mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = user-email +LTLIBRARIES = $(lib_LTLIBRARIES) + +libgettextsrc_la_LIBADD = +am_libgettextsrc_la_OBJECTS = message.lo po.lo po-lex.lo po-gram-gen.lo \ + po-hash-gen.lo po-charset.lo open-po.lo dir-list.lo str-list.lo \ + read-po.lo write-po.lo msgl-ascii.lo msgl-iconv.lo \ + msgl-equal.lo msgl-cat.lo msgl-english.lo file-list.lo \ + msgl-charset.lo po-time.lo format.lo format-c.lo format-java.lo \ + format-lisp.lo format-python.lo format-pascal.lo format-ycp.lo +libgettextsrc_la_OBJECTS = $(am_libgettextsrc_la_OBJECTS) bin_PROGRAMS = gettext$(EXEEXT) ngettext$(EXEEXT) msgcmp$(EXEEXT) \ msgfmt$(EXEEXT) msgmerge$(EXEEXT) msgunfmt$(EXEEXT) \ xgettext$(EXEEXT) msgattrib$(EXEEXT) msgcat$(EXEEXT) \ @@ -234,144 +273,82 @@ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am_gettext_OBJECTS = gettext.$(OBJEXT) gettext_OBJECTS = $(am_gettext_OBJECTS) gettext_LDADD = $(LDADD) -gettext_DEPENDENCIES = ../lib/libnlsut.a +gettext_DEPENDENCIES = ../lib/libgettextlib.la gettext_LDFLAGS = am_hostname_OBJECTS = hostname.$(OBJEXT) hostname_OBJECTS = $(am_hostname_OBJECTS) hostname_LDADD = $(LDADD) -hostname_DEPENDENCIES = ../lib/libnlsut.a +hostname_DEPENDENCIES = ../lib/libgettextlib.la hostname_LDFLAGS = -am_msgattrib_OBJECTS = msgattrib.$(OBJEXT) message.$(OBJEXT) \ - po.$(OBJEXT) po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) \ - po-hash-gen.$(OBJEXT) po-charset.$(OBJEXT) open-po.$(OBJEXT) \ - dir-list.$(OBJEXT) str-list.$(OBJEXT) msgl-ascii.$(OBJEXT) \ - write-po.$(OBJEXT) read-po.$(OBJEXT) +am_msgattrib_OBJECTS = msgattrib.$(OBJEXT) msgattrib_OBJECTS = $(am_msgattrib_OBJECTS) -msgattrib_DEPENDENCIES = ../lib/libnlsut.a +msgattrib_DEPENDENCIES = libgettextsrc.la msgattrib_LDFLAGS = -am_msgcat_OBJECTS = msgcat.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ - po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ - po-charset.$(OBJEXT) open-po.$(OBJEXT) dir-list.$(OBJEXT) \ - str-list.$(OBJEXT) msgl-ascii.$(OBJEXT) write-po.$(OBJEXT) \ - read-po.$(OBJEXT) msgl-iconv.$(OBJEXT) msgl-cat.$(OBJEXT) \ - file-list.$(OBJEXT) +am_msgcat_OBJECTS = msgcat.$(OBJEXT) msgcat_OBJECTS = $(am_msgcat_OBJECTS) -msgcat_DEPENDENCIES = ../lib/libnlsut.a +msgcat_DEPENDENCIES = libgettextsrc.la msgcat_LDFLAGS = -am_msgcmp_OBJECTS = msgcmp.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ - po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ - po-charset.$(OBJEXT) open-po.$(OBJEXT) dir-list.$(OBJEXT) \ - str-list.$(OBJEXT) +am_msgcmp_OBJECTS = msgcmp.$(OBJEXT) msgcmp_OBJECTS = $(am_msgcmp_OBJECTS) -msgcmp_DEPENDENCIES = ../lib/libnlsut.a +msgcmp_DEPENDENCIES = libgettextsrc.la msgcmp_LDFLAGS = -am_msgcomm_OBJECTS = msgcomm.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ - po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ - po-charset.$(OBJEXT) open-po.$(OBJEXT) dir-list.$(OBJEXT) \ - str-list.$(OBJEXT) msgl-ascii.$(OBJEXT) write-po.$(OBJEXT) \ - read-po.$(OBJEXT) msgl-iconv.$(OBJEXT) msgl-cat.$(OBJEXT) \ - file-list.$(OBJEXT) +am_msgcomm_OBJECTS = msgcomm.$(OBJEXT) msgcomm_OBJECTS = $(am_msgcomm_OBJECTS) -msgcomm_DEPENDENCIES = ../lib/libnlsut.a +msgcomm_DEPENDENCIES = libgettextsrc.la msgcomm_LDFLAGS = -am_msgconv_OBJECTS = msgconv.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ - po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ - po-charset.$(OBJEXT) open-po.$(OBJEXT) dir-list.$(OBJEXT) \ - str-list.$(OBJEXT) msgl-ascii.$(OBJEXT) write-po.$(OBJEXT) \ - read-po.$(OBJEXT) msgl-iconv.$(OBJEXT) +am_msgconv_OBJECTS = msgconv.$(OBJEXT) msgconv_OBJECTS = $(am_msgconv_OBJECTS) -msgconv_DEPENDENCIES = ../lib/libnlsut.a +msgconv_DEPENDENCIES = libgettextsrc.la msgconv_LDFLAGS = -am_msgen_OBJECTS = msgen.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ - po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ - po-charset.$(OBJEXT) open-po.$(OBJEXT) dir-list.$(OBJEXT) \ - str-list.$(OBJEXT) msgl-ascii.$(OBJEXT) write-po.$(OBJEXT) \ - read-po.$(OBJEXT) msgl-english.$(OBJEXT) +am_msgen_OBJECTS = msgen.$(OBJEXT) msgen_OBJECTS = $(am_msgen_OBJECTS) -msgen_DEPENDENCIES = ../lib/libnlsut.a +msgen_DEPENDENCIES = libgettextsrc.la msgen_LDFLAGS = -am_msgexec_OBJECTS = msgexec.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ - po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ - po-charset.$(OBJEXT) open-po.$(OBJEXT) dir-list.$(OBJEXT) \ - str-list.$(OBJEXT) msgl-ascii.$(OBJEXT) write-po.$(OBJEXT) \ - read-po.$(OBJEXT) msgl-charset.$(OBJEXT) +am_msgexec_OBJECTS = msgexec.$(OBJEXT) msgexec_OBJECTS = $(am_msgexec_OBJECTS) -msgexec_DEPENDENCIES = ../lib/libnlsut.a +msgexec_DEPENDENCIES = libgettextsrc.la msgexec_LDFLAGS = -am_msgfmt_OBJECTS = msgfmt.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ - po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ - po-charset.$(OBJEXT) open-po.$(OBJEXT) dir-list.$(OBJEXT) \ - str-list.$(OBJEXT) msgl-ascii.$(OBJEXT) msgl-iconv.$(OBJEXT) \ - write-mo.$(OBJEXT) write-java.$(OBJEXT) plural.$(OBJEXT) \ - plural-eval.$(OBJEXT) format.$(OBJEXT) format-c.$(OBJEXT) \ - format-java.$(OBJEXT) format-lisp.$(OBJEXT) \ - format-python.$(OBJEXT) format-pascal.$(OBJEXT) \ - format-ycp.$(OBJEXT) +am_msgfmt_OBJECTS = msgfmt.$(OBJEXT) write-mo.$(OBJEXT) \ + write-java.$(OBJEXT) plural.$(OBJEXT) plural-eval.$(OBJEXT) msgfmt_OBJECTS = $(am_msgfmt_OBJECTS) -msgfmt_DEPENDENCIES = ../lib/libnlsut.a +msgfmt_DEPENDENCIES = libgettextsrc.la msgfmt_LDFLAGS = -am_msggrep_OBJECTS = msggrep.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ - po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ - po-charset.$(OBJEXT) open-po.$(OBJEXT) dir-list.$(OBJEXT) \ - str-list.$(OBJEXT) msgl-ascii.$(OBJEXT) write-po.$(OBJEXT) \ - read-po.$(OBJEXT) msgl-charset.$(OBJEXT) +am_msggrep_OBJECTS = msggrep.$(OBJEXT) msggrep_OBJECTS = $(am_msggrep_OBJECTS) -msggrep_DEPENDENCIES = ../lib/libnlsut.a +msggrep_DEPENDENCIES = libgettextsrc.la msggrep_LDFLAGS = -am_msginit_OBJECTS = msginit.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ - po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ - po-charset.$(OBJEXT) open-po.$(OBJEXT) dir-list.$(OBJEXT) \ - str-list.$(OBJEXT) msgl-ascii.$(OBJEXT) write-po.$(OBJEXT) \ - read-po.$(OBJEXT) msgl-english.$(OBJEXT) po-time.$(OBJEXT) +am_msginit_OBJECTS = msginit.$(OBJEXT) msginit_OBJECTS = $(am_msginit_OBJECTS) msginit_DEPENDENCIES = ../intl/localealias.$(OBJEXT) \ - ../intl/localename.$(OBJEXT) ../lib/libnlsut.a + ../intl/localename.$(OBJEXT) libgettextsrc.la msginit_LDFLAGS = -am_msgmerge_OBJECTS = msgmerge.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ - po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ - po-charset.$(OBJEXT) open-po.$(OBJEXT) dir-list.$(OBJEXT) \ - str-list.$(OBJEXT) msgl-ascii.$(OBJEXT) write-po.$(OBJEXT) \ - read-po.$(OBJEXT) msgl-equal.$(OBJEXT) +am_msgmerge_OBJECTS = msgmerge.$(OBJEXT) msgmerge_OBJECTS = $(am_msgmerge_OBJECTS) -msgmerge_DEPENDENCIES = ../lib/libnlsut.a +msgmerge_DEPENDENCIES = libgettextsrc.la msgmerge_LDFLAGS = -am_msgunfmt_OBJECTS = msgunfmt.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ - po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ - po-charset.$(OBJEXT) open-po.$(OBJEXT) dir-list.$(OBJEXT) \ - str-list.$(OBJEXT) msgl-ascii.$(OBJEXT) write-po.$(OBJEXT) \ - read-po.$(OBJEXT) read-mo.$(OBJEXT) read-java.$(OBJEXT) +am_msgunfmt_OBJECTS = msgunfmt.$(OBJEXT) read-mo.$(OBJEXT) \ + read-java.$(OBJEXT) msgunfmt_OBJECTS = $(am_msgunfmt_OBJECTS) -msgunfmt_DEPENDENCIES = ../lib/libnlsut.a +msgunfmt_DEPENDENCIES = libgettextsrc.la msgunfmt_LDFLAGS = -am_msguniq_OBJECTS = msguniq.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ - po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ - po-charset.$(OBJEXT) open-po.$(OBJEXT) dir-list.$(OBJEXT) \ - str-list.$(OBJEXT) msgl-ascii.$(OBJEXT) write-po.$(OBJEXT) \ - read-po.$(OBJEXT) msgl-iconv.$(OBJEXT) msgl-cat.$(OBJEXT) +am_msguniq_OBJECTS = msguniq.$(OBJEXT) msguniq_OBJECTS = $(am_msguniq_OBJECTS) -msguniq_DEPENDENCIES = ../lib/libnlsut.a +msguniq_DEPENDENCIES = libgettextsrc.la msguniq_LDFLAGS = am_ngettext_OBJECTS = ngettext.$(OBJEXT) ngettext_OBJECTS = $(am_ngettext_OBJECTS) ngettext_LDADD = $(LDADD) -ngettext_DEPENDENCIES = ../lib/libnlsut.a +ngettext_DEPENDENCIES = ../lib/libgettextlib.la ngettext_LDFLAGS = am_urlget_OBJECTS = urlget.$(OBJEXT) urlget_OBJECTS = $(am_urlget_OBJECTS) urlget_LDADD = $(LDADD) -urlget_DEPENDENCIES = ../lib/libnlsut.a +urlget_DEPENDENCIES = ../lib/libgettextlib.la urlget_LDFLAGS = -am_xgettext_OBJECTS = xgettext.$(OBJEXT) message.$(OBJEXT) po.$(OBJEXT) \ - po-lex.$(OBJEXT) po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) \ - po-charset.$(OBJEXT) open-po.$(OBJEXT) dir-list.$(OBJEXT) \ - str-list.$(OBJEXT) msgl-ascii.$(OBJEXT) write-po.$(OBJEXT) \ - file-list.$(OBJEXT) po-time.$(OBJEXT) x-c.$(OBJEXT) \ - x-po.$(OBJEXT) x-java.$(OBJEXT) x-ycp.$(OBJEXT) x-rst.$(OBJEXT) \ - format.$(OBJEXT) format-c.$(OBJEXT) format-java.$(OBJEXT) \ - format-lisp.$(OBJEXT) format-python.$(OBJEXT) \ - format-pascal.$(OBJEXT) format-ycp.$(OBJEXT) +am_xgettext_OBJECTS = xgettext.$(OBJEXT) x-c.$(OBJEXT) x-po.$(OBJEXT) \ + x-java.$(OBJEXT) x-ycp.$(OBJEXT) x-rst.$(OBJEXT) xgettext_OBJECTS = $(am_xgettext_OBJECTS) -xgettext_DEPENDENCIES = ../lib/libnlsut.a +xgettext_DEPENDENCIES = libgettextsrc.la xgettext_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ @@ -391,18 +368,18 @@ LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS) YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS) YLWRAP = $(top_srcdir)/ylwrap -DIST_SOURCES = $(gettext_SOURCES) $(hostname_SOURCES) \ - $(msgattrib_SOURCES) $(msgcat_SOURCES) $(msgcmp_SOURCES) \ - $(msgcomm_SOURCES) $(msgconv_SOURCES) $(msgen_SOURCES) \ - $(msgexec_SOURCES) $(msgfmt_SOURCES) $(msggrep_SOURCES) \ - $(msginit_SOURCES) $(msgmerge_SOURCES) $(msgunfmt_SOURCES) \ - $(msguniq_SOURCES) $(ngettext_SOURCES) $(urlget_SOURCES) \ - $(xgettext_SOURCES) +DIST_SOURCES = $(libgettextsrc_la_SOURCES) $(gettext_SOURCES) \ + $(hostname_SOURCES) $(msgattrib_SOURCES) $(msgcat_SOURCES) \ + $(msgcmp_SOURCES) $(msgcomm_SOURCES) $(msgconv_SOURCES) \ + $(msgen_SOURCES) $(msgexec_SOURCES) $(msgfmt_SOURCES) \ + $(msggrep_SOURCES) $(msginit_SOURCES) $(msgmerge_SOURCES) \ + $(msgunfmt_SOURCES) $(msguniq_SOURCES) $(ngettext_SOURCES) \ + $(urlget_SOURCES) $(xgettext_SOURCES) HEADERS = $(noinst_HEADERS) DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in \ po-gram-gen.c po-hash-gen.c user-email.in x-java.c -SOURCES = $(gettext_SOURCES) $(hostname_SOURCES) $(msgattrib_SOURCES) $(msgcat_SOURCES) $(msgcmp_SOURCES) $(msgcomm_SOURCES) $(msgconv_SOURCES) $(msgen_SOURCES) $(msgexec_SOURCES) $(msgfmt_SOURCES) $(msggrep_SOURCES) $(msginit_SOURCES) $(msgmerge_SOURCES) $(msgunfmt_SOURCES) $(msguniq_SOURCES) $(ngettext_SOURCES) $(urlget_SOURCES) $(xgettext_SOURCES) +SOURCES = $(libgettextsrc_la_SOURCES) $(gettext_SOURCES) $(hostname_SOURCES) $(msgattrib_SOURCES) $(msgcat_SOURCES) $(msgcmp_SOURCES) $(msgcomm_SOURCES) $(msgconv_SOURCES) $(msgen_SOURCES) $(msgexec_SOURCES) $(msgfmt_SOURCES) $(msggrep_SOURCES) $(msginit_SOURCES) $(msgmerge_SOURCES) $(msgunfmt_SOURCES) $(msguniq_SOURCES) $(ngettext_SOURCES) $(urlget_SOURCES) $(xgettext_SOURCES) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -427,6 +404,27 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status user-email: $(top_builddir)/config.status user-email.in cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(libdir) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ + else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +libgettextsrc.la: $(libgettextsrc_la_OBJECTS) $(libgettextsrc_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgettextsrc_la_LDFLAGS) $(libgettextsrc_la_OBJECTS) $(libgettextsrc_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@ -572,6 +570,7 @@ top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) + $(mkinstalldirs) $(distdir)/gnu/gettext @for file in $(DISTFILES); do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ @@ -589,7 +588,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(HEADERS) all-local +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local +install-binPROGRAMS: install-libLTLIBRARIES + install: install-am install-exec: install-exec-am @@ -619,8 +620,8 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-binPROGRAMS clean-generic clean-libtool \ - clean-noinstPROGRAMS mostlyclean-am +clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ + clean-libtool clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am @@ -637,7 +638,8 @@ info-am: install-data-am: install-data-local -install-exec-am: install-binPROGRAMS install-exec-local +install-exec-am: install-binPROGRAMS install-exec-local \ + install-libLTLIBRARIES install-info: install-info-am @@ -654,23 +656,25 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool -uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-local +uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ + uninstall-libLTLIBRARIES uninstall-local .PHONY: GTAGS all all-am all-local check check-am clean \ - clean-binPROGRAMS clean-generic clean-libtool \ - clean-noinstPROGRAMS distclean distclean-compile \ + clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ + clean-libtool clean-noinstPROGRAMS distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ dvi-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-data-local install-exec \ install-exec-am install-exec-local install-info install-info-am \ - install-man install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool tags uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-info-am uninstall-local + install-libLTLIBRARIES install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool tags uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-info-am \ + uninstall-libLTLIBRARIES uninstall-local -po-lex.o: po-gram-gen2.h +po-lex.o po-lex.lo: po-gram-gen2.h po-gram-gen2.h: po-gram-gen.h $(SED) 's/[yY][yY]/po_gram_/g' $(srcdir)/po-gram-gen.h > $@-tmp mv $@-tmp $@ diff --git a/src/x-java.c b/src/x-java.c index 97a109b..2dddcc3 100644 --- a/src/x-java.c +++ b/src/x-java.c @@ -1903,7 +1903,6 @@ add_object (list, object) { if (list->num_obj + 1 >= list->max_num_obj) { - // resize list->max_num_obj += OBJECT_LIST_GROWTH; list->objects = xrealloc (list->objects, list->max_num_obj * sizeof (void *)); diff --git a/tests/Makefile.in b/tests/Makefile.in index 6efb88f..b7d2003 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -99,6 +99,8 @@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ +LTALLOCA = @LTALLOCA@ +LTLIBOBJS = @LTLIBOBJS@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ @@ -123,7 +125,7 @@ lispdir = @lispdir@ AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies TESTS = gettext-1 gettext-2 \ - msgcat-1 \ + msgcat-1 msgcat-2 msgcat-3 msgcat-4 msgcat-5 msgcat-6 \ msgcmp-1 msgcmp-2 \ msgcomm-1 msgcomm-2 msgcomm-3 msgcomm-4 msgcomm-5 msgcomm-6 msgcomm-7 \ msgcomm-8 msgcomm-9 msgcomm-10 msgcomm-11 msgcomm-12 msgcomm-13 \ @@ -146,7 +148,7 @@ TESTS = gettext-1 gettext-2 \ plural-1 plural-2 -EXTRA_DIST = $(TESTS) test.mo xg-test1.ok.po +EXTRA_DIST = $(TESTS) test.mo xg-test1.ok.po msguniq-1.in msguniq-1.out XGETTEXT = ../src/xgettext @@ -172,9 +174,9 @@ LDADD_yes = ../intl/libintl.la LDADD_no = ../intl/libgnuintl.la @INTLLIBS@ noinst_PROGRAMS = tstgettext tstngettext cake tstgettext_SOURCES = tstgettext.c setlocale.c -tstgettext_LDADD = ../lib/libnlsut.a $(LDADD) +tstgettext_LDADD = ../lib/libgettextlib.la $(LDADD) tstngettext_SOURCES = tstngettext.c setlocale.c -tstngettext_LDADD = ../lib/libnlsut.a $(LDADD) +tstngettext_LDADD = ../lib/libgettextlib.la $(LDADD) cake_SOURCES = plural-1-prg.c setlocale.c subdir = tests mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -190,11 +192,11 @@ cake_DEPENDENCIES = cake_LDFLAGS = am_tstgettext_OBJECTS = tstgettext.$(OBJEXT) setlocale.$(OBJEXT) tstgettext_OBJECTS = $(am_tstgettext_OBJECTS) -tstgettext_DEPENDENCIES = ../lib/libnlsut.a +tstgettext_DEPENDENCIES = ../lib/libgettextlib.la tstgettext_LDFLAGS = am_tstngettext_OBJECTS = tstngettext.$(OBJEXT) setlocale.$(OBJEXT) tstngettext_OBJECTS = $(am_tstngettext_OBJECTS) -tstngettext_DEPENDENCIES = ../lib/libnlsut.a +tstngettext_DEPENDENCIES = ../lib/libgettextlib.la tstngettext_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ diff --git a/tests/xg-test1.ok.po b/tests/xg-test1.ok.po index d84f7fa..02a78f6 100644 --- a/tests/xg-test1.ok.po +++ b/tests/xg-test1.ok.po @@ -1,4 +1,12 @@ -msgid "while preparing output" +#, c-format, no-wrap +msgid "" +"Copyright (C) %s Free Software Foundation, Inc.\n" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +msgstr "" + +#, c-format +msgid "Written by %s.\n" msgstr "" #, c-format @@ -11,17 +19,6 @@ msgstr "" msgid "xgettext cannot work without keywords to look for" msgstr "" -#, c-format, no-wrap -msgid "" -"Copyright (C) %s Free Software Foundation, Inc.\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" -msgstr "" - -#, c-format -msgid "Written by %s.\n" -msgstr "" - msgid "no input file given" msgstr "" @@ -68,7 +65,8 @@ msgstr "" #, no-wrap msgid "" "Choice of input file language:\n" -" -L, --language=NAME recognise the specified language (C, C++, PO)\n" +" -L, --language=NAME recognise the specified language\n" +" (C, C++, ObjectiveC, PO, Java, YCP)\n" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" msgstr "" @@ -103,7 +101,7 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" -" -s, --sort-output generate sorted output and remove duplicates\n" +" -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" " --foreign-user omit FSF copyright in output for foreign user\n" @@ -118,7 +116,7 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n" +msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n" msgstr "" msgid "this file may not contain domain directives" @@ -131,12 +129,22 @@ msgstr "" msgid "error while opening \"%s\" for reading" msgstr "" +msgid "" +"Empty msgid. It is reserved by GNU gettext:\n" +"gettext(\"\") returns the header entry with\n" +"meta information, not the empty string.\n" +msgstr "" + #, c-format msgid "language `%s' unknown" msgstr "" #, c-format -msgid "error while opening \"%s\" for writing" +msgid "%s requires a \"-d directory\" specification" +msgstr "" + +#, c-format +msgid "%s is only valid with %s" msgstr "" #, c-format @@ -179,6 +187,13 @@ msgstr "" #, no-wrap msgid "" +"Operation mode:\n" +" -j, --java Java mode: generate a Java ResourceBundle class\n" +" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n" +msgstr "" + +#, no-wrap +msgid "" "Output file location:\n" " -o, --output-file=FILE write output to specified file\n" " --strict enable strict Uniforum mode\n" @@ -187,6 +202,17 @@ msgstr "" #, no-wrap msgid "" +"Output file location in Java mode:\n" +" -r, --resource=RESOURCE resource name\n" +" -l, --locale=LOCALE locale name, either language or language_COUNTRY\n" +" -d DIRECTORY base directory of classes directory hierarchy\n" +"The class name is determined by appending the locale name to the resource name,\n" +"separated with an underscore. The -d option is mandatory. The class is\n" +"written under the specified directory.\n" +msgstr "" + +#, no-wrap +msgid "" "Input file interpretation:\n" " -c, --check perform all the checks implied by\n" " --check-format, --check-header, --check-domain\n" @@ -217,53 +243,54 @@ msgstr "" msgid "while creating hash table" msgstr "" -msgid "warning: PO file header missing, fuzzy, or invalid\n" +msgid "plural expression can produce negative values" msgstr "" -msgid "warning: charset conversion will not work\n" +#, c-format +msgid "nplurals = %lu but plural expression can produce values as large as %lu" msgstr "" -#, c-format -msgid "domain name \"%s\" not suitable as file name" +msgid "plural expression can produce division by zero" msgstr "" -#, c-format -msgid "domain name \"%s\" not suitable as file name: will use prefix" +msgid "plural expression can produce integer overflow" msgstr "" -#, c-format -msgid "`domain %s' directive ignored" +msgid "" +"plural expression can produce arithmetic exceptions, possibly division by " +"zero" msgstr "" -msgid "empty `msgstr' entry ignored" +msgid "message catalog has plural form translations..." msgstr "" -msgid "fuzzy `msgstr' entry ignored" +msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "" -#, c-format -msgid "headerfield `%s' missing in header" +msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "" -#, c-format -msgid "header field `%s' should start at beginning of line" +msgid "invalid nplurals value" msgstr "" -msgid "some header fields still have the initial default value" +msgid "invalid plural expression" msgstr "" #, c-format -msgid "field `%s' still has initial default value" +msgid "nplurals = %lu..." msgstr "" -msgid "duplicate message definition" +#, c-format +msgid "...but some messages have only %lu plural forms" msgstr "" -msgid "...this is the location of the first definition" +#, c-format +msgid "...but some messages have %lu plural forms" msgstr "" -#, c-format -msgid "%s: warning: source file contains fuzzy translation" +msgid "" +"message catalog has plural form translations, but lacks a header entry with " +"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" msgstr "" msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'" @@ -293,6 +320,55 @@ msgstr "" msgid "'msgstr' is not a valid %s format string, unlike 'msgid'" msgstr "" +msgid "warning: PO file header missing, fuzzy, or invalid\n" +msgstr "" + +msgid "warning: charset conversion will not work\n" +msgstr "" + +#, c-format +msgid "domain name \"%s\" not suitable as file name" +msgstr "" + +#, c-format +msgid "domain name \"%s\" not suitable as file name: will use prefix" +msgstr "" + +#, c-format +msgid "`domain %s' directive ignored" +msgstr "" + +msgid "empty `msgstr' entry ignored" +msgstr "" + +msgid "fuzzy `msgstr' entry ignored" +msgstr "" + +#, c-format +msgid "headerfield `%s' missing in header" +msgstr "" + +#, c-format +msgid "header field `%s' should start at beginning of line" +msgstr "" + +msgid "some header fields still have the initial default value" +msgstr "" + +#, c-format +msgid "field `%s' still has initial default value" +msgstr "" + +msgid "duplicate message definition" +msgstr "" + +msgid "...this is the location of the first definition" +msgstr "" + +#, c-format +msgid "%s: warning: source file contains fuzzy translation" +msgstr "" + msgid "too many arguments" msgstr "" |