2004-09-23 09:16:41 +08:00
|
|
|
m4_define([_m4_divert(SCRIPT)], 100)
|
|
|
|
m4_divert_push([SCRIPT])#! /bin/sh
|
2004-08-29 00:15:23 +08:00
|
|
|
# @configure_input@
|
|
|
|
|
2003-11-26 20:34:23 +08:00
|
|
|
# libtoolize (GNU @PACKAGE@@TIMESTAMP@) @VERSION@
|
2004-08-29 00:15:23 +08:00
|
|
|
# Written by Gary V. Vaughan <gary@gnu.org>, 2003
|
2003-10-07 19:12:16 +08:00
|
|
|
|
2005-02-22 23:27:07 +08:00
|
|
|
# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
|
2003-10-07 19:12:16 +08:00
|
|
|
# This is free software; see the source for copying conditions. There is NO
|
|
|
|
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
|
1997-04-02 02:29:23 +08:00
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful, but
|
|
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
# General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
2003-10-07 19:12:16 +08:00
|
|
|
# along with this program; if not, a copy can be downloaded from
|
|
|
|
# http://www.gnu.org/copyleft/gpl.html, or by writing to the Free
|
|
|
|
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
|
|
# MA 02111-1307, USA.
|
1997-04-02 02:29:23 +08:00
|
|
|
#
|
|
|
|
# As a special exception to the GNU General Public License, if you
|
|
|
|
# distribute this file as part of a program that contains a
|
|
|
|
# configuration script generated by Autoconf, you may include it under
|
|
|
|
# the same distribution terms that you use for the rest of that program.
|
|
|
|
|
2003-10-07 19:12:16 +08:00
|
|
|
# Usage: $progname [OPTION]...
|
|
|
|
#
|
|
|
|
# Prepare a package to use libtool.
|
|
|
|
#
|
|
|
|
# -c, --copy copy files rather than symlinking them
|
|
|
|
# --debug enable verbose shell tracing
|
|
|
|
# -n, --dry-run print commands rather than running them
|
|
|
|
# -f, --force replace existing files
|
|
|
|
# -i, --install copy missing auxiliary files
|
2004-06-21 18:17:27 +08:00
|
|
|
# --ltdl[=DIR] install libltdl in a subdirectory [default: libltdl]
|
2004-11-29 21:50:54 +08:00
|
|
|
# -I DIR search DIR for libtoolize master source files
|
2003-10-07 19:12:16 +08:00
|
|
|
# -q, --quiet work silently
|
|
|
|
# -v, --verbose verbosely report processing
|
|
|
|
# --version print version information and exit
|
2004-08-29 00:15:23 +08:00
|
|
|
# -h, --help print short or long help message
|
2003-10-07 19:12:16 +08:00
|
|
|
#
|
|
|
|
# You must `cd' to the top directory of your package before you run
|
|
|
|
# `$progname'.
|
|
|
|
#
|
2004-08-29 00:15:23 +08:00
|
|
|
# When reporting a bug, please describe a test case to reproduce it and
|
|
|
|
# include the following information:
|
|
|
|
#
|
|
|
|
# host-triplet: @host_triplet@
|
|
|
|
# $progname: (GNU @PACKAGE@@TIMESTAMP@) @VERSION@
|
|
|
|
# automake: $automake_version
|
|
|
|
# autoconf: $autoconf_version
|
|
|
|
#
|
2003-10-07 19:12:16 +08:00
|
|
|
# Report bugs to <bug-libtool@gnu.org>.
|
|
|
|
|
1997-04-02 02:29:23 +08:00
|
|
|
PROGRAM=libtoolize
|
|
|
|
|
2004-09-23 09:16:41 +08:00
|
|
|
AS_SHELL_SANITIZE
|
|
|
|
$as_unset CDPATH
|
2004-06-22 00:40:01 +08:00
|
|
|
|
2004-09-23 09:16:41 +08:00
|
|
|
m4_include([getopt.m4sh])
|
2004-02-12 21:18:52 +08:00
|
|
|
|
2005-02-22 23:27:07 +08:00
|
|
|
TAR=tar
|
|
|
|
|
2004-09-23 09:16:41 +08:00
|
|
|
# Command line options:
|
2004-02-12 21:18:52 +08:00
|
|
|
opt_force=false
|
|
|
|
opt_install=false
|
|
|
|
opt_link=:
|
2004-12-28 21:31:12 +08:00
|
|
|
opt_debug=:
|
2003-10-07 19:12:16 +08:00
|
|
|
|
|
|
|
seen_libtool=false
|
|
|
|
seen_ltdl=false
|
|
|
|
|
2004-06-22 00:40:01 +08:00
|
|
|
# Collect flags to pass into libltdl libtoolize
|
|
|
|
libtoolize_flags=
|
|
|
|
|
2003-10-07 19:12:16 +08:00
|
|
|
# Locations for important files:
|
1997-04-02 02:29:23 +08:00
|
|
|
prefix=@prefix@
|
|
|
|
datadir=@datadir@
|
2004-11-29 21:50:54 +08:00
|
|
|
pkgvdatadirs=@pkgvdatadir@
|
|
|
|
pkgvmacrodirs=@pkgvmacrodir@
|
2003-10-07 19:12:16 +08:00
|
|
|
auxdir=
|
|
|
|
m4dir=
|
2004-06-21 18:17:27 +08:00
|
|
|
ltdldir=
|
2003-10-07 19:12:16 +08:00
|
|
|
configure_ac=configure.in
|
1997-04-02 02:29:23 +08:00
|
|
|
|
2003-10-07 19:12:16 +08:00
|
|
|
|
|
|
|
# Parse options once, thoroughly. This comes as soon as possible in
|
|
|
|
# the script to make things like `libtoolize --version' happen quickly.
|
|
|
|
{
|
|
|
|
# sed scripts:
|
|
|
|
my_sed_single_opt='1s/^\(..\).*$/\1/;q'
|
|
|
|
my_sed_single_rest='1s/^..\(.*\)$/\1/;q'
|
2004-09-23 09:16:41 +08:00
|
|
|
my_sed_long_opt='1s/^\(--[[^=]]*\)=.*/\1/;q'
|
|
|
|
my_sed_long_arg='1s/^--[[^=]]*=//'
|
2003-10-07 19:12:16 +08:00
|
|
|
|
Refactor all the test case common code into shell functions in
tests/defs, and move the various demo directories out of
$top_srcdir, and into tests too. The refactoring showed up a
number of inconsistencies and latent bugs, as well as fixing (I
think!!) the long-standing annoyance with some of the tests giving
spurious failures intermittently. While I was here, emacs kindly
removed a lot of bogus whitespace and added copyright notices for
us:
* cdemo, demo, depdemo, f77demo, mdemo, mdemo2, pdemo, tagdemo:
Moved from here...
* tests/cdemo, tests/demo, tests/depdemo, tests/f77demo,
tests/mdemo, tests/mdemo2, tests/pdemo, tests/tagdemo: ...to
here.
* tests/defs: Factor much common functionality from the test
scripts into shell functions. Added a copyright notice.
* tests/assign.test, tests/cdemo-conf.test, tests/cdemo-exec.test,
tests/cdemo-make.test, tests/cdemo-shared.test,
tests/cdemo-static.test, tests/demo-conf.test,
tests/demo-deplibs.test, tests/demo-exec.test,
tests/demo-inst.test, tests/demo-make.test,
tests/demo-nofast.test, tests/demo-nopic.test,
tests/demo-pic.test, tests/demo-shared.test,
tests/demo-static.test, tests/demo-unst.test,
tests/depdemo-conf.test, tests/depdemo-exec.test,
tests/depdemo-inst.test, tests/depdemo-make.test,
tests/depdemo-nofast.test, tests/depdemo-shared.test,
tests/depdemo-static.test, tests/depdemo-unst.test,
tests/f77demo-conf.test, tests/f77demo-exec.test,
tests/f77demo-make.test, tests/f77demo-shared.test,
tests/f77demo-static.test, tests/link-2.test, tests/link.test,
tests/mdemo-conf.test, tests/mdemo-exec.test,
tests/mdemo-inst.test, tests/mdemo-make.test,
tests/mdemo-shared.test, tests/mdemo-static.test,
tests/mdemo-unst.test, tests/mdemo2-conf.test,
tests/mdemo2-exec.test, tests/mdemo2-make.test, tests/nomode.test,
tests/pdemo-conf.test, tests/pdemo-exec.test,
tests/pdemo-inst.test, tests/pdemo-make.test,
tests/pdemo-unst.test, tests/quote.test, tests/sh.test,
tests/suffix.test, tests/tagdemo-conf.test,
tests/tagdemo-exec.test, tests/tagdemo-make.test,
tests/tagdemo-shared.test, tests/tagdemo-static.test: Refactored
to use new functions in tests/defs. Added a copyright notice.
* tests/hardcode.test, noinst-link.test,
tests/relink.test, tests/relink.test,
tests/mdryrun.test: Ditto. Moved from here...
* tests/demo-hardcode.test, demo-noinst-link.test,
tests/demo-relink.test, tests/depdemo-relink.test,
tests/mdemo-dryrun.test: ...to here respectively.
* Makefile.am: Added a copyright notice.
* tests/sh.test: Check libtoolize.in for non-portabilities too.
* libtoolize.in: Fix non-portabilities found by tests/sh.test.
2003-10-15 05:45:03 +08:00
|
|
|
while test "$#" -gt 0; do
|
2004-02-12 21:18:52 +08:00
|
|
|
opt="$1"
|
|
|
|
shift
|
|
|
|
case $opt in
|
2004-06-22 00:40:01 +08:00
|
|
|
--copy|-c) opt_link=false
|
|
|
|
libtoolize_flags="$libtoolize_flags --copy"
|
|
|
|
;;
|
2003-10-07 19:12:16 +08:00
|
|
|
|
2004-02-12 21:18:52 +08:00
|
|
|
--debug) func_echo "enabling shell trace mode"
|
2004-12-28 21:31:12 +08:00
|
|
|
opt_debug='set -x'
|
|
|
|
$opt_debug
|
2003-10-07 19:12:16 +08:00
|
|
|
;;
|
|
|
|
|
2004-02-12 21:18:52 +08:00
|
|
|
--dry-run|-n) if $opt_dry_run; then :; else
|
|
|
|
opt_dry_run=:
|
2004-09-16 22:57:02 +08:00
|
|
|
RM="$ECHO $RM"
|
|
|
|
test -n "$LN_S" && LN_S="$ECHO $LN_S"
|
|
|
|
CP="$ECHO $CP"
|
|
|
|
MKDIR="$ECHO $MKDIR"
|
2005-02-22 23:27:07 +08:00
|
|
|
TAR="$ECHO $TAR"
|
2003-10-07 19:12:16 +08:00
|
|
|
fi
|
2004-06-22 00:40:01 +08:00
|
|
|
libtoolize_flags="${libtoolize_flags} --dry-run"
|
2003-10-07 19:12:16 +08:00
|
|
|
;;
|
|
|
|
|
2004-06-22 00:40:01 +08:00
|
|
|
--force|-f) opt_force=:
|
|
|
|
libtoolize_flags="${libtoolize_flags} --force"
|
|
|
|
;;
|
|
|
|
|
|
|
|
--install|-i) opt_install=:
|
|
|
|
libtoolize_flags="${libtoolize_flags} --install"
|
|
|
|
;;
|
2004-06-21 18:17:27 +08:00
|
|
|
|
|
|
|
--ltdl) ltdldir=libltdl
|
2004-06-21 21:44:14 +08:00
|
|
|
if test "$#" -gt 0; then
|
2004-06-21 18:17:27 +08:00
|
|
|
case $1 in
|
|
|
|
-*) ;;
|
|
|
|
*) ltdldir="$1"; shift ;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
|
2004-11-29 21:50:54 +08:00
|
|
|
-I) test "$#" = 0 && func_missing_arg $opt && break
|
|
|
|
test -d "$1" \
|
|
|
|
&& pkgvdatadirs="`cd $1 && pwd`:$pkgvdatadirs"
|
|
|
|
test -d "$1/m4" \
|
|
|
|
&& pkgvmacrodirs="`cd $1/m4 && pwd`:$pkgvmacrodirs"
|
|
|
|
func_quote_for_eval "$1"
|
|
|
|
libtoolize_flags="$libtoolize_flags -I $func_quote_for_eval_result"
|
|
|
|
shift
|
|
|
|
;;
|
|
|
|
|
2004-02-12 21:18:52 +08:00
|
|
|
--quiet|--automake|-q) # --automake is for 1.5 compatibility
|
2004-06-22 00:40:01 +08:00
|
|
|
opt_quiet=:
|
|
|
|
libtoolize_flags="${libtoolize_flags} --quiet"
|
|
|
|
;;
|
|
|
|
|
|
|
|
--verbose|-v) opt_verbose=:
|
|
|
|
libtoolize_flags="${libtoolize_flags} --verbose"
|
|
|
|
;;
|
2004-06-21 18:17:27 +08:00
|
|
|
|
|
|
|
# Separate optargs to long options:
|
2004-11-29 21:50:54 +08:00
|
|
|
--*=*)
|
2004-09-25 00:08:33 +08:00
|
|
|
arg=`$ECHO "X$opt" | $Xsed -e "$my_sed_long_arg"`
|
|
|
|
opt=`$ECHO "X$opt" | $Xsed -e "$my_sed_long_opt"`
|
2004-12-28 21:50:23 +08:00
|
|
|
set dummy "$opt" "$arg" ${1+"$@"}
|
|
|
|
shift
|
2004-06-21 18:17:27 +08:00
|
|
|
;;
|
2003-10-07 19:12:16 +08:00
|
|
|
|
2004-06-21 18:17:27 +08:00
|
|
|
# Separate non-argument short options:
|
2003-10-07 19:12:16 +08:00
|
|
|
-c*|-i*|-f*|-n*|-q*|-v*)
|
2004-09-25 00:08:33 +08:00
|
|
|
rest=`$ECHO "X$opt" | $Xsed -e "$my_sed_single_rest"`
|
|
|
|
opt=`$ECHO "X$opt" | $Xsed -e "$my_sed_single_opt"`
|
2004-12-28 21:50:23 +08:00
|
|
|
set dummy "$opt" "-$rest" ${1+"$@"}
|
|
|
|
shift
|
2003-10-07 19:12:16 +08:00
|
|
|
;;
|
|
|
|
|
2004-02-12 21:18:52 +08:00
|
|
|
-\?|-h) func_usage ;;
|
|
|
|
--help) func_help ;;
|
|
|
|
--version) func_version ;;
|
|
|
|
--) break ;;
|
|
|
|
-*) func_fatal_help "unrecognized option \`$opt'" ;;
|
2003-10-07 19:12:16 +08:00
|
|
|
*) func_fatal_help "too many arguments" ;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
}
|
|
|
|
|
2004-09-03 08:26:37 +08:00
|
|
|
|
2003-10-07 19:12:16 +08:00
|
|
|
# func_copy srcfile destfile
|
2005-02-22 23:27:07 +08:00
|
|
|
# A wrapper for func_copy_cb that accepts arguments in the same order
|
|
|
|
# as the cp(1) shell command.
|
2003-10-07 19:12:16 +08:00
|
|
|
func_copy ()
|
|
|
|
{
|
2004-12-28 21:31:12 +08:00
|
|
|
$opt_debug
|
2005-02-22 23:27:07 +08:00
|
|
|
|
|
|
|
test -f "$1" || \
|
|
|
|
{ func_error "\`$1' not copied: not a regular file"; return 1; }
|
|
|
|
|
|
|
|
my_f1=`$ECHO "X$1" | $Xsed -e "$basename"`
|
|
|
|
|
|
|
|
if test -d "$2"; then
|
|
|
|
|
|
|
|
func_copy_cb "$my_f1" `$ECHO "X$1" | $Xsed -e "$dirname"` "$2"
|
|
|
|
|
2003-10-07 19:12:16 +08:00
|
|
|
else
|
2005-02-22 23:27:07 +08:00
|
|
|
|
|
|
|
# Supporting this would mean changing the timestamp:
|
|
|
|
test "X$my_f1" = X`$ECHO "X$2" | $Xsed -e "$basename"` \
|
|
|
|
|| func_fatal_error "func_copy() cannot change filename on copy"
|
|
|
|
|
|
|
|
func_copy_cb "$my_f1" \
|
|
|
|
`$ECHO "X$1" | $Xsed -e "$dirname"` \
|
|
|
|
`$ECHO "X$2" | $Xsed -e "$dirname"`
|
|
|
|
|
1997-04-02 03:19:30 +08:00
|
|
|
fi
|
|
|
|
|
2005-02-22 23:27:07 +08:00
|
|
|
return $copy_return_status # set in func_copy_cb
|
2003-10-07 19:12:16 +08:00
|
|
|
}
|
1997-04-02 02:29:23 +08:00
|
|
|
|
2004-11-29 21:50:54 +08:00
|
|
|
|
|
|
|
# func_copy_cb filename srcdir destdir
|
2005-02-22 23:27:07 +08:00
|
|
|
# If option `--copy' was specified, or soft-linking SRCFILE to DESTFILE fails,
|
|
|
|
# then try to copy SRCFILE to DESTFILE (without changing the timestamp if
|
|
|
|
# possible).
|
2004-11-29 21:50:54 +08:00
|
|
|
func_copy_cb ()
|
|
|
|
{
|
2004-12-28 21:31:12 +08:00
|
|
|
$opt_debug
|
2005-02-22 23:27:07 +08:00
|
|
|
my_file="$1"
|
|
|
|
my_srcdir="$2"
|
|
|
|
my_destdir="$3"
|
|
|
|
copy_return_status=1
|
|
|
|
|
|
|
|
# Libtool is probably misinstalled if this happens:
|
|
|
|
test -f "$my_srcdir/$my_file" || \
|
|
|
|
{ func_error "\`$my_file' not found in \`$my_srcdir'"; return; }
|
|
|
|
|
|
|
|
func_mkdir_p "$my_destdir"
|
|
|
|
|
|
|
|
$RM "$my_destdir/$my_file"
|
|
|
|
if $opt_link && $LN_S "$my_srcdir/$my_file" "$my_destdir/$my_file"; then
|
|
|
|
$opt_quiet || func_echo "copying file \`$my_destdir/$my_file'"
|
|
|
|
copy_return_status=0
|
2005-02-23 01:19:49 +08:00
|
|
|
elif { ( cd "$my_srcdir" && $TAR cf - "$my_file" 2>/dev/null; ) \
|
2005-02-22 23:27:07 +08:00
|
|
|
| ( cd "$my_destdir" && "$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
|
|
|
|
$opt_quiet || func_echo "copying file \`$my_destdir/$my_file'"
|
|
|
|
copy_return_status=0
|
|
|
|
else
|
|
|
|
func_error "can not copy \`$my_srcdir/$my_file' to \`$my_destdir/'"
|
|
|
|
exit_status=$EXIT_FAILURE
|
|
|
|
fi
|
2004-11-29 21:50:54 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
# 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 ()
|
|
|
|
{
|
2004-12-28 21:31:12 +08:00
|
|
|
$opt_debug
|
2004-11-29 21:50:54 +08:00
|
|
|
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
|
2004-12-17 21:03:11 +08:00
|
|
|
func_copy_all_files $my_args "$myvdir" "$my_destdir" "$my_globexc"
|
2004-11-29 21:50:54 +08:00
|
|
|
break
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
IFS="$save_IFS"
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
# func_copy_all_files [-r] srcdir destdir [glob_exclude] [copy_cb=func_copy_cb]
|
2004-01-08 18:34:52 +08:00
|
|
|
# For each file in SRCDIR, then try to copy the file to DESTDIR by calling
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
# COPY_CB with the src and dest files. With the `-r' option, recurse into
|
|
|
|
# subdirectories of srcdir too. If GLOB_EXCLUDE is given, exclude any
|
|
|
|
# matching filenames from the copy. If COPY_CB is passed, then the check
|
|
|
|
# for overwriting without opt_force is the callbacks responsibility: This
|
|
|
|
# allows using callbacks like func_serial_update, which perform their own
|
|
|
|
# checks to decide whether to overwrite the dest file.
|
2003-10-07 19:12:16 +08:00
|
|
|
func_copy_all_files ()
|
|
|
|
{
|
2004-12-28 21:31:12 +08:00
|
|
|
$opt_debug
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
my_opt_recurse=false
|
|
|
|
if test "X$1" = X-r; then
|
|
|
|
my_opt_recurse=:
|
|
|
|
shift
|
|
|
|
fi
|
|
|
|
|
2003-10-07 19:12:16 +08:00
|
|
|
my_srcdir="$1"
|
|
|
|
my_destdir="$2"
|
|
|
|
my_glob_exclude="$3"
|
2004-11-29 21:50:54 +08:00
|
|
|
my_copy_cb="${4-func_copy_cb}"
|
1999-01-14 23:07:12 +08:00
|
|
|
|
2004-06-16 23:08:28 +08:00
|
|
|
my_srcfiles=
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
my_basedir="$my_srcdir"
|
|
|
|
my_srcdirs="$my_srcdir"
|
|
|
|
my_save_IFS="$IFS"
|
|
|
|
IFS=:
|
|
|
|
while test -n "$my_srcdirs"; do
|
1999-01-14 23:07:12 +08:00
|
|
|
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
IFS="$my_save_IFS"
|
2004-09-25 00:08:33 +08:00
|
|
|
my_srcdir=`$ECHO "X$my_srcdirs" | $Xsed -e 's,:.*,,g'`
|
|
|
|
my_srcdirs=`$ECHO "X$my_srcdirs" | $Xsed -e 's,:*[[^:]][[^:]]*:*,,'`
|
1997-04-02 02:29:23 +08:00
|
|
|
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
for my_filename in `cd "$my_srcdir" && ls`; do
|
2004-06-16 23:08:28 +08:00
|
|
|
|
2004-11-29 21:50:54 +08:00
|
|
|
# ignore excluded filenames
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
if test -n "$my_glob_exclude"; then
|
|
|
|
eval 'case $my_filename in '$my_glob_exclude') continue ;; esac'
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Add to the appropriate list
|
|
|
|
if test -f "$my_srcdir/$my_filename"; then
|
2004-09-25 00:08:33 +08:00
|
|
|
my_srcfile=`$ECHO "X$my_srcdir/$my_filename" | $Xsed \
|
|
|
|
-e "s,^$my_basedir/*,,"`
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
my_srcfiles="$my_srcfiles${my_srcfiles:+:}$my_srcfile"
|
|
|
|
elif $my_opt_recurse && test -d "$my_srcdir/$my_filename"; then
|
|
|
|
my_srcdirs="$my_srcdirs${my_srcdirs:+:}$my_srcdir/$my_filename"
|
|
|
|
fi
|
|
|
|
|
|
|
|
done
|
2004-06-16 23:08:28 +08:00
|
|
|
done
|
This pervasive changeset makes two intertwined deep changes to the
operation of libtool (neither would work alone). First, there is
a new feature that allows libraries to preopen modules. This
entails a backwards incompatible change to the libltdl API for
separating out the preloaded symbol lists by owner. Second, in
the tradition of "eating our own dogfood", libltdl now preloads
its own dlloaders. The internal API for dlloaders has also had to
change in a backwards incompatible way in support of the new
library preloading feature. If you don't use preloaded libraries,
you needn't change your project sources, though you will need to
recompile against the new libltdl. The API changes are mostly
confined to dlloaders, so you probably needn't worry about those
(unless you have written a custom loader that you want libltdl to
use):
* configure.ac (AC_CONFIG_FILES): Add libltdl/loaders/Makefile.
* libltdl/configure.ac (AC_CONFIG_FILES): Add loaders/Makefile.
* libltdl/loaders: New directory for module loaders, to simplify
Makefile rules, and to give the loaders themselves names that are
unique in the first few characters.
* libtoolize.in (func_copy_all_files): Copy recursively to pick up
the loaders directory contents.
* libltdl/loaders/Makefile.am: New file. Move module building
rules to here...
* libltdl/Makefile.am: ...from here.
(VERSION_INFO): Bumped version info to signify interface changes.
(libltdl_la_CPPFLAGS, libltdlc_la_CPPFLAGS): Set LTDLOPEN
appropriately for each library.
* libltdl/loader-dld_link.c, libltdl/loader-dlopen.c,
libltdl/loader-dyld.c, libltdl/loader-load_add_on.c,
libltdl/loader-loadlibrary.c libltdl/loader-preopen.c,
libltdl/loader-shl_load.c: Moved from here...
* libltdl/loaders/dld_link.c, libltdl/loaders/dlopen.c,
libltdl/loaders/dyld.c, libltdl/loaders/load_add_on.c,
libltdl/loaders/loadlibrary.c libltdl/loaders/preopen.c,
libltdl/loaders/shl_load.c: ...to here.
(get_vtable): New entry function for each.
* libltdl/loaders/preopen.c (lt_dlsymlists_t): Replaced by...
(symlist_chain): ...a new structure which maps lists of preloaded
symbols from the object that loads them.
(lt_dlpreload_open): New function to automatically open all
preloaded modules belonging to a named object (ORIGINATOR).
* libltdl/lt__alloc.c (lt__zalloc): New function to return a block
of zeroed out new memory.
* libltdl/lt__alloc.h (lt__zalloc): Prototype it.
* libltdl/lt__private.h (lt__alloc_die_callback): Add missing
prototype.
(lt__error_strings): Make this opaque to callers.
* libltdl/lt_error.c (lt__error_strings): Move the implementation
to here.
* libltdl/lt_dlloader.h (lt_user_dlloader): Add extra fields to
make originator focused preloading possible. *BREAKS BACKWARDS
COMPATIBILITY*
(lt_dlloader_add): Take advantage of new fields to simplify
paramater list.
* libltdl/lt_system.h (LT_STR): New ANSI stringification macro.
(LT_CONC): Fix it to work from within macros.
* libltdl/ltdl.c (loader_init, loader_init_callback): Simplify
dlloader loading.
(get_vtable, preloaded_symbols): Point these at the preopen.c
symbols to bootstrap the loader chain.
(lt_dlinit): Load the preopen dlloader manually, and then use it
to load any other preloaded dlloaders.
(lt_dlloader_add): Simplify parameter list. Populate new
fields. Chain new loaders according to priority field.
* libltdl/ltdl.h (lt_dlsymlist): Add a new originator field.
(lt_dlpreload_callback_func): Type of a callback for automatic
lt_dlpreload_open loading.
(LTDL_SET_PRELOADED_SYMBOLS): Adjust to hook into preloaded
symbols from the "@PROGRAM@" originator.
* tests/demo/dlmain.c (main): Use mangled preloaded_symbols symbol.
* tests/pdemo/longer_file_name_dlmain.c (main): Ditto.
* ltmain.in: Don't spew spurious warnings when dlopening and
dlpreopening modules.
(func_generate_dlsyms): Factored out from multiple copies in the
rest of the code. Generate originator keyed symbol lists.
(func_extract_archives): Also factored. Extract the contents of
convenience archives for linking with dependent libraries when
--whole-archive is not available.
[darwin]: Don't try to link $old_library unless it exists, and
$lib is a bundle.
* m4/ltdl.m4 (AC_LTDL_DLLIB): Check for all possible dynamic
loading libraries/apis rather that stopping when an acceptable one
is discovered.
(LT_DLLOADERS): New variable for holding dlloaders that can be
preloaded.
* doc/libtool.texi: Document interface changes.
* NEWS: Updated.
2004-07-15 20:14:48 +08:00
|
|
|
IFS="$my_save_IFS"
|
2004-06-16 23:08:28 +08:00
|
|
|
|
2004-11-29 21:50:54 +08:00
|
|
|
func_copy_some_files "$my_srcfiles" "$my_basedir" \
|
2004-06-16 23:08:28 +08:00
|
|
|
"$my_destdir" "$my_copy_cb"
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-11-29 21:50:54 +08:00
|
|
|
# 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.
|
2004-06-16 23:08:28 +08:00
|
|
|
func_copy_some_files ()
|
|
|
|
{
|
2004-12-28 21:31:12 +08:00
|
|
|
$opt_debug
|
2004-11-29 21:50:54 +08:00
|
|
|
my_srcfile_spec="$1"
|
|
|
|
my_srcdirs="$2"
|
2004-06-16 23:08:28 +08:00
|
|
|
my_destdir="$3"
|
2004-11-29 21:50:54 +08:00
|
|
|
my_copy_cb="${4-func_copy_cb}"
|
2004-06-16 23:08:28 +08:00
|
|
|
|
|
|
|
my_save_IFS="$IFS"
|
|
|
|
IFS=:
|
|
|
|
for my_filename in $my_srcfile_spec; do
|
2004-11-29 21:50:54 +08:00
|
|
|
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
|
2003-10-07 19:12:16 +08:00
|
|
|
fi
|
|
|
|
|
2004-11-29 21:50:54 +08:00
|
|
|
$my_copy_cb "$my_filename" "$my_srcdir" "$my_destdir"
|
|
|
|
done
|
|
|
|
IFS="$my_save_IFS"
|
2003-10-07 19:12:16 +08:00
|
|
|
done
|
2004-06-16 23:08:28 +08:00
|
|
|
IFS="$my_save_IFS"
|
2003-10-07 19:12:16 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
# func_scan_files
|
2004-01-07 04:25:53 +08:00
|
|
|
# Scan configure.(ac|in) and aclocal.m4 (if present) for use of libltdl
|
|
|
|
# and libtool. Possibly running some of these tools if necessary.
|
|
|
|
# Libtoolize affects the contents of aclocal.m4, and should be run before
|
|
|
|
# aclocal, so we can't use configure --trace which relies on a consistent
|
|
|
|
# configure.(ac|in) and aclocal.m4.
|
2003-10-07 19:12:16 +08:00
|
|
|
func_scan_files ()
|
|
|
|
{
|
2004-12-28 21:31:12 +08:00
|
|
|
$opt_debug
|
2003-10-07 19:12:16 +08:00
|
|
|
# Prefer configure.ac to configure.in
|
|
|
|
test -f configure.ac && configure_ac=configure.ac
|
|
|
|
test -f "$configure_ac" \
|
|
|
|
|| func_fatal_help "\`$configure_ac' does not exist"
|
|
|
|
|
2004-11-29 21:50:54 +08:00
|
|
|
# TODO: check that existing directories from the list can be ls'ed
|
|
|
|
#test -n "`{ cd $pkgvdatadir && ls; } 2>dev/null`" \
|
|
|
|
# || func_fatal_error "can not list files in \`$pkgvdatadir'"
|
2003-10-07 19:12:16 +08:00
|
|
|
|
|
|
|
# Set local variables to reflect contents of configure.ac
|
|
|
|
my_uses_autoconf=false
|
|
|
|
my_sed_scan_configure_ac='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,;
|
|
|
|
/AC_INIT/ { s,^.*$,my_uses_autoconf=:,; p; };
|
|
|
|
d'
|
2004-02-12 21:18:52 +08:00
|
|
|
eval `$SED "$my_sed_scan_configure_ac" "$configure_ac"`
|
2003-10-07 19:12:16 +08:00
|
|
|
|
|
|
|
$my_uses_autoconf || {
|
|
|
|
func_verbose "$configure_ac: not using Autoconf"
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
# ---------------------------------------------------- #
|
|
|
|
# Probe macro usage in configure.ac and/or aclocal.m4. #
|
|
|
|
# ---------------------------------------------------- #
|
|
|
|
|
|
|
|
my_sed_traces='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,;
|
2004-09-23 09:16:41 +08:00
|
|
|
/AC_CONFIG_AUX_DIR[[^_]]/ {
|
|
|
|
s,^.*AC_CONFIG_AUX_DIR([[[ ]*\([^])]]*\).*$,auxdir=\1,; p;
|
2003-10-07 19:12:16 +08:00
|
|
|
};
|
2003-10-08 22:09:02 +08:00
|
|
|
/AC_CONFIG_MACRO_DIR/ {
|
2004-09-23 09:16:41 +08:00
|
|
|
s,^.*AC_CONFIG_MACRO_DIR([[[ ]*\([^])]]*\).*$,m4dir=\1,; p;
|
2003-10-07 19:12:16 +08:00
|
|
|
};
|
2004-09-23 09:16:41 +08:00
|
|
|
/A[[CM]]_PROG_LIBTOOL/ { s,^.*$,seen_libtool=:,; p; };
|
2004-03-30 17:38:29 +08:00
|
|
|
/LT_INIT/ { s,^.*$,seen_libtool=:,; p; };
|
The Grand Renaming. In preparation for libtool-2.0, move all of
the many and varied m4 symbols accumulated by libtool over the
years, considering also that modern autoconf can detect unexpanded
macros even without AC in the macro name:
* bootstrap: Remove libltdl/config.h from previous releases.
* m4/libtool.m4, m4/ltdl.m4, doc/libtool.texi: Basically, run a
giant sed transformation like this:
s,AC_LIB_LTDL,LTDL_INIT,g
s,AC_LIBLTDL_CONVENIENCE,LTDL_CONVENIENCE,g
s,AC_LIBLTDL_INSTALLABLE,LTDL_INSTALLABLE,g
s,AC_WITH_LTDL,LT_WITH_LTDL,g
s,AC_LTDL_ENABLE_INSTALL,_LT_ENABLE_INSTALL,g
s,AC_DEPLIBS_CHECK_METHOD,_LT_CHECK_MAGIC_METHOD,g
s,AC_LIBTOOL_OBJDIR,_LT_CHECK_OBJDIR,g
s,AC_LTDL_OBJDIR,_LT_CHECK_OBJDIR,g
s,AC_LTDL_DLPREOPEN,_LT_CHECK_DLPREOPEN,g
s,AC_LIBTOOL_SYS_MAX_CMD_LEN,LT_CMD_MAX_LEN,g
s,AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE,_LT_CMD_GLOBAL_SYMBOLS,g
s,AC_LIBTOOL_SYS_OLD_ARCHIVE,_LT_CMD_OLD_ARCHIVE,g
s,AC_PROG_LD_RELOAD_FLAG,_LT_CMD_RELOAD,g
s,AC_LIBTOOL_SYS_LIB_STRIP,_LT_CMD_STRIPLIB,g
s,AC_CHECK_LIBM,LT_LIB_M,g
s,AC_LTDL_DLLIB,LT_LIB_DLLOAD,g
s,AC_LIBTOOL_COMPILER_OPTION,_LT_COMPILER_OPTION,g
s,AC_LIBTOOL_PROG_CC_C_O,_LT_COMPILER_C_O,g
s,AC_LIBTOOL_PROG_COMPILER_NO_RTTI,_LT_COMPILER_NO_RTTI,g
s,AC_LIBTOOL_PROG_COMPILER_PIC,_LT_COMPILER_PIC,g
s,AC_LIBTOOL_SYS_HARD_LINK_LOCKS,_LT_COMPILER_FILE_LOCKS,g
s,AC_LTDL_DLSYM_USCORE,LT_FUNC_DLSYM_USCORE,g
s,AC_LIBTOOL_LINKER_OPTION,_LT_LINKER_OPTION,g
s,AC_LIBTOOL_PROG_LD_SHLIBS,_LT_LINKER_SHLIBS,g
s,AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH,_LT_LINKER_HARDCODE_LIBPATH,g
s,AC_PATH_MAGIC,_LT_PATH_MAGIC,g
s,AC_PATH_TOOL_PREFIX,_LT_PATH_TOOL_PREFIX,g
s,AC_PROG_LD,LT_PATH_LD,g
s,AC_PROG_LD_GNU,_LT_PATH_LD_GNU,g
s,AC_PROG_NM,LT_PATH_NM,g
s,AC_LTDL_SYS_DLOPEN_DEPLIBS,LT_SYS_DLOPEN_DEPLIBS,g
s,AC_LIBTOOL_DLOPEN_SELF,LT_SYS_DLOPEN_SELF,g
s,AC_LIBTOOL_POSTDEP_PREDEP,_LT_SYS_HIDDEN_LIBDEPS,g
s,AC_LTDL_SYSSEARCHPATH,LT_SYS_DLSEARCH_PATH,g
s,AC_LTDL_SHLIBEXT,LT_SYS_MODULE_EXT,g
s,AC_LTDL_SHLIBPATH,LT_SYS_MODULE_PATH,g
s,AC_LTDL_SYMBOL_USCORE,LT_SYS_SYMBOL_USCORE,g
s,AC_LIBTOOL_SYS_DYNAMIC_LINKER,_LT_SYS_DYNAMIC_LINKER,g
s,_LT_AC_TAGVAR,_LT_TAGVAR,g
s,_LT_AC_SYS_COMPILER,_LT_TAG_COMPILER,g
s,_LT_AC_PROG_ECHO_BACKSLASH,_LT_PROG_ECHO_BACKSLASH,g
s,_LT_AC_SYS_LIBPATH_AIX,_LT_SYS_MODULE_PATH_AIX,g
s,_LT_AC_SHELL_INIT,_LT_SHELL_INIT,g
s,_LT_AC_LOCK,_LT_ENABLE_LOCK,g
s,_LT_AC_CHECK_DLFCN,_LT_HEADER_DLFCN,g
s,_LT_AC_TRY_DLOPEN_SELF,_LT_TRY_DLOPEN_SELF,g
s,LT_AC_PROG_EGREP,_LT_DECL_EGREP,g
s,LT_AC_PROG_SED,_LT_DECL_SED,g
* doc/libtool.texi (Autoconf macros): Document exported macros.
* libtoolize.in: Compare ltdl.m4 serial numbers for LTDL_INIT
instead of newly obsoleted AC_LIB_LTDL.
(func_scan_files): Also set seen_ltdl for LTDL_INIT and
LT_WITH_LTDL.
* libltdl/ltdl.c (lt_dlforeachfile): LT_SYS_LIBSEARCH_PATH is not
an environment variable, it is an actual path.
Reported by Noah Mish <noah@cs.caltech.edu>
2004-08-23 06:02:07 +08:00
|
|
|
/LTDL_INIT/ { s,^.*$,seen_ltdl=:,; p; };
|
|
|
|
/LT_WITH_LTDL/ { s,^.*$,seen_ltdl=:,; p; };
|
2003-10-07 19:12:16 +08:00
|
|
|
/AC_LIB_LTDL/ { s,^.*$,seen_ltdl=:,; p; };
|
2004-06-17 16:03:49 +08:00
|
|
|
/AC_WITH_LTDL/ { s,^.*$,seen_ltdl=:,; p; };
|
2003-10-07 19:12:16 +08:00
|
|
|
d;'
|
2004-04-14 18:24:25 +08:00
|
|
|
eval `cat aclocal.m4 "$configure_ac" 2>/dev/null | $SED "$my_sed_traces"`
|
2003-10-07 19:12:16 +08:00
|
|
|
|
|
|
|
|
|
|
|
# ---------------- #
|
|
|
|
# Validate auxdir. #
|
|
|
|
# ---------------- #
|
|
|
|
|
|
|
|
if test -n "$auxdir"; then
|
|
|
|
# If $configure_ac contains AC_CONFIG_AUX_DIR, check that it was
|
|
|
|
# not given in terms of a shell variable!
|
|
|
|
case "$auxdir" in
|
|
|
|
*\$*)
|
|
|
|
func_fatal_error "can not handle variables in AC_CONFIG_AUX_DIR"
|
|
|
|
;;
|
|
|
|
*);;
|
|
|
|
esac
|
|
|
|
else
|
|
|
|
# Try to discover auxdir the same way it is discovered by configure.
|
|
|
|
# Note that we default to the current directory.
|
|
|
|
for dir in . .. ../..; do
|
Refactor all the test case common code into shell functions in
tests/defs, and move the various demo directories out of
$top_srcdir, and into tests too. The refactoring showed up a
number of inconsistencies and latent bugs, as well as fixing (I
think!!) the long-standing annoyance with some of the tests giving
spurious failures intermittently. While I was here, emacs kindly
removed a lot of bogus whitespace and added copyright notices for
us:
* cdemo, demo, depdemo, f77demo, mdemo, mdemo2, pdemo, tagdemo:
Moved from here...
* tests/cdemo, tests/demo, tests/depdemo, tests/f77demo,
tests/mdemo, tests/mdemo2, tests/pdemo, tests/tagdemo: ...to
here.
* tests/defs: Factor much common functionality from the test
scripts into shell functions. Added a copyright notice.
* tests/assign.test, tests/cdemo-conf.test, tests/cdemo-exec.test,
tests/cdemo-make.test, tests/cdemo-shared.test,
tests/cdemo-static.test, tests/demo-conf.test,
tests/demo-deplibs.test, tests/demo-exec.test,
tests/demo-inst.test, tests/demo-make.test,
tests/demo-nofast.test, tests/demo-nopic.test,
tests/demo-pic.test, tests/demo-shared.test,
tests/demo-static.test, tests/demo-unst.test,
tests/depdemo-conf.test, tests/depdemo-exec.test,
tests/depdemo-inst.test, tests/depdemo-make.test,
tests/depdemo-nofast.test, tests/depdemo-shared.test,
tests/depdemo-static.test, tests/depdemo-unst.test,
tests/f77demo-conf.test, tests/f77demo-exec.test,
tests/f77demo-make.test, tests/f77demo-shared.test,
tests/f77demo-static.test, tests/link-2.test, tests/link.test,
tests/mdemo-conf.test, tests/mdemo-exec.test,
tests/mdemo-inst.test, tests/mdemo-make.test,
tests/mdemo-shared.test, tests/mdemo-static.test,
tests/mdemo-unst.test, tests/mdemo2-conf.test,
tests/mdemo2-exec.test, tests/mdemo2-make.test, tests/nomode.test,
tests/pdemo-conf.test, tests/pdemo-exec.test,
tests/pdemo-inst.test, tests/pdemo-make.test,
tests/pdemo-unst.test, tests/quote.test, tests/sh.test,
tests/suffix.test, tests/tagdemo-conf.test,
tests/tagdemo-exec.test, tests/tagdemo-make.test,
tests/tagdemo-shared.test, tests/tagdemo-static.test: Refactored
to use new functions in tests/defs. Added a copyright notice.
* tests/hardcode.test, noinst-link.test,
tests/relink.test, tests/relink.test,
tests/mdryrun.test: Ditto. Moved from here...
* tests/demo-hardcode.test, demo-noinst-link.test,
tests/demo-relink.test, tests/depdemo-relink.test,
tests/mdemo-dryrun.test: ...to here respectively.
* Makefile.am: Added a copyright notice.
* tests/sh.test: Check libtoolize.in for non-portabilities too.
* libtoolize.in: Fix non-portabilities found by tests/sh.test.
2003-10-15 05:45:03 +08:00
|
|
|
if test -f "$dir/install-sh"; then
|
2003-10-07 19:12:16 +08:00
|
|
|
auxdir=$dir
|
|
|
|
break
|
Refactor all the test case common code into shell functions in
tests/defs, and move the various demo directories out of
$top_srcdir, and into tests too. The refactoring showed up a
number of inconsistencies and latent bugs, as well as fixing (I
think!!) the long-standing annoyance with some of the tests giving
spurious failures intermittently. While I was here, emacs kindly
removed a lot of bogus whitespace and added copyright notices for
us:
* cdemo, demo, depdemo, f77demo, mdemo, mdemo2, pdemo, tagdemo:
Moved from here...
* tests/cdemo, tests/demo, tests/depdemo, tests/f77demo,
tests/mdemo, tests/mdemo2, tests/pdemo, tests/tagdemo: ...to
here.
* tests/defs: Factor much common functionality from the test
scripts into shell functions. Added a copyright notice.
* tests/assign.test, tests/cdemo-conf.test, tests/cdemo-exec.test,
tests/cdemo-make.test, tests/cdemo-shared.test,
tests/cdemo-static.test, tests/demo-conf.test,
tests/demo-deplibs.test, tests/demo-exec.test,
tests/demo-inst.test, tests/demo-make.test,
tests/demo-nofast.test, tests/demo-nopic.test,
tests/demo-pic.test, tests/demo-shared.test,
tests/demo-static.test, tests/demo-unst.test,
tests/depdemo-conf.test, tests/depdemo-exec.test,
tests/depdemo-inst.test, tests/depdemo-make.test,
tests/depdemo-nofast.test, tests/depdemo-shared.test,
tests/depdemo-static.test, tests/depdemo-unst.test,
tests/f77demo-conf.test, tests/f77demo-exec.test,
tests/f77demo-make.test, tests/f77demo-shared.test,
tests/f77demo-static.test, tests/link-2.test, tests/link.test,
tests/mdemo-conf.test, tests/mdemo-exec.test,
tests/mdemo-inst.test, tests/mdemo-make.test,
tests/mdemo-shared.test, tests/mdemo-static.test,
tests/mdemo-unst.test, tests/mdemo2-conf.test,
tests/mdemo2-exec.test, tests/mdemo2-make.test, tests/nomode.test,
tests/pdemo-conf.test, tests/pdemo-exec.test,
tests/pdemo-inst.test, tests/pdemo-make.test,
tests/pdemo-unst.test, tests/quote.test, tests/sh.test,
tests/suffix.test, tests/tagdemo-conf.test,
tests/tagdemo-exec.test, tests/tagdemo-make.test,
tests/tagdemo-shared.test, tests/tagdemo-static.test: Refactored
to use new functions in tests/defs. Added a copyright notice.
* tests/hardcode.test, noinst-link.test,
tests/relink.test, tests/relink.test,
tests/mdryrun.test: Ditto. Moved from here...
* tests/demo-hardcode.test, demo-noinst-link.test,
tests/demo-relink.test, tests/depdemo-relink.test,
tests/mdemo-dryrun.test: ...to here respectively.
* Makefile.am: Added a copyright notice.
* tests/sh.test: Check libtoolize.in for non-portabilities too.
* libtoolize.in: Fix non-portabilities found by tests/sh.test.
2003-10-15 05:45:03 +08:00
|
|
|
elif test -f "$dir/install.sh"; then
|
|
|
|
auxdir="$dir"
|
2003-10-07 19:12:16 +08:00
|
|
|
break
|
|
|
|
fi
|
|
|
|
done
|
1997-04-02 03:53:01 +08:00
|
|
|
fi
|
|
|
|
|
2003-11-07 22:04:16 +08:00
|
|
|
# Just use the current directory if all else fails.
|
|
|
|
test -n "$auxdir" || auxdir=.
|
|
|
|
|
1997-04-02 02:29:23 +08:00
|
|
|
|
2003-10-07 19:12:16 +08:00
|
|
|
# ------------------------------ #
|
|
|
|
# Find local m4 macro directory. #
|
|
|
|
# ------------------------------ #
|
|
|
|
|
2003-10-08 22:09:02 +08:00
|
|
|
# If AC_CONFIG_MACRO_DIR turned nothing up, we hunt for ACLOCAL_AMFLAGS
|
2003-10-07 19:12:16 +08:00
|
|
|
# in `Makefile.am' for a `-I' argument.
|
|
|
|
|
2004-09-23 09:16:41 +08:00
|
|
|
my_sed_aclocal_flags='/^[[ ]]*ACLOCAL_[[A-Z_]]*FLAGS[[ ]]*=/ {
|
|
|
|
s,^[[^=]]*=[[ ]]*\(.*\), \1,; q; }; d'
|
2003-10-07 19:12:16 +08:00
|
|
|
if test ! -n "$m4dir" && test -f Makefile.am; then
|
|
|
|
my_m4dir_is_next=false
|
2004-02-12 21:18:52 +08:00
|
|
|
for arg in `$SED "$my_sed_aclocal_flags" Makefile.am`; do
|
2003-10-07 19:12:16 +08:00
|
|
|
if $my_m4dir_is_next; then
|
|
|
|
m4dir="$arg"
|
|
|
|
break
|
|
|
|
else
|
|
|
|
if test "X$arg" = "X-I"; then
|
|
|
|
my_m4dir_is_next=:
|
|
|
|
else
|
|
|
|
my_m4dir_is_next=false
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
fi
|
|
|
|
}
|
1997-04-02 03:18:28 +08:00
|
|
|
|
2003-10-07 19:12:16 +08:00
|
|
|
# func_included_files searchfile
|
|
|
|
# Output INCLUDEFILE if SEARCHFILE m4_includes it, else output SEARCHFILE.
|
|
|
|
func_included_files ()
|
|
|
|
{
|
2004-12-28 21:31:12 +08:00
|
|
|
$opt_debug
|
2003-10-07 19:12:16 +08:00
|
|
|
my_searchfile="$1"
|
1997-04-02 02:29:23 +08:00
|
|
|
|
2003-10-07 19:12:16 +08:00
|
|
|
my_include_regex=
|
|
|
|
my_sed_include='
|
2004-09-23 09:16:41 +08:00
|
|
|
/^[m4]_include(\[[.*\]])$/ { s,^[m4]_include(\[[\(.*\)\]])$,\1,; p; };
|
2003-10-07 19:12:16 +08:00
|
|
|
d'
|
|
|
|
|
2004-09-25 00:08:33 +08:00
|
|
|
if test -f "$my_searchfile"; then
|
|
|
|
$ECHO "X$my_searchfile" | $Xsed
|
|
|
|
fi
|
2003-10-07 19:12:16 +08:00
|
|
|
|
|
|
|
# Only recurse when we don't care if all the variables we use get
|
|
|
|
# trashed, since they are in global scope.
|
2004-02-12 21:18:52 +08:00
|
|
|
for my_filename in `$SED "$my_sed_include" "$my_searchfile"`; do
|
2003-10-07 19:12:16 +08:00
|
|
|
func_included_files $my_filename
|
|
|
|
done
|
|
|
|
}
|
|
|
|
|
2004-11-29 21:50:54 +08:00
|
|
|
|
|
|
|
# func_filename_path_search filename dirs
|
|
|
|
func_filename_path_search ()
|
|
|
|
{
|
2004-12-28 21:31:12 +08:00
|
|
|
$opt_debug
|
2004-11-29 21:50:54 +08:00
|
|
|
func_filename_path_search_result=
|
|
|
|
|
|
|
|
my_save_IFS="$IFS"; IFS=:
|
|
|
|
for mydir in $2; do
|
|
|
|
IFS="$my_save_IFS"
|
|
|
|
test -f "$mydir/$1" && break
|
|
|
|
done
|
|
|
|
IFS="$my_save_IFS"
|
|
|
|
|
|
|
|
test -f "$mydir/$1" && func_filename_path_search_result="$mydir/$1"
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-01-08 18:34:52 +08:00
|
|
|
# func_serial filename [macro_regex]
|
2003-10-07 19:12:16 +08:00
|
|
|
# Output the value of the serial number comment in FILENAME, where the
|
2004-01-08 18:34:52 +08:00
|
|
|
# comment line must also match MACRO_REGEX, if given.
|
2003-10-07 19:12:16 +08:00
|
|
|
func_serial ()
|
|
|
|
{
|
2004-12-28 21:31:12 +08:00
|
|
|
$opt_debug
|
2004-01-08 18:34:52 +08:00
|
|
|
my_filename="$1"
|
|
|
|
my_macro_regex="$2"
|
|
|
|
my_sed_serial='/^# serial [1-9][0-9]*[ ]*'"$my_macro_regex"'[ ]*$/ {
|
|
|
|
s,^# serial \([1-9][0-9]*\).*$,\1,; q;
|
2003-10-07 19:12:16 +08:00
|
|
|
}; d'
|
|
|
|
|
|
|
|
# Search FILENAME and all the files it m4_includes for a serial number
|
|
|
|
# in the file that AC_DEFUNs MACRO_REGEX.
|
|
|
|
my_serial=
|
|
|
|
for my_file in `func_included_files "$my_filename"`; do
|
2004-03-30 17:38:29 +08:00
|
|
|
if test -z "$my_macro_regex" ||
|
2004-09-23 09:16:41 +08:00
|
|
|
func_grep '^AC_DEFUN(\@<:@'"$my_macro_regex" "$my_file"
|
2004-03-30 17:38:29 +08:00
|
|
|
then
|
2004-02-12 21:18:52 +08:00
|
|
|
my_serial=`$SED -e "$my_sed_serial" "$my_file"`
|
2003-10-07 19:12:16 +08:00
|
|
|
break
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
|
|
|
# If the file has no serial number, we assume it's ancient.
|
|
|
|
test -n "$my_serial" || my_serial=0
|
|
|
|
|
2004-09-16 22:57:02 +08:00
|
|
|
$ECHO $my_serial
|
2003-10-07 19:12:16 +08:00
|
|
|
}
|
|
|
|
|
2004-11-29 21:50:54 +08:00
|
|
|
# func_serial_update filename srcdirs destdir [macro_regex] [old_macro_regex]
|
|
|
|
# Copy the first file named FILENAME from a directory listed in the
|
|
|
|
# ':' delimited SRCDIRS to DESTFILE provided that either FILENAME has
|
|
|
|
# a newer serial number, or DESTFILE does not yet exist, or the user
|
|
|
|
# specified `--force' at the command line. If given, MACRO_REGEX or
|
|
|
|
# OLD_MACRO_REGEX must match any text after "# serial N" in both files.
|
2003-10-07 19:12:16 +08:00
|
|
|
func_serial_update ()
|
|
|
|
{
|
2004-12-28 21:31:12 +08:00
|
|
|
$opt_debug
|
2004-11-29 21:50:54 +08:00
|
|
|
my_filename="$1"
|
|
|
|
my_srcdirs="$2"
|
|
|
|
my_destdir="$3"
|
|
|
|
my_macro_regex="$4"
|
|
|
|
my_old_macro_regex="$5"
|
2003-10-07 19:12:16 +08:00
|
|
|
|
|
|
|
my_return_status=1
|
|
|
|
my_update_p=:
|
2004-11-29 21:50:54 +08:00
|
|
|
func_filename_path_search "$my_filename" "$my_srcdirs"
|
|
|
|
my_srcfile="$func_filename_path_search_result"
|
|
|
|
my_destfile="$my_destdir/$my_filename"
|
|
|
|
|
|
|
|
test -f "$my_srcfile" || \
|
|
|
|
{ func_error "\`$my_filename' not found in \`$my_srcdirs'"; return; }
|
2003-10-07 19:12:16 +08:00
|
|
|
|
|
|
|
if test -f "$my_destfile"; then
|
2004-01-08 18:34:52 +08:00
|
|
|
my_src_serial=`func_serial "$my_srcfile" "$my_macro_regex"`
|
2004-03-29 20:43:37 +08:00
|
|
|
# Strictly, this libtoolize ought not to have to deal with ancient
|
|
|
|
# serial formats, but we accept them here to be complete:
|
|
|
|
test "$my_src_serial" -eq 0 &&
|
|
|
|
my_src_serial=`func_serial "$my_srcfile" "$my_old_macro_regex"`
|
|
|
|
|
2004-01-08 18:34:52 +08:00
|
|
|
my_dest_serial=`func_serial "$my_destfile" "$my_macro_regex"`
|
2004-03-29 20:43:37 +08:00
|
|
|
test "$my_dest_serial" -eq 0 &&
|
|
|
|
my_dest_serial=`func_serial "$my_destfile" "$my_old_macro_regex"`
|
2003-10-07 19:12:16 +08:00
|
|
|
|
Refactor all the test case common code into shell functions in
tests/defs, and move the various demo directories out of
$top_srcdir, and into tests too. The refactoring showed up a
number of inconsistencies and latent bugs, as well as fixing (I
think!!) the long-standing annoyance with some of the tests giving
spurious failures intermittently. While I was here, emacs kindly
removed a lot of bogus whitespace and added copyright notices for
us:
* cdemo, demo, depdemo, f77demo, mdemo, mdemo2, pdemo, tagdemo:
Moved from here...
* tests/cdemo, tests/demo, tests/depdemo, tests/f77demo,
tests/mdemo, tests/mdemo2, tests/pdemo, tests/tagdemo: ...to
here.
* tests/defs: Factor much common functionality from the test
scripts into shell functions. Added a copyright notice.
* tests/assign.test, tests/cdemo-conf.test, tests/cdemo-exec.test,
tests/cdemo-make.test, tests/cdemo-shared.test,
tests/cdemo-static.test, tests/demo-conf.test,
tests/demo-deplibs.test, tests/demo-exec.test,
tests/demo-inst.test, tests/demo-make.test,
tests/demo-nofast.test, tests/demo-nopic.test,
tests/demo-pic.test, tests/demo-shared.test,
tests/demo-static.test, tests/demo-unst.test,
tests/depdemo-conf.test, tests/depdemo-exec.test,
tests/depdemo-inst.test, tests/depdemo-make.test,
tests/depdemo-nofast.test, tests/depdemo-shared.test,
tests/depdemo-static.test, tests/depdemo-unst.test,
tests/f77demo-conf.test, tests/f77demo-exec.test,
tests/f77demo-make.test, tests/f77demo-shared.test,
tests/f77demo-static.test, tests/link-2.test, tests/link.test,
tests/mdemo-conf.test, tests/mdemo-exec.test,
tests/mdemo-inst.test, tests/mdemo-make.test,
tests/mdemo-shared.test, tests/mdemo-static.test,
tests/mdemo-unst.test, tests/mdemo2-conf.test,
tests/mdemo2-exec.test, tests/mdemo2-make.test, tests/nomode.test,
tests/pdemo-conf.test, tests/pdemo-exec.test,
tests/pdemo-inst.test, tests/pdemo-make.test,
tests/pdemo-unst.test, tests/quote.test, tests/sh.test,
tests/suffix.test, tests/tagdemo-conf.test,
tests/tagdemo-exec.test, tests/tagdemo-make.test,
tests/tagdemo-shared.test, tests/tagdemo-static.test: Refactored
to use new functions in tests/defs. Added a copyright notice.
* tests/hardcode.test, noinst-link.test,
tests/relink.test, tests/relink.test,
tests/mdryrun.test: Ditto. Moved from here...
* tests/demo-hardcode.test, demo-noinst-link.test,
tests/demo-relink.test, tests/depdemo-relink.test,
tests/mdemo-dryrun.test: ...to here respectively.
* Makefile.am: Added a copyright notice.
* tests/sh.test: Check libtoolize.in for non-portabilities too.
* libtoolize.in: Fix non-portabilities found by tests/sh.test.
2003-10-15 05:45:03 +08:00
|
|
|
test "$my_src_serial" -eq 0 && {
|
2003-10-07 19:12:16 +08:00
|
|
|
func_error "warning: no serial number on \`$my_srcfile', not copying."
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
# Only perform the file update if the destination has an older serial.
|
Refactor all the test case common code into shell functions in
tests/defs, and move the various demo directories out of
$top_srcdir, and into tests too. The refactoring showed up a
number of inconsistencies and latent bugs, as well as fixing (I
think!!) the long-standing annoyance with some of the tests giving
spurious failures intermittently. While I was here, emacs kindly
removed a lot of bogus whitespace and added copyright notices for
us:
* cdemo, demo, depdemo, f77demo, mdemo, mdemo2, pdemo, tagdemo:
Moved from here...
* tests/cdemo, tests/demo, tests/depdemo, tests/f77demo,
tests/mdemo, tests/mdemo2, tests/pdemo, tests/tagdemo: ...to
here.
* tests/defs: Factor much common functionality from the test
scripts into shell functions. Added a copyright notice.
* tests/assign.test, tests/cdemo-conf.test, tests/cdemo-exec.test,
tests/cdemo-make.test, tests/cdemo-shared.test,
tests/cdemo-static.test, tests/demo-conf.test,
tests/demo-deplibs.test, tests/demo-exec.test,
tests/demo-inst.test, tests/demo-make.test,
tests/demo-nofast.test, tests/demo-nopic.test,
tests/demo-pic.test, tests/demo-shared.test,
tests/demo-static.test, tests/demo-unst.test,
tests/depdemo-conf.test, tests/depdemo-exec.test,
tests/depdemo-inst.test, tests/depdemo-make.test,
tests/depdemo-nofast.test, tests/depdemo-shared.test,
tests/depdemo-static.test, tests/depdemo-unst.test,
tests/f77demo-conf.test, tests/f77demo-exec.test,
tests/f77demo-make.test, tests/f77demo-shared.test,
tests/f77demo-static.test, tests/link-2.test, tests/link.test,
tests/mdemo-conf.test, tests/mdemo-exec.test,
tests/mdemo-inst.test, tests/mdemo-make.test,
tests/mdemo-shared.test, tests/mdemo-static.test,
tests/mdemo-unst.test, tests/mdemo2-conf.test,
tests/mdemo2-exec.test, tests/mdemo2-make.test, tests/nomode.test,
tests/pdemo-conf.test, tests/pdemo-exec.test,
tests/pdemo-inst.test, tests/pdemo-make.test,
tests/pdemo-unst.test, tests/quote.test, tests/sh.test,
tests/suffix.test, tests/tagdemo-conf.test,
tests/tagdemo-exec.test, tests/tagdemo-make.test,
tests/tagdemo-shared.test, tests/tagdemo-static.test: Refactored
to use new functions in tests/defs. Added a copyright notice.
* tests/hardcode.test, noinst-link.test,
tests/relink.test, tests/relink.test,
tests/mdryrun.test: Ditto. Moved from here...
* tests/demo-hardcode.test, demo-noinst-link.test,
tests/demo-relink.test, tests/depdemo-relink.test,
tests/mdemo-dryrun.test: ...to here respectively.
* Makefile.am: Added a copyright notice.
* tests/sh.test: Check libtoolize.in for non-portabilities too.
* libtoolize.in: Fix non-portabilities found by tests/sh.test.
2003-10-15 05:45:03 +08:00
|
|
|
test "$my_src_serial" -gt "$my_dest_serial" || my_update_p=false
|
2003-10-07 19:12:16 +08:00
|
|
|
|
Refactor all the test case common code into shell functions in
tests/defs, and move the various demo directories out of
$top_srcdir, and into tests too. The refactoring showed up a
number of inconsistencies and latent bugs, as well as fixing (I
think!!) the long-standing annoyance with some of the tests giving
spurious failures intermittently. While I was here, emacs kindly
removed a lot of bogus whitespace and added copyright notices for
us:
* cdemo, demo, depdemo, f77demo, mdemo, mdemo2, pdemo, tagdemo:
Moved from here...
* tests/cdemo, tests/demo, tests/depdemo, tests/f77demo,
tests/mdemo, tests/mdemo2, tests/pdemo, tests/tagdemo: ...to
here.
* tests/defs: Factor much common functionality from the test
scripts into shell functions. Added a copyright notice.
* tests/assign.test, tests/cdemo-conf.test, tests/cdemo-exec.test,
tests/cdemo-make.test, tests/cdemo-shared.test,
tests/cdemo-static.test, tests/demo-conf.test,
tests/demo-deplibs.test, tests/demo-exec.test,
tests/demo-inst.test, tests/demo-make.test,
tests/demo-nofast.test, tests/demo-nopic.test,
tests/demo-pic.test, tests/demo-shared.test,
tests/demo-static.test, tests/demo-unst.test,
tests/depdemo-conf.test, tests/depdemo-exec.test,
tests/depdemo-inst.test, tests/depdemo-make.test,
tests/depdemo-nofast.test, tests/depdemo-shared.test,
tests/depdemo-static.test, tests/depdemo-unst.test,
tests/f77demo-conf.test, tests/f77demo-exec.test,
tests/f77demo-make.test, tests/f77demo-shared.test,
tests/f77demo-static.test, tests/link-2.test, tests/link.test,
tests/mdemo-conf.test, tests/mdemo-exec.test,
tests/mdemo-inst.test, tests/mdemo-make.test,
tests/mdemo-shared.test, tests/mdemo-static.test,
tests/mdemo-unst.test, tests/mdemo2-conf.test,
tests/mdemo2-exec.test, tests/mdemo2-make.test, tests/nomode.test,
tests/pdemo-conf.test, tests/pdemo-exec.test,
tests/pdemo-inst.test, tests/pdemo-make.test,
tests/pdemo-unst.test, tests/quote.test, tests/sh.test,
tests/suffix.test, tests/tagdemo-conf.test,
tests/tagdemo-exec.test, tests/tagdemo-make.test,
tests/tagdemo-shared.test, tests/tagdemo-static.test: Refactored
to use new functions in tests/defs. Added a copyright notice.
* tests/hardcode.test, noinst-link.test,
tests/relink.test, tests/relink.test,
tests/mdryrun.test: Ditto. Moved from here...
* tests/demo-hardcode.test, demo-noinst-link.test,
tests/demo-relink.test, tests/depdemo-relink.test,
tests/mdemo-dryrun.test: ...to here respectively.
* Makefile.am: Added a copyright notice.
* tests/sh.test: Check libtoolize.in for non-portabilities too.
* libtoolize.in: Fix non-portabilities found by tests/sh.test.
2003-10-15 05:45:03 +08:00
|
|
|
test "$my_src_serial" -gt "$my_dest_serial" \
|
2003-10-07 19:12:16 +08:00
|
|
|
&& func_verbose "\`$my_srcfile' is serial $my_srcserial, greater than $my_destserial in \`$my_destfile'"
|
|
|
|
|
Refactor all the test case common code into shell functions in
tests/defs, and move the various demo directories out of
$top_srcdir, and into tests too. The refactoring showed up a
number of inconsistencies and latent bugs, as well as fixing (I
think!!) the long-standing annoyance with some of the tests giving
spurious failures intermittently. While I was here, emacs kindly
removed a lot of bogus whitespace and added copyright notices for
us:
* cdemo, demo, depdemo, f77demo, mdemo, mdemo2, pdemo, tagdemo:
Moved from here...
* tests/cdemo, tests/demo, tests/depdemo, tests/f77demo,
tests/mdemo, tests/mdemo2, tests/pdemo, tests/tagdemo: ...to
here.
* tests/defs: Factor much common functionality from the test
scripts into shell functions. Added a copyright notice.
* tests/assign.test, tests/cdemo-conf.test, tests/cdemo-exec.test,
tests/cdemo-make.test, tests/cdemo-shared.test,
tests/cdemo-static.test, tests/demo-conf.test,
tests/demo-deplibs.test, tests/demo-exec.test,
tests/demo-inst.test, tests/demo-make.test,
tests/demo-nofast.test, tests/demo-nopic.test,
tests/demo-pic.test, tests/demo-shared.test,
tests/demo-static.test, tests/demo-unst.test,
tests/depdemo-conf.test, tests/depdemo-exec.test,
tests/depdemo-inst.test, tests/depdemo-make.test,
tests/depdemo-nofast.test, tests/depdemo-shared.test,
tests/depdemo-static.test, tests/depdemo-unst.test,
tests/f77demo-conf.test, tests/f77demo-exec.test,
tests/f77demo-make.test, tests/f77demo-shared.test,
tests/f77demo-static.test, tests/link-2.test, tests/link.test,
tests/mdemo-conf.test, tests/mdemo-exec.test,
tests/mdemo-inst.test, tests/mdemo-make.test,
tests/mdemo-shared.test, tests/mdemo-static.test,
tests/mdemo-unst.test, tests/mdemo2-conf.test,
tests/mdemo2-exec.test, tests/mdemo2-make.test, tests/nomode.test,
tests/pdemo-conf.test, tests/pdemo-exec.test,
tests/pdemo-inst.test, tests/pdemo-make.test,
tests/pdemo-unst.test, tests/quote.test, tests/sh.test,
tests/suffix.test, tests/tagdemo-conf.test,
tests/tagdemo-exec.test, tests/tagdemo-make.test,
tests/tagdemo-shared.test, tests/tagdemo-static.test: Refactored
to use new functions in tests/defs. Added a copyright notice.
* tests/hardcode.test, noinst-link.test,
tests/relink.test, tests/relink.test,
tests/mdryrun.test: Ditto. Moved from here...
* tests/demo-hardcode.test, demo-noinst-link.test,
tests/demo-relink.test, tests/depdemo-relink.test,
tests/mdemo-dryrun.test: ...to here respectively.
* Makefile.am: Added a copyright notice.
* tests/sh.test: Check libtoolize.in for non-portabilities too.
* libtoolize.in: Fix non-portabilities found by tests/sh.test.
2003-10-15 05:45:03 +08:00
|
|
|
if test "$my_src_serial" -lt "$my_dest_serial"; then
|
2003-10-07 19:12:16 +08:00
|
|
|
func_error "\`$my_srcfile' is serial $my_srcserial, less than $my_destserial in \`$my_destfile'"
|
2004-02-12 21:18:52 +08:00
|
|
|
$opt_force \
|
2003-10-07 19:12:16 +08:00
|
|
|
|| func_fatal_error "Use \`--force' to replace newer libtool files with this version."
|
1997-04-02 02:29:23 +08:00
|
|
|
fi
|
|
|
|
fi
|
1999-12-16 19:40:16 +08:00
|
|
|
|
2004-02-12 21:18:52 +08:00
|
|
|
if $my_update_p || $opt_force; then
|
2003-10-07 19:12:16 +08:00
|
|
|
func_copy "$my_srcfile" "$my_destfile"
|
|
|
|
my_return_status=$?
|
1999-12-16 19:40:16 +08:00
|
|
|
else
|
2004-02-12 21:18:52 +08:00
|
|
|
$opt_quiet \
|
2003-10-07 19:12:16 +08:00
|
|
|
|| func_echo "\`$my_destfile' is already up to date."
|
1999-12-16 19:40:16 +08:00
|
|
|
fi
|
|
|
|
|
2003-10-07 19:12:16 +08:00
|
|
|
# Do this after the copy for hand maintained `aclocal.m4', incase
|
|
|
|
# it has `m4_include([DESTFILE])', so the copy effectively already
|
|
|
|
# updated `aclocal.m4'.
|
|
|
|
$use_aclocal || if test -f aclocal.m4; then
|
2004-01-08 18:34:52 +08:00
|
|
|
test "$my_src_serial" -gt `func_serial aclocal.m4 "$my_macro_regex"` \
|
2003-10-07 19:12:16 +08:00
|
|
|
&& func_echo "You should add the contents of \'$my_destfile' to \`aclocal.m4'."
|
|
|
|
fi
|
1999-12-16 19:40:16 +08:00
|
|
|
|
2003-10-07 19:12:16 +08:00
|
|
|
return $my_return_status
|
|
|
|
}
|
|
|
|
|
|
|
|
# func_check_macros
|
|
|
|
# Sanity check macros from aclocal.m4 against installed versions.
|
|
|
|
func_check_macros ()
|
|
|
|
{
|
2004-12-28 21:31:12 +08:00
|
|
|
$opt_debug
|
2003-10-07 19:12:16 +08:00
|
|
|
# Don't trace for this, we're just checking the user didn't invoke it
|
|
|
|
# directly from configure.ac.
|
2004-09-23 09:16:41 +08:00
|
|
|
$SED 's,[d]nl .*$,,; s,# .*$,,' "$configure_ac" | grep AC_PROG_RANLIB \
|
2004-03-29 20:43:37 +08:00
|
|
|
&& func_echo "\`AC_PROG_RANLIB' is rendered obsolete by \`LT_INIT'"
|
2003-10-07 19:12:16 +08:00
|
|
|
|
|
|
|
$seen_libtool \
|
2004-03-29 20:43:37 +08:00
|
|
|
|| func_echo "Remember to add \`LT_INIT' to \`$configure_ac'."
|
2003-10-07 19:12:16 +08:00
|
|
|
|
|
|
|
# FIXME: Ensure ltmain.sh, libtool.m4 and ltdl.m4 are from the same release
|
|
|
|
}
|
|
|
|
|
2004-11-29 21:50:54 +08:00
|
|
|
# func_ltmain_update filename srcdirs destdir
|
|
|
|
# Copy the first file named FILENAME from a directory listed in the
|
|
|
|
# ':' delimited SRCDIRS to DESTFILE provided that either FILENAME has
|
|
|
|
# a newer TIMESTAMP, or DESTFILE does not yet exist, or the user
|
|
|
|
# specified `--force' at the command line.
|
2003-10-07 19:12:16 +08:00
|
|
|
func_ltmain_update ()
|
|
|
|
{
|
2004-12-28 21:31:12 +08:00
|
|
|
$opt_debug
|
2004-11-29 21:50:54 +08:00
|
|
|
my_filename="$1"
|
|
|
|
my_srcdirs="$2"
|
|
|
|
my_destdir="$3"
|
|
|
|
|
|
|
|
func_filename_path_search "$my_filename" "$my_srcdirs"
|
|
|
|
my_srcfile="$func_filename_path_search_result"
|
|
|
|
my_destfile="$my_destdir/$my_filename"
|
2003-10-07 19:12:16 +08:00
|
|
|
my_sed_ltmain='
|
2004-09-23 09:16:41 +08:00
|
|
|
s,^VERSION=[[^0-9]]*\(.*\)[[ ]]*$,\1,; t
|
|
|
|
s,^TIMESTAMP=[[^0-9]]*\([[.0-9]]*\) .*$,\1,; t
|
2003-10-07 19:12:16 +08:00
|
|
|
d'
|
|
|
|
|
2004-11-29 21:50:54 +08:00
|
|
|
if test -n "$my_srcfile"; then
|
|
|
|
|
|
|
|
# FIXME: check versions, and only downgrade with --force
|
|
|
|
cmp -s "$my_srcfile" "$my_destfile"
|
|
|
|
if test "$?" -ne 0 || $opt_force; then
|
|
|
|
func_copy "$my_srcfile" "$my_destfile"
|
|
|
|
else
|
|
|
|
$opt_quiet \
|
|
|
|
|| func_echo "\`$my_destfile' is already up to date."
|
|
|
|
fi
|
2003-10-07 19:12:16 +08:00
|
|
|
|
|
|
|
else
|
2004-11-29 21:50:54 +08:00
|
|
|
func_error "\`$my_filename' not found in \`$my_srcdirs'."
|
2003-10-07 19:12:16 +08:00
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2004-11-29 21:50:54 +08:00
|
|
|
# func_config_update filename srcdirs destdir
|
|
|
|
# Copy the first file named FILENAME from a directory listed in the
|
|
|
|
# ':' delimited SRCDIRS to DESTFILE provided that either FILENAME has
|
|
|
|
# a newer TIMESTAMP, or DESTFILE does not yet exist, or the user
|
|
|
|
# specified `--force' at the command line.
|
2003-10-07 19:12:16 +08:00
|
|
|
func_config_update ()
|
|
|
|
{
|
2004-12-28 21:31:12 +08:00
|
|
|
$opt_debug
|
2004-11-29 21:50:54 +08:00
|
|
|
my_filename="$1"
|
|
|
|
my_srcdirs="$2"
|
|
|
|
my_destdir="$3"
|
|
|
|
|
|
|
|
func_filename_path_search "$my_filename" "$my_srcdirs"
|
|
|
|
my_srcfile="$func_filename_path_search_result"
|
|
|
|
my_destfile="$my_destdir/$my_filename"
|
2004-09-23 09:16:41 +08:00
|
|
|
my_sed_config='s,^timestamp=[[^0-9]]*\([[.0-9-]]*\)[[^0-9]].*$,\1,; t; d'
|
2003-10-07 19:12:16 +08:00
|
|
|
|
2004-11-29 21:50:54 +08:00
|
|
|
if test -n "$my_srcfile"; then
|
|
|
|
|
|
|
|
# FIXME: check versions, and only downgrade with --force
|
|
|
|
cmp -s "$my_srcfile" "$my_destfile"
|
|
|
|
if test "$?" -ne 0 || $opt_force; then
|
|
|
|
func_copy "$my_srcfile" "$my_destfile"
|
|
|
|
else
|
|
|
|
$opt_quiet \
|
|
|
|
|| func_echo "\`$my_destfile' is already up to date."
|
|
|
|
fi
|
1997-04-02 02:29:23 +08:00
|
|
|
|
2003-10-07 19:12:16 +08:00
|
|
|
else
|
2004-11-29 21:50:54 +08:00
|
|
|
func_error "\`$my_filename' not found in \`$my_srcdirs'."
|
2003-10-07 19:12:16 +08:00
|
|
|
fi
|
|
|
|
}
|
1997-04-02 03:53:01 +08:00
|
|
|
|
|
|
|
|
1997-04-02 02:29:23 +08:00
|
|
|
|
2003-10-07 19:12:16 +08:00
|
|
|
## ----------- ##
|
|
|
|
## Main. ##
|
|
|
|
## ----------- ##
|
1997-04-02 02:29:23 +08:00
|
|
|
|
2003-10-07 19:12:16 +08:00
|
|
|
{
|
|
|
|
rerun_aclocal=false
|
|
|
|
|
2004-11-15 09:03:14 +08:00
|
|
|
# NOTE: PKGVMACRO_FILES must be kept in synch with pkgvmacro_DATA in the
|
2004-06-16 23:08:28 +08:00
|
|
|
# libtool top_srcdir/Makefile.am (libtool.m4 and ltdl.m4 are handled
|
|
|
|
# specially below though, so don't add them here):
|
2004-11-15 09:03:14 +08:00
|
|
|
pkgvmacro_files='argz.m4:ltoptions.m4:ltsugar.m4:ltversion.m4'
|
2004-06-16 23:08:28 +08:00
|
|
|
|
2004-12-20 21:08:35 +08:00
|
|
|
glob_exclude_pkgaux_files='config.guess|config.sub|install-sh|ltmain.sh'
|
2004-01-08 18:34:52 +08:00
|
|
|
|
2003-10-07 19:12:16 +08:00
|
|
|
func_scan_files
|
2004-02-12 21:18:52 +08:00
|
|
|
$opt_quiet || func_check_macros
|
2003-10-07 19:12:16 +08:00
|
|
|
|
2004-11-29 21:50:54 +08:00
|
|
|
# Copy all the files from installed (or specified, if `-I' was used)
|
|
|
|
# libltdl to this project, if the user specified `--ltdl'.
|
2004-06-21 18:17:27 +08:00
|
|
|
if test -n "$ltdldir"; then
|
2004-11-29 21:50:54 +08:00
|
|
|
func_copy_all_from_path -r libltdl "$pkgvdatadirs" "$ltdldir"
|
2004-06-22 00:40:01 +08:00
|
|
|
|
|
|
|
# libtoolize the newly copied libltdl tree
|
2004-11-29 21:50:54 +08:00
|
|
|
( cd "$ltdldir" && eval "$progpath" $libtoolize_flags ) \
|
|
|
|
|| exit $EXIT_FAILURE
|
2004-06-21 18:17:27 +08:00
|
|
|
fi
|
2003-10-07 19:12:16 +08:00
|
|
|
|
|
|
|
# Copy all the installed utility files to the auxiliary directory if
|
|
|
|
# `--install' was passed, or else copy just ltmain.sh.
|
2004-02-12 21:18:52 +08:00
|
|
|
$opt_quiet || if test "$auxdir" != .; then
|
2003-10-07 19:12:16 +08:00
|
|
|
func_echo "putting files in AC_CONFIG_AUX_DIR, \`$auxdir'."
|
1999-01-17 19:19:40 +08:00
|
|
|
fi
|
2004-02-12 21:18:52 +08:00
|
|
|
if $opt_install || $opt_force; then
|
2004-11-29 21:50:54 +08:00
|
|
|
func_copy_all_from_path . "$pkgvdatadirs" \
|
|
|
|
"$auxdir" "$glob_exclude_pkgaux_files"
|
|
|
|
func_config_update config.guess "$pkgvdatadirs" "$auxdir"
|
|
|
|
func_config_update config.sub "$pkgvdatadirs" "$auxdir"
|
2004-12-20 21:08:35 +08:00
|
|
|
func_config_update install-sh "$pkgvdatadirs" "$auxdir"
|
2003-10-07 19:12:16 +08:00
|
|
|
fi
|
2004-11-29 21:50:54 +08:00
|
|
|
func_ltmain_update ltmain.sh "$pkgvdatadirs" "$auxdir"
|
2003-10-07 19:12:16 +08:00
|
|
|
|
|
|
|
# Copy libtool's m4 macros to the macro directory, if they are newer.
|
2004-06-17 16:03:49 +08:00
|
|
|
if test -n "$m4dir"; then
|
|
|
|
$opt_quiet || func_echo "putting macros in AC_CONFIG_MACRO_DIR, \`$m4dir'."
|
2004-01-08 18:34:52 +08:00
|
|
|
|
2004-11-29 21:50:54 +08:00
|
|
|
func_serial_update libtool.m4 "$pkgvmacrodirs" "$m4dir" \
|
2004-09-23 09:16:41 +08:00
|
|
|
LT_INIT 'A[[CM]]_PROG_LIBTOOL'
|
2004-06-17 16:03:49 +08:00
|
|
|
|
|
|
|
if $seen_ltdl; then
|
2004-11-29 21:50:54 +08:00
|
|
|
func_serial_update ltdl.m4 "$pkgvmacrodirs" "$m4dir" 'LTDL_INIT'
|
2004-06-17 16:03:49 +08:00
|
|
|
else
|
2004-11-29 21:50:54 +08:00
|
|
|
func_verbose "Not copying \`$m4dir/ltdl.m4', libltdl not used."
|
2004-06-17 16:03:49 +08:00
|
|
|
fi
|
1999-03-10 06:57:26 +08:00
|
|
|
|
2004-11-29 21:50:54 +08:00
|
|
|
func_copy_some_files "$pkgvmacro_files" "$pkgvmacrodirs" \
|
2004-06-17 16:03:49 +08:00
|
|
|
"$m4dir" func_serial_update
|
1999-03-10 06:57:26 +08:00
|
|
|
fi
|
2003-10-07 19:12:16 +08:00
|
|
|
}
|
1999-03-10 06:57:26 +08:00
|
|
|
|
2003-10-07 19:12:16 +08:00
|
|
|
exit $exit_status
|
1997-04-02 02:29:23 +08:00
|
|
|
|
|
|
|
# Local Variables:
|
|
|
|
# mode:shell-script
|
|
|
|
# sh-indentation:2
|
|
|
|
# End:
|