[maemo-commits] [maemo-commits] r15552 - in projects/haf/trunk/glib: . m4macros

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2008-05-14 16:04:55 +0300 (Wed, 14 May 2008)
New Revision: 15552

Modified:
   projects/haf/trunk/glib/ChangeLog
   projects/haf/trunk/glib/m4macros/glib-2.0.m4
Log:
2008-05-14  Michael Natterer  <mitch at imendio.com>

	* m4macros/glib-2.0.m4: revert to upstream. Was apparently
	forgotten to upgrade since 2.10. Bumps pkg-config requirement to
	0.16, but that's what configure requires anyway so it's installed
	on the platform.



Modified: projects/haf/trunk/glib/ChangeLog
===================================================================
--- projects/haf/trunk/glib/ChangeLog	2008-05-14 11:57:36 UTC (rev 15551)
+++ projects/haf/trunk/glib/ChangeLog	2008-05-14 13:04:55 UTC (rev 15552)
@@ -1,3 +1,14 @@
+2008-05-14  Michael Natterer  <mitch at imendio.com>
+
+	* m4macros/glib-2.0.m4: revert to upstream. Was apparently
+	forgotten to upgrade since 2.10. Bumps pkg-config requirement to
+	0.16, but that's what configure requires anyway so it's installed
+	on the platform.
+
+2008-05-14  Michael Natterer  <mitch at imendio.com>
+
+	* === Start Maemo-GLib 2.16.3 ===
+
 2008-04-08  Matthias Clasen  <mclasen at redhat.com>
 
 	* === Released 2.16.3 ===

Modified: projects/haf/trunk/glib/m4macros/glib-2.0.m4
===================================================================
--- projects/haf/trunk/glib/m4macros/glib-2.0.m4	2008-05-14 11:57:36 UTC (rev 15551)
+++ projects/haf/trunk/glib/m4macros/glib-2.0.m4	2008-05-14 13:04:55 UTC (rev 15552)
@@ -34,20 +34,13 @@
       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)