Send inn-committers mailing list submissions to
inn-committers@lists.isc.org
To subscribe or unsubscribe via the World Wide Web, visit
https://lists.isc.org/mailman/listinfo/inn-committers
or, via email, send a message with subject or body 'help' to
inn-committers-requ...@lists.isc.org
You can reach the person managing the list at
inn-committers-ow...@lists.isc.org
When replying, please edit your Subject line so it is more specific
than "Re: Contents of inn-committers digest..."
Today's Topics:
1. INN commit: trunk/m4 (openssl.m4) (INN Commit)
----------------------------------------------------------------------
Message: 1
Date: Mon, 28 Oct 2013 13:58:39 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk/m4 (openssl.m4)
Message-ID: <20131028205840.0722c67...@hope.eyrie.org>
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.])])])
------------------------------
_______________________________________________
inn-committers mailing list
inn-committers@lists.isc.org
https://lists.isc.org/mailman/listinfo/inn-committers
End of inn-committers Digest, Vol 56, Issue 4
*********************************************
