Make the secchan report a few more switch-status items.

[openvswitch] / configure.ac

diff --git a/configure.ac b/configure.ac
index 539fc619e7800fb86a70e2d65742245a633bb87e..3f0142e0a8575241551ecf7740e1f42cd3abd439 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,51 @@
+# Copyright (c) 2008 The Board of Trustees of The Leland Stanford
+# Junior University
+#
+# We are making the OpenFlow specification and associated documentation
+# (Software) available for public use and benefit with the expectation
+# that others will use, modify and enhance the Software and contribute
+# those enhancements back to the community. However, since we would
+# like to make the Software available for broadest use, with as few
+# restrictions as possible permission is hereby granted, free of
+# charge, to any person obtaining a copy of this Software to deal in
+# the Software under the copyrights without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+# The name and trademarks of copyright holder(s) may NOT be used in
+# advertising or publicity pertaining to the Software or any
+# derivatives without specific, written prior permission.
+
 AC_PREREQ(2.59)
-AC_INIT(openflow, v0.2.0, info@openflowswitch.org)
+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_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],
@@ -21,13 +59,42 @@ AC_ARG_ENABLE(
   [ndebug=false])
 AM_CONDITIONAL([NDEBUG], [test x$ndebug = xtrue])
 
+AC_ARG_ENABLE(
+  [hw-tables],
+  [AC_HELP_STRING([--enable-hw-tables=MODULE...],
+                  [Configure and build the specified externally supplied 
+                  hardware table support modules])])
+case "${enable_hw_tables}" in # (
+  yes) 
+    AC_MSG_ERROR([--enable-hw-tables has a required argument])
+    ;; # (
+  ''|no) 
+    hw_tables=
+    ;; # (
+  *) 
+    hw_tables=`echo "$enable_hw_tables" | sed 's/,/ /g'`
+    ;;
+esac
+for d in $hw_tables; do
+    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
+    HW_TABLES="$HW_TABLES \$(top_srcdir)/$mk"
+done
+AC_SUBST(HW_TABLES)
+
+AC_ARG_VAR(KARCH, [Kernel Architecture String])
+AC_SUBST(KARCH)
+
 CHECK_LINUX(l26, 2.6, 2.6, KSRC26, L26_ENABLED)
 CHECK_LINUX(l24, 2.4, 2.4, KSRC24, L24_ENABLED)
 
 AC_CHECK_HEADER([linux/netlink.h],
                 [HAVE_NETLINK=yes],
                 [HAVE_NETLINK=no],
-                [#include <sys/socket.h>])
+                [#include <sys/socket.h>
+#include <linux/types.h>])
 AM_CONDITIONAL([HAVE_NETLINK], [test "$HAVE_NETLINK" = yes])
 if test "$HAVE_NETLINK" = yes; then
    AC_DEFINE([HAVE_NETLINK], [1],
@@ -55,6 +122,8 @@ AC_ARG_ENABLE(
   [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
@@ -71,14 +140,13 @@ if test "$HAVE_OPENSSL" = yes; then
 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 
-man/Makefile
-man/man8/Makefile
 datapath/Makefile 
 lib/Makefile
 include/Makefile
@@ -86,9 +154,14 @@ controller/Makefile
 utilities/Makefile
 secchan/Makefile
 switch/Makefile
+tests/Makefile
 datapath/tests/Makefile
 third-party/Makefile
+datapath/linux-2.6/Kbuild
 datapath/linux-2.6/Makefile
-datapath/linux-2.4/Makefile])
+datapath/linux-2.6/Makefile.main
+datapath/linux-2.4/Kbuild
+datapath/linux-2.4/Makefile
+datapath/linux-2.4/Makefile.main])
 
 AC_OUTPUT