autoconf: remove some redundant shell indirections
They are merely useless now, but would get in the way of future changes. No semantic change is intended. 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
7f8cf48c4dd2bc86f8c0933a27d4f21df2033910
1 file changed
+5
-7
configure.ac
+5
-7
@@ -29,13 +29,12 @@ AC_DEFUN([GIT_ARG_SET_PATH],
29
# --without-PROGRAM is used.
30
AC_DEFUN([GIT_CONF_APPEND_PATH],
31
[m4_pushdef([GIT_UC_PROGRAM], m4_toupper([$1]))dnl
32
- PROGRAM=GIT_UC_PROGRAM
32
if test "$withval" = "no"; then
33
if test -n "$2"; then
34
GIT_UC_PROGRAM[]_PATH=$withval
36
- AC_MSG_NOTICE([Disabling use of ${PROGRAM}])
37
- GIT_CONF_SUBST([NO_${PROGRAM}], [YesPlease])
38
- GIT_CONF_SUBST([${PROGRAM}_PATH], [])
35
+ AC_MSG_NOTICE([Disabling use of GIT_UC_PROGRAM])
36
+ GIT_CONF_SUBST([NO_]GIT_UC_PROGRAM, [YesPlease])
37
+ GIT_CONF_SUBST(GIT_UC_PROGRAM[]_PATH, [])
38
else
39
AC_MSG_ERROR([You cannot use git without $1])
40
fi
@@ -45,7 +44,7 @@ AC_DEFUN([GIT_CONF_APPEND_PATH],
44
else
45
GIT_UC_PROGRAM[]_PATH=$withval
46
AC_MSG_NOTICE([Setting GIT_UC_PROGRAM[]_PATH to $withval])
48
- GIT_CONF_SUBST([${PROGRAM}_PATH], [$withval])
47
+ GIT_CONF_SUBST(GIT_UC_PROGRAM[]_PATH, [$withval])
48
fi
49
fi
50
m4_popdef([GIT_UC_PROGRAM])])
@@ -58,7 +57,6 @@ AC_DEFUN([GIT_CONF_APPEND_PATH],
57
# * Unset NO_PACKAGE for --with-PACKAGE without ARG
58
AC_DEFUN([GIT_PARSE_WITH],
59
[m4_pushdef([GIT_UC_PACKAGE], m4_toupper([$1]))dnl
61
- PACKAGE=GIT_UC_PACKAGE
60
if test "$withval" = "no"; then
61
NO_[]GIT_UC_PACKAGE=YesPlease
62
elif test "$withval" = "yes"; then
@@ -67,7 +65,7 @@ AC_DEFUN([GIT_PARSE_WITH],
65
NO_[]GIT_UC_PACKAGE=
66
GIT_UC_PACKAGE[]DIR=$withval
67
AC_MSG_NOTICE([Setting GIT_UC_PACKAGE[]DIR to $withval])
70
- GIT_CONF_SUBST([${PACKAGE}DIR], [$withval])
68
+ GIT_CONF_SUBST(GIT_UC_PACKAGE[DIR], [$withval])
69
fi
70
m4_popdef([GIT_UC_PACKAGE])])
71