git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
[sliver-openvswitch.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
19c095e
..
09e01fb
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-13,7
+13,7
@@
# limitations under the License.
AC_PREREQ(2.64)
# limitations under the License.
AC_PREREQ(2.64)
-AC_INIT(openvswitch, 2.1.90,
ovs-
bugs@openvswitch.org)
+AC_INIT(openvswitch, 2.1.90, bugs@openvswitch.org)
AC_CONFIG_SRCDIR([datapath/datapath.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR([datapath/datapath.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
@@
-90,6
+90,7
@@
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_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_CHECK_INCLUDE_NEXT([stdio.h string.h])
AC_CONFIG_FILES([lib/stdio.h lib/string.h])
@@
-132,11
+133,6
@@
AC_CONFIG_COMMANDS([include/openflow/openflow.h.stamp])
AC_CONFIG_COMMANDS([utilities/bugtool/dummy], [:])
AC_CONFIG_COMMANDS([utilities/bugtool/dummy], [:])
-AM_CONDITIONAL([LINUX_DATAPATH], [test "$HAVE_NETLINK" = yes && test "$ESX" = no])
-if test "$HAVE_NETLINK" = yes && test "$ESX" = no; then
- AC_DEFINE([LINUX_DATAPATH], [1], [System uses the linux datapath module.])
-fi
-
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
AC_OUTPUT
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
AC_OUTPUT