Redone to fix the problems you encountered in the other thread about this patch. Okay to commit?
libltdl/m4/ltdl.m4 | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) Index: libtool--devo--1.0/ChangeLog from Gary V. Vaughan <[EMAIL PROTECTED]> * 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. Index: libtool--devo--1.0/libltdl/m4/ltdl.m4 =================================================================== --- libtool--devo--1.0.orig/libltdl/m4/ltdl.m4 +++ libtool--devo--1.0/libltdl/m4/ltdl.m4 @@ -69,13 +69,6 @@ case $enable_ltdl_convenience in 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, @@ -125,13 +118,6 @@ else 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, @@ -223,6 +209,11 @@ m4_if(_LTDL_MODE, [subproject], [], [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 ())_. [EMAIL PROTECTED],gnu.org} Research Scientist ( '/ http://tkd.kicks-ass.net GNU Hacker / )= http://www.gnu.org/software/libtool Technical Author `(_~)_ http://sources.redhat.com/autobook
signature.asc
Description: OpenPGP digital signature