diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-03-01 20:02:17 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-03-01 20:02:17 +0000 |
| commit | 9869351ea133a8e0c3814423abe3c03a268fe486 (patch) | |
| tree | 972dc4df0fe369a05be2189a76fd6d66019852fd /configure.in | |
| parent | 42d1230026248153bd0900455fb72fa772bb0897 (diff) | |
| download | pango-9869351ea133a8e0c3814423abe3c03a268fe486.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.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/configure.in b/configure.in index de447ea1..f927fe52 100644 --- a/configure.in +++ b/configure.in @@ -312,17 +312,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 |