From 084faf6a41eaf7f0fb52c0210b0cc7fbf22a7ac6 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sun, 3 Jan 2016 15:10:05 +0100 Subject: Allow building without libgtest-dev under build profile I'd like to avoid pulling libgtest-dev into the bootstrap set. Fortunately, libgtest-dev is only used for testing apt and apt correctly implements DEB_BUILD_OPTIONS=nocheck now. So this bug is about getting rid of the Build-Depends. Simply removing it (by adding a build profile) is not sufficient however as configure fails hard, so an additional bit is necessary to cover for that. Closes: #809726 --- debian/control | 2 +- debian/rules | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index bb5bf87ae..d36b97743 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), zlib1g-dev, libbz2-dev, liblzma-dev, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), - autotools-dev, autoconf, automake, libgtest-dev, + autotools-dev, autoconf, automake, libgtest-dev , g++ (>= 4:5.2) Build-Depends-Indep: doxygen, w3m, graphviz Build-Conflicts: autoconf2.13, automake1.4 diff --git a/debian/rules b/debian/rules index c8e7cb285..ce7d19dec 100755 --- a/debian/rules +++ b/debian/rules @@ -60,6 +60,11 @@ ifeq ($(words $(BLD)),0) override BLD := ./build endif +# When building without , the header is available and thus the test is +# successful. When building with , the header is missing, but we still +# pretend it to be available, because configure would fail otherwise. +export ac_cv_header_gtest_gtest_h=yes + # APT Programs in apt-utils APT_UTILS=ftparchive sortpkgs extracttemplates -- cgit v1.2.3