From 655e0185d95b3b08958019848f418ae388c5caf1 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Mon, 29 Aug 2005 11:11:41 +0000 Subject: [PATCH] * libltdl/m4/ltdl.m4 (LTDL_CONVENIENCE): Fix the comment to not pretend that LIBLTDL and LTDLINCL are not AC_SUBSTed here. * doc/libtool.texi (Distributing libltdl): Update the documentation to match the advice given in HEAD. Don't tell the user they have to AC_SUBST again. --- ChangeLog | 10 +++++++++- doc/libtool.texi | 9 +++------ libtool.m4 | 14 +++++++------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5bd4cc399..38ac92fc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-08-29 Gary V. Vaughan + + * libltdl/m4/ltdl.m4 (LTDL_CONVENIENCE): Fix the comment to not + pretend that LIBLTDL and LTDLINCL are not AC_SUBSTed here. + * doc/libtool.texi (Distributing libltdl): Update the + documentation to match the advice given in HEAD. Don't tell + the user they have to AC_SUBST again. + 2005-08-24 Bruno Haible * ltmain.in (install mode): Try "ln -s -f" and "rm -f && ln -s" @@ -84,7 +92,7 @@ 2005-07-08 Ralf Wildenhues - * tests/defs (make): Undo bogus change I did, and also + * tests/defs (make): Undo bogus change I did, and also wrongly attributed to Derek R. Price. 2005-07-08 Derek R. Price diff --git a/doc/libtool.texi b/doc/libtool.texi index 06969a890..ea2fda216 100644 --- a/doc/libtool.texi +++ b/doc/libtool.texi @@ -24,7 +24,7 @@ @ifnottex This file documents GNU Libtool @value{VERSION} -Copyright (C) 1996-2003 Free Software Foundation, Inc. +Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 @@ -3504,10 +3504,10 @@ a convenience library or an installable libtool library. The most simplistic way to add @code{libltdl} to your package is to copy the source files, @file{ltdl.c} and @file{ltdl.h}, to a source directory -withing your package and to build and link them along with the rest of +within your package and to build and link them along with the rest of your sources. To help you do this, the m4 macros for autoconf are available in @file{ltdl.m4}. You must ensure that they are available in -@file{aclocal.m4} before you run autoconf -- by appending the contents +@file{aclocal.m4} before you run Autoconf -- by appending the contents of @file{ltdl.m4} to @file{acinclude.m4}, if you are using automake, or to @file{aclocal.m4} if you are not. Having made the macros available, you must add a call to the @samp{AC_LIB_LTDL} macro to your package's @@ -3607,9 +3607,6 @@ configure.in: dnl Enable building of the convenience library dnl and set LIBLTDL accordingly AC_LIBLTDL_CONVENIENCE -dnl Substitute LTDLINCL and LIBLTDL in the Makefiles -AC_SUBST(LTDLINCL) -AC_SUBST(LIBLTDL) dnl Check for dlopen support AC_LIBTOOL_DLOPEN dnl Configure libtool diff --git a/libtool.m4 b/libtool.m4 index 52e2a37b6..d218aa6bc 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -2419,13 +2419,13 @@ esac # ----------------------------------- # sets LIBLTDL to the link flags for the libltdl convenience library and # LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL -# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If -# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will -# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and -# top_srcdir appropriately in the Makefiles. +# --enable-ltdl-convenience to the configure arguments. Note that +# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +# it is assumed to be `libltdl'. LIBLTDL will be prefixed with +# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' +# (note the single quotes!). If your package is not flat and you're not +# using automake, define top_builddir and top_srcdir appropriately in +# the Makefiles. AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl case $enable_ltdl_convenience in -- 2.47.3