Add the Win32 GDI Pango backend to autoconfiguration:

2001-10-03  Tor Lillqvist  <tml@iki.fi>

	Add the Win32 GDI Pango backend to autoconfiguration:

	* configure.in: Call AC_LIBTOOL_WIN32_DLL. Check for native Win32
	or Cygwin, set automake conditional PLATFORM_WIN32. Check for
	native Win32, set OS_WIN32. Refactor the
	Xrender+Xft+Xft+FreeType.h checks not to use AC_CHECK_LIBs inside
	eachother, autoconf 2.52e on Cygwin generated bad shell code for
	that. Check for gdi32 library, set automake conditional
	HAVE_WIN32. Add the basic-win32 module, add INCLUDED_WIN32_MODULES
	and INCLUDE_BASIC_WIN32. Write pango/module-defs-win32.c. Generate
	pangowin32*.pc.

	* pangowin32.pc.in
	* pangowin32-uninstalled.pc.in: New files.

	* Makefile.am: Add pangowin32*.pc.in.

	* .cvsignore: Add pangowin32*.pc.

	* modules/basic/Makefile.am: Add the basic-win32 backend. Use
	-no-undefined on PLATFORM_WIN32.

	* pango/Makefile.am: Add the Win32 backend. Use -no-undefined on
	PLATFORM_WIN32. Use the .def files on OS_WIN32. Link libpangoft2
	with GLIB_LIBS.

	* pango/pango-utils.c: (DllMain): New function, on
	G_OS_WIN32. Used to get the actual DLL name, which is tucked away.
	(pango_get_sysconf_subdirectory, pango_get_lib_subdirectory):
	(Win32): Append VERSION to the registry key passed to
	g_win32_get_package_installation_subdirectory(). Use the real DLL
	name from above instead of assuming the DLL has a certain name.

	Other Win32 backend fixes:

	* pango/pangowin32-fontmap.c: (free_coverages_foreach): Remove, unused.

	* pango/pangowin32.c: Remove unused variables.

	* pango/pangowin32.def: Add pango_win32_font_get_glyph_index.

	* pango/pangowin32.h: Remove pango_win32_font_get_coverage, which
	is static.

1 files changed, 31 insertions, 5 deletions

diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index b42f5a17..f22a6824 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -6,6 +6,7 @@ pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS)
 pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs)
 pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs)
 pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs)
+pangowin32libs = $(top_builddir)/pango/libpangowin32.la $(pangolibs)
 
 if HAVE_XFT
 if INCLUDE_BASIC_XFT
@@ -58,9 +59,30 @@ X_MODULES=
 X_PREFIX=
 endif
 
-noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) $(FT2_INCLUDED)
-module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) $(FT2_MODULES)
-moddefine = $(X_PREFIX) $(XFT_PREFIX) $(FT2_PREFIX)
+if HAVE_WIN32
+if INCLUDE_BASIC_WIN32
+WIN32_INCLUDED=libpango-basic-win32.la
+WIN32_MODULES=
+WIN32_PREFIX=-DWIN32_MODULE_PREFIX
+else
+WIN32_INCLUDED=
+WIN32_MODULES=pango-basic-win32.la
+WIN32_PREFIX=
+basic_win32_libadd=$(pangowin32libs)
+endif
+else
+WIN32_INCLUDED=
+WIN32_MODULES=
+WIN32_PREFIX=
+endif
+
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
+
+noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) $(FT2_INCLUDED) $(WIN32_INCLUDED)
+module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) $(FT2_MODULES) $(WIN32_MODULES)
+moddefine = $(X_PREFIX) $(XFT_PREFIX) $(FT2_PREFIX) $(WIN32_PREFIX)
 moduledir = $(libdir)/pango/modules
 
 INCLUDES = 			\
@@ -81,15 +103,19 @@ pango_basic_xft_la_LIBADD = $(basic_xft_libadd)
 pango_basic_xft_la_SOURCES = basic-xft.c
 libpango_basic_xft_la_SOURCES = basic-xft.c
 
-pango_basic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_basic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_basic_ft2_la_LIBADD = $(basic_ft2_libadd)
 pango_basic_ft2_la_SOURCES = basic-ft2.c
 libpango_basic_ft2_la_SOURCES = basic-ft2.c
 
+pango_basic_win32_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
+pango_basic_win32_la_LIBADD = $(basic_win32_libadd)
+pango_basic_win32_la_SOURCES = basic-win32.c
+libpango_basic_win32_la_SOURCES = basic-win32.c
+
 EXTRA_DIST =		\
 	tables-big.i	\
 	tables-small.i	\
-	basic-win32.c	\
 	makefile.mingw	\
 	makefile.mingw.in