mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2024-11-21 01:40:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

* libtoolize.m4sh: Fix a typo, s/pkgvltdldirs/pkgvdatadirs/.

Browse Source 
When using -I to test an uninstalled libtoolize, we need to add
the config subdirectory to the search path so that ltmain.sh can
be found in the source tree.
This commit is contained in:
Gary V. Vaughan 2005-03-24 13:15:54 +00:00
parent 7d7dd1b66f
commit b8ffb80224
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2005-03-24 Gary V. Vaughan <gary@gnu.org>
* libtoolize.m4sh: Fix a typo, s/pkgvltdldirs/pkgvdatadirs/.
When using -I to test an uninstalled libtoolize, we need to add
the config subdirectory to the search path so that ltmain.sh can
be found in the source tree.
* libtoolize.m4sh (func_copy_some_files): IFS needs to be set to
path delimiter for all inner loop iterations.
Once a matching file has been copied, no need to keep searching

38
libtoolize.m4sh
View File

@ -83,9 +83,9 @@ libtoolize_flags=
# Locations for important files:
prefix=@prefix@
datadir=@datadir@
pkgvdatadirs=@pkgvdatadir@
pkgvltdldirs=@pkgvdatadir@/libltdl
pkgvmacrodirs=@pkgvmacrodir@
pkgvdatadirs=@pkgvdatadir@ # ltmain.sh et. al.
pkgvltdldirs=@pkgvdatadir@/libltdl # libltdl source tree
pkgvmacrodirs=@pkgvmacrodir@ # libtool.m4 et. al.
auxdir=
m4dir=
ltdldir=
@ -133,6 +133,25 @@ configure_ac=configure.in
libtoolize_flags="${libtoolize_flags} --install"
;;
-I) test "$#" = 0 && func_missing_arg $opt && break
# for installed share/libtool trees:
test -d "$1" \
&& pkgvdatadirs="`cd $1 && pwd`:$pkgvdatadirs"
# for uninstalled ltmain.sh location:
test -d "$1/config" \
&& pkgvdatadirs="`cd $1/config && pwd`:$pkgvdatadirs"
# for libltdl source files:
test -d "$1" \
&& pkgvltdldirs="`cd $1/libltdl \
&& pwd`:$pkgvltdldirs"
# for libtool.m4 and other macro files:
test -d "$1/m4" \
&& pkgvmacrodirs="`cd $1/m4 && pwd`:$pkgvmacrodirs"
func_quote_for_eval "$1"
libtoolize_flags="$libtoolize_flags -I $func_quote_for_eval_result"
shift
;;
--ltdl) ltdldir=libltdl
if test "$#" -gt 0; then
case $1 in
@ -142,19 +161,6 @@ configure_ac=configure.in
fi
;;
-I) test "$#" = 0 && func_missing_arg $opt && break
test -d "$1" \
&& pkgvdatadirs="`cd $1 && pwd`:$pkgvltdldirs"
test -d "$1" \
&& pkgvltdldirs="`cd $1/libltdl \
&& pwd`:$pkgvltdldirs"
test -d "$1/m4" \
&& pkgvmacrodirs="`cd $1/m4 && pwd`:$pkgvmacrodirs"
func_quote_for_eval "$1"
libtoolize_flags="$libtoolize_flags -I $func_quote_for_eval_result"
shift
;;
--quiet|--automake|-q) # --automake is for 1.5 compatibility
opt_quiet=:
libtoolize_flags="${libtoolize_flags} --quiet"