Modified the naming scheme for hardware tables.

[sliver-openvswitch.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index eab18d1..5fea45f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,17 @@
 AC_PREREQ(2.59)
-AC_INIT(openflow, v0.8.0rc1, info@openflowswitch.org)
+AC_INIT(openflow, v0.8.1, info@openflowswitch.org)
 AM_INIT_AUTOMAKE
 
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_LD
 
+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_USE_SYSTEM_EXTENSIONS
 
 AC_PROG_LIBTOOL
@@ -22,6 +28,34 @@ 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)
 
@@ -57,6 +91,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
@@ -79,8 +115,6 @@ AC_CHECK_LIB([dl], [dladdr])
 CFLAGS="$CFLAGS -Wall -Wno-sign-compare"
 
 AC_CONFIG_FILES([Makefile 
-man/Makefile
-man/man8/Makefile
 datapath/Makefile 
 lib/Makefile
 include/Makefile
@@ -94,6 +128,8 @@ third-party/Makefile
 datapath/linux-2.6/Kbuild
 datapath/linux-2.6/Makefile
 datapath/linux-2.6/Makefile.main
-datapath/linux-2.4/Makefile])
+datapath/linux-2.4/Kbuild
+datapath/linux-2.4/Makefile
+datapath/linux-2.4/Makefile.main])
 
 AC_OUTPUT