|
Lines 1-135
Link Here
|
| 1 |
--- configure.orig 2017-09-12 13:21:59 UTC |
|
|
| 2 |
+++ configure |
| 3 |
@@ -12661,7 +12649,7 @@ CC=$lt_save_CC |
| 4 |
|
| 5 |
|
| 6 |
|
| 7 |
-if test "z$RM" == "z" ; then |
| 8 |
+if test "z$RM" = "z" ; then |
| 9 |
# Extract the first word of "rm", so it can be a program name with args. |
| 10 |
set dummy rm; ac_word=$2 |
| 11 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 12 |
@@ -13648,7 +13636,7 @@ case "${host}" in |
| 13 |
;; |
| 14 |
esac |
| 15 |
|
| 16 |
-if test "z$shrext" == "z" ; then |
| 17 |
+if test "z$shrext" = "z" ; then |
| 18 |
shrext=$shrext_cmds |
| 19 |
fi |
| 20 |
|
| 21 |
@@ -14384,6 +14372,7 @@ elif test "z$with_openssl" != "z" ; then |
| 22 |
*-*-osf5*) openssl_exlibs=;; |
| 23 |
*-*-openbsd*) openssl_exlibs=;; |
| 24 |
*-*-netbsd*) openssl_exlibs=;; |
| 25 |
+ *-*-freebsd*) openssl_exlibs=;; |
| 26 |
#FIXME: check if lib "dl" is required |
| 27 |
*) openssl_exlibs=-ldl;; |
| 28 |
esac |
| 29 |
@@ -14641,9 +14630,9 @@ if test "z$OPENSSL_FOUND" = "zno" ; then |
| 30 |
for dir in $ac_openssl_lib_dir ; do |
| 31 |
if test -f $dir/libcrypto.a ; then |
| 32 |
if test "z$dir" = "z/usr/lib" ; then |
| 33 |
- OPENSSL_LIBS="-lcrypto -ldl" |
| 34 |
+ OPENSSL_LIBS="-lcrypto" |
| 35 |
else |
| 36 |
- OPENSSL_LIBS="-L$dir -lcrypto -ldl" |
| 37 |
+ OPENSSL_LIBS="-L$dir -lcrypto " |
| 38 |
fi |
| 39 |
OPENSSL_LIBS_FOUND="yes" |
| 40 |
ac_found_openssl_lib_dir=$dir |
| 41 |
@@ -14668,7 +14669,7 @@ $as_echo_n "checking for openssl librari |
| 42 |
/* end confdefs.h. */ |
| 43 |
|
| 44 |
#include <openssl/opensslv.h> |
| 45 |
- #if OPENSSL_VERSION_NUMBER == 0x20000000L && defined(LIBRESSL_VERSION_NUMBER) |
| 46 |
+ #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L |
| 47 |
yes |
| 48 |
#endif |
| 49 |
|
| 50 |
@@ -14676,7 +14665,7 @@ _ACEOF |
| 51 |
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
| 52 |
$EGREP "yes" >/dev/null 2>&1; then : |
| 53 |
|
| 54 |
- OPENSSL_VERSION="1.0.0 (libressl)" |
| 55 |
+ OPENSSL_VERSION="1.0.0 (LibreSSL < 2.7)" |
| 56 |
|
| 57 |
else |
| 58 |
|
| 59 |
@@ -14692,7 +14681,31 @@ rm -f conftest* |
| 60 |
/* end confdefs.h. */ |
| 61 |
|
| 62 |
#include <openssl/opensslv.h> |
| 63 |
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L |
| 64 |
+ #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L |
| 65 |
+ yes |
| 66 |
+ #endif |
| 67 |
+ |
| 68 |
+_ACEOF |
| 69 |
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | |
| 70 |
+ $EGREP "yes" >/dev/null 2>&1; then : |
| 71 |
+ |
| 72 |
+ OPENSSL_VERSION="1.1.0 (LibreSSL >= 2.7)" |
| 73 |
+ |
| 74 |
+else |
| 75 |
+ |
| 76 |
+ OPENSSL_VERSION="" |
| 77 |
+ |
| 78 |
+fi |
| 79 |
+rm -f conftest* |
| 80 |
+ |
| 81 |
+ fi |
| 82 |
+ |
| 83 |
+ if test "z$OPENSSL_VERSION" = "z" ; then |
| 84 |
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 85 |
+/* end confdefs.h. */ |
| 86 |
+ |
| 87 |
+ #include <openssl/opensslv.h> |
| 88 |
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) |
| 89 |
yes |
| 90 |
#endif |
| 91 |
|
| 92 |
@@ -14749,12 +14762,12 @@ fi |
| 93 |
if test "z$OPENSSL_FOUND" = "zyes" ; then |
| 94 |
XMLSEC_NO_OPENSSL="0" |
| 95 |
OPENSSL_CFLAGS="$OPENSSL_CFLAGS -DXMLSEC_CRYPTO_OPENSSL=1" |
| 96 |
- XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST openssl" |
| 97 |
+ XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST openssl"; CPPFLAGS="$CPPFLAGS $OPENSSL_CFLAGS" |
| 98 |
else |
| 99 |
XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST openssl" |
| 100 |
fi |
| 101 |
|
| 102 |
- if test "z$XMLSEC_NO_OPENSSL" == "z1"; then |
| 103 |
+ if test "z$XMLSEC_NO_OPENSSL" = "z1"; then |
| 104 |
XMLSEC_NO_OPENSSL_TRUE= |
| 105 |
XMLSEC_NO_OPENSSL_FALSE='#' |
| 106 |
else |
| 107 |
@@ -14776,7 +14789,7 @@ NSPR_MIN_VERSION="4.4.1" |
| 108 |
NSS_CFLAGS="" |
| 109 |
NSS_LIBS="" |
| 110 |
NSS_LIBS_LIST="-lnss3 -lsmime3" |
| 111 |
-NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" |
| 112 |
+NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4 -lpthread" |
| 113 |
NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss" |
| 114 |
NSS_FOUND="no" |
| 115 |
NSPR_PACKAGE=mozilla-nspr |
| 116 |
@@ -15211,15 +15224,15 @@ $as_echo_n "checking for nss libraries > |
| 117 |
NSS_NSS_H="" |
| 118 |
|
| 119 |
if test "z$with_nss" != "z" ; then |
| 120 |
- NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss" |
| 121 |
+ NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include/nss/nss -I$with_nss/include/nss" |
| 122 |
if test "z$with_gnu_ld" = "zyes" ; then |
| 123 |
- NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST" |
| 124 |
+ NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib/nss -L$with_nss/lib/nss $NSS_LIBS_LIST" |
| 125 |
else |
| 126 |
- NSS_LIBS="$NSS_LIBS -L$with_nss/lib $NSS_LIBS_LIST" |
| 127 |
+ NSS_LIBS="$NSS_LIBS -L$with_nss/lib/nss $NSS_LIBS_LIST" |
| 128 |
fi |
| 129 |
NSS_INCLUDES_FOUND="yes" |
| 130 |
NSS_LIBS_FOUND="yes" |
| 131 |
- NSS_NSS_H="$with_nss/include/nss.h" |
| 132 |
+ NSS_NSS_H="$with_nss/include/nss/nss/nss.h" |
| 133 |
else |
| 134 |
for dir in $ac_nss_inc_dir ; do |
| 135 |
if test -f $dir/nss/nss.h ; then |