X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fsocket_send_flags.m4;h=7b739928bc65f0308f49132836c2c4b49a690102;hb=411d5ae2fdcd66d8613d38c3725e4ef76f022fea;hp=8251980dad93c5642daba58701ff2cd46c6b0346;hpb=d0a0615a20fae501e944374a7917067f90d5c7e6;p=awesomized%2Flibmemcached

diff --git a/m4/socket_send_flags.m4 b/m4/socket_send_flags.m4
index 8251980d..7b739928 100644
--- a/m4/socket_send_flags.m4
+++ b/m4/socket_send_flags.m4
@@ -1,49 +1,47 @@
-dnl  Copyright (C) 2011 Trond Norbye
-dnl This file is free software; Trond Norbye
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl ---------------------------------------------------------------------------
-dnl Macro: SOCKET_SEND_FLAGS
-dnl ---------------------------------------------------------------------------
+# Copyright (C) 2012-2013 Data Differential LLC
+# Copyright (C) 2011 Trond Norbye
+# This file is free software; Trond Norbye and Data Differential
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# ---------------------------------------------------------------------------
+# Macro: SOCKET_SEND_FLAGS
+# ---------------------------------------------------------------------------
+#
+
+#serial 2
 
 AC_DEFUN([SOCKET_SEND_FLAGS],
-[
-  AC_CACHE_CHECK([for MSG_NOSIGNAL], [ac_cv_msg_nosignal], [
-    AC_LANG_PUSH([C])
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -I${srcdir}"
-    AC_TRY_LINK([
-#include <sys/socket.h>
-                   ], [
-int flags= MSG_NOSIGNAL;
-                   ],
-                   [ ac_cv_msg_nosignal=yes ],
-                   [ ac_cv_msg_nosignal=no ])
-   CFLAGS="$save_CFLAGS"
-   AC_LANG_POP
-  ])
+    [AC_CACHE_CHECK([for MSG_NOSIGNAL],[ac_cv_msg_nosignal],
+      [AC_LANG_PUSH([C])
+      AX_SAVE_FLAGS
+      CFLAGS="$CFLAGS -I${srcdir}"
 
-  AC_CACHE_CHECK([for MSG_DONTWAIT], [ac_cv_msg_dontwait], [
-    AC_LANG_PUSH([C])
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -I${srcdir}"
-    AC_TRY_LINK([
-#include <sys/socket.h>
-                   ], [
-int flags= MSG_DONTWAIT;
-                   ],
-                   [ ac_cv_msg_dontwait=yes ],
-                   [ ac_cv_msg_dontwait=no ])
-   CFLAGS="$save_CFLAGS"
-   AC_LANG_POP
-  ])
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>], [int flags= MSG_NOSIGNAL])], [ac_cv_msg_nosignal="yes"])
+      AC_LANG_POP
+      AX_RESTORE_FLAGS])
+
+    AC_CACHE_CHECK([for MSG_DONTWAIT],[ac_cv_msg_dontwait],
+      [AC_LANG_PUSH([C])
+      AX_SAVE_FLAGS
+      CFLAGS="$CFLAGS -I${srcdir}"
 
-  AS_IF([test "x$ac_cv_msg_nosignal" = "xyes"],[
-        AC_DEFINE(HAVE_MSG_NOSIGNAL, 1, [Define to 1 if you have a MSG_NOSIGNAL])])
-  AS_IF([test "x$ac_cv_msg_dontwait" = "xyes"],[
-        AC_DEFINE(HAVE_MSG_DONTWAIT, 1, [Define to 1 if you have a MSG_DONTWAIT])])
-])
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],[int flags= MSG_DONTWAIT])],[ac_cv_msg_dontwait="yes"])
+      AC_LANG_POP
+      AX_RESTORE_FLAGS])
+
+    AC_CACHE_CHECK([for MSG_MORE],[ac_cv_msg_more],
+      [AC_LANG_PUSH([C])
+      AX_SAVE_FLAGS
+      CFLAGS="$CFLAGS -I${srcdir}"
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>], [int flags= MSG_MORE])], [ac_cv_msg_more="yes"])
+      AC_LANG_POP
+      AX_RESTORE_FLAGS])
+
+  AS_IF([test "x$ac_cv_msg_nosignal" = "xyes"],[AC_DEFINE([HAVE_MSG_NOSIGNAL],[1],[Define to 1 if you have a MSG_NOSIGNAL])])
+  AS_IF([test "x$ac_cv_msg_dontwait" = "xyes"],[AC_DEFINE([HAVE_MSG_DONTWAIT],[1],[Define to 1 if you have a MSG_DONTWAIT])])
+  AS_IF([test "x$ac_cv_msg_more" = "xyes"],[AC_DEFINE([HAVE_MSG_MORE],[1],[Define to 1 if you have a MSG_MORE])])
+  ])
 
-dnl ---------------------------------------------------------------------------
-dnl End Macro: SOCKET_SEND_FLAGS
-dnl ---------------------------------------------------------------------------
+# ---------------------------------------------------------------------------
+# End Macro: SOCKET_SEND_FLAGS
+# ---------------------------------------------------------------------------