INN commit: trunk/m4 (getaddrinfo.m4)

INN Commit Russ_Allbery at isc.org
Sat Jan 31 19:35:03 UTC 2009


    Date: Saturday, January 31, 2009 @ 11:35:03
  Author: eagle
Revision: 8311

Use AC_RUN_IFELSE and AC_LANG_SOURCE in the getaddrinfo check instead
of the deprecated AC_TRY_RUN.

Modified:
  trunk/m4/getaddrinfo.m4

----------------+
 getaddrinfo.m4 |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

Modified: getaddrinfo.m4
===================================================================
--- getaddrinfo.m4	2009-01-31 19:04:59 UTC (rev 8310)
+++ getaddrinfo.m4	2009-01-31 19:35:03 UTC (rev 8311)
@@ -8,7 +8,8 @@
 
 dnl Source used by INN_FUNC_GETADDRINFO_ADDRCONFIG.
 define([_INN_FUNC_GETADDRINFO_ADDRCONFIG_SOURCE],
-[#include <netdb.h>
+[AC_LANG_SOURCE([[
+#include <netdb.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #if STDC_HEADERS || HAVE_STRING_H
@@ -17,25 +18,25 @@
 
 int
 main(int argc, char **argv) {
-    struct addrinfo hints;
-    struct addrinfo *ai;
+    struct addrinfo hints, *ai;
 
     memset(&hints, 0, sizeof(hints));
     hints.ai_family = AF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
     hints.ai_flags = AI_ADDRCONFIG;
     return getaddrinfo("localhost", NULL, &hints, &ai) != 0;
-}])
+}
+]])])
 
-
 dnl The public macro.
 AC_DEFUN([INN_FUNC_GETADDRINFO_ADDRCONFIG],
-[AC_CACHE_CHECK(for working AI_ADDRCONFIG, inn_cv_func_getaddrinfo_addrconfig_works,
-[AC_TRY_RUN(_INN_FUNC_GETADDRINFO_ADDRCONFIG_SOURCE(),
-    [inn_cv_func_getaddrinfo_addrconfig_works=yes],
-    [inn_cv_func_getaddrinfo_addrconfig_works=no],
-    [inn_cv_func_getaddrinfo_addrconfig_works=no])])
-if test "$inn_cv_func_getaddrinfo_addrconfig_works" = yes ; then
+[AC_CACHE_CHECK([for working AI_ADDRCONFIG],
+    [inn_cv_func_getaddrinfo_addrconfig_works],
+    [AC_RUN_IFELSE([_INN_FUNC_GETADDRINFO_ADDRCONFIG_SOURCE],
+        [inn_cv_func_getaddrinfo_addrconfig_works=yes],
+        [inn_cv_func_getaddrinfo_addrconfig_works=no],
+        [inn_cv_func_getaddrinfo_addrconfig_works=no])])
+ if test "$inn_cv_func_getaddrinfo_addrconfig_works" = yes ; then
     AC_DEFINE([HAVE_GETADDRINFO_ADDRCONFIG], 1,
         [Define if your system has a working AI_ADDRCONFIG flag with getaddrinfo.])
-fi])
+ fi])




More information about the inn-committers mailing list