From: Gary V. Vaughan Date: Sat, 30 Apr 2005 09:30:14 +0000 (+0000) Subject: Revert the parallel installation changes from November last year: X-Git-Tag: release-2-1b~644 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef4442da9be6915b80547151bf171280a62641e5;p=thirdparty%2Flibtool.git Revert the parallel installation changes from November last year: * libtoolize.m4sh (pkgdatadir, aclocaldir): Substituted from configure. (func_copy_all_from_path): Removed. No longer used. (func_copy_some_files): Simplify now that nothing is copied from a list of possible directories now. (func_scan_files): Remove directory readability check... (func_nonemptydir_p): ...in favour of a dedicated sanity check function called from the main body. (_lt_pkgvdatadir): Set pkgdatadir and aclocaldir appropriately if this is in the environment. * configure.ac: Tests for `ln' removed. (APIVERSION): Removed. * Makefile.am (pkgvdatadir, nobase_dist_pkgvdata_DATA) (nobase_pkgvdata_DATA): Renamed to... (pkgdatadir, nobase_dist_pkgdata_DATA, aclocalfiles): ...these respectively. (edit): Adjust for new variable names. (install-data-local): Don't bother to remove old macro files that will be overwritten by the installation, and perform a manual installation of $(aclocalfiles) to preserve timestamps. (install-exec-hook): Removed. No need to make versioned links. (uninstall-hook): No need to remove versioned links, but now we need to manually remove the manually installed $(aclocalfiles). * doc/libtool.texi: Remove bogus notes about setting ACLOCAL_AMFLAGS for versioned libtool installations. * NEWS: Remove parallel installation item. --- diff --git a/ChangeLog b/ChangeLog index 07112397e..2b0936710 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,34 @@ +2005-04-30 Gary V. Vaughan + + Revert the parallel installation changes from November last year: + + * libtoolize.m4sh (pkgdatadir, aclocaldir): Substituted from + configure. + (func_copy_all_from_path): Removed. No longer used. + (func_copy_some_files): Simplify now that nothing is copied from a + list of possible directories now. + (func_scan_files): Remove directory readability check... + (func_nonemptydir_p): ...in favour of a dedicated sanity check + function called from the main body. + (_lt_pkgvdatadir): Set pkgdatadir and aclocaldir appropriately if + this is in the environment. + * configure.ac: Tests for `ln' removed. + (APIVERSION): Removed. + * Makefile.am (pkgvdatadir, nobase_dist_pkgvdata_DATA) + (nobase_pkgvdata_DATA): Renamed to... + (pkgdatadir, nobase_dist_pkgdata_DATA, aclocalfiles): ...these + respectively. + (edit): Adjust for new variable names. + (install-data-local): Don't bother to remove old macro files that + will be overwritten by the installation, and perform a manual + installation of $(aclocalfiles) to preserve timestamps. + (install-exec-hook): Removed. No need to make versioned links. + (uninstall-hook): No need to remove versioned links, but now we + need to manually remove the manually installed $(aclocalfiles). + * doc/libtool.texi: Remove bogus notes about setting + ACLOCAL_AMFLAGS for versioned libtool installations. + * NEWS: Remove parallel installation item. + 2005-04-29 Ralf Wildenhues * m4/ltdl.m4 (all over): Quote all arguments to AC_DEFINE and diff --git a/Makefile.am b/Makefile.am index 213fcfbba..8772afa1c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,8 +45,8 @@ libtoolize: $(srcdir)/libtoolize.in $(timestamp); \ input="libtoolize.m4sh"; \ $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \ - -e 's,@nobase_pkgvdata_DATA\@,$(nobase_pkgvdata_DATA),g' \ - -e "s,@pkgvltdl_files\@,`echo $(ltdldatafiles)`,g" \ + -e 's,@aclocal_DATA\@,$(aclocalfiles),g' \ + -e "s,@pkgltdl_files\@,$(ltdldatafiles),g" \ $(srcdir)/libtoolize.in > libtoolize.tmp chmod a+x libtoolize.tmp chmod a-w libtoolize.tmp @@ -93,8 +93,8 @@ edit = sed \ -e 's,@VERSION\@,$(VERSION),g' \ -e 's,@aclocaldir\@,$(aclocaldir),g' \ -e 's,@datadir\@,$(datadir),g' \ + -e 's,@pkgdatadir\@,$(pkgdatadir),g' \ -e 's,@host_triplet\@,$(host_triplet),g' \ - -e 's,@pkgvdatadir\@,$(pkgvdatadir),g' \ -e 's,@prefix\@,$(prefix),g' \ -e "s,@configure_input\@,Generated from $$input; do not edit by hand,g" @@ -116,12 +116,12 @@ DISTCLEANFILES = # These are required by libtoolize and must be executable when installed. # Since _SCRIPTS gets the program transform applied we make them # executable by hand -nobase_dist_pkgvdata_DATA = config/config.guess config/config.sub \ +nobase_dist_pkgdata_DATA = config/config.guess config/config.sub \ config/ltmain.sh config/install-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. -nobase_pkgvdata_DATA = m4/argz.m4 m4/libtool.m4 m4/ltdl.m4 \ +aclocalfiles = m4/argz.m4 m4/libtool.m4 m4/ltdl.m4 \ m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 ## We know that $(srcdir)/ChangeLog has been edited if stamp-vcl @@ -210,7 +210,7 @@ $(srcdir)/doc/notes.txt: $(srcdir)/doc/notes.texi ## These are installed as a subdirectory of pkgdatadir so that ## libtoolize --ltdl can find them later: -ltdldatadir = $(pkgvdatadir)/libltdl +ltdldatadir = $(pkgdatadir)/libltdl ltdldatafiles = COPYING.LIB README \ Makefile.am Makefile.in \ argz_.h argz.c \ @@ -240,52 +240,41 @@ ltdldatafiles = COPYING.LIB README \ slist.c 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 ## To avoid spurious reconfiguration when the user installs these files ## with libtoolize, we have to preserve their timestamps carefully: $(mkinstalldirs) $(DESTDIR)$(ltdldatadir) ( cd $(srcdir)/libltdl && $(AMTAR) chf - $(ltdldatafiles); ) \ | ( umask 0 && cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; ) + $(mkinstalldirs) $(DESTDIR)$(aclocaldir) + @for p in $(aclocalfiles); do \ + f=`echo "$$p" | sed 's|^.*/||'`; \ + aclocalfiles="$$aclocalfiles $$f"; \ + done; \ + ( cd $(srcdir)/m4 && $(AMTAR) chf - $$aclocalfiles; ) \ + | ( umask 0 && cd $(DESTDIR)$(aclocaldir) && $(AMTAR) xf -; ) install-data-hook: - chmod +x $(DESTDIR)$(pkgvdatadir)/config/config.guess - chmod +x $(DESTDIR)$(pkgvdatadir)/config/config.sub - chmod +x $(DESTDIR)$(pkgvdatadir)/config/install-sh + chmod +x $(DESTDIR)$(pkgdatadir)/config/config.guess + chmod +x $(DESTDIR)$(pkgdatadir)/config/config.sub + chmod +x $(DESTDIR)$(pkgdatadir)/config/install-sh ## ------------- ## ## Distribution. ## ## ------------- ## -## 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 @for f in $(ltdldatafiles); do \ echo " rm -rf '$(DESTDIR)$(ltdldatadir)/$$f'"; \ rm -f "$(DESTDIR)$(ltdldatadir)/$$f"; \ done + @for p in $(aclocalfiles); do \ + f=`echo "$$p" | sed 's|^.*/||'`; \ + echo " rm -rf '$(DESTDIR)$(aclocaldir)/$$f'"; \ + rm -f "$(DESTDIR)$(aclocaldir)/$$f"; \ + done; ## Ship README.alpha only in alpha release, but renamed to README diff --git a/NEWS b/NEWS index 4957862be..2034e0832 100644 --- a/NEWS +++ b/NEWS @@ -13,13 +13,7 @@ New in 2.1b: 2005-??-??; CVS version 2.1a, Libtool team: * Detection of compiler wrappers like distcc/ccache and $host_alias prefix. 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]) +* Bug fixes. New in 1.9f: 2004-10-23; CVS version 1.9e, Libtool team: * Fix a regression in 1.9d, where ECHO was always set to 'echo' and the diff --git a/configure.ac b/configure.ac index 0de091d1b..9d58a772a 100644 --- a/configure.ac +++ b/configure.ac @@ -125,17 +125,8 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/stamp-vcl']) ## Libtool specific configuration. ## ## ------------------------------- ## -# 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], ["\${datadir}/aclocal"]) -AC_SUBST([pkgvdatadir], ["\${datadir}/$PACKAGE-$APIVERSION"]) +AC_SUBST([aclocaldir], ["\${datadir}/aclocal"]) +AC_SUBST([pkgdatadir], ["\${datadir}/$PACKAGE"]) AC_ARG_ENABLE(ltdl-install, [AS_HELP_STRING([--disable-ltdl-install], [do not install libltdl])]) @@ -156,23 +147,6 @@ done 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. ## ## ---------------- ## diff --git a/doc/libtool.texi b/doc/libtool.texi index 2e04c1b84..2e1db3a81 100644 --- a/doc/libtool.texi +++ b/doc/libtool.texi @@ -2113,16 +2113,6 @@ project, a copy of the relevant macro definitions will be placed in 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 Configure notes @subsection Platform-specific configuration notes diff --git a/libtoolize.m4sh b/libtoolize.m4sh index a95f4f279..089bde6be 100644 --- a/libtoolize.m4sh +++ b/libtoolize.m4sh @@ -80,9 +80,10 @@ seen_ltdl=false libtoolize_flags= # Locations for important files: -: ${_lt_pkgvdatadir="@pkgvdatadir@"} prefix=@prefix@ datadir=@datadir@ +pkgdatadir=@pkgdatadir@ +aclocaldir=@aclocaldir@ auxdir= m4dir= ltdldir= @@ -232,7 +233,7 @@ func_copy_cb () $opt_quiet || func_echo "copying file \`$my_destdir/$my_file'" copy_return_status=0 elif { ( cd "$my_srcdir" 2>/dev/null && $TAR chf - "$my_file" 2>/dev/null; ) \ - | ( umask 0 && cd "$my_destdir" 2>/dev/null && "$TAR" xf - > /dev/null 2>&1; ); } ; then + | ( umask 0 && cd "$my_destdir" 2>/dev/null && "$TAR" xf - >/dev/null 2>&1; ); } ; then $opt_quiet || func_echo "copying file \`$my_destdir/$my_file'" copy_return_status=0 elif $CP -p "$my_srcdir/$my_file" "$my_destdir/$my_file"; then @@ -245,36 +246,6 @@ func_copy_cb () } -# func_copy_all_from_path [-r] dirname srcpath destdir [glob_exclude] -# Search each : delimited directory in SRCPATH for a directory named -# DIRNAME. Recursively copy the contents of the first match found -# to DESTDIR. -func_copy_all_from_path () -{ - $opt_debug - if test "X$1" = X-r; then - my_args=-r - shift - fi - - my_dirname="$1" - my_srcpath="$2" - my_destdir="$3" - my_globexc="$4" - - save_IFS="$IFS"; IFS=: - for myvdir in $my_srcpath; do - IFS="$save_IFS" - test "X$my_dirname" = X. || myvdir="$myvdir/$my_dirname" - if test -d "$myvdir"; then - func_copy_all_files $my_args "$myvdir" "$my_destdir" "$my_globexc" - break - fi - done - IFS="$save_IFS" -} - - # func_copy_all_files [-r] srcdir destdir [glob_exclude] [copy_cb=func_copy_cb] # For each file in SRCDIR, then try to copy the file to DESTDIR by calling # COPY_CB with the src and dest files. With the `-r' option, recurse into @@ -310,7 +281,7 @@ func_copy_all_files () for my_filename in `cd "$my_srcdir" && ls`; do - # ignore excluded filenames + # ignore excluded filenames if test -n "$my_glob_exclude"; then eval 'case $my_filename in '$my_glob_exclude') continue ;; esac' fi @@ -333,41 +304,36 @@ func_copy_all_files () } -# func_copy_some_files srcfile_spec srcdirs destdir [copy_cb=func_copy_cb] -# Call COPY_CB for each regular file named by the ':' delimited names in -# SRCFILE_SPEC first found in a directory from SRCDIRS. The odd calling -# convention is needed to allow spaces in file and directory names. +# func_copy_some_files srcfile_spec srcdir destdir [copy_cb=func_copy_cb] +# Call COPY_CB for each regular file in SRCDIR named by the ':' delimited +# names in SRCFILE_SPEC. The odd calling convention is needed to allow +# spaces in file and directory names. func_copy_some_files () { $opt_debug my_srcfile_spec="$1" - my_srcdirs="$2" + my_srcdir="$2" my_destdir="$3" my_copy_cb="${4-func_copy_cb}" my_save_IFS="$IFS" IFS=: for my_filename in $my_srcfile_spec; do - IFS=: - for my_srcdir in $my_srcdirs; do - IFS="$my_save_IFS" - if test -f "$my_srcdir/$my_filename"; then - if test "X$my_copy_cb" = Xfunc_copy_cb; then - $opt_force || if test -f "$my_destdir/$my_filename"; then - $opt_quiet \ - || func_error "\`$my_destdir/$my_filename' exists: use \`--force' to overwrite" - continue - fi - fi - else - # Not a regular file - continue + IFS="$my_save_IFS" + if test -f "$my_srcdir/$my_filename"; then + if test "X$my_copy_cb" = Xfunc_copy_cb; then + $opt_force || if test -f "$my_destdir/$my_filename"; then + $opt_quiet \ + || func_error "\`$my_destdir/$my_filename' exists: use \`--force' to overwrite" + continue + fi fi + else + # Not a regular file + continue + fi - $my_copy_cb "$my_filename" "$my_srcdir" "$my_destdir" - break - done - IFS="$my_save_IFS" + $my_copy_cb "$my_filename" "$my_srcdir" "$my_destdir" done IFS="$my_save_IFS" } @@ -386,10 +352,6 @@ func_scan_files () test -f "$configure_ac" \ || func_fatal_help "\`$configure_ac' does not exist" - # check that existing directories from the list can be ls'ed - test -n "`{ cd $_lt_pkgvdatadir && ls; } 2>/dev/null`" \ - || func_fatal_error "can not list files in \`$_lt_pkgvdatadir'" - # Set local variables to reflect contents of configure.ac my_uses_autoconf=false my_sed_scan_configure_ac='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,; @@ -801,17 +763,17 @@ func_check_macros () } -# func_massage_nobase_pkgvdata_DATA [glob_exclude] -# @nobase_pkgvdata_DATA\@ is substituted as per its value in Makefile.am; +# func_massage_aclocal_DATA [glob_exclude] +# @aclocal_DATA\@ is substituted as per its value in Makefile.am; # this function massages it into a suitable format for func_copy_some_files. -func_massage_nobase_pkgvdata_DATA () +func_massage_aclocal_DATA () { - pkgvmacro_files= # GLOBAL VAR + pkgmacro_files= # GLOBAL VAR my_glob_exclude="$1" - # Massage a value for pkgvmacro_files from the value used in Makefile.am. - for my_filename in @nobase_pkgvdata_DATA@; do + # Massage a value for pkgmacro_files from the value used in Makefile.am. + for my_filename in @aclocal_DATA@; do my_filename=`$ECHO "X$my_filename" | $Xsed -e "$basename"` # ignore excluded filenames @@ -819,25 +781,25 @@ func_massage_nobase_pkgvdata_DATA () eval 'case $my_filename in '$my_glob_exclude') continue ;; esac' fi - pkgvmacro_files="$pkgvmacro_files:$my_filename" + pkgmacro_files="$pkgmacro_files:$my_filename" done # strip spurious leading `:' - pkgvmacro_files=`$ECHO "X$pkgvmacro_files" | $Xsed -e 's,^:*,,'` + pkgmacro_files=`$ECHO "X$pkgmacro_files" | $Xsed -e 's,^:*,,'` } -# func_massage_pkgvltdl_files [glob_exclude] -# @pkgvltdl_files\@ is substituted as per its value in Makefile.am; this +# func_massage_pkgltdl_files [glob_exclude] +# @pkgltdl_files\@ is substituted as per its value in Makefile.am; this # function massages it into a suitable format for func_copy_some_files. -func_massage_pkgvltdl_files () +func_massage_pkgltdl_files () { - pkgvltdl_files= # GLOBAL VAR + pkgltdl_files= # GLOBAL VAR my_glob_exclude="$1" - # Massage a value for pkgvltdl_files from the value used in Makefile.am - for my_filename in @pkgvltdl_files@; do + # Massage a value for pkgltdl_files from the value used in Makefile.am + for my_filename in @pkgltdl_files@; do # ignore excluded filenames if test -n "$my_glob_exclude"; then @@ -845,14 +807,33 @@ func_massage_pkgvltdl_files () fi # ignore duplicates - case :$pkgvltdl_files: in + case :$pkgltdl_files: in *:$my_filename:*) ;; - *) pkgvltdl_files="$pkgvltdl_files:$my_filename" ;; + *) pkgltdl_files="$pkgltdl_files:$my_filename" ;; esac done # strip spurious leading `:' - pkgvltdl_files=`$ECHO "X$pkgvltdl_files" | $Xsed -e 's,^:*,,'` + pkgltdl_files=`$ECHO "X$pkgltdl_files" | $Xsed -e 's,^:*,,'` +} + + +# func_nonemptydir_p dirvar +# DIRVAR is the name of a variable to evaluate. Unless DIRVAR names +# a directory that exists and is non-empty abort with a diagnostic. +func_nonemptydir_p () +{ + $opt_debug + my_dirvar="$1" + my_dir=`eval echo "\\\$$my_dirvar"` + + # Is it a directory at all? + test -d "$my_dir" \ + || func_fatal_error "\$$my_dirvar not a directory: \`$my_dir'" + + # check that the directories contents can be ls'ed + test -n "`{ cd $my_dir && ls; } 2>/dev/null`" \ + || func_fatal_error "can not list files: \`$my_dir'" } @@ -863,20 +844,28 @@ func_massage_pkgvltdl_files () { rerun_aclocal=false - func_massage_pkgvltdl_files + # Allow the user to override the master libtoolize repository: + if test -n "$_lt_pkgdatadir"; then + pkgdatadir="$_lt_pkgdatadir" + aclocaldir="$_lt_pkgdatadir/m4" + fi + func_nonemptydir_p pkgdatadir + func_nonemptydir_p aclocaldir + + func_massage_pkgltdl_files # libtool.m4 and ltdl.m4 are handled specially below - func_massage_nobase_pkgvdata_DATA 'libtool.m4|ltdl.m4' + func_massage_aclocal_DATA 'libtool.m4|ltdl.m4' glob_exclude_pkgaux_files='config.guess|config.sub|install-sh|ltmain.sh' func_scan_files $opt_quiet || func_check_macros - # Copy all the files from installed (or specified, if `-I' was used) - # libltdl to this project, if the user specified `--ltdl'. + # Copy all the files from installed libltdl to this project, if the + # user specified `--ltdl'. if test -n "$ltdldir"; then - func_copy_some_files "$pkgvltdl_files" "$_lt_pkgvdatadir/libltdl" "$ltdldir" + func_copy_some_files "$pkgltdl_files" "$pkgdatadir/libltdl" "$ltdldir" # libtoolize the newly copied libltdl tree ( cd "$ltdldir" && eval "$progpath" $libtoolize_flags ) \ @@ -889,26 +878,26 @@ func_massage_pkgvltdl_files () func_echo "putting files in AC_CONFIG_AUX_DIR, \`$auxdir'." fi if $opt_install; then - func_config_update config.guess "$_lt_pkgvdatadir/config" "$auxdir" - func_config_update config.sub "$_lt_pkgvdatadir/config" "$auxdir" - func_install_update install-sh "$_lt_pkgvdatadir/config" "$auxdir" + func_config_update config.guess "$pkgdatadir/config" "$auxdir" + func_config_update config.sub "$pkgdatadir/config" "$auxdir" + func_install_update install-sh "$pkgdatadir/config" "$auxdir" fi - func_ltmain_update ltmain.sh "$_lt_pkgvdatadir/config" "$auxdir" + func_ltmain_update ltmain.sh "$pkgdatadir/config" "$auxdir" # Copy libtool's m4 macros to the macro directory, if they are newer. if test -n "$m4dir"; then $opt_quiet || func_echo "putting macros in AC_CONFIG_MACRO_DIR, \`$m4dir'." - func_serial_update libtool.m4 "$_lt_pkgvdatadir/m4" "$m4dir" \ + func_serial_update libtool.m4 "$aclocaldir" "$m4dir" \ LT_INIT 'A[[CM]]_PROG_LIBTOOL' if $seen_ltdl; then - func_serial_update ltdl.m4 "$_lt_pkgvdatadir/m4" "$m4dir" 'LTDL_INIT' + func_serial_update ltdl.m4 "$aclocaldir" "$m4dir" 'LTDL_INIT' else func_verbose "Not copying \`$m4dir/ltdl.m4', libltdl not used." fi - func_copy_some_files "$pkgvmacro_files" "$_lt_pkgvdatadir/m4" \ + func_copy_some_files "$pkgmacro_files" "$aclocaldir" \ "$m4dir" func_serial_update else func_verbose "AC_CONFIG_MACRO_DIR not defined, not copying libtool macro files." diff --git a/tests/testsuite.at b/tests/testsuite.at index 7e4e01cfb..886aa86aa 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -29,7 +29,7 @@ m4_divert_pop([PREPARE_TESTS])dnl # LT_AT_LIBTOOLIZE([ARGS]) # ------------------------ m4_define([LT_AT_LIBTOOLIZE], -[_lt_pkgvdatadir="$abs_top_srcdir" "$LIBTOOLIZE" $1 +[_lt_pkgdatadir="$abs_top_srcdir" "$LIBTOOLIZE" $1 ]) @@ -46,7 +46,7 @@ m4_define([LT_AT_CHECK_LIBTOOLIZE], m4_define([LT_AT_BOOTSTRAP], [ test -f ./ltmain.sh || LT_AT_LIBTOOLIZE([--copy]) -test -f ./configure || _lt_pkgvdatadir="$abs_top_srcdir" autoreconf --force --verbose --install || exit 1 +test -f ./configure || _lt_pkgdatadir="$abs_top_srcdir" autoreconf --force --verbose --install || exit 1 test -f ./configure || exit 1 ./configure ])