[ds6-devel] nc6/config ai_constants.m4,1.1,1.2 proto_inet6.m4,1.2,1.3 type_socklen_t.m4,1.2,1.3

[chris@deepspace6.net]

Update of /cvs/nc6/config

Modified Files:
	ai_constants.m4 proto_inet6.m4 type_socklen_t.m4 
Log Message:
Fixed some mistakes setting up autoconf caching


Index: ai_constants.m4
===================================================================
RCS file: /cvs/nc6/config/ai_constants.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ai_constants.m4	29 Dec 2002 21:53:58 -0000	1.1
+++ ai_constants.m4	1 Jan 2003 23:35:37 -0000	1.2
@@ -1,7 +1,6 @@
 AC_DEFUN([GETADDRINFO_AI_ADDRCONFIG],[
-  AC_MSG_CHECKING([if getaddrinfo supports AI_ADDRCONFIG])
-
-  AC_CACHE_VAL([cv_gai_ai_addrconfig],[
+  AC_CACHE_CHECK([if getaddrinfo supports AI_ADDRCONFIG],
+    [nc_cv_gai_ai_addrconfig],[
     AC_TRY_CPP([
 #include <netdb.h>
 
@@ -9,17 +8,15 @@
 #error Missing AI_ADDRCONFIG
 #endif
     ],[
-      cv_gai_ai_addrconfig=yes
+      nc_cv_gai_ai_addrconfig=yes
     ],[
-      cv_gai_ai_addrconfig=no
+      nc_cv_gai_ai_addrconfig=no
     ])
   ])
 
-  if test "X$cv_gai_ai_addrconfig" = "Xyes"; then
-    AC_MSG_RESULT([yes])
+  if test "X$nc_cv_gai_ai_addrconfig" = "Xyes"; then :
     $1
-  else
-    AC_MSG_RESULT([no])
+  else :
     $2
   fi
 ])
@@ -27,9 +24,7 @@
 
 
 AC_DEFUN([GETADDRINFO_AI_ALL],[
-  AC_MSG_CHECKING([if getaddrinfo supports AI_ALL])
-
-  AC_CACHE_VAL([cv_gai_ai_all],[
+  AC_CACHE_CHECK([if getaddrinfo supports AI_ALL],[nc_cv_gai_ai_all],[
     AC_TRY_CPP([
 #include <netdb.h>
 
@@ -37,17 +32,15 @@
 #error Missing AI_ALL
 #endif
     ],[
-      cv_gai_ai_all=yes
+      nc_cv_gai_ai_all=yes
     ],[
-      cv_gai_ai_all=no
+      nc_cv_gai_ai_all=no
     ])
   ])
 
-  if test "X$cv_gai_ai_all" = "Xyes"; then
-    AC_MSG_RESULT([yes])
+  if test "X$nc_cv_gai_ai_all" = "Xyes"; then :
     $1
-  else
-    AC_MSG_RESULT([no])
+  else :
     $2
   fi
 ])
@@ -55,9 +48,7 @@
 
 
 AC_DEFUN([GETADDRINFO_AI_V4MAPPED],[
-  AC_MSG_CHECKING([if getaddrinfo supports AI_V4MAPPED])
-
-  AC_CACHE_VAL([cv_gai_ai_v4mapped],[
+  AC_CACHE_CHECK([if getaddrinfo supports AI_V4MAPPED],[nc_cv_gai_ai_v4mapped],[
     AC_TRY_CPP([
 #include <netdb.h>
 
@@ -65,17 +56,15 @@
 #error Missing AI_V4MAPPED
 #endif
     ],[
-      cv_gai_ai_v4mapped=yes
+      nc_cv_gai_ai_v4mapped=yes
     ],[
-      cv_gai_ai_v4mapped=no
+      nc_cv_gai_ai_v4mapped=no
     ])
   ])
 
-  if test "X$cv_gai_ai_v4mapped" = "Xyes"; then
-    AC_MSG_RESULT([yes])
+  if test "X$nc_cv_gai_ai_v4mapped" = "Xyes"; then :
     $1
[...6 lines suppressed...]
Index: proto_inet6.m4
===================================================================
RCS file: /cvs/nc6/config/proto_inet6.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- proto_inet6.m4	20 Dec 2002 10:34:45 -0000	1.2
+++ proto_inet6.m4	1 Jan 2003 23:35:37 -0000	1.3
@@ -1,7 +1,5 @@
 AC_DEFUN([PROTO_INET6],[
-  AC_MSG_CHECKING([for INET6 protocol support])
-
-  AC_CACHE_VAL([cv_proto_inet6],[
+  AC_CACHE_CHECK([for INET6 protocol support], [nc_cv_proto_inet6],[
     AC_TRY_CPP([
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -13,17 +11,15 @@
 #error Mlssing AF_INET6
 #endif
     ],[
-      cv_proto_inet6=yes
+      nc_cv_proto_inet6=yes
     ],[
-      cv_proto_inet6=no
+      nc_cv_proto_inet6=no
     ])
   ])
 
-  if test "X$cv_proto_inet6" = "Xyes"; then
-    AC_MSG_RESULT([yes])
+  if test "X$nc_cv_proto_inet6" = "Xyes"; then :
     $1
-  else
-    AC_MSG_RESULT([no])
+  else :
     $2
   fi
 ])
Index: type_socklen_t.m4
===================================================================
RCS file: /cvs/nc6/config/type_socklen_t.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- type_socklen_t.m4	20 Dec 2002 00:27:46 -0000	1.2
+++ type_socklen_t.m4	1 Jan 2003 23:35:37 -0000	1.3
@@ -11,10 +11,10 @@
 [
   AC_CHECK_TYPE([socklen_t], ,[
     AC_MSG_CHECKING([for socklen_t equivalent])
-    AC_CACHE_VAL([cv_type_socklen_t_equiv],[
+    AC_CACHE_VAL([rsync_cv_type_socklen_t_equiv],[
       # Systems have either "struct sockaddr *" or
       # "void *" as the second argument to getpeername
-      cv_type_socklen_t_equiv=
+      rsync_cv_type_socklen_t_equiv=
       for arg2 in "struct sockaddr" void; do
         for t in int size_t unsigned long "unsigned long"; do
           AC_TRY_COMPILE([
@@ -26,18 +26,18 @@
 $t len;
 getpeername(0,0,&len);
           ],[
-            cv_type_socklen_t_equiv="$t"
+            rsync_cv_type_socklen_t_equiv="$t"
             break
           ])
         done
       done
 
-      if test "x$cv_type_socklen_t_equiv" = x; then
+      if test "x$rsync_cv_type_socklen_t_equiv" = x; then
         AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
       fi
     ])
-    AC_MSG_RESULT($cv_type_socklen_t_equiv)
-    AC_DEFINE_UNQUOTED(socklen_t, $cv_type_socklen_t_equiv,
+    AC_MSG_RESULT($rsync_cv_type_socklen_t_equiv)
+    AC_DEFINE_UNQUOTED(socklen_t, $rsync_cv_type_socklen_t_equiv,
             [type to use in place of socklen_t if not defined])
   ],[
 #include <sys/types.h>