INN commit: trunk/m4 (lib-helper.m4 openssl.m4)

[INN Commit]

    Date: Thursday, November 21, 2013 @ 07:23:24
  Author: iulius
Revision: 9570

sync with latest lib-helper.m4 and openssl.m4 from rra-c-util

Fix a bug in the *_OPTIONAL version of all Autoconf macros using
lib-helper.m4 that would add yes/include and yes/lib to the compiler
and linker search paths.

Modified:
  trunk/m4/lib-helper.m4
  trunk/m4/openssl.m4

---------------+
 lib-helper.m4 |    2 +-
 openssl.m4    |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

Modified: lib-helper.m4
===================================================================
--- lib-helper.m4	2013-11-17 20:32:27 UTC (rev 9569)
+++ lib-helper.m4	2013-11-21 15:23:24 UTC (rev 9570)
@@ -125,7 +125,7 @@
         [Location of $2 headers and libraries])],
     [AS_IF([test x"$withval" = xno],
         [inn_use_$3=false],
-        [AS_IF([test x"$withval" != yes], [inn_$3[]_root="$withval"])
+        [AS_IF([test x"$withval" != xyes], [inn_$3[]_root="$withval"])
          inn_use_$3=true])])
  AC_ARG_WITH([$1][-include],
     [AS_HELP_STRING([--with-][$1][-include=DIR],

Modified: openssl.m4
===================================================================
--- openssl.m4	2013-11-17 20:32:27 UTC (rev 9569)
+++ openssl.m4	2013-11-21 15:23:24 UTC (rev 9570)
@@ -16,6 +16,12 @@
 dnl INN_LIB_CRYPTO_SWITCH.  Defines HAVE_OPENSSL and sets inn_use_OPENSSL to
 dnl true if the library is found.
 dnl
+dnl Provides the INN_LIB_OPENSSL_OPTIONAL macro, which should be used if
+dnl OpenSSL support is optional.  This macro will still set the substitution
+dnl variables and shell variables described above, but they'll be empty unless
+dnl OpenSSL libraries are detected.  HAVE_OPENSSL will be defined only if the
+dnl library is found.
+dnl
 dnl Depends on INN_ENABLE_REDUCED_DEPENDS and the lib-helper.m4 framework.
 dnl
 dnl The canonical version of this file is maintained in the rra-c-util