Changeset f9dbc99

Timestamp:

2008-04-02T14:37:13Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

d179921d

Parents:

85d7b85 (diff), 4af7b4f (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 gnutls detection fix.

File:

• configure (modified) (1 diff)

configure

@@ -215 +215 @@
 detect_gnutls()
 {
-        if libgnutls-config --version > /dev/null 2> /dev/null; then
+        if $PKG_CONFIG --exists gnutls; then
+                cat <<EOF>>Makefile.settings
+EFLAGS+=`$PKG_CONFIG --libs gnutls`
+CFLAGS+=`$PKG_CONFIG --cflags gnutls`
+EOF
+                ssl=gnutls
+                ret=1
+        elif libgnutls-config --version > /dev/null 2> /dev/null; then
                 cat <<EOF>>Makefile.settings
 EFLAGS+=`libgnutls-config --libs`