Fix double free (closes: #711045)

[apt.git] / buildlib / configure.mak

diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index 2124ef887e074eda8f6855543cb5adfa62b1f01f..68d0535b41ed4947f9ee2d105ee3c254b396cb81 100644 (file)
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -12,16 +12,50 @@
 # It would be a fairly good idea to run this after a cvs checkout.
 BUILDDIR=build
 
-.PHONY: startup
-startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTED)) 
+.PHONY: startup missing-config-files
+startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTED))
 
-configure: aclocal.m4 configure.in
+# 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
 
-aclocal.m4:
+aclocal.m4: $(wildcard buildlib/*.m4)
        aclocal -I buildlib
+
 $(BUILDDIR)/config.status: configure
-       test -e $(BUILDDIR) || mkdir $(BUILDDIR)        
+       /usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR)
        (HERE=`pwd`; cd $(BUILDDIR) && $$HERE/configure)
-$(addprefix $(BUILDDIR)/,$(CONVERTED)):
-       (cd $(BUILDDIR) && ./config.status)
+
+$(addprefix $(BUILDDIR)/,$(CONVERTED)): $(BUILDDIR)/config.status