Re: FYI: centralise INCLTDL [291]

[Ralf Wildenhues]

Hi Gary,

* Gary V. Vaughan wrote on Tue, Oct 11, 2005 at 10:22:02AM CEST:
> Ralf Wildenhues wrote:
> 
> >I suggest reverting your change and applying my suggested, pretty
> >trivial patch, instead.  Do you agree?
> 
> Yes.

Good.  Reverted your patch and applied mine, both shown below.

> I'll have a poke around and see if I can make a working version
> of my patch later, as I do think it is nicer to consolidate the whole
> thing if possible.

OK.  I would not see this as very important, though.

Cheers,
Ralf

        * libltdl/m4/ltdl.m4 (LTDL_CONVENIENCE, LTDL_INSTALLABLE)
        (LT_WITH_LTDL): Revert Gary's 2005-10-10 patch.

Index: libltdl/m4/ltdl.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/m4/ltdl.m4,v
retrieving revision 1.12
diff -u -r1.12 ltdl.m4
--- libltdl/m4/ltdl.m4  10 Oct 2005 17:28:58 -0000      1.12
+++ libltdl/m4/ltdl.m4  11 Oct 2005 11:24:15 -0000
@@ -63,6 +63,13 @@
   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,
@@ -112,6 +119,13 @@
   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,
@@ -184,11 +198,6 @@
        [],
     [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:

*snip*

        * libltdl/m4/ltdl.m4 (LT_WITH_LTDL): Also set INCLTDL.

Index: libltdl/m4/ltdl.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/m4/ltdl.m4,v
retrieving revision 1.13
diff -u -r1.13 ltdl.m4
--- libltdl/m4/ltdl.m4  11 Oct 2005 11:25:08 -0000      1.13
+++ libltdl/m4/ltdl.m4  11 Oct 2005 11:27:16 -0000
@@ -185,6 +185,7 @@
     [Define this if a modern libltdl is already installed])
   LIBLTDL=-lltdl
   LTDLINCL=
+  INCLTDL=
 fi
 
 # Report our decision...