diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-02 16:37:13 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-02 16:37:13 +0200 |
| commit | f9dbc997f0d1c0ce6f6f265c0a04d693b24642dc (patch) | |
| tree | 4adf09c7a1b503334a449c2c2c5924b75ee63cc1 | |
| parent | 85d7b857fb8ca8e3c03d4abb3368a0966760630c (diff) | |
| parent | 4af7b4fa9b0cc85ea8b7a00f748c324d5f56b47b (diff) | |
Merge gnutls detection fix.
| -rwxr-xr-x | configure | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -214,7 +214,14 @@ echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings 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` CFLAGS+=`libgnutls-config --cflags` |