FYI: centralise INCLTDL [291]

[Gary V. Vaughan]

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

Applied to HEAD.

  * looking for address@hidden/libtool--devo--1.0--patch-317 to compare with
  * comparing to address@hidden/libtool--devo--1.0--patch-317
  M  libltdl/m4/ltdl.m4
  M  ChangeLog
  
  * modified files
  
  Index: Changelog
  from  Gary V. Vaughan  <address@hidden>
  
        * libltdl/m4/ltdl.m4 (LTDL_CONVENIENCE, LTDL_INSTALLABLE): Remove
        AC_SUBST of LIBLTDL, LTDLINCL, and all mention of INCLTDL.
        (LT_WITH_LTDL): Due to order constraints between LTDL_CONVENIENCE,
        LTDL_INSTALLABLE, LT_WITH_LTDL & LTDL_INIT, we can safely AC_SUBST
        LIBLTDL and LTDLINCL here.  Also, remember to synch INCLTDL.
  
  --- orig/libltdl/m4/ltdl.m4
  +++ mod/libltdl/m4/ltdl.m4
  @@ -63,13 +63,6 @@
     esac
   LIBLTDL='${top_builddir}'"${lt_ltdl_dir+/$lt_ltdl_dir}/libltdlc.la"
   LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
  -
  -AC_SUBST([LIBLTDL])
  -AC_SUBST([LTDLINCL])
  -
  -# For backwards non-gettext consistent compatibility...
  -INCLTDL="$LTDLINCL"
  -AC_SUBST([INCLTDL])
   ])# LTDL_CONVENIENCE
   
   # AC_LIBLTDL_CONVENIENCE accepted a directory argument in older libtools,
  @@ -119,13 +112,6 @@
     LIBLTDL="-lltdl"
     LTDLINCL=
   fi
  -
  -AC_SUBST([LIBLTDL])
  -AC_SUBST([LTDLINCL])
  -
  -# For backwards non-gettext consistent compatibility...
  -INCLTDL="$LTDLINCL"
  -AC_SUBST([INCLTDL])
   ])# LTDL_INSTALLABLE
   
   # AC_LIBLTDL_INSTALLABLE accepted a directory argument in older libtools,
  @@ -198,6 +184,11 @@
        [],
       [LTDL_INIT
       AC_DEFUN([LTDL_INIT], [])])
  +
  +AC_SUBST([LIBLTDL])
  +AC_SUBST([LTDLINCL])
  +dnl For backwards non-gettext consistent compatibility...
  +AC_SUBST([INCLTDL], ["$LTDLINCL"])
   ])# LT_WITH_LTDL
   
   # Old name:
  
  
  
- -- 
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 1.0
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Darwin)

iD8DBQFDSqMhFRMICSmD1gYRAlBcAJ97fvw/2AXGb1+KglhR2hUFdXWI7wCdEjwo
CCJOJAKEktch8d+Fzt8siP0=
=rXfk
-----END PGP SIGNATURE-----