vconn: Factor out common code from TCP and SSL vconns.

[openvswitch] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 498196b307d646159aa7c24a3e3d17387f104051..1e7989f0196cc0707be9421b12f5f8330281a42c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -154,12 +154,36 @@ AC_DEFUN([OVS_CHECK_IF_PACKET],
                 [Define to 1 if net/if_packet.h is available.])
    fi])
 
-dnl Checks for dpkg-buildpackage.  If this is available then we check
-dnl that the Debian packaging is functional at "make distcheck" time.
-AC_DEFUN([OVS_CHECK_DPKG_BUILDPACKAGE],
-  [AC_CHECK_PROG([HAVE_DPKG_BUILDPACKAGE], [dpkg-buildpackage], [yes], [no])
-   AM_CONDITIONAL([HAVE_DPKG_BUILDPACKAGE], 
-                  [test $HAVE_DPKG_BUILDPACKAGE = yes])])
+dnl Checks for buggy strtok_r.
+dnl
+dnl Some versions of glibc 2.7 has a bug in strtok_r when compiling
+dnl with optimization that can cause segfaults:
+dnl
+dnl http://sources.redhat.com/bugzilla/show_bug.cgi?id=5614.
+AC_DEFUN([OVS_CHECK_STRTOK_R],
+  [AC_CACHE_CHECK(
+     [whether strtok_r macro segfaults on some inputs],
+     [ovs_cv_strtok_r_bug],
+     [AC_RUN_IFELSE(
+        [AC_LANG_PROGRAM([#include <stdio.h>
+                          #include <string.h>
+                         ],
+                         [[char string[] = ":::";
+                           char *save_ptr = (char *) 0xc0ffee;
+                           char *token1, *token2;
+                           token1 = strtok_r(string, ":", &save_ptr);
+                           token2 = strtok_r(NULL, ":", &save_ptr);
+                           printf ("%s %s\n", token1, token2);
+                           return 0;
+                          ]])],
+        [ovs_cv_strtok_r_bug=no],
+        [ovs_cv_strtok_r_bug=yes],
+        [ovs_cv_strtok_r_bug=yes])])
+   if test $ovs_cv_strtok_r_bug = yes; then
+     AC_DEFINE([HAVE_STRTOK_R_BUG], [1],
+               [Define if strtok_r macro segfaults on some inputs])
+   fi
+])
 
 dnl ----------------------------------------------------------------------
 dnl These macros are from GNU PSPP, with the following original license: