mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2025-02-05 14:40:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

bootstrap: always extract only the first AC_CONFIG_MACRO_DIR arg.

Browse Source 
Previous versions of bootstrap concatenated all the arguments to
multiple invocations of AC_CONFIG_MACRO_DIR when extracting the
macro_dir directory name.  This change enforces correct and
consistent behaviour.
* libtoolize.in (func_require_macro_dir): Use the new
func_extract_trace_first function to make sure the first argument
is always used.
(func_require_aux_dir, func_require_gnulib_mk)
(func_require_source_base): Future proof these functions against
multiple invocations or additional arguments to the macros they
trace.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
This commit is contained in:
Gary V. Vaughan 2012-10-19 12:23:39 +07:00
parent 670283ee70
commit 6c51572ae0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bootstrap
View File

@ -951,8 +951,8 @@ func_require_build_aux ()
$debug_cmd
test -n "$build_aux" || {
func_extract_trace AC_CONFIG_AUX_DIR
build_aux=$func_extract_trace_result
func_extract_trace_first AC_CONFIG_AUX_DIR
build_aux=$func_extract_trace_first_result
func_check_configuration build_aux \
"AC_CONFIG_AUX_DIR([name of a directory for build scripts])"
@ -1294,8 +1294,8 @@ func_require_gnulib_mk ()
$require_gnulib_cache
$require_macro_dir
func_extract_trace "gl_MAKEFILE_NAME" "$gnulib_cache"
gnulib_mk=$func_extract_trace_result
func_extract_trace_first "gl_MAKEFILE_NAME" "$gnulib_cache"
gnulib_mk=$func_extract_trace_first_result
test -n "$gnulib_mk" && func_verbose "gnulib_mk='$gnulib_mk'"
}
@ -1484,8 +1484,8 @@ func_require_macro_dir ()
# Sometimes this is stored in `configure.ac'.
test -n "$macro_dir" || {
func_extract_trace AC_CONFIG_MACRO_DIR
macro_dir=$func_extract_trace_result
func_extract_trace_first AC_CONFIG_MACRO_DIR
macro_dir=$func_extract_trace_first_result
}
# Otherwise we might find it in `Makefile.am'.
@ -1696,9 +1696,9 @@ func_require_source_base ()
test -f "$gnulib_cache" && test -z "$source_base" && {
$require_macro_dir
func_extract_trace "gl_SOURCE_BASE" "$gnulib_cache"
func_extract_trace_first "gl_SOURCE_BASE" "$gnulib_cache"
source_base=$func_extract_trace_result
source_base=$func_extract_trace_first_result
func_verbose "source_base='$source_base'"
}