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 /configure.ac | |
| 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 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 2f5c87ff..6a8a1ea4 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ # limitations under the License. AC_PREREQ(2.63) -AC_INIT(openvswitch, 0.90.6, ovs-bugs@openvswitch.org) +AC_INIT(openvswitch, 0.99.1, ovs-bugs@openvswitch.org) NX_BUILDNR AC_CONFIG_SRCDIR([datapath/datapath.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -76,6 +76,7 @@ OVS_ENABLE_OPTION([-Wold-style-definition]) OVS_ENABLE_OPTION([-Wmissing-prototypes]) OVS_ENABLE_OPTION([-Wmissing-field-initializers]) OVS_ENABLE_OPTION([-Wno-override-init]) +OVS_CONDITIONAL_CC_OPTION([-Wno-unused], [HAVE_WNO_UNUSED]) AC_ARG_VAR(KARCH, [Kernel Architecture String]) AC_SUBST(KARCH) |