add assertion that shaper != NULL to catch engine problems faster

2000-12-14  Havoc Pennington  <hp@redhat.com>

	* pango/fonts.c (pango_font_find_shaper): add assertion that
	shaper != NULL to catch engine problems faster

	* pango/Makefile.am (libpangox_la_SOURCES): modules.[hc] and
	module-defs.c have to go in libpangox for now since the modules
	use the X stuff, and static linkage won't let you play games here

	* examples/Makefile.am (pango_viewer_LDADD): fix order of link

	* modules/indic/pango-indic-script.h (pango_indic_get_char): make
	this a macro, so it doesn't collide between modules

	* modules/*/Makefile.am: Fix to work if the module isn't included

	* examples/Makefile.am: don't query modules if we didn't build any

	* modules/indic/gurmukhi.c (MODULE_ENTRY): fix prefix

	* modules/indic/bengali.c (MODULE_ENTRY): fix prefix

	* modules/indic/gujarati.c (MODULE_ENTRY): fix prefix

	* modules/indic/devanagari.c (MODULE_ENTRY): fix prefix

	* modules/indic/myanmar.c (MODULE_ENTRY): uniquely prefix the functions

	* modules/Makefile.am (MODULES): handle case where there are no
	modules to query

	* configure.in: Fix up include_modules stuff to work with Indic

	* pango/glyphstring.c (pango_glyph_string_set_size): Just
	g_error() if the glyph string exceeds maximum integer size,
	instead of mysteriously crashing later.

1 files changed, 69 insertions, 30 deletions

diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index 18d27153..5f5db4dc 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -8,52 +8,91 @@ sources =		 	\
 	devanagari.c		\
 	pango-indic-script.h
 
-if INCLUDE_INDIC
-noinst_LTLIBRARIES = libpango-myanmar.la libpango-gurmukhi.la \
-                     libpango-bengali.la \
-		     libpango-devanagari.la \
-		     libpango-gujarati.la
-moddefine = -DMODULE_PREFIX
+if INCLUDE_MYANMAR
+myanmar_noinst=libpango-myanmar.la
+myanmar_cflags=-DMYANMAR_MODULE_PREFIX
 else
-moduledir = $(libdir)/pango/modules
-module_LTLIBRARIES = pango-myanmar.la pango-gurmukhi.la \
-                     pango-bengali.la \
-		     pango-devanagari.la \
-		     pango-gujarati.la
+myanmar_inst=pango-myanmar.la
+myanmar_moduleflags=-rpath $(libdir)
 endif
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine)
-
+if INCLUDE_GURMUKHI
+gurmukhi_noinst=libpango-gurmukhi.la
+gurmukhi_cflags=-DGURMUKHI_MODULE_PREFIX
+else
+gurmukhi_inst=pango-gurmukhi.la
+gurmukhi_moduleflags=-rpath $(libdir)
+endif
 
-EXTRA_DIST = \
-	pango-indic-script.h
+if INCLUDE_BENGALI
+bengali_noinst=libpango-bengali.la
+bengali_cflags=-DBENGALI_MODULE_PREFIX
+else
+bengali_inst=pango-bengali.la
+bengali_moduleflags=-rpath $(libdir)
+endif
 
-pango_devanagari_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
-pango_devanagari_la_SOURCES = devanagari.c
+if INCLUDE_DEVANAGARI
+devanagari_noinst=libpango-devanagari.la
+devanagari_cflags=-DDEVANAGARI_MODULE_PREFIX
+else
+devanagari_inst=pango-devanagari.la
+devanagari_moduleflags=-rpath $(libdir)
+endif
 
-libpango_devanagari_la_SOURCES = devanagari.c
+if INCLUDE_GUJARATI
+gujarati_noinst=libpango-gujarati.la
+gujarati_cflags=-DGUJARATI_MODULE_PREFIX
+else
+gujarati_inst=pango-gujarati.la
+gujarati_moduleflags=-rpath $(libdir)
+endif
 
+if INCLUDE_ANY_INDIC
+noinst_LTLIBRARIES = $(myanmar_noinst) $(gurmukhi_noinst) $(bengali_noinst) $(devanagari_noinst) $(gujarati_noinst)
+else
+moduledir = $(libdir)/pango/modules
+module_LTLIBRARIES = $(myanmar_inst) $(gurmukhi_inst) $(bengali_inst) $(devanagari_inst) $(gujarati_inst)
+endif
 
-pango_myanmar_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
-pango_myanmar_la_SOURCES = myanmar.c
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(myanmar_cflags) $(gurmukhi_cflags) $(bengali_cflags) $(devanagari_cflags) $(gujarati_cflags)
 
-libpango_myanmar_la_SOURCES = myanmar.c
+EXTRA_DIST = \
+	pango-indic-script.h
 
+pango_devanagari_la_LDFLAGS = $(devanagari_moduleflags) -export-dynamic -avoid-version -module
+if INCLUDE_DEVANAGARI
+libpango_devanagari_la_SOURCES = devanagari.c
+else
+pango_devanagari_la_SOURCES = devanagari.c
+endif
 
-pango_gurmukhi_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
-pango_gurmukhi_la_SOURCES = gurmukhi.c
+pango_myanmar_la_LDFLAGS = $(myanmar_moduleflags) -export-dynamic -avoid-version -module
+if INCLUDE_MYANMAR
+libpango_myanmar_la_SOURCES = myanmar.c
+else
+pango_myanmar_la_SOURCES = myanmar.c
+endif
 
+pango_gurmukhi_la_LDFLAGS = $(gurmukhi_moduleflags) -export-dynamic -avoid-version -module
+if INCLUDE_GURMUKHI
 libpango_gurmukhi_la_SOURCES = gurmukhi.c
+else
+pango_gurmukhi_la_SOURCES = gurmukhi.c
+endif
 
-
-pango_bengali_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
-pango_bengali_la_SOURCES = bengali.c
-
+pango_bengali_la_LDFLAGS = $(bengali_moduleflags) -export-dynamic -avoid-version -module
+if INCLUDE_BENGALI
 libpango_bengali_la_SOURCES = bengali.c
+else
+pango_bengali_la_SOURCES = bengali.c
+endif
 
-
-pango_gujarati_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
+pango_gujarati_la_LDFLAGS = $(gujarati_moduleflags) -export-dynamic -avoid-version -module
+if INCLUDE_GUJARATI
+libpango_gujarati_la_SOURCES = gujarati.c
+else
 pango_gujarati_la_SOURCES = gujarati.c
+endif
 
-libpango_gujarati_la_SOURCES = gujarati.c