summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2012-06-18 12:33:53 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-06-18 12:33:53 +0200
commit7f9692a9e91be568d8cb5208924b8e49d5a75e39 (patch)
tree351f67ef8b67f78531a183c6ce5823bef888b553
parent2b803d4069e1f05d0461fbad004482ff02100812 (diff)
* buildlib/configure.mak:
- print a message detailing how to get config.guess and config.sub in case they are not in /usr/share/misc (Closes: #677312)
-rw-r--r--buildlib/configure.mak29
-rw-r--r--debian/changelog3
2 files changed, 31 insertions, 1 deletions
diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index c0d8e3c76..68d0535b4 100644
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -12,15 +12,42 @@
# It would be a fairly good idea to run this after a cvs checkout.
BUILDDIR=build
-.PHONY: startup
+.PHONY: startup missing-config-files
startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTED))
# use the files provided from the system instead of carry around
# and use (most of the time outdated) copycats
+ifeq (file-okay,$(shell test -r buildlib/config.sub && echo 'file-okay'))
+buildlib/config.sub:
+else
+ ifeq (file-okay,$(shell test -r /usr/share/misc/config.sub && echo 'file-okay'))
buildlib/config.sub:
ln -sf /usr/share/misc/config.sub buildlib/config.sub
+ else
+buildlib/config.sub: missing-config-files
+ endif
+endif
+
+ifeq (file-okay,$(shell test -r buildlib/config.guess && echo 'file-okay'))
+buildlib/config.guess:
+else
+ ifeq (file-okay,$(shell test -r /usr/share/misc/config.guess && echo 'file-okay'))
buildlib/config.guess:
ln -sf /usr/share/misc/config.guess buildlib/config.guess
+ else
+buildlib/config.guess: missing-config-files
+ endif
+endif
+
+missing-config-files:
+ @echo "APT needs 'config.guess' and 'config.sub' in buildlib/ for configuration."
+ @echo "On Debian systems these are available in the 'autotools-dev' package."
+ @echo
+ @echo "The latest versions can be acquired from the upstream git repository:"
+ @echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD"
+ @echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD"
+ exit 100
+
configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub
autoconf
diff --git a/debian/changelog b/debian/changelog
index 0e08534b6..ad5a4a1a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ apt (0.9.6.1) UNRELEASED; urgency=low
* apt-pkg/pkgcache.cc:
- do a string comparision for architecture checking in IsMultiArchImplicit
as 'unique' strings in the pkgcache aren't unique (Closes: #677454)
+ * buildlib/configure.mak:
+ - print a message detailing how to get config.guess and config.sub
+ in case they are not in /usr/share/misc (Closes: #677312)
-- David Kalnischkies <kalnischkies@gmail.com> Thu, 14 Jun 2012 15:45:13 +0200