Re: [PATCH 5/5] libtoolize: install autoconf macros only if there is a $configure_ac.

[Gary V. Vaughan]

Flubbed the Subject line, sorry.  Should have said:

FYI: [PATCH] libtoolize: ...


On 8 Nov 2011, at 20:42, Gary V. Vaughan wrote:

> Applied as obvious.
> 
> * libtoolize.m4sh (func_install_pkgmacro_files): If there is no
> $configure_ac in the parent project directory, and libtoolize is
> in subproject mode, then the parent project has no use for
> autoconf macros, so don't install them.
> * NEWS: Updated.
> 
> Signed-off-by: Gary V. Vaughan <address@hidden>
> ---
> NEWS            |    3 +++
> libtoolize.m4sh |    5 ++++-
> 2 files changed, 7 insertions(+), 1 deletions(-)
> 
> diff --git a/NEWS b/NEWS
> index b446e62..2aa71ad 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -19,6 +19,9 @@ NEWS - list of user-visible changes between releases of GNU 
> Libtool
>     sed script.
>   - Fix a long-standing bug in libtoolize, by outputting the `putting
>     auxiliary files in' header with `libtoolize --ltdl --subproject'.
> +  - Fix a long-standing bug in libtoolize subproject installation, by not
> +    installing a set of autoconf macro files into the parent project if
> +    there is no configure.ac present to use them.
>   - The libtoolize subproject mode selector is now named `--subproject'
>     and is equivalent to the implied `--subproject' mode when no other
>     mode is selected; `--standalone' never worked, and is no longer
> diff --git a/libtoolize.m4sh b/libtoolize.m4sh
> index 49a317e..2432e02 100644
> --- a/libtoolize.m4sh
> +++ b/libtoolize.m4sh
> @@ -1060,6 +1060,7 @@ func_install_pkgmacro_files ()
> 
>     $require_ac_macro_dir
>     $require_am_macro_dir
> +    $require_configure_ac
>     $require_macro_dir
> 
>     # argz.m4, libtool.m4 and ltdl.m4 are handled specially:
> @@ -1069,7 +1070,9 @@ func_install_pkgmacro_files ()
>     if $opt_ltdl && test "x$ltdl_mode" = "xsubproject" &&
>        test "x$macro_dir" != "x$subproject_macro_dir"
>     then
> -      func_install_pkgmacro_parent
> +      # No point installing configure macros in the parent project when
> +      # there's no $configure_ac to use them.
> +      test -f "$configure_ac" && func_install_pkgmacro_parent
>       func_install_pkgmacro_subproject
> 
>   # 2. Parent shares macro_dir with subproject ltdl:
> -- 
> 1.7.7.2

Cheers,
-- 
Gary V. Vaughan (gary AT gnu DOT org)