- update to package.xml v2

[m6w6/ext-ares] / config.m4

diff --git a/config.m4 b/config.m4
index 2acb051eaee8f21d4f1fde38ac1177a7bb7ea10d..77c2592e51c339ec207d5d011ce7851a3207eb4a 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -3,8 +3,6 @@ dnl config.m4 for extension ares
 
 PHP_ARG_WITH(ares, for asynchronous resolver support,
 [  --with-ares             Include asynchronous resolver support])
-PHP_ARG_WITH(ares-lib, type of ares library (cares),
-[  --with-ares-lib         MIT/ares or CURL/cares], "cares", "cares")
 
 if test "$PHP_ARES" != "no"; then
        PHP_ARES_DIR=
@@ -20,58 +18,90 @@ if test "$PHP_ARES" != "no"; then
                AC_MSG_ERROR(could not find ares.h)
        fi
        
-       case "$PHP_ARES_LIB" in
-               MIT* [)]
-                       PHP_ARES_LIB=ares
-                       ;;
-               ares [)]
-                       ;;
-               CURL* [)]
-                       PHP_ARES_LIB=cares
-                       ;;
-               cares [)]
-                       ;;
-               * [)]
+       dnl ##########
+       dnl newer versions of libcares need -lrt
+       dnl ##########
+       PHP_ADD_LIBRARY(rt, 1, ARES_SHARED_LIBADD)
+       
+       PHP_ARES_LIB=
+       PHP_CHECK_LIBRARY(cares, ares_init, [
                        PHP_ARES_LIB=cares
-                       ;;
-       esac
+                       echo $LDFLAGS
+               ], [
+                       echo $LDFLAGS
+                       PHP_CHECK_LIBRARY(ares, ares_init, [
+                                       PHP_ARES_LIB=ares
+                               ], [
+                                       PHP_ARES_LIB=unknown
+                               ], [
+                                       -lrt -L$PHP_ARES_DIR/$PHP_LIBDIR
+                               ]
+                       )
+               ], [
+                       -lrt -L$PHP_ARES_DIR/$PHP_LIBDIR
+               ]
+       )
+       AC_MSG_CHECKING(for libares/libcares)
+       AC_MSG_RESULT($PHP_ARES_LIB)
        
-       if test $PHP_ARES_LIB = "cares"; then
+       if test $PHP_ARES_LIB = "unknown"; then
+               AC_MSG_ERROR(could neither find libares nor libcares)
+       elif test $PHP_ARES_LIB = "cares"; then
                AC_DEFINE_UNQUOTED([PHP_ARES_LIBNAME], "c-ares (CURL)", [ ])
                AC_DEFINE([PHP_ARES_EXPAND_LEN_TYPE], [long], [ ])
        else
                AC_DEFINE_UNQUOTED([PHP_ARES_LIBNAME], "ares (MIT)", [ ])
                AC_DEFINE([PHP_ARES_EXPAND_LEN_TYPE], [int], [ ])
+               AC_DEFINE([HAVE_OLD_ARES_STRERROR], [1], [ ])
        fi
        
        PHP_CHECK_LIBRARY($PHP_ARES_LIB, ares_cancel, 
                [AC_DEFINE([HAVE_ARES_CANCEL], [1], [ ])], [ ], 
-               [-L$PHP_ARES_DIR/$PHP_LIBDIR]
+               [-lrt -L$PHP_ARES_DIR/$PHP_LIBDIR]
        )
        PHP_CHECK_LIBRARY($PHP_ARES_LIB, ares_getnameinfo, 
                [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]
+               [-lrt -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]
+               [-lrt -L$PHP_ARES_DIR/$PHP_LIBDIR]
        )
        PHP_CHECK_LIBRARY($PHP_ARES_LIB, ares_version, 
                [AC_DEFINE([HAVE_ARES_VERSION], [1], [ ])], [ ], 
-               [-L$PHP_ARES_DIR/$PHP_LIBDIR]
+               [-lrt -L$PHP_ARES_DIR/$PHP_LIBDIR]
        )
        
+       dnl ##########
+       dnl check new c-ares callback API
+       dnl ##########
+       save_LIBS=$LIBS
+       save_CFLAGS=$CFLAGS
+       LDFLIBS="-L$PHP_ARES_DIR/$PHP_LIBDIR -l$PHP_ARES_LIB -lrt"
+       CFLAGS="-I$PHP_ARES_DIR/include -Werror"
+       
+       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)
        PHP_ADD_LIBRARY_WITH_PATH($PHP_ARES_LIB, $PHP_ARES_DIR/$PHP_LIBDIR, ARES_SHARED_LIBADD)
+       
        PHP_SUBST(ARES_SHARED_LIBADD)
        PHP_NEW_EXTENSION(ares, ares.c, $ext_shared)
 fi