Browse code

Confgiuration patch by Bernd Kuhls to allow for building statically linked libraries.

Mickey Sola authored on 2015/10/06 03:24:58
Showing 3 changed files
... ...
@@ -38,7 +38,7 @@ else
38 38
     save_LDFLAGS="$LDFLAGS"
39 39
     LDFLAGS="$CURL_LDFLAGS"
40 40
     AC_CHECK_LIB([curl], [curl_easy_init], [curl_msg="";have_curl="yes";CLAMSUBMIT_LIBS="$CLAMSUBMIT_LIBS $CURL_LDFLAGS";CLAMSUBMIT_CFLAGS="$CLAMSUBMIT_CFLAGS $CURL_CPPFLAGS"],
41
-            [AC_MSG_WARN([Your libcurl is misconfigured. Please use the web interface for submitting FPs/FNs.])])
41
+            [AC_MSG_WARN([Your libcurl is misconfigured. Please use the web interface for submitting FPs/FNs.])], [$CURL_LDFLAGS])
42 42
     LDFLAGS="$save_LDFLAGS"
43 43
 fi
44 44
 
... ...
@@ -26,7 +26,7 @@ save_LDFLAGS="$LDFLAGS"
26 26
 save_CFLAGS="$CFLAGS"
27 27
 save_LIBS="$LIBS"
28 28
 
29
-SSL_LIBS="-lssl -lcrypto"
29
+SSL_LIBS="-lssl -lcrypto -lz"
30 30
 
31 31
 if test "$LIBSSL_HOME" != "/usr"; then
32 32
     SSL_LDFLAGS="-L$LIBSSL_HOME/lib"
... ...
@@ -41,12 +41,12 @@ fi
41 41
 have_ssl="no"
42 42
 have_crypto="no"
43 43
 
44
-AC_CHECK_LIB([ssl], [SSL_library_init], [have_ssl="yes"], [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])], [-lcrypto])
44
+AC_CHECK_LIB([ssl], [SSL_library_init], [have_ssl="yes"], [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])], [-lcrypto -lz])
45 45
 
46
-AC_CHECK_LIB([crypto], [EVP_EncryptInit], [have_crypto="yes"], [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])])
46
+AC_CHECK_LIB([crypto], [EVP_EncryptInit], [have_crypto="yes"], [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])], [-lcrypto -lz])
47 47
 
48 48
 dnl OpenSSL 0.9.8 is the minimum required version due to X509_VERIFY_PARAM
49
-AC_CHECK_LIB([ssl], [X509_VERIFY_PARAM_new], [], [AC_MSG_ERROR([Your OpenSSL installation is missing the X509_VERIFY_PARAM function. Please upgrade to a more recent version of OpenSSL.])], [-lcrypto])
49
+AC_CHECK_LIB([ssl], [X509_VERIFY_PARAM_new], [], [AC_MSG_ERROR([Your OpenSSL installation is missing the X509_VERIFY_PARAM function. Please upgrade to a more recent version of OpenSSL.])], [-lcrypto -lz])
50 50
 
51 51
 LDFLAGS="$save_LDFLAGS"
52 52
 CFLAGS="$save_CFLAGS"
... ...
@@ -67,7 +67,7 @@ if test "X$found_xml" != "Xno"; then
67 67
     save_LDFLAGS="$LDFLAGS"
68 68
     LDFLAGS="$LDFLAGS $XML_LIBS"
69 69
 
70
-    AC_CHECK_LIB([xml2], [xmlTextReaderRead], [working_xml="yes"], [working_xml="no"])
70
+    AC_CHECK_LIB([xml2], [xmlTextReaderRead], [working_xml="yes"], [working_xml="no"], [$XML_LIBS])
71 71
 
72 72
     CPPFLAGS="$save_CPPFLAGS"
73 73
     LDFLAGS="$save_LDFLAGS"