soft require openssl

eggheads · Oct 2, 2023 · 9cf3579 · 9cf3579
1 parent 45445f2
commit 9cf3579
Showing 1 changed file with 14 additions and 21 deletions.
diff --git a/aclocal.m4 b/aclocal.m4
@@ -1530,13 +1530,10 @@ AC_DEFUN([EGG_TLS_ENABLE],
 [
   AC_MSG_CHECKING([whether to enable TLS support])
   AC_ARG_ENABLE(tls,
-    [  --enable-tls            enable TLS support (autodetect)],
-    [enable_tls="$enableval"])
-  AC_ARG_ENABLE(tls,
-    [  --disable-tls           disable TLS support ], [enable_tls="$enableval"],
-    [enable_tls="autodetect"])
+    [  --disable-tls           disable TLS support ], [tls_enabled="$enableval"],
+    [tls_enabled="$enableval"])
 
-  AC_MSG_RESULT([$enable_tls])
+  AC_MSG_RESULT([$tls_enabled])
 ])
 
 
@@ -1553,7 +1550,7 @@ AC_DEFUN(EGG_TLS_WITHSSL,
         CC="$CC -I$withval"
         CPP="$CPP -I$withval"
         AC_CHECK_HEADERS([openssl/ssl.h openssl/x509v3.h], [sslinc="-I$withval"], [
-          AC_MSG_WARN([Invalid path to OpenSSL headers. $withval/openssl/ doesn't contain the required files.])
+          AC_MSG_ERROR([Invalid path to OpenSSL headers. $withval/openssl/ doesn't contain the required files.])
           sslinc=""
           break
         ], [[
@@ -1567,7 +1564,7 @@ AC_DEFUN(EGG_TLS_WITHSSL,
         CC="$save_CC"
         CPP="$save_CPP"
       else
-        AC_MSG_WARN([Invalid path to OpenSSL headers. $withval is not a directory.])
+        AC_MSG_ERROR([Invalid path to OpenSSL headers. $withval is not a directory.])
       fi
     fi
   ])
@@ -1579,13 +1576,13 @@ AC_DEFUN(EGG_TLS_WITHSSL,
         AC_CHECK_LIB(crypto, X509_digest, , [havessllib="no"], [-L$withval -lssl])
         AC_CHECK_LIB(ssl, SSL_accept, , [havessllib="no"], [-L$withval -lcrypto])
         if test "$havessllib" = "no"; then
-          AC_MSG_WARN([Invalid path to OpenSSL libs. $withval doesn't contain the required files.])
+          AC_MSG_ERROR([Invalid path to OpenSSL libs. $withval doesn't contain the required files.])
         else
           AC_SUBST(SSL_LIBS, [-L$withval])
           LDFLAGS="${LDFLAGS} -L$withval"
         fi
       else
-        AC_MSG_WARN([You have specified an invalid path to OpenSSL libs. $withval is not a directory.])
+        AC_MSG_ERROR([You have specified an invalid path to OpenSSL libs. $withval is not a directory.])
       fi
     fi
   ])
@@ -1596,7 +1593,6 @@ dnl EGG_TLS_DETECT
 dnl
 AC_DEFUN([EGG_TLS_DETECT],
 [
-  tls_enabled="no"
   if test "$enable_tls" != "no"; then
     if test -z "$SSL_INCLUDES"; then
       AC_CHECK_HEADERS([openssl/ssl.h openssl/x509v3.h], , [havesslinc="no"], [
@@ -1632,15 +1628,13 @@ AC_DEFUN([EGG_TLS_DETECT],
           break
       ]])
     )
-    if test "$enable_tls" = "yes"; then
-      if test "$havesslinc" = "no"; then
-        AC_MSG_WARN([Cannot find OpenSSL headers.])
-        AC_MSG_WARN([Please specify the path to the openssl include dir using --with-sslinc=path])
-      fi
-      if test "$havessllib" = "no"; then
-        AC_MSG_WARN([Cannot find OpenSSL libraries.])
-        AC_MSG_WARN([Please specify the path to libssl and libcrypto using --with-ssllib=path])
-      fi
+    if test "$havesslinc" = "no"; then
+      AC_MSG_ERROR([Cannot find OpenSSL headers.])
+      AC_MSG_ERROR([Please specify the path to the openssl include dir using --with-sslinc=path])
+    fi
+    if test "$havessllib" = "no"; then
+      AC_MSG_ERROR([Cannot find OpenSSL libraries.])
+      AC_MSG_ERROR([Please specify the path to libssl and libcrypto using --with-ssllib=path])
     fi
     AC_MSG_CHECKING([for OpenSSL])
     if test "$havesslinc" = "no" || test "$havessllib" = "no"; then
@@ -1660,7 +1654,6 @@ AC_DEFUN([EGG_TLS_DETECT],
       )
       dnl EVP_PKEY_get1_EC_KEY: OpenSSL without EC (SunOS 5.11 Solaris 11.3 I love you Oracle)
       AC_CHECK_FUNCS([EVP_PKEY_get1_EC_KEY])
-      tls_enabled="yes"
       EGG_MD5_COMPAT
     fi
   fi