[Forensics-changes] [yara] 180/368: Show warning if OpenSSL is not installed when running ./configure script

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.5.0
in repository yara.

commit c9c3d5796af25e748ee87e011d6f1e3bb4c0b131
Author: plusvic <plusvic at gmail.com>
Date:   Tue Feb 23 16:10:27 2016 +0100

    Show warning if OpenSSL is not installed when running ./configure script
---
 configure.ac | 74 +++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/configure.ac b/configure.ac
index 89a76b0..c08186c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,15 @@ case $host_os in
     darwin*) CFLAGS="$CFLAGS -I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib" ;;
 esac
 
+ACX_PTHREAD(
+    [LIBS="$PTHREAD_LIBS $LIBS"
+     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+     CC="$PTHREAD_CC"],
+    [AC_MSG_ERROR([pthread API support is required.])])
+
+AC_CHECK_LIB(m, isnan)
+AC_CHECK_LIB(m, log2)
+AC_CHECK_FUNCS([strlcpy strlcat memmem timegm])
 
 AC_ARG_ENABLE([profiling],
   [AS_HELP_STRING([--enable-profiling], [enable profiling support])],
@@ -70,40 +79,39 @@ AC_ARG_WITH([crypto],
   AS_HELP_STRING([--without-crypto],
     [ignore presence of OpenSSL and disable it]))
 
-  AS_IF([test "x$with_crypto" != "xno"],
-    [
-      AC_CHECK_LIB(crypto, MD5_Init,, [have_crypto=no])
-      AC_CHECK_LIB(crypto, MD5_Update,, [have_crypto=no])
-      AC_CHECK_LIB(crypto, MD5_Final,, [have_crypto=no])
-      AC_CHECK_LIB(crypto, SHA256_Init,, [have_crypto=no])
-      AC_CHECK_LIB(crypto, SHA256_Update,, [have_crypto=no])
-      AC_CHECK_LIB(crypto, SHA256_Final,, [have_crypto=no])
-    ],
-    [
-      have_crypto=no
-    ])
-
-  AS_IF([test "x$have_crypto" = "xno"],
-    [
-      AS_IF([test "x$with_crypto" = "xyes"],
-        [
-          AC_MSG_ERROR([OpenSSL requested but not found])
+AS_IF([test "x$with_crypto" != "xno"],
+  [
+    AC_CHECK_LIB(crypto, MD5_Init,, [have_crypto=no])
+    AC_CHECK_LIB(crypto, MD5_Update,, [have_crypto=no])
+    AC_CHECK_LIB(crypto, MD5_Final,, [have_crypto=no])
+    AC_CHECK_LIB(crypto, SHA256_Init,, [have_crypto=no])
+    AC_CHECK_LIB(crypto, SHA256_Update,, [have_crypto=no])
+    AC_CHECK_LIB(crypto, SHA256_Final,, [have_crypto=no])
+  ],
+  [
+    have_crypto=no
+  ])
+
+AS_IF([test "x$have_crypto" = "xno"],
+  [
+    AS_IF([test "x$with_crypto" = "xyes"],
+      [
+        AC_MSG_ERROR([please install OpenSSL library])
+      ],
+      [
+        AC_MSG_WARN([
+*******************************************************************************
+  Could not find OpenSSL library. The "hash" module and some features in "pe"
+  module has been disabled. If you want to enable all features please install
+  it and run this script again.
+*******************************************************************************
         ])
-    ],
-    [
-      build_hash_module=true
-      AC_DEFINE([HASH], [1], [enable hash module])
-    ])
-
-ACX_PTHREAD(
-    [LIBS="$PTHREAD_LIBS $LIBS"
-     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-     CC="$PTHREAD_CC"],
-    [AC_MSG_ERROR([pthread API support is required.])])
-
-AC_CHECK_LIB(m, isnan)
-AC_CHECK_LIB(m, log2)
-AC_CHECK_FUNCS([strlcpy strlcat memmem timegm])
+      ])
+  ],
+  [
+    build_hash_module=true
+    AC_DEFINE([HASH], [1], [enable hash module])
+  ])
 
 AM_CONDITIONAL([CUCKOO], [test x$build_cuckoo_module = xtrue])
 AM_CONDITIONAL([MAGIC], [test x$build_magic_module = xtrue])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git