Merged in two missing changes from f-visibility tree.

[awesomized/libmemcached] / m4 / protocol_binary.m4

diff --git a/m4/protocol_binary.m4 b/m4/protocol_binary.m4
index 8b8f3f98b2edc018fd8e66bca728f4283c94597f..d31bcb04a2a06c1ca2ab9af82e3b76f090ac9b39 100644 (file)
--- a/m4/protocol_binary.m4
+++ b/m4/protocol_binary.m4
@@ -1,19 +1,22 @@
 dnl ---------------------------------------------------------------------------
 dnl Macro: PROTOCOL_BINARY_TEST
 dnl ---------------------------------------------------------------------------
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I${srcdir}"
-AC_RUN_IFELSE([ 
-   AC_LANG_PROGRAM([
-      #include "libmemcached/memcached/protocol_binary.h"
-   ], [
+AC_DEFUN([PROTOCOL_BINARY_TEST],
+  [AC_LANG_PUSH([C])
+   save_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -I${srcdir}"
+   AC_RUN_IFELSE([ 
+      AC_LANG_PROGRAM([[
+#include "libmemcached/memcached/protocol_binary.h"
+   ]],[[
       protocol_binary_request_set request;
       if (sizeof(request) != sizeof(request.bytes)) {
          return 1;
       }
-   ])
-],, AC_MSG_ERROR([Unsupported struct padding done by compiler.])) 
-CFLAGS="$save_CFLAGS"
+   ]])],, AC_MSG_ERROR([Unsupported struct padding done by compiler.])) 
+   CFLAGS="$save_CFLAGS"
+   AC_LANG_POP
+])
 
 dnl ---------------------------------------------------------------------------
 dnl End Macro: PROTOCOL_BINARY_TEST