Re: FYI: centralise INCLTDL [291]

[Ralf Wildenhues]

Hi Gary,

* Gary V. Vaughan wrote on Mon, Oct 10, 2005 at 07:21:39PM CEST:
> 
> Applied to HEAD.

Gah, it breaks mdemo. mdemo/configure.ac does not invoke LT_WITH_LTDL
_at all_.  Looking at branch-1-5, I guess we have to support this
mode, too.  :-/

Can you look into fixing this?

Cheers,
Ralf

>   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: