configure: save pkg-config env in qconfig.pri
authorJohannes Zellner <johannes.zellner@nokia.com>
Sat, 12 May 2012 00:54:30 +0000 (17:54 -0700)
committerQt by Nokia <qt-info@nokia.com>
Mon, 14 May 2012 19:23:43 +0000 (21:23 +0200)
Store PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_LIBDIR for the usecase of
cross compilation in qconfig.pri. They will get picked up by
pkgConfigExecutable() in qt_functions.prf used from link_pkgconfig.prf
as environment for pkg-config calls.

Change-Id: I7d0de05c0bd21b435275fc26c66a80035ba30970
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
configure

index 2cefb65..8c0002c 100755 (executable)
--- a/configure
+++ b/configure
@@ -5719,6 +5719,14 @@ QT_LIBINFIX = $QT_LIBINFIX
 QT_NAMESPACE = $QT_NAMESPACE
 
 EOF
+
+if [ -n "$PKG_CONFIG_SYSROOT_DIR" ] || [ -n "$PKG_CONFIG_LIBDIR" ]; then
+    echo "# pkgconfig" >> "$QTCONFIG.tmp"
+    echo "PKG_CONFIG_SYSROOT_DIR = $PKG_CONFIG_SYSROOT_DIR" >> "$QTCONFIG.tmp"
+    echo "PKG_CONFIG_LIBDIR = $PKG_CONFIG_LIBDIR" >> "$QTCONFIG.tmp"
+    echo >> $"$QTCONFIG.tmp"
+fi
+
 if [ -n "$CFG_SYSROOT" ]; then
     echo "# sysroot" >>"$QTCONFIG.tmp"
     echo `basename "$XQMAKESPEC"` \{ >>"$QTCONFIG.tmp"