diff -ur pango-1.0.4.orig/modules/arabic/Makefile.am pango-1.0.4/modules/arabic/Makefile.am
--- pango-1.0.4.orig/modules/arabic/Makefile.am	2002-03-07 02:05:04.000000000 +0900
+++ pango-1.0.4/modules/arabic/Makefile.am	2002-09-02 08:33:40.000000000 +0900
@@ -88,13 +88,13 @@
 
 INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS)
 
-pango_arabic_x_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_arabic_x_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_arabic_x_la_LIBADD = $(arabic_x_libadd)
 pango_arabic_x_la_SOURCES = $(x_sources)
 
 libpango_arabic_x_la_SOURCES = $(x_sources)
 
-pango_arabic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_arabic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_arabic_xft_la_LIBADD = $(arabic_xft_libadd)
 pango_arabic_xft_la_SOURCES = $(xft_sources)
 
diff -ur pango-1.0.4.orig/modules/basic/Makefile.am pango-1.0.4/modules/basic/Makefile.am
--- pango-1.0.4.orig/modules/basic/Makefile.am	2002-03-27 08:24:54.000000000 +0900
+++ pango-1.0.4/modules/basic/Makefile.am	2002-09-02 08:33:06.000000000 +0900
@@ -94,12 +94,12 @@
 	$(FREETYPE_CFLAGS)	\
 	$(moddefine)
 
-pango_basic_x_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_basic_x_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_basic_x_la_LIBADD = $(basic_x_libadd)
 pango_basic_x_la_SOURCES = $(basic_sources)
 libpango_basic_x_la_SOURCES = $(basic_sources)
 
-pango_basic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_basic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_basic_xft_la_LIBADD = $(basic_xft_libadd)
 pango_basic_xft_la_SOURCES = basic-xft.c
 libpango_basic_xft_la_SOURCES = basic-xft.c
diff -ur pango-1.0.4.orig/modules/hangul/Makefile.am pango-1.0.4/modules/hangul/Makefile.am
--- pango-1.0.4.orig/modules/hangul/Makefile.am	2002-03-07 02:05:08.000000000 +0900
+++ pango-1.0.4/modules/hangul/Makefile.am	2002-09-02 08:34:44.000000000 +0900
@@ -7,6 +7,10 @@
 pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs)
 pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
+
 if HAVE_X
 if INCLUDE_HANGUL_X
 noinst_LTLIBRARIES = libpango-hangul-x.la
@@ -20,7 +24,7 @@
 
 INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS)
 
-pango_hangul_x_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_hangul_x_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_hangul_x_la_SOURCES = $(sources)
 pango_hangul_x_la_LIBADD = $(hangul_x_libadd)
 
diff -ur pango-1.0.4.orig/modules/hebrew/Makefile.am pango-1.0.4/modules/hebrew/Makefile.am
--- pango-1.0.4.orig/modules/hebrew/Makefile.am	2002-03-07 02:05:10.000000000 +0900
+++ pango-1.0.4/modules/hebrew/Makefile.am	2002-09-02 08:35:12.000000000 +0900
@@ -79,12 +79,12 @@
 	$(FREETYPE_CFLAGS)	\
 	$(moddefine)
 
-pango_hebrew_x_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_hebrew_x_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_hebrew_x_la_LIBADD = $(hebrew_x_libadd)
 pango_hebrew_x_la_SOURCES = $(hebrew_x_sources)
 libpango_hebrew_x_la_SOURCES = $(hebrew_x_sources)
 
-pango_hebrew_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_hebrew_xft_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_hebrew_xft_la_LIBADD = $(hebrew_xft_libadd)
 pango_hebrew_xft_la_SOURCES = $(hebrew_xft_sources)
 libpango_hebrew_xft_la_SOURCES = $(hebrew_xft_sources)
diff -ur pango-1.0.4.orig/modules/indic/Makefile.am pango-1.0.4/modules/indic/Makefile.am
--- pango-1.0.4.orig/modules/indic/Makefile.am	2002-03-07 02:05:12.000000000 +0900
+++ pango-1.0.4/modules/indic/Makefile.am	2002-09-02 08:35:56.000000000 +0900
@@ -55,6 +55,10 @@
 gujarati_x_libadd=$(pangoxlibs)
 endif
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
+
 noinst_LTLIBRARIES = $(myanmar_x_noinst) $(gurmukhi_x_noinst) $(bengali_x_noinst) $(devanagari_x_noinst) $(gujarati_x_noinst)
 
 moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
@@ -67,7 +71,7 @@
 EXTRA_DIST = \
 	pango-indic-script.h
 
-pango_devanagari_x_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_devanagari_x_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_devanagari_x_la_LIBADD = $(devanagari_x_libadd)
 if INCLUDE_DEVANAGARI_X
 libpango_devanagari_x_la_SOURCES = devanagari-x.c
@@ -75,7 +79,7 @@
 pango_devanagari_x_la_SOURCES = devanagari-x.c
 endif
 
-pango_myanmar_x_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_myanmar_x_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_myanmar_x_la_LIBADD = $(myanmar_x_libadd)
 if INCLUDE_MYANMAR_X
 libpango_myanmar_x_la_SOURCES = myanmar-x.c
@@ -83,7 +87,7 @@
 pango_myanmar_x_la_SOURCES = myanmar-x.c
 endif
 
