From c8e5702127e507e82e6f68a4b8c546803accea9d Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 30 Jun 2005 08:19:37 +0000
Subject: import clean BK tree at cset 1.3670

---
 .../glib-1.2-1.2.10/glib-config-use-pkg-config     | 70 ++++++++++++++++++++++
 1 file changed, 70 insertions(+)

(limited to 'packages/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config')

diff --git a/packages/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config b/packages/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config
index e69de29bb2..d12b4a9d55 100644
--- a/packages/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config
+++ b/packages/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config
@@ -0,0 +1,70 @@
+patch glib-config so it indirects to pkgconfig for cflags and libs
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- glib-1.2.10/glib-config.in~glib-config-use-pkg-config
++++ glib-1.2.10/glib-config.in
+@@ -28,6 +28,8 @@
+ 
+ lib_glib=yes
+ 
++cmd="pkg-config "
++
+ while test $# -gt 0; do
+   case "$1" in
+   -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+@@ -55,20 +57,9 @@
+       echo @GLIB_VERSION@
+       exit 0
+       ;;
+-    --cflags)
+-      echo_cflags=yes
+-      ;;
+-    --libs)
+-      echo_libs=yes
+-      ;;
+-    glib)
+-      lib_glib=yes
+-      ;;
+-    gmodule)
+-      lib_gmodule=yes
+-      ;;
+-    gthread)
+-      lib_gthread=yes
++    --cflags | --libs | glib | gmodule | gthread)
++      cmd="$cmd $1 "
++      echo_pkgconfig="yes"
+       ;;
+     *)
+       usage 1 1>&2
+@@ -83,26 +74,6 @@
+ if test "$echo_exec_prefix" = "yes"; then
+ 	echo $exec_prefix
+ fi
+-if test "$echo_cflags" = "yes"; then
+-	cflags=""
+-	if test "$lib_gthread" = "yes"; then
+-		cflags="$cflags @G_THREAD_CFLAGS@"
+-	fi
+-	echo -I@includedir@/glib-1.2 -I@libdir@/glib/include $includes $cflags
+-fi
+-if test "$echo_libs" = "yes"; then
+-	libsp=""
+-	libsa=""
+-	if test "$lib_glib" = "yes"; then
+-		libsp="$libsp -lglib"
+-	fi
+-	if test "$lib_gthread" = "yes"; then
+-		libsp="-lgthread $libsp"
+-		libsa="$libsa @G_THREAD_LIBS@"
+-	fi
+-	if test "$lib_gmodule" = "yes"; then
+-		libsp="@G_MODULE_LDFLAGS@ -lgmodule $libsp"
+-		libsa="$libsa @G_MODULE_LIBS@"
+-	fi
+-	echo -L@libdir@ $libsp $libsa
++if test "$echo_pkgconfig" = "yes"; then
++	echo `$cmd`
+ fi
-- 
cgit v1.2.3