Merge

diff --cc ChangeLog
index be748a9e310942ab1d786632ad03478f7b130526,1cba2963523003f3f22c8dbb6a5924c4fdab4538..8ff6718ded4069251fe93dc741aecd284ddf0d59
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,17 +1,22 @@@
 -      
++2009-06-30  Tollef Fog Heen  <tfheen@err.no>
++
++      * pkg.m4: Add patch from Peter Rosin for somewhat nicer output if
++      you use the four-clause form of PKG_CHECK_MODULES.
++
+ 2009-06-12  Tor Lillqvist  <tml@iki.fi>
+ 
+       * parse.c: On Win32, if the value of a a variable other than the
+       "prefix" one starts with the non-overridden value of "prefix",
+       then replace that prefix, too, with the run-time one.
+ 
+       To avoid shadowing warnings, rename a 'p' variable to 'q'.
+ 
+       * pkg-config.1: Corresponding update.
+ 
+       * main.c
+       * pkg.h: Move the Win32 redefinition of PKG_CONFIG_PC_PATH from
+       main.c to pkg.h as it now is needed in pkg.c, too.
++
  2009-03-30  Tollef Fog Heen  <tfheen@err.no>
  
        * autogen.sh: Allow not running configure, wanted by cygwin.

diff --cc pkg.m4
index 0be5f678e8a44fdb51501ab44036d7af79dfb0cd,0be5f678e8a44fdb51501ab44036d7af79dfb0cd..6bfe45ce7132387aab77a4282ae7e0f0ecda06f4
--- 1/pkg.m4
--- 2/pkg.m4
+++ b/pkg.m4
@@@ -148,7 -148,7 +148,8 @@@ path to pkg-config
  _PKG_TEXT
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
--              [$4])
++              [AC_MSG_RESULT([no])
++                $4])
  else
        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
        $1[]_LIBS=$pkg_cv_[]$1[]_LIBS