# $Product: gettext $ $Id$

diff -Naurd ../gettext-0.14.1/gettext-tools/lib/getopt.c ./gettext-tools/lib/getopt.c
--- ../gettext-0.14.1/gettext-tools/lib/getopt.c	Tue Nov  5 15:53:48 2002
+++ ./gettext-tools/lib/getopt.c	Tue Mar  9 12:27:31 2004
@@ -57,6 +57,10 @@
 # endif
 #endif
 
+#ifdef __MINGW32__
+#define ELIDE_CODE
+#endif
+
 #ifndef ELIDE_CODE
 
 
diff -Naurd ../gettext-0.14.1/gettext-tools/lib/getopt1.c ./gettext-tools/lib/getopt1.c
--- ../gettext-0.14.1/gettext-tools/lib/getopt1.c	Wed Sep 25 15:19:24 2002
+++ ./gettext-tools/lib/getopt1.c	Tue Mar  9 12:27:31 2004
@@ -54,6 +54,10 @@
 #endif
 #endif
 
+#ifdef __MINGW32__
+#define ELIDE_CODE
+#endif
+
 #ifndef ELIDE_CODE
 
 
diff -Naurd ../gettext-0.14.1/gettext-tools/lib/Makefile.am ./gettext-tools/lib/Makefile.am
--- ../gettext-0.14.1/gettext-tools/lib/Makefile.am	Thu Jan  8 11:26:34 2004
+++ ./gettext-tools/lib/Makefile.am	Tue Mar  9 12:27:31 2004
@@ -110,13 +110,17 @@
 
 # How to build libgettextlib.la.
 
+if OS_WIN32
+export_symbols = -export-symbols ../windows/gettextlib.def
+endif
+
 libgettextlib_la_LIBADD = @LTLIBOBJS@
 
 # Need @LTLIBINTL@ because many source files use gettext().
 # Need @LTLIBICONV@ because linebreak.c uses iconv().
 libgettextlib_la_LDFLAGS = \
   -release @VERSION@ \
-  @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
+  @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined $(export_symbols)
 
 # No need to install libgettextlib.a.
 install-exec-local: install-libLTLIBRARIES install-exec-clean
diff -Naurd ../gettext-0.14.1/gettext-tools/src/Makefile.am ./gettext-tools/src/Makefile.am
--- ../gettext-0.14.1/gettext-tools/src/Makefile.am	Fri Jan  9 10:57:03 2004
+++ ./gettext-tools/src/Makefile.am	Tue Mar  9 12:27:31 2004
@@ -144,13 +144,18 @@
 urlget_SOURCES = urlget.c
 
 # How to build libgettextsrc.la.
+
+if OS_WIN32
+export_src_symbols = -export-symbols ../windows/gettextsrc.def
+endif
+
 # Need ../lib/libgettextlib.la.
 # Need @LTLIBINTL@ because many source files use gettext().
 # Need @LTLIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c
 # use iconv().
 libgettextsrc_la_LDFLAGS = \
   -release @VERSION@ \
-  ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
+  ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined $(export_src_symbols)
 
 # No need to install libgettextsrc.a.
 install-exec-local: install-libLTLIBRARIES install-exec-clean
@@ -158,12 +163,17 @@
 	$(RM) $(DESTDIR)$(libdir)/libgettextsrc.a
 
 # How to build libgettextpo.la.
+
+if OS_WIN32
+export_po_symbols = -export-symbols ../windows/gettextpo.def
+endif
+
 # Need libgettextsrc.la.
 # Need ../lib/libgettextlib.la because of xmalloc.
 libgettextpo_la_LDFLAGS = \
   -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
   -rpath $(libdir) \
-  libgettextsrc.la ../lib/libgettextlib.la -lc -no-undefined
+  libgettextsrc.la ../lib/libgettextlib.la -lc -no-undefined $(export_po_symbols)
 # Build order. Only needed for "make -j[N]".
 libgettextpo_la_DEPENDENCIES = libgettextsrc.la
 
diff -Naurd ../gettext-0.14.1/gettext-tools/configure.ac ./gettext-tools/configure.ac
--- ../gettext-0.14.1/gettext-tools/configure.ac	Fri Jan 16 10:49:06 2004
+++ ./gettext-tools/configure.ac	Tue Mar  9 12:27:31 2004
@@ -95,6 +95,16 @@
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
+dnl Check for win32
+case "$host" in
+  *-*-mingw*)
+    os_win32=yes
+    ;;
+  *)
+    os_win32=no
+esac
+AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
+
 AC_RELOCATABLE
 
 dnl Checks for libraries.
diff -Naurd ../gettext-0.14.1/gettext-tools/windows/gettextlib.def ./gettext-tools/windows/gettextlib.def
--- ../gettext-0.14.1/gettext-tools/windows/gettextlib.def	Sun Jan 18 13:51:25 2004
+++ ./gettext-tools/windows/gettextlib.def	Tue Mar  9 13:15:07 2004
@@ -58,6 +58,7 @@
 getopt_long
 get_version
 gnu_basename
+gnu_getline
 gnu_mbswidth
 gnu_stpncpy
 init_hash
@@ -73,18 +74,16 @@
 multiline_warning
 new_classpath
 next_prime
+obstack_free
 optarg
 optind
 path_search
-relocate
+posix_fnmatch
 reset_classpath
-rpl_fnmatch
-rpl_getline
 safe_read
 safe_write
 set_classpath
 set_program_name
-set_program_name_and_installdir
 shell_quote
 shell_quote_argv
 shell_quote_copy
diff -Naurd ../gettext-0.14.1/gettext-tools/windows/gettextsrc.def ./gettext-tools/windows/gettextsrc.def
--- ../gettext-0.14.1/gettext-tools/windows/gettextsrc.def	Sun Jan 18 13:51:25 2004
+++ ./gettext-tools/windows/gettextsrc.def	Tue Mar  9 13:07:01 2004
@@ -11,12 +11,14 @@
 formatstring_java
 formatstring_librep
 formatstring_lisp
+formatstring_objc
 formatstring_parsers
 formatstring_pascal
 formatstring_perl
 formatstring_perl_brace
 formatstring_php
 formatstring_python
+formatstring_qt
 formatstring_sh
 formatstring_smalltalk
 formatstring_tcl
@@ -37,12 +39,10 @@
 po_charset_utf8
 po_gram_lval
 po_lex_charset
-po_lex_iconv
 po_lex_weird_cjk
 use_first
 catenate_msgdomain_list
 compare_po_locale_charsets
-convert_string
 default_constructor
 default_destructor
 default_parse_brief
@@ -120,7 +120,6 @@
 po_callback_message
 po_charset_ascii_compatible
 po_charset_canonicalize
-po_gram_error_at_line
 po_gram_lex
 po_gram_parse
 po_is_charset_weird