X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-ares;a=blobdiff_plain;f=config.m4;h=1b96e73f4b561bedae8cfb5b19c92e7fbc9ccdfb;hp=46d96a37256a4240fed96d5bbe74f785ee49c1fb;hb=d7101dab193ff93425126756a861f3b1c7c6d5e8;hpb=a91fecd6cd84eb3dfb1937e654e23fa9e8602d59

diff --git a/config.m4 b/config.m4
index 46d96a3..1b96e73 100644
--- a/config.m4
+++ b/config.m4
@@ -18,6 +18,7 @@ if test "$PHP_ARES" != "no"; then
 		AC_MSG_ERROR(could not find ares.h)
 	fi
 	
+	PHP_ADD_LIBRARY(rt, ARES_SHARED_LIBADD)
 	PHP_ARES_LIB=
 	PHP_CHECK_LIBRARY(cares, ares_init, [
 			PHP_ARES_LIB=cares
@@ -56,14 +57,6 @@ if test "$PHP_ARES" != "no"; then
 		[AC_DEFINE([HAVE_ARES_GETNAMEINFO], [1], [ ])], [ ], 
 		[-L$PHP_ARES_DIR/$PHP_LIBDIR]
 	)
-	PHP_CHECK_LIBRARY($PHP_ARES_LIB, ares_expand_string, 
-		[AC_DEFINE([HAVE_ARES_EXPAND_STRING], [1], [ ])], [ ], 
-		[-L$PHP_ARES_DIR/$PHP_LIBDIR]
-	)
-	PHP_CHECK_LIBRARY($PHP_ARES_LIB, ares_parse_aaaa_reply, 
-		[AC_DEFINE([HAVE_ARES_PARSE_AAAA_REPLY], [1], [ ])], [ ], 
-		[-L$PHP_ARES_DIR/$PHP_LIBDIR]
-	)
 	PHP_CHECK_LIBRARY($PHP_ARES_LIB, ares_getsock, 
 		[AC_DEFINE([HAVE_ARES_GETSOCK], [1], [ ])], [ ], 
 		[-L$PHP_ARES_DIR/$PHP_LIBDIR]
@@ -73,6 +66,31 @@ if test "$PHP_ARES" != "no"; then
 		[-L$PHP_ARES_DIR/$PHP_LIBDIR]
 	)
 	
+	
+	dnl check new c-ares API
+	
+	save_LIBS=$LIBS
+	save_CFLAGS=$CFLAGS
+	LIBS="-L $PHP_ARES_DIR/$PHP_LIBDIR -l $PHP_ARES_LIB"
+	CFLAGS="-I$PHP_ARES_DIR/include -pedantic-errors"
+	
+	AC_MSG_CHECKING(for new c-ares callback API)
+	AC_TRY_COMPILE(
+		[#include <ares.h>
+		], [
+			ares_search(0, 0, 0, 0, (void (*)(void *, int, int, unsigned char *, int)) 0, 0);
+		], [
+			AC_MSG_RESULT(yes)
+			AC_DEFINE([PHP_ARES_NEW_CALLBACK_API], [1], [ ])
+		], [
+			AC_MSG_RESULT(no)
+			AC_DEFINE([PHP_ARES_NEW_CALLBACK_API], [0], [ ])
+		]
+	)
+	
+	LIBS=$save_LIBS
+	CFLAGS=$save_CFLAGS
+	
 	AC_CHECK_HEADERS([netdb.h unistd.h arpa/inet.h arpa/nameser.h])
 	
 	PHP_ADD_INCLUDE($PHP_ARES_DIR/include)