configure: ensure settings from user are also usable in the script

Allow things set by the user (--with-lib, --with-iconv, etc) to set
variables for use by other parts of the script.  Display values as
they're set.

Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ben Walton 2009-03-12 15:20:06 -04:00 коммит произвёл Junio C Hamano
Родитель 64621462de
Коммит e068f4f53b
1 изменённых файлов: 11 добавлений и 0 удалений

Просмотреть файл

@ -42,6 +42,8 @@ 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; \
AC_MSG_NOTICE([Setting m4_toupper($1)_PATH to $withval]); \
GIT_CONF_APPEND_LINE(${PROGRAM}_PATH=$withval); \ GIT_CONF_APPEND_LINE(${PROGRAM}_PATH=$withval); \
fi; \ fi; \
fi; \ fi; \
@ -61,6 +63,8 @@ elif test "$withval" = "yes"; then \
m4_toupper(NO_$1)=; \ m4_toupper(NO_$1)=; \
else \ else \
m4_toupper(NO_$1)=; \ m4_toupper(NO_$1)=; \
m4_toupper($1)DIR=$withval; \
AC_MSG_NOTICE([Setting m4_toupper($1)DIR to $withval]); \
GIT_CONF_APPEND_LINE(${PACKAGE}DIR=$withval); \ GIT_CONF_APPEND_LINE(${PACKAGE}DIR=$withval); \
fi \ fi \
])# GIT_PARSE_WITH ])# GIT_PARSE_WITH
@ -86,9 +90,16 @@ AC_ARG_WITH([lib],
[if test "$withval" = "no" || test "$withval" = "yes"; then \ [if test "$withval" = "no" || test "$withval" = "yes"; then \
AC_MSG_WARN([You should provide name for --with-lib=ARG]); \ AC_MSG_WARN([You should provide name for --with-lib=ARG]); \
else \ else \
lib=$withval; \
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
AC_MSG_NOTICE([Setting lib to 'lib' (the default)])
lib=lib
fi
# #
# Define SHELL_PATH to provide path to shell. # Define SHELL_PATH to provide path to shell.
GIT_ARG_SET_PATH(shell) GIT_ARG_SET_PATH(shell)