diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-06-07 16:40:02 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-06-07 16:40:02 +0000 |
| commit | a5b50542c5bd7e4a5487284af9ce3d40a36633f8 (patch) | |
| tree | a70df449f0f3a98acdd5428d79c98ab1bb34b012 /configure.in | |
| parent | 84940c514a6500ec4082ecdfe46df0278506dd16 (diff) | |
| download | pango-a5b50542c5bd7e4a5487284af9ce3d40a36633f8.tar.gz | |
subst GLIB_GENMARSHAL, GOBJECT_QUERY, GLIB_MKENUMS variables
2001-06-07 Havoc Pennington <hp@redhat.com>
* m4macros/glib-2.0.m4: subst GLIB_GENMARSHAL, GOBJECT_QUERY,
GLIB_MKENUMS variables
* gmodule-2.0.pc.in: add gmodule_supported variable
* glib-2.0.pc.in: add glib_genmarshal, gobject_query,
glib_mkenums variables
* configure.in: put G_MODULE_SUPPORTED value into
.pc files
* autogen.sh: support AUTOGEN_SUBDIR_MODE
* Makefile.am: add -uninstalled.pc.in to EXTRA_DIST
2001-06-07 Havoc Pennington <hp@redhat.com>
* pango/Makefile.am: add libpango.la to _DEPENDENCIES for the
other libs
* configure.in: use AM_PATH_GLIB_2_0
* autogen.sh: support AUTOGEN_SUBDIR_MODE
* Makefile.am: dist the .pc.in files
2001-06-07 Havoc Pennington <hp@redhat.com>
* atk/Makefile.am: use @GLIB_GENMARSHAL@ so we can use uninstalled
glib-genmarshal
* configure.in: rearrange the library checks to support
uninstalled linking
* autogen.sh: add support for AUTOGEN_SUBDIR_MODE
* atk-uninstalled.pc.in: new file, allows linking to uninstalled
ATK in giant GTK tarball
2001-06-07 Havoc Pennington <hp@redhat.com>
* tests/Makefile.am: add missing -I flag
* gtk/Makefile.am: use @GLIB_MKENUMS@, @GLIB_GENMARSHAL@, etc.
* configure.in: use pkg-config to see if GModule is
supported; fix to properly turn on included loaders
when GModule isn't supported; don't use AC_CHECK_LIB
when libs are not installed yet
* autogen.sh: add support for AUTOGEN_SUBDIR_MODE
* Makefile.am (SUBDIRS): add m4macros subdir
* gtk/Makefile.am: $(srcdir)/foo targets must be $(srcdir)/foo in
dependencies also.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/configure.in b/configure.in index 05fbcd67..255a7a4c 100644 --- a/configure.in +++ b/configure.in @@ -51,19 +51,6 @@ fi AM_CONDITIONAL(HAVE_X, $have_x) # -# Find pkg-config -# -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -if test x$PKG_CONFIG = xno ; then - AC_MSG_ERROR([*** pkg-config not found. See http://pkgconfig.sourceforge.net]) -fi - -if ! $PKG_CONFIG --atleast-pkgconfig-version 0.5 ; then - AC_MSG_ERROR([*** pkg-config too old; version 0.5 or better required.]) -fi - - -# # Checks for FreeType # FREETYPE_LIBS= @@ -132,21 +119,7 @@ AM_CONDITIONAL(HAVE_XFT, $have_xft) # # Checks for GLib # -GLIB_PACKAGES="gobject-2.0 gmodule-2.0" -GLIB_REQUIRED_VERSION=1.3.2 - -AC_MSG_CHECKING(GLib flags) -if $PKG_CONFIG --atleast-version $GLIB_REQUIRED_VERSION glib-2.0 ; then - GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES` - GLIB_LIBS=`$PKG_CONFIG --libs $GLIB_PACKAGES` - - AC_MSG_RESULT($GLIB_CFLAGS $GLIB_LIBS) -else - AC_MSG_ERROR([ -*** GLIB $GLIB_REQUIRED_VERSION or newer is required. The latest version of GLIB -*** is always available from ftp://ftp.gtk.org/. - ]) -fi +AM_PATH_GLIB_2_0(1.3.5,,,gobject gmodule) CFLAGS="$CFLAGS $GLIB_CFLAGS" @@ -508,6 +481,10 @@ pango.pc pangox.pc pangoft2.pc pangoxft.pc +pango-uninstalled.pc +pangox-uninstalled.pc +pangoft2-uninstalled.pc +pangoxft-uninstalled.pc ],[case "$CONFIG_FILES" in *pango-config*)chmod +x pango-config;; esac]) |