diff options
| author | Max Kellermann <max@duempel.org> | 2008-09-15 12:27:28 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-09-15 12:27:28 +0200 |
| commit | 629401644d03c1fc57895409b74ea8267c276a4b (patch) | |
| tree | 3b3851879bb8a780d90d3338ac2f87a1d5477300 /m4/glib-2.0.m4 | |
| parent | 6d3b7cdd62d798521d73ac58d57bd67061d64ba5 (diff) | |
| download | mpd-629401644d03c1fc57895409b74ea8267c276a4b.tar.gz mpd-629401644d03c1fc57895409b74ea8267c276a4b.tar.xz mpd-629401644d03c1fc57895409b74ea8267c276a4b.zip | |
configure: updated m4/*.m4
Copied m4 files from /usr/share/aclocal (Debian Lenny).
Diffstat (limited to 'm4/glib-2.0.m4')
| -rw-r--r-- | m4/glib-2.0.m4 | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/m4/glib-2.0.m4 b/m4/glib-2.0.m4 index 28ccef4a5..be79a4626 100644 --- a/m4/glib-2.0.m4 +++ b/m4/glib-2.0.m4 @@ -2,10 +2,10 @@ # Owen Taylor 1997-2001 dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or -dnl gthread is specified in MODULES, pass to pkg-config +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, +dnl gthread, or gio is specified in MODULES, pass to pkg-config dnl -AC_DEFUN(AM_PATH_GLIB_2_0, +AC_DEFUN([AM_PATH_GLIB_2_0], [dnl dnl Get the cflags and libraries from pkg-config dnl @@ -19,29 +19,28 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run gmodule) pkg_config_args="$pkg_config_args gmodule-2.0" ;; + gmodule-no-export) + pkg_config_args="$pkg_config_args gmodule-no-export-2.0" + ;; gobject) pkg_config_args="$pkg_config_args gobject-2.0" ;; gthread) pkg_config_args="$pkg_config_args gthread-2.0" ;; + gio*) + pkg_config_args="$pkg_config_args $module-2.0" + ;; esac done - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + PKG_PROG_PKG_CONFIG([0.16]) no_glib="" - if test x$PKG_CONFIG != xno ; then - if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then - : - else - echo *** pkg-config too old; version 0.7 or better required. - no_glib=yes - PKG_CONFIG=no - fi - else + if test "x$PKG_CONFIG" = x ; then no_glib=yes + PKG_CONFIG=no fi min_glib_version=ifelse([$1], ,2.0.0,$1) |