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>
Ben Walton committed
Mar 12, 2009 at 15:20 UTC
e068f4f53b22c64f2058c316d858a892a5e24a6e
1 file changed
+11
configure.ac
+11
@@ -42,6 +42,8 @@ else \
42
if test "$withval" = "yes"; then \
43
AC_MSG_WARN([You should provide path for --with-$1=PATH]); \
44
else \
45
+ m4_toupper($1)_PATH=$withval; \
46
+ AC_MSG_NOTICE([Setting m4_toupper($1)_PATH to $withval]); \
47
GIT_CONF_APPEND_LINE(${PROGRAM}_PATH=$withval); \
48
fi; \
49
fi; \
@@ -61,6 +63,8 @@ elif test "$withval" = "yes"; then \
63
m4_toupper(NO_$1)=; \
64
else \
65
m4_toupper(NO_$1)=; \
66
+ m4_toupper($1)DIR=$withval; \
67
+ AC_MSG_NOTICE([Setting m4_toupper($1)DIR to $withval]); \
68
GIT_CONF_APPEND_LINE(${PACKAGE}DIR=$withval); \
69
fi \
70
])# GIT_PARSE_WITH
@@ -86,9 +90,16 @@ AC_ARG_WITH([lib],
90
[if test "$withval" = "no" || test "$withval" = "yes"; then \
91
AC_MSG_WARN([You should provide name for --with-lib=ARG]); \
92
else \
93
+ lib=$withval; \
94
+ AC_MSG_NOTICE([Setting lib to '$lib']); \
95
GIT_CONF_APPEND_LINE(lib=$withval); \
96
fi; \
97
],[])
98
+
99
+if test -z "$lib"; then
100
+ AC_MSG_NOTICE([Setting lib to 'lib' (the default)])
101
+ lib=lib
102
+fi
103
#
104
# Define SHELL_PATH to provide path to shell.
105
GIT_ARG_SET_PATH(shell)