X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=configure.ac;h=d86e553c479de3a20c7a97e2c16736434e1759a5;hb=978cbbfb827ec9fa0681d374d3507d8176ad881b;hp=11cf5298e6ba74fede895f9987ca18215b3c0979;hpb=8368c6e6e429d36c663f8d5cea054feebcc2f654;p=sliver-openvswitch.git

diff --git a/configure.ac b/configure.ac
index 11cf5298e..d86e553c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(openflow, v0.1.9, info@openflowswitch.org)
+AC_INIT(openflow, v0.2.1, info@openflowswitch.org)
 AM_INIT_AUTOMAKE
 
 AC_PROG_CC
@@ -29,6 +29,46 @@ AC_CHECK_HEADER([linux/netlink.h],
                 [HAVE_NETLINK=no],
                 [#include <sys/socket.h>])
 AM_CONDITIONAL([HAVE_NETLINK], [test "$HAVE_NETLINK" = yes])
+if test "$HAVE_NETLINK" = yes; then
+   AC_DEFINE([HAVE_NETLINK], [1],
+             [Define to 1 if Netlink protocol is available.])
+fi
+
+AC_CHECK_HEADER([net/if_packet.h],
+                [HAVE_IF_PACKET=yes],
+                [HAVE_IF_PACKET=no])
+AM_CONDITIONAL([HAVE_IF_PACKET], [test "$HAVE_IF_PACKET" = yes])
+if test "$HAVE_IF_PACKET" = yes; then
+   AC_DEFINE([HAVE_IF_PACKET], [1],
+             [Define to 1 if net/if_packet.h is available.])
+fi
+
+AC_ARG_ENABLE(
+  [ssl],
+  [AC_HELP_STRING([--enable-ssl], 
+                  [Enable ssl support (requires libssl)])],
+  [case "${enableval}" in # (
+     yes) ssl=true ;;  # (
+     no)  ssl=false ;; # (
+     *) AC_MSG_ERROR([bad value ${enableval} for --enable-ssl]) ;;
+   esac],
+  [ssl=false])
+
+if test "$ssl" = true; then
+PKG_CHECK_MODULES([SSL], [libssl], 
+  [HAVE_OPENSSL=yes],
+  [HAVE_OPENSSL=no
+   AC_MSG_WARN([Cannot find libssl:
+
+$SSL_PKG_ERRORS
+
+OpenFlow will not support SSL connections.])])
+
+fi
+AM_CONDITIONAL([HAVE_OPENSSL], [test "$HAVE_OPENSSL" = yes])
+if test "$HAVE_OPENSSL" = yes; then
+   AC_DEFINE([HAVE_OPENSSL], [1], [Define to 1 if OpenSSL is installed.])
+fi
 
 AC_CHECK_LIB([socket], [connect])
 AC_CHECK_LIB([resolv], [gethostbyname])
@@ -45,6 +85,7 @@ include/Makefile
 controller/Makefile
 utilities/Makefile
 secchan/Makefile
+switch/Makefile
 datapath/tests/Makefile
 third-party/Makefile
 datapath/linux-2.6/Makefile