Regenerated.

1 files changed, 63 insertions, 39 deletions

diff --git a/gettext-tools/misc/Makefile.in b/gettext-tools/misc/Makefile.in
index af8cda5..3013d62 100644
--- a/gettext-tools/misc/Makefile.in
+++ b/gettext-tools/misc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -44,6 +44,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \
 	$(top_srcdir)/../m4/libtool.m4 \
+	$(top_srcdir)/../m4/woe32-dll.m4 \
 	$(top_srcdir)/../autoconf-lib-link/m4/lib-ld.m4 \
 	$(top_srcdir)/../autoconf-lib-link/m4/lib-link.m4 \
 	$(top_srcdir)/../autoconf-lib-link/m4/lib-prefix.m4 \
@@ -55,8 +56,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/fixautomake.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/iconv.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/intdiv0.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/intmax.m4 \
+	$(top_srcdir)/../gettext-runtime/m4/inttypes-h.m4 \
 	$(top_srcdir)/../gettext-runtime/m4/inttypes-pri.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 \
@@ -76,33 +77,34 @@ 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/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 \
-	$(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exitfail.m4 \
-	$(top_srcdir)/m4/extensions.m4 $(top_srcdir)/m4/fnmatch.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/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/backupfile.m4 $(top_srcdir)/m4/bison-i18n.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 $(top_srcdir)/m4/error.m4 \
+	$(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \
+	$(top_srcdir)/m4/fnmatch.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/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/stdarg.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 \
-	$(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/xreadlink.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \
+	$(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
@@ -141,6 +143,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BISON_LOCALEDIR = @BISON_LOCALEDIR@
 BUILDCSHARP = @BUILDCSHARP@
 BUILDJAVA = @BUILDJAVA@
 BUILDJAVAEXE = @BUILDJAVAEXE@
@@ -153,9 +156,14 @@ CFLAGS = @CFLAGS@
 CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CLASSPATH = @CLASSPATH@
 CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
+CLIX_PATH = @CLIX_PATH@
+CLIX_PATH_VAR = @CLIX_PATH_VAR@
+CONF_JAVA = @CONF_JAVA@
+CONF_JAVAC = @CONF_JAVAC@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CROSS_COMPILING = @CROSS_COMPILING@
+CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@
 CSHARP_CHOICE = @CSHARP_CHOICE@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -185,7 +193,11 @@ GETOPT_H = @GETOPT_H@
 GLIBC2 = @GLIBC2@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_CLIX = @HAVE_CLIX@
+HAVE_CLIX_IN_PATH = @HAVE_CLIX_IN_PATH@
 HAVE_CSC = @HAVE_CSC@
 HAVE_CSCC = @HAVE_CSCC@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
@@ -199,7 +211,9 @@ HAVE_ILRUN = @HAVE_ILRUN@
 HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
 HAVE_JAVA = @HAVE_JAVA@
 HAVE_JAVAC = @HAVE_JAVAC@
+HAVE_JAVAC_ENVVAR = @HAVE_JAVAC_ENVVAR@
 HAVE_JAVAC_IN_PATH = @HAVE_JAVAC_IN_PATH@
+HAVE_JAVA_ENVVAR = @HAVE_JAVA_ENVVAR@
 HAVE_JAVA_IN_PATH = @HAVE_JAVA_IN_PATH@
 HAVE_JIKES = @HAVE_JIKES@
 HAVE_JIKES_IN_PATH = @HAVE_JIKES_IN_PATH@
@@ -228,8 +242,6 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JAR = @JAR@
-JAVA = @JAVA@
-JAVAC = @JAVAC@
 JAVA_CHOICE = @JAVA_CHOICE@
 LDFLAGS = @LDFLAGS@
 LIBEXPAT = @LIBEXPAT@
@@ -254,13 +266,12 @@ 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@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+MSGMERGE_LIBM = @MSGMERGE_LIBM@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -285,20 +296,20 @@ TESTCSHARP = @TESTCSHARP@
 TESTJAVA = @TESTJAVA@
 TESTLIBASPRINTF = @TESTLIBASPRINTF@
 TEXI2PDF = @TEXI2PDF@
+UNISTD_H = @UNISTD_H@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+WOE32DLL = @WOE32DLL@
+WOE32DLL_FALSE = @WOE32DLL_FALSE@
+WOE32DLL_TRUE = @WOE32DLL_TRUE@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 aclocaldir = @aclocaldir@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -316,13 +327,16 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -334,10 +348,13 @@ localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 AUTOMAKE_OPTIONS = 1.2 gnits
@@ -451,9 +468,16 @@ elc-stamp: $(LISP)
 	else : ; fi
 	@mv -f elc-temp $@
 $(am__ELCFILES): elc-stamp
-	@if test ! -f $@; then \
-	  rm -f elc-stamp; \
-	  $(MAKE) $(AM_MAKEFLAGS) elc-stamp; \
+	@if test "$(EMACS)" != no && test ! -f $@; then \
+	  trap 'rm -rf elc-lock elc-stamp' 1 2 13 15; \
+	  if mkdir elc-lock 2>/dev/null; then \
+	    rm -f elc-stamp; \
+	    $(MAKE) $(AM_MAKEFLAGS) elc-stamp; \
+	    rmdir elc-lock; \
+	  else \
+	    while test -d elc-lock; do sleep 1; done; \
+	    test -f elc-stamp; exit $$?; \
+	  fi; \
 	else : ; fi
 install-lispLISP: $(lisp_LISP) $(ELCFILES)
 	@$(NORMAL_INSTALL)