Fix boot.sh for the case where the extensions repository is not available.

Reported by Justin.

diff --git a/Makefile.am b/Makefile.am
index 53c65fefd7f3e96274adf8ba7306d50c683bdb15..658070b3ebc1c75f0317332625f3ac0a8c65dae8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ SUBDIRS = \
        third-party \
        debian
 if HAVE_EXT
-SUBDIRS += ext
+SUBDIRS += $(EXT)
 distdir = $(PACKAGE)+ext-$(VERSION)
 endif
 

diff --git a/acinclude.m4 b/acinclude.m4
index 8b80249d9d92712c9938ae1b67b4b351eef97046..0c016a8d4067f857149fa1dc7be38365c734cd61 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -134,6 +134,7 @@ AC_DEFUN([OFP_ENABLE_EXT],
      AC_CONFIG_SUBDIRS([ext])
      AC_DEFINE([HAVE_EXT], [1], 
                [Whether the OpenFlow extensions submodule is available])
+     AC_SUBST([EXT], [ext])
    fi
    AC_SUBST([ofp_top_srcdir], ['$(top_srcdir)'])
    AM_CONDITIONAL([HAVE_EXT], [test $HAVE_EXT = yes])])