From 32c632fb46e58043a2d437c44cad783a59b7aea9 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 17 Dec 2005 02:00:38 +0100 Subject: Allow overriding the pkg-config command to run --- configure | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'configure') diff --git a/configure b/configure index e172d40d..37915a07 100755 --- a/configure +++ b/configure @@ -144,10 +144,14 @@ else exit 1; fi -if type pkg-config > /dev/null 2>/dev/null && pkg-config glib-2.0; then +if [ -z "$PKG_CONFIG" ]; then + PKG_CONFIG=pkg-config +fi + +if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then cat<>Makefile.settings -EFLAGS+=`pkg-config --libs glib-2.0 gmodule-2.0` -CFLAGS+=`pkg-config --cflags glib-2.0 gmodule-2.0` +EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0` +CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0` EOF echo '#define GLIB2' >> config.h elif type glib-config > /dev/null 2> /dev/null; then @@ -189,10 +193,10 @@ EOF detect_nss() { - if type pkg-config > /dev/null 2>/dev/null && pkg-config mozilla-nss; then + if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG mozilla-nss; then cat<>Makefile.settings -EFLAGS+=`pkg-config --libs mozilla-nss` -CFLAGS+=`pkg-config --cflags mozilla-nss` +EFLAGS+=`$PKG_CONFIG --libs mozilla-nss` +CFLAGS+=`$PKG_CONFIG --cflags mozilla-nss` EOF ssl=nss -- cgit v1.2.3