X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=configure.ac;h=9672cb0288b496e37142c9d88dddfdf7ae33b693;hb=003ce655b7116d18c86a74c50391e54990346931;hp=c8e9d1bd25406c7c86cd9f5000e31e139a834a69;hpb=98742ab8656cfb4d9aa2b6fb13bf79f237814b98;p=sliver-openvswitch.git diff --git a/configure.ac b/configure.ac index c8e9d1bd2..9672cb028 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (c) 2008, 2009 Nicira Networks +# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,20 +12,21 @@ # See the License for the specific language governing permissions and # limitations under the License. -AC_PREREQ(2.60) -AC_INIT(openvswitch, 0.90.2, bugs@openvswitch.org) -NX_BUILDNR +AC_PREREQ(2.64) +AC_INIT(openvswitch, 2.2.90, bugs@openvswitch.org) 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 AM_PROG_CC_C_O AC_PROG_CPP -AC_PROG_RANLIB AC_PROG_MKDIR_P +AC_PROG_FGREP +AC_PROG_EGREP AC_ARG_VAR([PERL], [path to Perl interpreter]) AC_PATH_PROG([PERL], perl, no) @@ -33,57 +34,106 @@ if test "$PERL" = no; then AC_MSG_ERROR([Perl interpreter not found in $PATH or $PERL.]) fi +AM_MISSING_PROG([AUTOM4TE], [autom4te]) + AC_USE_SYSTEM_EXTENSIONS AC_C_BIGENDIAN AC_SYS_LARGEFILE -OVS_CHECK_USERSPACE +LT_INIT([disable-shared]) +m4_pattern_forbid([LT_INIT]) dnl Make autoconf fail if libtool is missing. + +AC_SEARCH_LIBS([pow], [m]) +AC_SEARCH_LIBS([clock_gettime], [rt]) +AC_SEARCH_LIBS([timer_create], [rt]) +AC_SEARCH_LIBS([pthread_sigmask], [pthread]) +AC_FUNC_STRERROR_R + +OVS_CHECK_ESX +OVS_CHECK_WIN32 +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_PYTHON_COMPAT +OVS_CHECK_DOT OVS_CHECK_IF_PACKET +OVS_CHECK_IF_DL OVS_CHECK_STRTOK_R +AC_CHECK_DECLS([sys_siglist], [], [], [[#include ]]) +AC_CHECK_MEMBERS([struct stat.st_mtim.tv_nsec, struct stat.st_mtimensec], + [], [], [[#include ]]) +AC_CHECK_MEMBERS([struct ifreq.ifr_flagshigh], [], [], [[#include ]]) +AC_CHECK_FUNCS([mlockall strnlen getloadavg statvfs getmntent_r]) +AC_CHECK_HEADERS([mntent.h sys/statvfs.h linux/types.h linux/if_ether.h stdatomic.h]) +AC_CHECK_HEADERS([net/if_mib.h], [], [], [[#include +#include ]]) -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 - - 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_CHECK_PKIDIR +OVS_CHECK_RUNDIR +OVS_CHECK_DBDIR +OVS_CHECK_BACKTRACE +OVS_CHECK_MALLOC_HOOKS +OVS_CHECK_VALGRIND +OVS_CHECK_SOCKET_LIBS +OVS_CHECK_XENSERVER_VERSION +OVS_CHECK_GROFF +OVS_CHECK_GNU_MAKE +OVS_CHECK_TLS +OVS_CHECK_ATOMIC_LIBS +OVS_CHECK_GCC4_ATOMICS +OVS_CHECK_ATOMIC_ALWAYS_LOCK_FREE(1) +OVS_CHECK_ATOMIC_ALWAYS_LOCK_FREE(2) +OVS_CHECK_ATOMIC_ALWAYS_LOCK_FREE(4) +OVS_CHECK_ATOMIC_ALWAYS_LOCK_FREE(8) +OVS_CHECK_POSIX_AIO +OVS_CHECK_PTHREAD_SET_NAME +OVS_CHECK_LINUX_HOST + +OVS_CHECK_INCLUDE_NEXT([stdio.h string.h]) +AC_CONFIG_FILES([lib/stdio.h lib/string.h]) + +OVS_ENABLE_OPTION([-Wall]) +OVS_ENABLE_OPTION([-Wextra]) +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([-Wno-format-zero-length]) +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([-Wthread-safety]) +OVS_CONDITIONAL_CC_OPTION([-Wno-unused], [HAVE_WNO_UNUSED]) +OVS_CONDITIONAL_CC_OPTION([-Wno-unused-parameter], [HAVE_WNO_UNUSED_PARAMETER]) +OVS_ENABLE_WERROR +OVS_ENABLE_SPARSE AC_ARG_VAR(KARCH, [Kernel Architecture String]) AC_SUBST(KARCH) -OVS_CHECK_LINUX(l26, 2.6, KSRC26, L26_ENABLED) +OVS_CHECK_LINUX +OVS_CHECK_DPDK + +AC_CONFIG_FILES(Makefile) +AC_CONFIG_FILES(datapath/Makefile) +AC_CONFIG_FILES(datapath/linux/Kbuild) +AC_CONFIG_FILES(datapath/linux/Makefile) +AC_CONFIG_FILES(datapath/linux/Makefile.main) +AC_CONFIG_FILES(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([utilities/bugtool/dummy], [:]) -AC_CONFIG_FILES([Makefile -datapath/Makefile -datapath/linux-2.6/Kbuild -datapath/linux-2.6/Makefile -datapath/linux-2.6/Makefile.main]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AC_OUTPUT