Merge "citrix" branch into "master".

[sliver-openvswitch.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2f5c87f..e8497e1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AC_PREREQ(2.63)
-AC_INIT(openvswitch, 0.90.6, ovs-bugs@openvswitch.org)
+AC_PREREQ(2.64)
+AC_INIT(openvswitch, 0.99.2, ovs-bugs@openvswitch.org)
 NX_BUILDNR
 AC_CONFIG_SRCDIR([datapath/datapath.c])
 AC_CONFIG_MACRO_DIR([m4])
@@ -51,6 +51,9 @@ OVS_CHECK_PCRE
 OVS_CHECK_PYTHON
 OVS_CHECK_IF_PACKET
 OVS_CHECK_STRTOK_R
+AC_CHECK_MEMBERS([struct stat.st_mtim.tv_nsec, struct stat.st_mtimensec],
+  [], [], [[#include <sys/stat.h>]])
+AC_CHECK_FUNCS([mlockall])
 
 OVS_CHECK_PKIDIR
 OVS_CHECK_RUNDIR
@@ -76,6 +79,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)