Version 3.0.36.

[yaz-moved-to-github.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 84c1bf3..03b9f34 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl This file is part of the YAZ toolkit.
 dnl Copyright (C) 1995-2008 Index Data
 AC_PREREQ([2.60])
-AC_INIT([yaz],[3.0.29],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[3.0.36],[yaz-help@indexdata.dk])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.9])
@@ -60,7 +60,7 @@ dnl
 dnl ------ OpenSSL
 AC_SUBST([SSL_CFLAGS])
 AC_SUBST([SSL_LIBS])
-openssl=default
+openssl=no
 sslver=no
 AC_ARG_WITH([openssl], [  --with-openssl[=PREFIX]   OpenSSL library in PREFIX], [openssl=$withval])
 SSL_CFLAGS=""
@@ -123,15 +123,15 @@ if test "$openssl" != "no"; then
     fi
 fi
 dnl ------ GNU TLS
-gnutls=no
-AC_ARG_WITH([gnutls], [  --with-gnutls[=PREFIX]   GNU TLS library in PREFIX], [gnutls=$withval])
+gnutls=default
+AC_ARG_WITH([gnutls], [  --with-gnutls[=PREFIX]    GNU TLS library in PREFIX], [gnutls=$withval])
 if test "$gnutls" != "no" -a "$sslver" = "no"; then
     gnutlsver=no
     if test "$gnutls" != "yes" -a "$gnutls" != "default"; then
        if test -x $gnutls/bin/pkg-config; then
            if $gnutls/bin/pkg-config --exists gnutls; then
                SSL_CFLAGS=`$gnutls/bin/pkg-config --cflags gnutls`
-               SSL_LIBS="`$gnutls/bin/pkg-config --libs gnutls` -lgnutls-openssl"
+               SSL_LIBS="`$gnutls/bin/pkg-config --libs gnutls`"
                gnutlsver=`$gnutls/bin/pkg-config --modversion gnutls`
            fi
        fi
@@ -139,7 +139,7 @@ if test "$gnutls" != "no" -a "$sslver" = "no"; then
        if test "$pkgconfigpath" != "NONE"; then
            if $pkgconfigpath --exists gnutls; then
                SSL_CFLAGS=`$pkgconfigpath --cflags gnutls`
-               SSL_LIBS="`$pkgconfigpath --libs gnutls` -lgnutls-openssl"
+               SSL_LIBS="`$pkgconfigpath --libs gnutls`"
                gnutlsver=`$pkgconfigpath --modversion gnutls`
            fi
        fi