[#3524] workaround for silent rules being ignored in automake 1.17

Also remove all the few other trailing `dnl`s just to be safe.

diff --git a/configure.ac b/configure.ac
index 488717b14ca471a9fc2d40c61bf3126047f07855..a2a20d5da9e41b0ad14edd3a749378b5df8f419b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ m4_define([serial_tests], [
 ])
 AM_INIT_AUTOMAKE(foreign serial_tests)
 
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])dnl be backward compatible
+AM_SILENT_RULES([yes])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4macros])
 
@@ -440,7 +440,7 @@ for extra in $werror_extras; do
                 [AC_MSG_ERROR([$CXX does not support $extra"])])
 done
 
-fi                              dnl GXX = yes
+fi  # if test "X$GXX" = "Xyes"
 
 # allow building programs with static link.  we need to make it selective
 # because loadable modules cannot be statically linked.
@@ -1468,9 +1468,9 @@ AX_GSS_API
 AC_DEFINE([CONFIG_H_WAS_INCLUDED], [1], [config.h inclusion marker])
 
 # Autoconf 2.70 has runstatedir.
-m4_version_prereq([2.70], [], [dnl
-    AC_ARG_VAR(runstatedir, [$localstatedir/run for autoconf < 2.70])dnl
-    AC_SUBST(runstatedir)dnl
+m4_version_prereq([2.70], [], [
+    AC_ARG_VAR(runstatedir, [$localstatedir/run for autoconf < 2.70])
+    AC_SUBST(runstatedir)
 ])
 if test "x$runstatedir" = "x"; then
     runstatedir="$localstatedir/run"

diff --git a/m4macros/ax_boost_for_kea.m4 b/m4macros/ax_boost_for_kea.m4
index a284a4de3a3dee992f82d107b63c2025ac519b4c..c2714eef272e18ed88ef4a23db2662afaee11d1a 100644 (file)
--- a/m4macros/ax_boost_for_kea.m4
+++ b/m4macros/ax_boost_for_kea.m4
@@ -281,4 +281,4 @@ AC_MSG_RESULT([$BOOST_VERSION])
 
 CPPFLAGS="$CPPFLAGS_SAVED"
 AC_LANG_RESTORE
-])dnl AX_BOOST_FOR_KEA
+])

diff --git a/m4macros/ax_cpp14.m4 b/m4macros/ax_cpp14.m4
index bc445829c20a0718ef1f36433efe92880538d6d4..f061c57bc6efae68f243bc5f42b91491fc599e3b 100644 (file)
--- a/m4macros/ax_cpp14.m4
+++ b/m4macros/ax_cpp14.m4
@@ -250,4 +250,4 @@ for retry in "none" "--std=c++14" "--std=c++1y" "fail"; do
         break
 done
 
-])dnl AX_ISC_CPP14
+])

diff --git a/m4macros/ax_gssapi.m4 b/m4macros/ax_gssapi.m4
index 539343edad50bcabcffe727cbffaca31904c528c..36f851e1a948da3d950bef254163f16f3cd0e7dc 100644 (file)
--- a/m4macros/ax_gssapi.m4
+++ b/m4macros/ax_gssapi.m4
@@ -90,4 +90,4 @@ AC_SUBST(GSSAPI_LIBS)
 AC_SUBST(DISTCHECK_GSSAPI_CONFIGURE_FLAG)
 AM_CONDITIONAL([HAVE_GSSAPI], [test $ENABLE_GSSAPI = "yes"])
 
-])dnl AX_GSS_API
+])

diff --git a/m4macros/ax_gtest.m4 b/m4macros/ax_gtest.m4
index 138a03f6e0f73f37ceb1031479857992cfb50b4c..479cc1896b97a1988f747ce04053a3ab4d7ecc50 100644 (file)
--- a/m4macros/ax_gtest.m4
+++ b/m4macros/ax_gtest.m4
@@ -221,4 +221,4 @@ AC_SUBST(GTEST_LDFLAGS)
 AC_SUBST(GTEST_LDADD)
 AC_SUBST(GTEST_SOURCE)
 
-])dnl AX_ISC_GTEST
+])

diff --git a/m4macros/ax_isc_rpath.m4 b/m4macros/ax_isc_rpath.m4
index cae89b968e119e6ff6104913844021250e5346b9..07dade900341fb4539ff76c7ab38b03f7aa8362b 100644 (file)
--- a/m4macros/ax_isc_rpath.m4
+++ b/m4macros/ax_isc_rpath.m4
@@ -61,4 +61,4 @@ if test x$rpath != xno; then
     CCFLAGS=$CCFLAGS_SAVED
 fi
 
-])dnl AX_ISC_RPATH
+])