Changeset f9dbc99


Ignore:
Timestamp:
2008-04-02T14:37:13Z (13 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:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    r85d7b85 rf9dbc99  
    215215detect_gnutls()
    216216{
    217         if libgnutls-config --version > /dev/null 2> /dev/null; then
     217        if $PKG_CONFIG --exists gnutls; then
     218                cat <<EOF>>Makefile.settings
     219EFLAGS+=`$PKG_CONFIG --libs gnutls`
     220CFLAGS+=`$PKG_CONFIG --cflags gnutls`
     221EOF
     222                ssl=gnutls
     223                ret=1
     224        elif libgnutls-config --version > /dev/null 2> /dev/null; then
    218225                cat <<EOF>>Makefile.settings
    219226EFLAGS+=`libgnutls-config --libs`
Note: See TracChangeset for help on using the changeset viewer.