* libtoolize.in (libtoolize_flags): With the --ltdl option, we

libtoolize the libltdl subdirectory automatically.
* m4/ltdl.m4 (AC_WITH_LTDL): Fix overquoted args.

diff --git a/ChangeLog b/ChangeLog
index aec4d61aaac913e247da5c7a98e3a4c51255586d..f608040c4c2db387962f2b5fd7a50f0c6874a3a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-21  Gary V. Vaughan  <gary@gnu.org>
+
+       * libtoolize.in (libtoolize_flags): With the --ltdl option, we
+       libtoolize the libltdl subdirectory automatically.
+       * m4/ltdl.m4 (AC_WITH_LTDL): Fix overquoted args.
+
 2004-06-21  Peter O'Gorman  <peter@pogma.com>
 
        * ltmain.in (dependency_libs) [darwin]: Remove -framework stuff from
@@ -7,7 +13,7 @@
        dependency_libs. Any unusual flags in dependency_libs cause recent
        versions of libtool to die with "cannot find the library `'", so
        it is required to move frameworks out of there. :(
-       
+
 2004-06-21  Gary V. Vaughan  <gary@gnu.org>
 
        From Ralf Wildenhues <Ralf.Wildenhues@gmx.de>:

diff --git a/libtoolize.in b/libtoolize.in
index 038669366ca7b95083badecef15befefdfe1d01f..bb721f1ff6060e0394bc84e9e04fa698b9459ca6 100644 (file)
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -67,6 +67,15 @@ progpath="$0"
 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 @@ opt_verbose=false
 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 @@ func_version ()
     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 @@ func_version ()
                          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 @@ func_version ()
                        ;;
 
       --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 @@ func_config_update ()
   # 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

diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index 077e73aa1a5865dad722bbc4d4c90fa39f229131..b31589dbbc065c9ba41653c35b36f1340939a2d1 100644 (file)
--- a/m4/ltdl.m4
+++ b/m4/ltdl.m4
@@ -63,7 +63,7 @@ fi
 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 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
   "") 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])