fix path search initialisation bugs [libtool--gary--1.0--patch-9]

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Okay to commit?

        * 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.

- -- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.9
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iD8DBQFCPZ48FRMICSmD1gYRAkRaAJ9WmFfLGNt2tukUR7ftZvnVtJ08AACfTb0C
tdH7Z6yS27V5+23Sm41C6VU=
=HIw9
-----END PGP SIGNATURE-----

* looking for address@hidden/libtool--gary--1.0--patch-8 to compare with
* comparing to address@hidden/libtool--gary--1.0--patch-8
M  libtoolize.m4sh
M  ChangeLog

* modified files

Index: Changelog
from  Gary V. Vaughan  <address@hidden>
        * 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.

--- orig/libtoolize.m4sh
+++ mod/libtoolize.m4sh
@@ -83,9 +83,9 @@
 # Locations for important files:
 address@hidden@
 address@hidden@
address@hidden@
address@hidden@/libltdl
address@hidden@
address@hidden@         # ltmain.sh et. al.
address@hidden@/libltdl # libltdl source tree
address@hidden@         # libtool.m4 et. al.
 auxdir=
 m4dir=
 ltdldir=
@@ -133,21 +133,18 @@
                        libtoolize_flags="${libtoolize_flags} --install"
                        ;;
 
-      --ltdl)          ltdldir=libltdl
-                       if test "$#" -gt 0; then
-                         case $1 in
-                           -*)                         ;;
-                           *)  ltdldir="$1"; shift     ;;
-                         esac
-                       fi
-                       ;;
-
       -I)              test "$#" = 0 && func_missing_arg $opt && break
+                       # for installed share/libtool trees:
                        test -d "$1" \
-                         && pkgvdatadirs="`cd $1 && pwd`:$pkgvltdldirs"
+                         && 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"
@@ -155,6 +152,15 @@
                        shift
                        ;;
 
+      --ltdl)          ltdldir=libltdl
+                       if test "$#" -gt 0; then
+                         case $1 in
+                           -*)                         ;;
+                           *)  ltdldir="$1"; shift     ;;
+                         esac
+                       fi
+                       ;;
+
       --quiet|--automake|-q) # --automake is for 1.5 compatibility
                        opt_quiet=:
                        libtoolize_flags="${libtoolize_flags} --quiet"