From 5fa9ff14a93414e16b0bd46d14b4eea910e9df8e Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 15 Jan 2008 10:12:58 +0000 Subject: [PATCH] Support gio in AM_PATH_GLIB_2_0 (#509465) 2008-01-14 Dan Winship * m4macros/glib-2.0.m4: Support gio in AM_PATH_GLIB_2_0 (#509465) svn path=/trunk/; revision=6315 --- ChangeLog | 4 ++++ m4macros/glib-2.0.m4 | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6dcdc9c86..826826e59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-01-14 Dan Winship + + * m4macros/glib-2.0.m4: Support gio in AM_PATH_GLIB_2_0 (#509465) + 2008-01-15 Dan Winship * glib/gchecksum.c (md5_sum_update): fix this; the previous code diff --git a/m4macros/glib-2.0.m4 b/m4macros/glib-2.0.m4 index 11df0b4f0..be79a4626 100644 --- a/m4macros/glib-2.0.m4 +++ b/m4macros/glib-2.0.m4 @@ -2,8 +2,8 @@ # 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], [dnl @@ -28,6 +28,9 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run gthread) pkg_config_args="$pkg_config_args gthread-2.0" ;; + gio*) + pkg_config_args="$pkg_config_args $module-2.0" + ;; esac done