X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=acinclude.m4;h=0036ac1b3eb528b0cfe356d0e7de0a14eabd86d8;hb=a662402bac1b52fb00c1e1803346b65725a8bebf;hp=17283b1129735a6105694f072e5e749b9e8225fa;hpb=27dadb6bc69e03c2fd4a8de4f86073ebcb5f6cc3;p=sliver-openvswitch.git

diff --git a/acinclude.m4 b/acinclude.m4
index 17283b112..0036ac1b3 100644
--- 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
@@ -126,14 +126,20 @@ AC_DEFUN([OFP_ENABLE_EXT],
        ;;
    esac
    if test $HAVE_EXT = yes; then
-     if test -e "$srcdir/ext/configure"; then
+     if test -e "$srcdir/ext/automake.mk"; then
        :
      else
        AC_MSG_ERROR([cannot configure extensions without "ext" directory])
      fi
-     AC_CONFIG_SUBDIRS([ext])
      AC_DEFINE([HAVE_EXT], [1], 
                [Whether the OpenFlow extensions submodule is available])
    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])])
+