Move Autoconf's macro definitions into config.h.

[openvswitch] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2c2b427edd8aefe69a87762cfa935f99f2608d4c..eb5f9fdd72c111295b834b5dfa541ccbcfddebe5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,20 @@
 AC_PREREQ(2.59)
 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_LD
+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],
@@ -39,7 +45,7 @@ case "${enable_hw_tables}" in # (
     ;;
 esac
 for d in $hw_tables; do
-    mk=datapath/hwtable-$d/Modules.mk
+    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
@@ -47,6 +53,9 @@ for d in $hw_tables; do
 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)
 
@@ -82,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
@@ -104,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
@@ -119,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