From 8833d73dea713cc86d0bc94d3d02e663067f3f9e Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 9 Jun 2009 14:22:52 -0700 Subject: [PATCH] Remove "dpkg-buildpackage" test from "make distcheck". Now the Debian packaging is regularly tested via the autobuilder, so there is less need to do it from "make distcheck", and not doing it saves time there. --- Makefile.am | 8 -------- acinclude.m4 | 7 ------- configure.ac | 1 - 3 files changed, 16 deletions(-) diff --git a/Makefile.am b/Makefile.am index 44addf02..f1de10f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,14 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = datapath if ENABLE_USERSPACE -if HAVE_DPKG_BUILDPACKAGE -distcheck-hook: - cd $(srcdir) && dpkg-buildpackage -rfakeroot -us -uc - cd $(srcdir) && fakeroot ./debian/rules clean -else -distcheck-hook: -endif - AM_CPPFLAGS = $(SSL_CFLAGS) AM_CPPFLAGS += $(NCURSES_CFLAGS) AM_CPPFLAGS += $(PCRE_CFLAGS) diff --git a/acinclude.m4 b/acinclude.m4 index 498196b3..f16bbf4b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -154,13 +154,6 @@ AC_DEFUN([OVS_CHECK_IF_PACKET], [Define to 1 if net/if_packet.h is available.]) fi]) -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([OVS_CHECK_DPKG_BUILDPACKAGE], - [AC_CHECK_PROG([HAVE_DPKG_BUILDPACKAGE], [dpkg-buildpackage], [yes], [no]) - AM_CONDITIONAL([HAVE_DPKG_BUILDPACKAGE], - [test $HAVE_DPKG_BUILDPACKAGE = yes])]) - dnl ---------------------------------------------------------------------- dnl These macros are from GNU PSPP, with the following original license: dnl Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. diff --git a/configure.ac b/configure.ac index a557f0f4..65152d17 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,6 @@ OVS_CHECK_CURSES OVS_CHECK_LINUX_VT_H OVS_CHECK_PCRE OVS_CHECK_IF_PACKET -OVS_CHECK_DPKG_BUILDPACKAGE if $build_userspace; then OVS_CHECK_PKIDIR -- 2.30.2