62 lines
2 KiB
Text
62 lines
2 KiB
Text
$NetBSD: patch-ab,v 1.7 2017/02/07 01:19:15 joerg Exp $
|
|
|
|
* portability fix
|
|
* DragonFly also not require extra libs for OpenSSL.
|
|
|
|
--- configure.orig 2013-03-24 21:36:30.000000000 +0000
|
|
+++ configure
|
|
@@ -10688,7 +10688,7 @@ darwin* | rhapsody*)
|
|
soname_spec='${libname}${release}${major}$shared_ext'
|
|
shlibpath_overrides_runpath=yes
|
|
shlibpath_var=DYLD_LIBRARY_PATH
|
|
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
|
|
+ shrext_cmds='.dylib'
|
|
|
|
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
|
|
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
|
|
@@ -11923,7 +11923,7 @@ CC="$lt_save_CC"
|
|
|
|
|
|
|
|
-if test "z$RM" == "z" ; then
|
|
+if test "z$RM" = "z" ; then
|
|
# Extract the first word of "rm", so it can be a program name with args.
|
|
set dummy rm; ac_word=$2
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
@@ -12597,7 +12597,7 @@ else
|
|
fi
|
|
|
|
|
|
-if test "z$shrext" == "z" ; then
|
|
+if test "z$shrext" = "z" ; then
|
|
shrext=$shrext_cmds
|
|
fi
|
|
|
|
@@ -13349,15 +13349,13 @@ elif test "z$with_openssl" != "z" ; then
|
|
*-*-osf5*) openssl_exlibs=;;
|
|
*-*-openbsd*) openssl_exlibs=;;
|
|
*-*-netbsd*) openssl_exlibs=;;
|
|
+ *-*-freebsd*|*-*-dragonfly*) openssl_exlibs=;;
|
|
+ *-*-darwin*) openssl_exlibs=;;
|
|
#FIXME: check if lib "dl" is required
|
|
*) openssl_exlibs=-ldl;;
|
|
esac
|
|
OPENSSL_CFLAGS="$OPENSSL_CFLAGS -I$with_openssl/include"
|
|
- if test -f "$with_openssl/lib/libcrypto${XMLSEC_SHLIBSFX}" ; then
|
|
- OPENSSL_LIBS="-L$with_openssl/lib -lcrypto $openssl_exlibs"
|
|
- else
|
|
- OPENSSL_LIBS="$with_openssl/lib/libcrypto.a $openssl_exlibs"
|
|
- fi
|
|
+ OPENSSL_LIBS="-L$with_openssl/lib -lcrypto $openssl_exlibs"
|
|
OPENSSL_FOUND="yes"
|
|
elif test "z$PKGCONFIG_FOUND" = "zyes" ; then
|
|
if test "z$OPENSSL_VERSION" = "z" ; then
|
|
@@ -13828,7 +13826,7 @@ else
|
|
XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST openssl"
|
|
fi
|
|
|
|
- if test "z$XMLSEC_NO_OPENSSL" == "z1"; then
|
|
+ if test "z$XMLSEC_NO_OPENSSL" = "z1"; then
|
|
XMLSEC_NO_OPENSSL_TRUE=
|
|
XMLSEC_NO_OPENSSL_FALSE='#'
|
|
else
|