Changeset 643dfc4 for configure

Timestamp:

2005-12-17T01:25:58Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

e3fb678

Parents:

4146a07 (diff), 32c632f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge integration

File:

• configure (modified) (2 diffs)

configure

@@ -145 +145 @@
 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
@@ -190 +194 @@
 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