Re: FYI: subproject.at distcheck failure

[Gary V. Vaughan]

Hallo Ralf,

You've uncovered a nice bug here.  Fix below...

Ralf Wildenhues wrote:
> * Gary V. Vaughan wrote on Tue, Oct 11, 2005 at 06:27:33PM CEST:
> > > I'm not quite sure about the best way to handle this.  We could
> > > replace autoreconf with calling aclocal, automake, and autoconf by
> > > hand to prevent recursing.  Proposed patch below ok?
> >
> > Sure.  Looks good to me.
>
> Thanks.  Installed.

Except that now libtoolize will need to handle populating the config
directory properly, rather than relying on autoreconf to pick up the
slack.  The immediate problem with these tests is that automake looks
at configure.ac instead of sub/ltdl/configure.ac, and decides that
it doesn't need to create sub/ltdl/config/compile, so the build in
sub/ltdl fails.

I think the following patch addresses the issue:

 libtoolize.m4sh |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

Index: libtool--devo--1.0/ChangeLog
from  Gary V. Vaughan  <address@hidden>
        * libtoolize.m4sh: Always copy pkgconfig_files for --ltdl, incase
        ltdl needs additional things not found by automake when looking at
        the parent project configury.
Index: libtool--devo--1.0/libtoolize.m4sh
===================================================================
--- libtool--devo--1.0.orig/libtoolize.m4sh
+++ libtool--devo--1.0/libtoolize.m4sh
@@ -956,26 +956,26 @@ func_nonemptydir_p ()
         "$aclocaldir" "$ltdldir/m4"
     fi

-    # Unless we share CONFIG_AUX_DIR with our parent project,
-    # copy config aux files into libltdl.
-    if test "$ltdldir/config" != "$auxdir"; then
-      func_copy_some_files "$pkgconfig_files" "$pkgdatadir" "$ltdldir"
-    fi
+    # Copy config aux files into libltdl.
+    func_copy_some_files "$pkgconfig_files" "$pkgdatadir" "$ltdldir"
   fi

-  # If they are newer, copy all the installed utility files to the
+  # Unless we share CONFIG_AUX_DIR with the libltdl subproject, then
+  # if they are newer, copy all the installed utility files to the
   # auxiliary directory if `--install' was passed, or else copy just
   # ltmain.sh.
   if test -n "$auxdir"; then
-    $opt_quiet || if test "$auxdir" != .; then
-      func_echo "putting files in AC_CONFIG_AUX_DIR, \`$auxdir'."
-    fi
-    if $opt_install; then
-      func_config_update config.guess "$pkgdatadir/config" "$auxdir"
-      func_config_update config.sub   "$pkgdatadir/config" "$auxdir"
-      func_install_update install-sh  "$pkgdatadir/config" "$auxdir"
+    if test "$ltdldir/config" != "$auxdir"; then
+      $opt_quiet || if test "$auxdir" != .; then
+        func_echo "putting files in AC_CONFIG_AUX_DIR, \`$auxdir'."
+      fi
+      if $opt_install; then
+        func_config_update config.guess "$pkgdatadir/config" "$auxdir"
+        func_config_update config.sub   "$pkgdatadir/config" "$auxdir"
+        func_install_update install-sh  "$pkgdatadir/config" "$auxdir"
+      fi
+      func_ltmain_update ltmain.sh "$pkgdatadir/config" "$auxdir"
     fi
-    func_ltmain_update ltmain.sh "$pkgdatadir/config" "$auxdir"
   else
     func_verbose "AC_CONFIG_AUX_DIR not defined, not copying libtool auxilliary 
files."
   fi

Cheers,
        Gary.
--
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

signature.asc
Description: OpenPGP digital signature