[Build-common-hackers] Bug#217131: new patch

[Robert Millan]

--GvXjxJ+pjyke8COw
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline


Hi!

My first patch was wrong, as it didn't run autothings in the proper order when
both autoconf and automake were enabled, which produced build errors in the
package i was maintaining (inetutils).

The correct order should be:

 1- aclocal
 2- autoconf
 3- automake

I'm attaching a new patch.

-- 
Robert Millan

"[..] but the delight and pride of Aule is in the deed of making, and in the
thing made, and neither in possession nor in his own mastery; wherefore he
gives and hoards not, and is free from care, passing ever on to some new work."

 -- J.R.R.T, Ainulindale (Silmarillion)

--GvXjxJ+pjyke8COw
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="cdbs.diff"

--- /usr/share/cdbs/1/class/autotools.mk	2003-10-16 05:24:55.000000000 +0200
+++ autotools.mk	2003-10-23 15:29:33.000000000 +0200
@@ -36,6 +36,17 @@
 common-configure-arch common-configure-indep:: common-configure-impl
 common-configure-impl:: $(DEB_BUILDDIR)/config.status
 $(DEB_BUILDDIR)/config.status:
+	if test -n "$(DEB_AUTO_UPDATE_AUTOMAKE)" ; 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 \
+	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 ; \
+	fi
 	chmod a+x $(DEB_CONFIGURE_SCRIPT)
 	$(DEB_CONFIGURE_INVOKE) $(cdbs_configure_flags) $(DEB_CONFIGURE_EXTRA_FLAGS) $(DEB_CONFIGURE_USER_FLAGS)
 

--GvXjxJ+pjyke8COw--