Get rid of per-port STP implemented bits, by reducing OFPP_MAX to 255.

[openvswitch] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 4dacae871a4101516a640a8f32a3767d186f7773..0c016a8d4067f857149fa1dc7be38365c734cd61 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -118,7 +118,7 @@ AC_DEFUN([OFP_ENABLE_EXT],
        HAVE_EXT=no
        ;;
      (*)
-       if test -d "$srcdir/ext"; then
+       if test -e "$srcdir/ext/configure"; then
          HAVE_EXT=yes
        else
          HAVE_EXT=no
@@ -126,7 +126,7 @@ AC_DEFUN([OFP_ENABLE_EXT],
        ;;
    esac
    if test $HAVE_EXT = yes; then
-     if test -d "$srcdir/ext"; then
+     if test -e "$srcdir/ext/configure"; then
        :
      else
        AC_MSG_ERROR([cannot configure extensions without "ext" directory])
@@ -134,6 +134,15 @@ 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])])
+
+dnl Checks for dpkg-buildpackage.  If this is available then we check
+dnl that the Debian packaging is functional at "make distcheck" time.
+AC_DEFUN([OFP_CHECK_DPKG_BUILDPACKAGE],
+  [AC_CHECK_PROG([HAVE_DPKG_BUILDPACKAGE], [dpkg-buildpackage], [yes], [no])
+   AM_CONDITIONAL([HAVE_DPKG_BUILDPACKAGE], 
+                  [test $HAVE_DPKG_BUILDPACKAGE = yes])])
+