Catalli's threaded switch

[sliver-openvswitch.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1fc6a47..2ef1383 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 AC_PREREQ(2.64)
-AC_INIT(openvswitch, 0.99.2, ovs-bugs@openvswitch.org)
+AC_INIT(openvswitch, 1.1.0pre2, ovs-bugs@openvswitch.org)
 NX_BUILDNR
 AC_CONFIG_SRCDIR([datapath/datapath.c])
 AC_CONFIG_MACRO_DIR([m4])
@@ -27,6 +27,7 @@ AM_PROG_CC_C_O
 AC_PROG_CPP
 AC_PROG_RANLIB
 AC_PROG_MKDIR_P
+AC_PROG_FGREP
 
 AC_ARG_VAR([PERL], [path to Perl interpreter])
 AC_PATH_PROG([PERL], perl, no)
@@ -39,25 +40,30 @@ AC_C_BIGENDIAN
 AC_SYS_LARGEFILE
 
 AC_SEARCH_LIBS([pow], [m])
+AC_SEARCH_LIBS([clock_gettime], [rt])
 
+OVS_CHECK_THREADED
 OVS_CHECK_COVERAGE
 OVS_CHECK_NDEBUG
 OVS_CHECK_NETLINK
 OVS_CHECK_OPENSSL
 OVS_CHECK_LOGDIR
-OVS_CHECK_CURSES
-OVS_CHECK_LINUX_VT_H
-OVS_CHECK_PCRE
 OVS_CHECK_PYTHON
+OVS_CHECK_PYUIC4
+OVS_CHECK_OVSDBMONITOR
+OVS_CHECK_ER_DIAGRAMS
 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
 OVS_CHECK_MALLOC_HOOKS
 OVS_CHECK_VALGRIND
-OVS_CHECK_TTY_LOCK_DIR
 OVS_CHECK_SOCKET_LIBS
+OVS_CHECK_LINKER_SECTIONS
 
 AC_CHECK_FUNCS([strsignal])
 
@@ -77,6 +83,7 @@ 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])
+OVS_CONDITIONAL_CC_OPTION([-Wno-unused-parameter], [HAVE_WNO_UNUSED_PARAMETER])
 
 AC_ARG_VAR(KARCH, [Kernel Architecture String])
 AC_SUBST(KARCH)
@@ -92,4 +99,6 @@ tests/atlocal])
 dnl This makes sure that include/openflow gets created in the build directory.
 AC_CONFIG_COMMANDS([include/openflow/openflow.h.stamp])
 
+AC_CONFIG_COMMANDS([ovsdb/ovsdbmonitor/dummy], [:])
+
 AC_OUTPUT