[Pkg-openldap-devel] Bug#725824: openldap: build/config.guess and build/config.sub not being updated despite dh-autoreconf

[Colin Watson]

Package: openldap
Version: 2.4.31-1+nmu2
Severity: normal
Tags: patch
User: debian-arm at lists.debian.org
Usertags: arm64

openldap's use of dh-autoreconf isn't quite enough to update
build/config.guess and build/config.sub, because autoreconf only updates
config.guess and config.sub in certain circumstances which don't hold
here.  The following patch fixes this, while still preserving the
property that the changes are reverted by dh_autoreconf_clean; this is a
pattern I've used successfully in other packages.

  * Update build/config.guess and build/config.sub at build time; this was
    not done automatically because the top-level configure.in does not use
    Automake.

diff -u openldap-2.4.31/debian/rules openldap-2.4.31/debian/rules
--- openldap-2.4.31/debian/rules
+++ openldap-2.4.31/debian/rules
@@ -53,6 +53,15 @@
 %:
 	dh $@ --with quilt,autoreconf --builddirectory=$(builddir)
 
+# Only contrib/ldapc++ uses Automake, so special care is needed to update
+# config.guess and config.sub at the top level.
+autoreconf:
+	autoreconf -f -i . contrib/ldapc++
+	cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub build/
+
+override_dh_autoreconf:
+	dh_autoreconf debian/rules -- autoreconf
+
 override_dh_auto_configure:
 	# Check if we include the RFCs, Internet-Drafts, or upstream schemas
 	# with RFC text (which are non DFSG-free).  You can set DFSG_NONFREE
reverted:
--- openldap-2.4.31/debian/autoreconf
+++ openldap-2.4.31.orig/debian/autoreconf
@@ -1,2 +0,0 @@
-.
-contrib/ldapc++

Thanks,

-- 
Colin Watson                                       [cjwatson at ubuntu.com]