From: Tollef Fog Heen <tfheen@qurzaw>
Date: Tue, 30 Jun 2009 03:05:52 +0000 (+0200)
Subject: Merge
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3ddc0344e02b77c3ebe74273be90b500e2448a4;p=pkg-config

Merge
---

c3ddc0344e02b77c3ebe74273be90b500e2448a4
diff --cc ChangeLog
index be748a9,1cba296..8ff6718
--- a/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 0be5f67,0be5f67..6bfe45c
--- a/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