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
Make vconn_open() consistently set *vconnp to NULL on failure.
[sliver-openvswitch.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
d22a71b
..
40fe94f
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,14
+1,20
@@
AC_PREREQ(2.59)
AC_INIT(openflow, v0.8.1, info@openflowswitch.org)
AC_PREREQ(2.59)
AC_INIT(openflow, v0.8.1, info@openflowswitch.org)
+AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE
AC_PROG_CC
AC_PROG_CPP
AC_PROG_LD
AM_INIT_AUTOMAKE
AC_PROG_CC
AC_PROG_CPP
AC_PROG_LD
+AC_PROG_RANLIB
-AC_USE_SYSTEM_EXTENSIONS
+AC_ARG_VAR([PERL], [path to Perl interpreter])
+AC_PATH_PROG([PERL], perl, no)
+if test "$PERL" = no; then
+ AC_MSG_ERROR([Perl interpreter not found in $PATH or $PERL.])
+fi
-AC_
PROG_LIBTOOL
+AC_
USE_SYSTEM_EXTENSIONS
AC_ARG_ENABLE(
[ndebug],
AC_ARG_ENABLE(
[ndebug],
@@
-39,7
+45,7
@@
case "${enable_hw_tables}" in # (
;;
esac
for d in $hw_tables; do
;;
esac
for d in $hw_tables; do
- mk=datapath/hwtable
-
$d/Modules.mk
+ mk=datapath/hwtable
_
$d/Modules.mk
if test ! -e $srcdir/$mk; then
AC_MSG_ERROR([--enable-hw-tables=$d specified but $mk is missing])
fi
if test ! -e $srcdir/$mk; then
AC_MSG_ERROR([--enable-hw-tables=$d specified but $mk is missing])
fi
@@
-85,6
+91,8
@@
AC_ARG_ENABLE(
[ssl=false])
if test "$ssl" = true; then
[ssl=false])
if test "$ssl" = true; then
+dnl Make sure that pkg-config is installed.
+m4_pattern_forbid([PKG_CHECK_MODULES])
PKG_CHECK_MODULES([SSL], [libssl],
[HAVE_OPENSSL=yes],
[HAVE_OPENSSL=no
PKG_CHECK_MODULES([SSL], [libssl],
[HAVE_OPENSSL=yes],
[HAVE_OPENSSL=no
@@
-101,14
+109,13
@@
if test "$HAVE_OPENSSL" = yes; then
fi
AC_CHECK_LIB([socket], [connect])
fi
AC_CHECK_LIB([socket], [connect])
-AC_CHECK_LIB([resolv], [gethostbyname])
-AC_CHECK_LIB([dl], [dladdr])
+AC_SEARCH_LIBS([gethostbyname], [resolv], [RESOLVER_LIBS=-lresolv])
+AC_CHECK_LIB([dl], [dladdr], [FAULT_LIBS=-ldl])
+AC_SUBST([FAULT_LIBS])
CFLAGS="$CFLAGS -Wall -Wno-sign-compare"
AC_CONFIG_FILES([Makefile
CFLAGS="$CFLAGS -Wall -Wno-sign-compare"
AC_CONFIG_FILES([Makefile
-man/Makefile
-man/man8/Makefile
datapath/Makefile
lib/Makefile
include/Makefile
datapath/Makefile
lib/Makefile
include/Makefile