[g-a-devel] atk / glib version ...



	The attached patch stops atk HEAD requiring a very recent glib, though
it should use it if it can,

	Can you test/commit for me Bill ? works for me but ... ;-)

	HTH,

		Michael.

-- 
 michael meeks novell com  <><, Pseudo Engineer, itinerant idiot
Index: configure.in
===================================================================
RCS file: /cvs/gnome/atk/configure.in,v
retrieving revision 1.153
diff -u -r1.153 configure.in
--- configure.in	5 Apr 2005 15:32:33 -0000	1.153
+++ configure.in	22 Apr 2005 13:56:39 -0000
@@ -53,10 +53,6 @@
 dnl
 dnl ==========================================================================
 
-GLIB_REQUIRED_VERSION=2.5.7
-AC_SUBST(GLIB_REQUIRED_VERSION)
-
-
 ATK_MAJOR_VERSION=atk_major_version
 ATK_MINOR_VERSION=atk_minor_version
 ATK_MICRO_VERSION=atk_micro_version
@@ -140,8 +136,17 @@
 fi
 changequote([,])dnl
 
-GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0"
+AM_PATH_GLIB_2_0(2.5.7,have_no_export=true,have_no_export=false)
+if test "x$have_no_export" = "xtrue"; then
+   GLIB_REQUIRED_VERSION=2.5.7
+   glib_no_export_package="gmodule-no-export-2.0"
+else
+   GLIB_REQUIRED_VERSION=2.0.0
+   glib_no_export_package=
+fi
+GLIB_PACKAGES="gobject-2.0 $glib_no_export_package"
 AC_SUBST(GLIB_PACKAGES)
+AC_SUBST(GLIB_REQUIRED_VERSION)
 
 dnl This PATH_GLIB is somewhat redundant, but does a sanity compile and 
 dnl importantly defines the GLIB_GENMARSHAL variable for subst into the


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]