Re: [patch 03/19] 285-gary-diagnose-missing-LT_WITH_LTDL.diff Queue

[Ralf Wildenhues]

Hi Gary,

* Gary V. Vaughan wrote on Mon, Oct 10, 2005 at 12:26:27PM CEST:
>  libtoolize.m4sh |   91 
> ++++++++++++++++++++++++++++----------------------------
>  1 files changed, 46 insertions(+), 45 deletions(-)
> 
> Index: libtool--devo--1.0/ChangeLog
> from  Gary V. Vaughan  <address@hidden>
>       * libtoolize.m4sh: Move the consistency checks...
>       (func_check_macros): ...into here.  Also suggest LT_WITH_LTDL if
>       appropriate.

Not quite like this.  Comments below.

Cheers,
Ralf

> Index: libtool--devo--1.0/libtoolize.m4sh
> ===================================================================
> --- libtool--devo--1.0.orig/libtoolize.m4sh
> +++ libtool--devo--1.0/libtoolize.m4sh
> @@ -795,16 +795,55 @@ func_check_macros ()
>  {
>      $opt_debug
>  
> -    $seen_autoconf \
> -      || return
> +    $seen_autoconf || return
> +
> +    # Suggest modern idioms for storing autoconf macros:
> +    if test -z "$macrodir$ltdldir"; then
> +      if test x"$m4dir" = x.; then
> +        func_echo "add \`AC_CONFIG_MACRO_DIR([m4])' to $configure_ac and 
> rerun libtoolize,"
> +        func_echo "to keep the correct libtool macros in-tree."
> +      else
> +        func_echo "consider adding \`AC_CONFIG_MACRO_DIR([$m4dir])'to 
> $configure.ac,"
> +        func_echo "and rerunning libtoolize."
> +      fi
> +    elif test -z "$m4dir"; then
> +      func_echo "You should add the contents of the following files to 
> \`aclocal.m4':"
> +      for need in libtool.m4 ltoptions.m4 ltversion.m4 ltsugar.m4; do
> +        func_echo "\`$aclocaldir/$need'"
> +      done
> +      if $seen_ltdl || $opt_ltdl; then
> +        for need in argz.m4 ltdl.m4; do
> +          func_echo "\`$aclocaldir/$need'"
> +        done

Don't forget to move my added comment, in case you agree with it (in
response to patch 284).

> +      fi
> +    fi
> +
> +    $seen_libtool ||
> +      func_echo "remember to add \`LT_INIT' to $configure_ac."
>  
>      # Don't trace for this, we're just checking the user didn't invoke it
>      # directly from configure.ac.
> -    $SED 's,[d]nl .*$,,; s,# .*$,,' "$configure_ac" | grep AC_PROG_RANLIB \
> -      && func_echo "\`AC_PROG_RANLIB' is rendered obsolete by \`LT_INIT'"
> +    $SED 's,[d]nl .*$,,; s,# .*$,,' "$configure_ac" | grep AC_PROG_RANLIB &&
> +      func_echo "\`AC_PROG_RANLIB' is rendered obsolete by \`LT_INIT'"

Now that I see this: Please remove these two lines, or make them as
little intrusive as branch-1-5 was: grepped for '^AC_PROG_RANLIB'.
Rationale: a `libtoolize' that'll bug me every time because of

m4_if([I_USE_LIBTOOL],
      [AM_PROG_LIBTOOL],
      [AC_PROG_RANLIB])

will make me not listen to it.  Besides, I *could* be using libltdl
as subpackage (and thus `libtoolize --ltdl') but not wanting to use
libtool in the parent package.

So, the warning above to add LT_INIT is also slightly bogus.

> +
> +    $opt_ltdl && {
> +
> +      # Suggest using LT_WITH_LTDL if appropriate:
> +      $seen_ltdl ||
> +        func_echo "remember to add \`LT_WITH_LTDL' to $configure_ac"

Erm, can we make this `consider using' instead of `remember to add'?
LT_WITH_LTDL is _not_ necessary.

> +
> +      # Remind the user to call LT_CONFIG_LTDL_DIR:
> +      test -n "$ac_ltdldir" || \
> +        func_echo "remember to add \`LT_CONFIG_LTDL_DIR([[$ltdldir]])' to 
> \`$configure_ac'"
> +
> +      # Offer some suggestions for avoiding duplicate files in a project
> +      # that uses libltdl:
> +      test "$ltdldir/config" = "$auxdir" || \
> +        func_echo "consider using \`AC_CONFIG_AUX_DIR([[$ltdldir/config]])' 
> in $configure_ac"
> +      test "$ltdldir/m4" = "$m4dir" || \
> +        func_echo "consider using \`AC_CONFIG_MACRO_DIR([[$ltdldir/m4]])' in 
> $configure_ac"
>  
> -    $seen_libtool \
> -      || func_echo "Remember to add \`LT_INIT' to \`$configure_ac'."
> +    }
>  
>      # FIXME: Ensure ltmain.sh, libtool.m4 and ltdl.m4 are from the same 
> release
>  }
> @@ -942,7 +981,6 @@ func_nonemptydir_p ()
>    glob_exclude_pkgaux_files='config.guess|config.sub|install-sh|ltmain.sh'
>  
>    func_scan_files
> -  $opt_quiet || func_check_macros
>  
>    # Copy all the files from installed libltdl to this project, if the
>    # user specified `--ltdl'.
> @@ -997,44 +1035,7 @@ func_nonemptydir_p ()
>        "$m4dir" func_serial_update
>    fi
>  
> -  # Suggest modern idioms for storing autoconf macros:
> -  $opt_quiet || \
> -    if $seen_autoconf; then
> -      if test -z "$macrodir$ltdldir"; then
> -     if test x"$m4dir" = x.; then
> -       func_echo "add \`AC_CONFIG_MACRO_DIR([m4])' to $configure_ac and 
> rerun libtoolize,"
> -       func_echo "to keep the correct libtool macros in-tree."
> -     else
> -       func_echo "consider adding \`AC_CONFIG_MACRO_DIR([$m4dir])'to 
> $configure.ac,"
> -       func_echo "and rerunning libtoolize."
> -     fi
> -      else
> -        func_echo "You should add the contents of the following files to 
> \`aclocal.m4':"
> -     for need in libtool.m4 ltoptions.m4 ltversion.m4 ltsugar.m4; do
> -       func_echo "\`$aclocaldir/$need'"
> -     done
> -     if $seen_ltdl || $opt_ltdl; then
> -       for need in argz.m4 ltdl.m4; do
> -         func_echo "\`$aclocaldir/$need'"
> -       done
> -     fi
> -      fi
> -    fi
> -
> -  $opt_quiet || \
> -    if $opt_ltdl && $seen_autoconf; then
> -
> -      # Remind the user to call LT_CONFIG_LTDL_DIR:
> -      test -n "$ac_ltdldir" || \
> -        func_echo "Remember to add \`LT_CONFIG_LTDL_DIR([[$ltdldir]])' to 
> \`$configure_ac'"
> -
> -      # Offer some suggestions for avoiding duplicate files in a project
> -      # that uses libltdl:
> -      test "$ltdldir/config" = "$auxdir" || \
> -        func_echo "consider using \`AC_CONFIG_AUX_DIR([[$ltdldir/config]])' 
> in $configure_ac"
> -      test "$ltdldir/m4" = "$m4dir" || \
> -        func_echo "consider using \`AC_CONFIG_MACRO_DIR([[$ltdldir/m4]])' in 
> $configure_ac"
> -    fi
> +  $opt_quiet || func_check_macros
>  }
>  
>  exit $exit_status