From: Bruno Haible Date: Fri, 26 Aug 2005 17:28:36 +0000 (+0000) Subject: Regenerated. X-Git-Tag: v0.15~414 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=573dfdcb049f708faf9ae37dd4dc678d2c9d778d;p=thirdparty%2Fgettext.git Regenerated. --- diff --git a/configure b/configure index fc827081b..75b686593 100755 --- a/configure +++ b/configure @@ -858,6 +858,8 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --disable-java do not build Java sources + --disable-native-java do not compile Java to native executables --enable-csharp[=IMPL] choose preferred C# implementation (pnet or mono) --enable-relocatable install a package that can be moved in the filesystem --disable-nls do not use Native Language Support @@ -866,6 +868,7 @@ Optional Features: --disable-threads build without multithread safety --disable-rpath do not hardcode runtime library paths --disable-libasprintf do not build libasprintf + --disable-libglocale do not build libglocale Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -889,6 +892,7 @@ Optional Packages: --with-libexpat-prefix[=DIR] search for libexpat in DIR/include and DIR/lib --without-libexpat-prefix don't search for libexpat in includedir and libdir --with-lispdir override the default lisp directory + --without-emacs do not use Emacs, don't install po-mode Some influential environment variables: CC C compiler command @@ -1929,6 +1933,16 @@ if test "${enable_dependency_tracking+set}" = set; then enableval="$enable_dependency_tracking" fi; +# Check whether --enable-java or --disable-java was given. +if test "${enable_java+set}" = set; then + enableval="$enable_java" + +fi; +# Check whether --enable-native-java or --disable-native-java was given. +if test "${enable_native_java+set}" = set; then + enableval="$enable_native_java" + +fi; # Check whether --enable-csharp or --disable-csharp was given. @@ -2056,6 +2070,11 @@ if test "${enable_libasprintf+set}" = set; then enableval="$enable_libasprintf" fi; +# Check whether --enable-libglocale or --disable-libglocale was given. +if test "${enable_libglocale+set}" = set; then + enableval="$enable_libglocale" + +fi; @@ -2065,6 +2084,16 @@ if test "${enable_dependency_tracking+set}" = set; then enableval="$enable_dependency_tracking" fi; +# Check whether --enable-java or --disable-java was given. +if test "${enable_java+set}" = set; then + enableval="$enable_java" + +fi; +# Check whether --enable-native-java or --disable-native-java was given. +if test "${enable_native_java+set}" = set; then + enableval="$enable_native_java" + +fi; @@ -2208,6 +2237,12 @@ if test "${with_lispdir+set}" = set; then fi; +# Check whether --with-emacs or --without-emacs was given. +if test "${with_emacs+set}" = set; then + withval="$with_emacs" + +fi; + diff --git a/gettext-runtime/Makefile.in b/gettext-runtime/Makefile.in index b7c6d8c8c..296aa4271 100644 --- a/gettext-runtime/Makefile.in +++ b/gettext-runtime/Makefile.in @@ -68,6 +68,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-tools/m4/error.m4 \ $(top_srcdir)/../gettext-tools/m4/extensions.m4 \ $(top_srcdir)/../gettext-tools/m4/getopt.m4 \ + $(top_srcdir)/../gettext-tools/m4/java.m4 \ $(top_srcdir)/../gettext-tools/m4/javacomp.m4 \ $(top_srcdir)/../gettext-tools/m4/onceonly.m4 \ $(top_srcdir)/../gettext-tools/m4/pathmax.m4 \ @@ -124,6 +125,8 @@ gettextsrcDATA_INSTALL = $(INSTALL_DATA) DATA = $(gettextsrc_DATA) ETAGS = etags CTAGS = ctags +DIST_SUBDIRS = doc intl intl-java intl-csharp lib libasprintf glocale \ + src po man m4 tests DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -175,6 +178,10 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_GLOCALE_FALSE = @ENABLE_GLOCALE_FALSE@ +ENABLE_GLOCALE_TRUE = @ENABLE_GLOCALE_TRUE@ +ENABLE_LIBASPRINTF_FALSE = @ENABLE_LIBASPRINTF_FALSE@ +ENABLE_LIBASPRINTF_TRUE = @ENABLE_LIBASPRINTF_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -213,6 +220,7 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -254,7 +262,6 @@ SET_RELOCATABLE = @SET_RELOCATABLE@ SHELL = @SHELL@ STDBOOL_H = @STDBOOL_H@ STRIP = @STRIP@ -SUBDIR_libasprintf = @SUBDIR_libasprintf@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -310,8 +317,14 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies ACLOCAL_AMFLAGS = -I m4 -I ../gettext-tools/m4 -I ../autoconf-lib-link/m4 -I ../m4 -SUBDIRS = doc intl intl-java intl-csharp lib @SUBDIR_libasprintf@ src po man m4 tests -DIST_SUBDIRS = doc intl intl-java intl-csharp lib libasprintf src po man m4 tests +@ENABLE_LIBASPRINTF_FALSE@SUBDIR_libasprintf = + +# The list of subdirectories depends on whether --disable-libasprintf or +# --disable-glocale was specified. +@ENABLE_LIBASPRINTF_TRUE@SUBDIR_libasprintf = libasprintf +@ENABLE_GLOCALE_FALSE@SUBDIR_glocale = +@ENABLE_GLOCALE_TRUE@SUBDIR_glocale = glocale +SUBDIRS = doc intl intl-java intl-csharp lib $(SUBDIR_libasprintf) $(SUBDIR_glocale) src po man m4 tests EXTRA_DIST = BUGS Makefile.vms config.h_vms README.woe32 Makefile.msvc \ config.h.msvc windows/dllexport.h windows/intl.rc diff --git a/gettext-runtime/aclocal.m4 b/gettext-runtime/aclocal.m4 index a32609ce5..13e55232d 100644 --- a/gettext-runtime/aclocal.m4 +++ b/gettext-runtime/aclocal.m4 @@ -874,6 +874,7 @@ m4_include([../gettext-tools/m4/eealloc.m4]) m4_include([../gettext-tools/m4/error.m4]) m4_include([../gettext-tools/m4/extensions.m4]) m4_include([../gettext-tools/m4/getopt.m4]) +m4_include([../gettext-tools/m4/java.m4]) m4_include([../gettext-tools/m4/javacomp.m4]) m4_include([../gettext-tools/m4/onceonly.m4]) m4_include([../gettext-tools/m4/pathmax.m4]) diff --git a/gettext-runtime/config.h.in b/gettext-runtime/config.h.in index d7875d339..c4a9ca27d 100644 --- a/gettext-runtime/config.h.in +++ b/gettext-runtime/config.h.in @@ -210,12 +210,22 @@ /* Define to 1 if you have the `munmap' function. */ #undef HAVE_MUNMAP +/* Define if you have and it defines the NL_LOCALE_NAME macro if + _GNU_SOURCE is defined. */ +#undef HAVE_NL_LOCALE_NAME + /* Define to 1 if you have the header file. */ #undef HAVE_NL_TYPES_H /* Define if your printf() function supports format strings with positions. */ #undef HAVE_POSIX_PRINTF +/* Define if the defines PTHREAD_MUTEX_RECURSIVE. */ +#undef HAVE_PTHREAD_MUTEX_RECURSIVE + +/* Define if the POSIX multithreading library has read/write locks. */ +#undef HAVE_PTHREAD_RWLOCK + /* Define to 1 if you have the `putenv' function. */ #undef HAVE_PUTENV @@ -298,6 +308,10 @@ /* Define if you have the 'unsigned long long' type. */ #undef HAVE_UNSIGNED_LONG_LONG +/* Define to 1 or 0, depending whether the compiler supports simple visibility + declarations. */ +#undef HAVE_VISIBILITY + /* Define to 1 if you have the `vprintf' function. */ #undef HAVE_VPRINTF @@ -358,6 +372,9 @@ /* Define if exists and defines unusable PRI* macros. */ #undef PRI_MACROS_BROKEN +/* Define if the pthread_in_use() detection is hard. */ +#undef PTHREAD_IN_USE_DETECTION_HARD + /* Define as the maximum value of type 'size_t', if the system doesn't define it. */ #undef SIZE_MAX @@ -376,11 +393,35 @@ /* Define to 1 if strerror_r returns char *. */ #undef STRERROR_R_CHAR_P +/* Define if the POSIX multithreading library can be used. */ +#undef USE_POSIX_THREADS + +/* Define if references to the POSIX multithreading library should be made + weak. */ +#undef USE_POSIX_THREADS_WEAK + +/* Define if the GNU Pth multithreading library can be used. */ +#undef USE_PTH_THREADS + +/* Define if references to the GNU Pth multithreading library should be made + weak. */ +#undef USE_PTH_THREADS_WEAK + +/* Define if the old Solaris multithreading library can be used. */ +#undef USE_SOLARIS_THREADS + +/* Define if references to the old Solaris multithreading library should be + made weak. */ +#undef USE_SOLARIS_THREADS_WEAK + /* Define to 1 if you want getc etc. to use unlocked I/O if available. Unlocked I/O can improve performance in unithreaded apps, but it is not safe for multithreaded apps. */ #undef USE_UNLOCKED_IO +/* Define if the Win32 multithreading API can be used. */ +#undef USE_WIN32_THREADS + /* Version number of package */ #undef VERSION @@ -451,8 +492,47 @@ #undef uintmax_t +#define __libc_lock_t gl_lock_t +#define __libc_lock_define gl_lock_define +#define __libc_lock_define_initialized gl_lock_define_initialized +#define __libc_lock_init gl_lock_init +#define __libc_lock_lock gl_lock_lock +#define __libc_lock_unlock gl_lock_unlock +#define __libc_rwlock_t gl_rwlock_t +#define __libc_rwlock_define gl_rwlock_define +#define __libc_rwlock_define_initialized gl_rwlock_define_initialized +#define __libc_rwlock_init gl_rwlock_init +#define __libc_rwlock_rdlock gl_rwlock_rdlock +#define __libc_rwlock_wrlock gl_rwlock_wrlock +#define __libc_rwlock_unlock gl_rwlock_unlock +#define __libc_lock_recursive_t gl_recursive_lock_t +#define __libc_lock_define_recursive gl_recursive_lock_define +#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized +#define __libc_lock_init_recursive gl_recursive_lock_init +#define __libc_lock_lock_recursive gl_recursive_lock_lock +#define __libc_lock_unlock_recursive gl_recursive_lock_unlock +#define glthread_in_use libintl_thread_in_use +#define glthread_lock_init libintl_lock_init +#define glthread_lock_lock libintl_lock_lock +#define glthread_lock_unlock libintl_lock_unlock +#define glthread_lock_destroy libintl_lock_destroy +#define glthread_rwlock_init libintl_rwlock_init +#define glthread_rwlock_rdlock libintl_rwlock_rdlock +#define glthread_rwlock_wrlock libintl_rwlock_wrlock +#define glthread_rwlock_unlock libintl_rwlock_unlock +#define glthread_rwlock_destroy libintl_rwlock_destroy +#define glthread_recursive_lock_init libintl_recursive_lock_init +#define glthread_recursive_lock_lock libintl_recursive_lock_lock +#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock +#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy +#define glthread_once libintl_once +#define glthread_once_call libintl_once_call +#define glthread_once_singlethreaded libintl_once_singlethreaded + + + /* On Windows, variables that may be in a DLL must be marked specially. */ -#if defined _MSC_VER && defined _DLL +#if (defined _MSC_VER && defined _DLL) || (defined __MINGW32__ && defined DLL_EXPORT) # define DLL_VARIABLE __declspec (dllimport) #else # define DLL_VARIABLE diff --git a/gettext-runtime/configure b/gettext-runtime/configure index 3c3bd0367..55eaed13f 100755 --- a/gettext-runtime/configure +++ b/gettext-runtime/configure @@ -463,8 +463,8 @@ ac_includes_default="\ # include #endif" -ac_subdirs_all="$ac_subdirs_all libasprintf" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar docdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC CPP EGREP HAVE_GCJ_IN_PATH HAVE_JAVAC_IN_PATH HAVE_JIKES_IN_PATH JAVAC CLASSPATH CLASSPATH_SEPARATOR HAVE_GCJ_C HAVE_JAVAC HAVE_JIKES JAR BUILDJAVA CSHARP_CHOICE HAVE_CSCC_IN_PATH HAVE_MCS_IN_PATH HAVE_CSC_IN_PATH HAVE_CSCC HAVE_MCS HAVE_CSC BUILDCSHARP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RELOCATABLE LIBOBJS SET_RELOCATABLE RELOCATABLE_VIA_LD_TRUE RELOCATABLE_VIA_LD_FALSE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC2 CFLAG_VISIBILITY HAVE_VISIBILITY ALLOCA GLIBC21 INTL_MACOSX_LIBS LIBPTH LTLIBPTH LIBTHREAD LTLIBTHREAD LIBMULTITHREAD LTLIBMULTITHREAD HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB STDBOOL_H HAVE__BOOL ALLOCA_H GETOPT_H PERL CROSS_COMPILING LIBSCHED SUBDIR_libasprintf subdirs LTLIBOBJS' +ac_subdirs_all="$ac_subdirs_all libasprintf glocale" +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar docdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC JAVA_CHOICE CPP EGREP HAVE_GCJ_IN_PATH HAVE_JAVAC_IN_PATH HAVE_JIKES_IN_PATH JAVAC CLASSPATH CLASSPATH_SEPARATOR HAVE_GCJ_C HAVE_JAVAC HAVE_JIKES JAR BUILDJAVA CSHARP_CHOICE HAVE_CSCC_IN_PATH HAVE_MCS_IN_PATH HAVE_CSC_IN_PATH HAVE_CSCC HAVE_MCS HAVE_CSC BUILDCSHARP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RELOCATABLE LIBOBJS SET_RELOCATABLE RELOCATABLE_VIA_LD_TRUE RELOCATABLE_VIA_LD_FALSE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC2 CFLAG_VISIBILITY HAVE_VISIBILITY ALLOCA GLIBC21 INTL_MACOSX_LIBS LIBPTH LTLIBPTH LIBTHREAD LTLIBTHREAD LIBMULTITHREAD LTLIBMULTITHREAD HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB STDBOOL_H HAVE__BOOL ALLOCA_H GETOPT_H PERL CROSS_COMPILING LIBSCHED ENABLE_LIBASPRINTF_TRUE ENABLE_LIBASPRINTF_FALSE ENABLE_GLOCALE_TRUE ENABLE_GLOCALE_FALSE subdirs LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1026,6 +1026,8 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors + --disable-java do not build Java sources + --disable-native-java do not compile Java to native executables --enable-csharp[=IMPL] choose preferred C# implementation (pnet or mono) --enable-shared[=PKGS] build shared libraries [default=yes] @@ -1041,6 +1043,7 @@ Optional Features: --disable-threads build without multithread safety --disable-rpath do not hardcode runtime library paths --disable-libasprintf do not build libasprintf + --disable-libglocale do not build libglocale Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -3183,6 +3186,28 @@ test -n "$YACC" || YACC="yacc" + echo "$as_me:$LINENO: checking whether to use Java" >&5 +echo $ECHO_N "checking whether to use Java... $ECHO_C" >&6 + # Check whether --enable-java or --disable-java was given. +if test "${enable_java+set}" = set; then + enableval="$enable_java" + JAVA_CHOICE="$enableval" +else + JAVA_CHOICE=yes +fi; + echo "$as_me:$LINENO: result: $JAVA_CHOICE" >&5 +echo "${ECHO_T}$JAVA_CHOICE" >&6 + if test "$JAVA_CHOICE" = yes; then + # Check whether --enable-native-java or --disable-native-java was given. +if test "${enable_native_java+set}" = set; then + enableval="$enable_native_java" + test "$enableval" != no || JAVA_CHOICE=bytecode +fi; + fi + + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3658,7 +3683,7 @@ else echo "${ECHO_T}no" >&6 fi -if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then +if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then BUILDJAVA=yes else BUILDJAVA=no @@ -5023,7 +5048,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5026 "configure"' > conftest.$ac_ext + echo '#line 5051 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6371,7 +6396,7 @@ fi # Provide some information about the compiler. -echo "$as_me:6374:" \ +echo "$as_me:6399:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -7444,11 +7469,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7447: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7472: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7451: \$? = $ac_status" >&5 + echo "$as_me:7476: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -7702,11 +7727,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7705: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7730: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7709: \$? = $ac_status" >&5 + echo "$as_me:7734: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -7762,11 +7787,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7765: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7790: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7769: \$? = $ac_status" >&5 + echo "$as_me:7794: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9963,7 +9988,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12314: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12293: \$? = $ac_status" >&5 + echo "$as_me:12318: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12346,11 +12371,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12349: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12374: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12353: \$? = $ac_status" >&5 + echo "$as_me:12378: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13710,7 +13735,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:14694: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14673: \$? = $ac_status" >&5 + echo "$as_me:14698: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -14726,11 +14751,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14729: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14754: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14733: \$? = $ac_status" >&5 + echo "$as_me:14758: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16787,11 +16812,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16790: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16815: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16794: \$? = $ac_status" >&5 + echo "$as_me:16819: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -17045,11 +17070,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17048: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17073: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17052: \$? = $ac_status" >&5 + echo "$as_me:17077: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -17105,11 +17130,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17108: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17133: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17112: \$? = $ac_status" >&5 + echo "$as_me:17137: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19306,7 +19331,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include int main () { @@ -33792,9 +33818,41 @@ if test "$CXX" = ":"; then fi +if test -n "$SUBDIR_libasprintf"; then + ENABLE_LIBASPRINTF_TRUE= + ENABLE_LIBASPRINTF_FALSE='#' +else + ENABLE_LIBASPRINTF_TRUE='#' + ENABLE_LIBASPRINTF_FALSE= +fi -subdirs="$subdirs libasprintf" +# Check whether --enable-libglocale or --disable-libglocale was given. +if test "${enable_libglocale+set}" = set; then + enableval="$enable_libglocale" + if test "$enableval" != no; then + SUBDIR_glocale=glocale + else + SUBDIR_glocale= + fi + +else + SUBDIR_glocale=glocale +fi; + + +if test -n "$SUBDIR_glocale"; then + ENABLE_GLOCALE_TRUE= + ENABLE_GLOCALE_FALSE='#' +else + ENABLE_GLOCALE_TRUE='#' + ENABLE_GLOCALE_FALSE= +fi + + + + +subdirs="$subdirs libasprintf glocale" ac_config_files="$ac_config_files Makefile" @@ -33957,6 +34015,20 @@ echo "$as_me: error: conditional \"RELOCATABLE_VIA_LD\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${ENABLE_LIBASPRINTF_TRUE}" && test -z "${ENABLE_LIBASPRINTF_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"ENABLE_LIBASPRINTF\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"ENABLE_LIBASPRINTF\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${ENABLE_GLOCALE_TRUE}" && test -z "${ENABLE_GLOCALE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GLOCALE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"ENABLE_GLOCALE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -34393,7 +34465,7 @@ cat >>$CONFIG_STATUS <<_ACEOF AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" # Capture the value of obsolete ALL_LINGUAS because we need it to compute # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it - # from automake. + # from automake < 1.5. eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' # Capture the value of LINGUAS because we need it to compute CATALOGS. LINGUAS="${LINGUAS-%UNSET%}" @@ -34551,6 +34623,7 @@ s,@CCDEPMODE@,$CCDEPMODE,;t t s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t s,@YACC@,$YACC,;t t +s,@JAVA_CHOICE@,$JAVA_CHOICE,;t t s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t s,@HAVE_GCJ_IN_PATH@,$HAVE_GCJ_IN_PATH,;t t @@ -34652,7 +34725,10 @@ s,@GETOPT_H@,$GETOPT_H,;t t s,@PERL@,$PERL,;t t s,@CROSS_COMPILING@,$CROSS_COMPILING,;t t s,@LIBSCHED@,$LIBSCHED,;t t -s,@SUBDIR_libasprintf@,$SUBDIR_libasprintf,;t t +s,@ENABLE_LIBASPRINTF_TRUE@,$ENABLE_LIBASPRINTF_TRUE,;t t +s,@ENABLE_LIBASPRINTF_FALSE@,$ENABLE_LIBASPRINTF_FALSE,;t t +s,@ENABLE_GLOCALE_TRUE@,$ENABLE_GLOCALE_TRUE,;t t +s,@ENABLE_GLOCALE_FALSE@,$ENABLE_GLOCALE_FALSE,;t t s,@subdirs@,$subdirs,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF @@ -35390,11 +35466,12 @@ done test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake. + # Hide the ALL_LINGUAS assigment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # The set of available languages was given in configure.in. + # Hide the ALL_LINGUAS assigment from automake < 1.5. eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi # Compute POFILES diff --git a/gettext-runtime/doc/Makefile.in b/gettext-runtime/doc/Makefile.in index 55924136f..0da88f1d5 100644 --- a/gettext-runtime/doc/Makefile.in +++ b/gettext-runtime/doc/Makefile.in @@ -52,6 +52,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-tools/m4/error.m4 \ $(top_srcdir)/../gettext-tools/m4/extensions.m4 \ $(top_srcdir)/../gettext-tools/m4/getopt.m4 \ + $(top_srcdir)/../gettext-tools/m4/java.m4 \ $(top_srcdir)/../gettext-tools/m4/javacomp.m4 \ $(top_srcdir)/../gettext-tools/m4/onceonly.m4 \ $(top_srcdir)/../gettext-tools/m4/pathmax.m4 \ @@ -128,6 +129,10 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_GLOCALE_FALSE = @ENABLE_GLOCALE_FALSE@ +ENABLE_GLOCALE_TRUE = @ENABLE_GLOCALE_TRUE@ +ENABLE_LIBASPRINTF_FALSE = @ENABLE_LIBASPRINTF_FALSE@ +ENABLE_LIBASPRINTF_TRUE = @ENABLE_LIBASPRINTF_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -166,6 +171,7 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -207,7 +213,6 @@ SET_RELOCATABLE = @SET_RELOCATABLE@ SHELL = @SHELL@ STDBOOL_H = @STDBOOL_H@ STRIP = @STRIP@ -SUBDIR_libasprintf = @SUBDIR_libasprintf@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/gettext-runtime/intl-csharp/Makefile.in b/gettext-runtime/intl-csharp/Makefile.in index 0e6ca58c2..96dcbebd7 100644 --- a/gettext-runtime/intl-csharp/Makefile.in +++ b/gettext-runtime/intl-csharp/Makefile.in @@ -52,6 +52,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-tools/m4/error.m4 \ $(top_srcdir)/../gettext-tools/m4/extensions.m4 \ $(top_srcdir)/../gettext-tools/m4/getopt.m4 \ + $(top_srcdir)/../gettext-tools/m4/java.m4 \ $(top_srcdir)/../gettext-tools/m4/javacomp.m4 \ $(top_srcdir)/../gettext-tools/m4/onceonly.m4 \ $(top_srcdir)/../gettext-tools/m4/pathmax.m4 \ @@ -128,6 +129,10 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_GLOCALE_FALSE = @ENABLE_GLOCALE_FALSE@ +ENABLE_GLOCALE_TRUE = @ENABLE_GLOCALE_TRUE@ +ENABLE_LIBASPRINTF_FALSE = @ENABLE_LIBASPRINTF_FALSE@ +ENABLE_LIBASPRINTF_TRUE = @ENABLE_LIBASPRINTF_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -166,6 +171,7 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -207,7 +213,6 @@ SET_RELOCATABLE = @SET_RELOCATABLE@ SHELL = @SHELL@ STDBOOL_H = @STDBOOL_H@ STRIP = @STRIP@ -SUBDIR_libasprintf = @SUBDIR_libasprintf@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/gettext-runtime/intl-java/Makefile.in b/gettext-runtime/intl-java/Makefile.in index b795d2161..127aa1c3c 100644 --- a/gettext-runtime/intl-java/Makefile.in +++ b/gettext-runtime/intl-java/Makefile.in @@ -52,6 +52,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-tools/m4/error.m4 \ $(top_srcdir)/../gettext-tools/m4/extensions.m4 \ $(top_srcdir)/../gettext-tools/m4/getopt.m4 \ + $(top_srcdir)/../gettext-tools/m4/java.m4 \ $(top_srcdir)/../gettext-tools/m4/javacomp.m4 \ $(top_srcdir)/../gettext-tools/m4/onceonly.m4 \ $(top_srcdir)/../gettext-tools/m4/pathmax.m4 \ @@ -128,6 +129,10 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_GLOCALE_FALSE = @ENABLE_GLOCALE_FALSE@ +ENABLE_GLOCALE_TRUE = @ENABLE_GLOCALE_TRUE@ +ENABLE_LIBASPRINTF_FALSE = @ENABLE_LIBASPRINTF_FALSE@ +ENABLE_LIBASPRINTF_TRUE = @ENABLE_LIBASPRINTF_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -166,6 +171,7 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -207,7 +213,6 @@ SET_RELOCATABLE = @SET_RELOCATABLE@ SHELL = @SHELL@ STDBOOL_H = @STDBOOL_H@ STRIP = @STRIP@ -SUBDIR_libasprintf = @SUBDIR_libasprintf@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/gettext-runtime/lib/Makefile.in b/gettext-runtime/lib/Makefile.in index 12285280f..b1ebb0cd7 100644 --- a/gettext-runtime/lib/Makefile.in +++ b/gettext-runtime/lib/Makefile.in @@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-tools/m4/error.m4 \ $(top_srcdir)/../gettext-tools/m4/extensions.m4 \ $(top_srcdir)/../gettext-tools/m4/getopt.m4 \ + $(top_srcdir)/../gettext-tools/m4/java.m4 \ $(top_srcdir)/../gettext-tools/m4/javacomp.m4 \ $(top_srcdir)/../gettext-tools/m4/onceonly.m4 \ $(top_srcdir)/../gettext-tools/m4/pathmax.m4 \ @@ -158,6 +159,10 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_GLOCALE_FALSE = @ENABLE_GLOCALE_FALSE@ +ENABLE_GLOCALE_TRUE = @ENABLE_GLOCALE_TRUE@ +ENABLE_LIBASPRINTF_FALSE = @ENABLE_LIBASPRINTF_FALSE@ +ENABLE_LIBASPRINTF_TRUE = @ENABLE_LIBASPRINTF_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -196,6 +201,7 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -237,7 +243,6 @@ SET_RELOCATABLE = @SET_RELOCATABLE@ SHELL = @SHELL@ STDBOOL_H = @STDBOOL_H@ STRIP = @STRIP@ -SUBDIR_libasprintf = @SUBDIR_libasprintf@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/gettext-runtime/m4/Makefile.in b/gettext-runtime/m4/Makefile.in index 689e32750..ff36cd2fb 100644 --- a/gettext-runtime/m4/Makefile.in +++ b/gettext-runtime/m4/Makefile.in @@ -53,6 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-tools/m4/error.m4 \ $(top_srcdir)/../gettext-tools/m4/extensions.m4 \ $(top_srcdir)/../gettext-tools/m4/getopt.m4 \ + $(top_srcdir)/../gettext-tools/m4/java.m4 \ $(top_srcdir)/../gettext-tools/m4/javacomp.m4 \ $(top_srcdir)/../gettext-tools/m4/onceonly.m4 \ $(top_srcdir)/../gettext-tools/m4/pathmax.m4 \ @@ -129,6 +130,10 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_GLOCALE_FALSE = @ENABLE_GLOCALE_FALSE@ +ENABLE_GLOCALE_TRUE = @ENABLE_GLOCALE_TRUE@ +ENABLE_LIBASPRINTF_FALSE = @ENABLE_LIBASPRINTF_FALSE@ +ENABLE_LIBASPRINTF_TRUE = @ENABLE_LIBASPRINTF_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -167,6 +172,7 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -208,7 +214,6 @@ SET_RELOCATABLE = @SET_RELOCATABLE@ SHELL = @SHELL@ STDBOOL_H = @STDBOOL_H@ STRIP = @STRIP@ -SUBDIR_libasprintf = @SUBDIR_libasprintf@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/gettext-runtime/man/Makefile.in b/gettext-runtime/man/Makefile.in index 2a268a93c..59860eb58 100644 --- a/gettext-runtime/man/Makefile.in +++ b/gettext-runtime/man/Makefile.in @@ -53,6 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-tools/m4/error.m4 \ $(top_srcdir)/../gettext-tools/m4/extensions.m4 \ $(top_srcdir)/../gettext-tools/m4/getopt.m4 \ + $(top_srcdir)/../gettext-tools/m4/java.m4 \ $(top_srcdir)/../gettext-tools/m4/javacomp.m4 \ $(top_srcdir)/../gettext-tools/m4/onceonly.m4 \ $(top_srcdir)/../gettext-tools/m4/pathmax.m4 \ @@ -134,6 +135,10 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_GLOCALE_FALSE = @ENABLE_GLOCALE_FALSE@ +ENABLE_GLOCALE_TRUE = @ENABLE_GLOCALE_TRUE@ +ENABLE_LIBASPRINTF_FALSE = @ENABLE_LIBASPRINTF_FALSE@ +ENABLE_LIBASPRINTF_TRUE = @ENABLE_LIBASPRINTF_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -172,6 +177,7 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -213,7 +219,6 @@ SET_RELOCATABLE = @SET_RELOCATABLE@ SHELL = @SHELL@ STDBOOL_H = @STDBOOL_H@ STRIP = @STRIP@ -SUBDIR_libasprintf = @SUBDIR_libasprintf@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/gettext-runtime/src/Makefile.in b/gettext-runtime/src/Makefile.in index 9f996bb61..14bbaca8b 100644 --- a/gettext-runtime/src/Makefile.in +++ b/gettext-runtime/src/Makefile.in @@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-tools/m4/error.m4 \ $(top_srcdir)/../gettext-tools/m4/extensions.m4 \ $(top_srcdir)/../gettext-tools/m4/getopt.m4 \ + $(top_srcdir)/../gettext-tools/m4/java.m4 \ $(top_srcdir)/../gettext-tools/m4/javacomp.m4 \ $(top_srcdir)/../gettext-tools/m4/onceonly.m4 \ $(top_srcdir)/../gettext-tools/m4/pathmax.m4 \ @@ -165,6 +166,10 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_GLOCALE_FALSE = @ENABLE_GLOCALE_FALSE@ +ENABLE_GLOCALE_TRUE = @ENABLE_GLOCALE_TRUE@ +ENABLE_LIBASPRINTF_FALSE = @ENABLE_LIBASPRINTF_FALSE@ +ENABLE_LIBASPRINTF_TRUE = @ENABLE_LIBASPRINTF_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -203,6 +208,7 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -244,7 +250,6 @@ SET_RELOCATABLE = @SET_RELOCATABLE@ SHELL = @SHELL@ STDBOOL_H = @STDBOOL_H@ STRIP = @STRIP@ -SUBDIR_libasprintf = @SUBDIR_libasprintf@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/gettext-runtime/tests/Makefile.in b/gettext-runtime/tests/Makefile.in index a26c4893e..f301c7a98 100644 --- a/gettext-runtime/tests/Makefile.in +++ b/gettext-runtime/tests/Makefile.in @@ -56,6 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-tools/m4/error.m4 \ $(top_srcdir)/../gettext-tools/m4/extensions.m4 \ $(top_srcdir)/../gettext-tools/m4/getopt.m4 \ + $(top_srcdir)/../gettext-tools/m4/java.m4 \ $(top_srcdir)/../gettext-tools/m4/javacomp.m4 \ $(top_srcdir)/../gettext-tools/m4/onceonly.m4 \ $(top_srcdir)/../gettext-tools/m4/pathmax.m4 \ @@ -149,6 +150,10 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_GLOCALE_FALSE = @ENABLE_GLOCALE_FALSE@ +ENABLE_GLOCALE_TRUE = @ENABLE_GLOCALE_TRUE@ +ENABLE_LIBASPRINTF_FALSE = @ENABLE_LIBASPRINTF_FALSE@ +ENABLE_LIBASPRINTF_TRUE = @ENABLE_LIBASPRINTF_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ @@ -187,6 +192,7 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -228,7 +234,6 @@ SET_RELOCATABLE = @SET_RELOCATABLE@ SHELL = @SHELL@ STDBOOL_H = @STDBOOL_H@ STRIP = @STRIP@ -SUBDIR_libasprintf = @SUBDIR_libasprintf@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff --git a/gettext-tools/Makefile.in b/gettext-tools/Makefile.in index ee170d1a5..b83847e36 100644 --- a/gettext-tools/Makefile.in +++ b/gettext-tools/Makefile.in @@ -89,7 +89,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \ - $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/byteswap.m4 \ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \ @@ -98,19 +98,19 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/m4/gcj.m4 $(top_srcdir)/m4/getline.m4 \ $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostname.m4 \ - $(top_srcdir)/m4/javacomp.m4 $(top_srcdir)/m4/javaexec.m4 \ - $(top_srcdir)/m4/libgrep.m4 $(top_srcdir)/m4/locale-fr.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/onceonly.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/quote.m4 \ - $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/relocatable.m4 \ - $(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ - $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/m4/signalblocking.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/javacomp.m4 \ + $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/libgrep.m4 \ + $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbswidth.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/restrict.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \ + $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stpncpy.m4 \ $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoul.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \ @@ -166,6 +166,7 @@ BUILDCSHARP = @BUILDCSHARP@ BUILDJAVA = @BUILDJAVA@ BUILDJAVAEXE = @BUILDJAVAEXE@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BYTESWAP_H = @BYTESWAP_H@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -250,6 +251,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVA = @JAVA@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBEXPAT = @LIBEXPAT@ LIBGREPOBJS = @LIBGREPOBJS@ diff --git a/gettext-tools/aclocal.m4 b/gettext-tools/aclocal.m4 index 1d74b2e67..f7bfb06f3 100644 --- a/gettext-tools/aclocal.m4 +++ b/gettext-tools/aclocal.m4 @@ -946,6 +946,7 @@ m4_include([../gettext-runtime/m4/xsize.m4]) m4_include([m4/alloca.m4]) m4_include([m4/allocsa.m4]) m4_include([m4/backupfile.m4]) +m4_include([m4/byteswap.m4]) m4_include([m4/canonicalize.m4]) m4_include([m4/csharp.m4]) m4_include([m4/csharpcomp.m4]) @@ -962,6 +963,7 @@ m4_include([m4/getndelim2.m4]) m4_include([m4/getopt.m4]) m4_include([m4/hard-locale.m4]) m4_include([m4/hostname.m4]) +m4_include([m4/java.m4]) m4_include([m4/javacomp.m4]) m4_include([m4/javaexec.m4]) m4_include([m4/libgrep.m4]) @@ -987,7 +989,6 @@ m4_include([m4/signalblocking.m4]) m4_include([m4/ssize_t.m4]) m4_include([m4/stdbool.m4]) m4_include([m4/stpncpy.m4]) -m4_include([m4/strcase.m4]) m4_include([m4/strdup.m4]) m4_include([m4/strerror.m4]) m4_include([m4/strtol.m4]) diff --git a/gettext-tools/config.h.in b/gettext-tools/config.h.in index 4b0eae81d..cc5f247f6 100644 --- a/gettext-tools/config.h.in +++ b/gettext-tools/config.h.in @@ -32,6 +32,10 @@ /* Define to 1 if the package shall run at any location in the filesystem. */ #undef ENABLE_RELOCATABLE +/* Define according to the byte order of the target machine: 1 for big endian, + 0 for little endian. */ +#undef ENDIANNESS + /* Define to 1 if you have `alloca', as a function or macro. */ #undef HAVE_ALLOCA @@ -57,6 +61,9 @@ /* Define to 1 if you have the `btowc' function. */ #undef HAVE_BTOWC +/* Define to 1 if you have the header file. */ +#undef HAVE_BYTESWAP_H + /* Define to 1 if you have the `canonicalize_file_name' function. */ #undef HAVE_CANONICALIZE_FILE_NAME @@ -310,6 +317,10 @@ /* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_NDIR_H +/* Define if you have and it defines the NL_LOCALE_NAME macro if + _GNU_SOURCE is defined. */ +#undef HAVE_NL_LOCALE_NAME + /* Define to 1 if you have the header file. */ #undef HAVE_NL_TYPES_H @@ -325,6 +336,12 @@ /* Define to 1 if you have the `posix_spawn' function. */ #undef HAVE_POSIX_SPAWN +/* Define if the defines PTHREAD_MUTEX_RECURSIVE. */ +#undef HAVE_PTHREAD_MUTEX_RECURSIVE + +/* Define if the POSIX multithreading library has read/write locks. */ +#undef HAVE_PTHREAD_RWLOCK + /* Define to 1 if the system has the type `ptrdiff_t'. */ #undef HAVE_PTRDIFF_T @@ -405,9 +422,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H -/* Define to 1 if you have the `strncasecmp' function. */ -#undef HAVE_STRNCASECMP - /* Define to 1 if you have the `strpbrk' function. */ #undef HAVE_STRPBRK @@ -417,6 +431,9 @@ /* Define to 1 if you have the `strtoul' function. */ #undef HAVE_STRTOUL +/* Define to 1 if `__names' is member of `struct __locale_struct'. */ +#undef HAVE_STRUCT___LOCALE_STRUCT___NAMES + /* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_SYS_DIR_H @@ -482,6 +499,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_VFORK_H +/* Define to 1 or 0, depending whether the compiler supports simple visibility + declarations. */ +#undef HAVE_VISIBILITY + /* Define to 1 if you have the `vprintf' function. */ #undef HAVE_VPRINTF @@ -575,6 +596,9 @@ /* Define if exists and defines unusable PRI* macros. */ #undef PRI_MACROS_BROKEN +/* Define if the pthread_in_use() detection is hard. */ +#undef PTHREAD_IN_USE_DETECTION_HARD + /* Define as const if the declaration of setlocale() needs const. */ #undef SETLOCALE_CONST @@ -599,11 +623,35 @@ /* Define to 1 if strerror_r returns char *. */ #undef STRERROR_R_CHAR_P +/* Define if the POSIX multithreading library can be used. */ +#undef USE_POSIX_THREADS + +/* Define if references to the POSIX multithreading library should be made + weak. */ +#undef USE_POSIX_THREADS_WEAK + +/* Define if the GNU Pth multithreading library can be used. */ +#undef USE_PTH_THREADS + +/* Define if references to the GNU Pth multithreading library should be made + weak. */ +#undef USE_PTH_THREADS_WEAK + +/* Define if the old Solaris multithreading library can be used. */ +#undef USE_SOLARIS_THREADS + +/* Define if references to the old Solaris multithreading library should be + made weak. */ +#undef USE_SOLARIS_THREADS_WEAK + /* Define to 1 if you want getc etc. to use unlocked I/O if available. Unlocked I/O can improve performance in unithreaded apps, but it is not safe for multithreaded apps. */ #undef USE_UNLOCKED_IO +/* Define if the Win32 multithreading API can be used. */ +#undef USE_WIN32_THREADS + /* Version number of package */ #undef VERSION @@ -703,6 +751,48 @@ #undef vfork +#define __libc_lock_t gl_lock_t +#define __libc_lock_define gl_lock_define +#define __libc_lock_define_initialized gl_lock_define_initialized +#define __libc_lock_init gl_lock_init +#define __libc_lock_lock gl_lock_lock +#define __libc_lock_unlock gl_lock_unlock +#define __libc_rwlock_t gl_rwlock_t +#define __libc_rwlock_define gl_rwlock_define +#define __libc_rwlock_define_initialized gl_rwlock_define_initialized +#define __libc_rwlock_init gl_rwlock_init +#define __libc_rwlock_rdlock gl_rwlock_rdlock +#define __libc_rwlock_wrlock gl_rwlock_wrlock +#define __libc_rwlock_unlock gl_rwlock_unlock +#define __libc_lock_recursive_t gl_recursive_lock_t +#define __libc_lock_define_recursive gl_recursive_lock_define +#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized +#define __libc_lock_init_recursive gl_recursive_lock_init +#define __libc_lock_lock_recursive gl_recursive_lock_lock +#define __libc_lock_unlock_recursive gl_recursive_lock_unlock +#define glthread_in_use libintl_thread_in_use +#define glthread_lock_init libintl_lock_init +#define glthread_lock_lock libintl_lock_lock +#define glthread_lock_unlock libintl_lock_unlock +#define glthread_lock_destroy libintl_lock_destroy +#define glthread_rwlock_init libintl_rwlock_init +#define glthread_rwlock_rdlock libintl_rwlock_rdlock +#define glthread_rwlock_wrlock libintl_rwlock_wrlock +#define glthread_rwlock_unlock libintl_rwlock_unlock +#define glthread_rwlock_destroy libintl_rwlock_destroy +#define glthread_recursive_lock_init libintl_recursive_lock_init +#define glthread_recursive_lock_lock libintl_recursive_lock_lock +#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock +#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy +#define glthread_once libintl_once +#define glthread_once_call libintl_once_call +#define glthread_once_singlethreaded libintl_once_singlethreaded + + + +/* Indicator for intl/ that it is compiled for testing purposes only. */ +#define USE_IN_GETTEXT_TESTS + /* A file name cannot consist of any character possible. INVALID_PATH_CHAR contains the characters not allowed. */ #if defined _MSC_VER || defined __MINGW32__ @@ -725,7 +815,7 @@ #define PAGE_WIDTH 79 /* On Windows, variables that may be in a DLL must be marked specially. */ -#if defined _MSC_VER && defined _DLL +#if (defined _MSC_VER && defined _DLL) || (defined __MINGW32__ && defined DLL_EXPORT) # define DLL_VARIABLE __declspec (dllimport) #else # define DLL_VARIABLE diff --git a/gettext-tools/configure b/gettext-tools/configure index 5252cdf5a..0ee21c760 100755 --- a/gettext-tools/configure +++ b/gettext-tools/configure @@ -463,7 +463,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar localedir docdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC GCJ GCJFLAGS HAVE_GCJ BUILDJAVAEXE CPP EGREP HAVE_GCJ_IN_PATH HAVE_JAVAC_IN_PATH HAVE_JIKES_IN_PATH JAVAC CLASSPATH CLASSPATH_SEPARATOR HAVE_GCJ_C HAVE_JAVAC HAVE_JIKES JAR BUILDJAVA HAVE_GIJ_IN_PATH HAVE_JAVA_IN_PATH HAVE_JRE_IN_PATH HAVE_JVIEW_IN_PATH JAVA HAVE_GIJ HAVE_JAVA HAVE_JRE HAVE_JVIEW TESTJAVA CSHARP_CHOICE HAVE_CSCC_IN_PATH HAVE_MCS_IN_PATH HAVE_CSC_IN_PATH HAVE_CSCC HAVE_MCS HAVE_CSC BUILDCSHARP HAVE_ILRUN_IN_PATH HAVE_MONO_IN_PATH MONO_PATH MONO_PATH_SEPARATOR HAVE_ILRUN HAVE_MONO TESTCSHARP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LTNOUNDEF RELOCATABLE LIBOBJS SET_RELOCATABLE RELOCATABLE_VIA_LD_TRUE RELOCATABLE_VIA_LD_FALSE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC2 CFLAG_VISIBILITY HAVE_VISIBILITY ALLOCA GLIBC21 INTL_MACOSX_LIBS LIBPTH LTLIBPTH LIBTHREAD LTLIBTHREAD LIBMULTITHREAD LTLIBMULTITHREAD HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB STDBOOL_H HAVE__BOOL ALLOCA_H FNMATCH_H GETOPT_H LIBGREPOBJS MINGW_TRUE MINGW_FALSE LIBEXPAT LTLIBEXPAT HAVE_LIBEXPAT EMACS EMACSLOADPATH lispdir aclocaldir DVIPS TEXI2PDF PERL CROSS_COMPILING LOCALE_FR LOCALE_FR_UTF8 TESTLIBASPRINTF LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar localedir docdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC JAVA_CHOICE GCJ GCJFLAGS HAVE_GCJ BUILDJAVAEXE CPP EGREP HAVE_GCJ_IN_PATH HAVE_JAVAC_IN_PATH HAVE_JIKES_IN_PATH JAVAC CLASSPATH CLASSPATH_SEPARATOR HAVE_GCJ_C HAVE_JAVAC HAVE_JIKES JAR BUILDJAVA HAVE_GIJ_IN_PATH HAVE_JAVA_IN_PATH HAVE_JRE_IN_PATH HAVE_JVIEW_IN_PATH JAVA HAVE_GIJ HAVE_JAVA HAVE_JRE HAVE_JVIEW TESTJAVA CSHARP_CHOICE HAVE_CSCC_IN_PATH HAVE_MCS_IN_PATH HAVE_CSC_IN_PATH HAVE_CSCC HAVE_MCS HAVE_CSC BUILDCSHARP HAVE_ILRUN_IN_PATH HAVE_MONO_IN_PATH MONO_PATH MONO_PATH_SEPARATOR HAVE_ILRUN HAVE_MONO TESTCSHARP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LTNOUNDEF RELOCATABLE LIBOBJS SET_RELOCATABLE RELOCATABLE_VIA_LD_TRUE RELOCATABLE_VIA_LD_FALSE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC2 CFLAG_VISIBILITY HAVE_VISIBILITY ALLOCA GLIBC21 INTL_MACOSX_LIBS LIBPTH LTLIBPTH LIBTHREAD LTLIBTHREAD LIBMULTITHREAD LTLIBMULTITHREAD HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB STDBOOL_H HAVE__BOOL ALLOCA_H FNMATCH_H GETOPT_H LIBGREPOBJS BYTESWAP_H MINGW_TRUE MINGW_FALSE LIBEXPAT LTLIBEXPAT HAVE_LIBEXPAT EMACS EMACSLOADPATH lispdir aclocaldir DVIPS TEXI2PDF PERL CROSS_COMPILING LOCALE_FR LOCALE_FR_UTF8 TESTLIBASPRINTF LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1041,6 +1041,8 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors + --disable-java do not build Java sources + --disable-native-java do not compile Java to native executables --enable-csharp[=IMPL] choose preferred C# implementation (pnet or mono) --enable-shared[=PKGS] build shared libraries [default=yes] @@ -1078,6 +1080,7 @@ Optional Packages: --with-libexpat-prefix[=DIR] search for libexpat in DIR/include and DIR/lib --without-libexpat-prefix don't search for libexpat in includedir and libdir --with-lispdir override the default lisp directory + --without-emacs do not use Emacs, don't install po-mode Some influential environment variables: CC C compiler command @@ -3210,6 +3213,28 @@ test -n "$YACC" || YACC="yacc" + echo "$as_me:$LINENO: checking whether to use Java" >&5 +echo $ECHO_N "checking whether to use Java... $ECHO_C" >&6 + # Check whether --enable-java or --disable-java was given. +if test "${enable_java+set}" = set; then + enableval="$enable_java" + JAVA_CHOICE="$enableval" +else + JAVA_CHOICE=yes +fi; + echo "$as_me:$LINENO: result: $JAVA_CHOICE" >&5 +echo "${ECHO_T}$JAVA_CHOICE" >&6 + if test "$JAVA_CHOICE" = yes; then + # Check whether --enable-native-java or --disable-native-java was given. +if test "${enable_native_java+set}" = set; then + enableval="$enable_native_java" + test "$enableval" != no || JAVA_CHOICE=bytecode +fi; + fi + + + + @@ -3307,7 +3332,7 @@ echo "${ECHO_T}$GCJ" >&6 -if test -n "$HAVE_GCJ"; then +if test -n "$HAVE_GCJ" && test "$JAVA_CHOICE" = yes; then BUILDJAVAEXE=yes else BUILDJAVAEXE=no @@ -3790,7 +3815,7 @@ else echo "${ECHO_T}no" >&6 fi -if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then +if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then BUILDJAVA=yes else BUILDJAVA=no @@ -5491,7 +5516,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5494 "configure"' > conftest.$ac_ext + echo '#line 5519 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6839,7 +6864,7 @@ fi # Provide some information about the compiler. -echo "$as_me:6842:" \ +echo "$as_me:6867:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -7912,11 +7937,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7915: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7940: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7919: \$? = $ac_status" >&5 + echo "$as_me:7944: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -8170,11 +8195,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8173: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8198: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8177: \$? = $ac_status" >&5 + echo "$as_me:8202: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -8230,11 +8255,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8233: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8258: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8237: \$? = $ac_status" >&5 + echo "$as_me:8262: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10431,7 +10456,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12782: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12761: \$? = $ac_status" >&5 + echo "$as_me:12786: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12814,11 +12839,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12817: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12842: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12821: \$? = $ac_status" >&5 + echo "$as_me:12846: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14178,7 +14203,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:15162: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15141: \$? = $ac_status" >&5 + echo "$as_me:15166: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15194,11 +15219,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15197: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15222: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15201: \$? = $ac_status" >&5 + echo "$as_me:15226: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17255,11 +17280,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17258: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17283: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17262: \$? = $ac_status" >&5 + echo "$as_me:17287: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -17513,11 +17538,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17516: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17541: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17520: \$? = $ac_status" >&5 + echo "$as_me:17545: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -17573,11 +17598,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17576: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17601: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17580: \$? = $ac_status" >&5 + echo "$as_me:17605: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19774,7 +19799,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include int main () { @@ -32796,246 +32822,7 @@ esac fi - - - -for ac_func in strcasecmp -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -else - case $LIBOBJS in - "$ac_func.$ac_objext" | \ - *" $ac_func.$ac_objext" | \ - "$ac_func.$ac_objext "* | \ - *" $ac_func.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; -esac - -fi -done - - - if test $ac_cv_func_strcasecmp = no; then - - : - - fi - - - -for ac_func in strncasecmp -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -else - case $LIBOBJS in - "$ac_func.$ac_objext" | \ - *" $ac_func.$ac_objext" | \ - "$ac_func.$ac_objext "* | \ - *" $ac_func.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; -esac - -fi -done - - - if test $ac_cv_func_strncasecmp = no; then - - : - - fi - - +gl_STRCASE for ac_func in isascii @@ -40902,6 +40689,394 @@ done +for ac_header in byteswap.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + + BYTESWAP_H='' + +else + + BYTESWAP_H='byteswap.h' + +fi + +done + + + +echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 +if test "${ac_cv_c_bigendian+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # See if sys/param.h defines the BYTE_ORDER macro. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include + +int +main () +{ +#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN + bogus endian macros +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + # It does; now see whether it defined to BIG_ENDIAN or not. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include + +int +main () +{ +#if BYTE_ORDER != BIG_ENDIAN + not big endian +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_bigendian=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_c_bigendian=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +# It does not; compile a test program. +if test "$cross_compiling" = yes; then + # try to guess the endianness by grepping values into an object file + ac_cv_c_bigendian=unknown + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } +short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; +void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } +int +main () +{ + _ascii (); _ebcdic (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then + ac_cv_c_bigendian=yes +fi +if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi +fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int +main () +{ + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long l; + char c[sizeof (long)]; + } u; + u.l = 1; + exit (u.c[sizeof (long) - 1] == 1); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_bigendian=no +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_c_bigendian=yes +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +echo "${ECHO_T}$ac_cv_c_bigendian" >&6 +case $ac_cv_c_bigendian in + yes) + endianness=1 ;; + no) + endianness=0 ;; + *) + echo "AC-C-BIGENDIAN fails to work on your system." | sed -e 's,-,_,g' 1>&2 + echo "Please report this as a bug to bug-autoconf@gnu.org" 1>&2 + exit 1 ;; +esac + + +cat >>confdefs.h <<_ACEOF +#define ENDIANNESS $endianness +_ACEOF + + + for ac_header in arpa/inet.h do @@ -41847,6 +42022,23 @@ fi; +# Check whether --with-emacs or --without-emacs was given. +if test "${with_emacs+set}" = set; then + withval="$with_emacs" + gt_use_emacs=$withval +else + gt_use_emacs=yes +fi; +if test "$EMACS" != no; then + echo "$as_me:$LINENO: checking whether Emacs support is requested" >&5 +echo $ECHO_N "checking whether Emacs support is requested... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $gt_use_emacs" >&5 +echo "${ECHO_T}$gt_use_emacs" >&6 + if test "$gt_use_emacs" = no; then + EMACS=no + fi +fi + aclocaldir='${datadir}/aclocal' @@ -42891,7 +43083,7 @@ cat >>$CONFIG_STATUS <<_ACEOF AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" # Capture the value of obsolete ALL_LINGUAS because we need it to compute # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it - # from automake. + # from automake < 1.5. eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' # Capture the value of LINGUAS because we need it to compute CATALOGS. LINGUAS="${LINGUAS-%UNSET%}" @@ -43059,6 +43251,7 @@ s,@CCDEPMODE@,$CCDEPMODE,;t t s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t s,@YACC@,$YACC,;t t +s,@JAVA_CHOICE@,$JAVA_CHOICE,;t t s,@GCJ@,$GCJ,;t t s,@GCJFLAGS@,$GCJFLAGS,;t t s,@HAVE_GCJ@,$HAVE_GCJ,;t t @@ -43181,6 +43374,7 @@ s,@ALLOCA_H@,$ALLOCA_H,;t t s,@FNMATCH_H@,$FNMATCH_H,;t t s,@GETOPT_H@,$GETOPT_H,;t t s,@LIBGREPOBJS@,$LIBGREPOBJS,;t t +s,@BYTESWAP_H@,$BYTESWAP_H,;t t s,@MINGW_TRUE@,$MINGW_TRUE,;t t s,@MINGW_FALSE@,$MINGW_FALSE,;t t s,@LIBEXPAT@,$LIBEXPAT,;t t @@ -43451,6 +43645,7 @@ s,@INSTALL@,$ac_INSTALL,;t t intl/Makefile ) # Change srcdir variable so that it points to ../gettext-runtime/intl. sed -e 's|^srcdir =.*$|srcdir = $(top_srcdir)/../gettext-runtime/intl|' \ + -e 's|^VPATH =.*$||' \ < intl/Makefile > intl/Makefile.tmp mv intl/Makefile.tmp intl/Makefile ;; @@ -43581,7 +43776,7 @@ x sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`" ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` fi - # Hide the ALL_LINGUAS assigment from automake. + # Hide the ALL_LINGUAS assigment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' # Compute POFILES # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) @@ -44184,11 +44379,12 @@ done test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake. + # Hide the ALL_LINGUAS assigment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # The set of available languages was given in configure.in. + # Hide the ALL_LINGUAS assigment from automake < 1.5. eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi # Compute POFILES diff --git a/gettext-tools/doc/Makefile.in b/gettext-tools/doc/Makefile.in index 6f134c2f2..6855208c3 100644 --- a/gettext-tools/doc/Makefile.in +++ b/gettext-tools/doc/Makefile.in @@ -75,7 +75,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \ - $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/byteswap.m4 \ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \ @@ -84,19 +84,19 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/m4/gcj.m4 $(top_srcdir)/m4/getline.m4 \ $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostname.m4 \ - $(top_srcdir)/m4/javacomp.m4 $(top_srcdir)/m4/javaexec.m4 \ - $(top_srcdir)/m4/libgrep.m4 $(top_srcdir)/m4/locale-fr.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/onceonly.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/quote.m4 \ - $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/relocatable.m4 \ - $(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ - $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/m4/signalblocking.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/javacomp.m4 \ + $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/libgrep.m4 \ + $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbswidth.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/restrict.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \ + $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stpncpy.m4 \ $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoul.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \ @@ -145,6 +145,7 @@ BUILDCSHARP = @BUILDCSHARP@ BUILDJAVA = @BUILDJAVA@ BUILDJAVAEXE = @BUILDJAVAEXE@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BYTESWAP_H = @BYTESWAP_H@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -234,6 +235,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVA = @JAVA@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBEXPAT = @LIBEXPAT@ LIBGREPOBJS = @LIBGREPOBJS@ diff --git a/gettext-tools/examples/Makefile.in b/gettext-tools/examples/Makefile.in index d09acb3df..7ed5a8b31 100644 --- a/gettext-tools/examples/Makefile.in +++ b/gettext-tools/examples/Makefile.in @@ -74,7 +74,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \ - $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/byteswap.m4 \ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \ @@ -83,19 +83,19 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/m4/gcj.m4 $(top_srcdir)/m4/getline.m4 \ $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostname.m4 \ - $(top_srcdir)/m4/javacomp.m4 $(top_srcdir)/m4/javaexec.m4 \ - $(top_srcdir)/m4/libgrep.m4 $(top_srcdir)/m4/locale-fr.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/onceonly.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/quote.m4 \ - $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/relocatable.m4 \ - $(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ - $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/m4/signalblocking.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/javacomp.m4 \ + $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/libgrep.m4 \ + $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbswidth.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/restrict.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \ + $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stpncpy.m4 \ $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoul.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \ @@ -143,6 +143,7 @@ BUILDCSHARP = @BUILDCSHARP@ BUILDJAVA = @BUILDJAVA@ BUILDJAVAEXE = @BUILDJAVAEXE@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BYTESWAP_H = @BYTESWAP_H@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -227,6 +228,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVA = @JAVA@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBEXPAT = @LIBEXPAT@ LIBGREPOBJS = @LIBGREPOBJS@ diff --git a/gettext-tools/examples/po/Makefile.in b/gettext-tools/examples/po/Makefile.in index f76437a44..6747f7d61 100644 --- a/gettext-tools/examples/po/Makefile.in +++ b/gettext-tools/examples/po/Makefile.in @@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-runtime/m4/inttypes.m4 \ $(top_srcdir)/../gettext-runtime/m4/inttypes_h.m4 \ $(top_srcdir)/../gettext-runtime/m4/lcmessage.m4 \ + $(top_srcdir)/../gettext-runtime/m4/lock.m4 \ $(top_srcdir)/../gettext-runtime/m4/longdouble.m4 \ $(top_srcdir)/../gettext-runtime/m4/longlong.m4 \ $(top_srcdir)/../gettext-runtime/m4/nls.m4 \ @@ -66,11 +67,12 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-runtime/m4/stdint_h.m4 \ $(top_srcdir)/../gettext-runtime/m4/uintmax_t.m4 \ $(top_srcdir)/../gettext-runtime/m4/ulonglong.m4 \ + $(top_srcdir)/../gettext-runtime/m4/visibility.m4 \ $(top_srcdir)/../gettext-runtime/m4/wchar_t.m4 \ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \ - $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/byteswap.m4 \ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \ @@ -79,19 +81,19 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/m4/gcj.m4 $(top_srcdir)/m4/getline.m4 \ $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostname.m4 \ - $(top_srcdir)/m4/javacomp.m4 $(top_srcdir)/m4/javaexec.m4 \ - $(top_srcdir)/m4/libgrep.m4 $(top_srcdir)/m4/locale-fr.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/onceonly.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/quote.m4 \ - $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/relocatable.m4 \ - $(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ - $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/m4/signalblocking.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/javacomp.m4 \ + $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/libgrep.m4 \ + $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbswidth.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/restrict.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \ + $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stpncpy.m4 \ $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoul.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \ @@ -121,10 +123,12 @@ BUILDCSHARP = @BUILDCSHARP@ BUILDJAVA = @BUILDJAVA@ BUILDJAVAEXE = @BUILDJAVAEXE@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BYTESWAP_H = @BYTESWAP_H@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAG_VISIBILITY = @CFLAG_VISIBILITY@ CLASSPATH = @CLASSPATH@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@ CPP = @CPP@ @@ -188,6 +192,7 @@ HAVE_MONO = @HAVE_MONO@ HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ HAVE_SNPRINTF = @HAVE_SNPRINTF@ +HAVE_VISIBILITY = @HAVE_VISIBILITY@ HAVE_WPRINTF = @HAVE_WPRINTF@ HAVE__BOOL = @HAVE__BOOL@ INSTALL_DATA = @INSTALL_DATA@ @@ -203,13 +208,17 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVA = @JAVA@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBEXPAT = @LIBEXPAT@ LIBGREPOBJS = @LIBGREPOBJS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ +LIBPTH = @LIBPTH@ LIBS = @LIBS@ +LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_FR = @LOCALE_FR@ @@ -217,8 +226,14 @@ LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ LTLIBEXPAT = @LTLIBEXPAT@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ +LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ +LTLIBPTH = @LTLIBPTH@ +LTLIBTHREAD = @LTLIBTHREAD@ +LTNOUNDEF = @LTNOUNDEF@ MAKEINFO = @MAKEINFO@ +MINGW_FALSE = @MINGW_FALSE@ +MINGW_TRUE = @MINGW_TRUE@ MKINSTALLDIRS = @MKINSTALLDIRS@ MONO_PATH = @MONO_PATH@ MONO_PATH_SEPARATOR = @MONO_PATH_SEPARATOR@ diff --git a/gettext-tools/lib/Makefile.in b/gettext-tools/lib/Makefile.in index 3a688c4df..4d2456b8e 100644 --- a/gettext-tools/lib/Makefile.in +++ b/gettext-tools/lib/Makefile.in @@ -47,9 +47,8 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/javaexec.sh.in ChangeLog atexit.c canonicalize.c \ error.c error.h fnmatch.c getline.c getndelim2.c getopt.c \ getopt1.c memmove.c memset.c mkdtemp.c readlink.c \ - relocatable.c setenv.c stpcpy.c stpncpy.c strcasecmp.c \ - strcspn.c strerror.c strncasecmp.c strpbrk.c strstr.c \ - strtoul.c unsetenv.c vasprintf.c + relocatable.c setenv.c stpcpy.c stpncpy.c strcspn.c strerror.c \ + strpbrk.c strstr.c strtoul.c unsetenv.c vasprintf.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../m4/libtool.m4 \ @@ -85,7 +84,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \ - $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/byteswap.m4 \ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \ @@ -94,19 +93,19 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/m4/gcj.m4 $(top_srcdir)/m4/getline.m4 \ $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostname.m4 \ - $(top_srcdir)/m4/javacomp.m4 $(top_srcdir)/m4/javaexec.m4 \ - $(top_srcdir)/m4/libgrep.m4 $(top_srcdir)/m4/locale-fr.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/onceonly.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/quote.m4 \ - $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/relocatable.m4 \ - $(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ - $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/m4/signalblocking.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/javacomp.m4 \ + $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/libgrep.m4 \ + $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbswidth.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/restrict.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \ + $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stpncpy.m4 \ $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoul.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \ @@ -178,6 +177,7 @@ BUILDCSHARP = @BUILDCSHARP@ BUILDJAVA = @BUILDJAVA@ BUILDJAVAEXE = @BUILDJAVAEXE@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BYTESWAP_H = @BYTESWAP_H@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -263,6 +263,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVA = @JAVA@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBEXPAT = @LIBEXPAT@ LIBGREPOBJS = @LIBGREPOBJS@ @@ -382,9 +383,9 @@ AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies # Woe32 support. EXTRA_DIST = $(LIBADD_SOURCE) $(UNUSED_SOURCE) relocwrapper.c \ allocsa.valgrind gen-lbrkprop.c 3level.h Combining.txt \ - ChangeLog.0 stdbool_.h alloca_.h fnmatch_.h fnmatch_loop.c \ - getopt_.h getopt_int.h config.charset ref-add.sin ref-del.sin \ - Makefile.vms Makefile.msvc + ChangeLog.0 stdbool_.h alloca_.h byteswap_.h fnmatch_.h \ + fnmatch_loop.c getopt_.h getopt_int.h config.charset \ + ref-add.sin ref-del.sin Makefile.vms Makefile.msvc # >>> gnulib module stdbool. # <<< gnulib module stdbool. @@ -392,12 +393,16 @@ EXTRA_DIST = $(LIBADD_SOURCE) $(UNUSED_SOURCE) relocwrapper.c \ # >>> gnulib module alloca. # <<< gnulib module alloca. +# >>> gnulib module byteswap. +# <<< gnulib module byteswap. + # >>> gnulib module fnmatch. # <<< gnulib module fnmatch. # >>> gnulib module getopt. -BUILT_SOURCES = $(STDBOOL_H) $(ALLOCA_H) $(FNMATCH_H) $(GETOPT_H) -MOSTLYCLEANFILES = stdbool.h alloca.h fnmatch.h getopt.h +BUILT_SOURCES = $(STDBOOL_H) $(ALLOCA_H) $(BYTESWAP_H) $(FNMATCH_H) \ + $(GETOPT_H) +MOSTLYCLEANFILES = stdbool.h alloca.h byteswap.h fnmatch.h getopt.h CLEANFILES = charset.alias ref-add.sed ref-del.sed DISTCLEANFILES = SUFFIXES = .sed .sin @@ -446,7 +451,6 @@ LIBADD_SOURCE = \ setenv.h setenv.c unsetenv.c \ stpcpy.h stpcpy.c \ stpncpy.h stpncpy.c \ - strcase.h strcasecmp.c strncasecmp.c \ strcspn.c \ strerror.c \ strpbrk.h strpbrk.c \ @@ -813,6 +817,12 @@ stdbool.h: stdbool_.h alloca.h: alloca_.h cp $(srcdir)/alloca_.h alloca.h +# We need the following in order to create when the system +# doesn't have one. +byteswap.h: byteswap_.h + cp $(srcdir)/$< $@-t + mv $@-t $@ + # The following is needed in order to create an when the system # doesn't have one that works. fnmatch.h: fnmatch_.h diff --git a/gettext-tools/libgrep/Makefile.in b/gettext-tools/libgrep/Makefile.in index 3654f3b8c..8b7da8959 100644 --- a/gettext-tools/libgrep/Makefile.in +++ b/gettext-tools/libgrep/Makefile.in @@ -75,7 +75,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \ - $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/byteswap.m4 \ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \ @@ -84,19 +84,19 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/m4/gcj.m4 $(top_srcdir)/m4/getline.m4 \ $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostname.m4 \ - $(top_srcdir)/m4/javacomp.m4 $(top_srcdir)/m4/javaexec.m4 \ - $(top_srcdir)/m4/libgrep.m4 $(top_srcdir)/m4/locale-fr.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/onceonly.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/quote.m4 \ - $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/relocatable.m4 \ - $(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ - $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/m4/signalblocking.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/javacomp.m4 \ + $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/libgrep.m4 \ + $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbswidth.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/restrict.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \ + $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stpncpy.m4 \ $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoul.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \ @@ -146,6 +146,7 @@ BUILDCSHARP = @BUILDCSHARP@ BUILDJAVA = @BUILDJAVA@ BUILDJAVAEXE = @BUILDJAVAEXE@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BYTESWAP_H = @BYTESWAP_H@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -230,6 +231,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVA = @JAVA@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBEXPAT = @LIBEXPAT@ LIBGREPOBJS = @LIBGREPOBJS@ diff --git a/gettext-tools/libuniname/Makefile.in b/gettext-tools/libuniname/Makefile.in index 8edf99985..8f56f09a5 100644 --- a/gettext-tools/libuniname/Makefile.in +++ b/gettext-tools/libuniname/Makefile.in @@ -77,7 +77,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \ - $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/byteswap.m4 \ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \ @@ -86,19 +86,19 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/m4/gcj.m4 $(top_srcdir)/m4/getline.m4 \ $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostname.m4 \ - $(top_srcdir)/m4/javacomp.m4 $(top_srcdir)/m4/javaexec.m4 \ - $(top_srcdir)/m4/libgrep.m4 $(top_srcdir)/m4/locale-fr.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/onceonly.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/quote.m4 \ - $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/relocatable.m4 \ - $(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ - $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/m4/signalblocking.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/javacomp.m4 \ + $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/libgrep.m4 \ + $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbswidth.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/restrict.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \ + $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stpncpy.m4 \ $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoul.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \ @@ -151,6 +151,7 @@ BUILDCSHARP = @BUILDCSHARP@ BUILDJAVA = @BUILDJAVA@ BUILDJAVAEXE = @BUILDJAVAEXE@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BYTESWAP_H = @BYTESWAP_H@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -235,6 +236,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVA = @JAVA@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBEXPAT = @LIBEXPAT@ LIBGREPOBJS = @LIBGREPOBJS@ diff --git a/gettext-tools/m4/Makefile.in b/gettext-tools/m4/Makefile.in index dcc2d2e53..e3234884e 100644 --- a/gettext-tools/m4/Makefile.in +++ b/gettext-tools/m4/Makefile.in @@ -76,7 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \ - $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/byteswap.m4 \ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \ @@ -85,19 +85,19 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/m4/gcj.m4 $(top_srcdir)/m4/getline.m4 \ $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostname.m4 \ - $(top_srcdir)/m4/javacomp.m4 $(top_srcdir)/m4/javaexec.m4 \ - $(top_srcdir)/m4/libgrep.m4 $(top_srcdir)/m4/locale-fr.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/onceonly.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/quote.m4 \ - $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/relocatable.m4 \ - $(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ - $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/m4/signalblocking.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/javacomp.m4 \ + $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/libgrep.m4 \ + $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbswidth.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/restrict.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \ + $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stpncpy.m4 \ $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoul.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \ @@ -138,6 +138,7 @@ BUILDCSHARP = @BUILDCSHARP@ BUILDJAVA = @BUILDJAVA@ BUILDJAVAEXE = @BUILDJAVAEXE@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BYTESWAP_H = @BYTESWAP_H@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -222,6 +223,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVA = @JAVA@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBEXPAT = @LIBEXPAT@ LIBGREPOBJS = @LIBGREPOBJS@ @@ -378,6 +380,7 @@ EXTRA_DIST = README ChangeLog.0 csharpexec-test.exe \ alloca.m4 \ allocsa.m4 \ backupfile.m4 \ +byteswap.m4 \ canonicalize.m4 \ csharp.m4 \ csharpcomp.m4 \ @@ -394,6 +397,7 @@ getndelim2.m4 \ getopt.m4 \ hard-locale.m4 \ hostname.m4 \ +java.m4 \ javacomp.m4 \ javaexec.m4 \ locale-fr.m4 \ @@ -418,7 +422,6 @@ signalblocking.m4 \ ssize_t.m4 \ stdbool.m4 \ stpncpy.m4 \ -strcase.m4 \ strdup.m4 \ strerror.m4 \ strerror_r.m4 \ diff --git a/gettext-tools/man/Makefile.in b/gettext-tools/man/Makefile.in index 57abe4279..646a1ca16 100644 --- a/gettext-tools/man/Makefile.in +++ b/gettext-tools/man/Makefile.in @@ -73,7 +73,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \ - $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/byteswap.m4 \ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \ @@ -82,19 +82,19 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/m4/gcj.m4 $(top_srcdir)/m4/getline.m4 \ $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostname.m4 \ - $(top_srcdir)/m4/javacomp.m4 $(top_srcdir)/m4/javaexec.m4 \ - $(top_srcdir)/m4/libgrep.m4 $(top_srcdir)/m4/locale-fr.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/onceonly.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/quote.m4 \ - $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/relocatable.m4 \ - $(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ - $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/m4/signalblocking.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/javacomp.m4 \ + $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/libgrep.m4 \ + $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbswidth.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/restrict.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \ + $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stpncpy.m4 \ $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoul.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \ @@ -128,6 +128,7 @@ BUILDCSHARP = @BUILDCSHARP@ BUILDJAVA = @BUILDJAVA@ BUILDJAVAEXE = @BUILDJAVAEXE@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BYTESWAP_H = @BYTESWAP_H@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -212,6 +213,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVA = @JAVA@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBEXPAT = @LIBEXPAT@ LIBGREPOBJS = @LIBGREPOBJS@ diff --git a/gettext-tools/misc/Makefile.in b/gettext-tools/misc/Makefile.in index 92b0e4f43..af8cda52d 100644 --- a/gettext-tools/misc/Makefile.in +++ b/gettext-tools/misc/Makefile.in @@ -76,7 +76,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \ - $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/byteswap.m4 \ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \ @@ -85,19 +85,19 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/m4/gcj.m4 $(top_srcdir)/m4/getline.m4 \ $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostname.m4 \ - $(top_srcdir)/m4/javacomp.m4 $(top_srcdir)/m4/javaexec.m4 \ - $(top_srcdir)/m4/libgrep.m4 $(top_srcdir)/m4/locale-fr.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/onceonly.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/quote.m4 \ - $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/relocatable.m4 \ - $(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ - $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/m4/signalblocking.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/javacomp.m4 \ + $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/libgrep.m4 \ + $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbswidth.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/restrict.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \ + $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stpncpy.m4 \ $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoul.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \ @@ -145,6 +145,7 @@ BUILDCSHARP = @BUILDCSHARP@ BUILDJAVA = @BUILDJAVA@ BUILDJAVAEXE = @BUILDJAVAEXE@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BYTESWAP_H = @BYTESWAP_H@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -229,6 +230,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVA = @JAVA@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBEXPAT = @LIBEXPAT@ LIBGREPOBJS = @LIBGREPOBJS@ diff --git a/gettext-tools/projects/Makefile.in b/gettext-tools/projects/Makefile.in index 1d841b7c0..4464e29aa 100644 --- a/gettext-tools/projects/Makefile.in +++ b/gettext-tools/projects/Makefile.in @@ -71,7 +71,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \ - $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/byteswap.m4 \ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \ @@ -80,19 +80,19 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/m4/gcj.m4 $(top_srcdir)/m4/getline.m4 \ $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostname.m4 \ - $(top_srcdir)/m4/javacomp.m4 $(top_srcdir)/m4/javaexec.m4 \ - $(top_srcdir)/m4/libgrep.m4 $(top_srcdir)/m4/locale-fr.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/onceonly.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/quote.m4 \ - $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/relocatable.m4 \ - $(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ - $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/m4/signalblocking.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/javacomp.m4 \ + $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/libgrep.m4 \ + $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbswidth.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/restrict.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \ + $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stpncpy.m4 \ $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoul.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \ @@ -123,6 +123,7 @@ BUILDCSHARP = @BUILDCSHARP@ BUILDJAVA = @BUILDJAVA@ BUILDJAVAEXE = @BUILDJAVAEXE@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BYTESWAP_H = @BYTESWAP_H@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -207,6 +208,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVA = @JAVA@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBEXPAT = @LIBEXPAT@ LIBGREPOBJS = @LIBGREPOBJS@ diff --git a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in index fbb688597..b49e71780 100644 --- a/gettext-tools/src/Makefile.in +++ b/gettext-tools/src/Makefile.in @@ -83,7 +83,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \ - $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/byteswap.m4 \ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \ @@ -92,19 +92,19 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/m4/gcj.m4 $(top_srcdir)/m4/getline.m4 \ $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostname.m4 \ - $(top_srcdir)/m4/javacomp.m4 $(top_srcdir)/m4/javaexec.m4 \ - $(top_srcdir)/m4/libgrep.m4 $(top_srcdir)/m4/locale-fr.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/onceonly.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/quote.m4 \ - $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/relocatable.m4 \ - $(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ - $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/m4/signalblocking.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/javacomp.m4 \ + $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/libgrep.m4 \ + $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbswidth.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/restrict.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \ + $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stpncpy.m4 \ $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoul.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \ @@ -328,6 +328,7 @@ BUILDCSHARP = @BUILDCSHARP@ BUILDJAVA = @BUILDJAVA@ BUILDJAVAEXE = @BUILDJAVAEXE@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BYTESWAP_H = @BYTESWAP_H@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -421,6 +422,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVA = @JAVA@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBEXPAT = @LIBEXPAT@ LIBGREPOBJS = @LIBGREPOBJS@ diff --git a/gettext-tools/tests/Makefile.in b/gettext-tools/tests/Makefile.in index d7cc10280..c8fbc0100 100644 --- a/gettext-tools/tests/Makefile.in +++ b/gettext-tools/tests/Makefile.in @@ -80,7 +80,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/../gettext-runtime/m4/wint_t.m4 \ $(top_srcdir)/../gettext-runtime/m4/xsize.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/allocsa.m4 \ - $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/byteswap.m4 \ $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/csharp.m4 \ $(top_srcdir)/m4/csharpcomp.m4 $(top_srcdir)/m4/csharpexec.m4 \ $(top_srcdir)/m4/eaccess.m4 $(top_srcdir)/m4/eealloc.m4 \ @@ -89,19 +89,19 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \ $(top_srcdir)/m4/gcj.m4 $(top_srcdir)/m4/getline.m4 \ $(top_srcdir)/m4/getndelim2.m4 $(top_srcdir)/m4/getopt.m4 \ $(top_srcdir)/m4/hard-locale.m4 $(top_srcdir)/m4/hostname.m4 \ - $(top_srcdir)/m4/javacomp.m4 $(top_srcdir)/m4/javaexec.m4 \ - $(top_srcdir)/m4/libgrep.m4 $(top_srcdir)/m4/locale-fr.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/mbswidth.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/onceonly.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/quote.m4 \ - $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/relocatable.m4 \ - $(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/setlocale.m4 $(top_srcdir)/m4/sig_atomic_t.m4 \ - $(top_srcdir)/m4/siginfo.m4 $(top_srcdir)/m4/signalblocking.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stpncpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/javacomp.m4 \ + $(top_srcdir)/m4/javaexec.m4 $(top_srcdir)/m4/libgrep.m4 \ + $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbswidth.m4 \ + $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/restrict.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/setlocale.m4 \ + $(top_srcdir)/m4/sig_atomic_t.m4 $(top_srcdir)/m4/siginfo.m4 \ + $(top_srcdir)/m4/signalblocking.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stpncpy.m4 \ $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoul.m4 \ $(top_srcdir)/m4/tmpdir.m4 $(top_srcdir)/m4/unionwait.m4 \ @@ -199,6 +199,7 @@ BUILDCSHARP = @BUILDCSHARP@ BUILDJAVA = @BUILDJAVA@ BUILDJAVAEXE = @BUILDJAVAEXE@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +BYTESWAP_H = @BYTESWAP_H@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -283,6 +284,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ JAR = @JAR@ JAVA = @JAVA@ JAVAC = @JAVAC@ +JAVA_CHOICE = @JAVA_CHOICE@ LDFLAGS = @LDFLAGS@ LIBEXPAT = @LIBEXPAT@ LIBGREPOBJS = @LIBGREPOBJS@