X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=6917fca92b4739283c719a290b06e1bd1ffcc535;hp=176f0db181eb8fc82cc5e883e2f8334eb5ccd9ca;hb=6717839a1fa6fdbca866a31300d9b6b7b654b667;hpb=a0c554e2d175289493c8e0bed9ba482ee3a782cb

diff --git a/config9.m4 b/config9.m4
index 176f0db..6917fca 100644
--- a/config9.m4
+++ b/config9.m4
@@ -410,26 +410,44 @@ dnl ----
 			dnl end compile tests
 
 			AC_MSG_CHECKING([for default SSL CA info/path])
+			CURL_CA_PATH=
+			CURL_CA_INFO=
+			CURL_CONFIG_CA=$($CURL_CONFIG --ca)
+			if test -z "$CURL_CONFIG_CA"; then
+				CURL_CONFIG_CA=$($CURL_CONFIG --configure  | $EGREP -o -- "--with-ca@<:@^'@:>@*" | $SED 's/.*=//')
+			fi
 			for i in \
-				"$($CURL_CONFIG --ca)" \
+				"$CURL_CONFIG_CA" \
 				/etc/ssl/certs \
-				/etc/pki/tls/certs/ca-bundle.crt \
 				/etc/ssl/certs/ca-bundle.crt \
+				/etc/ssl/certs/ca-certificates.crt \
+				/etc/pki/tls/certs/ca-bundle.crt \
 				/etc/pki/tls/certs/ca-bundle.trust.crt \
 				/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem \
 				/System/Library/OpenSSL
 			do
-				if test -d "$i"; then
+				if test -z "$CURL_CA_PATH" && test -d "$i"; then
 					# check if it's actually a hashed directory
-					if ls "$i"/[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].0 >/dev/null 2>&1; then
-						AC_MSG_RESULT([capath: $i])
-						AC_DEFINE_UNQUOTED([PHP_HTTP_CURL_CAPATH], ["$i"], [path to default SSL CA path])
+					if ls "$i"/@<:@0-9a-f@:>@@<:@0-9a-f@:>@@<:@0-9a-f@:>@@<:@0-9a-f@:>@@<:@0-9a-f@:>@@<:@0-9a-f@:>@@<:@0-9a-f@:>@@<:@0-9a-f@:>@.0 >/dev/null 2>&1; then
+						CURL_CA_PATH="$i"
 					fi
-				elif test -e "$i"; then
-					AC_MSG_RESULT([cainfo: $i])
-					AC_DEFINE_UNQUOTED([PHP_HTTP_CURL_CAINFO], ["$i"], [path to default SSL CA info])
+				elif test -z "$CURL_CA_INFO" && test -f "$i"; then
+					CURL_CA_INFO="$i"
 				fi
 			done
+			if test -n "$CURL_CA_PATH" && test -n "$CURL_CA_INFO"; then
+				AC_MSG_RESULT([path:$CURL_CA_PATH, info:$CURL_CA_INFO])
+				AC_DEFINE_UNQUOTED([PHP_HTTP_CURL_CAPATH], ["$CURL_CA_PATH"], [path to default SSL CA path])
+				AC_DEFINE_UNQUOTED([PHP_HTTP_CURL_CAINFO], ["$CURL_CA_INFO"], [path to default SSL CA info])
+			elif test -n "$CURL_CA_INFO"; then
+				AC_MSG_RESULT([info:$CURL_CA_INFO])
+				AC_DEFINE_UNQUOTED([PHP_HTTP_CURL_CAINFO], ["$CURL_CA_INFO"], [path to default SSL CA info])
+			elif test -n "$CURL_CA_PATH"; then
+				AC_MSG_RESULT([path:$CURL_CA_PATH])
+				AC_DEFINE_UNQUOTED([PHP_HTTP_CURL_CAPATH], ["$CURL_CA_PATH"], [path to default SSL CA path])
+			else
+				AC_MSG_RESULT([none])
+			fi
 
 			PHP_ADD_INCLUDE($CURL_DIR/include)
 			PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)