[Pkg-openldap-devel] r1382 - in openldap/trunk/debian: . patches

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2011-10-08 10:01:04 +0000 (Sat, 08 Oct 2011)
New Revision: 1382

Added:
   openldap/trunk/debian/patches/no-AM_INIT_AUTOMAKE
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/series
Log:
debian/patches/no-AM_INIT_AUTOMAKE: don't use AM_INIT_AUTOMAKE macro
when we aren't using automake.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2011-10-08 09:32:20 UTC (rev 1381)
+++ openldap/trunk/debian/changelog	2011-10-08 10:01:04 UTC (rev 1382)
@@ -4,6 +4,8 @@
     libdb5.1.  Thanks to Peter Marschall for catching.  Closes: #621403
     again.
   * Use dh_autoreconf instead of a locally-patched autogen.sh.
+  * debian/patches/no-AM_INIT_AUTOMAKE: don't use AM_INIT_AUTOMAKE macro
+    when we aren't using automake.
 
  -- Steve Langasek <vorlon at debian.org>  Sun, 21 Aug 2011 11:25:07 -0700
 

Added: openldap/trunk/debian/patches/no-AM_INIT_AUTOMAKE
===================================================================
--- openldap/trunk/debian/patches/no-AM_INIT_AUTOMAKE	                        (rev 0)
+++ openldap/trunk/debian/patches/no-AM_INIT_AUTOMAKE	2011-10-08 10:01:04 UTC (rev 1382)
@@ -0,0 +1,18 @@
+Description: don't use AM_INIT_AUTOMAKE macro when we aren't using automake
+ Calling AM_INIT_AUTOMAKE() in configure.in serves no purpose if we're not
+ using automake, and it confuses autoreconf.  Use AC_INIT() instead.
+Author: Steve Langasek <vorlon at debian.org>
+
+Index: trunk/configure.in
+===================================================================
+--- trunk.orig/configure.in
++++ trunk/configure.in
+@@ -67,7 +67,7 @@
+ dnl		we try not to use this for much
+ AC_CANONICAL_TARGET([])
+ 
+-AM_INIT_AUTOMAKE([$OL_PACKAGE],[$OL_VERSION], [no defines])dnl
++AC_INIT([$OL_PACKAGE],[$OL_VERSION])dnl
+ AC_SUBST(PACKAGE)dnl
+ AC_SUBST(VERSION)dnl
+ AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2011-10-08 09:32:20 UTC (rev 1381)
+++ openldap/trunk/debian/patches/series	2011-10-08 10:01:04 UTC (rev 1382)
@@ -16,3 +16,4 @@
 fix-ftbfs-binutils-gold
 fix-its6898-locking-issue
 fix-build-top-mk
+no-AM_INIT_AUTOMAKE