Merge from HEAD:

2003-06-15  Tor Lillqvist  <tml@iki.fi>

	Merge from HEAD:

	* acconfig.h: Add HAVE_X.

	* configure.in: Set HAVE_X.

	* modules/indic/Makefile.am: Use -no-undefined on Windows.

	* modules/thai/thai-shaper.h: Don't include pangox.h unless
	HAVE_X. Also leave out the PangoXSubfont field unless HAVE_X.

	* modules/thai/thai-shaper.c
	* modules/thai/thai-x.c: Include config.h for HAVE_X.

	* modules/thai/thai-shaper.c (get_glyphs_list): Bypass
	THAI_FONT_XTIS case unless HAVE_X.

	* pango/pangoft2.def: Add some missing entries.

12 files changed, 123 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e171ba2e..9c48c58c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2003-06-15  Tor Lillqvist  <tml@iki.fi>
+
+	Merge from HEAD:
+
+	* acconfig.h: Add HAVE_X.
+
+	* configure.in: Set HAVE_X.
+
+	* modules/indic/Makefile.am: Use -no-undefined on Windows.
+
+	* modules/thai/thai-shaper.h: Don't include pangox.h unless
+	HAVE_X. Also leave out the PangoXSubfont field unless HAVE_X.
+
+	* modules/thai/thai-shaper.c
+	* modules/thai/thai-x.c: Include config.h for HAVE_X.
+
+	* modules/thai/thai-shaper.c (get_glyphs_list): Bypass
+	THAI_FONT_XTIS case unless HAVE_X.
+
+	* pango/pangoft2.def: Add some missing entries.
+	
 2003-06-13  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Updates.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index e171ba2e..9c48c58c 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,24 @@
+2003-06-15  Tor Lillqvist  <tml@iki.fi>
+
+	Merge from HEAD:
+
+	* acconfig.h: Add HAVE_X.
+
+	* configure.in: Set HAVE_X.
+
+	* modules/indic/Makefile.am: Use -no-undefined on Windows.
+
+	* modules/thai/thai-shaper.h: Don't include pangox.h unless
+	HAVE_X. Also leave out the PangoXSubfont field unless HAVE_X.
+
+	* modules/thai/thai-shaper.c
+	* modules/thai/thai-x.c: Include config.h for HAVE_X.
+
+	* modules/thai/thai-shaper.c (get_glyphs_list): Bypass
+	THAI_FONT_XTIS case unless HAVE_X.
+
+	* pango/pangoft2.def: Add some missing entries.
+	
 2003-06-13  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Updates.
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index e171ba2e..9c48c58c 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,24 @@
+2003-06-15  Tor Lillqvist  <tml@iki.fi>
+
+	Merge from HEAD:
+
+	* acconfig.h: Add HAVE_X.
+
+	* configure.in: Set HAVE_X.
+
+	* modules/indic/Makefile.am: Use -no-undefined on Windows.
+
+	* modules/thai/thai-shaper.h: Don't include pangox.h unless
+	HAVE_X. Also leave out the PangoXSubfont field unless HAVE_X.
+
+	* modules/thai/thai-shaper.c
+	* modules/thai/thai-x.c: Include config.h for HAVE_X.
+
+	* modules/thai/thai-shaper.c (get_glyphs_list): Bypass
+	THAI_FONT_XTIS case unless HAVE_X.
+
+	* pango/pangoft2.def: Add some missing entries.
+	
 2003-06-13  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Updates.
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index e171ba2e..9c48c58c 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,24 @@
+2003-06-15  Tor Lillqvist  <tml@iki.fi>
+
+	Merge from HEAD:
+
+	* acconfig.h: Add HAVE_X.
+
+	* configure.in: Set HAVE_X.
+
+	* modules/indic/Makefile.am: Use -no-undefined on Windows.
+
+	* modules/thai/thai-shaper.h: Don't include pangox.h unless
+	HAVE_X. Also leave out the PangoXSubfont field unless HAVE_X.
+
+	* modules/thai/thai-shaper.c
+	* modules/thai/thai-x.c: Include config.h for HAVE_X.
+
+	* modules/thai/thai-shaper.c (get_glyphs_list): Bypass
+	THAI_FONT_XTIS case unless HAVE_X.
+
+	* pango/pangoft2.def: Add some missing entries.
+	
 2003-06-13  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Updates.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index e171ba2e..9c48c58c 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,24 @@
+2003-06-15  Tor Lillqvist  <tml@iki.fi>
+
+	Merge from HEAD:
+
+	* acconfig.h: Add HAVE_X.
+
+	* configure.in: Set HAVE_X.
+
+	* modules/indic/Makefile.am: Use -no-undefined on Windows.
+
+	* modules/thai/thai-shaper.h: Don't include pangox.h unless
+	HAVE_X. Also leave out the PangoXSubfont field unless HAVE_X.
+
+	* modules/thai/thai-shaper.c
+	* modules/thai/thai-x.c: Include config.h for HAVE_X.
+
+	* modules/thai/thai-shaper.c (get_glyphs_list): Bypass
+	THAI_FONT_XTIS case unless HAVE_X.
+
+	* pango/pangoft2.def: Add some missing entries.
+	
 2003-06-13  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Updates.
