mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autoconf: GIT_CONF_APPEND_LINE: change signature

Browse Source 
Change one-argument GIT_CONF_APPEND_LINE([VAR=VAL]) to
GIT_CONF_APPEND_LINE([VAR], [VAL]), that is more similar to the usual
AC_SUBST macro; this is only a preparatory change in view of future
refactorings.

No semantic change is intended.  In fact, the generated configure file
doesn't change at all.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefano Lattarini
2012-07-19 09:49:56 +02:00
committed by Junio C Hamano
parent 31c79549b8
commit 390f4da8af
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
configure.ac
View File

@ -3,11 +3,11 @@
## Definitions of private macros. ## Definitions of private macros.
# GIT_CONF_APPEND_LINE(LINE) # GIT_CONF_APPEND_LINE(VAL, VAR)
# -------------------------- # ------------------------------
# Append LINE to file ${config_append} # Append the line "VAR=VAL" to file ${config_append}
AC_DEFUN([GIT_CONF_APPEND_LINE], AC_DEFUN([GIT_CONF_APPEND_LINE],
[echo "$1" >> "${config_append}"]) [echo "$1=$2" >> "${config_append}"])
# GIT_ARG_SET_PATH(PROGRAM) # GIT_ARG_SET_PATH(PROGRAM)
# ------------------------- # -------------------------
@ -34,8 +34,8 @@ AC_DEFUN([GIT_CONF_APPEND_PATH],
if test -n "$2"; then if test -n "$2"; then
GIT_UC_PROGRAM[]_PATH=$withval GIT_UC_PROGRAM[]_PATH=$withval
AC_MSG_NOTICE([Disabling use of ${PROGRAM}]) AC_MSG_NOTICE([Disabling use of ${PROGRAM}])
GIT_CONF_APPEND_LINE(NO_${PROGRAM}=YesPlease) GIT_CONF_APPEND_LINE([NO_${PROGRAM}], [YesPlease])
GIT_CONF_APPEND_LINE(${PROGRAM}_PATH=) GIT_CONF_APPEND_LINE([${PROGRAM}_PATH], [])
else else
AC_MSG_ERROR([You cannot use git without $1]) AC_MSG_ERROR([You cannot use git without $1])
fi fi
@ -45,7 +45,7 @@ AC_DEFUN([GIT_CONF_APPEND_PATH],
else else
GIT_UC_PROGRAM[]_PATH=$withval GIT_UC_PROGRAM[]_PATH=$withval
AC_MSG_NOTICE([Setting GIT_UC_PROGRAM[]_PATH to $withval]) AC_MSG_NOTICE([Setting GIT_UC_PROGRAM[]_PATH to $withval])
GIT_CONF_APPEND_LINE(${PROGRAM}_PATH=$withval) GIT_CONF_APPEND_LINE([${PROGRAM}_PATH], [$withval])
fi fi
fi fi
m4_popdef([GIT_UC_PROGRAM])]) m4_popdef([GIT_UC_PROGRAM])])
@ -67,7 +67,7 @@ AC_DEFUN([GIT_PARSE_WITH],
NO_[]GIT_UC_PACKAGE= NO_[]GIT_UC_PACKAGE=
GIT_UC_PACKAGE[]DIR=$withval GIT_UC_PACKAGE[]DIR=$withval
AC_MSG_NOTICE([Setting GIT_UC_PACKAGE[]DIR to $withval]) AC_MSG_NOTICE([Setting GIT_UC_PACKAGE[]DIR to $withval])
GIT_CONF_APPEND_LINE(${PACKAGE}DIR=$withval) GIT_CONF_APPEND_LINE([${PACKAGE}DIR], [$withval])
fi fi
m4_popdef([GIT_UC_PACKAGE])]) m4_popdef([GIT_UC_PACKAGE])])
@ -87,7 +87,7 @@ AC_DEFUN([GIT_PARSE_WITH_SET_MAKE_VAR],
[a value for $1 ($2). Maybe you do...?]) [a value for $1 ($2). Maybe you do...?])
fi fi
AC_MSG_NOTICE([Setting $2 to $withval]) AC_MSG_NOTICE([Setting $2 to $withval])
GIT_CONF_APPEND_LINE($2=$withval) GIT_CONF_APPEND_LINE([$2], [$withval])
fi)])# GIT_PARSE_WITH_SET_MAKE_VAR fi)])# GIT_PARSE_WITH_SET_MAKE_VAR
# #
@ -150,7 +150,7 @@ AC_ARG_WITH([sane-tool-path],
else else
AC_MSG_NOTICE([Setting SANE_TOOL_PATH to '$withval']) AC_MSG_NOTICE([Setting SANE_TOOL_PATH to '$withval'])
fi fi
GIT_CONF_APPEND_LINE([SANE_TOOL_PATH=$withval])], GIT_CONF_APPEND_LINE([SANE_TOOL_PATH], [$withval])],
[# If the "--with-sane-tool-path" option was not given, don't touch [# If the "--with-sane-tool-path" option was not given, don't touch
# SANE_TOOL_PATH here, but let defaults in Makefile take care of it. # SANE_TOOL_PATH here, but let defaults in Makefile take care of it.
# This should minimize spurious differences in the behaviour of the # This should minimize spurious differences in the behaviour of the
@ -169,7 +169,7 @@ AC_ARG_WITH([lib],
else else
lib=$withval lib=$withval
AC_MSG_NOTICE([Setting lib to '$lib']) AC_MSG_NOTICE([Setting lib to '$lib'])
GIT_CONF_APPEND_LINE(lib=$withval) GIT_CONF_APPEND_LINE([lib], [$withval])
fi]) fi])
if test -z "$lib"; then if test -z "$lib"; then
@ -205,7 +205,7 @@ AC_ARG_ENABLE([jsmin],
[ [
JSMIN=$enableval; JSMIN=$enableval;
AC_MSG_NOTICE([Setting JSMIN to '$JSMIN' to enable JavaScript minifying]) AC_MSG_NOTICE([Setting JSMIN to '$JSMIN' to enable JavaScript minifying])
GIT_CONF_APPEND_LINE(JSMIN=$enableval); GIT_CONF_APPEND_LINE([JSMIN], [$enableval]);
]) ])
# Define option to enable CSS minification # Define option to enable CSS minification
@ -215,7 +215,7 @@ AC_ARG_ENABLE([cssmin],
[ [
CSSMIN=$enableval; CSSMIN=$enableval;
AC_MSG_NOTICE([Setting CSSMIN to '$CSSMIN' to enable CSS minifying]) AC_MSG_NOTICE([Setting CSSMIN to '$CSSMIN' to enable CSS minifying])
GIT_CONF_APPEND_LINE(CSSMIN=$enableval); GIT_CONF_APPEND_LINE([CSSMIN], [$enableval]);
]) ])
## Site configuration (override autodetection) ## Site configuration (override autodetection)
@ -256,7 +256,7 @@ AS_HELP_STRING([], [ARG can be also prefix for libpcre library and hea
USE_LIBPCRE=YesPlease USE_LIBPCRE=YesPlease
LIBPCREDIR=$withval LIBPCREDIR=$withval
AC_MSG_NOTICE([Setting LIBPCREDIR to $withval]) AC_MSG_NOTICE([Setting LIBPCREDIR to $withval])
GIT_CONF_APPEND_LINE(LIBPCREDIR=$withval) GIT_CONF_APPEND_LINE([LIBPCREDIR], [$withval])
fi) fi)
# #
# Define NO_CURL if you do not have curl installed. git-http-pull and # Define NO_CURL if you do not have curl installed. git-http-pull and