summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scilab/Makefile.am2
-rw-r--r--scilab/Makefile.in4
-rwxr-xr-xscilab/config/ltmain.sh1398
-rwxr-xr-xscilab/config/mkinstalldirs162
-rwxr-xr-xscilab/configure2799
-rw-r--r--scilab/configure.ac15
-rw-r--r--scilab/contrib/Makefile.in1
-rw-r--r--scilab/libs/MALLOC/Makefile.in1
-rw-r--r--scilab/libs/Makefile.in1
-rw-r--r--scilab/libs/doublylinkedlist/Makefile.in1
-rw-r--r--scilab/libs/dynamiclibrary/Makefile.in1
-rw-r--r--scilab/libs/hashtable/Makefile.in1
-rw-r--r--scilab/libs/libst/Makefile.in1
-rw-r--r--scilab/m4/libtool.m4942
-rw-r--r--scilab/m4/ltoptions.m42
-rw-r--r--scilab/m4/ltversion.m410
-rw-r--r--scilab/m4/lt~obsolete.m410
-rw-r--r--scilab/modules/Makefile.in1
-rw-r--r--scilab/modules/action_binding/Makefile.in212
-rw-r--r--scilab/modules/api_scilab/Makefile.in1
-rw-r--r--scilab/modules/arnoldi/Makefile.in330
-rw-r--r--scilab/modules/atoms/Makefile.in1
-rw-r--r--scilab/modules/boolean/Makefile.in244
-rw-r--r--scilab/modules/cacsd/Makefile.in644
-rw-r--r--scilab/modules/call_scilab/Makefile.in1
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in1
-rw-r--r--scilab/modules/completion/Makefile.in1
-rw-r--r--scilab/modules/console/Makefile.in274
-rw-r--r--scilab/modules/core/Makefile.in1
-rw-r--r--scilab/modules/data_structures/Makefile.in312
-rw-r--r--scilab/modules/demo_tools/Makefile.in1
-rw-r--r--scilab/modules/development_tools/Makefile.in1
-rw-r--r--scilab/modules/development_tools/src/fake/Makefile.in1
-rw-r--r--scilab/modules/differential_equations/Makefile.in520
-rw-r--r--scilab/modules/double/Makefile.in1
-rw-r--r--scilab/modules/dynamic_link/Makefile.in330
-rw-r--r--scilab/modules/elementary_functions/Makefile.in1184
-rw-r--r--scilab/modules/fftw/Makefile.in272
-rw-r--r--scilab/modules/fileio/Makefile.in722
-rw-r--r--scilab/modules/functions/Makefile.in278
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in1
-rw-r--r--scilab/modules/graphic_export/Makefile.in332
-rw-r--r--scilab/modules/graphics/Makefile.in2461
-rw-r--r--scilab/modules/gui/Makefile.in1057
-rw-r--r--scilab/modules/hdf5/Makefile.in236
-rw-r--r--scilab/modules/helptools/Makefile.in444
-rw-r--r--scilab/modules/history_manager/Makefile.in1
-rw-r--r--scilab/modules/integer/Makefile.in578
-rw-r--r--scilab/modules/interpolation/Makefile.in278
-rw-r--r--scilab/modules/intersci/Makefile.in1
-rw-r--r--scilab/modules/io/Makefile.in350
-rw-r--r--scilab/modules/javasci/Makefile.in270
-rw-r--r--scilab/modules/jvm/Makefile.in1
-rw-r--r--scilab/modules/linear_algebra/Makefile.in450
-rw-r--r--scilab/modules/localization/Makefile.in1
-rw-r--r--scilab/modules/m2sci/Makefile.in1
-rw-r--r--scilab/modules/maple2scilab/Makefile.in1
-rw-r--r--scilab/modules/matio/Makefile.in332
-rw-r--r--scilab/modules/metanet/Makefile.in440
-rw-r--r--scilab/modules/mexlib/Makefile.in1
-rw-r--r--scilab/modules/optimization/Makefile.in446
-rw-r--r--scilab/modules/output_stream/Makefile.in1
-rw-r--r--scilab/modules/overloading/Makefile.in1
-rw-r--r--scilab/modules/parameters/Makefile.in1
-rw-r--r--scilab/modules/polynomials/Makefile.in444
-rw-r--r--scilab/modules/pvm/Makefile.in452
-rw-r--r--scilab/modules/randlib/Makefile.in302
-rw-r--r--scilab/modules/renderer/Makefile.in1714
-rw-r--r--scilab/modules/scicos/Makefile.in1
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in2132
-rw-r--r--scilab/modules/scipad/Makefile.in1
-rw-r--r--scilab/modules/shell/Makefile.in1
-rw-r--r--scilab/modules/shell/src/c/others/initMacOSXEnv.c4
-rw-r--r--scilab/modules/shell/src/c/others/mainscic.c8
-rw-r--r--scilab/modules/signal_processing/Makefile.in402
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in1
-rw-r--r--scilab/modules/sound/Makefile.in206
-rw-r--r--scilab/modules/sparse/Makefile.in628
-rw-r--r--scilab/modules/special_functions/Makefile.in306
-rw-r--r--scilab/modules/spreadsheet/Makefile.in254
-rw-r--r--scilab/modules/statistics/Makefile.in396
-rw-r--r--scilab/modules/string/Makefile.in528
-rw-r--r--scilab/modules/symbolic/Makefile.in226
-rw-r--r--scilab/modules/tclsci/Makefile.in403
-rw-r--r--scilab/modules/texmacs/Makefile.in1
-rw-r--r--scilab/modules/time/Makefile.in1
-rw-r--r--scilab/modules/umfpack/Makefile.in290
-rw-r--r--scilab/modules/windows_tools/Makefile.in194
-rw-r--r--scilab/modules/xpad/Makefile.in236
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/ColorizeAction.java46
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/DefaultAction.java127
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/DefaultCheckAction.java135
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/FindAction.java4
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/HelpAction.java21
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/HighlightCurrentLineAction.java21
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/IndentAction.java5
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/LineNumbersAction.java5
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/LoadIntoScilabAction.java10
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/NewAction.java59
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/NextTabAction.java5
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/OpenAction.java101
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/PageSetupAction.java5
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/PasteAction.java7
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/PreviousTabAction.java8
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/PrintAction.java11
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/PrintPreviewAction.java9
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/RedoAction.java7
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/ResetFontAction.java85
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/SaveAction.java77
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/SaveAsAction.java9
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/ScilabStyleAction.java15
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/SelectAllAction.java23
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/SetColorsAction.java120
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/SetFontAction.java87
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/ShowToolBarAction.java17
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/TextStyleAction.java15
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/UTF8EncodingAction.java15
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/UnCommentAction.java11
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/UndoAction.java7
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/WordWrapAction.java19
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/XMLStyleAction.java15
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/utils/XpadMessages.java112
122 files changed, 13164 insertions, 15549 deletions
diff --git a/scilab/Makefile.am b/scilab/Makefile.am
index 97160bc..2d91273 100644
--- a/scilab/Makefile.am
+++ b/scilab/Makefile.am
@@ -27,6 +27,8 @@ bin_PROGRAMS = scilab-bin scilab-cli-bin
27bin_SCRIPTS = bin/scilab bin/scilab-adv-cli bin/scilab-cli 27bin_SCRIPTS = bin/scilab bin/scilab-adv-cli bin/scilab-cli
28 28
29scilab_bin_LDFLAGS = 29scilab_bin_LDFLAGS =
30scilab_cli_bin_LDFLAGS =
31
30if IS_MACOSX 32if IS_MACOSX
31scilab_bin_LDFLAGS += -framework Cocoa 33scilab_bin_LDFLAGS += -framework Cocoa
32endif 34endif
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index fa33a37..4793468 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -191,7 +191,7 @@ scilab_cli_bin_OBJECTS = $(am_scilab_cli_bin_OBJECTS)
191scilab_cli_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(SCILAB_CLI_LIB) 191scilab_cli_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(SCILAB_CLI_LIB)
192scilab_cli_bin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ 192scilab_cli_bin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
193 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(scilab_cli_bin_CFLAGS) \ 193 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(scilab_cli_bin_CFLAGS) \
194 $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ 194 $(CFLAGS) $(scilab_cli_bin_LDFLAGS) $(LDFLAGS) -o $@
195am__scilab_static_bin_SOURCES_DIST = \ 195am__scilab_static_bin_SOURCES_DIST = \
196 $(top_srcdir)/modules/shell/src/c/others/mainscic.c 196 $(top_srcdir)/modules/shell/src/c/others/mainscic.c
197am__objects_1 = scilab_static_bin-mainscic.$(OBJEXT) 197am__objects_1 = scilab_static_bin-mainscic.$(OBJEXT)
@@ -525,7 +525,6 @@ libdir = @libdir@
525libexecdir = @libexecdir@ 525libexecdir = @libexecdir@
526localedir = @localedir@ 526localedir = @localedir@
527localstatedir = @localstatedir@ 527localstatedir = @localstatedir@
528lt_ECHO = @lt_ECHO@
529mandir = @mandir@ 528mandir = @mandir@
530mkdir_p = @mkdir_p@ 529mkdir_p = @mkdir_p@
531oldincludedir = @oldincludedir@ 530oldincludedir = @oldincludedir@
@@ -550,6 +549,7 @@ ACLOCAL_AMFLAGS = -I m4/
550changelogs = CHANGES CHANGES_5.1.X 549changelogs = CHANGES CHANGES_5.1.X
551bin_SCRIPTS = bin/scilab bin/scilab-adv-cli bin/scilab-cli 550bin_SCRIPTS = bin/scilab bin/scilab-adv-cli bin/scilab-cli
552scilab_bin_LDFLAGS = $(am__append_1) 551scilab_bin_LDFLAGS = $(am__append_1)
552scilab_cli_bin_LDFLAGS =
553scilab_bin_CFLAGS = 553scilab_bin_CFLAGS =
554# --no-undefined --relax 554# --no-undefined --relax
555 555
diff --git a/scilab/config/ltmain.sh b/scilab/config/ltmain.sh
index 3506ead..d8447d5 100755
--- a/scilab/config/ltmain.sh
+++ b/scilab/config/ltmain.sh
@@ -1,9 +1,10 @@
1# Generated from ltmain.m4sh. 1# Generated from ltmain.m4sh.
2 2
3# ltmain.sh (GNU libtool) 2.2.6 3# libtool (GNU libtool 1.3121 2009-09-18) 2.2.7a
4# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 4# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
5 5
6# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. 6# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
7# 2007, 2008, 2009 Free Software Foundation, Inc.
7# This is free software; see the source for copying conditions. There is NO 8# This is free software; see the source for copying conditions. There is NO
8# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 9# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
9 10
@@ -32,50 +33,54 @@
32# 33#
33# Provide generalized library-building support services. 34# Provide generalized library-building support services.
34# 35#
35# --config show all configuration variables 36# --config show all configuration variables
36# --debug enable verbose shell tracing 37# --debug enable verbose shell tracing
37# -n, --dry-run display commands without modifying any files 38# -n, --dry-run display commands without modifying any files
38# --features display basic configuration information and exit 39# --features display basic configuration information and exit
39# --mode=MODE use operation mode MODE 40# --mode=MODE use operation mode MODE
40# --preserve-dup-deps don't remove duplicate dependency libraries 41# --preserve-dup-deps don't remove duplicate dependency libraries
41# --quiet, --silent don't print informational messages 42# --quiet, --silent don't print informational messages
42# --tag=TAG use configuration variables from tag TAG 43# --no-quiet, --no-silent
43# -v, --verbose print informational messages (default) 44# print informational messages (default)
44# --version print version information 45# --tag=TAG use configuration variables from tag TAG
45# -h, --help print short or long help message 46# -v, --verbose print more informational messages than default
47# --no-verbose don't print the extra informational messages
48# --version print version information
49# -h, --help, --help-all print short, long, or detailed help message
46# 50#
47# MODE must be one of the following: 51# MODE must be one of the following:
48# 52#
49# clean remove files from the build directory 53# clean remove files from the build directory
50# compile compile a source file into a libtool object 54# compile compile a source file into a libtool object
51# execute automatically set library path, then run a program 55# execute automatically set library path, then run a program
52# finish complete the installation of libtool libraries 56# finish complete the installation of libtool libraries
53# install install libraries or executables 57# install install libraries or executables
54# link create a library or an executable 58# link create a library or an executable
55# uninstall remove libraries from an installed directory 59# uninstall remove libraries from an installed directory
56# 60#
57# MODE-ARGS vary depending on the MODE. 61# MODE-ARGS vary depending on the MODE. When passed as first option,
62# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
58# Try `$progname --help --mode=MODE' for a more detailed description of MODE. 63# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
59# 64#
60# When reporting a bug, please describe a test case to reproduce it and 65# When reporting a bug, please describe a test case to reproduce it and
61# include the following information: 66# include the following information:
62# 67#
63# host-triplet: $host 68# host-triplet: $host
64# shell: $SHELL 69# shell: $SHELL
65# compiler: $LTCC 70# compiler: $LTCC
66# compiler flags: $LTCFLAGS 71# compiler flags: $LTCFLAGS
67# linker: $LD (gnu? $with_gnu_ld) 72# linker: $LD (gnu? $with_gnu_ld)
68# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4 73# $progname: (GNU libtool 1.3121 2009-09-18) 2.2.7a
69# automake: $automake_version 74# automake: $automake_version
70# autoconf: $autoconf_version 75# autoconf: $autoconf_version
71# 76#
72# Report bugs to <bug-libtool@gnu.org>. 77# Report bugs to <bug-libtool@gnu.org>.
73 78
74PROGRAM=ltmain.sh 79PROGRAM=libtool
75PACKAGE=libtool 80PACKAGE=libtool
76VERSION="2.2.6 Debian-2.2.6a-4" 81VERSION=2.2.7a
77TIMESTAMP="" 82TIMESTAMP=" 1.3121 2009-09-18"
78package_revision=1.3012 83package_revision=1.3121
79 84
80# Be Bourne compatible 85# Be Bourne compatible
81if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then 86if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -91,6 +96,14 @@ fi
91BIN_SH=xpg4; export BIN_SH # for Tru64 96BIN_SH=xpg4; export BIN_SH # for Tru64
92DUALCASE=1; export DUALCASE # for MKS sh 97DUALCASE=1; export DUALCASE # for MKS sh
93 98
99# A function that is used when there is no print builtin or printf.
100func_fallback_echo ()
101{
102 eval 'cat <<_LTECHO_EOF
103$1
104_LTECHO_EOF'
105}
106
94# NLS nuisances: We save the old values to restore during execute mode. 107# NLS nuisances: We save the old values to restore during execute mode.
95# Only set LANG and LC_ALL to C if already set. 108# Only set LANG and LC_ALL to C if already set.
96# These must not be set unconditionally because not all systems understand 109# These must not be set unconditionally because not all systems understand
@@ -114,8 +127,19 @@ $lt_unset CDPATH
114 127
115 128
116 129
130
131
132# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
133# is ksh but when the shell is invoked as "sh" and the current value of
134# the _XPG environment variable is not equal to 1 (one), the special
135# positional parameter $0, within a function call, is the name of the
136# function.
137progpath="$0"
138
139
140
117: ${CP="cp -f"} 141: ${CP="cp -f"}
118: ${ECHO="echo"} 142: ${ECHO=$as_echo}
119: ${EGREP="/bin/grep -E"} 143: ${EGREP="/bin/grep -E"}
120: ${FGREP="/bin/grep -F"} 144: ${FGREP="/bin/grep -F"}
121: ${GREP="/bin/grep"} 145: ${GREP="/bin/grep"}
@@ -159,32 +183,165 @@ basename="s,^.*/,,"
159func_dirname_and_basename () 183func_dirname_and_basename ()
160{ 184{
161 # Extract subdirectory from the argument. 185 # Extract subdirectory from the argument.
162 func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` 186 func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
163 if test "X$func_dirname_result" = "X${1}"; then 187 if test "X$func_dirname_result" = "X${1}"; then
164 func_dirname_result="${3}" 188 func_dirname_result="${3}"
165 else 189 else
166 func_dirname_result="$func_dirname_result${2}" 190 func_dirname_result="$func_dirname_result${2}"
167 fi 191 fi
168 func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` 192 func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
169} 193}
170 194
171# Generated shell functions inserted here. 195# Generated shell functions inserted here.
172 196
173# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh 197# These SED scripts presuppose an absolute path with a trailing slash.
174# is ksh but when the shell is invoked as "sh" and the current value of 198pathcar="s,^/\([^/]*\).*$,\1,"
175# the _XPG environment variable is not equal to 1 (one), the special 199pathcdr="s,^/[^/]*,,"
176# positional parameter $0, within a function call, is the name of the 200removedotparts="s@/\(\./\)\{1,\}@/@g;s,/\.$,/,"
177# function. 201collapseslashes="s@/\{1,\}@/@g"
178progpath="$0" 202finalslash="s,/*$,/,"
203
204# func_normal_abspath PATH
205# Remove doubled-up and trailing slashes, "." path components,
206# and cancel out any ".." path components in PATH after making
207# it an absolute path.
208# value returned in "$func_normal_abspath_result"
209func_normal_abspath ()
210{
211 # Start from root dir and reassemble the path.
212 func_normal_abspath_result=
213 func_normal_abspath_tpath=$1
214 func_normal_abspath_altnamespace=
215 case $func_normal_abspath_tpath in
216 "")
217 # Empty path, that just means $cwd.
218 func_stripname '' '/' "`pwd`"
219 func_normal_abspath_result=$func_stripname_result
220 return
221 ;;
222 # The next three entries are used to spot a run of precisely
223 # two leading slashes without using negated character classes;
224 # we take advantage of case's first-match behaviour.
225 ///*)
226 # Unusual form of absolute path, do nothing.
227 ;;
228 //*)
229 # Not necessarily an ordinary path; POSIX reserves leading '//'
230 # and for example Cygwin uses it to access remote file shares
231 # over CIFS/SMB, so we conserve a leading double slash if found.
232 func_normal_abspath_altnamespace=/
233 ;;
234 /*)
235 # Absolute path, do nothing.
236 ;;
237 *)
238 # Relative path, prepend $cwd.
239 func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
240 ;;
241 esac
242 # Cancel out all the simple stuff to save iterations. We also want
243 # the path to end with a slash for ease of parsing, so make sure
244 # there is one (and only one) here.
245 func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
246 -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
247 while :; do
248 # Processed it all yet?
249 if test "$func_normal_abspath_tpath" = / ; then
250 # If we ascended to the root using ".." the result may be empty now.
251 if test -z "$func_normal_abspath_result" ; then
252 func_normal_abspath_result=/
253 fi
254 break
255 fi
256 func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
257 -e "$pathcar"`
258 func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
259 -e "$pathcdr"`
260 # Figure out what to do with it
261 case $func_normal_abspath_tcomponent in
262 "")
263 # Trailing empty path component, ignore it.
264 ;;
265 ..)
266 # Parent dir; strip last assembled component from result.
267 func_dirname "$func_normal_abspath_result"
268 func_normal_abspath_result=$func_dirname_result
269 ;;
270 *)
271 # Actual path component, append it.
272 func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
273 ;;
274 esac
275 done
276 # Restore leading double-slash if one was found on entry.
277 func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
278}
279
280# func_relative_path SRCDIR DSTDIR
281# generates a relative path from SRCDIR to DSTDIR, with a trailing
282# slash if non-empty, suitable for immediately appending a filename
283# without needing to append a separator.
284# value returned in "$func_relative_path_result"
285func_relative_path ()
286{
287 func_relative_path_result=
288 func_normal_abspath "$1"
289 func_relative_path_tlibdir=$func_normal_abspath_result
290 func_normal_abspath "$2"
291 func_relative_path_tbindir=$func_normal_abspath_result
292
293 # Ascend the tree starting from libdir
294 while :; do
295 # check if we have found a prefix of bindir
296 case $func_relative_path_tbindir in
297 $func_relative_path_tlibdir)
298 # found an exact match
299 func_relative_path_tcancelled=
300 break
301 ;;
302 $func_relative_path_tlibdir*)
303 # found a matching prefix
304 func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
305 func_relative_path_tcancelled=$func_stripname_result
306 if test -z "$func_relative_path_result"; then
307 func_relative_path_result=.
308 fi
309 break
310 ;;
311 *)
312 func_dirname $func_relative_path_tlibdir
313 func_relative_path_tlibdir=${func_dirname_result}
314 if test "x$func_relative_path_tlibdir" = x ; then
315 # Have to descend all the way to the root!
316 func_relative_path_result=../$func_relative_path_result
317 func_relative_path_tcancelled=$func_relative_path_tbindir
318 break
319 fi
320 func_relative_path_result=../$func_relative_path_result
321 ;;
322 esac
323 done
324
325 # Now calculate path; take care to avoid doubling-up slashes.
326 func_stripname '' '/' "$func_relative_path_result"
327 func_relative_path_result=$func_stripname_result
328 func_stripname '/' '/' "$func_relative_path_tcancelled"
329 if test "x$func_stripname_result" != x ; then
330 func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
331 fi
332
333 # Normalisation. If bindir is libdir, return empty string,
334 # else relative path ending with a slash; either way, target
335 # file name can be directly appended.
336 if test ! -z "$func_relative_path_result"; then
337 func_stripname './' '' "$func_relative_path_result/"
338 func_relative_path_result=$func_stripname_result
339 fi
340}
179 341
180# The name of this program: 342# The name of this program:
181# In the unlikely event $progname began with a '-', it would play havoc with
182# func_echo (imagine progname=-n), so we prepend ./ in that case:
183func_dirname_and_basename "$progpath" 343func_dirname_and_basename "$progpath"
184progname=$func_basename_result 344progname=$func_basename_result
185case $progname in
186 -*) progname=./$progname ;;
187esac
188 345
189# Make sure we have an absolute path for reexecution: 346# Make sure we have an absolute path for reexecution:
190case $progpath in 347case $progpath in
@@ -258,6 +415,13 @@ func_verbose ()
258 : 415 :
259} 416}
260 417
418# func_echo_all arg...
419# Invoke $ECHO with all args, space-separated.
420func_echo_all ()
421{
422 $ECHO "$*"
423}
424
261# func_error arg... 425# func_error arg...
262# Echo program name prefixed message to standard error. 426# Echo program name prefixed message to standard error.
263func_error () 427func_error ()
@@ -326,9 +490,9 @@ func_mkdir_p ()
326 case $my_directory_path in */*) ;; *) break ;; esac 490 case $my_directory_path in */*) ;; *) break ;; esac
327 491
328 # ...otherwise throw away the child directory and loop 492 # ...otherwise throw away the child directory and loop
329 my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` 493 my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
330 done 494 done
331 my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` 495 my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
332 496
333 save_mkdir_p_IFS="$IFS"; IFS=':' 497 save_mkdir_p_IFS="$IFS"; IFS=':'
334 for my_dir in $my_dir_list; do 498 for my_dir in $my_dir_list; do
@@ -378,7 +542,7 @@ func_mktempdir ()
378 func_fatal_error "cannot create temporary directory \`$my_tmpdir'" 542 func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
379 fi 543 fi
380 544
381 $ECHO "X$my_tmpdir" | $Xsed 545 $ECHO "$my_tmpdir"
382} 546}
383 547
384 548
@@ -392,7 +556,7 @@ func_quote_for_eval ()
392{ 556{
393 case $1 in 557 case $1 in
394 *[\\\`\"\$]*) 558 *[\\\`\"\$]*)
395 func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; 559 func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
396 *) 560 *)
397 func_quote_for_eval_unquoted_result="$1" ;; 561 func_quote_for_eval_unquoted_result="$1" ;;
398 esac 562 esac
@@ -419,7 +583,7 @@ func_quote_for_expand ()
419{ 583{
420 case $1 in 584 case $1 in
421 *[\\\`\"]*) 585 *[\\\`\"]*)
422 my_arg=`$ECHO "X$1" | $Xsed \ 586 my_arg=`$ECHO "$1" | $SED \
423 -e "$double_quote_subst" -e "$sed_double_backslash"` ;; 587 -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
424 *) 588 *)
425 my_arg="$1" ;; 589 my_arg="$1" ;;
@@ -496,7 +660,15 @@ func_show_eval_locale ()
496# Echo version message to standard output and exit. 660# Echo version message to standard output and exit.
497func_version () 661func_version ()
498{ 662{
499 $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { 663 $SED -n '/(C)/!b go
664 :more
665 /\./!{
666 N
667 s/\n# //
668 b more
669 }
670 :go
671 /^# '$PROGRAM' (GNU /,/# warranty; / {
500 s/^# // 672 s/^# //
501 s/^# *$// 673 s/^# *$//
502 s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ 674 s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@ -509,19 +681,20 @@ func_version ()
509# Echo short help message to standard output and exit. 681# Echo short help message to standard output and exit.
510func_usage () 682func_usage ()
511{ 683{
512 $SED -n '/^# Usage:/,/# -h/ { 684 $SED -n '/^# Usage:/,/^# *-h/ {
513 s/^# // 685 s/^# //
514 s/^# *$// 686 s/^# *$//
515 s/\$progname/'$progname'/ 687 s/\$progname/'$progname'/
516 p 688 p
517 }' < "$progpath" 689 }' < "$progpath"
518 $ECHO 690 echo
519 $ECHO "run \`$progname --help | more' for full usage" 691 $ECHO "run \`$progname --help | more' for full usage"
520 exit $? 692 exit $?
521} 693}
522 694
523# func_help 695# func_help [NOEXIT]
524# Echo long help message to standard output and exit. 696# Echo long help message to standard output and exit,
697# unless 'noexit' is passed as argument.
525func_help () 698func_help ()
526{ 699{
527 $SED -n '/^# Usage:/,/# Report bugs to/ { 700 $SED -n '/^# Usage:/,/# Report bugs to/ {
@@ -538,7 +711,10 @@ func_help ()
538 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ 711 s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
539 p 712 p
540 }' < "$progpath" 713 }' < "$progpath"
541 exit $? 714 ret=$?
715 if test -z "$1"; then
716 exit $ret
717 fi
542} 718}
543 719
544# func_missing_arg argname 720# func_missing_arg argname
@@ -556,29 +732,6 @@ exit_cmd=:
556 732
557 733
558 734
559# Check that we have a working $ECHO.
560if test "X$1" = X--no-reexec; then
561 # Discard the --no-reexec flag, and continue.
562 shift
563elif test "X$1" = X--fallback-echo; then
564 # Avoid inline document here, it may be left over
565 :
566elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
567 # Yippee, $ECHO works!
568 :
569else
570 # Restart under the correct shell, and then maybe $ECHO will work.
571 exec $SHELL "$progpath" --no-reexec ${1+"$@"}
572fi
573
574if test "X$1" = X--fallback-echo; then
575 # used as fallback echo
576 shift
577 cat <<EOF
578$*
579EOF
580 exit $EXIT_SUCCESS
581fi
582 735
583magic="%%%MAGIC variable%%%" 736magic="%%%MAGIC variable%%%"
584magic_exe="%%%MAGIC EXE variable%%%" 737magic_exe="%%%MAGIC EXE variable%%%"
@@ -636,16 +789,16 @@ func_config ()
636# Display the features supported by this script. 789# Display the features supported by this script.
637func_features () 790func_features ()
638{ 791{
639 $ECHO "host: $host" 792 echo "host: $host"
640 if test "$build_libtool_libs" = yes; then 793 if test "$build_libtool_libs" = yes; then
641 $ECHO "enable shared libraries" 794 echo "enable shared libraries"
642 else 795 else
643 $ECHO "disable shared libraries" 796 echo "disable shared libraries"
644 fi 797 fi
645 if test "$build_old_libs" = yes; then 798 if test "$build_old_libs" = yes; then
646 $ECHO "enable static libraries" 799 echo "enable static libraries"
647 else 800 else
648 $ECHO "disable static libraries" 801 echo "disable static libraries"
649 fi 802 fi
650 803
651 exit $? 804 exit $?
@@ -772,10 +925,21 @@ func_enable_tag ()
772 925
773 --quiet|--silent) preserve_args="$preserve_args $opt" 926 --quiet|--silent) preserve_args="$preserve_args $opt"
774 opt_silent=: 927 opt_silent=:
928 opt_verbose=false
929 ;;
930
931 --no-quiet|--no-silent)
932 preserve_args="$preserve_args $opt"
933 opt_silent=false
775 ;; 934 ;;
776 935
777 --verbose| -v) preserve_args="$preserve_args $opt" 936 --verbose| -v) preserve_args="$preserve_args $opt"
778 opt_silent=false 937 opt_silent=false
938 opt_verbose=:
939 ;;
940
941 --no-verbose) preserve_args="$preserve_args $opt"
942 opt_verbose=false
779 ;; 943 ;;
780 944
781 --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break 945 --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
@@ -793,6 +957,7 @@ func_enable_tag ()
793 957
794 -\?|-h) func_usage ;; 958 -\?|-h) func_usage ;;
795 --help) opt_help=: ;; 959 --help) opt_help=: ;;
960 --help-all) opt_help=': help-all' ;;
796 --version) func_version ;; 961 --version) func_version ;;
797 962
798 -*) func_fatal_help "unrecognized option \`$opt'" ;; 963 -*) func_fatal_help "unrecognized option \`$opt'" ;;
@@ -1016,10 +1181,13 @@ func_infer_tag ()
1016 func_quote_for_eval "$arg" 1181 func_quote_for_eval "$arg"
1017 CC_quoted="$CC_quoted $func_quote_for_eval_result" 1182 CC_quoted="$CC_quoted $func_quote_for_eval_result"
1018 done 1183 done
1184 CC_expanded=`func_echo_all $CC`
1185 CC_quoted_expanded=`func_echo_all $CC_quoted`
1019 case $@ in 1186 case $@ in
1020 # Blanks in the command may have been stripped by the calling shell, 1187 # Blanks in the command may have been stripped by the calling shell,
1021 # but not from the CC environment variable when configure was run. 1188 # but not from the CC environment variable when configure was run.
1022 " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; 1189 " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
1190 " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
1023 # Blanks at the start of $base_compile will cause this to fail 1191 # Blanks at the start of $base_compile will cause this to fail
1024 # if we don't check for them as well. 1192 # if we don't check for them as well.
1025 *) 1193 *)
@@ -1033,8 +1201,11 @@ func_infer_tag ()
1033 func_quote_for_eval "$arg" 1201 func_quote_for_eval "$arg"
1034 CC_quoted="$CC_quoted $func_quote_for_eval_result" 1202 CC_quoted="$CC_quoted $func_quote_for_eval_result"
1035 done 1203 done
1204 CC_expanded=`func_echo_all $CC`
1205 CC_quoted_expanded=`func_echo_all $CC_quoted`
1036 case "$@ " in 1206 case "$@ " in
1037 " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) 1207 " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
1208 " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
1038 # The compiler in the base compile command matches 1209 # The compiler in the base compile command matches
1039 # the one in the tagged configuration. 1210 # the one in the tagged configuration.
1040 # Assume this is the tagged configuration we want. 1211 # Assume this is the tagged configuration we want.
@@ -1213,7 +1384,7 @@ func_mode_compile ()
1213 *.[cCFSifmso] | \ 1384 *.[cCFSifmso] | \
1214 *.ada | *.adb | *.ads | *.asm | \ 1385 *.ada | *.adb | *.ads | *.asm | \
1215 *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ 1386 *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
1216 *.[fF][09]? | *.for | *.java | *.obj | *.sx) 1387 *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
1217 func_xform "$libobj" 1388 func_xform "$libobj"
1218 libobj=$func_xform_result 1389 libobj=$func_xform_result
1219 ;; 1390 ;;
@@ -1288,7 +1459,7 @@ func_mode_compile ()
1288 # Calculate the filename of the output object if compiler does 1459 # Calculate the filename of the output object if compiler does
1289 # not support -o with -c 1460 # not support -o with -c
1290 if test "$compiler_c_o" = no; then 1461 if test "$compiler_c_o" = no; then
1291 output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} 1462 output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
1292 lockfile="$output_obj.lock" 1463 lockfile="$output_obj.lock"
1293 else 1464 else
1294 output_obj= 1465 output_obj=
@@ -1445,7 +1616,7 @@ compiler."
1445} 1616}
1446 1617
1447$opt_help || { 1618$opt_help || {
1448test "$mode" = compile && func_mode_compile ${1+"$@"} 1619 test "$mode" = compile && func_mode_compile ${1+"$@"}
1449} 1620}
1450 1621
1451func_mode_help () 1622func_mode_help ()
@@ -1486,6 +1657,7 @@ This mode accepts the following additional options:
1486 -prefer-non-pic try to building non-PIC objects only 1657 -prefer-non-pic try to building non-PIC objects only
1487 -shared do not build a \`.o' file suitable for static linking 1658 -shared do not build a \`.o' file suitable for static linking
1488 -static only build a \`.o' file suitable for static linking 1659 -static only build a \`.o' file suitable for static linking
1660 -Wc,FLAG pass FLAG directly to the compiler
1489 1661
1490COMPILE-COMMAND is a command to be used in creating a \`standard' object file 1662COMPILE-COMMAND is a command to be used in creating a \`standard' object file
1491from the given SOURCEFILE. 1663from the given SOURCEFILE.
@@ -1538,7 +1710,7 @@ either the \`install' or \`cp' program.
1538 1710
1539The following components of INSTALL-COMMAND are treated specially: 1711The following components of INSTALL-COMMAND are treated specially:
1540 1712
1541 -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation 1713 -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
1542 1714
1543The rest of the components are interpreted as arguments to that command (only 1715The rest of the components are interpreted as arguments to that command (only
1544BSD-compatible install options are recognized)." 1716BSD-compatible install options are recognized)."
@@ -1558,6 +1730,8 @@ The following components of LINK-COMMAND are treated specially:
1558 1730
1559 -all-static do not do any dynamic linking at all 1731 -all-static do not do any dynamic linking at all
1560 -avoid-version do not add a version suffix if possible 1732 -avoid-version do not add a version suffix if possible
1733 -bindir BINDIR specify path to binaries directory (for systems where
1734 libraries must be found in the PATH setting at runtime)
1561 -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime 1735 -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
1562 -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols 1736 -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
1563 -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) 1737 -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
@@ -1586,6 +1760,11 @@ The following components of LINK-COMMAND are treated specially:
1586 -version-info CURRENT[:REVISION[:AGE]] 1760 -version-info CURRENT[:REVISION[:AGE]]
1587 specify library version info [each variable defaults to 0] 1761 specify library version info [each variable defaults to 0]
1588 -weak LIBNAME declare that the target provides the LIBNAME interface 1762 -weak LIBNAME declare that the target provides the LIBNAME interface
1763 -Wc,FLAG
1764 -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
1765 -Wl,FLAG
1766 -Xlinker FLAG pass linker-specific FLAG directly to the linker
1767 -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
1589 1768
1590All other options (arguments beginning with \`-') are ignored. 1769All other options (arguments beginning with \`-') are ignored.
1591 1770
@@ -1623,14 +1802,40 @@ Otherwise, only FILE itself is deleted using RM."
1623 ;; 1802 ;;
1624 esac 1803 esac
1625 1804
1626 $ECHO 1805 echo
1627 $ECHO "Try \`$progname --help' for more information about other modes." 1806 $ECHO "Try \`$progname --help' for more information about other modes."
1628
1629 exit $?
1630} 1807}
1631 1808
1632 # Now that we've collected a possible --mode arg, show help if necessary 1809# Now that we've collected a possible --mode arg, show help if necessary
1633 $opt_help && func_mode_help 1810if $opt_help; then
1811 if test "$opt_help" = :; then
1812 func_mode_help
1813 else
1814 {
1815 func_help noexit
1816 for mode in compile link execute install finish uninstall clean; do
1817 func_mode_help
1818 done
1819 } | sed -n '1p; 2,$s/^Usage:/ or: /p'
1820 {
1821 func_help noexit
1822 for mode in compile link execute install finish uninstall clean; do
1823 echo
1824 func_mode_help
1825 done
1826 } |
1827 sed '1d
1828 /^When reporting/,/^Report/{
1829 H
1830 d
1831 }
1832 $x
1833 /information about other modes/d
1834 /more detailed .*MODE/d
1835 s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
1836 fi
1837 exit $?
1838fi
1634 1839
1635 1840
1636# func_mode_execute arg... 1841# func_mode_execute arg...
@@ -1712,7 +1917,7 @@ func_mode_execute ()
1712 for file 1917 for file
1713 do 1918 do
1714 case $file in 1919 case $file in
1715 -*) ;; 1920 -* | *.la | *.lo ) ;;
1716 *) 1921 *)
1717 # Do a test to see if this is really a libtool program. 1922 # Do a test to see if this is really a libtool program.
1718 if func_ltwrapper_script_p "$file"; then 1923 if func_ltwrapper_script_p "$file"; then
@@ -1754,7 +1959,7 @@ func_mode_execute ()
1754 # Display what would be done. 1959 # Display what would be done.
1755 if test -n "$shlibpath_var"; then 1960 if test -n "$shlibpath_var"; then
1756 eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" 1961 eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
1757 $ECHO "export $shlibpath_var" 1962 echo "export $shlibpath_var"
1758 fi 1963 fi
1759 $ECHO "$cmd$args" 1964 $ECHO "$cmd$args"
1760 exit $EXIT_SUCCESS 1965 exit $EXIT_SUCCESS
@@ -1795,23 +2000,23 @@ func_mode_finish ()
1795 # Exit here if they wanted silent mode. 2000 # Exit here if they wanted silent mode.
1796 $opt_silent && exit $EXIT_SUCCESS 2001 $opt_silent && exit $EXIT_SUCCESS
1797 2002
1798 $ECHO "X----------------------------------------------------------------------" | $Xsed 2003 echo "----------------------------------------------------------------------"
1799 $ECHO "Libraries have been installed in:" 2004 echo "Libraries have been installed in:"
1800 for libdir in $libdirs; do 2005 for libdir in $libdirs; do
1801 $ECHO " $libdir" 2006 $ECHO " $libdir"
1802 done 2007 done
1803 $ECHO 2008 echo
1804 $ECHO "If you ever happen to want to link against installed libraries" 2009 echo "If you ever happen to want to link against installed libraries"
1805 $ECHO "in a given directory, LIBDIR, you must either use libtool, and" 2010 echo "in a given directory, LIBDIR, you must either use libtool, and"
1806 $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" 2011 echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
1807 $ECHO "flag during linking and do at least one of the following:" 2012 echo "flag during linking and do at least one of the following:"
1808 if test -n "$shlibpath_var"; then 2013 if test -n "$shlibpath_var"; then
1809 $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" 2014 echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
1810 $ECHO " during execution" 2015 echo " during execution"
1811 fi 2016 fi
1812 if test -n "$runpath_var"; then 2017 if test -n "$runpath_var"; then
1813 $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" 2018 echo " - add LIBDIR to the \`$runpath_var' environment variable"
1814 $ECHO " during linking" 2019 echo " during linking"
1815 fi 2020 fi
1816 if test -n "$hardcode_libdir_flag_spec"; then 2021 if test -n "$hardcode_libdir_flag_spec"; then
1817 libdir=LIBDIR 2022 libdir=LIBDIR
@@ -1823,21 +2028,21 @@ func_mode_finish ()
1823 $ECHO " - have your system administrator run these commands:$admincmds" 2028 $ECHO " - have your system administrator run these commands:$admincmds"
1824 fi 2029 fi
1825 if test -f /etc/ld.so.conf; then 2030 if test -f /etc/ld.so.conf; then
1826 $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" 2031 echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
1827 fi 2032 fi
1828 $ECHO 2033 echo
1829 2034
1830 $ECHO "See any operating system documentation about shared libraries for" 2035 echo "See any operating system documentation about shared libraries for"
1831 case $host in 2036 case $host in
1832 solaris2.[6789]|solaris2.1[0-9]) 2037 solaris2.[6789]|solaris2.1[0-9])
1833 $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" 2038 echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
1834 $ECHO "pages." 2039 echo "pages."
1835 ;; 2040 ;;
1836 *) 2041 *)
1837 $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." 2042 echo "more information, such as the ld(1) and ld.so(8) manual pages."
1838 ;; 2043 ;;
1839 esac 2044 esac
1840 $ECHO "X----------------------------------------------------------------------" | $Xsed 2045 echo "----------------------------------------------------------------------"
1841 exit $EXIT_SUCCESS 2046 exit $EXIT_SUCCESS
1842} 2047}
1843 2048
@@ -1852,7 +2057,7 @@ func_mode_install ()
1852 # install_prog (especially on Windows NT). 2057 # install_prog (especially on Windows NT).
1853 if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || 2058 if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
1854 # Allow the use of GNU shtool's install command. 2059 # Allow the use of GNU shtool's install command.
1855 $ECHO "X$nonopt" | $GREP shtool >/dev/null; then 2060 case $nonopt in *shtool*) :;; *) false;; esac; then
1856 # Aesthetically quote it. 2061 # Aesthetically quote it.
1857 func_quote_for_eval "$nonopt" 2062 func_quote_for_eval "$nonopt"
1858 install_prog="$func_quote_for_eval_result " 2063 install_prog="$func_quote_for_eval_result "
@@ -1867,6 +2072,11 @@ func_mode_install ()
1867 # Aesthetically quote it. 2072 # Aesthetically quote it.
1868 func_quote_for_eval "$arg" 2073 func_quote_for_eval "$arg"
1869 install_prog="$install_prog$func_quote_for_eval_result" 2074 install_prog="$install_prog$func_quote_for_eval_result"
2075 install_shared_prog=$install_prog
2076 case " $install_prog " in
2077 *[\\\ /]cp\ *) install_cp=: ;;
2078 *) install_cp=false ;;
2079 esac
1870 2080
1871 # We need to accept at least all the BSD install flags. 2081 # We need to accept at least all the BSD install flags.
1872 dest= 2082 dest=
@@ -1876,8 +2086,10 @@ func_mode_install ()
1876 install_type= 2086 install_type=
1877 isdir=no 2087 isdir=no
1878 stripme= 2088 stripme=
2089 no_mode=:
1879 for arg 2090 for arg
1880 do 2091 do
2092 arg2=
1881 if test -n "$dest"; then 2093 if test -n "$dest"; then
1882 files="$files $dest" 2094 files="$files $dest"
1883 dest=$arg 2095 dest=$arg
@@ -1887,10 +2099,9 @@ func_mode_install ()
1887 case $arg in 2099 case $arg in
1888 -d) isdir=yes ;; 2100 -d) isdir=yes ;;
1889 -f) 2101 -f)
1890 case " $install_prog " in 2102 if $install_cp; then :; else
1891 *[\\\ /]cp\ *) ;; 2103 prev=$arg
1892 *) prev=$arg ;; 2104 fi
1893 esac
1894 ;; 2105 ;;
1895 -g | -m | -o) 2106 -g | -m | -o)
1896 prev=$arg 2107 prev=$arg
@@ -1904,6 +2115,10 @@ func_mode_install ()
1904 *) 2115 *)
1905 # If the previous option needed an argument, then skip it. 2116 # If the previous option needed an argument, then skip it.
1906 if test -n "$prev"; then 2117 if test -n "$prev"; then
2118 if test "x$prev" = x-m && test -n "$install_override_mode"; then
2119 arg2=$install_override_mode
2120 no_mode=false
2121 fi
1907 prev= 2122 prev=
1908 else 2123 else
1909 dest=$arg 2124 dest=$arg
@@ -1915,6 +2130,10 @@ func_mode_install ()
1915 # Aesthetically quote the argument. 2130 # Aesthetically quote the argument.
1916 func_quote_for_eval "$arg" 2131 func_quote_for_eval "$arg"
1917 install_prog="$install_prog $func_quote_for_eval_result" 2132 install_prog="$install_prog $func_quote_for_eval_result"
2133 if test -n "$arg2"; then
2134 func_quote_for_eval "$arg2"
2135 fi
2136 install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
1918 done 2137 done
1919 2138
1920 test -z "$install_prog" && \ 2139 test -z "$install_prog" && \
@@ -1923,6 +2142,13 @@ func_mode_install ()
1923 test -n "$prev" && \ 2142 test -n "$prev" && \
1924 func_fatal_help "the \`$prev' option requires an argument" 2143 func_fatal_help "the \`$prev' option requires an argument"
1925 2144
2145 if test -n "$install_override_mode" && $no_mode; then
2146 if $install_cp; then :; else
2147 func_quote_for_eval "$install_override_mode"
2148 install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
2149 fi
2150 fi
2151
1926 if test -z "$files"; then 2152 if test -z "$files"; then
1927 if test -z "$dest"; then 2153 if test -z "$dest"; then
1928 func_fatal_help "no file or destination specified" 2154 func_fatal_help "no file or destination specified"
@@ -2010,7 +2236,7 @@ func_mode_install ()
2010 2236
2011 if test -n "$relink_command"; then 2237 if test -n "$relink_command"; then
2012 # Determine the prefix the user has applied to our future dir. 2238 # Determine the prefix the user has applied to our future dir.
2013 inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` 2239 inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
2014 2240
2015 # Don't allow the user to place us outside of our expected 2241 # Don't allow the user to place us outside of our expected
2016 # location b/c this prevents finding dependent libraries that 2242 # location b/c this prevents finding dependent libraries that
@@ -2023,9 +2249,9 @@ func_mode_install ()
2023 2249
2024 if test -n "$inst_prefix_dir"; then 2250 if test -n "$inst_prefix_dir"; then
2025 # Stick the inst_prefix_dir data into the link command. 2251 # Stick the inst_prefix_dir data into the link command.
2026 relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` 2252 relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
2027 else 2253 else
2028 relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` 2254 relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
2029 fi 2255 fi
2030 2256
2031 func_warning "relinking \`$file'" 2257 func_warning "relinking \`$file'"
@@ -2043,7 +2269,7 @@ func_mode_install ()
2043 test -n "$relink_command" && srcname="$realname"T 2269 test -n "$relink_command" && srcname="$realname"T
2044 2270
2045 # Install the shared library and build the symlinks. 2271 # Install the shared library and build the symlinks.
2046 func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ 2272 func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
2047 'exit $?' 2273 'exit $?'
2048 tstripme="$stripme" 2274 tstripme="$stripme"
2049 case $host_os in 2275 case $host_os in
@@ -2183,7 +2409,7 @@ func_mode_install ()
2183 if test -f "$lib"; then 2409 if test -f "$lib"; then
2184 func_source "$lib" 2410 func_source "$lib"
2185 fi 2411 fi
2186 libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test 2412 libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
2187 if test -n "$libdir" && test ! -f "$libfile"; then 2413 if test -n "$libdir" && test ! -f "$libfile"; then
2188 func_warning "\`$lib' has not been installed in \`$libdir'" 2414 func_warning "\`$lib' has not been installed in \`$libdir'"
2189 finalize=no 2415 finalize=no
@@ -2202,7 +2428,7 @@ func_mode_install ()
2202 file="$func_basename_result" 2428 file="$func_basename_result"
2203 outputname="$tmpdir/$file" 2429 outputname="$tmpdir/$file"
2204 # Replace the output file specification. 2430 # Replace the output file specification.
2205 relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` 2431 relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
2206 2432
2207 $opt_silent || { 2433 $opt_silent || {
2208 func_quote_for_expand "$relink_command" 2434 func_quote_for_expand "$relink_command"
@@ -2221,7 +2447,7 @@ func_mode_install ()
2221 } 2447 }
2222 else 2448 else
2223 # Install the binary that we compiled earlier. 2449 # Install the binary that we compiled earlier.
2224 file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` 2450 file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
2225 fi 2451 fi
2226 fi 2452 fi
2227 2453
@@ -2323,6 +2549,10 @@ func_generate_dlsyms ()
2323extern \"C\" { 2549extern \"C\" {
2324#endif 2550#endif
2325 2551
2552#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
2553#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
2554#endif
2555
2326/* External symbol declarations for the compiler. */\ 2556/* External symbol declarations for the compiler. */\
2327" 2557"
2328 2558
@@ -2332,7 +2562,7 @@ extern \"C\" {
2332 $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" 2562 $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
2333 2563
2334 # Add our own program objects to the symbol list. 2564 # Add our own program objects to the symbol list.
2335 progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` 2565 progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
2336 for progfile in $progfiles; do 2566 for progfile in $progfiles; do
2337 func_verbose "extracting global C symbols from \`$progfile'" 2567 func_verbose "extracting global C symbols from \`$progfile'"
2338 $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" 2568 $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
@@ -2371,7 +2601,7 @@ extern \"C\" {
2371 eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' 2601 eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
2372 eval '$MV "$nlist"T "$nlist"' 2602 eval '$MV "$nlist"T "$nlist"'
2373 case $host in 2603 case $host in
2374 *cygwin | *mingw* | *cegcc* ) 2604 *cygwin* | *mingw* | *cegcc* )
2375 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' 2605 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
2376 eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' 2606 eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
2377 ;; 2607 ;;
@@ -2415,10 +2645,10 @@ extern \"C\" {
2415 if test -f "$nlist"S; then 2645 if test -f "$nlist"S; then
2416 eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' 2646 eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
2417 else 2647 else
2418 $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" 2648 echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
2419 fi 2649 fi
2420 2650
2421 $ECHO >> "$output_objdir/$my_dlsyms" "\ 2651 echo >> "$output_objdir/$my_dlsyms" "\
2422 2652
2423/* The mapping between symbol names and symbols. */ 2653/* The mapping between symbol names and symbols. */
2424typedef struct { 2654typedef struct {
@@ -2428,7 +2658,7 @@ typedef struct {
2428" 2658"
2429 case $host in 2659 case $host in
2430 *cygwin* | *mingw* | *cegcc* ) 2660 *cygwin* | *mingw* | *cegcc* )
2431 $ECHO >> "$output_objdir/$my_dlsyms" "\ 2661 echo >> "$output_objdir/$my_dlsyms" "\
2432/* DATA imports from DLLs on WIN32 con't be const, because 2662/* DATA imports from DLLs on WIN32 con't be const, because
2433 runtime relocations are performed -- see ld's documentation 2663 runtime relocations are performed -- see ld's documentation
2434 on pseudo-relocs. */" 2664 on pseudo-relocs. */"
@@ -2441,7 +2671,7 @@ typedef struct {
2441 lt_dlsym_const=const ;; 2671 lt_dlsym_const=const ;;
2442 esac 2672 esac
2443 2673
2444 $ECHO >> "$output_objdir/$my_dlsyms" "\ 2674 echo >> "$output_objdir/$my_dlsyms" "\
2445extern $lt_dlsym_const lt_dlsymlist 2675extern $lt_dlsym_const lt_dlsymlist
2446lt_${my_prefix}_LTX_preloaded_symbols[]; 2676lt_${my_prefix}_LTX_preloaded_symbols[];
2447$lt_dlsym_const lt_dlsymlist 2677$lt_dlsym_const lt_dlsymlist
@@ -2457,7 +2687,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] =
2457 eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" 2687 eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
2458 ;; 2688 ;;
2459 esac 2689 esac
2460 $ECHO >> "$output_objdir/$my_dlsyms" "\ 2690 echo >> "$output_objdir/$my_dlsyms" "\
2461 {0, (void *) 0} 2691 {0, (void *) 0}
2462}; 2692};
2463 2693
@@ -2515,16 +2745,16 @@ static const void *lt_preloaded_setup() {
2515 case $host in 2745 case $host in
2516 *cygwin* | *mingw* | *cegcc* ) 2746 *cygwin* | *mingw* | *cegcc* )
2517 if test -f "$output_objdir/$my_outputname.def"; then 2747 if test -f "$output_objdir/$my_outputname.def"; then
2518 compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` 2748 compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
2519 finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` 2749 finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
2520 else 2750 else
2521 compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` 2751 compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
2522 finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` 2752 finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
2523 fi 2753 fi
2524 ;; 2754 ;;
2525 *) 2755 *)
2526 compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` 2756 compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
2527 finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` 2757 finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
2528 ;; 2758 ;;
2529 esac 2759 esac
2530 ;; 2760 ;;
@@ -2538,8 +2768,8 @@ static const void *lt_preloaded_setup() {
2538 # really was required. 2768 # really was required.
2539 2769
2540 # Nullify the symbol file. 2770 # Nullify the symbol file.
2541 compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` 2771 compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
2542 finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` 2772 finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
2543 fi 2773 fi
2544} 2774}
2545 2775
@@ -2549,6 +2779,7 @@ static const void *lt_preloaded_setup() {
2549# Need a lot of goo to handle *both* DLLs and import libs 2779# Need a lot of goo to handle *both* DLLs and import libs
2550# Has to be a shell function in order to 'eat' the argument 2780# Has to be a shell function in order to 'eat' the argument
2551# that is supplied when $file_magic_command is called. 2781# that is supplied when $file_magic_command is called.
2782# Despite the name, also deal with 64 bit binaries.
2552func_win32_libid () 2783func_win32_libid ()
2553{ 2784{
2554 $opt_debug 2785 $opt_debug
@@ -2560,7 +2791,7 @@ func_win32_libid ()
2560 ;; 2791 ;;
2561 *ar\ archive*) # could be an import, or static 2792 *ar\ archive*) # could be an import, or static
2562 if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | 2793 if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
2563 $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then 2794 $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
2564 win32_nmres=`eval $NM -f posix -A $1 | 2795 win32_nmres=`eval $NM -f posix -A $1 |
2565 $SED -n -e ' 2796 $SED -n -e '
2566 1,100{ 2797 1,100{
@@ -2598,7 +2829,18 @@ func_extract_an_archive ()
2598 $opt_debug 2829 $opt_debug
2599 f_ex_an_ar_dir="$1"; shift 2830 f_ex_an_ar_dir="$1"; shift
2600 f_ex_an_ar_oldlib="$1" 2831 f_ex_an_ar_oldlib="$1"
2601 func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' 2832 if test "$lock_old_archive_extraction" = yes; then
2833 lockfile=$f_ex_an_ar_oldlib.lock
2834 until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
2835 func_echo "Waiting for $lockfile to be removed"
2836 sleep 2
2837 done
2838 fi
2839 func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
2840 'stat=$?; rm -f "$lockfile"; exit $stat'
2841 if test "$lock_old_archive_extraction" = yes; then
2842 $opt_dry_run || rm -f "$lockfile"
2843 fi
2602 if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then 2844 if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
2603 : 2845 :
2604 else 2846 else
@@ -2691,18 +2933,23 @@ func_extract_archives ()
2691} 2933}
2692 2934
2693 2935
2694 2936# func_emit_wrapper [arg=no]
2695# func_emit_wrapper_part1 [arg=no]
2696# 2937#
2697# Emit the first part of a libtool wrapper script on stdout. 2938# Emit a libtool wrapper script on stdout.
2698# For more information, see the description associated with 2939# Don't directly open a file because we may want to
2699# func_emit_wrapper(), below. 2940# incorporate the script contents within a cygwin/mingw
2700func_emit_wrapper_part1 () 2941# wrapper executable. Must ONLY be called from within
2942# func_mode_link because it depends on a number of variables
2943# set therein.
2944#
2945# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
2946# variable will take. If 'yes', then the emitted script
2947# will assume that the directory in which it is stored is
2948# the $objdir directory. This is a cygwin/mingw-specific
2949# behavior.
2950func_emit_wrapper ()
2701{ 2951{
2702 func_emit_wrapper_part1_arg1=no 2952 func_emit_wrapper_arg1=${1-no}
2703 if test -n "$1" ; then
2704 func_emit_wrapper_part1_arg1=$1
2705 fi
2706 2953
2707 $ECHO "\ 2954 $ECHO "\
2708#! $SHELL 2955#! $SHELL
@@ -2718,7 +2965,6 @@ func_emit_wrapper_part1 ()
2718 2965
2719# Sed substitution that helps us do robust quoting. It backslashifies 2966# Sed substitution that helps us do robust quoting. It backslashifies
2720# metacharacters that are still active within double-quoted strings. 2967# metacharacters that are still active within double-quoted strings.
2721Xsed='${SED} -e 1s/^X//'
2722sed_quote_subst='$sed_quote_subst' 2968sed_quote_subst='$sed_quote_subst'
2723 2969
2724# Be Bourne compatible 2970# Be Bourne compatible
@@ -2749,31 +2995,29 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then
2749else 2995else
2750 # When we are sourced in execute mode, \$file and \$ECHO are already set. 2996 # When we are sourced in execute mode, \$file and \$ECHO are already set.
2751 if test \"\$libtool_execute_magic\" != \"$magic\"; then 2997 if test \"\$libtool_execute_magic\" != \"$magic\"; then
2752 ECHO=\"$qecho\" 2998 file=\"\$0\""
2753 file=\"\$0\" 2999
2754 # Make sure echo works. 3000 qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
2755 if test \"X\$1\" = X--no-reexec; then 3001 $ECHO "\
2756 # Discard the --no-reexec flag, and continue. 3002
2757 shift 3003# A function that is used when there is no print builtin or printf.
2758 elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then 3004func_fallback_echo ()
2759 # Yippee, \$ECHO works! 3005{
2760 : 3006 eval 'cat <<_LTECHO_EOF
2761 else 3007\$1
2762 # Restart under the correct shell, and then maybe \$ECHO will work. 3008_LTECHO_EOF'
2763 exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} 3009}
2764 fi 3010 ECHO=\"$qECHO\"
2765 fi\ 3011 fi\
2766"
2767 $ECHO "\
2768 3012
2769 # Find the directory that this script lives in. 3013 # Find the directory that this script lives in.
2770 thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` 3014 thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
2771 test \"x\$thisdir\" = \"x\$file\" && thisdir=. 3015 test \"x\$thisdir\" = \"x\$file\" && thisdir=.
2772 3016
2773 # Follow symbolic links until we get to the real thisdir. 3017 # Follow symbolic links until we get to the real thisdir.
2774 file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` 3018 file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
2775 while test -n \"\$file\"; do 3019 while test -n \"\$file\"; do
2776 destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` 3020 destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
2777 3021
2778 # If there was a directory component, then change thisdir. 3022 # If there was a directory component, then change thisdir.
2779 if test \"x\$destdir\" != \"x\$file\"; then 3023 if test \"x\$destdir\" != \"x\$file\"; then
@@ -2783,30 +3027,13 @@ else
2783 esac 3027 esac
2784 fi 3028 fi
2785 3029
2786 file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` 3030 file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
2787 file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` 3031 file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
2788 done 3032 done
2789"
2790}
2791# end: func_emit_wrapper_part1
2792
2793# func_emit_wrapper_part2 [arg=no]
2794#
2795# Emit the second part of a libtool wrapper script on stdout.
2796# For more information, see the description associated with
2797# func_emit_wrapper(), below.
2798func_emit_wrapper_part2 ()
2799{
2800 func_emit_wrapper_part2_arg1=no
2801 if test -n "$1" ; then
2802 func_emit_wrapper_part2_arg1=$1
2803 fi
2804
2805 $ECHO "\
2806 3033
2807 # Usually 'no', except on cygwin/mingw when embedded into 3034 # Usually 'no', except on cygwin/mingw when embedded into
2808 # the cwrapper. 3035 # the cwrapper.
2809 WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 3036 WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
2810 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then 3037 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
2811 # special case for '.' 3038 # special case for '.'
2812 if test \"\$thisdir\" = \".\"; then 3039 if test \"\$thisdir\" = \".\"; then
@@ -2814,7 +3041,7 @@ func_emit_wrapper_part2 ()
2814 fi 3041 fi
2815 # remove .libs from thisdir 3042 # remove .libs from thisdir
2816 case \"\$thisdir\" in 3043 case \"\$thisdir\" in
2817 *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; 3044 *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
2818 $objdir ) thisdir=. ;; 3045 $objdir ) thisdir=. ;;
2819 esac 3046 esac
2820 fi 3047 fi
@@ -2877,7 +3104,7 @@ func_emit_wrapper_part2 ()
2877 3104
2878 # Some systems cannot cope with colon-terminated $shlibpath_var 3105 # Some systems cannot cope with colon-terminated $shlibpath_var
2879 # The second colon is a workaround for a bug in BeOS R4 sed 3106 # The second colon is a workaround for a bug in BeOS R4 sed
2880 $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` 3107 $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
2881 3108
2882 export $shlibpath_var 3109 export $shlibpath_var
2883" 3110"
@@ -2917,41 +3144,12 @@ func_emit_wrapper_part2 ()
2917 # The program doesn't exist. 3144 # The program doesn't exist.
2918 \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 3145 \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
2919 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 3146 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
2920 $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 3147 \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
2921 exit 1 3148 exit 1
2922 fi 3149 fi
2923fi\ 3150fi\
2924" 3151"
2925} 3152}
2926# end: func_emit_wrapper_part2
2927
2928
2929# func_emit_wrapper [arg=no]
2930#
2931# Emit a libtool wrapper script on stdout.
2932# Don't directly open a file because we may want to
2933# incorporate the script contents within a cygwin/mingw
2934# wrapper executable. Must ONLY be called from within
2935# func_mode_link because it depends on a number of variables
2936# set therein.
2937#
2938# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
2939# variable will take. If 'yes', then the emitted script
2940# will assume that the directory in which it is stored is
2941# the $objdir directory. This is a cygwin/mingw-specific
2942# behavior.
2943func_emit_wrapper ()
2944{
2945 func_emit_wrapper_arg1=no
2946 if test -n "$1" ; then
2947 func_emit_wrapper_arg1=$1
2948 fi
2949
2950 # split this up so that func_emit_cwrapperexe_src
2951 # can call each part independently.
2952 func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
2953 func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
2954}
2955 3153
2956 3154
2957# func_to_host_path arg 3155# func_to_host_path arg
@@ -2978,23 +3176,19 @@ func_emit_wrapper ()
2978func_to_host_path () 3176func_to_host_path ()
2979{ 3177{
2980 func_to_host_path_result="$1" 3178 func_to_host_path_result="$1"
2981 if test -n "$1" ; then 3179 if test -n "$1"; then
2982 case $host in 3180 case $host in
2983 *mingw* ) 3181 *mingw* )
2984 lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' 3182 lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
2985 case $build in 3183 case $build in
2986 *mingw* ) # actually, msys 3184 *mingw* ) # actually, msys
2987 # awkward: cmd appends spaces to result 3185 # awkward: cmd appends spaces to result
2988 lt_sed_strip_trailing_spaces="s/[ ]*\$//" 3186 func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
2989 func_to_host_path_tmp1=`( cmd //c echo "$1" |\ 3187 $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
2990 $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
2991 func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
2992 $SED -e "$lt_sed_naive_backslashify"`
2993 ;; 3188 ;;
2994 *cygwin* ) 3189 *cygwin* )
2995 func_to_host_path_tmp1=`cygpath -w "$1"` 3190 func_to_host_path_result=`cygpath -w "$1" |
2996 func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ 3191 $SED -e "$lt_sed_naive_backslashify"`
2997 $SED -e "$lt_sed_naive_backslashify"`
2998 ;; 3192 ;;
2999 * ) 3193 * )
3000 # Unfortunately, winepath does not exit with a non-zero 3194 # Unfortunately, winepath does not exit with a non-zero
@@ -3006,17 +3200,17 @@ func_to_host_path ()
3006 # the odd construction: 3200 # the odd construction:
3007 func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` 3201 func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
3008 if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then 3202 if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
3009 func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ 3203 func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
3010 $SED -e "$lt_sed_naive_backslashify"` 3204 $SED -e "$lt_sed_naive_backslashify"`
3011 else 3205 else
3012 # Allow warning below. 3206 # Allow warning below.
3013 func_to_host_path_result="" 3207 func_to_host_path_result=
3014 fi 3208 fi
3015 ;; 3209 ;;
3016 esac 3210 esac
3017 if test -z "$func_to_host_path_result" ; then 3211 if test -z "$func_to_host_path_result" ; then
3018 func_error "Could not determine host path corresponding to" 3212 func_error "Could not determine host path corresponding to"
3019 func_error " '$1'" 3213 func_error " \`$1'"
3020 func_error "Continuing, but uninstalled executables may not work." 3214 func_error "Continuing, but uninstalled executables may not work."
3021 # Fallback: 3215 # Fallback:
3022 func_to_host_path_result="$1" 3216 func_to_host_path_result="$1"
@@ -3049,30 +3243,24 @@ func_to_host_path ()
3049func_to_host_pathlist () 3243func_to_host_pathlist ()
3050{ 3244{
3051 func_to_host_pathlist_result="$1" 3245 func_to_host_pathlist_result="$1"
3052 if test -n "$1" ; then 3246 if test -n "$1"; then
3053 case $host in 3247 case $host in
3054 *mingw* ) 3248 *mingw* )
3055 lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' 3249 lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
3056 # Remove leading and trailing path separator characters from 3250 # Remove leading and trailing path separator characters from
3057 # ARG. msys behavior is inconsistent here, cygpath turns them 3251 # ARG. msys behavior is inconsistent here, cygpath turns them
3058 # into '.;' and ';.', and winepath ignores them completely. 3252 # into '.;' and ';.', and winepath ignores them completely.
3059 func_to_host_pathlist_tmp2="$1" 3253 func_stripname : : "$1"
3060 # Once set for this call, this variable should not be 3254 func_to_host_pathlist_tmp1=$func_stripname_result
3061 # reassigned. It is used in tha fallback case.
3062 func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
3063 $SED -e 's|^:*||' -e 's|:*$||'`
3064 case $build in 3255 case $build in
3065 *mingw* ) # Actually, msys. 3256 *mingw* ) # Actually, msys.
3066 # Awkward: cmd appends spaces to result. 3257 # Awkward: cmd appends spaces to result.
3067 lt_sed_strip_trailing_spaces="s/[ ]*\$//" 3258 func_to_host_pathlist_result=`
3068 func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ 3259 ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
3069 $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` 3260 $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
3070 func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
3071 $SED -e "$lt_sed_naive_backslashify"`
3072 ;; 3261 ;;
3073 *cygwin* ) 3262 *cygwin* )
3074 func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` 3263 func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
3075 func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
3076 $SED -e "$lt_sed_naive_backslashify"` 3264 $SED -e "$lt_sed_naive_backslashify"`
3077 ;; 3265 ;;
3078 * ) 3266 * )
@@ -3088,18 +3276,17 @@ func_to_host_pathlist ()
3088 if test -z "$func_to_host_pathlist_result" ; then 3276 if test -z "$func_to_host_pathlist_result" ; then
3089 func_to_host_pathlist_result="$func_to_host_path_result" 3277 func_to_host_pathlist_result="$func_to_host_path_result"
3090 else 3278 else
3091 func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" 3279 func_append func_to_host_pathlist_result ";$func_to_host_path_result"
3092 fi 3280 fi
3093 fi 3281 fi
3094 fi 3282 fi
3095 IFS=:
3096 done 3283 done
3097 IFS=$func_to_host_pathlist_oldIFS 3284 IFS=$func_to_host_pathlist_oldIFS
3098 ;; 3285 ;;
3099 esac 3286 esac
3100 if test -z "$func_to_host_pathlist_result" ; then 3287 if test -z "$func_to_host_pathlist_result"; then
3101 func_error "Could not determine the host path(s) corresponding to" 3288 func_error "Could not determine the host path(s) corresponding to"
3102 func_error " '$1'" 3289 func_error " \`$1'"
3103 func_error "Continuing, but uninstalled executables may not work." 3290 func_error "Continuing, but uninstalled executables may not work."
3104 # Fallback. This may break if $1 contains DOS-style drive 3291 # Fallback. This may break if $1 contains DOS-style drive
3105 # specifications. The fix is not to complicate the expression 3292 # specifications. The fix is not to complicate the expression
@@ -3116,7 +3303,7 @@ func_to_host_pathlist ()
3116 ;; 3303 ;;
3117 esac 3304 esac
3118 case "$1" in 3305 case "$1" in
3119 *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" 3306 *: ) func_append func_to_host_pathlist_result ";"
3120 ;; 3307 ;;
3121 esac 3308 esac
3122 ;; 3309 ;;
@@ -3148,24 +3335,20 @@ func_emit_cwrapperexe_src ()
3148*/ 3335*/
3149EOF 3336EOF
3150 cat <<"EOF" 3337 cat <<"EOF"
3338#ifdef _MSC_VER
3339# define _CRT_SECURE_NO_DEPRECATE 1
3340#endif
3151#include <stdio.h> 3341#include <stdio.h>
3152#include <stdlib.h> 3342#include <stdlib.h>
3153#ifdef _MSC_VER 3343#ifdef _MSC_VER
3154# include <direct.h> 3344# include <direct.h>
3155# include <process.h> 3345# include <process.h>
3156# include <io.h> 3346# include <io.h>
3157# define setmode _setmode
3158#else 3347#else
3159# include <unistd.h> 3348# include <unistd.h>
3160# include <stdint.h> 3349# include <stdint.h>
3161# ifdef __CYGWIN__ 3350# ifdef __CYGWIN__
3162# include <io.h> 3351# include <io.h>
3163# define HAVE_SETENV
3164# ifdef __STRICT_ANSI__
3165char *realpath (const char *, char *);
3166int putenv (char *);
3167int setenv (const char *, const char *, int);
3168# endif
3169# endif 3352# endif
3170#endif 3353#endif
3171#include <malloc.h> 3354#include <malloc.h>
@@ -3177,6 +3360,44 @@ int setenv (const char *, const char *, int);
3177#include <fcntl.h> 3360#include <fcntl.h>
3178#include <sys/stat.h> 3361#include <sys/stat.h>
3179 3362
3363/* declarations of non-ANSI functions */
3364#if defined(__MINGW32__)
3365# ifdef __STRICT_ANSI__
3366int _putenv (const char *);
3367# endif
3368#elif defined(__CYGWIN__)
3369# ifdef __STRICT_ANSI__
3370char *realpath (const char *, char *);
3371int putenv (char *);
3372int setenv (const char *, const char *, int);
3373# endif
3374/* #elif defined (other platforms) ... */
3375#endif
3376
3377/* portability defines, excluding path handling macros */
3378#if defined(_MSC_VER)
3379# define setmode _setmode
3380# define stat _stat
3381# define chmod _chmod
3382# define getcwd _getcwd
3383# define putenv _putenv
3384# define S_IXUSR _S_IEXEC
3385# ifndef _INTPTR_T_DEFINED
3386# define _INTPTR_T_DEFINED
3387# define intptr_t int
3388# endif
3389#elif defined(__MINGW32__)
3390# define setmode _setmode
3391# define stat _stat
3392# define chmod _chmod
3393# define getcwd _getcwd
3394# define putenv _putenv
3395#elif defined(__CYGWIN__)
3396# define HAVE_SETENV
3397# define FOPEN_WB "wb"
3398/* #elif defined (other platforms) ... */
3399#endif
3400
3180#if defined(PATH_MAX) 3401#if defined(PATH_MAX)
3181# define LT_PATHMAX PATH_MAX 3402# define LT_PATHMAX PATH_MAX
3182#elif defined(MAXPATHLEN) 3403#elif defined(MAXPATHLEN)
@@ -3192,14 +3413,7 @@ int setenv (const char *, const char *, int);
3192# define S_IXGRP 0 3413# define S_IXGRP 0
3193#endif 3414#endif
3194 3415
3195#ifdef _MSC_VER 3416/* path handling portability macros */
3196# define S_IXUSR _S_IEXEC
3197# define stat _stat
3198# ifndef _INTPTR_T_DEFINED
3199# define intptr_t int
3200# endif
3201#endif
3202
3203#ifndef DIR_SEPARATOR 3417#ifndef DIR_SEPARATOR
3204# define DIR_SEPARATOR '/' 3418# define DIR_SEPARATOR '/'
3205# define PATH_SEPARATOR ':' 3419# define PATH_SEPARATOR ':'
@@ -3230,10 +3444,6 @@ int setenv (const char *, const char *, int);
3230# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) 3444# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
3231#endif /* PATH_SEPARATOR_2 */ 3445#endif /* PATH_SEPARATOR_2 */
3232 3446
3233#ifdef __CYGWIN__
3234# define FOPEN_WB "wb"
3235#endif
3236
3237#ifndef FOPEN_WB 3447#ifndef FOPEN_WB
3238# define FOPEN_WB "w" 3448# define FOPEN_WB "w"
3239#endif 3449#endif
@@ -3247,7 +3457,7 @@ int setenv (const char *, const char *, int);
3247} while (0) 3457} while (0)
3248 3458
3249#undef LTWRAPPER_DEBUGPRINTF 3459#undef LTWRAPPER_DEBUGPRINTF
3250#if defined DEBUGWRAPPER 3460#if defined LT_DEBUGWRAPPER
3251# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args 3461# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
3252static void 3462static void
3253ltwrapper_debugprintf (const char *fmt, ...) 3463ltwrapper_debugprintf (const char *fmt, ...)
@@ -3274,28 +3484,11 @@ char *strendzap (char *str, const char *pat);
3274void lt_fatal (const char *message, ...); 3484void lt_fatal (const char *message, ...);
3275void lt_setenv (const char *name, const char *value); 3485void lt_setenv (const char *name, const char *value);
3276char *lt_extend_str (const char *orig_value, const char *add, int to_end); 3486char *lt_extend_str (const char *orig_value, const char *add, int to_end);
3277void lt_opt_process_env_set (const char *arg);
3278void lt_opt_process_env_prepend (const char *arg);
3279void lt_opt_process_env_append (const char *arg);
3280int lt_split_name_value (const char *arg, char** name, char** value);
3281void lt_update_exe_path (const char *name, const char *value); 3487void lt_update_exe_path (const char *name, const char *value);
3282void lt_update_lib_path (const char *name, const char *value); 3488void lt_update_lib_path (const char *name, const char *value);
3283 3489char **prepare_spawn (char **argv);
3284static const char *script_text_part1 = 3490void lt_dump_script (FILE *f);
3285EOF
3286
3287 func_emit_wrapper_part1 yes |
3288 $SED -e 's/\([\\"]\)/\\\1/g' \
3289 -e 's/^/ "/' -e 's/$/\\n"/'
3290 echo ";"
3291 cat <<EOF
3292
3293static const char *script_text_part2 =
3294EOF 3491EOF
3295 func_emit_wrapper_part2 yes |
3296 $SED -e 's/\([\\"]\)/\\\1/g' \
3297 -e 's/^/ "/' -e 's/$/\\n"/'
3298 echo ";"
3299 3492
3300 cat <<EOF 3493 cat <<EOF
3301const char * MAGIC_EXE = "$magic_exe"; 3494const char * MAGIC_EXE = "$magic_exe";
@@ -3347,18 +3540,6 @@ static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
3347 3540
3348static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; 3541static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
3349 3542
3350static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
3351static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
3352 /* argument is putenv-style "foo=bar", value of foo is set to bar */
3353
3354static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
3355static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
3356 /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
3357
3358static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
3359static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
3360 /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
3361
3362int 3543int
3363main (int argc, char *argv[]) 3544main (int argc, char *argv[])
3364{ 3545{
@@ -3391,8 +3572,7 @@ EOF
3391 esac 3572 esac
3392 3573
3393 cat <<"EOF" 3574 cat <<"EOF"
3394 printf ("%s", script_text_part1); 3575 lt_dump_script (stdout);
3395 printf ("%s", script_text_part2);
3396 return 0; 3576 return 0;
3397 } 3577 }
3398 } 3578 }
@@ -3484,51 +3664,6 @@ EOF
3484 newargc=0; 3664 newargc=0;
3485 for (i = 1; i < argc; i++) 3665 for (i = 1; i < argc; i++)
3486 { 3666 {
3487 if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
3488 {
3489 if (argv[i][env_set_opt_len] == '=')
3490 {
3491 const char *p = argv[i] + env_set_opt_len + 1;
3492 lt_opt_process_env_set (p);
3493 }
3494 else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
3495 {
3496 lt_opt_process_env_set (argv[++i]); /* don't copy */
3497 }
3498 else
3499 lt_fatal ("%s missing required argument", env_set_opt);
3500 continue;
3501 }
3502 if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
3503 {
3504 if (argv[i][env_prepend_opt_len] == '=')
3505 {
3506 const char *p = argv[i] + env_prepend_opt_len + 1;
3507 lt_opt_process_env_prepend (p);
3508 }
3509 else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
3510 {
3511 lt_opt_process_env_prepend (argv[++i]); /* don't copy */
3512 }
3513 else
3514 lt_fatal ("%s missing required argument", env_prepend_opt);
3515 continue;
3516 }
3517 if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
3518 {
3519 if (argv[i][env_append_opt_len] == '=')
3520 {
3521 const char *p = argv[i] + env_append_opt_len + 1;
3522 lt_opt_process_env_append (p);
3523 }
3524 else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
3525 {
3526 lt_opt_process_env_append (argv[++i]); /* don't copy */
3527 }
3528 else
3529 lt_fatal ("%s missing required argument", env_append_opt);
3530 continue;
3531 }
3532 if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) 3667 if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
3533 { 3668 {
3534 /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX 3669 /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
@@ -3560,6 +3695,7 @@ EOF
3560 mingw*) 3695 mingw*)
3561 cat <<"EOF" 3696 cat <<"EOF"
3562 /* execv doesn't actually work on mingw as expected on unix */ 3697 /* execv doesn't actually work on mingw as expected on unix */
3698 newargz = prepare_spawn (newargz);
3563 rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); 3699 rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
3564 if (rval == -1) 3700 if (rval == -1)
3565 { 3701 {
@@ -3904,89 +4040,6 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
3904 return new_value; 4040 return new_value;
3905} 4041}
3906 4042
3907int
3908lt_split_name_value (const char *arg, char** name, char** value)
3909{
3910 const char *p;
3911 int len;
3912 if (!arg || !*arg)
3913 return 1;
3914
3915 p = strchr (arg, (int)'=');
3916
3917 if (!p)
3918 return 1;
3919
3920 *value = xstrdup (++p);
3921
3922 len = strlen (arg) - strlen (*value);
3923 *name = XMALLOC (char, len);
3924 strncpy (*name, arg, len-1);
3925 (*name)[len - 1] = '\0';
3926
3927 return 0;
3928}
3929
3930void
3931lt_opt_process_env_set (const char *arg)
3932{
3933 char *name = NULL;
3934 char *value = NULL;
3935
3936 if (lt_split_name_value (arg, &name, &value) != 0)
3937 {
3938 XFREE (name);
3939 XFREE (value);
3940 lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
3941 }
3942
3943 lt_setenv (name, value);
3944 XFREE (name);
3945 XFREE (value);
3946}
3947
3948void
3949lt_opt_process_env_prepend (const char *arg)
3950{
3951 char *name = NULL;
3952 char *value = NULL;
3953 char *new_value = NULL;
3954
3955 if (lt_split_name_value (arg, &name, &value) != 0)
3956 {
3957 XFREE (name);
3958 XFREE (value);
3959 lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
3960 }
3961
3962 new_value = lt_extend_str (getenv (name), value, 0);
3963 lt_setenv (name, new_value);
3964 XFREE (new_value);
3965 XFREE (name);
3966 XFREE (value);
3967}
3968
3969void
3970lt_opt_process_env_append (const char *arg)
3971{
3972 char *name = NULL;
3973 char *value = NULL;
3974 char *new_value = NULL;
3975
3976 if (lt_split_name_value (arg, &name, &value) != 0)
3977 {
3978 XFREE (name);
3979 XFREE (value);
3980 lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
3981 }
3982
3983 new_value = lt_extend_str (getenv (name), value, 1);
3984 lt_setenv (name, new_value);
3985 XFREE (new_value);
3986 XFREE (name);
3987 XFREE (value);
3988}
3989
3990void 4043void
3991lt_update_exe_path (const char *name, const char *value) 4044lt_update_exe_path (const char *name, const char *value)
3992{ 4045{
@@ -4023,11 +4076,152 @@ lt_update_lib_path (const char *name, const char *value)
4023 } 4076 }
4024} 4077}
4025 4078
4079EOF
4080 case $host_os in
4081 mingw*)
4082 cat <<"EOF"
4083
4084/* Prepares an argument vector before calling spawn().
4085 Note that spawn() does not by itself call the command interpreter
4086 (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
4087 ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
4088 GetVersionEx(&v);
4089 v.dwPlatformId == VER_PLATFORM_WIN32_NT;
4090 }) ? "cmd.exe" : "command.com").
4091 Instead it simply concatenates the arguments, separated by ' ', and calls
4092 CreateProcess(). We must quote the arguments since Win32 CreateProcess()
4093 interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
4094 special way:
4095 - Space and tab are interpreted as delimiters. They are not treated as
4096 delimiters if they are surrounded by double quotes: "...".
4097 - Unescaped double quotes are removed from the input. Their only effect is
4098 that within double quotes, space and tab are treated like normal
4099 characters.
4100 - Backslashes not followed by double quotes are not special.
4101 - But 2*n+1 backslashes followed by a double quote become
4102 n backslashes followed by a double quote (n >= 0):
4103 \" -> "
4104 \\\" -> \"
4105 \\\\\" -> \\"
4106 */
4107#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
4108#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
4109char **
4110prepare_spawn (char **argv)
4111{
4112 size_t argc;
4113 char **new_argv;
4114 size_t i;
4115
4116 /* Count number of arguments. */
4117 for (argc = 0; argv[argc] != NULL; argc++)
4118 ;
4119
4120 /* Allocate new argument vector. */
4121 new_argv = XMALLOC (char *, argc + 1);
4122
4123 /* Put quoted arguments into the new argument vector. */
4124 for (i = 0; i < argc; i++)
4125 {
4126 const char *string = argv[i];
4127
4128 if (string[0] == '\0')
4129 new_argv[i] = xstrdup ("\"\"");
4130 else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
4131 {
4132 int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
4133 size_t length;
4134 unsigned int backslashes;
4135 const char *s;
4136 char *quoted_string;
4137 char *p;
4138
4139 length = 0;
4140 backslashes = 0;
4141 if (quote_around)
4142 length++;
4143 for (s = string; *s != '\0'; s++)
4144 {
4145 char c = *s;
4146 if (c == '"')
4147 length += backslashes + 1;
4148 length++;
4149 if (c == '\\')
4150 backslashes++;
4151 else
4152 backslashes = 0;
4153 }
4154 if (quote_around)
4155 length += backslashes + 1;
4156
4157 quoted_string = XMALLOC (char, length + 1);
4158
4159 p = quoted_string;
4160 backslashes = 0;
4161 if (quote_around)
4162 *p++ = '"';
4163 for (s = string; *s != '\0'; s++)
4164 {
4165 char c = *s;
4166 if (c == '"')
4167 {
4168 unsigned int j;
4169 for (j = backslashes + 1; j > 0; j--)
4170 *p++ = '\\';
4171 }
4172 *p++ = c;
4173 if (c == '\\')
4174 backslashes++;
4175 else
4176 backslashes = 0;
4177 }
4178 if (quote_around)
4179 {
4180 unsigned int j;
4181 for (j = backslashes; j > 0; j--)
4182 *p++ = '\\';
4183 *p++ = '"';
4184 }
4185 *p = '\0';
4186
4187 new_argv[i] = quoted_string;
4188 }
4189 else
4190 new_argv[i] = (char *) string;
4191 }
4192 new_argv[argc] = NULL;
4193
4194 return new_argv;
4195}
4196EOF
4197 ;;
4198 esac
4199
4200 cat <<"EOF"
4201void lt_dump_script (FILE* f)
4202{
4203EOF
4204 func_emit_wrapper yes |
4205 $SED -e 's/\([\\"]\)/\\\1/g' \
4206 -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
4026 4207
4208 cat <<"EOF"
4209}
4027EOF 4210EOF
4028} 4211}
4029# end: func_emit_cwrapperexe_src 4212# end: func_emit_cwrapperexe_src
4030 4213
4214# func_win32_import_lib_p ARG
4215# True if ARG is an import lib, as indicated by $file_magic_cmd
4216func_win32_import_lib_p ()
4217{
4218 $opt_debug
4219 case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
4220 *import*) : ;;
4221 *) false ;;
4222 esac
4223}
4224
4031# func_mode_link arg... 4225# func_mode_link arg...
4032func_mode_link () 4226func_mode_link ()
4033{ 4227{
@@ -4072,6 +4266,7 @@ func_mode_link ()
4072 new_inherited_linker_flags= 4266 new_inherited_linker_flags=
4073 4267
4074 avoid_version=no 4268 avoid_version=no
4269 bindir=
4075 dlfiles= 4270 dlfiles=
4076 dlprefiles= 4271 dlprefiles=
4077 dlself=no 4272 dlself=no
@@ -4164,6 +4359,11 @@ func_mode_link ()
4164 esac 4359 esac
4165 4360
4166 case $prev in 4361 case $prev in
4362 bindir)
4363 bindir="$arg"
4364 prev=
4365 continue
4366 ;;
4167 dlfiles|dlprefiles) 4367 dlfiles|dlprefiles)
4168 if test "$preload" = no; then 4368 if test "$preload" = no; then
4169 # Add the symbol object into the linking commands. 4369 # Add the symbol object into the linking commands.
@@ -4425,6 +4625,11 @@ func_mode_link ()
4425 continue 4625 continue
4426 ;; 4626 ;;
4427 4627
4628 -bindir)
4629 prev=bindir
4630 continue
4631 ;;
4632
4428 -dlopen) 4633 -dlopen)
4429 prev=dlfiles 4634 prev=dlfiles
4430 continue 4635 continue
@@ -4503,7 +4708,7 @@ func_mode_link ()
4503 esac 4708 esac
4504 case $host in 4709 case $host in
4505 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) 4710 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
4506 testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` 4711 testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
4507 case :$dllsearchpath: in 4712 case :$dllsearchpath: in
4508 *":$dir:"*) ;; 4713 *":$dir:"*) ;;
4509 ::) dllsearchpath=$dir;; 4714 ::) dllsearchpath=$dir;;
@@ -4708,7 +4913,7 @@ func_mode_link ()
4708 for flag in $args; do 4913 for flag in $args; do
4709 IFS="$save_ifs" 4914 IFS="$save_ifs"
4710 func_quote_for_eval "$flag" 4915 func_quote_for_eval "$flag"
4711 arg="$arg $wl$func_quote_for_eval_result" 4916 arg="$arg $func_quote_for_eval_result"
4712 compiler_flags="$compiler_flags $func_quote_for_eval_result" 4917 compiler_flags="$compiler_flags $func_quote_for_eval_result"
4713 done 4918 done
4714 IFS="$save_ifs" 4919 IFS="$save_ifs"
@@ -4764,8 +4969,9 @@ func_mode_link ()
4764 # -F/path gives path to uninstalled frameworks, gcc on darwin 4969 # -F/path gives path to uninstalled frameworks, gcc on darwin
4765 # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC 4970 # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
4766 # @file GCC response files 4971 # @file GCC response files
4972 # -tp=* Portland pgcc target processor selection
4767 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ 4973 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
4768 -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) 4974 -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
4769 func_quote_for_eval "$arg" 4975 func_quote_for_eval "$arg"
4770 arg="$func_quote_for_eval_result" 4976 arg="$func_quote_for_eval_result"
4771 func_append compile_command " $arg" 4977 func_append compile_command " $arg"
@@ -4925,7 +5131,7 @@ func_mode_link ()
4925 5131
4926 if test -n "$shlibpath_var"; then 5132 if test -n "$shlibpath_var"; then
4927 # get the directories listed in $shlibpath_var 5133 # get the directories listed in $shlibpath_var
4928 eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` 5134 eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
4929 else 5135 else
4930 shlib_search_path= 5136 shlib_search_path=
4931 fi 5137 fi
@@ -5033,10 +5239,7 @@ func_mode_link ()
5033 case $pass in 5239 case $pass in
5034 dlopen) libs="$dlfiles" ;; 5240 dlopen) libs="$dlfiles" ;;
5035 dlpreopen) libs="$dlprefiles" ;; 5241 dlpreopen) libs="$dlprefiles" ;;
5036 link) 5242 link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
5037 libs="$deplibs %DEPLIBS%"
5038 test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
5039 ;;
5040 esac 5243 esac
5041 fi 5244 fi
5042 if test "$linkmode,$pass" = "lib,dlpreopen"; then 5245 if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -5051,7 +5254,8 @@ func_mode_link ()
5051 # Collect preopened libtool deplibs, except any this library 5254 # Collect preopened libtool deplibs, except any this library
5052 # has declared as weak libs 5255 # has declared as weak libs
5053 for deplib in $dependency_libs; do 5256 for deplib in $dependency_libs; do
5054 deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` 5257 func_basename "$deplib"
5258 deplib_base=$func_basename_result
5055 case " $weak_libs " in 5259 case " $weak_libs " in
5056 *" $deplib_base "*) ;; 5260 *" $deplib_base "*) ;;
5057 *) deplibs="$deplibs $deplib" ;; 5261 *) deplibs="$deplibs $deplib" ;;
@@ -5230,7 +5434,7 @@ func_mode_link ()
5230 match_pattern*) 5434 match_pattern*)
5231 set dummy $deplibs_check_method; shift 5435 set dummy $deplibs_check_method; shift
5232 match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` 5436 match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
5233 if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ 5437 if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
5234 | $EGREP "$match_pattern_regex" > /dev/null; then 5438 | $EGREP "$match_pattern_regex" > /dev/null; then
5235 valid_a_lib=yes 5439 valid_a_lib=yes
5236 fi 5440 fi
@@ -5240,15 +5444,15 @@ func_mode_link ()
5240 ;; 5444 ;;
5241 esac 5445 esac
5242 if test "$valid_a_lib" != yes; then 5446 if test "$valid_a_lib" != yes; then
5243 $ECHO 5447 echo
5244 $ECHO "*** Warning: Trying to link with static lib archive $deplib." 5448 $ECHO "*** Warning: Trying to link with static lib archive $deplib."
5245 $ECHO "*** I have the capability to make that library automatically link in when" 5449 echo "*** I have the capability to make that library automatically link in when"
5246 $ECHO "*** you link to this library. But I can only do this if you have a" 5450 echo "*** you link to this library. But I can only do this if you have a"
5247 $ECHO "*** shared version of the library, which you do not appear to have" 5451 echo "*** shared version of the library, which you do not appear to have"
5248 $ECHO "*** because the file extensions .$libext of this argument makes me believe" 5452 echo "*** because the file extensions .$libext of this argument makes me believe"
5249 $ECHO "*** that it is just a static archive that I should not use here." 5453 echo "*** that it is just a static archive that I should not use here."
5250 else 5454 else
5251 $ECHO 5455 echo
5252 $ECHO "*** Warning: Linking the shared library $output against the" 5456 $ECHO "*** Warning: Linking the shared library $output against the"
5253 $ECHO "*** static library $deplib is not portable!" 5457 $ECHO "*** static library $deplib is not portable!"
5254 deplibs="$deplib $deplibs" 5458 deplibs="$deplib $deplibs"
@@ -5321,7 +5525,7 @@ func_mode_link ()
5321 5525
5322 # Convert "-framework foo" to "foo.ltframework" 5526 # Convert "-framework foo" to "foo.ltframework"
5323 if test -n "$inherited_linker_flags"; then 5527 if test -n "$inherited_linker_flags"; then
5324 tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` 5528 tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
5325 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do 5529 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
5326 case " $new_inherited_linker_flags " in 5530 case " $new_inherited_linker_flags " in
5327 *" $tmp_inherited_linker_flag "*) ;; 5531 *" $tmp_inherited_linker_flag "*) ;;
@@ -5329,7 +5533,7 @@ func_mode_link ()
5329 esac 5533 esac
5330 done 5534 done
5331 fi 5535 fi
5332 dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` 5536 dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
5333 if test "$linkmode,$pass" = "lib,link" || 5537 if test "$linkmode,$pass" = "lib,link" ||
5334 test "$linkmode,$pass" = "prog,scan" || 5538 test "$linkmode,$pass" = "prog,scan" ||
5335 { test "$linkmode" != prog && test "$linkmode" != lib; }; then 5539 { test "$linkmode" != prog && test "$linkmode" != lib; }; then
@@ -5347,19 +5551,19 @@ func_mode_link ()
5347 # It is a libtool convenience library, so add in its objects. 5551 # It is a libtool convenience library, so add in its objects.
5348 convenience="$convenience $ladir/$objdir/$old_library" 5552 convenience="$convenience $ladir/$objdir/$old_library"
5349 old_convenience="$old_convenience $ladir/$objdir/$old_library" 5553 old_convenience="$old_convenience $ladir/$objdir/$old_library"
5350 tmp_libs=
5351 for deplib in $dependency_libs; do
5352 deplibs="$deplib $deplibs"
5353 if $opt_duplicate_deps ; then
5354 case "$tmp_libs " in
5355 *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5356 esac
5357 fi
5358 tmp_libs="$tmp_libs $deplib"
5359 done
5360 elif test "$linkmode" != prog && test "$linkmode" != lib; then 5554 elif test "$linkmode" != prog && test "$linkmode" != lib; then
5361 func_fatal_error "\`$lib' is not a convenience library" 5555 func_fatal_error "\`$lib' is not a convenience library"
5362 fi 5556 fi
5557 tmp_libs=
5558 for deplib in $dependency_libs; do
5559 deplibs="$deplib $deplibs"
5560 if $opt_duplicate_deps ; then
5561 case "$tmp_libs " in
5562 *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
5563 esac
5564 fi
5565 tmp_libs="$tmp_libs $deplib"
5566 done
5363 continue 5567 continue
5364 fi # $pass = conv 5568 fi # $pass = conv
5365 5569
@@ -5583,7 +5787,7 @@ func_mode_link ()
5583 fi 5787 fi
5584 done 5788 done
5585 if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then 5789 if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
5586 $ECHO 5790 echo
5587 if test "$linkmode" = prog; then 5791 if test "$linkmode" = prog; then
5588 $ECHO "*** Warning: Linking the executable $output against the loadable module" 5792 $ECHO "*** Warning: Linking the executable $output against the loadable module"
5589 else 5793 else
@@ -5686,9 +5890,9 @@ func_mode_link ()
5686 if test "X$dlopenmodule" != "X$lib"; then 5890 if test "X$dlopenmodule" != "X$lib"; then
5687 $ECHO "*** Warning: lib $linklib is a module, not a shared library" 5891 $ECHO "*** Warning: lib $linklib is a module, not a shared library"
5688 if test -z "$old_library" ; then 5892 if test -z "$old_library" ; then
5689 $ECHO 5893 echo
5690 $ECHO "*** And there doesn't seem to be a static archive available" 5894 echo "*** And there doesn't seem to be a static archive available"
5691 $ECHO "*** The link will probably fail, sorry" 5895 echo "*** The link will probably fail, sorry"
5692 else 5896 else
5693 add="$dir/$old_library" 5897 add="$dir/$old_library"
5694 fi 5898 fi
@@ -5828,21 +6032,21 @@ func_mode_link ()
5828 6032
5829 # Just print a warning and add the library to dependency_libs so 6033 # Just print a warning and add the library to dependency_libs so
5830 # that the program can be linked against the static library. 6034 # that the program can be linked against the static library.
5831 $ECHO 6035 echo
5832 $ECHO "*** Warning: This system can not link to static lib archive $lib." 6036 $ECHO "*** Warning: This system can not link to static lib archive $lib."
5833 $ECHO "*** I have the capability to make that library automatically link in when" 6037 echo "*** I have the capability to make that library automatically link in when"
5834 $ECHO "*** you link to this library. But I can only do this if you have a" 6038 echo "*** you link to this library. But I can only do this if you have a"
5835 $ECHO "*** shared version of the library, which you do not appear to have." 6039 echo "*** shared version of the library, which you do not appear to have."
5836 if test "$module" = yes; then 6040 if test "$module" = yes; then
5837 $ECHO "*** But as you try to build a module library, libtool will still create " 6041 echo "*** But as you try to build a module library, libtool will still create "
5838 $ECHO "*** a static module, that should work as long as the dlopening application" 6042 echo "*** a static module, that should work as long as the dlopening application"
5839 $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." 6043 echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
5840 if test -z "$global_symbol_pipe"; then 6044 if test -z "$global_symbol_pipe"; then
5841 $ECHO 6045 echo
5842 $ECHO "*** However, this would only work if libtool was able to extract symbol" 6046 echo "*** However, this would only work if libtool was able to extract symbol"
5843 $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" 6047 echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
5844 $ECHO "*** not find such a program. So, this module is probably useless." 6048 echo "*** not find such a program. So, this module is probably useless."
5845 $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." 6049 echo "*** \`nm' from GNU binutils and a full rebuild may help."
5846 fi 6050 fi
5847 if test "$build_old_libs" = no; then 6051 if test "$build_old_libs" = no; then
5848 build_libtool_libs=module 6052 build_libtool_libs=module
@@ -5962,7 +6166,7 @@ func_mode_link ()
5962 compile_deplibs="$new_inherited_linker_flags $compile_deplibs" 6166 compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
5963 finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" 6167 finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
5964 else 6168 else
5965 compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` 6169 compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
5966 fi 6170 fi
5967 fi 6171 fi
5968 dependency_libs="$newdependency_libs" 6172 dependency_libs="$newdependency_libs"
@@ -6130,7 +6334,7 @@ func_mode_link ()
6130 if test "$deplibs_check_method" != pass_all; then 6334 if test "$deplibs_check_method" != pass_all; then
6131 func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 6335 func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
6132 else 6336 else
6133 $ECHO 6337 echo
6134 $ECHO "*** Warning: Linking the shared library $output against the non-libtool" 6338 $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
6135 $ECHO "*** objects $objs is not portable!" 6339 $ECHO "*** objects $objs is not portable!"
6136 libobjs="$libobjs $objs" 6340 libobjs="$libobjs $objs"
@@ -6198,7 +6402,7 @@ func_mode_link ()
6198 age="$number_minor" 6402 age="$number_minor"
6199 revision="$number_revision" 6403 revision="$number_revision"
6200 ;; 6404 ;;
6201 freebsd-aout|freebsd-elf|sunos) 6405 freebsd-aout|freebsd-elf|qnx|sunos)
6202 current="$number_major" 6406 current="$number_major"
6203 revision="$number_minor" 6407 revision="$number_minor"
6204 age="0" 6408 age="0"
@@ -6210,9 +6414,6 @@ func_mode_link ()
6210 revision="$number_minor" 6414 revision="$number_minor"
6211 lt_irix_increment=no 6415 lt_irix_increment=no
6212 ;; 6416 ;;
6213 *)
6214 func_fatal_configuration "$modename: unknown library version type \`$version_type'"
6215 ;;
6216 esac 6417 esac
6217 ;; 6418 ;;
6218 no) 6419 no)
@@ -6435,14 +6636,14 @@ func_mode_link ()
6435 oldlibs="$oldlibs $output_objdir/$libname.$libext" 6636 oldlibs="$oldlibs $output_objdir/$libname.$libext"
6436 6637
6437 # Transform .lo files to .o files. 6638 # Transform .lo files to .o files.
6438 oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` 6639 oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
6439 fi 6640 fi
6440 6641
6441 # Eliminate all temporary directories. 6642 # Eliminate all temporary directories.
6442 #for path in $notinst_path; do 6643 #for path in $notinst_path; do
6443 # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` 6644 # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
6444 # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` 6645 # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
6445 # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` 6646 # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
6446 #done 6647 #done
6447 6648
6448 if test -n "$xrpath"; then 6649 if test -n "$xrpath"; then
@@ -6568,13 +6769,13 @@ EOF
6568 newdeplibs="$newdeplibs $i" 6769 newdeplibs="$newdeplibs $i"
6569 else 6770 else
6570 droppeddeps=yes 6771 droppeddeps=yes
6571 $ECHO 6772 echo
6572 $ECHO "*** Warning: dynamic linker does not accept needed library $i." 6773 $ECHO "*** Warning: dynamic linker does not accept needed library $i."
6573 $ECHO "*** I have the capability to make that library automatically link in when" 6774 echo "*** I have the capability to make that library automatically link in when"
6574 $ECHO "*** you link to this library. But I can only do this if you have a" 6775 echo "*** you link to this library. But I can only do this if you have a"
6575 $ECHO "*** shared version of the library, which I believe you do not have" 6776 echo "*** shared version of the library, which I believe you do not have"
6576 $ECHO "*** because a test_compile did reveal that the linker did not use it for" 6777 echo "*** because a test_compile did reveal that the linker did not use it for"
6577 $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." 6778 echo "*** its dynamic dependency list that programs get resolved with at runtime."
6578 fi 6779 fi
6579 fi 6780 fi
6580 ;; 6781 ;;
@@ -6611,22 +6812,22 @@ EOF
6611 newdeplibs="$newdeplibs $i" 6812 newdeplibs="$newdeplibs $i"
6612 else 6813 else
6613 droppeddeps=yes 6814 droppeddeps=yes
6614 $ECHO 6815 echo
6615 $ECHO "*** Warning: dynamic linker does not accept needed library $i." 6816 $ECHO "*** Warning: dynamic linker does not accept needed library $i."
6616 $ECHO "*** I have the capability to make that library automatically link in when" 6817 echo "*** I have the capability to make that library automatically link in when"
6617 $ECHO "*** you link to this library. But I can only do this if you have a" 6818 echo "*** you link to this library. But I can only do this if you have a"
6618 $ECHO "*** shared version of the library, which you do not appear to have" 6819 echo "*** shared version of the library, which you do not appear to have"
6619 $ECHO "*** because a test_compile did reveal that the linker did not use this one" 6820 echo "*** because a test_compile did reveal that the linker did not use this one"
6620 $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." 6821 echo "*** as a dynamic dependency that programs can get resolved with at runtime."
6621 fi 6822 fi
6622 fi 6823 fi
6623 else 6824 else
6624 droppeddeps=yes 6825 droppeddeps=yes
6625 $ECHO 6826 echo
6626 $ECHO "*** Warning! Library $i is needed by this library but I was not able to" 6827 $ECHO "*** Warning! Library $i is needed by this library but I was not able to"
6627 $ECHO "*** make it link in! You will probably need to install it or some" 6828 echo "*** make it link in! You will probably need to install it or some"
6628 $ECHO "*** library that it depends on before this library will be fully" 6829 echo "*** library that it depends on before this library will be fully"
6629 $ECHO "*** functional. Installing it before continuing would be even better." 6830 echo "*** functional. Installing it before continuing would be even better."
6630 fi 6831 fi
6631 ;; 6832 ;;
6632 *) 6833 *)
@@ -6672,7 +6873,7 @@ EOF
6672 potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` 6873 potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
6673 case $potliblink in 6874 case $potliblink in
6674 [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; 6875 [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
6675 *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; 6876 *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
6676 esac 6877 esac
6677 done 6878 done
6678 if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | 6879 if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
@@ -6687,12 +6888,12 @@ EOF
6687 fi 6888 fi
6688 if test -n "$a_deplib" ; then 6889 if test -n "$a_deplib" ; then
6689 droppeddeps=yes 6890 droppeddeps=yes
6690 $ECHO 6891 echo
6691 $ECHO "*** Warning: linker path does not have real file for library $a_deplib." 6892 $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
6692 $ECHO "*** I have the capability to make that library automatically link in when" 6893 echo "*** I have the capability to make that library automatically link in when"
6693 $ECHO "*** you link to this library. But I can only do this if you have a" 6894 echo "*** you link to this library. But I can only do this if you have a"
6694 $ECHO "*** shared version of the library, which you do not appear to have" 6895 echo "*** shared version of the library, which you do not appear to have"
6695 $ECHO "*** because I did check the linker path looking for a file starting" 6896 echo "*** because I did check the linker path looking for a file starting"
6696 if test -z "$potlib" ; then 6897 if test -z "$potlib" ; then
6697 $ECHO "*** with $libname but no candidates were found. (...for file magic test)" 6898 $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
6698 else 6899 else
@@ -6730,7 +6931,7 @@ EOF
6730 potential_libs=`ls $i/$libname[.-]* 2>/dev/null` 6931 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
6731 for potent_lib in $potential_libs; do 6932 for potent_lib in $potential_libs; do
6732 potlib="$potent_lib" # see symlink-check above in file_magic test 6933 potlib="$potent_lib" # see symlink-check above in file_magic test
6733 if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ 6934 if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
6734 $EGREP "$match_pattern_regex" > /dev/null; then 6935 $EGREP "$match_pattern_regex" > /dev/null; then
6735 newdeplibs="$newdeplibs $a_deplib" 6936 newdeplibs="$newdeplibs $a_deplib"
6736 a_deplib="" 6937 a_deplib=""
@@ -6741,12 +6942,12 @@ EOF
6741 fi 6942 fi
6742 if test -n "$a_deplib" ; then 6943 if test -n "$a_deplib" ; then
6743 droppeddeps=yes 6944 droppeddeps=yes
6744 $ECHO 6945 echo
6745 $ECHO "*** Warning: linker path does not have real file for library $a_deplib." 6946 $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
6746 $ECHO "*** I have the capability to make that library automatically link in when" 6947 echo "*** I have the capability to make that library automatically link in when"
6747 $ECHO "*** you link to this library. But I can only do this if you have a" 6948 echo "*** you link to this library. But I can only do this if you have a"
6748 $ECHO "*** shared version of the library, which you do not appear to have" 6949 echo "*** shared version of the library, which you do not appear to have"
6749 $ECHO "*** because I did check the linker path looking for a file starting" 6950 echo "*** because I did check the linker path looking for a file starting"
6750 if test -z "$potlib" ; then 6951 if test -z "$potlib" ; then
6751 $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" 6952 $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
6752 else 6953 else
@@ -6764,25 +6965,25 @@ EOF
6764 ;; 6965 ;;
6765 none | unknown | *) 6966 none | unknown | *)
6766 newdeplibs="" 6967 newdeplibs=""
6767 tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ 6968 tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
6768 -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
6769 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then 6969 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
6770 for i in $predeps $postdeps ; do 6970 for i in $predeps $postdeps ; do
6771 # can't use Xsed below, because $i might contain '/' 6971 # can't use Xsed below, because $i might contain '/'
6772 tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` 6972 tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
6773 done 6973 done
6774 fi 6974 fi
6775 if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | 6975 case $tmp_deplibs in
6776 $GREP . >/dev/null; then 6976 *[!\ \ ]*)
6777 $ECHO 6977 echo
6778 if test "X$deplibs_check_method" = "Xnone"; then 6978 if test "X$deplibs_check_method" = "Xnone"; then
6779 $ECHO "*** Warning: inter-library dependencies are not supported in this platform." 6979 echo "*** Warning: inter-library dependencies are not supported in this platform."
6780 else 6980 else
6781 $ECHO "*** Warning: inter-library dependencies are not known to be supported." 6981 echo "*** Warning: inter-library dependencies are not known to be supported."
6782 fi 6982 fi
6783 $ECHO "*** All declared inter-library dependencies are being dropped." 6983 echo "*** All declared inter-library dependencies are being dropped."
6784 droppeddeps=yes 6984 droppeddeps=yes
6785 fi 6985 ;;
6986 esac
6786 ;; 6987 ;;
6787 esac 6988 esac
6788 versuffix=$versuffix_save 6989 versuffix=$versuffix_save
@@ -6794,23 +6995,23 @@ EOF
6794 case $host in 6995 case $host in
6795 *-*-rhapsody* | *-*-darwin1.[012]) 6996 *-*-rhapsody* | *-*-darwin1.[012])
6796 # On Rhapsody replace the C library with the System framework 6997 # On Rhapsody replace the C library with the System framework
6797 newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` 6998 newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
6798 ;; 6999 ;;
6799 esac 7000 esac
6800 7001
6801 if test "$droppeddeps" = yes; then 7002 if test "$droppeddeps" = yes; then
6802 if test "$module" = yes; then 7003 if test "$module" = yes; then
6803 $ECHO 7004 echo
6804 $ECHO "*** Warning: libtool could not satisfy all declared inter-library" 7005 echo "*** Warning: libtool could not satisfy all declared inter-library"
6805 $ECHO "*** dependencies of module $libname. Therefore, libtool will create" 7006 $ECHO "*** dependencies of module $libname. Therefore, libtool will create"
6806 $ECHO "*** a static module, that should work as long as the dlopening" 7007 echo "*** a static module, that should work as long as the dlopening"
6807 $ECHO "*** application is linked with the -dlopen flag." 7008 echo "*** application is linked with the -dlopen flag."
6808 if test -z "$global_symbol_pipe"; then 7009 if test -z "$global_symbol_pipe"; then
6809 $ECHO 7010 echo
6810 $ECHO "*** However, this would only work if libtool was able to extract symbol" 7011 echo "*** However, this would only work if libtool was able to extract symbol"
6811 $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" 7012 echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
6812 $ECHO "*** not find such a program. So, this module is probably useless." 7013 echo "*** not find such a program. So, this module is probably useless."
6813 $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." 7014 echo "*** \`nm' from GNU binutils and a full rebuild may help."
6814 fi 7015 fi
6815 if test "$build_old_libs" = no; then 7016 if test "$build_old_libs" = no; then
6816 oldlibs="$output_objdir/$libname.$libext" 7017 oldlibs="$output_objdir/$libname.$libext"
@@ -6820,16 +7021,16 @@ EOF
6820 build_libtool_libs=no 7021 build_libtool_libs=no
6821 fi 7022 fi
6822 else 7023 else
6823 $ECHO "*** The inter-library dependencies that have been dropped here will be" 7024 echo "*** The inter-library dependencies that have been dropped here will be"
6824 $ECHO "*** automatically added whenever a program is linked with this library" 7025 echo "*** automatically added whenever a program is linked with this library"
6825 $ECHO "*** or is declared to -dlopen it." 7026 echo "*** or is declared to -dlopen it."
6826 7027
6827 if test "$allow_undefined" = no; then 7028 if test "$allow_undefined" = no; then
6828 $ECHO 7029 echo
6829 $ECHO "*** Since this library must not contain undefined symbols," 7030 echo "*** Since this library must not contain undefined symbols,"
6830 $ECHO "*** because either the platform does not support them or" 7031 echo "*** because either the platform does not support them or"
6831 $ECHO "*** it was explicitly requested with -no-undefined," 7032 echo "*** it was explicitly requested with -no-undefined,"
6832 $ECHO "*** libtool will only create a static version of it." 7033 echo "*** libtool will only create a static version of it."
6833 if test "$build_old_libs" = no; then 7034 if test "$build_old_libs" = no; then
6834 oldlibs="$output_objdir/$libname.$libext" 7035 oldlibs="$output_objdir/$libname.$libext"
6835 build_libtool_libs=module 7036 build_libtool_libs=module
@@ -6846,9 +7047,9 @@ EOF
6846 # Time to change all our "foo.ltframework" stuff back to "-framework foo" 7047 # Time to change all our "foo.ltframework" stuff back to "-framework foo"
6847 case $host in 7048 case $host in
6848 *-*-darwin*) 7049 *-*-darwin*)
6849 newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` 7050 newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
6850 new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` 7051 new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
6851 deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` 7052 deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
6852 ;; 7053 ;;
6853 esac 7054 esac
6854 7055
@@ -6970,7 +7171,7 @@ EOF
6970 done 7171 done
6971 7172
6972 # Use standard objects if they are pic 7173 # Use standard objects if they are pic
6973 test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` 7174 test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
6974 test "X$libobjs" = "X " && libobjs= 7175 test "X$libobjs" = "X " && libobjs=
6975 7176
6976 delfiles= 7177 delfiles=
@@ -7036,7 +7237,7 @@ EOF
7036 if test -n "$export_symbols" && test -n "$include_expsyms"; then 7237 if test -n "$export_symbols" && test -n "$include_expsyms"; then
7037 tmp_export_symbols="$export_symbols" 7238 tmp_export_symbols="$export_symbols"
7038 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" 7239 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
7039 $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' 7240 $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
7040 fi 7241 fi
7041 7242
7042 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then 7243 if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
@@ -7137,7 +7338,8 @@ EOF
7137 save_libobjs=$libobjs 7338 save_libobjs=$libobjs
7138 fi 7339 fi
7139 save_output=$output 7340 save_output=$output
7140 output_la=`$ECHO "X$output" | $Xsed -e "$basename"` 7341 func_basename "$output"
7342 output_la=$func_basename_result
7141 7343
7142 # Clear the reloadable object creation command queue and 7344 # Clear the reloadable object creation command queue and
7143 # initialize k to one. 7345 # initialize k to one.
@@ -7150,12 +7352,12 @@ EOF
7150 if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then 7352 if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
7151 output=${output_objdir}/${output_la}.lnkscript 7353 output=${output_objdir}/${output_la}.lnkscript
7152 func_verbose "creating GNU ld script: $output" 7354 func_verbose "creating GNU ld script: $output"
7153 $ECHO 'INPUT (' > $output 7355 echo 'INPUT (' > $output
7154 for obj in $save_libobjs 7356 for obj in $save_libobjs
7155 do 7357 do
7156 $ECHO "$obj" >> $output 7358 $ECHO "$obj" >> $output
7157 done 7359 done
7158 $ECHO ')' >> $output 7360 echo ')' >> $output
7159 delfiles="$delfiles $output" 7361 delfiles="$delfiles $output"
7160 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then 7362 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
7161 output=${output_objdir}/${output_la}.lnk 7363 output=${output_objdir}/${output_la}.lnk
@@ -7197,17 +7399,19 @@ EOF
7197 # command to the queue. 7399 # command to the queue.
7198 if test "$k" -eq 1 ; then 7400 if test "$k" -eq 1 ; then
7199 # The first file doesn't have a previous command to add. 7401 # The first file doesn't have a previous command to add.
7200 eval concat_cmds=\"$reload_cmds $objlist $last_robj\" 7402 reload_objs=$objlist
7403 eval concat_cmds=\"$reload_cmds\"
7201 else 7404 else
7202 # All subsequent reloadable object files will link in 7405 # All subsequent reloadable object files will link in
7203 # the last one created. 7406 # the last one created.
7204 eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" 7407 reload_objs="$objlist $last_robj"
7408 eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
7205 fi 7409 fi
7206 last_robj=$output_objdir/$output_la-${k}.$objext 7410 last_robj=$output_objdir/$output_la-${k}.$objext
7207 func_arith $k + 1 7411 func_arith $k + 1
7208 k=$func_arith_result 7412 k=$func_arith_result
7209 output=$output_objdir/$output_la-${k}.$objext 7413 output=$output_objdir/$output_la-${k}.$objext
7210 objlist=$obj 7414 objlist=" $obj"
7211 func_len " $last_robj" 7415 func_len " $last_robj"
7212 func_arith $len0 + $func_len_result 7416 func_arith $len0 + $func_len_result
7213 len=$func_arith_result 7417 len=$func_arith_result
@@ -7217,7 +7421,8 @@ EOF
7217 # reloadable object file. All subsequent reloadable object 7421 # reloadable object file. All subsequent reloadable object
7218 # files will link in the last one created. 7422 # files will link in the last one created.
7219 test -z "$concat_cmds" || concat_cmds=$concat_cmds~ 7423 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
7220 eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" 7424 reload_objs="$objlist $last_robj"
7425 eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
7221 if test -n "$last_robj"; then 7426 if test -n "$last_robj"; then
7222 eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" 7427 eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
7223 fi 7428 fi
@@ -7276,7 +7481,7 @@ EOF
7276 if test -n "$export_symbols" && test -n "$include_expsyms"; then 7481 if test -n "$export_symbols" && test -n "$include_expsyms"; then
7277 tmp_export_symbols="$export_symbols" 7482 tmp_export_symbols="$export_symbols"
7278 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" 7483 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
7279 $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' 7484 $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
7280 fi 7485 fi
7281 7486
7282 if test -n "$orig_export_symbols"; then 7487 if test -n "$orig_export_symbols"; then
@@ -7441,7 +7646,7 @@ EOF
7441 if test -n "$convenience"; then 7646 if test -n "$convenience"; then
7442 if test -n "$whole_archive_flag_spec"; then 7647 if test -n "$whole_archive_flag_spec"; then
7443 eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" 7648 eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
7444 reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` 7649 reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
7445 else 7650 else
7446 gentop="$output_objdir/${obj}x" 7651 gentop="$output_objdir/${obj}x"
7447 generated="$generated $gentop" 7652 generated="$generated $gentop"
@@ -7452,7 +7657,7 @@ EOF
7452 fi 7657 fi
7453 7658
7454 # Create the old-style object. 7659 # Create the old-style object.
7455 reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test 7660 reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
7456 7661
7457 output="$obj" 7662 output="$obj"
7458 func_execute_cmds "$reload_cmds" 'exit $?' 7663 func_execute_cmds "$reload_cmds" 'exit $?'
@@ -7512,8 +7717,8 @@ EOF
7512 case $host in 7717 case $host in
7513 *-*-rhapsody* | *-*-darwin1.[012]) 7718 *-*-rhapsody* | *-*-darwin1.[012])
7514 # On Rhapsody replace the C library is the System framework 7719 # On Rhapsody replace the C library is the System framework
7515 compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` 7720 compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
7516 finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` 7721 finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
7517 ;; 7722 ;;
7518 esac 7723 esac
7519 7724
@@ -7530,8 +7735,8 @@ EOF
7530 esac 7735 esac
7531 fi 7736 fi
7532 # Time to change all our "foo.ltframework" stuff back to "-framework foo" 7737 # Time to change all our "foo.ltframework" stuff back to "-framework foo"
7533 compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` 7738 compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
7534 finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` 7739 finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
7535 ;; 7740 ;;
7536 esac 7741 esac
7537 7742
@@ -7668,8 +7873,8 @@ EOF
7668 7873
7669 if test -n "$libobjs" && test "$build_old_libs" = yes; then 7874 if test -n "$libobjs" && test "$build_old_libs" = yes; then
7670 # Transform all the library objects into standard objects. 7875 # Transform all the library objects into standard objects.
7671 compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` 7876 compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
7672 finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` 7877 finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
7673 fi 7878 fi
7674 7879
7675 func_generate_dlsyms "$outputname" "@PROGRAM@" "no" 7880 func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
@@ -7681,15 +7886,15 @@ EOF
7681 7886
7682 wrappers_required=yes 7887 wrappers_required=yes
7683 case $host in 7888 case $host in
7889 *cegcc* | *mingw32ce*)
7890 # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
7891 wrappers_required=no
7892 ;;
7684 *cygwin* | *mingw* ) 7893 *cygwin* | *mingw* )
7685 if test "$build_libtool_libs" != yes; then 7894 if test "$build_libtool_libs" != yes; then
7686 wrappers_required=no 7895 wrappers_required=no
7687 fi 7896 fi
7688 ;; 7897 ;;
7689 *cegcc)
7690 # Disable wrappers for cegcc, we are cross compiling anyway.
7691 wrappers_required=no
7692 ;;
7693 *) 7898 *)
7694 if test "$need_relink" = no || test "$build_libtool_libs" != yes; then 7899 if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
7695 wrappers_required=no 7900 wrappers_required=no
@@ -7698,7 +7903,7 @@ EOF
7698 esac 7903 esac
7699 if test "$wrappers_required" = no; then 7904 if test "$wrappers_required" = no; then
7700 # Replace the output file specification. 7905 # Replace the output file specification.
7701 compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` 7906 compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
7702 link_command="$compile_command$compile_rpath" 7907 link_command="$compile_command$compile_rpath"
7703 7908
7704 # We have no uninstalled library dependencies, so finalize right now. 7909 # We have no uninstalled library dependencies, so finalize right now.
@@ -7745,7 +7950,7 @@ EOF
7745 # We don't need to create a wrapper script. 7950 # We don't need to create a wrapper script.
7746 link_command="$compile_var$compile_command$compile_rpath" 7951 link_command="$compile_var$compile_command$compile_rpath"
7747 # Replace the output file specification. 7952 # Replace the output file specification.
7748 link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` 7953 link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
7749 # Delete the old output file. 7954 # Delete the old output file.
7750 $opt_dry_run || $RM $output 7955 $opt_dry_run || $RM $output
7751 # Link the executable and exit 7956 # Link the executable and exit
@@ -7764,7 +7969,7 @@ EOF
7764 if test "$fast_install" != no; then 7969 if test "$fast_install" != no; then
7765 link_command="$finalize_var$compile_command$finalize_rpath" 7970 link_command="$finalize_var$compile_command$finalize_rpath"
7766 if test "$fast_install" = yes; then 7971 if test "$fast_install" = yes; then
7767 relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` 7972 relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
7768 else 7973 else
7769 # fast_install is set to needless 7974 # fast_install is set to needless
7770 relink_command= 7975 relink_command=
@@ -7776,7 +7981,7 @@ EOF
7776 fi 7981 fi
7777 7982
7778 # Replace the output file specification. 7983 # Replace the output file specification.
7779 link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` 7984 link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
7780 7985
7781 # Delete the old output files. 7986 # Delete the old output files.
7782 $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname 7987 $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
@@ -7800,18 +8005,7 @@ EOF
7800 fi 8005 fi
7801 done 8006 done
7802 relink_command="(cd `pwd`; $relink_command)" 8007 relink_command="(cd `pwd`; $relink_command)"
7803 relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` 8008 relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
7804 fi
7805
7806 # Quote $ECHO for shipping.
7807 if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
7808 case $progpath in
7809 [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
7810 *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
7811 esac
7812 qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
7813 else
7814 qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
7815 fi 8009 fi
7816 8010
7817 # Only actually do things if not in dry run mode. 8011 # Only actually do things if not in dry run mode.
@@ -7932,7 +8126,7 @@ EOF
7932 done | sort | sort -uc >/dev/null 2>&1); then 8126 done | sort | sort -uc >/dev/null 2>&1); then
7933 : 8127 :
7934 else 8128 else
7935 $ECHO "copying selected object files to avoid basename conflicts..." 8129 echo "copying selected object files to avoid basename conflicts..."
7936 gentop="$output_objdir/${outputname}x" 8130 gentop="$output_objdir/${outputname}x"
7937 generated="$generated $gentop" 8131 generated="$generated $gentop"
7938 func_mkdir_p "$gentop" 8132 func_mkdir_p "$gentop"
@@ -8043,7 +8237,7 @@ EOF
8043 done 8237 done
8044 # Quote the link command for shipping. 8238 # Quote the link command for shipping.
8045 relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" 8239 relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
8046 relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` 8240 relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
8047 if test "$hardcode_automatic" = yes ; then 8241 if test "$hardcode_automatic" = yes ; then
8048 relink_command= 8242 relink_command=
8049 fi 8243 fi
@@ -8128,9 +8322,27 @@ EOF
8128 fi 8322 fi
8129 $RM $output 8323 $RM $output
8130 # place dlname in correct position for cygwin 8324 # place dlname in correct position for cygwin
8325 # In fact, it would be nice if we could use this code for all target
8326 # systems that can't hard-code library paths into their executables
8327 # and that have no shared library path variable independent of PATH,
8328 # but it turns out we can't easily determine that from inspecting
8329 # libtool variables, so we have to hard-code the OSs to which it
8330 # applies here; at the moment, that means platforms that use the PE
8331 # object format with DLL files. See the long comment at the top of
8332 # tests/bindir.at for full details.
8131 tdlname=$dlname 8333 tdlname=$dlname
8132 case $host,$output,$installed,$module,$dlname in 8334 case $host,$output,$installed,$module,$dlname in
8133 *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; 8335 *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
8336 # If a -bindir argument was supplied, place the dll there.
8337 if test "x$bindir" != x ;
8338 then
8339 func_relative_path "$install_libdir" "$bindir"
8340 tdlname=$func_relative_path_result$dlname
8341 else
8342 # Otherwise fall back on heuristic.
8343 tdlname=../bin/$dlname
8344 fi
8345 ;;
8134 esac 8346 esac
8135 $ECHO > $output "\ 8347 $ECHO > $output "\
8136# $outputname - a libtool library file 8348# $outputname - a libtool library file
diff --git a/scilab/config/mkinstalldirs b/scilab/config/mkinstalldirs
new file mode 100755
index 0000000..4191a45
--- /dev/null
+++ b/scilab/config/mkinstalldirs
@@ -0,0 +1,162 @@
1#! /bin/sh
2# mkinstalldirs --- make directory hierarchy
3
4scriptversion=2009-04-28.21; # UTC
5
6# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
7# Created: 1993-05-16
8# Public domain.
9#
10# This file is maintained in Automake, please report
11# bugs to <bug-automake@gnu.org> or send patches to
12# <automake-patches@gnu.org>.
13
14nl='
15'
16IFS=" "" $nl"
17errstatus=0
18dirmode=
19
20usage="\
21Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
22
23Create each directory DIR (with mode MODE, if specified), including all
24leading file name components.
25
26Report bugs to <bug-automake@gnu.org>."
27
28# process command line arguments
29while test $# -gt 0 ; do
30 case $1 in
31 -h | --help | --h*) # -h for help
32 echo "$usage"
33 exit $?
34 ;;
35 -m) # -m PERM arg
36 shift
37 test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
38 dirmode=$1
39 shift
40 ;;
41 --version)
42 echo "$0 $scriptversion"
43 exit $?
44 ;;
45 --) # stop option processing
46 shift
47 break
48 ;;
49 -*) # unknown option
50 echo "$usage" 1>&2
51 exit 1
52 ;;
53 *) # first non-opt arg
54 break
55 ;;
56 esac
57done
58
59for file
60do
61 if test -d "$file"; then
62 shift
63 else
64 break
65 fi
66done
67
68case $# in
69 0) exit 0 ;;
70esac
71
72# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
73# mkdir -p a/c at the same time, both will detect that a is missing,
74# one will create a, then the other will try to create a and die with
75# a "File exists" error. This is a problem when calling mkinstalldirs
76# from a parallel make. We use --version in the probe to restrict
77# ourselves to GNU mkdir, which is thread-safe.
78case $dirmode in
79 '')
80 if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
81 echo "mkdir -p -- $*"
82 exec mkdir -p -- "$@"
83 else
84 # On NextStep and OpenStep, the `mkdir' command does not
85 # recognize any option. It will interpret all options as
86 # directories to create, and then abort because `.' already
87 # exists.
88 test -d ./-p && rmdir ./-p
89 test -d ./--version && rmdir ./--version
90 fi
91 ;;
92 *)
93 if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
94 test ! -d ./--version; then
95 echo "mkdir -m $dirmode -p -- $*"
96 exec mkdir -m "$dirmode" -p -- "$@"
97 else
98 # Clean up after NextStep and OpenStep mkdir.
99 for d in ./-m ./-p ./--version "./$dirmode";
100 do
101 test -d $d && rmdir $d
102 done
103 fi
104 ;;
105esac
106
107for file
108do
109 case $file in
110 /*) pathcomp=/ ;;
111 *) pathcomp= ;;
112 esac
113 oIFS=$IFS
114 IFS=/
115 set fnord $file
116 shift
117 IFS=$oIFS
118
119 for d
120 do
121 test "x$d" = x && continue
122
123 pathcomp=$pathcomp$d
124 case $pathcomp in
125 -*) pathcomp=./$pathcomp ;;
126 esac
127
128 if test ! -d "$pathcomp"; then
129 echo "mkdir $pathcomp"
130
131 mkdir "$pathcomp" || lasterr=$?
132
133 if test ! -d "$pathcomp"; then
134 errstatus=$lasterr
135 else
136 if test ! -z "$dirmode"; then
137 echo "chmod $dirmode $pathcomp"
138 lasterr=
139 chmod "$dirmode" "$pathcomp" || lasterr=$?
140
141 if test ! -z "$lasterr"; then
142 errstatus=$lasterr
143 fi
144 fi
145 fi
146 fi
147
148 pathcomp=$pathcomp/
149 done
150done
151
152exit $errstatus
153
154# Local Variables:
155# mode: shell-script
156# sh-indentation: 2
157# eval: (add-hook 'write-file-hooks 'time-stamp)
158# time-stamp-start: "scriptversion="
159# time-stamp-format: "%:y-%02m-%02d.%02H"
160# time-stamp-time-zone: "UTC"
161# time-stamp-end: "; # UTC"
162# End:
diff --git a/scilab/configure b/scilab/configure
index f8a886f..5f17b39 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -172,7 +172,15 @@ test x\$exitcode = x0 || exit 1"
172 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO 172 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
173 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && 173 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
174 test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 174 test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
175test \$(( 1 + 1 )) = 2 || exit 1" 175test \$(( 1 + 1 )) = 2 || exit 1
176
177 test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
178 ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
179 ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
180 ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
181 PATH=/empty FPATH=/empty; export PATH FPATH
182 test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
183 || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
176 if (eval "$as_required") 2>/dev/null; then : 184 if (eval "$as_required") 2>/dev/null; then :
177 as_have_required=yes 185 as_have_required=yes
178else 186else
@@ -527,155 +535,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
527# Sed expression to map a string onto a valid variable name. 535# Sed expression to map a string onto a valid variable name.
528as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" 536as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
529 537
530
531
532# Check that we are running under the correct shell.
533SHELL=${CONFIG_SHELL-/bin/sh} 538SHELL=${CONFIG_SHELL-/bin/sh}
534 539
535case X$lt_ECHO in
536X*--fallback-echo)
537 # Remove one level of quotation (which was required for Make).
538 ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
539 ;;
540esac
541
542ECHO=${lt_ECHO-echo}
543if test "X$1" = X--no-reexec; then
544 # Discard the --no-reexec flag, and continue.
545 shift
546elif test "X$1" = X--fallback-echo; then
547 # Avoid inline document here, it may be left over
548 :
549elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
550 # Yippee, $ECHO works!
551 :
552else
553 # Restart under the correct shell.
554 exec $SHELL "$0" --no-reexec ${1+"$@"}
555fi
556
557if test "X$1" = X--fallback-echo; then
558 # used as fallback echo
559 shift
560 cat <<_LT_EOF
561$*
562_LT_EOF
563 exit 0
564fi
565
566# The HP-UX ksh and POSIX shell print the target directory to stdout
567# if CDPATH is set.
568(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
569
570if test -z "$lt_ECHO"; then
571 if test "X${echo_test_string+set}" != Xset; then
572 # find a string as large as possible, as long as the shell can cope with it
573 for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
574 # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
575 if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
576 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
577 then
578 break
579 fi
580 done
581 fi
582
583 if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
584 echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
585 test "X$echo_testing_string" = "X$echo_test_string"; then
586 :
587 else
588 # The Solaris, AIX, and Digital Unix default echo programs unquote
589 # backslashes. This makes it impossible to quote backslashes using
590 # echo "$something" | sed 's/\\/\\\\/g'
591 #
592 # So, first we look for a working echo in the user's PATH.
593
594 lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
595 for dir in $PATH /usr/ucb; do
596 IFS="$lt_save_ifs"
597 if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
598 test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
599 echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
600 test "X$echo_testing_string" = "X$echo_test_string"; then
601 ECHO="$dir/echo"
602 break
603 fi
604 done
605 IFS="$lt_save_ifs"
606
607 if test "X$ECHO" = Xecho; then
608 # We didn't find a better echo, so look for alternatives.
609 if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
610 echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
611 test "X$echo_testing_string" = "X$echo_test_string"; then
612 # This shell has a builtin print -r that does the trick.
613 ECHO='print -r'
614 elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
615 test "X$CONFIG_SHELL" != X/bin/ksh; then
616 # If we have ksh, try running configure again with it.
617 ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
618 export ORIGINAL_CONFIG_SHELL
619 CONFIG_SHELL=/bin/ksh
620 export CONFIG_SHELL
621 exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
622 else
623 # Try using printf.
624 ECHO='printf %s\n'
625 if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
626 echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
627 test "X$echo_testing_string" = "X$echo_test_string"; then
628 # Cool, printf works
629 :
630 elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
631 test "X$echo_testing_string" = 'X\t' &&
632 echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
633 test "X$echo_testing_string" = "X$echo_test_string"; then
634 CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
635 export CONFIG_SHELL
636 SHELL="$CONFIG_SHELL"
637 export SHELL
638 ECHO="$CONFIG_SHELL $0 --fallback-echo"
639 elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
640 test "X$echo_testing_string" = 'X\t' &&
641 echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
642 test "X$echo_testing_string" = "X$echo_test_string"; then
643 ECHO="$CONFIG_SHELL $0 --fallback-echo"
644 else
645 # maybe with a smaller string...
646 prev=:
647
648 for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
649 if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
650 then
651 break
652 fi
653 prev="$cmd"
654 done
655
656 if test "$prev" != 'sed 50q "$0"'; then
657 echo_test_string=`eval $prev`
658 export echo_test_string
659 exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
660 else
661 # Oops. We lost completely, so just stick with echo.
662 ECHO=echo
663 fi
664 fi
665 fi
666 fi
667 fi
668fi
669
670# Copy echo and quote the copy suitably for passing to libtool from
671# the Makefile, instead of quoting the original, which is used later.
672lt_ECHO=$ECHO
673if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
674 lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
675fi
676
677
678
679 540
680exec 7<&0 </dev/null 6>&1 541exec 7<&0 </dev/null 6>&1
681 542
@@ -752,7 +613,6 @@ OTOOL
752LIPO 613LIPO
753NMEDIT 614NMEDIT
754DSYMUTIL 615DSYMUTIL
755lt_ECHO
756RANLIB 616RANLIB
757AR 617AR
758OBJDUMP 618OBJDUMP
@@ -9252,6 +9112,16 @@ case "$CC" in
9252 CFLAGS=" $CFLAGS -I/sw/include " 9112 CFLAGS=" $CFLAGS -I/sw/include "
9253 CPPFLAGS=" $CPPFLAGS -I/sw/include " 9113 CPPFLAGS=" $CPPFLAGS -I/sw/include "
9254 LDFLAGS=" $LDFLAGS -L/sw/lib/ " 9114 LDFLAGS=" $LDFLAGS -L/sw/lib/ "
9115 case "$host" in
9116 i386-apple-darwin*)
9117 CC=" $CC -arch i386 "
9118 CXX=" $CXX -arch i386 "
9119 ;;
9120 x86_64-apple-darwin*)
9121 CC=" $CC -arch x86_64 "
9122 CXX=" $CXX -arch x86_64 "
9123 ;;
9124 esac
9255 ;; 9125 ;;
9256esac 9126esac
9257;; # end of the gcc case on the $CC 9127;; # end of the gcc case on the $CC
@@ -9938,7 +9808,7 @@ $as_echo "$ac_java_classpath" >&6; }
9938$as_echo_n "checking to see if the java compiler works... " >&6; } 9808$as_echo_n "checking to see if the java compiler works... " >&6; }
9939 9809
9940 cat << \EOF > conftest.java 9810 cat << \EOF > conftest.java
9941// #line 9941 "configure" 9811// #line 9811 "configure"
9942 9812
9943 9813
9944public class conftest { 9814public class conftest {
@@ -9986,7 +9856,7 @@ $as_echo_n "checking type of jvm... " >&6; }
9986 if test "x$ac_java_jvm_name" = "x" ; then 9856 if test "x$ac_java_jvm_name" = "x" ; then
9987 9857
9988 cat << \EOF > conftest.java 9858 cat << \EOF > conftest.java
9989// #line 9989 "configure" 9859// #line 9859 "configure"
9990import gnu.java.io.EncodingManager; 9860import gnu.java.io.EncodingManager;
9991 9861
9992public class conftest { 9862public class conftest {
@@ -10032,7 +9902,7 @@ $as_echo_n "checking java API version... " >&6; }
10032 9902
10033 9903
10034 cat << \EOF > conftest.java 9904 cat << \EOF > conftest.java
10035// #line 10035 "configure" 9905// #line 9905 "configure"
10036import java.nio.charset.Charset; 9906import java.nio.charset.Charset;
10037 9907
10038public class conftest { 9908public class conftest {
@@ -10059,7 +9929,7 @@ EOF
10059 9929
10060 9930
10061 cat << \EOF > conftest.java 9931 cat << \EOF > conftest.java
10062// #line 10062 "configure" 9932// #line 9932 "configure"
10063import java.lang.StringBuilder; 9933import java.lang.StringBuilder;
10064 9934
10065public class conftest { 9935public class conftest {
@@ -11261,7 +11131,7 @@ $as_echo_n "checking jgraphx... " >&6; }
11261 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11131 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11262 11132
11263 cat << \EOF > conftest.java 11133 cat << \EOF > conftest.java
11264// #line 11264 "configure" 11134// #line 11134 "configure"
11265import com.mxgraph.model.mxCell; 11135import com.mxgraph.model.mxCell;
11266 11136
11267public class conftest { 11137public class conftest {
@@ -11333,7 +11203,7 @@ $as_echo_n "checking flexdock... " >&6; }
11333 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11203 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11334 11204
11335 cat << \EOF > conftest.java 11205 cat << \EOF > conftest.java
11336// #line 11336 "configure" 11206// #line 11206 "configure"
11337import org.flexdock.docking.DockingManager; 11207import org.flexdock.docking.DockingManager;
11338 11208
11339public class conftest { 11209public class conftest {
@@ -11405,7 +11275,7 @@ $as_echo_n "checking looks... " >&6; }
11405 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11275 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11406 11276
11407 cat << \EOF > conftest.java 11277 cat << \EOF > conftest.java
11408// #line 11408 "configure" 11278// #line 11278 "configure"
11409import com.jgoodies.looks.common.RenderingUtils; 11279import com.jgoodies.looks.common.RenderingUtils;
11410 11280
11411public class conftest { 11281public class conftest {
@@ -11477,7 +11347,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
11477 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11347 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11478 11348
11479 cat << \EOF > conftest.java 11349 cat << \EOF > conftest.java
11480// #line 11480 "configure" 11350// #line 11350 "configure"
11481import com.jgoodies.looks.common.RenderingUtils; 11351import com.jgoodies.looks.common.RenderingUtils;
11482 11352
11483public class conftest { 11353public class conftest {
@@ -11550,7 +11420,7 @@ $as_echo_n "checking skinlf... " >&6; }
11550 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11420 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11551 11421
11552 cat << \EOF > conftest.java 11422 cat << \EOF > conftest.java
11553// #line 11553 "configure" 11423// #line 11423 "configure"
11554import com.l2fprod.util.AccessUtils; 11424import com.l2fprod.util.AccessUtils;
11555 11425
11556public class conftest { 11426public class conftest {
@@ -11622,7 +11492,7 @@ $as_echo_n "checking jogl... " >&6; }
11622 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11492 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11623 11493
11624 cat << \EOF > conftest.java 11494 cat << \EOF > conftest.java
11625// #line 11625 "configure" 11495// #line 11495 "configure"
11626import javax.media.opengl.glu.GLUnurbs; 11496import javax.media.opengl.glu.GLUnurbs;
11627 11497
11628public class conftest { 11498public class conftest {
@@ -11694,7 +11564,7 @@ $as_echo_n "checking jhall... " >&6; }
11694 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11564 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11695 11565
11696 cat << \EOF > conftest.java 11566 cat << \EOF > conftest.java
11697// #line 11697 "configure" 11567// #line 11567 "configure"
11698import javax.help.JHelp; 11568import javax.help.JHelp;
11699 11569
11700public class conftest { 11570public class conftest {
@@ -11766,7 +11636,7 @@ $as_echo_n "checking javahelp2... " >&6; }
11766 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11636 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11767 11637
11768 cat << \EOF > conftest.java 11638 cat << \EOF > conftest.java
11769// #line 11769 "configure" 11639// #line 11639 "configure"
11770import javax.help.JHelp; 11640import javax.help.JHelp;
11771 11641
11772public class conftest { 11642public class conftest {
@@ -11839,7 +11709,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
11839 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11709 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11840 11710
11841 cat << \EOF > conftest.java 11711 cat << \EOF > conftest.java
11842// #line 11842 "configure" 11712// #line 11712 "configure"
11843import com.sun.gluegen.runtime.CPU; 11713import com.sun.gluegen.runtime.CPU;
11844 11714
11845public class conftest { 11715public class conftest {
@@ -11911,7 +11781,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
11911 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11781 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11912 11782
11913 cat << \EOF > conftest.java 11783 cat << \EOF > conftest.java
11914// #line 11914 "configure" 11784// #line 11784 "configure"
11915import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 11785import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
11916 11786
11917public class conftest { 11787public class conftest {
@@ -11983,7 +11853,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
11983 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11853 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11984 11854
11985 cat << \EOF > conftest.java 11855 cat << \EOF > conftest.java
11986// #line 11986 "configure" 11856// #line 11856 "configure"
11987import com.artenum.rosetta.core.action.AbstractConsoleAction; 11857import com.artenum.rosetta.core.action.AbstractConsoleAction;
11988 11858
11989public class conftest { 11859public class conftest {
@@ -12056,7 +11926,7 @@ $as_echo_n "checking jhdf5... " >&6; }
12056 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11926 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12057 11927
12058 cat << \EOF > conftest.java 11928 cat << \EOF > conftest.java
12059// #line 12059 "configure" 11929// #line 11929 "configure"
12060import ncsa.hdf.hdf5lib.HDF5Constants; 11930import ncsa.hdf.hdf5lib.HDF5Constants;
12061 11931
12062public class conftest { 11932public class conftest {
@@ -12129,7 +11999,7 @@ $as_echo_n "checking commons-logging... " >&6; }
12129 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11999 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12130 12000
12131 cat << \EOF > conftest.java 12001 cat << \EOF > conftest.java
12132// #line 12132 "configure" 12002// #line 12002 "configure"
12133import org.apache.commons.logging.LogFactory; 12003import org.apache.commons.logging.LogFactory;
12134 12004
12135public class conftest { 12005public class conftest {
@@ -19286,6 +19156,9 @@ _ACEOF
19286 19156
19287WITH_TKSCI=no 19157WITH_TKSCI=no
19288if test "$with_tk" != no; then 19158if test "$with_tk" != no; then
19159 if test "$MACOSX" = "1"; then
19160 as_fn_error "Due to technical constraints, Tcl/Tk must be disabled under Mac OS X (--without-tk)" "$LINENO" 5
19161 fi
19289 19162
19290 # check user arguments 19163 # check user arguments
19291 USER_TCL_LIB_PATH="" 19164 USER_TCL_LIB_PATH=""
@@ -20182,7 +20055,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
20182{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 20055{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
20183$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 20056$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
20184cat > conftest.$ac_ext <<EOF 20057cat > conftest.$ac_ext <<EOF
20185#line 20185 "configure" 20058#line 20058 "configure"
20186#include "confdefs.h" 20059#include "confdefs.h"
20187 20060
20188#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 20061#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -20494,7 +20367,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
20494$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 20367$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
20495 20368
20496cat > conftest.$ac_ext <<EOF 20369cat > conftest.$ac_ext <<EOF
20497#line 20497 "configure" 20370#line 20370 "configure"
20498#include "confdefs.h" 20371#include "confdefs.h"
20499 20372
20500#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 20373#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -21075,7 +20948,7 @@ $as_echo_n "checking batik-all... " >&6; }
21075 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 20948 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21076 20949
21077 cat << \EOF > conftest.java 20950 cat << \EOF > conftest.java
21078// #line 21078 "configure" 20951// #line 20951 "configure"
21079import org.apache.batik.parser.Parser; 20952import org.apache.batik.parser.Parser;
21080 20953
21081public class conftest { 20954public class conftest {
@@ -21147,7 +21020,7 @@ $as_echo_n "checking batik... " >&6; }
21147 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21020 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21148 21021
21149 cat << \EOF > conftest.java 21022 cat << \EOF > conftest.java
21150// #line 21150 "configure" 21023// #line 21023 "configure"
21151import org.apache.batik.parser.Parser; 21024import org.apache.batik.parser.Parser;
21152 21025
21153public class conftest { 21026public class conftest {
@@ -21221,7 +21094,7 @@ $as_echo_n "checking saxon... " >&6; }
21221 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21094 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21222 21095
21223 cat << \EOF > conftest.java 21096 cat << \EOF > conftest.java
21224// #line 21224 "configure" 21097// #line 21097 "configure"
21225import com.icl.saxon.Loader; 21098import com.icl.saxon.Loader;
21226 21099
21227public class conftest { 21100public class conftest {
@@ -21293,7 +21166,7 @@ $as_echo_n "checking fop... " >&6; }
21293 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21166 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21294 21167
21295 cat << \EOF > conftest.java 21168 cat << \EOF > conftest.java
21296// #line 21296 "configure" 21169// #line 21169 "configure"
21297import org.apache.fop.pdf.PDFInfo; 21170import org.apache.fop.pdf.PDFInfo;
21298 21171
21299public class conftest { 21172public class conftest {
@@ -21365,7 +21238,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
21365 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21238 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21366 21239
21367 cat << \EOF > conftest.java 21240 cat << \EOF > conftest.java
21368// #line 21368 "configure" 21241// #line 21241 "configure"
21369import net.sourceforge.jeuclid.LayoutContext; 21242import net.sourceforge.jeuclid.LayoutContext;
21370 21243
21371public class conftest { 21244public class conftest {
@@ -21437,7 +21310,7 @@ $as_echo_n "checking commons-io... " >&6; }
21437 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21310 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21438 21311
21439 cat << \EOF > conftest.java 21312 cat << \EOF > conftest.java
21440// #line 21440 "configure" 21313// #line 21313 "configure"
21441import org.apache.commons.io.output.CountingOutputStream; 21314import org.apache.commons.io.output.CountingOutputStream;
21442 21315
21443public class conftest { 21316public class conftest {
@@ -21509,7 +21382,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
21509 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21382 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21510 21383
21511 cat << \EOF > conftest.java 21384 cat << \EOF > conftest.java
21512// #line 21512 "configure" 21385// #line 21385 "configure"
21513import org.apache.xmlgraphics.util.Service; 21386import org.apache.xmlgraphics.util.Service;
21514 21387
21515public class conftest { 21388public class conftest {
@@ -21581,7 +21454,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
21581 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21454 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21582 21455
21583 cat << \EOF > conftest.java 21456 cat << \EOF > conftest.java
21584// #line 21584 "configure" 21457// #line 21457 "configure"
21585import org.w3c.dom.svg.SVGDocument; 21458import org.w3c.dom.svg.SVGDocument;
21586 21459
21587public class conftest { 21460public class conftest {
@@ -21654,7 +21527,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
21654 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21527 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21655 21528
21656 cat << \EOF > conftest.java 21529 cat << \EOF > conftest.java
21657// #line 21657 "configure" 21530// #line 21530 "configure"
21658import org.apache.avalon.framework.configuration.ConfigurationException; 21531import org.apache.avalon.framework.configuration.ConfigurationException;
21659 21532
21660public class conftest { 21533public class conftest {
@@ -21841,8 +21714,8 @@ esac
21841 21714
21842 21715
21843 21716
21844macro_version='2.2.6' 21717macro_version='2.2.7a'
21845macro_revision='1.3012' 21718macro_revision='1.3121'
21846 21719
21847 21720
21848 21721
@@ -21858,6 +21731,75 @@ macro_revision='1.3012'
21858 21731
21859ltmain="$ac_aux_dir/ltmain.sh" 21732ltmain="$ac_aux_dir/ltmain.sh"
21860 21733
21734# Backslashify metacharacters that are still active within
21735# double-quoted strings.
21736sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
21737
21738# Same as above, but do not quote variable references.
21739double_quote_subst='s/\(["`\\]\)/\\\1/g'
21740
21741# Sed substitution to delay expansion of an escaped shell variable in a
21742# double_quote_subst'ed string.
21743delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
21744
21745# Sed substitution to delay expansion of an escaped single quote.
21746delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
21747
21748# Sed substitution to avoid accidental globbing in evaled expressions
21749no_glob_subst='s/\*/\\\*/g'
21750
21751ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
21752ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
21753ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
21754
21755{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
21756$as_echo_n "checking how to print strings... " >&6; }
21757# Test print first, because it will be a builtin if present.
21758if test "X`print -r -- -n 2>/dev/null`" = X-n && \
21759 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
21760 ECHO='print -r --'
21761elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
21762 ECHO='printf %s\n'
21763else
21764 # Use this function as a fallback that always works.
21765 func_fallback_echo ()
21766 {
21767 eval 'cat <<_LTECHO_EOF
21768$1
21769_LTECHO_EOF'
21770 }
21771 ECHO='func_fallback_echo'
21772fi
21773
21774# func_echo_all arg...
21775# Invoke $ECHO with all args, space-separated.
21776func_echo_all ()
21777{
21778 $ECHO ""
21779}
21780
21781case "$ECHO" in
21782 printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
21783$as_echo "printf" >&6; } ;;
21784 print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
21785$as_echo "print -r" >&6; } ;;
21786 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
21787$as_echo "cat" >&6; } ;;
21788esac
21789
21790
21791
21792
21793
21794
21795
21796
21797
21798
21799
21800
21801
21802
21861{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 21803{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
21862$as_echo_n "checking for a sed that does not truncate output... " >&6; } 21804$as_echo_n "checking for a sed that does not truncate output... " >&6; }
21863if test "${ac_cv_path_SED+set}" = set; then : 21805if test "${ac_cv_path_SED+set}" = set; then :
@@ -22193,8 +22135,11 @@ if test "$lt_cv_path_NM" != "no"; then
22193 NM="$lt_cv_path_NM" 22135 NM="$lt_cv_path_NM"
22194else 22136else
22195 # Didn't find any BSD compatible name lister, look for dumpbin. 22137 # Didn't find any BSD compatible name lister, look for dumpbin.
22196 if test -n "$ac_tool_prefix"; then 22138 if test -n "$DUMPBIN"; then :
22197 for ac_prog in "dumpbin -symbols" "link -dump -symbols" 22139 # Let the user override the test.
22140 else
22141 if test -n "$ac_tool_prefix"; then
22142 for ac_prog in dumpbin "link -dump"
22198 do 22143 do
22199 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 22144 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
22200set dummy $ac_tool_prefix$ac_prog; ac_word=$2 22145set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -22238,7 +22183,7 @@ fi
22238fi 22183fi
22239if test -z "$DUMPBIN"; then 22184if test -z "$DUMPBIN"; then
22240 ac_ct_DUMPBIN=$DUMPBIN 22185 ac_ct_DUMPBIN=$DUMPBIN
22241 for ac_prog in "dumpbin -symbols" "link -dump -symbols" 22186 for ac_prog in dumpbin "link -dump"
22242do 22187do
22243 # Extract the first word of "$ac_prog", so it can be a program name with args. 22188 # Extract the first word of "$ac_prog", so it can be a program name with args.
22244set dummy $ac_prog; ac_word=$2 22189set dummy $ac_prog; ac_word=$2
@@ -22293,6 +22238,15 @@ esac
22293 fi 22238 fi
22294fi 22239fi
22295 22240
22241 case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
22242 *COFF*)
22243