X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=configure.ac;h=708b1fe5c22b4593ef311ea88bd554ab211ee496;hb=b54269832d4add0af5e7b2a1c787968da1ca8bfe;hp=0dec077e4db48d9eecc0b7e3f7ae47412c8d773e;hpb=6209d47f7b41040b213d7b0c5fc0fa1046fc0b99;p=sliver-openvswitch.git

diff --git a/configure.ac b/configure.ac
index 0dec077e4..708b1fe5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,94 +1,81 @@
-AC_PREREQ(2.59)
-AC_INIT(openflow, v0.1.9, info@openflowswitch.org)
+# 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.60)
+AC_INIT(openflow, 0.8.9~1, info@openflowswitch.org)
+NX_BUILDNR
+AC_CONFIG_SRCDIR([README.hwtables])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_CPP
+AC_PROG_RANLIB
+AC_PROG_MKDIR_P
 
-AC_USE_SYSTEM_EXTENSIONS
-
-AC_PROG_LIBTOOL
-
-AC_ARG_ENABLE(
-  [ndebug],
-  [AC_HELP_STRING([--enable-ndebug], 
-                  [Disable debugging features for max performance])],
-  [case "${enableval}" in # (
-     yes) ndebug=true ;; # (
-     no)  ndebug=false ;; # (
-     *) AC_MSG_ERROR([bad value ${enableval} for --enable-ndebug]) ;;
-   esac],
-  [ndebug=false])
-AM_CONDITIONAL([NDEBUG], [test x$ndebug = xtrue])
-
-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>])
-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.])
+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_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
+OFP_CHECK_LIBOPENFLOW
+OFP_CHECK_IF_PACKET
+OFP_CHECK_HWTABLES
 
-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])
+AC_CHECK_FUNCS([strsignal])
 
-if test "$ssl" = true; then
-PKG_CHECK_MODULES([SSL], [libssl], 
-  [HAVE_OPENSSL=yes],
-  [HAVE_OPENSSL=no
-   AC_MSG_WARN([Cannot find libssl:
+AC_ARG_VAR(KARCH, [Kernel Architecture String])
+AC_SUBST(KARCH)
+OFP_CHECK_LINUX(l26, 2.6, 2.6, KSRC26, L26_ENABLED)
+OFP_CHECK_LINUX(l24, 2.4, 2.4, KSRC24, L24_ENABLED)
 
-$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
+OFP_CHECK_DPKG_BUILDPACKAGE
 
-AC_CHECK_LIB([socket], [connect])
-AC_CHECK_LIB([resolv], [gethostbyname])
-AC_CHECK_LIB([dl], [dladdr])
+CFLAGS="$CFLAGS -Wall -Wno-sign-compare -Wpointer-arith -Wdeclaration-after-statement"
 
-CFLAGS="$CFLAGS -Wall -Wno-sign-compare"
+OFP_ENABLE_EXT
+m4_include([ext.m4])
 
 AC_CONFIG_FILES([Makefile 
-man/Makefile
-man/man8/Makefile
 datapath/Makefile 
-lib/Makefile
-include/Makefile
-controller/Makefile
-utilities/Makefile
-secchan/Makefile
-switch/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