From: Gary V. Vaughan Date: Sun, 30 Sep 2001 10:20:29 +0000 (+0000) Subject: * libtool.m4 (AC_LIBLTDL_CONVENIENCE): s/INCLTDL/LTDLINCL/ for X-Git-Tag: release-1-4d~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee4a8bb8bdc48933b7f7844dcdc139cff7efaf5e;p=thirdparty%2Flibtool.git * libtool.m4 (AC_LIBLTDL_CONVENIENCE): s/INCLTDL/LTDLINCL/ for consistency with gettext's INTLINCL. Keep the old symbol too for backwards compatibility. (AC_LIBLTDL_INSTALLABLE): Ditto. * doc/libtool.texi (Distributing libltdl): Adjust documentation. --- diff --git a/ChangeLog b/ChangeLog index 43dddbafe..db6b0a501 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-09-30 Gary V. Vaughan + + * libtool.m4 (AC_LIBLTDL_CONVENIENCE): s/INCLTDL/LTDLINCL/ for + consistency with gettext's INTLINCL. Keep the old symbol too for + backwards compatibility. + (AC_LIBLTDL_INSTALLABLE): Ditto. + * doc/libtool.texi (Distributing libltdl): Adjust documentation. + 2001-09-22 Albert Chin-A-Young * ltdl.m4 (AC_LTDL_DLLIB): Even though HP-UX 10.20 and 11.00 diff --git a/doc/libtool.texi b/doc/libtool.texi index f7b21916c..f326be055 100644 --- a/doc/libtool.texi +++ b/doc/libtool.texi @@ -3443,14 +3443,14 @@ Whatever macro you use, it is up to you to ensure that your sub-makes within libltdl's directory, using automake's @var{SUBDIRS}, for example. Both macros define the shell variables @var{LIBLTDL}, to the link flag that you should use to link with libltdl, and -@var{INCLTDL}, to the preprocessor flag that you should use to compile +@var{LTDLINCL}, to the preprocessor flag that you should use to compile with programs that include @file{ltdl.h}. It is up to you to use @samp{AC_SUBST} to ensure that this variable will be available in @file{Makefile}s, or add them to variables that are @samp{AC_SUBST}ed by default, such as @var{LIBS} and @var{CPPFLAGS}. If you're using the convenience libltdl, @var{LIBLTDL} will be the -pathname for the convenience version of libltdl and @var{INCLTDL} will be +pathname for the convenience version of libltdl and @var{LTDLINCL} will be @samp{-I} followed by the directory that contains libltdl, both starting with @samp{$@{top_builddir@}/} or @samp{$@{top_srcdir@}/}, respectively. @@ -3459,15 +3459,15 @@ found@footnote{Even if libltdl is installed, @samp{AC_LIBLTDL_INSTALLABLE} may fail to detect it, if libltdl depends on symbols provided by libraries other than the C library. In this case, it will needlessly build and install libltdl.}, @var{LIBLTDL} will -be set to @samp{-lltdl} and @var{INCLTDL} will be empty (which is just a +be set to @samp{-lltdl} and @var{LTDLINCL} will be empty (which is just a blind assumption that @file{ltdl.h} is somewhere in the include path if libltdl is in the library path). If an installable version of libltdl must be built, its pathname, starting with @samp{$@{top_builddir@}/}, -will be stored in @var{LIBLTDL}, and @var{INCLTDL} will be set just like +will be stored in @var{LIBLTDL}, and @var{LTDLINCL} will be set just like in the case of convenience library. So, when you want to link a program with libltdl, be it a convenience, -installed or installable library, just compile with @samp{$(INCLTDL)} +installed or installable library, just compile with @samp{$(LTDLINCL)} and link it with @samp{$(LIBLTDL)}, using libtool. You should probably also add @samp{AC_LIBTOOL_DLOPEN} to your @@ -3490,8 +3490,8 @@ configure.in: dnl Enable building of the convenience library dnl and set LIBLTDL accordingly AC_LIBLTDL_CONVENIENCE -dnl Substitute INCLTDL and LIBLTDL in the Makefiles -AC_SUBST(INCLTDL) +dnl Substitute LTDLINCL and LIBLTDL in the Makefiles +AC_SUBST(LTDLINCL) AC_SUBST(LIBLTDL) dnl Check for dlopen support AC_LIBTOOL_DLOPEN @@ -3507,7 +3507,7 @@ Makefile.am: ... SUBDIRS = libltdl -INCLUDES = $(INCLTDL) +INCLUDES = $(LTDLINCL) myprog_LDFLAGS = -export-dynamic # The quotes around -dlopen below fool automake <= 1.4 into accepting it diff --git a/libtool.m4 b/libtool.m4 index a360490ac..76a970ce0 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -2085,11 +2085,11 @@ esac # AC_LIBLTDL_CONVENIENCE([DIRECTORY]) # ----------------------------------- # sets LIBLTDL to the link flags for the libltdl convenience library and -# INCLTDL to the include flags for the libltdl header and adds +# LTDLINCL to the include flags for the libltdl header and adds # --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL -# and INCLTDL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If +# 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 INCLTDL will be prefixed with +# 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. @@ -2101,19 +2101,21 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE], ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + # For backwards non-gettext consistent compatibility... + INCLTDL="$LTDLINCL" ])# AC_LIBLTDL_CONVENIENCE # AC_LIBLTDL_INSTALLABLE([DIRECTORY]) # ----------------------------------- # sets LIBLTDL to the link flags for the libltdl installable library and -# INCLTDL to the include flags for the libltdl header and adds +# LTDLINCL to the include flags for the libltdl header and adds # --enable-ltdl-install to the configure arguments. Note that LIBLTDL -# and INCLTDL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If +# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If # DIRECTORY is not provided and an installed libltdl is not found, it is # assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' -# and INCLTDL will be prefixed with '${top_srcdir}/' (note the single +# 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. # In the future, this macro may have to be called after AC_PROG_LIBTOOL. @@ -2130,12 +2132,14 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE], if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" - INCLTDL= + LTDLINCL= fi + # For backwards non-gettext consistent compatibility... + INCLTDL="$LTDLINCL" ])# AC_LIBLTDL_INSTALLABLE