4de9370493
"please commit it" sturm@ ok espie@
30 lines
1.1 KiB
Plaintext
30 lines
1.1 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.2 2006/12/13 08:52:07 kili Exp $
|
|
--- configure.in.orig Tue Nov 28 23:17:21 2006
|
|
+++ configure.in Sun Dec 10 12:09:19 2006
|
|
@@ -200,17 +200,7 @@ CFLAGS_X="$CFLAGS"
|
|
LIBS_X="$LIBS"
|
|
cf_result=no
|
|
if test -z "$disable_ssl"; then
|
|
- PKG_CHECK_MODULES(OPENSSL,openssl,pkgconfig_openssl=yes,pkgconfig_openssl=no)
|
|
- if test "$pkgconfig_openssl" = "yes"; then
|
|
AC_MSG_CHECKING([for OpenSSL])
|
|
- CPPFLAGS="$CPPFLAGS `pkg-config openssl --cflags-only-I`"
|
|
- LIBS="$LIBS `pkg-config openssl --libs`"
|
|
- AC_TRY_LINK([#include <openssl/ssl.h>], [OpenSSL_add_all_algorithms()], cf_result=yes, cf_result=no)
|
|
- if test "$cf_result" != yes; then
|
|
- AC_TRY_LINK([#include <openssl/ssl.h>], [SSLeay_add_ssl_algorithms()], cf_result=yes, cf_result=no)
|
|
- fi
|
|
- else
|
|
- AC_MSG_CHECKING([for OpenSSL])
|
|
for ssldir in "" /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/local/www /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl; do
|
|
if test "$cf_result" = no; then
|
|
if test ! -z "$ssldir" && test "$ssldir" != /usr; then
|
|
@@ -225,7 +215,6 @@ if test -z "$disable_ssl"; then
|
|
fi
|
|
fi
|
|
done
|
|
- fi
|
|
|
|
AC_MSG_RESULT($cf_result)
|
|
|