From 722a2cf8bd288af87df4d8d442e49ee0d322f4c7 Mon Sep 17 00:00:00 2001
From: Olivier Thauvin <nanardon@mandriva.org>
Date: Sat, 17 Feb 2007 15:52:22 +0000
Subject: - really fix #28577

---
 ChangeLog        | 25 +++++++++++++++++++++++++
 pkgconfigdeps.sh |  6 ++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3f72894..b5e00c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2007-02-16 18:42  nanardon
+
+	* ChangeLog, configure.ac: - 1.35
+
+2007-02-16 18:41  nanardon
+
+	* find-requires.in: - enable pkgconfig requirement
+
+2007-02-16 18:42  nanardon
+
+	* ChangeLog, configure.ac: - 1.35
+
+2007-02-16 18:41  nanardon
+
+	* find-requires.in: - enable pkgconfig requirement
+
+2007-02-13 23:52  nanardon
+
+	* pkgconfigdeps.sh: - remove misplaced and not working code
+
+2007-02-13 23:51  nanardon
+
+	* pkgconfigdeps.sh: - call pkgconfig one time all .pc file to allow
+	  to find all deps #28577
+
 2007-02-13 23:52  nanardon
 
 	* pkgconfigdeps.sh: - remove misplaced and not working code
diff --git a/pkgconfigdeps.sh b/pkgconfigdeps.sh
index b884205..f5eb66c 100755
--- a/pkgconfigdeps.sh
+++ b/pkgconfigdeps.sh
@@ -18,11 +18,12 @@ case $1 in
     *.pc)
 	# Assume that this file doesn't contain useful information.
     pcfiles=${pcfiles}" ${filename}"
+    PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$(dirname ${filename})
 	;;
     esac
     done
 	# Query the dependencies of the package.
-	$pkgconfig --print-provides $pcfiles 2> /dev/null | while read n r v ; do
+	PKG_CONFIG_PATH=$PKG_CONFIG_PATH $pkgconfig --print-provides $pcfiles 2> /dev/null | while read n r v ; do
 	    # We have a dependency.  Make a note that we need the pkgconfig
 	    # tool for this package.
 	    echo "pkgconfig($n)" "$r" "$v"
@@ -34,9 +35,10 @@ case $1 in
     case "${filename}" in
     *.pc)
     pcfiles=${pcfiles}" ${filename}"
+    PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$(dirname ${filename})
     esac
     done
-	$pkgconfig --print-requires ${pcfiles} 2> /dev/null | while read n r v ; do
+    PKG_CONFIG_PATH=$PKG_CONFIG_PATH $pkgconfig --print-requires ${pcfiles} 2> /dev/null | while read n r v ; do
 	    echo "pkgconfig($n)" "$r" "$v"
     done
     ;;
-- 
cgit v1.2.1