INN commit: trunk/m4 (openssl.m4)

[INN Commit]

    Date: Monday, October 28, 2013 @ 13:58:39
  Author: iulius
Revision: 9551

do not stop the build if the crypto library, when optional, is not found

Modified:
  trunk/m4/openssl.m4

------------+
 openssl.m4 |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: openssl.m4
===================================================================
--- openssl.m4	2013-10-26 20:30:02 UTC (rev 9550)
+++ openssl.m4	2013-10-28 20:58:39 UTC (rev 9551)
@@ -52,7 +52,8 @@
  AC_SUBST([CRYPTO_LIBS])
  INN_LIB_OPENSSL_SWITCH
  AC_CHECK_LIB([crypto], [AES_cbc_encrypt], [CRYPTO_LIBS=-lcrypto],
-    [AC_MSG_ERROR([cannot find usable OpenSSL crypto library])])
+    [AS_IF([test x"$1" = xtrue],
+        [AC_MSG_ERROR([cannot find usable OpenSSL crypto library])])])
  AS_IF([test x"$inn_reduced_depends" = xtrue],
     [AC_CHECK_LIB([ssl], [SSL_library_init],
         [OPENSSL_LIBS="-lssl $CRYPTO_LIBS"],
@@ -61,7 +62,8 @@
         [$CRYPTO_LIBS])],
     [AC_CHECK_LIB([ssl], [SSL_library_init], [OPENSSL_LIBS=-lssl],
         [AS_IF([test x"$1" = xtrue],
-            [AC_MSG_ERROR([cannot find usable OpenSSL library])])])])])
+            [AC_MSG_ERROR([cannot find usable OpenSSL library])])])])
+ INN_LIB_OPENSSL_RESTORE])
 
 dnl The main macro for packages with mandatory OpenSSL support.
 AC_DEFUN([INN_LIB_OPENSSL],
@@ -79,4 +81,5 @@
         [_INN_LIB_OPENSSL_INTERNAL([true])],
         [_INN_LIB_OPENSSL_INTERNAL([false])])])
  AS_IF([test x"$OPENSSL_LIBS" != x],
-    [AC_DEFINE([HAVE_SSL], 1, [Define if libssl is available.])])])
+    [inn_use_OPENSSL=true
+     AC_DEFINE([HAVE_SSL], 1, [Define if libssl is available.])])])