From 7be4dc91e91394fc51c8fe2ace14fa716b6e7c34 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 13 Aug 2018 21:24:07 +0200
Subject: Fix bootstrap hack for automake 1.16

* Makefile.in.dep.patch: New file.
* configure.ac: Try to apply Makefile.in.dep.patch if
config.status.dep.patch failed to apply.
---
 configure.ac | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 40e78a04..df5a1a08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -216,7 +216,9 @@ dnl     's%#\ dummy%Makefile: $(filter-out $(DIST_SOURCES),$(SOURCES))%' \
 dnl     config.status
 dnl ])
 AC_CONFIG_COMMANDS_POST([
-  if "$PATCH" -f < "$srcdir"/config.status.dep.patch
+  if "$PATCH" -f < "$srcdir"/config.status.dep.patch > /dev/null 2>&1 ||
+     "$PATCH" -f < "$srcdir"/Makefile.in.dep.patch > /dev/null 2>&1 ||
+     grep "Ugly bootstrap hack to get to-be-generated files created" Makefile.in > /dev/null 2>&1
   then] AC_MSG_NOTICE([Applied a patch to work around a deficiency in]
     [Automake.  See `configure.ac' for details.])
   [else] AC_MSG_ERROR([failed to patch using `config.status.dep.patch'.]
-- 
cgit v1.2.3