autoconf: use AC_CONFIG_COMMANDS instead of ad-hoc 'config.mak.append'
This will allow "./config.status --recheck; ./config.status" to work correctly as a mean of reconfiguring the tree with the same configure argument used in the previous "./configure" invocation. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefano Lattarini committed
Jul 19, 2012 at 09:50 UTC
ac5fc1c57f2a964e1b5480a25b6fd447ab18b9b9
1 file changed
+17
-11
configure.ac
+17
-11
@@ -5,9 +5,22 @@
5
6
# GIT_CONF_SUBST(VAL, VAR)
7
# ------------------------
8
-# Append the line "VAR=VAL" to file ${config_append}
9
-AC_DEFUN([GIT_CONF_APPEND_LINE],
10
- [echo "$1=$2" >> "${config_append}"])
8
+# Cause the line "VAR=VAL" to be eventually appended to ${config_file}.
9
+AC_DEFUN([GIT_CONF_SUBST],
10
+ [AC_REQUIRE([GIT_CONF_SUBST_INIT])
11
+ config_appended_defs="$config_appended_defs${newline}$1=$2"])
12
+
13
+# GIT_CONF_SUBST_INIT
14
+# -------------------
15
+# Prepare shell variables and autoconf machine required by later calls
16
+# to GIT_CONF_SUBST.
17
+AC_DEFUN([GIT_CONF_SUBST_INIT],
18
+ [config_appended_defs=; newline='
19
+'
20
+ AC_CONFIG_COMMANDS([$config_file],
21
+ [echo "$config_appended_defs" >> "$config_file"],
22
+ [config_file=$config_file
23
+ config_appended_defs="$config_appended_defs"])])
24
25
# GIT_ARG_SET_PATH(PROGRAM)
26
# -------------------------
@@ -133,11 +146,8 @@ AC_INIT([git], [@@GIT_VERSION@@], [git@vger.kernel.org])
146
AC_CONFIG_SRCDIR([git.c])
147
148
config_file=config.mak.autogen
136
-config_append=config.mak.append
149
config_in=config.mak.in
150
139
-echo "# ${config_append}. Generated by configure." > "${config_append}"
140
-
151
# Directories holding "saner" versions of common or POSIX binaries.
152
AC_ARG_WITH([sane-tool-path],
153
[AS_HELP_STRING(
@@ -1041,9 +1051,5 @@ AC_SUBST(PTHREAD_LIBS)
1051
AC_SUBST(NO_PTHREADS)
1052
1053
## Output files
1044
-AC_CONFIG_FILES(["${config_file}":"${config_in}":"${config_append}"])
1054
+AC_CONFIG_FILES(["${config_file}":"${config_in}"])
1055
AC_OUTPUT
1046
-
1047
-
1048
-## Cleanup
1049
-rm -f "${config_append}"