X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=9a0cda368d89d7458562fbddb496624eebf7a417;hp=8bedac7fec173d1f098ce9e709ed4acf7871160b;hb=4daf43ea22acd40a8cb0e7fc47047da8fae1270f;hpb=8c1ed3eb9cb4d30b619cbf7a7a1141687cadeaaa

diff --git a/config9.m4 b/config9.m4
index 8bedac7..9a0cda3 100644
--- a/config9.m4
+++ b/config9.m4
@@ -177,7 +177,7 @@ dnl ----
 		CURL_LIBS=`$CURL_CONFIG --libs`
 		
 		AC_MSG_CHECKING([for SSL support in libcurl])
-		CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
+		CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
 		if test "$CURL_SSL" = "SSL"; then
 			AC_MSG_RESULT([yes])
 			AC_DEFINE([HTTP_HAVE_SSL], [1], [ ])
@@ -211,6 +211,21 @@ dnl ----
 			AC_MSG_RESULT([no])
 		fi
 		
+		AC_MSG_CHECKING([for bundled SSL CA info])
+		CURL_CAINFO=
+		for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt"; do
+			if test -f "$i"; then
+				CURL_CAINFO="$i"
+				break
+			fi
+		done
+		if test -z "$CURL_CAINFO"; then
+			AC_MSG_RESULT([not found])
+		else
+			AC_MSG_RESULT([$CURL_CAINFO])
+			AC_DEFINE_UNQUOTED([HTTP_CURL_CAINFO], ["$CURL_CAINFO"], [path to bundled SSL CA info])
+		fi
+		
 		PHP_ADD_INCLUDE($CURL_DIR/include)
 		PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
 		PHP_EVAL_LIBLINE($CURL_LIBS, HTTP_SHARED_LIBADD)