Fix boot.sh behavior when OpenFlow extensions are not available.

diff --git a/Makefile.am b/Makefile.am
index e165359a80636a580080af5561ad53e3c2f822f2..b1221fd9040dea70b2e37cb498b15d6dd7f9c9a6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # The goal of -Wno-syntax here is just to suppress the Automake warning
 # about overriding distdir, below.
 AUTOMAKE_OPTIONS = foreign -Wno-syntax subdir-objects
-ACLOCAL_AMFLAGS = -I m4 -I ext/m4
+ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = datapath
 
 if HAVE_DPKG_BUILDPACKAGE

diff --git a/acinclude.m4 b/acinclude.m4
index dd7a5271102a53ba2803cbe37ca78468ab11b9a3..0036ac1b3eb528b0cfe356d0e7de0a14eabd86d8 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -118,7 +118,7 @@ AC_DEFUN([OFP_ENABLE_EXT],
        HAVE_EXT=no
        ;;
      (*)
-       if test -e "$srcdir/ext/configure"; then
+       if test -e "$srcdir/ext/automake.mk"; then
          HAVE_EXT=yes
        else
          HAVE_EXT=no

diff --git a/configure.ac b/configure.ac
index 7908a59c64646d2a044de74206852ea71eca2298..9cca05971ea74c719012922ee6b5cee7e298cfbc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,6 @@ AC_PREREQ(2.59)
 AC_INIT(openflow, 0.9.0~b1, info@openflowswitch.org)
 AC_CONFIG_SRCDIR([README.hwtables])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_MACRO_DIR([ext/m4])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE