diff options
| author | Havoc Pennington <hp@redhat.com> | 2000-12-14 23:23:14 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2000-12-14 23:23:14 +0000 |
| commit | 016c4d7047fd3ac2f76667f4ffe3b3a22ad0b902 (patch) | |
| tree | 740872633a5f6f1ffda8dbf8a01e5249e9ff85de /examples | |
| parent | 1b3ed686bdc299ab5b79eeb8a485f6d84189f4e6 (diff) | |
| download | pango-016c4d7047fd3ac2f76667f4ffe3b3a22ad0b902.tar.gz | |
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.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Makefile.am | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index 0a12e7fa..8af03153 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -23,7 +23,7 @@ moc_viewer-qt.cc: viewer-qt.h BUILT_SOURCES=moc_viewer-qt.cc -pango_viewer_LDADD = ../pango/libpango.la ../pango/libpangox.la $(FRIBIDI_LIBS) $(QT_LIBS) +pango_viewer_LDADD = ../pango/libpangox.la ../pango/libpango.la $(FRIBIDI_LIBS) $(QT_LIBS) endif ################################################### @@ -31,8 +31,14 @@ endif all-local: pango.modules pango.modules: - ( cd ../modules && \ - ../pango/pango-querymodules `find . -name '*.so'` > ../examples/pango.modules ) + if find ../modules -name '*.so' | grep -q 'so'; then \ + echo "Writing a pango.modules file to use when running examples before installing Pango."; \ + (cd ../modules && \ + ../pango/pango-querymodules `find . -name '*.so'` > ../examples/pango.modules ) ;\ + else \ + echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \ + touch pango.modules; \ + fi EXTRA_DIST= \ viewer-win32.c \ |