Merge changes from CUPS 1.6svn-r10510.

[thirdparty/cups.git] / config-scripts / cups-ssl.m4

diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4
index 157ed0f42b891f774f6922df8d4d8f3652c4a6dc..28d5d3482b76e8d91cb510228b14709cb477069a 100644 (file)
--- a/config-scripts/cups-ssl.m4
+++ b/config-scripts/cups-ssl.m4
@@ -124,7 +124,7 @@ if test x$enable_ssl != xno; then
 
     dnl Check for the OpenSSL library last...
     if test $have_ssl = 0 -a "x$enable_openssl" != "xno"; then
-       AC_CHECK_HEADER(openssl/ssl.h,
+       AC_CHECK_HEADER(openssl/ssl.h,[
            dnl Save the current libraries so the crypto stuff isn't always
            dnl included...
            SAVELIBS="$LIBS"
@@ -149,14 +149,16 @@ if test x$enable_ssl != xno; then
                    $libcrypto)
 
                if test "x${SSLLIBS}" != "x"; then
-                   LIBS="$SAVELIBS $SSLLIBS"
-                   AC_CHECK_FUNC(SSL_set_tlsext_host_name,
-                       AC_DEFINE(HAVE_SSL_SET_TLSEXT_HOST_NAME))
                    break
                fi
            done
 
-           LIBS="$SAVELIBS")
+           if test "x${SSLLIBS}" != "x"; then
+               LIBS="$SAVELIBS $SSLLIBS"
+               AC_CHECK_FUNCS(SSL_set_tlsext_host_name)
+           fi
+
+           LIBS="$SAVELIBS"])
     fi
 fi