autoconf: GIT_CONF_APPEND_LINE -> GIT_CONF_SUBST
The new name fits better with the macro signature, and underlines the similarities with the autoconf-provided macro AC_SUBST (which will be made even more pronounced in planned future commits). Once again, no semantic change is intended, and indeed no change to the generated configure script is expected. 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:49 UTC
610473a6f75c495e6d4f7cd618aefcfe67ce7594
1 file changed
+12
-12
configure.ac
+12
-12
@@ -3,8 +3,8 @@
3
4
## Definitions of private macros.
5
6
-# GIT_CONF_APPEND_LINE(VAL, VAR)
7
-# ------------------------------
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}"])
@@ -34,8 +34,8 @@ AC_DEFUN([GIT_CONF_APPEND_PATH],
34
if test -n "$2"; then
35
GIT_UC_PROGRAM[]_PATH=$withval
36
AC_MSG_NOTICE([Disabling use of ${PROGRAM}])
37
- GIT_CONF_APPEND_LINE([NO_${PROGRAM}], [YesPlease])
38
- GIT_CONF_APPEND_LINE([${PROGRAM}_PATH], [])
37
+ GIT_CONF_SUBST([NO_${PROGRAM}], [YesPlease])
38
+ GIT_CONF_SUBST([${PROGRAM}_PATH], [])
39
else
40
AC_MSG_ERROR([You cannot use git without $1])
41
fi
@@ -45,7 +45,7 @@ AC_DEFUN([GIT_CONF_APPEND_PATH],
45
else
46
GIT_UC_PROGRAM[]_PATH=$withval
47
AC_MSG_NOTICE([Setting GIT_UC_PROGRAM[]_PATH to $withval])
48
- GIT_CONF_APPEND_LINE([${PROGRAM}_PATH], [$withval])
48
+ GIT_CONF_SUBST([${PROGRAM}_PATH], [$withval])
49
fi
50
fi
51
m4_popdef([GIT_UC_PROGRAM])])
@@ -67,7 +67,7 @@ AC_DEFUN([GIT_PARSE_WITH],
67
NO_[]GIT_UC_PACKAGE=
68
GIT_UC_PACKAGE[]DIR=$withval
69
AC_MSG_NOTICE([Setting GIT_UC_PACKAGE[]DIR to $withval])
70
- GIT_CONF_APPEND_LINE([${PACKAGE}DIR], [$withval])
70
+ GIT_CONF_SUBST([${PACKAGE}DIR], [$withval])
71
fi
72
m4_popdef([GIT_UC_PACKAGE])])
73
@@ -87,7 +87,7 @@ AC_DEFUN([GIT_PARSE_WITH_SET_MAKE_VAR],
87
[a value for $1 ($2). Maybe you do...?])
88
fi
89
AC_MSG_NOTICE([Setting $2 to $withval])
90
- GIT_CONF_APPEND_LINE([$2], [$withval])
90
+ GIT_CONF_SUBST([$2], [$withval])
91
fi)])# GIT_PARSE_WITH_SET_MAKE_VAR
92
93
#
@@ -150,7 +150,7 @@ AC_ARG_WITH([sane-tool-path],
150
else
151
AC_MSG_NOTICE([Setting SANE_TOOL_PATH to '$withval'])
152
fi
153
- GIT_CONF_APPEND_LINE([SANE_TOOL_PATH], [$withval])],
153
+ GIT_CONF_SUBST([SANE_TOOL_PATH], [$withval])],
154
[# If the "--with-sane-tool-path" option was not given, don't touch
155
# SANE_TOOL_PATH here, but let defaults in Makefile take care of it.
156
# This should minimize spurious differences in the behaviour of the
@@ -169,7 +169,7 @@ AC_ARG_WITH([lib],
169
else
170
lib=$withval
171
AC_MSG_NOTICE([Setting lib to '$lib'])
172
- GIT_CONF_APPEND_LINE([lib], [$withval])
172
+ GIT_CONF_SUBST([lib], [$withval])
173
fi])
174
175
if test -z "$lib"; then
@@ -205,7 +205,7 @@ AC_ARG_ENABLE([jsmin],
205
[
206
JSMIN=$enableval;
207
AC_MSG_NOTICE([Setting JSMIN to '$JSMIN' to enable JavaScript minifying])
208
- GIT_CONF_APPEND_LINE([JSMIN], [$enableval]);
208
+ GIT_CONF_SUBST([JSMIN], [$enableval]);
209
])
210
211
# Define option to enable CSS minification
@@ -215,7 +215,7 @@ AC_ARG_ENABLE([cssmin],
215
[
216
CSSMIN=$enableval;
217
AC_MSG_NOTICE([Setting CSSMIN to '$CSSMIN' to enable CSS minifying])
218
- GIT_CONF_APPEND_LINE([CSSMIN], [$enableval]);
218
+ GIT_CONF_SUBST([CSSMIN], [$enableval]);
219
])
220
221
## Site configuration (override autodetection)
@@ -256,7 +256,7 @@ AS_HELP_STRING([], [ARG can be also prefix for libpcre library and hea
256
USE_LIBPCRE=YesPlease
257
LIBPCREDIR=$withval
258
AC_MSG_NOTICE([Setting LIBPCREDIR to $withval])
259
- GIT_CONF_APPEND_LINE([LIBPCREDIR], [$withval])
259
+ GIT_CONF_SUBST([LIBPCREDIR], [$withval])
260
fi)
261
#
262
# Define NO_CURL if you do not have curl installed. git-http-pull and