From: Justin Pettit <jpettit@nicira.com>
Date: Wed, 19 Mar 2008 21:01:07 +0000 (-0700)
Subject: Merge branch 'master' of nicira.dyndns.org:/srv/git/openflow
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=981a0b3dd7cae0108af37fa77df65ab725b063ea;hp=-c;p=openvswitch

Merge branch 'master' of nicira.dyndns.org:/srv/git/openflow
---

981a0b3dd7cae0108af37fa77df65ab725b063ea
diff --combined configure.ac
index 11cf5298,6abd5211..cd648f34
--- a/configure.ac
+++ b/configure.ac
@@@ -1,5 -1,5 +1,5 @@@
  AC_PREREQ(2.59)
 -AC_INIT(openflow, v0.1.8, info@openflowswitch.org)
 +AC_INIT(openflow, v0.1.9, info@openflowswitch.org)
  AM_INIT_AUTOMAKE
  
  AC_PROG_CC
@@@ -22,6 -22,7 +22,6 @@@ AC_ARG_ENABLE
  AM_CONDITIONAL([NDEBUG], [test x$ndebug = xtrue])
  
  CHECK_LINUX(l26, 2.6, 2.6, KSRC26, L26_ENABLED)
 -CHECK_LINUX(uml, 2.6, 2.6-uml, KSRCUML, UML_ENABLED)
  CHECK_LINUX(l24, 2.4, 2.4, KSRC24, L24_ENABLED)
  
  AC_CHECK_HEADER([linux/netlink.h],
@@@ -29,6 -30,23 +29,23 @@@
                  [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
+ 
+ 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.])])
+ 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])
@@@ -48,6 -66,7 +65,6 @@@ secchan/Makefil
  datapath/tests/Makefile
  third-party/Makefile
  datapath/linux-2.6/Makefile
 -datapath/linux-2.6-uml/Makefile
  datapath/linux-2.4/Makefile])
  
  AC_OUTPUT