Merge citrix branch into master.

[sliver-openvswitch.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 41ff7be..400ea78 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,13 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AC_PREREQ(2.60)
+AC_PREREQ(2.63)
 AC_INIT(openvswitch, 0.90.5, ovs-bugs@openvswitch.org)
 NX_BUILDNR
 AC_CONFIG_SRCDIR([datapath/datapath.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_TESTDIR([tests])
 AM_INIT_AUTOMAKE
 
 AC_PROG_CC
@@ -37,7 +38,7 @@ AC_USE_SYSTEM_EXTENSIONS
 AC_C_BIGENDIAN
 AC_SYS_LARGEFILE
 
-OVS_CHECK_USERSPACE
+OVS_CHECK_COVERAGE
 OVS_CHECK_NDEBUG
 OVS_CHECK_NETLINK
 OVS_CHECK_OPENSSL
@@ -45,36 +46,35 @@ OVS_CHECK_LOGDIR
 OVS_CHECK_CURSES
 OVS_CHECK_LINUX_VT_H
 OVS_CHECK_PCRE
+OVS_CHECK_PYTHON
 OVS_CHECK_IF_PACKET
 OVS_CHECK_STRTOK_R
 
-if $build_userspace; then
-    OVS_CHECK_PKIDIR
-    OVS_CHECK_RUNDIR
-    OVS_CHECK_MALLOC_HOOKS
-    OVS_CHECK_VALGRIND
-    OVS_CHECK_TTY_LOCK_DIR
-    OVS_CHECK_SOCKET_LIBS
-    OVS_CHECK_FAULT_LIBS
+OVS_CHECK_PKIDIR
+OVS_CHECK_RUNDIR
+OVS_CHECK_MALLOC_HOOKS
+OVS_CHECK_VALGRIND
+OVS_CHECK_TTY_LOCK_DIR
+OVS_CHECK_SOCKET_LIBS
+OVS_CHECK_FAULT_LIBS
 
-    AC_CHECK_FUNCS([strsignal])
+AC_CHECK_FUNCS([strsignal])
 
-    OVS_ENABLE_OPTION([-Wall])
-    OVS_ENABLE_OPTION([-Wno-sign-compare])
-    OVS_ENABLE_OPTION([-Wpointer-arith])
-    OVS_ENABLE_OPTION([-Wdeclaration-after-statement])
-    OVS_ENABLE_OPTION([-Wformat-security])
-    OVS_ENABLE_OPTION([-Wswitch-enum])
-    OVS_ENABLE_OPTION([-Wunused-parameter])
-    OVS_ENABLE_OPTION([-Wstrict-aliasing])
-    OVS_ENABLE_OPTION([-Wbad-function-cast])
-    OVS_ENABLE_OPTION([-Wcast-align])
-    OVS_ENABLE_OPTION([-Wstrict-prototypes])
-    OVS_ENABLE_OPTION([-Wold-style-definition])
-    OVS_ENABLE_OPTION([-Wmissing-prototypes])
-    OVS_ENABLE_OPTION([-Wmissing-field-initializers])
-    OVS_ENABLE_OPTION([-Wno-override-init])
-fi
+OVS_ENABLE_OPTION([-Wall])
+OVS_ENABLE_OPTION([-Wno-sign-compare])
+OVS_ENABLE_OPTION([-Wpointer-arith])
+OVS_ENABLE_OPTION([-Wdeclaration-after-statement])
+OVS_ENABLE_OPTION([-Wformat-security])
+OVS_ENABLE_OPTION([-Wswitch-enum])
+OVS_ENABLE_OPTION([-Wunused-parameter])
+OVS_ENABLE_OPTION([-Wstrict-aliasing])
+OVS_ENABLE_OPTION([-Wbad-function-cast])
+OVS_ENABLE_OPTION([-Wcast-align])
+OVS_ENABLE_OPTION([-Wstrict-prototypes])
+OVS_ENABLE_OPTION([-Wold-style-definition])
+OVS_ENABLE_OPTION([-Wmissing-prototypes])
+OVS_ENABLE_OPTION([-Wmissing-field-initializers])
+OVS_ENABLE_OPTION([-Wno-override-init])
 
 AC_ARG_VAR(KARCH, [Kernel Architecture String])
 AC_SUBST(KARCH)
@@ -84,6 +84,7 @@ AC_CONFIG_FILES([Makefile
 datapath/Makefile 
 datapath/linux-2.6/Kbuild
 datapath/linux-2.6/Makefile
-datapath/linux-2.6/Makefile.main])
+datapath/linux-2.6/Makefile.main
+tests/atlocal])
 
 AC_OUTPUT