diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-12-17 02:00:38 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2005-12-17 02:00:38 +0100 |
| commit | 32c632fb46e58043a2d437c44cad783a59b7aea9 (patch) | |
| tree | 0dc633ae6a9bd9ce5c1bba5742ed0e0c24839bfd | |
| parent | 4bfca70ab85926364682a11aef5f921eb337cf54 (diff) | |
Allow overriding the pkg-config command to run
| -rwxr-xr-x | configure | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -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<<EOF>>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<<EOF>>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 |