diff mbox

[v3,1/2] ./configure: request pkg-config to provide private libs when static linking

Message ID 1327343629-23250-1-git-send-email-slyfox@inbox.ru
State New
Headers show

Commit Message

Sergei Trofimovich Jan. 23, 2012, 6:33 p.m. UTC 
From: Sergei Trofimovich <slyfox@gentoo.org>

Added wrapper around pkg-config to allow:
- safe options injection via ${QEMU_PKG_CONFIG_FLAGS}
- spaces in path to pkg-config

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
 configure |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

Comments

Sergei Trofimovich Jan. 29, 2012, 7:52 a.m. UTC | #1 
On Mon, 23 Jan 2012 21:33:49 +0300
Sergei Trofimovich <slyfox@inbox.ru> wrote:

> From: Sergei Trofimovich <slyfox@gentoo.org>
> 
> Added wrapper around pkg-config to allow:
> - safe options injection via ${QEMU_PKG_CONFIG_FLAGS}
> - spaces in path to pkg-config
> 
> Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
> ---
>  configure |   11 ++++++++---
>  1 files changed, 8 insertions(+), 3 deletions(-)

ping
diff mbox

Patch

diff --git a/configure b/configure
index 467e87b..c90e519 100755
--- a/configure
+++ b/configure
@@ -234,7 +234,11 @@  ld="${LD-${cross_prefix}ld}"
 libtool="${LIBTOOL-${cross_prefix}libtool}"
 strip="${STRIP-${cross_prefix}strip}"
 windres="${WINDRES-${cross_prefix}windres}"
-pkg_config="${PKG_CONFIG-${cross_prefix}pkg-config}"
+pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}"
+query_pkg_config() {
+    "${pkg_config_exe}" ${QEMU_PKG_CONFIG_FLAGS} "$@"
+}
+pkg_config=query_pkg_config
 sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}"
 
 # default flags for all hosts
@@ -553,6 +557,7 @@  for opt do
   --static)
     static="yes"
     LDFLAGS="-static $LDFLAGS"
+    QEMU_PKG_CONFIG_FLAGS="--static $QEMU_PKG_CONFIG_FLAGS"
   ;;
   --mandir=*) mandir="$optarg"
   ;;
@@ -1445,8 +1450,8 @@  fi
 ##########################################
 # pkg-config probe
 
-if ! has $pkg_config; then
-  echo "Error: pkg-config binary '$pkg_config' not found"
+if ! has "$pkg_config_exe"; then
+  echo "Error: pkg-config binary '$pkg_config_exe' not found"
   exit 1
 fi