FYI: libtool--devo--1.0--patch-72

[Gary V. Vaughan]

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

Applied to HEAD.
- -- 
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.5
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (Darwin)

iD8DBQFA1w9sFRMICSmD1gYRAmUmAJ4g66uk15z39iM1aGsT3/O9ToVWOACfaRlt
nbtyEGJ2PnOqK8tiYTmrbEA=
=SK+F
-----END PGP SIGNATURE-----

* looking for address@hidden/libtool--devo--1.0--patch-71 to compare with
* comparing to address@hidden/libtool--devo--1.0--patch-71
M  ChangeLog
M  libtoolize.in
M  m4/ltdl.m4

* modified files

Index: Changelog
from  Gary V. Vaughan  <address@hidden>

        * libtoolize.in (libtoolize_flags): With the --ltdl option, we
        libtoolize the libltdl subdirectory automatically.
        * m4/ltdl.m4 (AC_WITH_LTDL): Fix overquoted args.


--- orig/libtoolize.in
+++ mod/libtoolize.in
@@ -67,6 +67,15 @@
 progname=`echo "$progpath" | $SED "$basename"`
 PROGRAM=libtoolize
 
+# Make sure we have an absolute path for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *) progdir=`echo "$progpath" | $SED "$dirname"`
+     progdir=`cd "$progdir" && pwd`
+     progpath="$progdir/$progname"
+     ;;
+esac
+
 # Global variables:
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
@@ -81,6 +90,9 @@
 seen_libtool=false
 seen_ltdl=false
 
+# Collect flags to pass into libltdl libtoolize
+libtoolize_flags=
+
 exit_status=$EXIT_SUCCESS
 
 # Locations for important files:
@@ -193,7 +205,9 @@
     opt="$1"
     shift
     case $opt in
-      --copy|-c)       opt_link=false          ;;
+      --copy|-c)       opt_link=false
+                       libtoolize_flags="$libtoolize_flags --copy"
+                       ;;
 
       --debug)         func_echo "enabling shell trace mode"
                        set -x
@@ -206,10 +220,16 @@
                          CP="echo $CP"
                          MKDIR="echo $MKDIR"
                        fi
+                       libtoolize_flags="${libtoolize_flags} --dry-run"
                        ;;
 
-      --force|-f)      opt_force=:                     ;;
-      --install|-i)    opt_install=:                   ;;
+      --force|-f)      opt_force=:
+                       libtoolize_flags="${libtoolize_flags} --force"
+                       ;;
+
+      --install|-i)    opt_install=:
+                       libtoolize_flags="${libtoolize_flags} --install"
+                       ;;
 
       --ltdl)          ltdldir=libltdl
                        if test "$#" -gt 0; then
@@ -221,8 +241,13 @@
                        ;;
 
       --quiet|--automake|-q) # --automake is for 1.5 compatibility
-                       opt_quiet=:                     ;;
-      --verbose|-v)    opt_verbose=:                   ;;
+                       opt_quiet=:
+                       libtoolize_flags="${libtoolize_flags} --quiet"
+                       ;;
+
+      --verbose|-v)    opt_verbose=:
+                       libtoolize_flags="${libtoolize_flags} --verbose"
+                       ;;
 
       # Separate optargs to long options:
       --ltdl=*)
@@ -669,6 +694,9 @@
   # user specified `--ltdl'.
   if test -n "$ltdldir"; then
     eval func_copy_all_files "$pkgdatadir/libltdl" "$ltdldir"
+
+    # libtoolize the newly copied libltdl tree
+    ( cd "$ltdldir" && "$progpath" $libtoolize_flags ) || exit $EXIT_FAILURE
   fi
 
   # Copy all the installed utility files to the auxiliary directory if


--- orig/m4/ltdl.m4
+++ mod/m4/ltdl.m4
@@ -63,7 +63,7 @@
 AC_MSG_CHECKING([whether to use included libltdl])
 AC_MSG_RESULT([$with_included_ltdl])
 
-AC_CONFIG_SUBDIRS([m4_if($#, 1, [$1], [libltdl])])
+AC_CONFIG_SUBDIRS(m4_if($#, 1, [$1], [libltdl]))
 ])# AC_WITH_LTDL
 
 
@@ -84,7 +84,7 @@
   "") enable_ltdl_convenience=yes
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
-LIBLTDL='${top_builddir}/'m4_if($#, 1,[$1], ['libltdl'])/libltdlc.la
+LIBLTDL='${top_builddir}/'m4_if($#, 1, [$1], ['libltdl'])/libltdlc.la
 LTDLINCL='-I${top_srcdir}/'m4_if($#, 1, [$1], ['libltdl'])
 
 AC_SUBST([LIBLTDL])