From b483c3049bcaae50db251003998a430e8dd30cda Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Mon, 16 Nov 2015 13:14:51 +0100
Subject: m4: _AX_TEXT_TPL_SUBST should take default value

This broke testsuite because it relies on construct
_AX_TEXT_TPL_SUBST([TEST_GEN_FILES_LIST], [.generated_files])
set within configure.ac.

* m4/_ax_text_tpl.m4 (_AX_TEXT_TPL_SUBST): Take optional default
value.
---
 THANKS             | 1 +
 m4/_ax_text_tpl.m4 | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/THANKS b/THANKS
index 999b33f..ffe876e 100644
--- a/THANKS
+++ b/THANKS
@@ -1 +1,2 @@
 Dietmar Kling
+Pavel Kajaba
diff --git a/m4/_ax_text_tpl.m4 b/m4/_ax_text_tpl.m4
index 971096a..0977c05 100644
--- a/m4/_ax_text_tpl.m4
+++ b/m4/_ax_text_tpl.m4
@@ -142,11 +142,12 @@ AC_SUBST([text_tpl_gen_script])
 AC_SUBST([text_tpl_gen_script_verbose])
 ])
 
-# _AX_TEXT_TPL_SUBST SHELL_VARNAME
-# --------------------------------
+# _AX_TEXT_TPL_SUBST SHELL_VARNAME [VALUE]
+# ----------------------------------------
 # Do substitution of SHELL_VARNAME both by config.status, and by sed call
 # in instantiation rules.
 AC_DEFUN([_AX_TEXT_TPL_SUBST], [
+test x = x"$2" || $1=$2
 __ax_text_tpl_user_sed_rules="$__ax_text_tpl_user_sed_rules\
 sed_subst_var_pattern($1)"
 AC_SUBST($1)
-- 
cgit