elif test "$haveext"; then
AC_MSG_RESULT([yes])
ifdef([PHP_ADD_EXTENSION_DEP], [
- PHP_ADD_EXTENSION_DEP([http], $1, 0)
+ PHP_ADD_EXTENSION_DEP([http], $1, true)
])
$2
else
fi
])
-dnl -------
-dnl HEADERS
-dnl -------
+dnl ----
+dnl STDC
+dnl ----
AC_CHECK_HEADERS([netdb.h unistd.h])
+ PHP_CHECK_FUNC(gethostname, nsl)
+ PHP_CHECK_FUNC(getdomainname, nsl)
+ PHP_CHECK_FUNC(getservbyport, nsl)
+ PHP_CHECK_FUNC(getservbyname, nsl)
dnl ----
dnl ZLIB
done
if test -z "$ZLIB_DIR"; then
AC_MSG_RESULT([not found])
- AC_MSG_WARN([could not find zlib.h])
+ AC_MSG_ERROR([could not find zlib.h])
else
AC_MSG_RESULT([found in $ZLIB_DIR])
AC_MSG_CHECKING([for zlib version >= 1.2.0.4])
AC_MSG_CHECKING([for SSL library used])
CURL_SSL_FLAVOUR=
for i in $CURL_LIBS; do
- if test "$i" = "-lssl"; then
- CURL_SSL_FLAVOUR="openssl"
- AC_MSG_RESULT([openssl])
- AC_DEFINE([HTTP_HAVE_OPENSSL], [1], [ ])
- AC_CHECK_HEADERS([openssl/crypto.h])
- break
- elif test "$i" = "-lgnutls"; then
- CURL_SSL_FLAVOUR="gnutls"
- AC_MSG_RESULT([gnutls])
- AC_DEFINE([HTTP_HAVE_GNUTLS], [1], [ ])
- AC_CHECK_HEADERS([gcrypt.h])
- break
- fi
+ case $i in
+ -lssl* | -lyassl*)
+ CURL_SSL_FLAVOUR="openssl"
+ AC_MSG_RESULT([openssl])
+ AC_DEFINE([HTTP_HAVE_OPENSSL], [1], [ ])
+ AC_CHECK_HEADERS([openssl/crypto.h])
+ break
+ ;;
+ -lgnutls*)
+ CURL_SSL_FLAVOUR="gnutls"
+ AC_MSG_RESULT([gnutls])
+ AC_DEFINE([HTTP_HAVE_GNUTLS], [1], [ ])
+ AC_CHECK_HEADERS([gcrypt.h])
+ break
+ ;;
+ esac
done
if test -z "$CURL_SSL_FLAVOUR"; then
AC_MSG_RESULT([unknown!])
[AC_DEFINE([HAVE_CURL_GETFORMDATA], [1], [ ])], [ ],
[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
)
+ dnl New API function which obsoletes use of Curl_getFormData (>=7.15.5)
+ PHP_CHECK_LIBRARY(curl, curl_formget,
+ [AC_DEFINE([HAVE_CURL_FORMGET], [1], [ ])], [ ],
+ [$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
+ )
fi
dnl ----