+2004-11-22 Gary V. Vaughan <gary@gnu.org>
+
+ * configure.ac, Makefile.am, libltdl/Makefile.am,
+ libltdl/loaders/Makefile.am, libtoolize.m4sh, doc/libtool.texi:
+ Revert libtool--release--2.0--patch-68, my 2004-11-14 patch for
+ parallel installation.
+
2004-11-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* m4/libtool.m4 (_LT_TAG_COMPILER): Document that with_gcc is
-e 's,@PACKAGE\@,$(PACKAGE),g' \
-e 's,@SED\@,$(SED),g' \
-e 's,@VERSION\@,$(VERSION),g' \
- -e 's,@aclocaldir\@,$(aclocaldir),g' \
+ -e 's,@prefix\@,$(prefix),g' \
-e 's,@datadir\@,$(datadir),g' \
+ -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
+ -e 's,@aclocaldir\@,$(aclocaldir),g' \
-e 's,@host_triplet\@,$(host_triplet),g' \
- -e 's,@pkgvdatadir\@,$(pkgvdatadir),g' \
- -e 's,@pkgvmacrodir\@,$(pkgvmacrodir),g' \
- -e 's,@prefix\@,$(prefix),g' \
-e "s,@configure_input\@,Generated from $$input; do not edit by hand,g"
timestamp = set -- `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; \
# These are required by libtoolize and must be executable when installed.
# Since _SCRIPTS gets the program transform applied we make them
# executable by hand
-dist_pkgvdata_DATA = config/config.guess config/config.sub config/ltmain.sh
+dist_pkgdata_DATA = config/config.guess config/config.sub config/ltmain.sh
# Everything that gets picked up by aclocal is automatically distributed,
# this is the list of macro files we install on the user's system.
-# NOTE: Ensure that PKGVMACRO_FILES in libtoolize.in is updated if you
+# NOTE: Ensure that PKGMACRO_FILES in libtoolize.in is updated if you
# change the contents of aclocal_DATA:
-pkgvmacro_DATA = m4/argz.m4 m4/libtool.m4 m4/ltdl.m4 \
+aclocal_DATA = m4/argz.m4 m4/libtool.m4 m4/ltdl.m4 \
m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4
## We know that $(top_srcdir)/ChangeLog has been edited if stamp-vcl
(cd $$dir && $$abs_srcdir/$$dir/configure) || exit 1
install-data-local:
-## Don't install over the top of an old pkgvdatadir
- -rm -rf $(DESTDIR)$(pkgvdatadir)
-## Remove old pkgdatadir
+## Don't install over the top of an old pkgdatadir
-rm -rf $(DESTDIR)$(pkgdatadir)
-## Remove old macro definitions
- -rm -rf $(DESTDIR)$(aclocaldir)/ltdl.m4
- -rm -rf $(DESTDIR)$(aclocaldir)/libtool.m4
install-data-hook:
- chmod +x $(DESTDIR)$(pkgvdatadir)/config.guess
- chmod +x $(DESTDIR)$(pkgvdatadir)/config.sub
-
-## Make versioned links. We only run the transform on the root name;
-## then we make a versioned link with the transformed base name. This
-## seemed like the most reasonable approach.
-install-exec-hook:
- @$(POST_INSTALL)
- @for p in $(bin_SCRIPTS); do \
- f="`echo $$p|sed '$(transform)'`"; \
- fv="$$f-$(APIVERSION)"; \
- rm -f $(DESTDIR)$(bindir)/$$fv; \
- echo " $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv"; \
- $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv; \
- done
-
-uninstall-hook:
- @for p in $(bin_SCRIPTS); do \
- f="`echo $$p|sed '$(transform)'`"; \
- fv="$$f-$(APIVERSION)"; \
- rm -f $(DESTDIR)$(bindir)/$$fv; \
- done
+ chmod +x $(DESTDIR)$(pkgdatadir)/config.guess
+ chmod +x $(DESTDIR)$(pkgdatadir)/config.sub
## Ship README.alpha only in alpha release, but renamed to README
dist-hook:
NEWS - list of user-visible changes between releases of GNU Libtool
New in 1.9h: 2004-??-??; CVS version 1.9g, Libtool team:
-* Libtool versions can now be parallel installed, except that only one
- set of libltdl headers and static libs, and only one manual is retained.
-* In order for this to work, Libtool's aclocal macros are not installed
- to a shared aclocal dir. Either change your Makefile.am to use:
- ACLOCAL_AMFLAGS = -I /usr/share/libtool-1.9g/m4
- Or change your configure.ac to use:
- AC_CONFIG_MACRO_DIR([m4])
\f
New in 1.9f: 2004-10-23; CVS version 1.9e, Libtool team:
* Calculate dllsearchpath correctly for wrapper scripts on cygwin.
## ------------------------------- ##
## Libtool specific configuration. ##
## ------------------------------- ##
+pkgdatadir='${datadir}'"/${PACKAGE}"
+AC_SUBST([pkgdatadir]) # automake does not need this, but libtoolize does
-# The API version is the base version. We must guarantee
-# compatibility for all releases with the same API version.
-# Our current rule is that:
-# * All releases, including the prereleases, in an X.Y series
-# are compatible. So 2.0.1c is compatible with 2.0.
-# * Prereleases on the trunk are all incompatible -- 2.1b and 2.1c
-# aren't the same.
-APIVERSION=`echo "$VERSION" | sed -e 's/^\([[0-9]]*\.[[0-9]]*[[a-z]]*\).*$/\1/'`
-AC_SUBST([APIVERSION])
-AC_SUBST([aclocaldir], ["\${prefix}/aclocal"])
-AC_SUBST([pkgvdatadir], ["\${datadir}/$PACKAGE-$APIVERSION"])
-AC_SUBST([pkgvmacrodir], ["\${datadir}/$PACKAGE-$APIVERSION/m4"])
+aclocaldir='${datadir}/aclocal'
+AC_SUBST([aclocaldir])
AC_ARG_ENABLE(ltdl-install,
[AS_HELP_STRING([--disable-ltdl-install], [do not install libltdl])])
AC_SUBST([DIST_MAKEFILE_LIST])
-# Test for ln. We need use it to install the versioned binaries.
-AC_MSG_CHECKING([whether ln works])
-AC_CACHE_VAL([am_cv_prog_ln], [
-rm -f conftest conftest.file
-: >conftest.file
-if ln conftest.file conftest 2>/dev/null; then
- am_cv_prog_ln=ln
-else
- am_cv_prog_ln='cp -p'
-fi
-rm -f conftest conftest.file])
-AC_SUBST([LN], [$am_cv_prog_ln])
-result=no
-test "x$am_cv_prog_ln" = xln && result=yes
-AC_MSG_RESULT([$result])
-
## ---------------- ##
## compiler checks. ##
your @code{AC_CONFIG_MACRO_DIR}, where @command{aclocal} can reference
them directly from @file{aclocal.m4}.
-Alternatively, if you want to keep all of your macros in a single
-@file{aclocal.m4}, or if you are using an older Automake that doesn't
-support in-tree m4_include, you need to arrange for @command{aclocal}
-to look in the versioned Libtool directory. One way of doing this is
-to use @code{ACLOCAL_AMFLAGS} in your @file{Makefile.am}:
-
-@example
-ACLOCAL_AMFLAGS += -I $(prefix)/share/libtool-2.0/m4
-@end example
-
@node Distributing
@section Including libtool in your package
## These are installed as a subdirectory of pkgdatadir so that
## libtoolize --ltdl can find them later:
-ltdldatadir = $(pkgvdatadir)/libltdl
+ltdldatadir = $(pkgdatadir)/libltdl
nobase_ltdldata_DATA = COPYING.LIB Makefile.am README configure.ac \
$(libltdl_la_SOURCES) $(libdlloader_la_SOURCES) \
lt__dirent.c lt__dirent.h argz_.h argz.c
## These are installed as a subdirectory of pkgdatadir so that
## libtoolize --ltdl can find them later:
-ltdldatadir = $(pkgvdatadir)/libltdl/loaders
+ltdldatadir = $(pkgdatadir)/libltdl/loaders
ltdldata_DATA = Makefile.am dld_link.c dlopen.c dyld.c \
load_add_on.c loadlibrary.c shl_load.c
# Locations for important files:
prefix=@prefix@
datadir=@datadir@
-pkgvdatadir=@pkgvdatadir@
-pkgvmacrodir=@pkgvmacrodir@
+pkgdatadir=@pkgdatadir@
+aclocaldir=@aclocaldir@
auxdir=
m4dir=
ltdldir=
test -f "$configure_ac" \
|| func_fatal_help "\`$configure_ac' does not exist"
- test -n "`cd $pkgvdatadir && ls`" \
- || func_fatal_error "can not list files in \`$pkgvdatadir'"
+ test -n "`cd $pkgdatadir && ls`" \
+ || func_fatal_error "can not list files in \`$pkgdatadir'"
# Set local variables to reflect contents of configure.ac
{
rerun_aclocal=false
- # NOTE: PKGVMACRO_FILES must be kept in synch with pkgvmacro_DATA in the
+ # NOTE: PKGMACRO_FILES must be kept in synch with aclocal_DATA in the
# libtool top_srcdir/Makefile.am (libtool.m4 and ltdl.m4 are handled
# specially below though, so don't add them here):
- pkgvmacro_files='argz.m4:ltoptions.m4:ltsugar.m4:ltversion.m4'
+ pkgmacro_files='argz.m4:ltoptions.m4:ltsugar.m4:ltversion.m4'
glob_exclude_pkgaux_files='config.guess|config.sub|ltmain.sh'
# Copy all the files from installed libltdl to this project, if the
# user specified `--ltdl'.
if test -n "$ltdldir"; then
- eval func_copy_all_files -r "$pkgvdatadir/libltdl" "$ltdldir"
+ eval func_copy_all_files -r "$pkgdatadir/libltdl" "$ltdldir"
# libtoolize the newly copied libltdl tree
( cd "$ltdldir" && "$progpath" $libtoolize_flags ) || exit $EXIT_FAILURE
func_echo "putting files in AC_CONFIG_AUX_DIR, \`$auxdir'."
fi
if $opt_install || $opt_force; then
- func_copy_all_files "$pkgvdatadir" "$auxdir" "$glob_exclude_pkgaux_files"
- func_config_update "$pkgvdatadir/config.guess" "$auxdir/config.guess"
- test -f "$pkgvdatadir/config.sub" \
- && func_config_update "$pkgvdatadir/config.sub" "$auxdir/config.sub"
+ func_copy_all_files "$pkgdatadir" "$auxdir" "$glob_exclude_pkgaux_files"
+ func_config_update "$pkgdatadir/config.guess" "$auxdir/config.guess"
+ test -f "$pkgdatadir/config.sub" \
+ && func_config_update "$pkgdatadir/config.sub" "$auxdir/config.sub"
fi
- func_ltmain_update "$pkgvdatadir/ltmain.sh" "$auxdir/ltmain.sh"
+ func_ltmain_update "$pkgdatadir/ltmain.sh" "$auxdir/ltmain.sh"
# Copy libtool's m4 macros to the macro directory, if they are newer.
if test -n "$m4dir"; then
- libtool_m4="$pkgvmacrodir/libtool.m4"
- ltdl_m4="$pkgvmacrodir/ltdl.m4"
+ libtool_m4="$aclocaldir/libtool.m4"
+ ltdl_m4="$aclocaldir/ltdl.m4"
$opt_quiet || func_echo "putting macros in AC_CONFIG_MACRO_DIR, \`$m4dir'."
func_verbose "Not copying \`$ltdl_m4', libltdl not used."
fi
- func_copy_some_files "$pkgvmacrodir" "$pkgvmacro_files" \
+ func_copy_some_files "$aclocaldir" "$pkgmacro_files" \
"$m4dir" func_serial_update
fi
}
projects / thirdparty / libtool.git / commitdiff
