INN commit: branches/2.6 (configure.ac m4/krb5.m4 m4/systemd.m4)

INN Commit rra at isc.org
Mon Jan 4 07:12:59 UTC 2021


    Date: Sunday, January 3, 2021 @ 23:12:59
  Author: iulius
Revision: 10484

Move to configure.ac the logic to undefine AM_CONDITIONAL

Modified:
  branches/2.6/configure.ac
  branches/2.6/m4/krb5.m4
  branches/2.6/m4/systemd.m4

---------------+
 configure.ac  |    4 ++++
 m4/krb5.m4    |    3 ---
 m4/systemd.m4 |    3 ---
 3 files changed, 4 insertions(+), 6 deletions(-)

Modified: configure.ac
===================================================================
--- configure.ac	2021-01-04 07:12:27 UTC (rev 10483)
+++ configure.ac	2021-01-04 07:12:59 UTC (rev 10484)
@@ -32,6 +32,10 @@
 AC_REVISION([$Revision$])
 AC_CONFIG_AUX_DIR([support])
 
+dnl Ignore Automake conditionals (called in a few m4 macros) as INN does not
+dnl uses Automake yet.
+m4_define_default([AM_CONDITIONAL], [:])
+
 dnl Lots of our macros are stored in separate files for ease of maintenance.
 m4_include([m4/aux-libs.m4])
 m4_include([m4/bdb.m4])

Modified: m4/krb5.m4
===================================================================
--- m4/krb5.m4	2021-01-04 07:12:27 UTC (rev 10483)
+++ m4/krb5.m4	2021-01-04 07:12:59 UTC (rev 10484)
@@ -61,9 +61,6 @@
 dnl
 dnl SPDX-License-Identifier: FSFULLR
 
-dnl Ignore Automake conditionals if not using Automake.
-m4_define_default([AM_CONDITIONAL], [:])
-
 dnl Headers to include when probing for Kerberos library properties.
 AC_DEFUN([INN_INCLUDES_KRB5], [[
 #if HAVE_KRB5_H

Modified: m4/systemd.m4
===================================================================
--- m4/systemd.m4	2021-01-04 07:12:27 UTC (rev 10483)
+++ m4/systemd.m4	2021-01-04 07:12:59 UTC (rev 10484)
@@ -27,9 +27,6 @@
 dnl
 dnl SPDX-License-Identifier: FSFULLR
 
-dnl Ignore Automake conditionals if not using Automake.
-m4_define_default([AM_CONDITIONAL], [:])
-
 dnl Determine the systemd system unit directory, along with a configure flag
 dnl to override, and sets @systemdsystemunitdir at .  Provides the Automake
 dnl HAVE_SYSTEMD Automake conditional.



More information about the inn-committers mailing list