glib r6315 - in trunk: . m4macros

[alexl svn gnome org]

Author: alexl
Date: Tue Jan 15 10:12:58 2008
New Revision: 6315
URL: http://svn.gnome.org/viewvc/glib?rev=6315&view=rev

Log:
2008-01-14  Dan Winship  <danw gnome org>

	* m4macros/glib-2.0.m4: Support gio in AM_PATH_GLIB_2_0 (#509465)




Modified:
   trunk/ChangeLog
   trunk/m4macros/glib-2.0.m4

Modified: trunk/m4macros/glib-2.0.m4
==============================================================================
--- trunk/m4macros/glib-2.0.m4	(original)
+++ trunk/m4macros/glib-2.0.m4	Tue Jan 15 10:12:58 2008
@@ -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 @@
          gthread) 
              pkg_config_args="$pkg_config_args gthread-2.0"
          ;;
+         gio*) 
+             pkg_config_args="$pkg_config_args $module-2.0"
+         ;;
       esac
   done