[Build-common-hackers] Bug#265562: Fixes for DEB_AUTO_UPDATE_* interface

[Robert Millan]

This is a multi-part MIME message sent by reportbug.

--===============1485427859==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: cdbs
Version: 0.4.22-1
Severity: wishlist
Tags: patch

I'm attaching a pair of fixes for the DEB_AUTO_UPDATE_* interface:

  - Recognise DEB_AUTO_UPDATE_ACLOCAL, make DEB_AUTO_UPDATE_AUTOMAKE imply
    the former, and add a warning explaining that using _AUTOMAKE to update
    aclocal.m4 is deprecated.  This will allow many packages to avoid a
    gratuitous automake update when they just want aclocal.

  - Be smarter when finding the autoconf command.  When autoconf 2.5x is
    installed, if command 'autoconf2.50' is not found, it means the 'autoconf'
    command is granted to be 2.5x and not 2.13.  So if the former is not
    found, we can safely fallback to the latter.  This will allow packages to
    avoid Build-Conflicts with autoconf2.13.

-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: kfreebsd-i386 (i386)
Kernel: GNU/kFreeBSD 5.2.1-5
Locale: LANG=C, LC_CTYPE=C (ignored: LC_ALL set to C)

-- no debconf information

--===============1485427859==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="cdbs.diff"

--- cdbs-0.4.22.old/1/class/autotools-files.mk.in	2004-02-15 07:13:30.000000000 +0100
+++ cdbs-0.4.22/1/class/autotools-files.mk.in	2004-08-13 19:40:07.000000000 +0200
@@ -27,18 +27,25 @@
 
 include $(_cdbs_class_path)/autotools-vars.mk$(_cdbs_makefile_suffix)
 
+# compatibility blurb, will be eventualy removed
+ifneq ($(DEB_AUTO_UPDATE_AUTOMAKE), )
+ifeq ($(DEB_AUTO_UPDATE_ACLOCAL), )
+$(warning DEB_AUTO_UPDATE_AUTOMAKE will eventualy stop impliing DEB_AUTO_UPDATE_ACLOCAL.  If you meant aclocal.m4 to be re-generated, please use DEB_AUTO_UPDATE_ACLOCAL)
+DEB_AUTO_UPDATE_ACLOCAL = $(DEB_AUTO_UPDATE_AUTOMAKE)
+endif
+endif
+
 common-configure-arch common-configure-indep:: debian/stamp-autotools-files
 debian/stamp-autotools-files:
 	if test "$(DEB_AUTO_UPDATE_LIBTOOL)" = "pre" ; then \
 		cd $(DEB_SRCDIR) && libtoolize -c -f ; \
 	fi
-	if test -n "$(DEB_AUTO_UPDATE_AUTOMAKE)" ; then \
+	if test -n "$(DEB_AUTO_UPDATE_ACLOCAL)" ; then \
 		if test -d $(DEB_SRCDIR)/m4 ; then m4="-I m4" ; fi ; \
 		if test -e $(DEB_SRCDIR)/aclocal.m4 ; then cd $(DEB_SRCDIR) && aclocal-$(DEB_AUTO_UPDATE_AUTOMAKE) $(m4) ; fi ; \
 	fi
 	if test -n "$(DEB_AUTO_UPDATE_AUTOCONF)" ; then \
-		if test "$(DEB_AUTO_UPDATE_AUTOCONF)" = "2.50" ; then ac_suffix="" ; else ac_suffix="$(DEB_AUTO_UPDATE_AUTOCONF)" ; fi ; \
-		if test -e $(DEB_SRCDIR)/configure.ac || test -e $(DEB_SRCDIR)/configure.in ; then cd $(DEB_SRCDIR) && autoconf$(ac_suffix) ; fi \
+		if test -e $(DEB_SRCDIR)/configure.ac || test -e $(DEB_SRCDIR)/configure.in ; then cd $(DEB_SRCDIR) && `which autoconf$(DEB_AUTO_UPDATE_AUTOCONF) || which autoconf` ; fi ; \
 	fi
 	if test -n "$(DEB_AUTO_UPDATE_AUTOMAKE)" ; then \
 		if test -e $(DEB_SRCDIR)/Makefile.am ; then cd $(DEB_SRCDIR) && automake-$(DEB_AUTO_UPDATE_AUTOMAKE) ; fi ; \

--===============1485427859==--