- Turn off ssl support by default

- Update docs
- Add ldl to link line (needed from non-ssl builds)

diff --git a/INSTALL b/INSTALL
index d0065a856eb31e27d7bab371661cbef4e513cebd..f9fc43f2beb5767d1031dc6cff732dd88b50a79e 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -20,7 +20,7 @@ distribution, you will need the following software:
     - libssl, from OpenSSL (http://www.openssl.org/), is optional but
       recommended.  libssl is required to establish confidentiality
       and authenticity in the connections among OpenFlow switches and
-      controllers.
+      controllers.  To enable, compile with --enable-ssl=yes
 
 If you are working from a Git tree or snapshot (instead of from a
 distribution tarball), or if you modify the OpenFlow build system, you
@@ -136,7 +136,8 @@ Secure operation over SSL
 The instructions above set up OpenFlow for operation over a plaintext
 TCP connection.  Production use of OpenFlow should use SSL[*] to
 ensure confidentiality and authenticity of traffic among switches and
-controllers.
+controllers.  The source must be configured with --enable-ssl=yes to
+build with ssl support.
 
 To use SSL with OpenFlow, you must set up a public-key infrastructure
 (PKI) including a pair of certificate authorities (CAs), one for

diff --git a/configure.ac b/configure.ac
index b03d669f2c83fed29cabed7f70e68b0d1df830a8..0dec077e4db48d9eecc0b7e3f7ae47412c8d773e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,18 @@ if test "$HAVE_IF_PACKET" = yes; then
              [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
@@ -51,6 +63,8 @@ PKG_CHECK_MODULES([SSL], [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.])

diff --git a/controller/Makefile.am b/controller/Makefile.am
index 1a22d525a07e3e6fca7d84d8de91ab6e66105e11..87642e98ffe3cc99a8d8ace4b1e21dfeb0c7bf0d 100644 (file)
--- a/controller/Makefile.am
+++ b/controller/Makefile.am
@@ -3,4 +3,4 @@ include ../Make.vars
 bin_PROGRAMS = controller
 
 controller_SOURCES = controller.c
-controller_LDADD = ../lib/libopenflow.la
+controller_LDADD = ../lib/libopenflow.la -ldl

diff --git a/secchan/Makefile.am b/secchan/Makefile.am
index bfb0d262aa1f07dee7f2134246581154cb7472f6..13ddb0446cb573967af1b786ecb4474d1a3ebc9c 100644 (file)
--- a/secchan/Makefile.am
+++ b/secchan/Makefile.am
@@ -3,4 +3,4 @@ include ../Make.vars
 bin_PROGRAMS = secchan
 
 secchan_SOURCES = secchan.c
-secchan_LDADD = ../lib/libopenflow.la
+secchan_LDADD = ../lib/libopenflow.la -ldl

diff --git a/switch/Makefile.am b/switch/Makefile.am
index 5e84a99632489d36197a37d804f1418a0d18b2f4..727d1bea194688e4452986aa970c943c7b219939 100644 (file)
--- a/switch/Makefile.am
+++ b/switch/Makefile.am
@@ -23,4 +23,4 @@ switch_SOURCES = \
        table-linear.c \
        table-mac.c 
 
-switch_LDADD = ../lib/libopenflow.la
+switch_LDADD = ../lib/libopenflow.la -ldl