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

diff --git a/ChangeLog b/ChangeLog
index d6a7f94c7f222e1a6ec074a366b71c41b1fa4665..73aea7077d362c4743f3934c569829147884f94a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 86d81f3a7f9d304c1ab92c045634f1c0331ea61a..a63933589a65620b509072de19f44a97f0c06911 100644 (file)
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -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,21 +133,18 @@ configure_ac=configure.in
                        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 @@ configure_ac=configure.in
                        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"