diff --git a/acconfig.h b/acconfig.h
index e4f933d9..f5dbde89 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -20,4 +20,5 @@
 #undef HAVE_USP10_H
 
 #undef MINI_XFTCONFIG_DIR
+#undef HAVE_X
 #undef HAVE_XFT2
diff --git a/configure.in b/configure.in
index 50014cb0..bba72c71 100644
--- a/configure.in
+++ b/configure.in
@@ -170,6 +170,7 @@ if test x$no_x = xyes ; then
 else
   X_LIBS="$X_LIBS -lX11"
   have_x=true
+  AC_DEFINE(HAVE_X)
 fi
 AM_CONDITIONAL(HAVE_X, $have_x) 
 
diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index a734ac77..2e923bb7 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -89,6 +89,9 @@ endif
 
 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) $(indic_xft_noinst) $(indic_ft2_noinst)
 
@@ -170,7 +173,7 @@ ft2_sources =		 	\
 	indic-ot.c		\
 	indic-ot.h
 
-pango_indic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_indic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_indic_ft2_la_LIBADD = $(indic_ft2_libadd)
 pango_indic_ft2_la_SOURCES = $(ft2_sources)
 libpango_indic_ft2_la_SOURCES = $(ft2_sources)
diff --git a/modules/thai/thai-shaper.c b/modules/thai/thai-shaper.c
index ef04b229..3dcd24bd 100644
--- a/modules/thai/thai-shaper.c
+++ b/modules/thai/thai-shaper.c
@@ -25,7 +25,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-
+#include "config.h"
 
 #include <string.h>
 
@@ -572,6 +572,7 @@ get_glyphs_list (ThaiFontInfo	*font_info,
 	  glyph_lists[i] = (*font_info->make_unknown_glyph) (font_info, glyph_lists[i]);
         return num_chrs;
 
+#ifdef HAVE_X
       case THAI_FONT_XTIS:
         /* If we are rendering with an XTIS font, we try to find a precomposed
          * glyph for the cluster.
@@ -591,6 +592,7 @@ get_glyphs_list (ThaiFontInfo	*font_info,
 	      (*font_info->make_glyph) (font_info,
 			0x100 * (cluster[i] - 0xe00 + 0x20) + 0x30);
         return num_chrs;
+#endif
       
       case THAI_FONT_TIS:
 	/* TIS620-0 + Wtt2.0 Extension
diff --git a/modules/thai/thai-shaper.h b/modules/thai/thai-shaper.h
index e028e3a9..7f3925fd 100644
--- a/modules/thai/thai-shaper.h
+++ b/modules/thai/thai-shaper.h
@@ -1,7 +1,9 @@
 #ifndef __THAI_SHAPER_H__
 #define __THAI_SHAPER_H__
 
+#ifdef HAVE_X
 #include "pangox.h"
+#endif
 
 #define ucs2tis(wc)     (unsigned int)((unsigned int)(wc) - 0x0E00 + 0xA0)
 #define tis2uni(c)      ((gunichar)(c) - 0xA0 + 0x0E00)
@@ -28,7 +30,9 @@ struct _ThaiFontInfo
 {
   PangoFont       *font;
   ThaiFontSet      font_set;
+#ifdef HAVE_X
   PangoXSubfont    subfont; /* For X backend */
+#endif
 
   PangoGlyph
   (*make_glyph) (ThaiFontInfo *font_info, unsigned int c);
diff --git a/modules/thai/thai-x.c b/modules/thai/thai-x.c
index edf31d54..a7b82fe9 100644
--- a/modules/thai/thai-x.c
+++ b/modules/thai/thai-x.c
@@ -26,6 +26,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 
 #include <string.h>
 
diff --git a/pango/pangoft2.def b/pango/pangoft2.def
index b207773c..82237d9e 100644
--- a/pango/pangoft2.def
+++ b/pango/pangoft2.def
@@ -2,8 +2,12 @@ EXPORTS
 	pango_ft2_font_get_coverage
 	pango_ft2_font_get_face
 	pango_ft2_font_get_kerning
+	pango_ft2_font_map_create_context
 	pango_ft2_font_map_for_display
+	pango_ft2_font_map_get_type
 	pango_ft2_font_map_new
+	pango_ft2_font_map_set_default_substitute
+	pango_ft2_font_map_set_resolution
 	pango_ft2_get_context
 	pango_ft2_get_unknown_glyph
 	pango_ft2_render