27 lines
996 B
Plaintext
27 lines
996 B
Plaintext
$OpenBSD: patch-acinclude_m4,v 1.5 2019/11/21 23:35:57 sthen Exp $
|
|
|
|
Index: acinclude.m4
|
|
--- acinclude.m4.orig
|
|
+++ acinclude.m4
|
|
@@ -2327,9 +2327,9 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
|
|
test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
|
|
|
|
dnl Fallbacks for different configure options
|
|
- if test "$PHP_OPENSSL" != "no"; then
|
|
+ if test -n "$PHP_OPENSSL" && test "$PHP_OPENSSL" != "no"; then
|
|
PHP_OPENSSL_DIR=$PHP_OPENSSL
|
|
- elif test "$PHP_IMAP_SSL" != "no"; then
|
|
+ elif test -n "$PHP_IMAP_SSL" && test "$PHP_IMAP_SSL" != "no"; then
|
|
PHP_OPENSSL_DIR=$PHP_IMAP_SSL
|
|
fi
|
|
|
|
@@ -2340,7 +2340,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
|
|
|
|
dnl If pkg-config is found try using it
|
|
if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
|
|
- if $PKG_CONFIG --atleast-version=1.0.1 openssl; then
|
|
+ if $PKG_CONFIG openssl; then
|
|
found_openssl=yes
|
|
OPENSSL_LIBS=`$PKG_CONFIG --libs openssl`
|
|
OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
|