Fix boot.sh behavior when OpenFlow extensions are not available.
This commit is contained in:
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user