diff options
| author | Justin Pettit <jpettit@nicira.com> | 2010-02-05 15:58:27 -0800 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2010-02-05 17:14:55 -0800 |
| commit | a4af00400a835eb87569ba40e21874c05e872c0f (patch) | |
| tree | d9c6db715493bd6fc17c91e9552f8037c3ea7caa /acinclude.m4 | |
| parent | 93ff0290fda0f02904686989243089faaa9229e6 (diff) | |
| parent | 5819a7cdcf44f0277c538353672fb27701c764f9 (diff) | |
Merge branch 'master' into next
Conflicts:
COPYING
datapath/datapath.h
lib/automake.mk
lib/dpif-provider.h
lib/dpif.c
lib/hmap.h
lib/netdev-provider.h
lib/netdev.c
lib/stream-ssl.h
ofproto/executer.c
ofproto/ofproto.c
ofproto/ofproto.h
tests/automake.mk
utilities/ovs-ofctl.c
utilities/ovs-vsctl.in
vswitchd/ovs-vswitchd.conf.5.in
xenserver/etc_init.d_vswitch
xenserver/etc_xensource_scripts_vif
xenserver/opt_xensource_libexec_interface-reconfigure
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d33a7c45..e38676fd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -215,6 +215,7 @@ AC_DEFUN([OVS_CHECK_STRTOK_R], char *token1, *token2; token1 = strtok_r(string, ":", &save_ptr); token2 = strtok_r(NULL, ":", &save_ptr); + freopen ("/dev/null", "w", stdout); printf ("%s %s\n", token1, token2); return 0; ]])], @@ -259,4 +260,14 @@ dnl Example: OVS_ENABLE_OPTION([-Wdeclaration-after-statement]) AC_DEFUN([OVS_ENABLE_OPTION], [OVS_CHECK_CC_OPTION([$1], [WARNING_FLAGS="$WARNING_FLAGS $1"]) AC_SUBST([WARNING_FLAGS])]) + +dnl OVS_CONDITIONAL_CC_OPTION([OPTION], [CONDITIONAL]) +dnl Check whether the given C compiler OPTION is accepted. +dnl If so, enable the given Automake CONDITIONAL. + +dnl Example: OVS_CONDITIONAL_CC_OPTION([-Wno-unused], [HAVE_WNO_UNUSED]) +AC_DEFUN([OVS_CONDITIONAL_CC_OPTION], + [OVS_CHECK_CC_OPTION( + [$1], [ovs_have_cc_option=yes], [ovs_have_cc_option=no]) + AM_CONDITIONAL([$2], [test $ovs_have_cc_option = yes])]) dnl ---------------------------------------------------------------------- |