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

[From: subversion at stage.maemo.org]

Author: fherrera
Date: 2007-06-21 16:38:25 +0300 (Thu, 21 Jun 2007)
New Revision: 12427

Modified:
   projects/haf/trunk/glib/ChangeLog
   projects/haf/trunk/glib/m4macros/glib-2.0.m4
Log:
2007-06-21  Fernando Herrera  <fernando.herrera-de-las-heras at nokia.com>

        * m4macros/glib-2.0.m4: Revert last upstream change and use
        AC_PATH_PROG for pkg-config detection instead of pkg-config own m4
        macro. This is needed because a problem in scratchbox that, even with
        pkg-config installed, aclocal and friends are looking for .m4 files on
        the /scratchbox/tools directory and then getting some ancient version
        of pkg-config.m4 file without the needed macro.
        



Modified: projects/haf/trunk/glib/ChangeLog
===================================================================
--- projects/haf/trunk/glib/ChangeLog	2007-06-21 13:31:12 UTC (rev 12426)
+++ projects/haf/trunk/glib/ChangeLog	2007-06-21 13:38:25 UTC (rev 12427)
@@ -1,3 +1,12 @@
+2007-06-21  Fernando Herrera  <fernando.herrera-de-las-heras at nokia.com>
+
+	* m4macros/glib-2.0.m4: Revert last upstream change and use 
+	AC_PATH_PROG for pkg-config detection instead of pkg-config own m4
+	macro. This is needed because a problem in scratchbox that, even with
+	pkg-config installed, aclocal and friends are looking for .m4 files on
+	the /scratchbox/tools directory and then getting some ancient version
+	of pkg-config.m4 file without the needed macro.
+	
 2007-05-16  Michael Natterer  <mitch at imendio.com>
 
 	* glib/gslice.[ch]: replace with versions from upstream trunk,

Modified: projects/haf/trunk/glib/m4macros/glib-2.0.m4
===================================================================
--- projects/haf/trunk/glib/m4macros/glib-2.0.m4	2007-06-21 13:31:12 UTC (rev 12426)
+++ projects/haf/trunk/glib/m4macros/glib-2.0.m4	2007-06-21 13:38:25 UTC (rev 12427)
@@ -31,13 +31,20 @@
       esac
   done
 
-  PKG_PROG_PKG_CONFIG([0.7])
+  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
   no_glib=""
 
-  if test "x$PKG_CONFIG" = x ; then
+  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
     no_glib=yes
-    PKG_CONFIG=no
   fi
 
   min_glib_version=ifelse([$1], ,2.0.0,$1)