AC_DEFINE([ESX], [1], [Define to 1 if building on ESX.])
fi])
+dnl Checks for MSVC x64 compiler.
+AC_DEFUN([OVS_CHECK_WIN64],
+ [AC_CACHE_CHECK(
+ [for MSVC x64 compiler],
+ [cl_cv_x64],
+ [dnl "cl" writes x64 output to stdin:
+ if (cl) 2>&1 | grep 'x64' >/dev/null 2>&1; then
+ cl_cv_x64=yes
+ MSVC64_LDFLAGS=" /MACHINE:X64 "
+ else
+ cl_cv_x64=no
+ MSVC64_LDFLAGS=""
+ fi])
+ AC_SUBST([MSVC64_LDFLAGS])
+])
+
dnl Checks for WINDOWS.
AC_DEFUN([OVS_CHECK_WIN32],
[AC_CHECK_HEADER([windows.h],
AC_MSG_ERROR([Invalid --with-pthread value])
;;
*)
- PTHREAD_INCLUDES="-I$withval/include"
- PTHREAD_LDFLAGS="-L$withval/lib/x86"
+ if (cl) 2>&1 | grep 'x64' >/dev/null 2>&1; then
+ cl_cv_x64=yes
+ else
+ cl_cv_x64=no
+ fi
+ if test "$cl_cv_x64" = yes; then
+ PTHREAD_WIN32_DIR=$withval/lib/x64
+ PTHREAD_WIN32_DIR_DLL=/$(echo ${withval} | ${SED} -e 's/://')/dll/x64
+ PTHREAD_WIN32_DIR_DLL_WIN_FORM=$withval/dll/x64
+ else
+ PTHREAD_WIN32_DIR=$withval/lib/x86
+ PTHREAD_WIN32_DIR_DLL=/$(echo ${withval} | ${SED} -e 's/://')/dll/x86
+ PTHREAD_WIN32_DIR_DLL_WIN_FORM=$withval/dll/x86
+ fi
+ PTHREAD_INCLUDES=-I$withval/include
+ PTHREAD_LDFLAGS=-L$PTHREAD_WIN32_DIR
PTHREAD_LIBS="-lpthreadVC2"
+ AC_SUBST([PTHREAD_WIN32_DIR_DLL_WIN_FORM])
+ AC_SUBST([PTHREAD_WIN32_DIR_DLL])
AC_SUBST([PTHREAD_INCLUDES])
AC_SUBST([PTHREAD_LDFLAGS])
AC_SUBST([PTHREAD_LIBS])
dnl
dnl Configure Visual Studio solution build
AC_DEFUN([OVS_CHECK_VISUAL_STUDIO_DDK], [
-AC_ARG_WITH([vstudioddk],
- [AS_HELP_STRING([--with-vstudioddk=version_type],
- [Visual Studio DDK version type e.g. Win8.1 Release])],
+AC_ARG_WITH([vstudiotarget],
+ [AS_HELP_STRING([--with-vstudiotarget=target_type],
+ [Target type: Debug/Release])],
[
case "$withval" in
- "Win8.1 Release") ;;
- "Win8.1 Debug") ;;
- "Win8 Release") ;;
- "Win8 Debug") ;;
- *) AC_MSG_ERROR([No good Visual Studio configuration found]) ;;
+ "Release") ;;
+ "Debug") ;;
+ *) AC_MSG_ERROR([No valid Visual Studio configuration found]) ;;
esac
VSTUDIO_CONFIG=$withval
)
AC_SUBST([VSTUDIO_CONFIG])
- AC_DEFINE([VSTUDIO_DDK], [1], [System uses the Visual Studio DDK version module.])
+ AC_DEFINE([VSTUDIO_DDK], [1], [System uses the Visual Studio build target.])
AM_CONDITIONAL([VSTUDIO_DDK], [test -n "$VSTUDIO_CONFIG"])
])
[Define to 1 if Netlink protocol is available.])
fi])
+dnl Checks for libcap-ng.
+AC_DEFUN([OVS_CHECK_LIBCAPNG],
+ [AC_ARG_ENABLE(
+ [libcapng],
+ [AC_HELP_STRING([--disable-libcapng], [Disable Linux capability support])],
+ [case "${enableval}" in
+ (yes) libcapng=true ;;
+ (no) libcapng=false ;;
+ (*) AC_MSG_ERROR([bad value ${enableval} for --enable-libcapng]) ;;
+ esac],
+ [libcapng=check])
+
+ if test "$libcapng" != false; then
+ AC_CHECK_LIB([cap-ng], [capng_clear], [HAVE_LIBCAPNG=yes])
+
+ if test "$HAVE_LIBCAPNG" != yes; then
+ if test "$libcapng" = true ; then
+ AC_MSG_ERROR([libcap-ng support requested, but not found])
+ fi
+ if test "$libcapng" = check ; then
+ AC_MSG_WARN([cannot find libcap-ng.
+--user option will not be supported on Linux.
+(you may use --disable-libcapng to suppress this warning). ])
+ fi
+ fi
+ fi
+
+ AC_SUBST([HAVE_LIBCAPNG])
+ AM_CONDITIONAL([HAVE_LIBCAPNG], [test "$HAVE_LIBCAPNG" = yes])
+ if test "$HAVE_LIBCAPNG" = yes; then
+ AC_DEFINE([HAVE_LIBCAPNG], [1],
+ [Define to 1 if libcap-ng is available.])
+ CAPNG_LDADD="-lcap-ng"
+ AC_SUBST([CAPNG_LDADD])
+ fi])
+
dnl Checks for OpenSSL.
AC_DEFUN([OVS_CHECK_OPENSSL],
[AC_ARG_ENABLE(
AC_DEFUN([OVS_CHECK_VALGRIND],
[AC_CHECK_HEADERS([valgrind/valgrind.h])])
-dnl Checks for Python 2.x, x >= 4.
+dnl Checks for Python 2.x, x >= 7.
AC_DEFUN([OVS_CHECK_PYTHON],
[AC_CACHE_CHECK(
- [for Python 2.x for x >= 4],
+ [for Python 2.x for x >= 7],
[ovs_cv_python],
[if test -n "$PYTHON"; then
ovs_cv_python=$PYTHON
else
ovs_cv_python=no
- for binary in python python2.4 python2.5 python2.7; do
+ for binary in python python2.7; do
ovs_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for dir in $PATH; do
IFS=$ovs_save_IFS
test -z "$dir" && dir=.
if test -x "$dir"/"$binary" && "$dir"/"$binary" -c 'import sys
-if sys.hexversion >= 0x02040000 and sys.hexversion < 0x03000000:
+if sys.hexversion >= 0x02070000 and sys.hexversion < 0x03000000:
sys.exit(0)
else:
sys.exit(1)'; then
fi
done
done
+ if test $ovs_cv_python != no; then
+ if test -x "$ovs_cv_python" && ! "$ovs_cv_python" -c 'import six' >/dev/null 2>&1; then
+ ovs_cv_python=no
+ AC_MSG_WARN([Missing Python six library.])
+ fi
+ fi
fi])
AC_SUBST([HAVE_PYTHON])
AM_MISSING_PROG([PYTHON], [python])
fi
AM_CONDITIONAL([HAVE_PYTHON], [test "$HAVE_PYTHON" = yes])])
+dnl Checks for Python 3.x, x >= 4.
+AC_DEFUN([OVS_CHECK_PYTHON3],
+ [AC_CACHE_CHECK(
+ [for Python 3.x for x >= 4],
+ [ovs_cv_python3],
+ [if test -n "$PYTHON3"; then
+ ovs_cv_python3=$PYTHON3
+ else
+ ovs_cv_python3=no
+ for binary in python3 python3.4; do
+ ovs_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for dir in $PATH; do
+ IFS=$ovs_save_IFS
+ test -z "$dir" && dir=.
+ if test -x "$dir"/"$binary" && "$dir"/"$binary" -c 'import sys
+if sys.hexversion >= 0x03040000 and sys.hexversion < 0x04000000:
+ sys.exit(0)
+else:
+ sys.exit(1)'; then
+ ovs_cv_python3=$dir/$binary
+ break 2
+ fi
+ done
+ done
+ if test $ovs_cv_python != no; then
+ if test -x "$ovs_cv_python" && ! "$ovs_cv_python" -c 'import six' >/dev/null 2>&1; then
+ ovs_cv_python=no
+ AC_MSG_WARN([Missing Python six library.])
+ fi
+ fi
+ fi])
+ AC_SUBST([HAVE_PYTHON3])
+ AM_MISSING_PROG([PYTHON3], [python3])
+ if test $ovs_cv_python3 != no; then
+ PYTHON3=$ovs_cv_python3
+ HAVE_PYTHON3=yes
+ else
+ HAVE_PYTHON3=no
+ fi
+ AM_CONDITIONAL([HAVE_PYTHON3], [test "$HAVE_PYTHON3" = yes])])
+
+
+dnl Checks for dot.
+AC_DEFUN([OVS_CHECK_FLAKE8],
+ [AC_CACHE_CHECK(
+ [for flake8],
+ [ovs_cv_flake8],
+ [if flake8 --version >/dev/null 2>&1; then
+ ovs_cv_flake8=yes
+ else
+ ovs_cv_flake8=no
+ fi])
+ AM_CONDITIONAL([HAVE_FLAKE8], [test "$ovs_cv_flake8" = yes])])
+
dnl Checks for dot.
AC_DEFUN([OVS_CHECK_DOT],
[AC_CACHE_CHECK(
fi])
AM_CONDITIONAL([HAVE_DOT], [test "$ovs_cv_dot" = yes])])
-dnl Checks whether $PYTHON supports the module given as $1
-AC_DEFUN([OVS_CHECK_PYTHON_MODULE],
- [AC_REQUIRE([OVS_CHECK_PYTHON])
- AC_CACHE_CHECK(
- [for $1 Python module],
- [ovs_cv_py_[]AS_TR_SH([$1])],
- [ovs_cv_py_[]AS_TR_SH([$1])=no
- if test $HAVE_PYTHON = yes; then
- AS_ECHO(["running $PYTHON -c 'import $1
-import sys
-sys.exit(0)'..."]) >&AS_MESSAGE_LOG_FD 2>&1
- if $PYTHON -c 'import $1
-import sys
-sys.exit(0)' >&AS_MESSAGE_LOG_FD 2>&1; then
- ovs_cv_py_[]AS_TR_SH([$1])=yes
- fi
- fi])])
-
-dnl Checks for missing python modules at build time
-AC_DEFUN([OVS_CHECK_PYTHON_COMPAT],
- [OVS_CHECK_PYTHON_MODULE([uuid])
- if test $ovs_cv_py_uuid = yes; then
- INCLUDE_PYTHON_COMPAT=no
- else
- INCLUDE_PYTHON_COMPAT=yes
- fi
- AC_MSG_CHECKING([whether to add python/compat to PYTHONPATH])
- AC_MSG_RESULT([$INCLUDE_PYTHON_COMPAT])
- AM_CONDITIONAL([INCLUDE_PYTHON_COMPAT], [test $INCLUDE_PYTHON_COMPAT = yes])])
-
dnl Checks for groff.
AC_DEFUN([OVS_CHECK_GROFF],
[AC_CACHE_CHECK(
projects / cascardo / ovs.git / blobdiff