[PATH] pkg-config / $PKG_CONFIG fix

[Enrico Weigelt <weigelt metux de>]

Hi folks,


here's a little fix against configure to use always $PKG_CONFIG
for calling pkg-config.

I've got two versions, one against 2.6.4, another against 2.8.0.


cu
-- 
---------------------------------------------------------------------
 Enrico Weigelt    ==   metux IT service

  phone:     +49 36207 519931         www:       http://www.metux.de/
  fax:       +49 36207 519932         email:     contact metux de
  cellphone: +49 174 7066481
---------------------------------------------------------------------
 -- DSL ab 0 Euro. -- statische IP -- UUCP -- Hosting -- Webshops --
---------------------------------------------------------------------

diff -ruN gtk+-2.6.4.orig/configure gtk+-2.6.4/configure
--- gtk+-2.6.4.orig/configure	Tue Jun 14 21:50:04 2005
+++ gtk+-2.6.4/configure	Tue Jun 14 21:53:15 2005
@@ -28410,7 +28410,7 @@
 
   if test $pango_omitted_x_deps = yes ; then
     # Old versions of Xft didn't necessarily include -lX11 in the output
-    x_libs="`pkg-config --libs xft` -lX11 $X_EXTRA_LIBS"
+    x_libs="`$PKG_CONFIG --libs xft` -lX11 $X_EXTRA_LIBS"
   fi
 
   ## Strip the .la files
diff -ruN gtk+-2.6.4.orig/configure.in gtk+-2.6.4/configure.in
--- gtk+-2.6.4.orig/configure.in	Tue Jun 14 21:50:01 2005
+++ gtk+-2.6.4/configure.in	Tue Jun 14 21:57:02 2005
@@ -1075,7 +1075,7 @@
   
   if test $pango_omitted_x_deps = yes ; then
     # Old versions of Xft didn't necessarily include -lX11 in the output
-    x_libs="`pkg-config --libs xft` -lX11 $X_EXTRA_LIBS"
+    x_libs="`$PKG_CONFIG --libs xft` -lX11 $X_EXTRA_LIBS"
   fi    	
 
   ## Strip the .la files
diff -ruN gtk+-2.6.4.orig/m4macros/gtk-2.0.m4 gtk+-2.6.4/m4macros/gtk-2.0.m4
--- gtk+-2.6.4.orig/m4macros/gtk-2.0.m4	Tue Jun 14 21:50:04 2005
+++ gtk+-2.6.4/m4macros/gtk-2.0.m4	Tue Jun 14 21:58:27 2005
@@ -27,7 +27,7 @@
   AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
   if test x$PKG_CONFIG != xno ; then
-    if pkg-config --atleast-pkgconfig-version 0.7 ; then
+    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
       :
     else
       echo "*** pkg-config too old; version 0.7 or better required."

diff -ruN gtk+-2.8.0.orig/configure gtk+-2.8.0/configure
--- gtk+-2.8.0.orig/configure	Wed Sep 21 23:17:07 2005
+++ gtk+-2.8.0/configure	Thu Sep 22 01:17:49 2005
@@ -27800,7 +27800,7 @@
   if $PKG_CONFIG --exists x11 xext; then
     have_base_x_pc=true
     X_PACKAGES="x11 xext"
-    x_libs="`pkg-config --libs x11 xext`"
+    x_libs="`$PKG_CONFIG --libs x11 xext`"
 
     # Strip out any .la files that pkg-config might give us (this happens
     # with -uninstalled.pc files)
diff -ruN gtk+-2.8.0.orig/configure.in gtk+-2.8.0/configure.in
--- gtk+-2.8.0.orig/configure.in	Wed Sep 21 23:14:27 2005
+++ gtk+-2.8.0/configure.in	Thu Sep 22 01:18:28 2005
@@ -1039,7 +1039,7 @@
   if $PKG_CONFIG --exists x11 xext; then
     have_base_x_pc=true
     X_PACKAGES="x11 xext"
-    x_libs="`pkg-config --libs x11 xext`"
+    x_libs="`$PKG_CONFIG --libs x11 xext`"
     
     # Strip out any .la files that pkg-config might give us (this happens
     # with -uninstalled.pc files)