diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | modules/thai/Makefile.am | 1 |
2 files changed, 11 insertions, 0 deletions
@@ -1,3 +1,12 @@ +2007-03-03 Behdad Esfahbod <behdad@gnome.org> + + Bug 414297 – Fails to build with --enable-static + --with-included-modules in thai lang module + Patch from Loïc Minier + + * modules/thai/Makefile.am: Include LIBTHAI_LIBS in static module + too. + 2007-02-26 Tor Lillqvist <tml@novell.com> * pango/pangowin32-fontmap.c: Fix brokenness in the code that @@ -45,6 +54,7 @@ * Makefile.am (EXTRA_DIST): Include just pango-zip.sh.in in the tarball, not pango-zip.sh. +>>>>>>> .r2207 2007-01-29 Behdad Esfahbod <behdad@gnome.org> * === Released 1.14.10 === diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am index 40f2315c..9a8c2140 100644 --- a/modules/thai/Makefile.am +++ b/modules/thai/Makefile.am @@ -38,3 +38,4 @@ pango_thai_lang_la_LIBADD = $(pangolibs) $(LIBTHAI_LIBS) pango_thai_lang_la_SOURCES = $(lang_sources) libpango_thai_lang_la_SOURCES = $(lang_sources) libpango_thai_lang_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_thai_lang $(LIBTHAI_CFLAGS) +libpango_thai_lang_la_LIBADD = $(LIBTHAI_LIBS) |