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

configure: avoid some code repetitions thanks to m4_{push,pop}def

Browse Source 
This change is just cosmetic, and should cause no semantic change, nor
any change in the generated configure script.

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-03-26 18:42:25 +02:00
committed by Junio C Hamano
parent e9e8c8090e
commit 99cccefbe0
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
configure.ac
View File

@ -27,10 +27,11 @@ AC_DEFUN([GIT_ARG_SET_PATH],
# Optional second argument allows setting NO_PROGRAM=YesPlease if # Optional second argument allows setting NO_PROGRAM=YesPlease if
# --without-PROGRAM is used. # --without-PROGRAM is used.
AC_DEFUN([GIT_CONF_APPEND_PATH], AC_DEFUN([GIT_CONF_APPEND_PATH],
[PROGRAM=m4_toupper($1); \ [m4_pushdef([GIT_UC_PROGRAM], m4_toupper([$1]))dnl
PROGRAM=GIT_UC_PROGRAM; \
if test "$withval" = "no"; then \ if test "$withval" = "no"; then \
if test -n "$2"; then \ if test -n "$2"; then \
m4_toupper($1)_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=); \
@ -41,12 +42,12 @@ else \
if test "$withval" = "yes"; then \ if test "$withval" = "yes"; then \
AC_MSG_WARN([You should provide path for --with-$1=PATH]); \ AC_MSG_WARN([You should provide path for --with-$1=PATH]); \
else \ else \
m4_toupper($1)_PATH=$withval; \ GIT_UC_PROGRAM[]_PATH=$withval; \
AC_MSG_NOTICE([Setting m4_toupper($1)_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; \
]) # GIT_CONF_APPEND_PATH m4_popdef([GIT_UC_PROGRAM])]) # GIT_CONF_APPEND_PATH
# #
# GIT_PARSE_WITH(PACKAGE) # GIT_PARSE_WITH(PACKAGE)
# ----------------------- # -----------------------
@ -55,18 +56,19 @@ fi; \
# * Set PACKAGEDIR=PATH for --with-PACKAGE=PATH # * Set PACKAGEDIR=PATH for --with-PACKAGE=PATH
# * Unset NO_PACKAGE for --with-PACKAGE without ARG # * Unset NO_PACKAGE for --with-PACKAGE without ARG
AC_DEFUN([GIT_PARSE_WITH], AC_DEFUN([GIT_PARSE_WITH],
[PACKAGE=m4_toupper($1); \ [m4_pushdef([GIT_UC_PACKAGE], m4_toupper([$1]))dnl
PACKAGE=GIT_UC_PACKAGE; \
if test "$withval" = "no"; then \ if test "$withval" = "no"; then \
m4_toupper(NO_$1)=YesPlease; \ NO_[]GIT_UC_PACKAGE=YesPlease; \
elif test "$withval" = "yes"; then \ elif test "$withval" = "yes"; then \
m4_toupper(NO_$1)=; \ NO_[]GIT_UC_PACKAGE=; \
else \ else \
m4_toupper(NO_$1)=; \ NO_[]GIT_UC_PACKAGE=; \
m4_toupper($1)DIR=$withval; \ GIT_UC_PACKAGE[]DIR=$withval; \
AC_MSG_NOTICE([Setting m4_toupper($1)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 \
])# GIT_PARSE_WITH m4_popdef([GIT_UC_PACKAGE])]) # GIT_PARSE_WITH
# #
# GIT_PARSE_WITH_SET_MAKE_VAR(WITHNAME, VAR, HELP_TEXT) # GIT_PARSE_WITH_SET_MAKE_VAR(WITHNAME, VAR, HELP_TEXT)
# --------------------- # ---------------------