Use the AC_CHECK_MEMBER() function for check struct members instead of

inventing and providing our own. Hopefully this solves a HP-UX 11.00 problem.

diff --git a/acinclude.m4 b/acinclude.m4
index 2f6256a..f4f317e 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -242,26 +242,6 @@ AC_DEFUN([CARES_CHECK_STRUCT], [
   fi\r
 ])\r
 \r
-dnl This macro determins if the specified struct contains a specific member.\r
-dnl Syntax:\r
-dnl CARES_CHECK_STRUCT_MEMBER(headers, struct name, member name, if found, [if not found])\r
-\r
-AC_DEFUN([CARES_CHECK_STRUCT_MEMBER], [\r
-  AC_MSG_CHECKING([if struct $2 has member $3])\r
-  AC_TRY_COMPILE([$1], \r
-    [\r
-      struct $2 struct_instance;\r
-      struct_instance.$3 = 0;\r
-    ], ac_struct="yes", ac_found="no")\r
-  if test "$ac_struct" = "yes" ; then\r
-    AC_MSG_RESULT(yes)\r
-    $4\r
-  else\r
-    AC_MSG_RESULT(no)\r
-    $5\r
-  fi\r
-])\r
-\r
 dnl This macro determines if the specified constant exists in the specified file\r
 dnl Syntax:\r
 dnl CARES_CHECK_CONSTANT(headers, constant name, if found, [if not found])\r

diff --git a/configure.ac b/configure.ac
index 7390139..271dfeb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -176,7 +176,10 @@ CARES_CHECK_STRUCT(
 )\r
 \r
 if test "$ac_have_sockaddr_in6" = "yes" ; then\r
-CARES_CHECK_STRUCT_MEMBER(\r
+AC_CHECK_MEMBER(struct sockaddr_in6.sin6_scope_id,\r
+    AC_DEFINE_UNQUOTED(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID,1,\r
+      [Define to 1 if your struct sockaddr_in6 has sin6_scope_id.])\r
+   , ,\r
   [\r
 #ifdef HAVE_SYS_TYPES_H\r
 #include <sys/types.h>\r
@@ -188,8 +191,6 @@ CARES_CHECK_STRUCT_MEMBER(
 #include <netinet/in.h>\r
 #endif\r
   ], [sockaddr_in6], [sin6_scope_id],\r
-     AC_DEFINE_UNQUOTED(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID,1,\r
-       [Define to 1 if your struct sockaddr_in6 has sin6_scope_id.])\r
 )\r
 fi\r
 \r