diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | configure.in | 23 |
4 files changed, 21 insertions, 20 deletions
@@ -1,3 +1,9 @@ +2004-12-14 Matthias Clasen <mclasen@redhat.com> + + * pango.pc.in: Require gmodule-no-export + + * configure.in: Use gmodule-no-export-2.0.pc, require glib 2.5.7 + 2004-12-14 Tor Lillqvist <tml@iki.fi> * pango/pangowin32.c (pango_win32_font_get_metrics): Set also diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 9370ae8a..52debc68 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +2004-12-14 Matthias Clasen <mclasen@redhat.com> + + * pango.pc.in: Require gmodule-no-export + + * configure.in: Use gmodule-no-export-2.0.pc, require glib 2.5.7 + 2004-12-14 Tor Lillqvist <tml@iki.fi> * pango/pangowin32.c (pango_win32_font_get_metrics): Set also diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 9370ae8a..52debc68 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +2004-12-14 Matthias Clasen <mclasen@redhat.com> + + * pango.pc.in: Require gmodule-no-export + + * configure.in: Use gmodule-no-export-2.0.pc, require glib 2.5.7 + 2004-12-14 Tor Lillqvist <tml@iki.fi> * pango/pangowin32.c (pango_win32_font_get_metrics): Set also diff --git a/configure.in b/configure.in index 2756140d..5f2ba3ed 100644 --- a/configure.in +++ b/configure.in @@ -281,36 +281,19 @@ fi # # Checks for GLib # -GLIB_REQUIRED_VERSION=2.4.0 +GLIB_REQUIRED_VERSION=2.5.7 AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :, 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) + gobject gmodule-no-export) -GLIB_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0 gthread-2.0` +GLIB_CFLAGS=`$PKG_CONFIG --cflags gmodule-no-export-2.0 gthread-2.0` AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_CFLAGS) -################################################################ -# Strip -export-dynamic from the link line -################################################################ - -# -# pkg-config --libs gmodule includes the "export_dynamic" flag, -# but this flag is only meaningful for executables. For libraries -# the effect is undefined; what it causes on Linux is that the -# export list from -export-symbols-regex is ignored and everything -# is exported -# -export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -if test -n "$export_dynamic"; then - GLIB_LIBS=`echo $GLIB_LIBS | sed -e "s/$export_dynamic//"` -fi - - # # The OpenType test programs aren't particularly portable # |