From: Steve Langasek <vorlon@debian.org>
Date: Tue, 17 Nov 2020 01:23:45 +0000 (+0000)
Subject: don't use AM_INIT_AUTOMAKE macro when we aren't using automake
X-Git-Tag: archive/raspbian/2.4.47+dfsg-3+rpi1+deb10u4^2~16
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cd1c9a5943d66b257fdce2212e67f636f8150c96;p=openldap.git

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.

Gbp-Pq: Name no-AM_INIT_AUTOMAKE
---

diff --git a/configure.in b/configure.in
index 30a785bc..a238b628 100644
--- a/configure.in
+++ b/configure.in
@@ -26,7 +26,8 @@ dnl Configure.in for OpenLDAP
 AC_COPYRIGHT([[Copyright 1998-2018 The OpenLDAP Foundation. All rights reserved.
 Restrictions apply, see COPYRIGHT and LICENSE files.]])
 AC_REVISION([$Id: 2a4d29f78fa5f6b25f2c5cecac2126fcc3bd8623 $])
-AC_INIT([OpenLDAP],,[http://www.openldap.org/its/])
+AC_INIT([OpenLDAP],[$OL_VERSION],[http://www.openldap.org/its/])
+AC_PROG_MAKE_SET
 m4_define([AC_PACKAGE_BUGREPORT],[<http://www.openldap.org/its/>])
 AC_CONFIG_SRCDIR(build/version.sh)dnl
 dnl ----------------------------------------------------------------
@@ -69,7 +70,6 @@ dnl Determine host platform
 dnl		we try not to use this for much
 AC_CANONICAL_TARGET([])
 
-AM_INIT_AUTOMAKE([$OL_PACKAGE],[$OL_VERSION], [no defines])dnl
 AC_SUBST(PACKAGE)dnl
 AC_SUBST(VERSION)dnl
 AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)