librb: remove zstring

[solanum.git] / librb / acinclude.m4

diff --git a/librb/acinclude.m4 b/librb/acinclude.m4
index a839aa02450c8fe950853bd49ee2baa1dbc5b39e..eaa270e063e11c9fefee6e76556def4d7d4b35c9 100644 (file)
--- a/librb/acinclude.m4
+++ b/librb/acinclude.m4
@@ -1,4 +1,3 @@
-# $Id: acinclude.m4 23020 2006-09-01 18:20:19Z androsyn $ - aclocal.m4 - Autoconf fun...
 AC_DEFUN([AC_DEFINE_DIR], [
   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -34,7 +33,7 @@ AC_DEFUN([AC_SUBST_DIR], [
 dnl IPv6 support macros..pretty much swiped from wget
 
 dnl RB_PROTO_INET6
- 
+
 AC_DEFUN([RB_PROTO_INET6],[
   AC_CACHE_CHECK([for INET6 protocol support], [rb_cv_proto_inet6],[
     AC_TRY_CPP([
@@ -57,14 +56,14 @@ AC_DEFUN([RB_PROTO_INET6],[
     ],[
       rb_cv_proto_inet6=no
     ])
-  ])  
+  ])
 
   if test "X$rb_cv_proto_inet6" = "Xyes"; then :
     $1
   else :
-    $2  
-  fi    
-])      
+    $2
+  fi
+])
 
 
 AC_DEFUN([RB_TYPE_STRUCT_SOCKADDR_IN6],[
@@ -74,9 +73,14 @@ AC_DEFUN([RB_TYPE_STRUCT_SOCKADDR_IN6],[
   ],[
     rb_have_sockaddr_in6=no
   ],[
+#ifndef _WIN32
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#else
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#endif
   ])
 
   if test "X$rb_have_sockaddr_in6" = "Xyes"; then :
@@ -88,7 +92,7 @@ AC_DEFUN([RB_TYPE_STRUCT_SOCKADDR_IN6],[
 
 
 AC_DEFUN([RB_CHECK_TIMER_CREATE],
-  [AC_CACHE_CHECK([for a working timer_create(CLOCK_REALTIME)], 
+  [AC_CACHE_CHECK([for a working timer_create(CLOCK_REALTIME)],
     [rb__cv_timer_create_works],
     [AC_TRY_RUN([
 #ifdef HAVE_TIME_H
@@ -121,7 +125,7 @@ int main(int argc, char *argv[])
      [rb__cv_timer_create_works=no])
   ])
 case $rb__cv_timer_create_works in
-    yes) AC_DEFINE([USE_TIMER_CREATE], 1, 
+    yes) AC_DEFINE([USE_TIMER_CREATE], 1,
                    [Define to 1 if we can use timer_create(CLOCK_REALTIME,...)]);;
 esac
 ])
@@ -129,7 +133,7 @@ esac
 
 
 AC_DEFUN([RB_CHECK_TIMERFD_CREATE],
-  [AC_CACHE_CHECK([for a working timerfd_create(CLOCK_REALTIME)], 
+  [AC_CACHE_CHECK([for a working timerfd_create(CLOCK_REALTIME)],
     [rb__cv_timerfd_create_works],
     [AC_TRY_RUN([
 #ifdef HAVE_TIME_H
@@ -161,7 +165,7 @@ int main(int argc, char *argv[])
      [rb__cv_timerfd_create_works=no])
   ])
 case $rb__cv_timerfd_create_works in
-    yes) AC_DEFINE([USE_TIMERFD_CREATE], 1, 
+    yes) AC_DEFINE([USE_TIMERFD_CREATE], 1,
                    [Define to 1 if we can use timerfd_create(CLOCK_REALTIME,...)]);;
 esac
 ])