diff options
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]) |