diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-03-01 20:02:33 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-03-01 20:02:33 +0000 |
| commit | 97d609b5bfea75944ef1c4b65ea1fd4048c4b5cd (patch) | |
| tree | b18efbe889f3e23f83d7ce34440196f46e4737b4 | |
| parent | 5262e5f1e3349a78468d2f5b05d83a1d3487671d (diff) | |
| download | pango-97d609b5bfea75944ef1c4b65ea1fd4048c4b5cd.tar.gz | |
Use PKG_CHECK_MODULES not AM_PATH_GLIB_2_0 to avoid a problem where older
2005-03-01 Owen Taylor <otaylor@redhat.com>
* configure.in: Use PKG_CHECK_MODULES not AM_PATH_GLIB_2_0
to avoid a problem where older verisons of AM_PATH_GLIB_2_0
silently ignored gmodule-no-export causing mysterious
build failures. (#161786)
* pango/Makefile.am (DISTCLEANFILES): Move some
configure.in output files from CLEANFILES to DISTCLEANFILES.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 11 | ||||
| -rw-r--r-- | configure.in | 13 | ||||
| -rw-r--r-- | docs/tmpl/pango-renderer.sgml | 2 | ||||
| -rw-r--r-- | pango/Makefile.am | 5 |
5 files changed, 30 insertions, 12 deletions
@@ -1,3 +1,13 @@ +2005-03-01 Owen Taylor <otaylor@redhat.com> + + * configure.in: Use PKG_CHECK_MODULES not AM_PATH_GLIB_2_0 + to avoid a problem where older verisons of AM_PATH_GLIB_2_0 + silently ignored gmodule-no-export causing mysterious + build failures. (#161786) + + * pango/Makefile.am (DISTCLEANFILES): Move some + configure.in output files from CLEANFILES to DISTCLEANFILES. + 2005-03-01 Tor Lillqvist <tml@novell.com> * tests/cxx-test.C: Include pangowin32.h first to avoid @@ -5,7 +15,6 @@ 2005-02-21 Owen Taylor <otaylor@redhat.com> - * pango/fonts.c (pango_font_get_glyph_extents): * pango/shape.c (pango_shape): Minor doc fixes. (#167922, #167924, Billy Biggs) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index d22170f1..aa92b9c8 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,13 @@ +2005-03-01 Owen Taylor <otaylor@redhat.com> + + * configure.in: Use PKG_CHECK_MODULES not AM_PATH_GLIB_2_0 + to avoid a problem where older verisons of AM_PATH_GLIB_2_0 + silently ignored gmodule-no-export causing mysterious + build failures. (#161786) + + * pango/Makefile.am (DISTCLEANFILES): Move some + configure.in output files from CLEANFILES to DISTCLEANFILES. + 2005-03-01 Tor Lillqvist <tml@novell.com> * tests/cxx-test.C: Include pangowin32.h first to avoid @@ -5,7 +15,6 @@ 2005-02-21 Owen Taylor <otaylor@redhat.com> - * pango/fonts.c (pango_font_get_glyph_extents): * pango/shape.c (pango_shape): Minor doc fixes. (#167922, #167924, Billy Biggs) diff --git a/configure.in b/configure.in index 5f283583..bd6d3053 100644 --- a/configure.in +++ b/configure.in @@ -282,17 +282,16 @@ fi # Checks for GLib # GLIB_REQUIRED_VERSION=2.5.7 +GLIB_MODULES="glib-2.0 >= $GLIB_REQUIRED_VERSION gobject-2.0 gmodule-no-export-2.0" -AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :, +PKG_CHECK_MODULES(GLIB, $GLIB_MODULES, :, AC_MSG_ERROR([ *** Glib $GLIB_REQUIRED_VERSION or better is required. The latest version of -*** Glib is always available from ftp://ftp.gtk.org/.]), - gobject gmodule-no-export) +*** Glib is always available from ftp://ftp.gtk.org/.])) -GLIB_CFLAGS=`$PKG_CONFIG --cflags gmodule-no-export-2.0 gthread-2.0` - -AC_SUBST(GLIB_LIBS) -AC_SUBST(GLIB_CFLAGS) +# Add in gthread-2.0 to CFLAGS but not to LIBS so we get any +# necesary defines for thread-safety. +GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0` # # The OpenType test programs aren't particularly portable diff --git a/docs/tmpl/pango-renderer.sgml b/docs/tmpl/pango-renderer.sgml index adb8f555..2b5dd74c 100644 --- a/docs/tmpl/pango-renderer.sgml +++ b/docs/tmpl/pango-renderer.sgml @@ -124,7 +124,7 @@ destinations can be created. @renderer: @part: -@y1: +@y1_: @x11: @x21: @y2: diff --git a/pango/Makefile.am b/pango/Makefile.am index ceea5582..d13bc8d5 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -355,13 +355,14 @@ CLEANFILES = \ pango-enum-types.h \ s-enum-types-h \ pango-enum-types.c \ - s-enum-types-c \ + s-enum-types-c + +DISTCLEANFILES = \ module-defs.h \ module-defs-x.c \ module-defs-fc.c \ module-defs-win32.c - install-data-local: install-ms-lib install-libtool-import-lib install-exec-hook: |