[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenox/konq-embed/kdesrc/kdecore
From:       Luciano Montanaro <mikelima () cirulla ! net>
Date:       2005-02-10 15:16:08
Message-ID: 20050210151608.CA6E21CF99 () office ! kde ! org
[Download RAW message or body]

CVS commit by montanaro: 

Imported check for IPV6 socket support from mainline


  M +6 -63     configure.in.in   1.4


--- kdenox/konq-embed/kdesrc/kdecore/configure.in.in  #1.3:1.4
@@ -91,69 +91,12 @@
   ]
 )
-LIBS="$my_LIBS"
+LIBS="$kde_safe_LIBS"
 
-AC_SUBST(HAVE_SOCKADDR_SA_LEN)
-AC_MSG_CHECKING([if struct sockaddr has member sa_len])
-AC_TRY_COMPILE(
-  [
-    #include <sys/types.h>
-    #include <sys/socket.h>
-  ],
-  [
-    struct sockaddr sa;
-    sa.sa_len = sizeof(sa);
-  ],
-  [
-    AC_DEFINE(HAVE_SOCKADDR_SA_LEN,1,[Define if struct sockaddr has member sa_len])
-    AC_MSG_RESULT(yes)
-  ],
-  AC_MSG_RESULT(no)
-)
+AC_CHECK_MEMBERS([struct sockaddr.sa_len],,,[#include <sys/socket.h>])
+AC_CHECK_TYPES([struct sockaddr_in6],
+  [AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,,[#include \
<netinet/in.h>])],, +  [#include <sys/types.h>
+#include <netinet/in.h>])
 
-AC_SUBST(HAVE_SOCKADDR_IN6)
-AC_SUBST(HAVE_SOCKADDR_IN6_SCOPE_ID)
-AC_CHECK_HEADERS(netinet/in.h,
-  [
-
-    dnl Check for sockaddr_in6. We don't have to check for in6_addr
-    dnl if sockaddr_in6 is there, so is in6_addr
-    AC_MSG_CHECKING([for struct sockaddr_in6])
-    AC_TRY_COMPILE(
-      [
-        #include <sys/types.h>
-        #include <stdlib.h>
-        #include <netinet/in.h>
-      ],
-      [
-        struct sockaddr_in6 sin6;
-      ],
-      [
-        AC_DEFINE(HAVE_SOCKADDR_IN6,1,[Define if we have struct sockaddr_in6 in \
                netinet/in.h])
-        AC_MSG_RESULT(yes)
-
-        dnl Check if this system's sockaddr_in6 already supports sin6_scope_id
-        dnl All systems should support it, but some still don't
-        AC_MSG_CHECKING([if struct sockaddr_in6 has member sin6_scope_id])
-        AC_TRY_COMPILE(
-          [
-            #include <sys/types.h>
-            #include <stdlib.h>
-            #include <netinet/in.h>
-          ],
-          [
-            struct sockaddr_in6 sin6;
-            sin6.sin6_scope_id = 0;
-          ],
-          [
-            AC_DEFINE(HAVE_SOCKADDR_IN6_SCOPE_ID,1,[Define if this system already \
                has sin6_scope_id in sockaddr_in6])
-            AC_MSG_RESULT(yes)
-          ],
-          AC_MSG_RESULT(no)
-        )
-      ],
-      AC_MSG_RESULT(no)
-    )
-  ]
-)
 
 AC_SUBST(KDE_IPV6_LOOKUP_MODE)


[prev in list] [next in list] [prev in thread] [next in thread]