FYI: make libtoolize's pkgvdatadir a private api [libtool--devo--1.0--patch-105]

[Gary V. Vaughan]

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

Applied to HEAD.

  * looking for address@hidden/libtool--devo--1.0--patch-105 to compare with
  * comparing to address@hidden/libtool--devo--1.0--patch-105
  M  libtoolize.m4sh
  M  ChangeLog
  M  tests/testsuite.at
  
  * modified files
  
  Index: Changelog
  from  Gary V. Vaughan  <address@hidden>
  
        * libtoolize.m4sh (pkgvdatadir): Renamed from this...
        (_lt_pkgvdatadir): ...to this.
        * tests/testsuite.at (LT_AT_LIBTOOLIZE): The `-I' option is no
        longer supported by libtoolize.  Set _lt_pkgvdatadir in the
        environment of the invocation instead.
  
  --- orig/libtoolize.m4sh
  +++ mod/libtoolize.m4sh
  @@ -80,7 +80,7 @@
   libtoolize_flags=
   
   # Locations for important files:
  -: ${pkgvdatadir="@pkgvdatadir@"}
  +: ${_lt_pkgvdatadir="@pkgvdatadir@"}
   address@hidden@
   address@hidden@
   auxdir=
  @@ -387,8 +387,8 @@
           || func_fatal_help "\`$configure_ac' does not exist"
   
       # check that existing directories from the list can be ls'ed
  -    test -n "`{ cd $pkgvdatadir && ls; } 2>/dev/null`" \
  -        || func_fatal_error "can not list files in \`$pkgvdatadir'"
  +    test -n "`{ cd $_lt_pkgvdatadir && ls; } 2>/dev/null`" \
  +        || func_fatal_error "can not list files in \`$_lt_pkgvdatadir'"
   
       # Set local variables to reflect contents of configure.ac
       my_uses_autoconf=false
  @@ -870,7 +870,7 @@
     # Copy all the files from installed (or specified, if `-I' was used)
     # libltdl to this project, if the user specified `--ltdl'.
     if test -n "$ltdldir"; then
  -    func_copy_some_files "$pkgvltdl_files" "$pkgvdatadir/libltdl" "$ltdldir"
  +    func_copy_some_files "$pkgvltdl_files" "$_lt_pkgvdatadir/libltdl" 
"$ltdldir"
   
       # libtoolize the newly copied libltdl tree
       ( cd "$ltdldir" && eval "$progpath" $libtoolize_flags ) \
  @@ -883,26 +883,26 @@
       func_echo "putting files in AC_CONFIG_AUX_DIR, \`$auxdir'."
     fi
     if $opt_install; then
  -    func_config_update config.guess "$pkgvdatadir/config" "$auxdir"
  -    func_config_update config.sub   "$pkgvdatadir/config" "$auxdir"
  -    func_install_update install-sh  "$pkgvdatadir/config" "$auxdir"
  +    func_config_update config.guess "$_lt_pkgvdatadir/config" "$auxdir"
  +    func_config_update config.sub   "$_lt_pkgvdatadir/config" "$auxdir"
  +    func_install_update install-sh  "$_lt_pkgvdatadir/config" "$auxdir"
     fi
  -  func_ltmain_update ltmain.sh "$pkgvdatadir/config" "$auxdir"
  +  func_ltmain_update ltmain.sh "$_lt_pkgvdatadir/config" "$auxdir"
   
     # Copy libtool's m4 macros to the macro directory, if they are newer.
     if test -n "$m4dir"; then
       $opt_quiet || func_echo "putting macros in AC_CONFIG_MACRO_DIR, 
\`$m4dir'."
   
  -    func_serial_update  libtool.m4 "$pkgvdatadir/m4" "$m4dir" \
  +    func_serial_update  libtool.m4 "$_lt_pkgvdatadir/m4" "$m4dir" \
         LT_INIT 'A[[CM]]_PROG_LIBTOOL'
   
       if $seen_ltdl; then
  -      func_serial_update ltdl.m4 "$pkgvdatadir/m4" "$m4dir" 'LTDL_INIT'
  +      func_serial_update ltdl.m4 "$_lt_pkgvdatadir/m4" "$m4dir" 'LTDL_INIT'
       else
         func_verbose "Not copying \`$m4dir/ltdl.m4', libltdl not used."
       fi
   
  -    func_copy_some_files "$pkgvmacro_files" "$pkgvdatadir/m4" \
  +    func_copy_some_files "$pkgvmacro_files" "$_lt_pkgvdatadir/m4" \
         "$m4dir" func_serial_update
     else
       func_verbose "AC_CONFIG_MACRO_DIR not defined, not copying libtool macro 
files."
  
  
  --- orig/tests/testsuite.at
  +++ mod/tests/testsuite.at
  @@ -1,7 +1,7 @@
   # Process with autom4te to create an -*- Autotest -*- test suite.
   
   # Test suite for GNU Libtool.
  -# Copyright 2004 Free Software Foundation, Inc.
  +# Copyright 2004, 2005 Free Software Foundation, Inc.
   
   # This program is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
  @@ -26,7 +26,7 @@
   # LT_AT_LIBTOOLIZE([ARGS])
   # ------------------------
   m4_define([LT_AT_LIBTOOLIZE],
  -["$LIBTOOLIZE" -I "$abs_top_srcdir" -I "$abs_top_srcdir/config" $1
  +[_lt_pkgvdatadir="$abs_top_srcdir" "$LIBTOOLIZE" $1
   ])
   
   
  
  
  
- -- 
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.9
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iD8DBQFCUXYqFRMICSmD1gYRAmuRAJ9ChTMMYdH52GsVzpLWKhU2F5k4wACguAra
NnPrpQNr89oQka8TZya5y/Q=
=C2gB
-----END PGP SIGNATURE-----