-pango_gurmukhi_x_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_gurmukhi_x_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_gurmukhi_x_la_LIBADD = $(gurmukhi_x_libadd)
 if INCLUDE_GURMUKHI_X
 libpango_gurmukhi_x_la_SOURCES = gurmukhi-x.c
@@ -91,7 +95,7 @@
 pango_gurmukhi_x_la_SOURCES = gurmukhi-x.c
 endif
 
-pango_bengali_x_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_bengali_x_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_bengali_x_la_LIBADD = $(bengali_x_libadd)
 if INCLUDE_BENGALI_X
 libpango_bengali_x_la_SOURCES = bengali-x.c
@@ -99,7 +103,7 @@
 pango_bengali_x_la_SOURCES = bengali-x.c
 endif
 
-pango_gujarati_x_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_gujarati_x_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_gujarati_x_la_LIBADD = $(gujarati_x_libadd)
 if INCLUDE_GUJARATI_X
 libpango_gujarati_x_la_SOURCES = gujarati-x.c
diff -ur pango-1.0.4.orig/modules/tamil/Makefile.am pango-1.0.4/modules/tamil/Makefile.am
--- pango-1.0.4.orig/modules/tamil/Makefile.am	2002-03-07 02:05:14.000000000 +0900
+++ pango-1.0.4/modules/tamil/Makefile.am	2002-09-02 08:36:32.000000000 +0900
@@ -47,6 +47,10 @@
 X_PREFIX=
 endif
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
+
 noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED)
 module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES)
 moddefine = $(X_PREFIX) $(XFT_PREFIX)
@@ -54,13 +58,13 @@
 
 INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS)
 
-pango_tamil_x_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_tamil_x_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_tamil_x_la_LIBADD = $(tamil_x_libadd)
 pango_tamil_x_la_SOURCES = $(x_sources)
 
 libpango_tamil_x_la_SOURCES = $(x_sources)
 
-pango_tamil_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_tamil_xft_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_tamil_xft_la_LIBADD = $(tamil_xft_libadd)
 pango_tamil_xft_la_SOURCES = $(xft_sources)
 
diff -ur pango-1.0.4.orig/modules/thai/Makefile.am pango-1.0.4/modules/thai/Makefile.am
--- pango-1.0.4.orig/modules/thai/Makefile.am	2002-07-27 07:29:30.000000000 +0900
+++ pango-1.0.4/modules/thai/Makefile.am	2002-09-02 08:37:14.000000000 +0900
@@ -12,10 +12,10 @@
 if HAVE_XFT
 if INCLUDE_THAI_XFT
 XFT_MODULES=
-XFT_INCLUDED=libpango-thai-xft.la
+XFT_INCLUDED=#libpango-thai-xft.la
 XFT_PREFIX=-DXFT_MODULE_PREFIX
 else
-XFT_MODULES=pango-thai-xft.la
+XFT_MODULES=#pango-thai-xft.la
 XFT_INCLUDED=
 XFT_PREFIX=
 thai_xft_libadd=$(pangoxftlibs)
@@ -43,6 +43,11 @@
 X_PREFIX=
 endif
 
+
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
+
 noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED)
 module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES)
 moddefine = $(X_PREFIX) $(XFT_PREFIX)
@@ -50,13 +55,13 @@
 
 INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS)
 
-pango_thai_x_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_thai_x_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_thai_x_la_LIBADD = $(thai_x_libadd)
 pango_thai_x_la_SOURCES = $(thai_x_sources)
 
 libpango_thai_x_la_SOURCES = $(thai_x_sources)
 
-pango_thai_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_thai_xft_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_thai_xft_la_LIBADD = $(thai_xft_libadd)
 pango_thai_xft_la_SOURCES = $(thai_xft_sources)
 
diff -ur pango-1.0.4.orig/pango/Makefile.am pango-1.0.4/pango/Makefile.am
--- pango-1.0.4.orig/pango/Makefile.am	2002-08-01 21:20:18.000000000 +0900
+++ pango-1.0.4/pango/Makefile.am	2002-09-02 08:32:12.000000000 +0900
@@ -164,7 +164,8 @@
 endif
 libpango_1_0_la_DEPENDENCIES = $(pango_win32res)
 
-libpangox_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
+libpangox_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \
+	$(GLIB_LIBS) $(no_undefined)
 libpangox_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_X_MODULES) $(X_LIBS) $(X_EXTRA_LIBS)
 libpangox_1_0_la_DEPENDENCIES = $(INCLUDED_X_MODULES) libpango-$(PANGO_API_VERSION).la
 
@@ -194,7 +195,8 @@
 	pangoxft-private.h	\
 	module-defs-xft.c
 
-libpangoxft_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
+libpangoxft_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \
+	$(GLIB_LIBS) $(no_undefined)
 libpangoxft_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_XFT_MODULES) $(XFT_LIBS) 
 libpangoxft_1_0_la_DEPENDENCIES = $(INCLUDED_XFT_MODULES) libpango-$(PANGO_API_VERSION).la
 
diff -ur pango-1.0.4.orig/pango/pango-utils.c pango-1.0.4/pango/pango-utils.c
--- pango-1.0.4.orig/pango/pango-utils.c	2002-02-10 14:53:40.000000000 +0900
+++ pango-1.0.4/pango/pango-utils.c	2002-09-02 08:39:24.000000000 +0900
@@ -637,7 +637,9 @@
 
 /* DllMain function needed to tuck away the DLL name */
 
+#ifdef G_OS_WIN32
 G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name)
+#endif
 
 
 /**