Merge lp:~chrisccoulson/totem/ubuntu into lp:~ubuntu-desktop/totem/ubuntu

Proposed by Chris Coulson
Status: Merged
Merged at revision: not available
Proposed branch: lp:~chrisccoulson/totem/ubuntu
Merge into: lp:~ubuntu-desktop/totem/ubuntu
Diff against target: None lines
To merge this branch: bzr merge lp:~chrisccoulson/totem/ubuntu
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-03-12 23:04:47 +0000
3+++ debian/changelog 2009-03-16 19:39:22 +0000
4@@ -1,3 +1,13 @@
5+totem (2.26.0-0ubuntu1) jaunty; urgency=low
6+
7+ * New upstream release (LP: #343843):
8+ - Make sure all the Python plugins are translated.
9+ - Fix the language selection in the OpenSubtitles plugin.
10+ * debian/patches/70_autotools.patch:
11+ - New version update.
12+
13+ -- Chris Coulson <chrisccoulson@googlemail.com> Mon, 16 Mar 2009 17:25:46 +0000
14+
15 totem (2.25.92-0ubuntu2) jaunty; urgency=low
16
17 * Reapply revisions dropped by error
18
19=== modified file 'debian/control'
20--- debian/control 2009-03-09 17:02:51 +0000
21+++ debian/control 2009-03-16 19:39:22 +0000
22@@ -211,6 +211,7 @@
23 python-apt,
24 python-gdbm,
25 python-gobject (>= 2.15.3),
26+ python-gconf,
27 python-gtk2 (>= 2.13.0),
28 python-gst0.10 (>= 0.10.12)
29 Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3)
30
31=== modified file 'debian/patches/70_autotools.patch'
32--- debian/patches/70_autotools.patch 2009-03-09 17:02:51 +0000
33+++ debian/patches/70_autotools.patch 2009-03-16 19:39:22 +0000
34@@ -1,30 +1,190 @@
35-Index: totem-2.25.92/INSTALL
36+Index: totem-2.26.0/INSTALL
37 ===================================================================
38---- totem-2.25.92.orig/INSTALL 2008-01-21 16:06:23.000000000 +0100
39-+++ totem-2.25.92/INSTALL 2009-03-09 17:29:29.000000000 +0100
40-@@ -2,7 +2,7 @@
41+--- totem-2.26.0.orig/INSTALL 2009-03-16 10:43:33.000000000 +0000
42++++ totem-2.26.0/INSTALL 2009-03-16 19:11:41.000000000 +0000
43+@@ -2,15 +2,15 @@
44 *************************
45
46 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
47--2006 Free Software Foundation, Inc.
48-+2006, 2007 Free Software Foundation, Inc.
49+-2006, 2007 Free Software Foundation, Inc.
50++2006, 2007, 2008 Free Software Foundation, Inc.
51
52- This file is free documentation; the Free Software Foundation gives
53+-This file is free documentation; the Free Software Foundation gives
54++ This file is free documentation; the Free Software Foundation gives
55 unlimited permission to copy, distribute and modify it.
56-@@ -67,6 +67,9 @@
57- all sorts of other programs in order to regenerate files that came
58- with the distribution.
59-
60-+ 6. Often, you can also type `make uninstall' to remove the installed
61-+ files again.
62-+
63+
64+ Basic Installation
65+ ==================
66+
67+-Briefly, the shell commands `./configure; make; make install' should
68++ Briefly, the shell commands `./configure; make; make install' should
69+ configure, build, and install this package. The following
70+ more-detailed instructions are generic; see the `README' file for
71+ instructions specific to this package.
72+@@ -73,9 +73,9 @@
73 Compilers and Options
74 =====================
75
76-Index: totem-2.25.92/Makefile.in
77+-Some systems require unusual options for compilation or linking that the
78+-`configure' script does not know about. Run `./configure --help' for
79+-details on some of the pertinent environment variables.
80++ Some systems require unusual options for compilation or linking that
81++the `configure' script does not know about. Run `./configure --help'
82++for details on some of the pertinent environment variables.
83+
84+ You can give `configure' initial values for configuration parameters
85+ by setting variables in the command line or in the environment. Here
86+@@ -88,7 +88,7 @@
87+ Compiling For Multiple Architectures
88+ ====================================
89+
90+-You can compile the package for more than one kind of computer at the
91++ You can compile the package for more than one kind of computer at the
92+ same time, by placing the object files for each architecture in their
93+ own directory. To do this, you can use GNU `make'. `cd' to the
94+ directory where you want the object files and executables to go and run
95+@@ -100,10 +100,24 @@
96+ installed the package for one architecture, use `make distclean' before
97+ reconfiguring for another architecture.
98+
99++ On MacOS X 10.5 and later systems, you can create libraries and
100++executables that work on multiple system types--known as "fat" or
101++"universal" binaries--by specifying multiple `-arch' options to the
102++compiler but only a single `-arch' option to the preprocessor. Like
103++this:
104++
105++ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
106++ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
107++ CPP="gcc -E" CXXCPP="g++ -E"
108++
109++ This is not guaranteed to produce working output in all cases, you
110++may have to build one architecture at a time and combine the results
111++using the `lipo' tool if you have problems.
112++
113+ Installation Names
114+ ==================
115+
116+-By default, `make install' installs the package's commands under
117++ By default, `make install' installs the package's commands under
118+ `/usr/local/bin', include files under `/usr/local/include', etc. You
119+ can specify an installation prefix other than `/usr/local' by giving
120+ `configure' the option `--prefix=PREFIX'.
121+@@ -126,7 +140,7 @@
122+ Optional Features
123+ =================
124+
125+-Some packages pay attention to `--enable-FEATURE' options to
126++ Some packages pay attention to `--enable-FEATURE' options to
127+ `configure', where FEATURE indicates an optional part of the package.
128+ They may also pay attention to `--with-PACKAGE' options, where PACKAGE
129+ is something like `gnu-as' or `x' (for the X Window System). The
130+@@ -138,14 +152,36 @@
131+ you can use the `configure' options `--x-includes=DIR' and
132+ `--x-libraries=DIR' to specify their locations.
133+
134++Particular systems
135++==================
136++
137++ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
138++CC is not installed, it is recommended to use the following options in
139++order to use an ANSI C compiler:
140++
141++ ./configure CC="cc -Ae"
142++
143++and if that doesn't work, install pre-built binaries of GCC for HP-UX.
144++
145++ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
146++parse its `<wchar.h>' header file. The option `-nodtk' can be used as
147++a workaround. If GNU CC is not installed, it is therefore recommended
148++to try
149++
150++ ./configure CC="cc"
151++
152++and if that doesn't work, try
153++
154++ ./configure CC="cc -nodtk"
155++
156+ Specifying the System Type
157+ ==========================
158+
159+-There may be some features `configure' cannot figure out automatically,
160+-but needs to determine by the type of machine the package will run on.
161+-Usually, assuming the package is built to be run on the _same_
162+-architectures, `configure' can figure that out, but if it prints a
163+-message saying it cannot guess the machine type, give it the
164++ There may be some features `configure' cannot figure out
165++automatically, but needs to determine by the type of machine the package
166++will run on. Usually, assuming the package is built to be run on the
167++_same_ architectures, `configure' can figure that out, but if it prints
168++a message saying it cannot guess the machine type, give it the
169+ `--build=TYPE' option. TYPE can either be a short name for the system
170+ type, such as `sun4', or a canonical name which has the form:
171+
172+@@ -171,9 +207,9 @@
173+ Sharing Defaults
174+ ================
175+
176+-If you want to set default values for `configure' scripts to share, you
177+-can create a site shell script called `config.site' that gives default
178+-values for variables like `CC', `cache_file', and `prefix'.
179++ If you want to set default values for `configure' scripts to share,
180++you can create a site shell script called `config.site' that gives
181++default values for variables like `CC', `cache_file', and `prefix'.
182+ `configure' looks for `PREFIX/share/config.site' if it exists, then
183+ `PREFIX/etc/config.site' if it exists. Or, you can set the
184+ `CONFIG_SITE' environment variable to the location of the site script.
185+@@ -182,7 +218,7 @@
186+ Defining Variables
187+ ==================
188+
189+-Variables not defined in a site shell script can be set in the
190++ Variables not defined in a site shell script can be set in the
191+ environment passed to `configure'. However, some packages may run
192+ configure again during the build, and the customized values of these
193+ variables may be lost. In order to avoid this problem, you should set
194+@@ -201,11 +237,19 @@
195+ `configure' Invocation
196+ ======================
197+
198+-`configure' recognizes the following options to control how it operates.
199++ `configure' recognizes the following options to control how it
200++operates.
201+
202+ `--help'
203+ `-h'
204+- Print a summary of the options to `configure', and exit.
205++ Print a summary of all of the options to `configure', and exit.
206++
207++`--help=short'
208++`--help=recursive'
209++ Print a summary of the options unique to this package's
210++ `configure', and exit. The `short' variant lists options used
211++ only in the top level, while the `recursive' variant lists options
212++ also present in any nested packages.
213+
214+ `--version'
215+ `-V'
216+@@ -232,6 +276,16 @@
217+ Look for the package's source code in directory DIR. Usually
218+ `configure' can determine that directory automatically.
219+
220++`--prefix=DIR'
221++ Use DIR as the installation prefix. *Note Installation Names::
222++ for more details, including other options available for fine-tuning
223++ the installation locations.
224++
225++`--no-create'
226++`-n'
227++ Run the configure checks, but stop before creating any output
228++ files.
229++
230+ `configure' also accepts some other, not widely useful, options. Run
231+ `configure --help' for more details.
232+
233+Index: totem-2.26.0/Makefile.in
234 ===================================================================
235---- totem-2.25.92.orig/Makefile.in 2009-03-03 13:02:19.000000000 +0100
236-+++ totem-2.25.92/Makefile.in 2009-03-09 17:29:49.000000000 +0100
237+--- totem-2.26.0.orig/Makefile.in 2009-03-16 10:43:33.000000000 +0000
238++++ totem-2.26.0/Makefile.in 2009-03-16 19:11:41.000000000 +0000
239 @@ -1,4 +1,4 @@
240 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
241 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
242@@ -66,15 +226,38 @@
243 GTK_CFLAGS = @GTK_CFLAGS@
244 GTK_LIBS = @GTK_LIBS@
245 HELP_DIR = @HELP_DIR@
246-@@ -178,6 +178,7 @@
247- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
248- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
249- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
250+@@ -155,29 +155,11 @@
251+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
252+ INSTOBJEXT = @INSTOBJEXT@
253+ INTLLIBS = @INTLLIBS@
254+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
255+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
256+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
257+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
258+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
259+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
260+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
261+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
262+ INTLTOOL_PERL = @INTLTOOL_PERL@
263+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
264+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
265+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
266+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
267+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
268+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
269+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
270+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
271+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
272+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
273+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
274+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
275+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
276+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
277 +LD = @LD@
278 LDFLAGS = @LDFLAGS@
279 LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
280 LIBEPC_LIBS = @LIBEPC_LIBS@
281-@@ -186,6 +187,7 @@
282+@@ -186,6 +168,7 @@
283 LIBOBJS = @LIBOBJS@
284 LIBS = @LIBS@
285 LIBTOOL = @LIBTOOL@
286@@ -82,7 +265,7 @@
287 LIRC_LIBS = @LIRC_LIBS@
288 LN_S = @LN_S@
289 LTLIBOBJS = @LTLIBOBJS@
290-@@ -205,10 +207,14 @@
291+@@ -205,10 +188,14 @@
292 NAUTILUSDIR = @NAUTILUSDIR@
293 NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
294 NAUTILUS_LIBS = @NAUTILUS_LIBS@
295@@ -97,7 +280,7 @@
296 PACKAGE = @PACKAGE@
297 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
298 PACKAGE_NAME = @PACKAGE_NAME@
299-@@ -272,7 +278,7 @@
300+@@ -272,7 +259,7 @@
301 abs_top_srcdir = @abs_top_srcdir@
302 ac_ct_CC = @ac_ct_CC@
303 ac_ct_CXX = @ac_ct_CXX@
304@@ -106,7 +289,7 @@
305 am__include = @am__include@
306 am__leading_dot = @am__leading_dot@
307 am__quote = @am__quote@
308-@@ -303,6 +309,7 @@
309+@@ -303,6 +290,7 @@
310 libexecdir = @libexecdir@
311 localedir = @localedir@
312 localstatedir = @localstatedir@
313@@ -114,7 +297,7 @@
314 mandir = @mandir@
315 mkdir_p = @mkdir_p@
316 oldincludedir = @oldincludedir@
317-@@ -405,7 +412,7 @@
318+@@ -405,7 +393,7 @@
319 -rm -rf .libs _libs
320
321 distclean-libtool:
322@@ -123,7 +306,7 @@
323
324 # This directory's subdirectories are mostly independent; you can cd
325 # into them and run `make' without going through this Makefile.
326-@@ -482,7 +489,7 @@
327+@@ -482,7 +470,7 @@
328 unique=`for i in $$list; do \
329 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
330 done | \
331@@ -132,10 +315,10 @@
332 END { if (nonempty) { for (i in files) print i; }; }'`; \
333 mkid -fID $$unique
334 tags: TAGS
335-Index: totem-2.25.92/aclocal.m4
336+Index: totem-2.26.0/aclocal.m4
337 ===================================================================
338---- totem-2.25.92.orig/aclocal.m4 2009-03-03 12:55:11.000000000 +0100
339-+++ totem-2.25.92/aclocal.m4 2009-03-09 17:29:39.000000000 +0100
340+--- totem-2.26.0.orig/aclocal.m4 2009-03-16 10:43:18.000000000 +0000
341++++ totem-2.26.0/aclocal.m4 2009-03-16 19:11:29.000000000 +0000
342 @@ -1,4 +1,4 @@
343 -# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
344 +# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
345@@ -200,7 +383,101 @@
346 ])
347
348
349-@@ -962,101 +959,187 @@
350+@@ -837,25 +834,25 @@
351+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
352+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
353+
354+-AC_SUBST(INTLTOOL_DESKTOP_RULE)
355+-AC_SUBST(INTLTOOL_DIRECTORY_RULE)
356+-AC_SUBST(INTLTOOL_KEYS_RULE)
357+-AC_SUBST(INTLTOOL_PROP_RULE)
358+-AC_SUBST(INTLTOOL_OAF_RULE)
359+-AC_SUBST(INTLTOOL_PONG_RULE)
360+-AC_SUBST(INTLTOOL_SERVER_RULE)
361+-AC_SUBST(INTLTOOL_SHEET_RULE)
362+-AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
363+-AC_SUBST(INTLTOOL_UI_RULE)
364+-AC_SUBST(INTLTOOL_XAM_RULE)
365+-AC_SUBST(INTLTOOL_KBD_RULE)
366+-AC_SUBST(INTLTOOL_XML_RULE)
367+-AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
368+-AC_SUBST(INTLTOOL_CAVES_RULE)
369+-AC_SUBST(INTLTOOL_SCHEMAS_RULE)
370+-AC_SUBST(INTLTOOL_THEME_RULE)
371+-AC_SUBST(INTLTOOL_SERVICE_RULE)
372+-AC_SUBST(INTLTOOL_POLICY_RULE)
373++_IT_SUBST(INTLTOOL_DESKTOP_RULE)
374++_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
375++_IT_SUBST(INTLTOOL_KEYS_RULE)
376++_IT_SUBST(INTLTOOL_PROP_RULE)
377++_IT_SUBST(INTLTOOL_OAF_RULE)
378++_IT_SUBST(INTLTOOL_PONG_RULE)
379++_IT_SUBST(INTLTOOL_SERVER_RULE)
380++_IT_SUBST(INTLTOOL_SHEET_RULE)
381++_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
382++_IT_SUBST(INTLTOOL_UI_RULE)
383++_IT_SUBST(INTLTOOL_XAM_RULE)
384++_IT_SUBST(INTLTOOL_KBD_RULE)
385++_IT_SUBST(INTLTOOL_XML_RULE)
386++_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
387++_IT_SUBST(INTLTOOL_CAVES_RULE)
388++_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
389++_IT_SUBST(INTLTOOL_THEME_RULE)
390++_IT_SUBST(INTLTOOL_SERVICE_RULE)
391++_IT_SUBST(INTLTOOL_POLICY_RULE)
392+
393+ # Check the gettext tools to make sure they are GNU
394+ AC_PATH_PROG(XGETTEXT, xgettext)
395+@@ -872,12 +869,17 @@
396+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
397+ fi
398+
399+-AC_PATH_PROG(INTLTOOL_PERL, [perl])
400++AC_PATH_PROG(INTLTOOL_PERL, perl)
401+ if test -z "$INTLTOOL_PERL"; then
402+- AC_MSG_ERROR([perl not found; required for intltool])
403++ AC_MSG_ERROR([perl not found])
404+ fi
405+-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
406+- AC_MSG_ERROR([perl 5.x required for intltool])
407++AC_MSG_CHECKING([for perl >= 5.8.1])
408++$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
409++if test $? -ne 0; then
410++ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
411++else
412++ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
413++ AC_MSG_RESULT([$IT_PERL_VERSION])
414+ fi
415+ if test "x$2" != "xno-xml"; then
416+ AC_MSG_CHECKING([for XML::Parser])
417+@@ -933,7 +935,7 @@
418+ dnl of config.status.
419+ AC_CONFIG_COMMANDS_PRE([
420+ AC_CONFIG_COMMANDS([$1/stamp-it], [
421+- if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
422++ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
423+ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
424+ fi
425+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
426+@@ -955,6 +957,17 @@
427+ ])dnl
428+ ])
429+
430++# _IT_SUBST(VARIABLE)
431++# -------------------
432++# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
433++#
434++AC_DEFUN([_IT_SUBST],
435++[
436++AC_SUBST([$1])
437++m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
438++]
439++)
440++
441+ # deprecated macros
442+ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
443+ # A hint is needed for aclocal from Automake <= 1.9.4:
444+@@ -962,101 +975,187 @@
445
446
447 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
448@@ -241,11 +518,19 @@
449 +# obtained by writing to the Free Software Foundation, Inc.,
450 +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
451 +])
452-+
453+
454+-# serial 52 AC_PROG_LIBTOOL
455 +# serial 56 LT_INIT
456
457--# serial 52 AC_PROG_LIBTOOL
458
459+-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
460+-# -----------------------------------------------------------
461+-# If this macro is not defined by Autoconf, define it here.
462+-m4_ifdef([AC_PROVIDE_IFELSE],
463+- [],
464+- [m4_define([AC_PROVIDE_IFELSE],
465+- [m4_ifdef([AC_PROVIDE_$1],
466+- [$2], [$3])])])
467 +# LT_PREREQ(VERSION)
468 +# ------------------
469 +# Complain and exit if this libtool version is less that VERSION.
470@@ -256,24 +541,6 @@
471 + 63)])],
472 + [$2])])
473
474--# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
475--# -----------------------------------------------------------
476--# If this macro is not defined by Autoconf, define it here.
477--m4_ifdef([AC_PROVIDE_IFELSE],
478-- [],
479-- [m4_define([AC_PROVIDE_IFELSE],
480-- [m4_ifdef([AC_PROVIDE_$1],
481-- [$2], [$3])])])
482-
483-+# _LT_CHECK_BUILDDIR
484-+# ------------------
485-+# Complain if the absolute build directory name contains unusual characters
486-+m4_defun([_LT_CHECK_BUILDDIR],
487-+[case `pwd` in
488-+ *\ * | *\ *)
489-+ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
490-+esac
491-+])
492
493 -# AC_PROG_LIBTOOL
494 -# ---------------
495@@ -308,7 +575,24 @@
496 - [define([LT_AC_PROG_GCJ],
497 - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
498 -])])# AC_PROG_LIBTOOL
499-
500++# _LT_CHECK_BUILDDIR
501++# ------------------
502++# Complain if the absolute build directory name contains unusual characters
503++m4_defun([_LT_CHECK_BUILDDIR],
504++[case `pwd` in
505++ *\ * | *\ *)
506++ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
507++esac
508++])
509+
510+
511+-# _AC_PROG_LIBTOOL
512+-# ----------------
513+-AC_DEFUN([_AC_PROG_LIBTOOL],
514+-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
515+-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
516+-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
517+-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
518 +# LT_INIT([OPTIONS])
519 +# ------------------
520 +AC_DEFUN([LT_INIT],
521@@ -328,14 +612,7 @@
522 +AC_REQUIRE([LTVERSION_VERSION])dnl
523 +AC_REQUIRE([LTOBSOLETE_VERSION])dnl
524 +m4_require([_LT_PROG_LTMAIN])dnl
525-
526--# _AC_PROG_LIBTOOL
527--# ----------------
528--AC_DEFUN([_AC_PROG_LIBTOOL],
529--[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
530--AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
531--AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
532--AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
533++
534 +dnl Parse OPTIONS
535 +_LT_SET_OPTIONS([$0], [$1])
536
537@@ -427,14 +704,14 @@
538 -AC_REQUIRE([AC_EXEEXT])dnl
539 +test -z "$LN_S" && LN_S="ln -s"
540 +_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
541-+dnl
542-+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
543-+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
544-+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
545 dnl
546 -AC_LIBTOOL_SYS_MAX_CMD_LEN
547 -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
548 -AC_LIBTOOL_OBJDIR
549++AC_REQUIRE([LT_CMD_MAX_LEN])dnl
550++_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
551++_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
552++dnl
553 +m4_require([_LT_FILEUTILS_DEFAULTS])dnl
554 +m4_require([_LT_CHECK_SHELL_FEATURES])dnl
555 +m4_require([_LT_CMD_RELOAD])dnl
556@@ -452,17 +729,17 @@
557 +if test -n "${ZSH_VERSION+set}" ; then
558 + setopt NO_GLOB_SUBST
559 +fi
560++
561++_LT_CHECK_OBJDIR
562
563 -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
564 -_LT_AC_PROG_ECHO_BACKSLASH
565-+_LT_CHECK_OBJDIR
566-+
567 +m4_require([_LT_TAG_COMPILER])dnl
568 +_LT_PROG_ECHO_BACKSLASH
569
570 case $host_os in
571 aix3*)
572-@@ -1072,6533 +1155,7770 @@
573+@@ -1072,6533 +1171,7770 @@
574
575 # Sed substitution that helps us do robust quoting. It backslashifies
576 # metacharacters that are still active within double-quoted strings.
577@@ -767,33 +1044,7 @@
578 - fi
579 - ;;
580 - esac
581--])
582-
583--# _LT_AC_SYS_LIBPATH_AIX
584--# ----------------------
585--# Links a minimal program and checks the executable
586--# for the system default hardcoded library path. In most cases,
587--# this is /usr/lib:/lib, but when the MPI compilers are used
588--# the location of the communication and MPI libs are included too.
589--# If we don't find anything, use the default library path according
590--# to the aix ld manual.
591--AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
592--[AC_REQUIRE([LT_AC_PROG_SED])dnl
593--AC_LINK_IFELSE(AC_LANG_PROGRAM,[
594--lt_aix_libpath_sed='
595-- /Import File Strings/,/^$/ {
596-- /^0/ {
597-- s/^0 *\(.*\)$/\1/
598-- p
599-- }
600-- }'
601--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
602--# Check for a 64-bit object if we didn't find anything.
603--if test -z "$aix_libpath"; then
604-- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
605--fi],[])
606--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
607--])# _LT_AC_SYS_LIBPATH_AIX
608++
609 +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
610 +# -------------------------------------------------------------------
611 +# CONFIGNAME is the name given to the value in the libtool script.
612@@ -809,8 +1060,37 @@
613 + [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
614 + lt_dict_add_subkey([lt_decl_dict], [$2],
615 + [tagged?], [m4_ifval([$5], [yes], [no])])])
616-+])
617-
618+ ])
619+
620+-# _LT_AC_SYS_LIBPATH_AIX
621+-# ----------------------
622+-# Links a minimal program and checks the executable
623+-# for the system default hardcoded library path. In most cases,
624+-# this is /usr/lib:/lib, but when the MPI compilers are used
625+-# the location of the communication and MPI libs are included too.
626+-# If we don't find anything, use the default library path according
627+-# to the aix ld manual.
628+-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
629+-[AC_REQUIRE([LT_AC_PROG_SED])dnl
630+-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
631+-lt_aix_libpath_sed='
632+- /Import File Strings/,/^$/ {
633+- /^0/ {
634+- s/^0 *\(.*\)$/\1/
635+- p
636+- }
637+- }'
638+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
639+-# Check for a 64-bit object if we didn't find anything.
640+-if test -z "$aix_libpath"; then
641+- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
642+-fi],[])
643+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
644+-])# _LT_AC_SYS_LIBPATH_AIX
645+
646++# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
647++# --------------------------------------------------------
648++m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
649
650 -# _LT_AC_SHELL_INIT(ARG)
651 -# ----------------------
652@@ -821,10 +1101,11 @@
653 -$1
654 -AC_DIVERT_POP
655 -])# _LT_AC_SHELL_INIT
656-+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
657-+# --------------------------------------------------------
658-+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
659
660++# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
661++# ------------------------------------------------
662++m4_define([lt_decl_tag_varnames],
663++[_lt_decl_filter([tagged?], [yes], $@)])
664
665 -# _LT_AC_PROG_ECHO_BACKSLASH
666 -# --------------------------
667@@ -834,10 +1115,6 @@
668 -[_LT_AC_SHELL_INIT([
669 -# Check that we are running under the correct shell.
670 -SHELL=${CONFIG_SHELL-/bin/sh}
671-+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
672-+# ------------------------------------------------
673-+m4_define([lt_decl_tag_varnames],
674-+[_lt_decl_filter([tagged?], [yes], $@)])
675
676 -case X$ECHO in
677 -X*--fallback-echo)
678@@ -845,21 +1122,6 @@
679 - ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
680 - ;;
681 -esac
682-
683--echo=${ECHO-echo}
684--if test "X[$]1" = X--no-reexec; then
685-- # Discard the --no-reexec flag, and continue.
686-- shift
687--elif test "X[$]1" = X--fallback-echo; then
688-- # Avoid inline document here, it may be left over
689-- :
690--elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
691-- # Yippee, $echo works!
692-- :
693--else
694-- # Restart under the correct shell.
695-- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
696--fi
697 +# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
698 +# ---------------------------------------------------------
699 +m4_define([_lt_decl_filter],
700@@ -871,6 +1133,21 @@
701 + [lt_dict_filter([lt_decl_dict], $@)])[]dnl
702 +])
703
704+-echo=${ECHO-echo}
705+-if test "X[$]1" = X--no-reexec; then
706+- # Discard the --no-reexec flag, and continue.
707+- shift
708+-elif test "X[$]1" = X--fallback-echo; then
709+- # Avoid inline document here, it may be left over
710+- :
711+-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
712+- # Yippee, $echo works!
713+- :
714+-else
715+- # Restart under the correct shell.
716+- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
717+-fi
718+
719 -if test "X[$]1" = X--fallback-echo; then
720 - # used as fallback echo
721 - shift
722@@ -879,15 +1156,15 @@
723 -EOF
724 - exit 0
725 -fi
726-
727--# The HP-UX ksh and POSIX shell print the target directory to stdout
728--# if CDPATH is set.
729--(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
730 +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
731 +# --------------------------------------------------
732 +m4_define([lt_decl_quote_varnames],
733 +[_lt_decl_filter([value], [1], $@)])
734
735+-# The HP-UX ksh and POSIX shell print the target directory to stdout
736+-# if CDPATH is set.
737+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
738+
739 -if test -z "$ECHO"; then
740 -if test "X${echo_test_string+set}" != Xset; then
741 -# find a string as large as possible, as long as the shell can cope with it
742@@ -901,22 +1178,22 @@
743 - fi
744 - done
745 -fi
746-
747--if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
748-- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
749-- test "X$echo_testing_string" = "X$echo_test_string"; then
750-- :
751--else
752-- # The Solaris, AIX, and Digital Unix default echo programs unquote
753-- # backslashes. This makes it impossible to quote backslashes using
754-- # echo "$something" | sed 's/\\/\\\\/g'
755-- #
756-- # So, first we look for a working echo in the user's PATH.
757 +# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
758 +# ---------------------------------------------------
759 +m4_define([lt_decl_dquote_varnames],
760 +[_lt_decl_filter([value], [2], $@)])
761
762+-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
763+- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
764+- test "X$echo_testing_string" = "X$echo_test_string"; then
765+- :
766+-else
767+- # The Solaris, AIX, and Digital Unix default echo programs unquote
768+- # backslashes. This makes it impossible to quote backslashes using
769+- # echo "$something" | sed 's/\\/\\\\/g'
770+- #
771+- # So, first we look for a working echo in the user's PATH.
772+
773 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
774 - for dir in $PATH /usr/ucb; do
775 - IFS="$lt_save_ifs"
776@@ -929,47 +1206,6 @@
777 - fi
778 - done
779 - IFS="$lt_save_ifs"
780-
781-- if test "X$echo" = Xecho; then
782-- # We didn't find a better echo, so look for alternatives.
783-- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
784-- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
785-- test "X$echo_testing_string" = "X$echo_test_string"; then
786-- # This shell has a builtin print -r that does the trick.
787-- echo='print -r'
788-- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
789-- test "X$CONFIG_SHELL" != X/bin/ksh; then
790-- # If we have ksh, try running configure again with it.
791-- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
792-- export ORIGINAL_CONFIG_SHELL
793-- CONFIG_SHELL=/bin/ksh
794-- export CONFIG_SHELL
795-- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
796-- else
797-- # Try using printf.
798-- echo='printf %s\n'
799-- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
800-- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
801-- test "X$echo_testing_string" = "X$echo_test_string"; then
802-- # Cool, printf works
803-- :
804-- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
805-- test "X$echo_testing_string" = 'X\t' &&
806-- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
807-- test "X$echo_testing_string" = "X$echo_test_string"; then
808-- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
809-- export CONFIG_SHELL
810-- SHELL="$CONFIG_SHELL"
811-- export SHELL
812-- echo="$CONFIG_SHELL [$]0 --fallback-echo"
813-- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
814-- test "X$echo_testing_string" = 'X\t' &&
815-- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
816-- test "X$echo_testing_string" = "X$echo_test_string"; then
817-- echo="$CONFIG_SHELL [$]0 --fallback-echo"
818-- else
819-- # maybe with a smaller string...
820-- prev=:
821 +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
822 +# ---------------------------------------------------
823 +m4_define([lt_decl_varnames_tagged],
824@@ -980,6 +1216,47 @@
825 +m4_define([_lt_decl_varnames_tagged],
826 +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
827
828+- if test "X$echo" = Xecho; then
829+- # We didn't find a better echo, so look for alternatives.
830+- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
831+- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
832+- test "X$echo_testing_string" = "X$echo_test_string"; then
833+- # This shell has a builtin print -r that does the trick.
834+- echo='print -r'
835+- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
836+- test "X$CONFIG_SHELL" != X/bin/ksh; then
837+- # If we have ksh, try running configure again with it.
838+- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
839+- export ORIGINAL_CONFIG_SHELL
840+- CONFIG_SHELL=/bin/ksh
841+- export CONFIG_SHELL
842+- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
843+- else
844+- # Try using printf.
845+- echo='printf %s\n'
846+- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
847+- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
848+- test "X$echo_testing_string" = "X$echo_test_string"; then
849+- # Cool, printf works
850+- :
851+- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
852+- test "X$echo_testing_string" = 'X\t' &&
853+- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
854+- test "X$echo_testing_string" = "X$echo_test_string"; then
855+- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
856+- export CONFIG_SHELL
857+- SHELL="$CONFIG_SHELL"
858+- export SHELL
859+- echo="$CONFIG_SHELL [$]0 --fallback-echo"
860+- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
861+- test "X$echo_testing_string" = 'X\t' &&
862+- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
863+- test "X$echo_testing_string" = "X$echo_test_string"; then
864+- echo="$CONFIG_SHELL [$]0 --fallback-echo"
865+- else
866+- # maybe with a smaller string...
867+- prev=:
868+
869 - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
870 - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
871 - then
872@@ -987,20 +1264,6 @@
873 - fi
874 - prev="$cmd"
875 - done
876-
877-- if test "$prev" != 'sed 50q "[$]0"'; then
878-- echo_test_string=`eval $prev`
879-- export echo_test_string
880-- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
881-- else
882-- # Oops. We lost completely, so just stick with echo.
883-- echo=echo
884-- fi
885-- fi
886-- fi
887-- fi
888--fi
889--fi
890 +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
891 +# ------------------------------------------------
892 +m4_define([lt_decl_all_varnames],
893@@ -1014,15 +1277,26 @@
894 + lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
895 +])
896
897+- if test "$prev" != 'sed 50q "[$]0"'; then
898+- echo_test_string=`eval $prev`
899+- export echo_test_string
900+- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
901+- else
902+- # Oops. We lost completely, so just stick with echo.
903+- echo=echo
904+- fi
905+- fi
906+- fi
907+- fi
908+-fi
909+-fi
910+
911 -# Copy echo and quote the copy suitably for passing to libtool from
912 -# the Makefile, instead of quoting the original, which is used later.
913 -ECHO=$echo
914 -if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
915 - ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
916 -fi
917-
918--AC_SUBST(ECHO)
919--])])# _LT_AC_PROG_ECHO_BACKSLASH
920 +# _LT_CONFIG_STATUS_DECLARE([VARNAME])
921 +# ------------------------------------
922 +# Quote a variable value, and forward it to `config.status' so that its
923@@ -1031,14 +1305,9 @@
924 +m4_define([_LT_CONFIG_STATUS_DECLARE],
925 +[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
926
927+-AC_SUBST(ECHO)
928+-])])# _LT_AC_PROG_ECHO_BACKSLASH
929
930--# _LT_AC_LOCK
931--# -----------
932--AC_DEFUN([_LT_AC_LOCK],
933--[AC_ARG_ENABLE([libtool-lock],
934-- [AC_HELP_STRING([--disable-libtool-lock],
935-- [avoid locking (might break parallel builds)])])
936--test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
937 +# _LT_CONFIG_STATUS_DECLARATIONS
938 +# ------------------------------
939 +# We delimit libtool config variables with single quotes, so when
940@@ -1051,6 +1320,14 @@
941 +[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
942 + [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
943
944+-# _LT_AC_LOCK
945+-# -----------
946+-AC_DEFUN([_LT_AC_LOCK],
947+-[AC_ARG_ENABLE([libtool-lock],
948+- [AC_HELP_STRING([--disable-libtool-lock],
949+- [avoid locking (might break parallel builds)])])
950+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
951+
952 -# Some flags need to be propagated to the compiler or linker for good
953 -# libtool support.
954 -case $host in
955@@ -1101,31 +1378,6 @@
956 - fi
957 - rm -rf conftest*
958 - ;;
959-
960--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
961--s390*-*linux*|sparc*-*linux*)
962-- # Find out which ABI we are using.
963-- echo 'int i;' > conftest.$ac_ext
964-- if AC_TRY_EVAL(ac_compile); then
965-- case `/usr/bin/file conftest.o` in
966-- *32-bit*)
967-- case $host in
968-- x86_64-*kfreebsd*-gnu)
969-- LD="${LD-ld} -m elf_i386_fbsd"
970-- ;;
971-- x86_64-*linux*)
972-- LD="${LD-ld} -m elf_i386"
973-- ;;
974-- ppc64-*linux*|powerpc64-*linux*)
975-- LD="${LD-ld} -m elf32ppclinux"
976-- ;;
977-- s390x-*linux*)
978-- LD="${LD-ld} -m elf_s390"
979-- ;;
980-- sparc64-*linux*)
981-- LD="${LD-ld} -m elf32_sparc"
982-- ;;
983-- esac
984 +# _LT_LIBTOOL_TAGS
985 +# ----------------
986 +# Output comment and list of tags supported by the script
987@@ -1133,7 +1385,31 @@
988 +[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
989 +available_tags="_LT_TAGS"dnl
990 +])
991-+
992+
993+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
994+-s390*-*linux*|sparc*-*linux*)
995+- # Find out which ABI we are using.
996+- echo 'int i;' > conftest.$ac_ext
997+- if AC_TRY_EVAL(ac_compile); then
998+- case `/usr/bin/file conftest.o` in
999+- *32-bit*)
1000+- case $host in
1001+- x86_64-*kfreebsd*-gnu)
1002+- LD="${LD-ld} -m elf_i386_fbsd"
1003+- ;;
1004+- x86_64-*linux*)
1005+- LD="${LD-ld} -m elf_i386"
1006+- ;;
1007+- ppc64-*linux*|powerpc64-*linux*)
1008+- LD="${LD-ld} -m elf32ppclinux"
1009+- ;;
1010+- s390x-*linux*)
1011+- LD="${LD-ld} -m elf_s390"
1012+- ;;
1013+- sparc64-*linux*)
1014+- LD="${LD-ld} -m elf32_sparc"
1015+- ;;
1016+- esac
1017 +
1018 +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
1019 +# -----------------------------------
1020@@ -1467,8 +1743,17 @@
1021 + exec AS_MESSAGE_FD>/dev/null
1022 fi
1023 -])# AC_LIBTOOL_LINKER_OPTION
1024+-
1025 +_LTEOF
1026
1027+-# AC_LIBTOOL_SYS_MAX_CMD_LEN
1028+-# --------------------------
1029+-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
1030+-[# find the maximum length of command line arguments
1031+-AC_MSG_CHECKING([the maximum length of command line arguments])
1032+-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
1033+- i=0
1034+- teststring="ABCD"
1035 +cat >>"$CONFIG_LT" <<_LTEOF
1036 +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
1037 +_LTEOF
1038@@ -1495,15 +1780,6 @@
1039 +fi
1040 +])# LT_OUTPUT
1041
1042--# AC_LIBTOOL_SYS_MAX_CMD_LEN
1043--# --------------------------
1044--AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
1045--[# find the maximum length of command line arguments
1046--AC_MSG_CHECKING([the maximum length of command line arguments])
1047--AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
1048-- i=0
1049-- teststring="ABCD"
1050--
1051 - case $build_os in
1052 - msdosdjgpp*)
1053 - # On DJGPP, this test can blow up pretty badly due to problems in libc
1054@@ -1656,15 +1932,22 @@
1055 - AC_MSG_RESULT(none)
1056 -fi
1057 -])# AC_LIBTOOL_SYS_MAX_CMD_LEN
1058--
1059--
1060+
1061++ _LT_PROG_LTMAIN
1062+
1063 -# _LT_AC_CHECK_DLFCN
1064 -# ------------------
1065 -AC_DEFUN([_LT_AC_CHECK_DLFCN],
1066 -[AC_CHECK_HEADERS(dlfcn.h)dnl
1067 -])# _LT_AC_CHECK_DLFCN
1068++ # We use sed instead of cat because bash on DJGPP gets confused if
1069++ # if finds mixed CR/LF and LF-only lines. Since sed operates in
1070++ # text mode, it properly converts lines to CR/LF. This bash problem
1071++ # is reportedly fixed, but why not run on old versions too?
1072++ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
1073++ || (rm -f "$cfgfile"; exit 1)
1074
1075-+ _LT_PROG_LTMAIN
1076++ _LT_PROG_XSI_SHELLFNS
1077
1078 -# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
1079 -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
1080@@ -1679,58 +1962,19 @@
1081 - cat > conftest.$ac_ext <<EOF
1082 -[#line __oline__ "configure"
1083 -#include "confdefs.h"
1084-+ # We use sed instead of cat because bash on DJGPP gets confused if
1085-+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
1086-+ # text mode, it properly converts lines to CR/LF. This bash problem
1087-+ # is reportedly fixed, but why not run on old versions too?
1088-+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
1089++ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
1090 + || (rm -f "$cfgfile"; exit 1)
1091
1092 -#if HAVE_DLFCN_H
1093 -#include <dlfcn.h>
1094 -#endif
1095-+ _LT_PROG_XSI_SHELLFNS
1096-
1097--#include <stdio.h>
1098-+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
1099-+ || (rm -f "$cfgfile"; exit 1)
1100-
1101--#ifdef RTLD_GLOBAL
1102--# define LT_DLGLOBAL RTLD_GLOBAL
1103--#else
1104--# ifdef DL_GLOBAL
1105--# define LT_DLGLOBAL DL_GLOBAL
1106--# else
1107--# define LT_DLGLOBAL 0
1108--# endif
1109--#endif
1110 + mv -f "$cfgfile" "$ofile" ||
1111 + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
1112 + chmod +x "$ofile"
1113 +],
1114 +[cat <<_LT_EOF >> "$ofile"
1115
1116--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
1117-- find out it does not work in some platform. */
1118--#ifndef LT_DLLAZY_OR_NOW
1119--# ifdef RTLD_LAZY
1120--# define LT_DLLAZY_OR_NOW RTLD_LAZY
1121--# else
1122--# ifdef DL_LAZY
1123--# define LT_DLLAZY_OR_NOW DL_LAZY
1124--# else
1125--# ifdef RTLD_NOW
1126--# define LT_DLLAZY_OR_NOW RTLD_NOW
1127--# else
1128--# ifdef DL_NOW
1129--# define LT_DLLAZY_OR_NOW DL_NOW
1130--# else
1131--# define LT_DLLAZY_OR_NOW 0
1132--# endif
1133--# endif
1134--# endif
1135--# endif
1136--#endif
1137+-#include <stdio.h>
1138 +dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
1139 +dnl in a comment (ie after a #).
1140 +# ### BEGIN LIBTOOL TAG CONFIG: $1
1141@@ -1748,15 +1992,37 @@
1142 +])dnl /_LT_CONFIG_SAVE_COMMANDS
1143 +])# _LT_CONFIG
1144
1145--#ifdef __cplusplus
1146--extern "C" void exit (int);
1147+-#ifdef RTLD_GLOBAL
1148+-# define LT_DLGLOBAL RTLD_GLOBAL
1149+-#else
1150+-# ifdef DL_GLOBAL
1151+-# define LT_DLGLOBAL DL_GLOBAL
1152+-# else
1153+-# define LT_DLGLOBAL 0
1154+-# endif
1155 -#endif
1156
1157--void fnord() { int i=42;}
1158--int main ()
1159--{
1160-- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1161-- int status = $lt_dlunknown;
1162+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
1163+- find out it does not work in some platform. */
1164+-#ifndef LT_DLLAZY_OR_NOW
1165+-# ifdef RTLD_LAZY
1166+-# define LT_DLLAZY_OR_NOW RTLD_LAZY
1167+-# else
1168+-# ifdef DL_LAZY
1169+-# define LT_DLLAZY_OR_NOW DL_LAZY
1170+-# else
1171+-# ifdef RTLD_NOW
1172+-# define LT_DLLAZY_OR_NOW RTLD_NOW
1173+-# else
1174+-# ifdef DL_NOW
1175+-# define LT_DLLAZY_OR_NOW DL_NOW
1176+-# else
1177+-# define LT_DLLAZY_OR_NOW 0
1178+-# endif
1179+-# endif
1180+-# endif
1181+-# endif
1182+-#endif
1183 +# LT_SUPPORTED_TAG(TAG)
1184 +# ---------------------
1185 +# Trace this macro to discover what tags are supported by the libtool
1186@@ -1764,6 +2030,19 @@
1187 +# autoconf --trace 'LT_SUPPORTED_TAG:$1'
1188 +AC_DEFUN([LT_SUPPORTED_TAG], [])
1189
1190+-#ifdef __cplusplus
1191+-extern "C" void exit (int);
1192+-#endif
1193+
1194+-void fnord() { int i=42;}
1195+-int main ()
1196+-{
1197+- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
1198+- int status = $lt_dlunknown;
1199++# C support is built-in for now
1200++m4_define([_LT_LANG_C_enabled], [])
1201++m4_define([_LT_TAGS], [])
1202+
1203 - if (self)
1204 - {
1205 - if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
1206@@ -1791,22 +2070,6 @@
1207 -fi
1208 -rm -fr conftest*
1209 -])# _LT_AC_TRY_DLOPEN_SELF
1210-+# C support is built-in for now
1211-+m4_define([_LT_LANG_C_enabled], [])
1212-+m4_define([_LT_TAGS], [])
1213-
1214-
1215--# AC_LIBTOOL_DLOPEN_SELF
1216--# ----------------------
1217--AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
1218--[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
1219--if test "x$enable_dlopen" != xyes; then
1220-- enable_dlopen=unknown
1221-- enable_dlopen_self=unknown
1222-- enable_dlopen_self_static=unknown
1223--else
1224-- lt_cv_dlopen=no
1225-- lt_cv_dlopen_libs=
1226 +# LT_LANG(LANG)
1227 +# -------------
1228 +# Enable libtool support for the given language if not already enabled.
1229@@ -1824,17 +2087,18 @@
1230 + [m4_fatal([$0: unsupported language: "$1"])])])dnl
1231 +])# LT_LANG
1232
1233-- case $host_os in
1234-- beos*)
1235-- lt_cv_dlopen="load_add_on"
1236-- lt_cv_dlopen_libs=
1237-- lt_cv_dlopen_self=yes
1238-- ;;
1239
1240-- mingw* | pw32*)
1241-- lt_cv_dlopen="LoadLibrary"
1242-- lt_cv_dlopen_libs=
1243-- ;;
1244+-# AC_LIBTOOL_DLOPEN_SELF
1245+-# ----------------------
1246+-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
1247+-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
1248+-if test "x$enable_dlopen" != xyes; then
1249+- enable_dlopen=unknown
1250+- enable_dlopen_self=unknown
1251+- enable_dlopen_self_static=unknown
1252+-else
1253+- lt_cv_dlopen=no
1254+- lt_cv_dlopen_libs=
1255 +# _LT_LANG(LANGNAME)
1256 +# ------------------
1257 +m4_defun([_LT_LANG],
1258@@ -1845,19 +2109,16 @@
1259 + _LT_LANG_$1_CONFIG($1)])dnl
1260 +])# _LT_LANG
1261
1262-- cygwin*)
1263-- lt_cv_dlopen="dlopen"
1264-- lt_cv_dlopen_libs=
1265-- ;;
1266-
1267-- darwin*)
1268-- # if libdl is installed we need to link against it
1269-- AC_CHECK_LIB([dl], [dlopen],
1270-- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
1271-- lt_cv_dlopen="dyld"
1272+- case $host_os in
1273+- beos*)
1274+- lt_cv_dlopen="load_add_on"
1275 - lt_cv_dlopen_libs=
1276 - lt_cv_dlopen_self=yes
1277-- ])
1278+- ;;
1279+
1280+- mingw* | pw32*)
1281+- lt_cv_dlopen="LoadLibrary"
1282+- lt_cv_dlopen_libs=
1283 - ;;
1284 +# _LT_LANG_DEFAULT_CONFIG
1285 +# -----------------------
1286@@ -1905,6 +2166,25 @@
1287 +dnl AC_DEFUN([AC_LIBTOOL_FC], [])
1288 +dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
1289
1290+- cygwin*)
1291+- lt_cv_dlopen="dlopen"
1292+- lt_cv_dlopen_libs=
1293+- ;;
1294+
1295+- darwin*)
1296+- # if libdl is installed we need to link against it
1297+- AC_CHECK_LIB([dl], [dlopen],
1298+- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
1299+- lt_cv_dlopen="dyld"
1300+- lt_cv_dlopen_libs=
1301+- lt_cv_dlopen_self=yes
1302+- ])
1303+- ;;
1304++# _LT_TAG_COMPILER
1305++# ----------------
1306++m4_defun([_LT_TAG_COMPILER],
1307++[AC_REQUIRE([AC_PROG_CC])dnl
1308+
1309 - *)
1310 - AC_CHECK_FUNC([shl_load],
1311 - [lt_cv_dlopen="shl_load"],
1312@@ -1925,35 +2205,34 @@
1313 - ])
1314 - ;;
1315 - esac
1316-
1317-- if test "x$lt_cv_dlopen" != xno; then
1318-- enable_dlopen=yes
1319-- else
1320-- enable_dlopen=no
1321-- fi
1322-+# _LT_TAG_COMPILER
1323-+# ----------------
1324-+m4_defun([_LT_TAG_COMPILER],
1325-+[AC_REQUIRE([AC_PROG_CC])dnl
1326-
1327-- case $lt_cv_dlopen in
1328-- dlopen)
1329-- save_CPPFLAGS="$CPPFLAGS"
1330-- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
1331 +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
1332 +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
1333 +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
1334 +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
1335
1336+- if test "x$lt_cv_dlopen" != xno; then
1337+- enable_dlopen=yes
1338+- else
1339+- enable_dlopen=no
1340+- fi
1341++# If no C compiler was specified, use CC.
1342++LTCC=${LTCC-"$CC"}
1343+
1344+- case $lt_cv_dlopen in
1345+- dlopen)
1346+- save_CPPFLAGS="$CPPFLAGS"
1347+- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
1348++# If no C compiler flags were specified, use CFLAGS.
1349++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
1350+
1351 - save_LDFLAGS="$LDFLAGS"
1352 - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
1353-+# If no C compiler was specified, use CC.
1354-+LTCC=${LTCC-"$CC"}
1355++# Allow CC to be a program name with arguments.
1356++compiler=$CC
1357++])# _LT_TAG_COMPILER
1358
1359 - save_LIBS="$LIBS"
1360 - LIBS="$lt_cv_dlopen_libs $LIBS"
1361-+# If no C compiler flags were specified, use CFLAGS.
1362-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
1363
1364 - AC_CACHE_CHECK([whether a program can dlopen itself],
1365 - lt_cv_dlopen_self, [dnl
1366@@ -1961,25 +2240,6 @@
1367 - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
1368 - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
1369 - ])
1370-+# Allow CC to be a program name with arguments.
1371-+compiler=$CC
1372-+])# _LT_TAG_COMPILER
1373-
1374-- if test "x$lt_cv_dlopen_self" = xyes; then
1375-- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
1376-- AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
1377-- lt_cv_dlopen_self_static, [dnl
1378-- _LT_AC_TRY_DLOPEN_SELF(
1379-- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
1380-- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
1381-- ])
1382-- fi
1383-
1384-- CPPFLAGS="$save_CPPFLAGS"
1385-- LDFLAGS="$save_LDFLAGS"
1386-- LIBS="$save_LIBS"
1387-- ;;
1388-- esac
1389 +# _LT_COMPILER_BOILERPLATE
1390 +# ------------------------
1391 +# Check for compiler boilerplate output or warnings with
1392@@ -1993,17 +2253,21 @@
1393 +$RM conftest*
1394 +])# _LT_COMPILER_BOILERPLATE
1395
1396-- case $lt_cv_dlopen_self in
1397-- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
1398-- *) enable_dlopen_self=unknown ;;
1399-- esac
1400+- if test "x$lt_cv_dlopen_self" = xyes; then
1401+- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
1402+- AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
1403+- lt_cv_dlopen_self_static, [dnl
1404+- _LT_AC_TRY_DLOPEN_SELF(
1405+- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
1406+- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
1407+- ])
1408+- fi
1409
1410-- case $lt_cv_dlopen_self_static in
1411-- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
1412-- *) enable_dlopen_self_static=unknown ;;
1413+- CPPFLAGS="$save_CPPFLAGS"
1414+- LDFLAGS="$save_LDFLAGS"
1415+- LIBS="$save_LIBS"
1416+- ;;
1417 - esac
1418--fi
1419--])# AC_LIBTOOL_DLOPEN_SELF
1420 +# _LT_LINKER_BOILERPLATE
1421 +# ----------------------
1422 +# Check for linker boilerplate output or warnings with
1423@@ -2017,6 +2281,17 @@
1424 +$RM -r conftest*
1425 +])# _LT_LINKER_BOILERPLATE
1426
1427+- case $lt_cv_dlopen_self in
1428+- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
1429+- *) enable_dlopen_self=unknown ;;
1430+- esac
1431+-
1432+- case $lt_cv_dlopen_self_static in
1433+- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
1434+- *) enable_dlopen_self_static=unknown ;;
1435+- esac
1436+-fi
1437+-])# AC_LIBTOOL_DLOPEN_SELF
1438 +# _LT_REQUIRED_DARWIN_CHECKS
1439 +# -------------------------
1440 +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
1441@@ -2038,20 +2313,6 @@
1442 + _LT_DECL([], [OTOOL64], [1],
1443 + [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
1444
1445--# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
1446--# ---------------------------------
1447--# Check to see if options -c and -o are simultaneously supported by compiler
1448--AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
1449--[AC_REQUIRE([LT_AC_PROG_SED])dnl
1450--AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
1451--AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
1452-- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
1453-- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
1454-- $rm -r conftest 2>/dev/null
1455-- mkdir conftest
1456-- cd conftest
1457-- mkdir out
1458-- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
1459 + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
1460 + [lt_cv_apple_cc_single_mod=no
1461 + if test -z "${LT_MULTI_MODULE}"; then
1462@@ -2121,6 +2382,21 @@
1463 + esac
1464 +])
1465
1466+-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
1467+-# ---------------------------------
1468+-# Check to see if options -c and -o are simultaneously supported by compiler
1469+-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
1470+-[AC_REQUIRE([LT_AC_PROG_SED])dnl
1471+-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
1472+-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
1473+- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
1474+- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
1475+- $rm -r conftest 2>/dev/null
1476+- mkdir conftest
1477+- cd conftest
1478+- mkdir out
1479+- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
1480+
1481 - lt_compiler_flag="-o out/conftest2.$ac_objext"
1482 - # Insert the option either (1) after the last *FLAGS variable, or
1483 - # (2) before a word containing "conftest.", or (3) at the end.
1484@@ -2154,7 +2430,6 @@
1485 - cd ..
1486 - rmdir conftest
1487 - $rm conftest*
1488-+
1489 +# _LT_DARWIN_LINKER_FEATURES
1490 +# --------------------------
1491 +# Checks for linker and compiler features on darwin
1492@@ -2291,11 +2566,8 @@
1493 - lt_cv_objdir=_libs
1494 + # Restart under the correct shell.
1495 + exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
1496- fi
1497--rmdir .libs 2>/dev/null])
1498--objdir=$lt_cv_objdir
1499--])# AC_LIBTOOL_OBJDIR
1500-
1501++fi
1502++
1503 +if test "X[$]1" = X--fallback-echo; then
1504 + # used as fallback echo
1505 + shift
1506@@ -2303,7 +2575,14 @@
1507 +[$]*
1508 +_LT_EOF
1509 + exit 0
1510-+fi
1511+ fi
1512+-rmdir .libs 2>/dev/null])
1513+-objdir=$lt_cv_objdir
1514+-])# AC_LIBTOOL_OBJDIR
1515+
1516++# The HP-UX ksh and POSIX shell print the target directory to stdout
1517++# if CDPATH is set.
1518++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
1519
1520 -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
1521 -# ----------------------------------------------
1522@@ -2314,9 +2593,18 @@
1523 -if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
1524 - test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
1525 - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
1526-+# The HP-UX ksh and POSIX shell print the target directory to stdout
1527-+# if CDPATH is set.
1528-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
1529++if test -z "$lt_ECHO"; then
1530++ if test "X${echo_test_string+set}" != Xset; then
1531++ # find a string as large as possible, as long as the shell can cope with it
1532++ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
1533++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
1534++ if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
1535++ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
1536++ then
1537++ break
1538++ fi
1539++ done
1540++ fi
1541
1542 - # We can hardcode non-existant directories.
1543 - if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
1544@@ -2327,19 +2615,6 @@
1545 - test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
1546 - # Linking always hardcodes the temporary library directory.
1547 - _LT_AC_TAGVAR(hardcode_action, $1)=relink
1548-+if test -z "$lt_ECHO"; then
1549-+ if test "X${echo_test_string+set}" != Xset; then
1550-+ # find a string as large as possible, as long as the shell can cope with it
1551-+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
1552-+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
1553-+ if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
1554-+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
1555-+ then
1556-+ break
1557-+ fi
1558-+ done
1559-+ fi
1560-+
1561 + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
1562 + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
1563 + test "X$echo_testing_string" = "X$echo_test_string"; then
1564@@ -3677,10 +3952,15 @@
1565 - if test -z "$LTCFLAGS"; then
1566 - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
1567 - fi
1568--
1569+
1570 - # Extract list of available tagged configurations in $ofile.
1571 - # Note that this assumes the entire list is on one line.
1572 - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
1573++ CPPFLAGS="$save_CPPFLAGS"
1574++ LDFLAGS="$save_LDFLAGS"
1575++ LIBS="$save_LIBS"
1576++ ;;
1577++ esac
1578
1579 - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
1580 - for tagname in $tagnames; do
1581@@ -3691,35 +3971,15 @@
1582 - *) AC_MSG_ERROR([invalid tag name: $tagname])
1583 - ;;
1584 - esac
1585-+ CPPFLAGS="$save_CPPFLAGS"
1586-+ LDFLAGS="$save_LDFLAGS"
1587-+ LIBS="$save_LIBS"
1588-+ ;;
1589++ case $lt_cv_dlopen_self in
1590++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
1591++ *) enable_dlopen_self=unknown ;;
1592 + esac
1593
1594 - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
1595 - then
1596 - AC_MSG_ERROR([tag name \"$tagname\" already exists])
1597 - fi
1598-+ case $lt_cv_dlopen_self in
1599-+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
1600-+ *) enable_dlopen_self=unknown ;;
1601-+ esac
1602-
1603-- # Update the list of available tags.
1604-- if test -n "$tagname"; then
1605-- echo appending configuration tag \"$tagname\" to $ofile
1606--
1607-- case $tagname in
1608-- CXX)
1609-- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
1610-- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
1611-- (test "X$CXX" != "Xg++"))) ; then
1612-- AC_LIBTOOL_LANG_CXX_CONFIG
1613-- else
1614-- tagname=""
1615-- fi
1616-- ;;
1617 + case $lt_cv_dlopen_self_static in
1618 + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
1619 + *) enable_dlopen_self_static=unknown ;;
1620@@ -3738,6 +3998,21 @@
1621 +dnl aclocal-1.4 backwards compatibility:
1622 +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
1623
1624+- # Update the list of available tags.
1625+- if test -n "$tagname"; then
1626+- echo appending configuration tag \"$tagname\" to $ofile
1627+-
1628+- case $tagname in
1629+- CXX)
1630+- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
1631+- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
1632+- (test "X$CXX" != "Xg++"))) ; then
1633+- AC_LIBTOOL_LANG_CXX_CONFIG
1634+- else
1635+- tagname=""
1636+- fi
1637+- ;;
1638+
1639 - F77)
1640 - if test -n "$F77" && test "X$F77" != "Xno"; then
1641 - AC_LIBTOOL_LANG_F77_CONFIG
1642@@ -3745,14 +4020,6 @@
1643 - tagname=""
1644 - fi
1645 - ;;
1646-
1647-- GCJ)
1648-- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
1649-- AC_LIBTOOL_LANG_GCJ_CONFIG
1650-- else
1651-- tagname=""
1652-- fi
1653-- ;;
1654 +# _LT_COMPILER_C_O([TAGNAME])
1655 +# ---------------------------
1656 +# Check to see if options -c and -o are simultaneously supported by compiler.
1657@@ -3770,8 +4037,12 @@
1658 + mkdir out
1659 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
1660
1661-- RC)
1662-- AC_LIBTOOL_LANG_RC_CONFIG
1663+- GCJ)
1664+- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
1665+- AC_LIBTOOL_LANG_GCJ_CONFIG
1666+- else
1667+- tagname=""
1668+- fi
1669 - ;;
1670 + lt_compiler_flag="-o out/conftest2.$ac_objext"
1671 + # Insert the option either (1) after the last *FLAGS variable, or
1672@@ -3811,18 +4082,14 @@
1673 + [Does compiler simultaneously support -c and -o options?])
1674 +])# _LT_COMPILER_C_O
1675
1676+- RC)
1677+- AC_LIBTOOL_LANG_RC_CONFIG
1678+- ;;
1679+
1680 - *)
1681 - AC_MSG_ERROR([Unsupported tag name: $tagname])
1682 - ;;
1683 - esac
1684-
1685-- # Append the new tag name to the list of available tags.
1686-- if test -n "$tagname" ; then
1687-- available_tags="$available_tags $tagname"
1688-- fi
1689-- fi
1690-- done
1691-- IFS="$lt_save_ifs"
1692 +# _LT_COMPILER_FILE_LOCKS([TAGNAME])
1693 +# ----------------------------------
1694 +# Check to see if we can do hard links to lock some files if needed
1695@@ -3831,13 +4098,13 @@
1696 +m4_require([_LT_FILEUTILS_DEFAULTS])dnl
1697 +_LT_COMPILER_C_O([$1])
1698
1699-- # Now substitute the updated list of available tags.
1700-- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
1701-- mv "${ofile}T" "$ofile"
1702-- chmod +x "$ofile"
1703-- else
1704-- rm -f "${ofile}T"
1705-- AC_MSG_ERROR([unable to update list of available tagged configurations.])
1706+- # Append the new tag name to the list of available tags.
1707+- if test -n "$tagname" ; then
1708+- available_tags="$available_tags $tagname"
1709+- fi
1710+- fi
1711+- done
1712+- IFS="$lt_save_ifs"
1713 +hard_links="nottested"
1714 +if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
1715 + # do not overwrite the value of need_locks provided by the user
1716@@ -3852,21 +4119,14 @@
1717 + if test "$hard_links" = no; then
1718 + AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
1719 + need_locks=warn
1720- fi
1721++ fi
1722 +else
1723 + need_locks=no
1724- fi
1725--])# _LT_AC_TAGCONFIG
1726++fi
1727 +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
1728 +])# _LT_COMPILER_FILE_LOCKS
1729-
1730-
1731--# AC_LIBTOOL_DLOPEN
1732--# -----------------
1733--# enable checks for dlopen support
1734--AC_DEFUN([AC_LIBTOOL_DLOPEN],
1735-- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
1736--])# AC_LIBTOOL_DLOPEN
1737++
1738++
1739 +# _LT_CHECK_OBJDIR
1740 +# ----------------
1741 +m4_defun([_LT_CHECK_OBJDIR],
1742@@ -3887,14 +4147,8 @@
1743 +AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
1744 + [Define to the sub-directory in which libtool stores uninstalled libraries.])
1745 +])# _LT_CHECK_OBJDIR
1746-
1747-
1748--# AC_LIBTOOL_WIN32_DLL
1749--# --------------------
1750--# declare package support for building win32 DLLs
1751--AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
1752--[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
1753--])# AC_LIBTOOL_WIN32_DLL
1754++
1755++
1756 +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
1757 +# --------------------------------------
1758 +# Check hardcoding attributes.
1759@@ -3905,6 +4159,10 @@
1760 + test -n "$_LT_TAGVAR(runpath_var, $1)" ||
1761 + test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
1762
1763+- # Now substitute the updated list of available tags.
1764+- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
1765+- mv "${ofile}T" "$ofile"
1766+- chmod +x "$ofile"
1767 + # We can hardcode non-existent directories.
1768 + if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
1769 + # If the only mechanism to avoid hardcoding is shlibpath_var, we
1770@@ -3914,45 +4172,20 @@
1771 + test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
1772 + # Linking always hardcodes the temporary library directory.
1773 + _LT_TAGVAR(hardcode_action, $1)=relink
1774-+ else
1775+ else
1776+- rm -f "${ofile}T"
1777+- AC_MSG_ERROR([unable to update list of available tagged configurations.])
1778 + # We can link without hardcoding, and we can hardcode nonexisting dirs.
1779 + _LT_TAGVAR(hardcode_action, $1)=immediate
1780-+ fi
1781+ fi
1782 +else
1783 + # We cannot hardcode anything, or else we can only hardcode existing
1784 + # directories.
1785 + _LT_TAGVAR(hardcode_action, $1)=unsupported
1786-+fi
1787+ fi
1788+-])# _LT_AC_TAGCONFIG
1789 +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
1790
1791--# AC_ENABLE_SHARED([DEFAULT])
1792--# ---------------------------
1793--# implement the --enable-shared flag
1794--# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
1795--AC_DEFUN([AC_ENABLE_SHARED],
1796--[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
1797--AC_ARG_ENABLE([shared],
1798-- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
1799-- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
1800-- [p=${PACKAGE-default}
1801-- case $enableval in
1802-- yes) enable_shared=yes ;;
1803-- no) enable_shared=no ;;
1804-- *)
1805-- enable_shared=no
1806-- # Look at the argument we got. We use all the common list separators.
1807-- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
1808-- for pkg in $enableval; do
1809-- IFS="$lt_save_ifs"
1810-- if test "X$pkg" = "X$p"; then
1811-- enable_shared=yes
1812-- fi
1813-- done
1814-- IFS="$lt_save_ifs"
1815-- ;;
1816-- esac],
1817-- [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
1818--])# AC_ENABLE_SHARED
1819 +if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
1820 + test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
1821 + # Fast installation is not supported
1822@@ -3966,14 +4199,13 @@
1823 + [How to hardcode a shared library path into an executable])
1824 +])# _LT_LINKER_HARDCODE_LIBPATH
1825
1826-
1827--# AC_DISABLE_SHARED
1828+-# AC_LIBTOOL_DLOPEN
1829 -# -----------------
1830--# set the default shared flag to --disable-shared
1831--AC_DEFUN([AC_DISABLE_SHARED],
1832--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
1833--AC_ENABLE_SHARED(no)
1834--])# AC_DISABLE_SHARED
1835+-# enable checks for dlopen support
1836+-AC_DEFUN([AC_LIBTOOL_DLOPEN],
1837+- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
1838+-])# AC_LIBTOOL_DLOPEN
1839+
1840 +# _LT_CMD_STRIPLIB
1841 +# ----------------
1842 +m4_defun([_LT_CMD_STRIPLIB],
1843@@ -4006,6 +4238,141 @@
1844 +_LT_DECL([], [striplib], [1])
1845 +])# _LT_CMD_STRIPLIB
1846
1847+-# AC_LIBTOOL_WIN32_DLL
1848+-# --------------------
1849+-# declare package support for building win32 DLLs
1850+-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
1851+-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
1852+-])# AC_LIBTOOL_WIN32_DLL
1853+
1854++# _LT_SYS_DYNAMIC_LINKER([TAG])
1855++# -----------------------------
1856++# PORTME Fill in your ld.so characteristics
1857++m4_defun([_LT_SYS_DYNAMIC_LINKER],
1858++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
1859++m4_require([_LT_DECL_EGREP])dnl
1860++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
1861++m4_require([_LT_DECL_OBJDUMP])dnl
1862++m4_require([_LT_DECL_SED])dnl
1863++AC_MSG_CHECKING([dynamic linker characteristics])
1864++m4_if([$1],
1865++ [], [
1866++if test "$GCC" = yes; then
1867++ case $host_os in
1868++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
1869++ *) lt_awk_arg="/^libraries:/" ;;
1870++ esac
1871++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
1872++ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
1873++ # if the path contains ";" then we assume it to be the separator
1874++ # otherwise default to the standard path separator (i.e. ":") - it is
1875++ # assumed that no part of a normal pathname contains ";" but that should
1876++ # okay in the real world where ";" in dirpaths is itself problematic.
1877++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
1878++ else
1879++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
1880++ fi
1881++ # Ok, now we have the path, separated by spaces, we can step through it
1882++ # and add multilib dir if necessary.
1883++ lt_tmp_lt_search_path_spec=
1884++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
1885++ for lt_sys_path in $lt_search_path_spec; do
1886++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
1887++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
1888++ else
1889++ test -d "$lt_sys_path" && \
1890++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
1891++ fi
1892++ done
1893++ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
1894++BEGIN {RS=" "; FS="/|\n";} {
1895++ lt_foo="";
1896++ lt_count=0;
1897++ for (lt_i = NF; lt_i > 0; lt_i--) {
1898++ if ($lt_i != "" && $lt_i != ".") {
1899++ if ($lt_i == "..") {
1900++ lt_count++;
1901++ } else {
1902++ if (lt_count == 0) {
1903++ lt_foo="/" $lt_i lt_foo;
1904++ } else {
1905++ lt_count--;
1906++ }
1907++ }
1908++ }
1909++ }
1910++ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
1911++ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
1912++}'`
1913++ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
1914++else
1915++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
1916++fi])
1917++library_names_spec=
1918++libname_spec='lib$name'
1919++soname_spec=
1920++shrext_cmds=".so"
1921++postinstall_cmds=
1922++postuninstall_cmds=
1923++finish_cmds=
1924++finish_eval=
1925++shlibpath_var=
1926++shlibpath_overrides_runpath=unknown
1927++version_type=none
1928++dynamic_linker="$host_os ld.so"
1929++sys_lib_dlsearch_path_spec="/lib /usr/lib"
1930++need_lib_prefix=unknown
1931++hardcode_into_libs=no
1932+
1933+-# AC_ENABLE_SHARED([DEFAULT])
1934+-# ---------------------------
1935+-# implement the --enable-shared flag
1936+-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
1937+-AC_DEFUN([AC_ENABLE_SHARED],
1938+-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
1939+-AC_ARG_ENABLE([shared],
1940+- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
1941+- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
1942+- [p=${PACKAGE-default}
1943+- case $enableval in
1944+- yes) enable_shared=yes ;;
1945+- no) enable_shared=no ;;
1946+- *)
1947+- enable_shared=no
1948+- # Look at the argument we got. We use all the common list separators.
1949+- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
1950+- for pkg in $enableval; do
1951+- IFS="$lt_save_ifs"
1952+- if test "X$pkg" = "X$p"; then
1953+- enable_shared=yes
1954+- fi
1955+- done
1956+- IFS="$lt_save_ifs"
1957+- ;;
1958+- esac],
1959+- [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
1960+-])# AC_ENABLE_SHARED
1961+-
1962++# when you set need_version to no, make sure it does not cause -set_version
1963++# flags to be left without arguments
1964++need_version=unknown
1965+
1966+-# AC_DISABLE_SHARED
1967+-# -----------------
1968+-# set the default shared flag to --disable-shared
1969+-AC_DEFUN([AC_DISABLE_SHARED],
1970+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
1971+-AC_ENABLE_SHARED(no)
1972+-])# AC_DISABLE_SHARED
1973++case $host_os in
1974++aix3*)
1975++ version_type=linux
1976++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
1977++ shlibpath_var=LIBPATH
1978+
1979++ # AIX 3 has no versioning support, so we append a major version to the name.
1980++ soname_spec='${libname}${release}${shared_ext}$major'
1981++ ;;
1982
1983 -# AC_ENABLE_STATIC([DEFAULT])
1984 -# ---------------------------
1985@@ -4031,92 +4398,67 @@
1986 - fi
1987 - done
1988 - IFS="$lt_save_ifs"
1989-- ;;
1990++aix[[4-9]]*)
1991++ version_type=linux
1992++ need_lib_prefix=no
1993++ need_version=no
1994++ hardcode_into_libs=yes
1995++ if test "$host_cpu" = ia64; then
1996++ # AIX 5 supports IA64
1997++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
1998++ shlibpath_var=LD_LIBRARY_PATH
1999++ else
2000++ # With GCC up to 2.95.x, collect2 would create an import file
2001++ # for dependence libraries. The import file would start with
2002++ # the line `#! .'. This would cause the generated library to
2003++ # depend on `.', always an invalid library. This was fixed in
2004++ # development snapshots of GCC prior to 3.0.
2005++ case $host_os in
2006++ aix4 | aix4.[[01]] | aix4.[[01]].*)
2007++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
2008++ echo ' yes '
2009++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
2010++ :
2011++ else
2012++ can_build_shared=no
2013++ fi
2014+ ;;
2015 - esac],
2016 - [enable_static=]AC_ENABLE_STATIC_DEFAULT)
2017 -])# AC_ENABLE_STATIC
2018-+# _LT_SYS_DYNAMIC_LINKER([TAG])
2019-+# -----------------------------
2020-+# PORTME Fill in your ld.so characteristics
2021-+m4_defun([_LT_SYS_DYNAMIC_LINKER],
2022-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
2023-+m4_require([_LT_DECL_EGREP])dnl
2024-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
2025-+m4_require([_LT_DECL_OBJDUMP])dnl
2026-+m4_require([_LT_DECL_SED])dnl
2027-+AC_MSG_CHECKING([dynamic linker characteristics])
2028-+m4_if([$1],
2029-+ [], [
2030-+if test "$GCC" = yes; then
2031-+ case $host_os in
2032-+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
2033-+ *) lt_awk_arg="/^libraries:/" ;;
2034-+ esac
2035-+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
2036-+ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
2037-+ # if the path contains ";" then we assume it to be the separator
2038-+ # otherwise default to the standard path separator (i.e. ":") - it is
2039-+ # assumed that no part of a normal pathname contains ";" but that should
2040-+ # okay in the real world where ";" in dirpaths is itself problematic.
2041-+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
2042-+ else
2043-+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
2044-+ fi
2045-+ # Ok, now we have the path, separated by spaces, we can step through it
2046-+ # and add multilib dir if necessary.
2047-+ lt_tmp_lt_search_path_spec=
2048-+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
2049-+ for lt_sys_path in $lt_search_path_spec; do
2050-+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
2051-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
2052++ esac
2053++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
2054++ # soname into executable. Probably we can add versioning support to
2055++ # collect2, so additional links can be useful in future.
2056++ if test "$aix_use_runtimelinking" = yes; then
2057++ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
2058++ # instead of lib<name>.a to let people know that these are not
2059++ # typical AIX shared libraries.
2060++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2061 + else
2062-+ test -d "$lt_sys_path" && \
2063-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
2064++ # We preserve .a as extension for shared libraries through AIX4.2
2065++ # and later when we are not doing run time linking.
2066++ library_names_spec='${libname}${release}.a $libname.a'
2067++ soname_spec='${libname}${release}${shared_ext}$major'
2068 + fi
2069-+ done
2070-+ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
2071-+BEGIN {RS=" "; FS="/|\n";} {
2072-+ lt_foo="";
2073-+ lt_count=0;
2074-+ for (lt_i = NF; lt_i > 0; lt_i--) {
2075-+ if ($lt_i != "" && $lt_i != ".") {
2076-+ if ($lt_i == "..") {
2077-+ lt_count++;
2078-+ } else {
2079-+ if (lt_count == 0) {
2080-+ lt_foo="/" $lt_i lt_foo;
2081-+ } else {
2082-+ lt_count--;
2083-+ }
2084-+ }
2085-+ }
2086-+ }
2087-+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
2088-+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
2089-+}'`
2090-+ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
2091-+else
2092-+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
2093-+fi])
2094-+library_names_spec=
2095-+libname_spec='lib$name'
2096-+soname_spec=
2097-+shrext_cmds=".so"
2098-+postinstall_cmds=
2099-+postuninstall_cmds=
2100-+finish_cmds=
2101-+finish_eval=
2102-+shlibpath_var=
2103-+shlibpath_overrides_runpath=unknown
2104-+version_type=none
2105-+dynamic_linker="$host_os ld.so"
2106-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
2107-+need_lib_prefix=unknown
2108-+hardcode_into_libs=no
2109++ shlibpath_var=LIBPATH
2110++ fi
2111++ ;;
2112
2113-+# when you set need_version to no, make sure it does not cause -set_version
2114-+# flags to be left without arguments
2115-+need_version=unknown
2116++amigaos*)
2117++ case $host_cpu in
2118++ powerpc)
2119++ # Since July 2007 AmigaOS4 officially supports .so libraries.
2120++ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
2121++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2122++ ;;
2123++ m68k)
2124++ library_names_spec='$libname.ixlibrary $libname.a'
2125++ # Create ${libname}_ixlibrary.a entries in /sys/libs.
2126++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
2127++ ;;
2128++ esac
2129++ ;;
2130
2131 -# AC_DISABLE_STATIC
2132 -# -----------------
2133@@ -4125,14 +4467,24 @@
2134 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
2135 -AC_ENABLE_STATIC(no)
2136 -])# AC_DISABLE_STATIC
2137-+case $host_os in
2138-+aix3*)
2139++beos*)
2140++ library_names_spec='${libname}${shared_ext}'
2141++ dynamic_linker="$host_os ld.so"
2142++ shlibpath_var=LIBRARY_PATH
2143++ ;;
2144+
2145++bsdi[[45]]*)
2146 + version_type=linux
2147-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
2148-+ shlibpath_var=LIBPATH
2149-
2150-+ # AIX 3 has no versioning support, so we append a major version to the name.
2151++ need_version=no
2152++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2153 + soname_spec='${libname}${release}${shared_ext}$major'
2154++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
2155++ shlibpath_var=LD_LIBRARY_PATH
2156++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
2157++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
2158++ # the default ld.so.conf also contains /usr/contrib/lib and
2159++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
2160++ # libtool to hard-code these into programs
2161 + ;;
2162
2163 -# AC_ENABLE_FAST_INSTALL([DEFAULT])
2164@@ -4159,67 +4511,33 @@
2165 - fi
2166 - done
2167 - IFS="$lt_save_ifs"
2168-+aix[[4-9]]*)
2169-+ version_type=linux
2170-+ need_lib_prefix=no
2171-+ need_version=no
2172-+ hardcode_into_libs=yes
2173-+ if test "$host_cpu" = ia64; then
2174-+ # AIX 5 supports IA64
2175-+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
2176-+ shlibpath_var=LD_LIBRARY_PATH
2177-+ else
2178-+ # With GCC up to 2.95.x, collect2 would create an import file
2179-+ # for dependence libraries. The import file would start with
2180-+ # the line `#! .'. This would cause the generated library to
2181-+ # depend on `.', always an invalid library. This was fixed in
2182-+ # development snapshots of GCC prior to 3.0.
2183-+ case $host_os in
2184-+ aix4 | aix4.[[01]] | aix4.[[01]].*)
2185-+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
2186-+ echo ' yes '
2187-+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
2188-+ :
2189-+ else
2190-+ can_build_shared=no
2191-+ fi
2192- ;;
2193+- ;;
2194 - esac],
2195 - [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
2196 -])# AC_ENABLE_FAST_INSTALL
2197-+ esac
2198-+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
2199-+ # soname into executable. Probably we can add versioning support to
2200-+ # collect2, so additional links can be useful in future.
2201-+ if test "$aix_use_runtimelinking" = yes; then
2202-+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
2203-+ # instead of lib<name>.a to let people know that these are not
2204-+ # typical AIX shared libraries.
2205-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2206-+ else
2207-+ # We preserve .a as extension for shared libraries through AIX4.2
2208-+ # and later when we are not doing run time linking.
2209-+ library_names_spec='${libname}${release}.a $libname.a'
2210-+ soname_spec='${libname}${release}${shared_ext}$major'
2211-+ fi
2212-+ shlibpath_var=LIBPATH
2213-+ fi
2214-+ ;;
2215++cygwin* | mingw* | pw32* | cegcc*)
2216++ version_type=windows
2217++ shrext_cmds=".dll"
2218++ need_version=no
2219++ need_lib_prefix=no
2220
2221-+amigaos*)
2222-+ case $host_cpu in
2223-+ powerpc)
2224-+ # Since July 2007 AmigaOS4 officially supports .so libraries.
2225-+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
2226-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2227-+ ;;
2228-+ m68k)
2229-+ library_names_spec='$libname.ixlibrary $libname.a'
2230-+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
2231-+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
2232-+ ;;
2233-+ esac
2234-+ ;;
2235++ case $GCC,$host_os in
2236++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
2237++ library_names_spec='$libname.dll.a'
2238++ # DLL is installed to $(libdir)/../bin by postinstall_cmds
2239++ postinstall_cmds='base_file=`basename \${file}`~
2240++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
2241++ dldir=$destdir/`dirname \$dlpath`~
2242++ test -d \$dldir || mkdir -p \$dldir~
2243++ $install_prog $dir/$dlname \$dldir/$dlname~
2244++ chmod a+x \$dldir/$dlname~
2245++ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
2246++ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
2247++ fi'
2248++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
2249++ dlpath=$dir/\$dldll~
2250++ $RM \$dlpath'
2251++ shlibpath_overrides_runpath=yes
2252
2253 -# AC_DISABLE_FAST_INSTALL
2254 -# -----------------------
2255@@ -4228,24 +4546,42 @@
2256 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
2257 -AC_ENABLE_FAST_INSTALL(no)
2258 -])# AC_DISABLE_FAST_INSTALL
2259-+beos*)
2260-+ library_names_spec='${libname}${shared_ext}'
2261-+ dynamic_linker="$host_os ld.so"
2262-+ shlibpath_var=LIBRARY_PATH
2263-+ ;;
2264++ case $host_os in
2265++ cygwin*)
2266++ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
2267++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2268++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
2269++ ;;
2270++ mingw* | cegcc*)
2271++ # MinGW DLLs use traditional 'lib' prefix
2272++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2273++ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
2274++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
2275++ # It is most probably a Windows format PATH printed by
2276++ # mingw gcc, but we are running on Cygwin. Gcc prints its search
2277++ # path with ; separators, and with drive letters. We can handle the
2278++ # drive letters (cygwin fileutils understands them), so leave them,
2279++ # especially as we might pass files found there to a mingw objdump,
2280++ # which wouldn't understand a cygwinified path. Ahh.
2281++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
2282++ else
2283++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
2284++ fi
2285++ ;;
2286++ pw32*)
2287++ # pw32 DLLs use 'pw' prefix rather than 'lib'
2288++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2289++ ;;
2290++ esac
2291++ ;;
2292
2293-+bsdi[[45]]*)
2294-+ version_type=linux
2295-+ need_version=no
2296-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2297-+ soname_spec='${libname}${release}${shared_ext}$major'
2298-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
2299-+ shlibpath_var=LD_LIBRARY_PATH
2300-+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
2301-+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
2302-+ # the default ld.so.conf also contains /usr/contrib/lib and
2303-+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
2304-+ # libtool to hard-code these into programs
2305++ *)
2306++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
2307++ ;;
2308++ esac
2309++ dynamic_linker='Win32 ld.exe'
2310++ # FIXME: first we should search . and the directory the executable is in
2311++ shlibpath_var=PATH
2312 + ;;
2313
2314 -# AC_LIBTOOL_PICMODE([MODE])
2315@@ -4256,30 +4592,8 @@
2316 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
2317 -pic_mode=ifelse($#,1,$1,default)
2318 -])# AC_LIBTOOL_PICMODE
2319-+cygwin* | mingw* | pw32* | cegcc*)
2320-+ version_type=windows
2321-+ shrext_cmds=".dll"
2322-+ need_version=no
2323-+ need_lib_prefix=no
2324-
2325-+ case $GCC,$host_os in
2326-+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
2327-+ library_names_spec='$libname.dll.a'
2328-+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
2329-+ postinstall_cmds='base_file=`basename \${file}`~
2330-+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
2331-+ dldir=$destdir/`dirname \$dlpath`~
2332-+ test -d \$dldir || mkdir -p \$dldir~
2333-+ $install_prog $dir/$dlname \$dldir/$dlname~
2334-+ chmod a+x \$dldir/$dlname~
2335-+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
2336-+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
2337-+ fi'
2338-+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
2339-+ dlpath=$dir/\$dldll~
2340-+ $RM \$dlpath'
2341-+ shlibpath_overrides_runpath=yes
2342-
2343+-
2344+-
2345 -# AC_PROG_EGREP
2346 -# -------------
2347 -# This is predefined starting with Autoconf 2.54, so this conditional
2348@@ -4293,44 +4607,8 @@
2349 - EGREP=$ac_cv_prog_egrep
2350 - AC_SUBST([EGREP])
2351 -])])
2352-+ case $host_os in
2353-+ cygwin*)
2354-+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
2355-+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2356-+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
2357-+ ;;
2358-+ mingw* | cegcc*)
2359-+ # MinGW DLLs use traditional 'lib' prefix
2360-+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2361-+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
2362-+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
2363-+ # It is most probably a Windows format PATH printed by
2364-+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
2365-+ # path with ; separators, and with drive letters. We can handle the
2366-+ # drive letters (cygwin fileutils understands them), so leave them,
2367-+ # especially as we might pass files found there to a mingw objdump,
2368-+ # which wouldn't understand a cygwinified path. Ahh.
2369-+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
2370-+ else
2371-+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
2372-+ fi
2373-+ ;;
2374-+ pw32*)
2375-+ # pw32 DLLs use 'pw' prefix rather than 'lib'
2376-+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2377-+ ;;
2378-+ esac
2379-+ ;;
2380-
2381-+ *)
2382-+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
2383-+ ;;
2384-+ esac
2385-+ dynamic_linker='Win32 ld.exe'
2386-+ # FIXME: first we should search . and the directory the executable is in
2387-+ shlibpath_var=PATH
2388-+ ;;
2389-
2390+-
2391+-
2392 -# AC_PATH_TOOL_PREFIX
2393 -# -------------------
2394 -# find a file program which can recognize shared library
2395@@ -4562,10 +4840,10 @@
2396 -case `$LD -v 2>&1 </dev/null` in
2397 -*GNU* | *'with BFD'*)
2398 - lt_cv_prog_gnu_ld=yes
2399- ;;
2400+- ;;
2401 -*)
2402 - lt_cv_prog_gnu_ld=no
2403-- ;;
2404+ ;;
2405 -esac])
2406 -with_gnu_ld=$lt_cv_prog_gnu_ld
2407 -])# AC_PROG_LD_GNU
2408@@ -4958,10 +5236,36 @@
2409
2410 solaris*)
2411 - lt_cv_deplibs_check_method=pass_all
2412-- ;;
2413--
2414--sysv4 | sysv4.3*)
2415-- case $host_vendor in
2416++ version_type=linux
2417++ need_lib_prefix=no
2418++ need_version=no
2419++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2420++ soname_spec='${libname}${release}${shared_ext}$major'
2421++ shlibpath_var=LD_LIBRARY_PATH
2422++ shlibpath_overrides_runpath=yes
2423++ hardcode_into_libs=yes
2424++ # ldd complains unless libraries are executable
2425++ postinstall_cmds='chmod +x $lib'
2426++ ;;
2427++
2428++sunos4*)
2429++ version_type=sunos
2430++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
2431++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
2432++ shlibpath_var=LD_LIBRARY_PATH
2433++ shlibpath_overrides_runpath=yes
2434++ if test "$with_gnu_ld" = yes; then
2435++ need_lib_prefix=no
2436++ fi
2437++ need_version=yes
2438+ ;;
2439+
2440+ sysv4 | sysv4.3*)
2441++ version_type=linux
2442++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2443++ soname_spec='${libname}${release}${shared_ext}$major'
2444++ shlibpath_var=LD_LIBRARY_PATH
2445+ case $host_vendor in
2446 - motorola)
2447 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
2448 - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
2449@@ -4984,31 +5288,32 @@
2450 - pc)
2451 - lt_cv_deplibs_check_method=pass_all
2452 - ;;
2453-- esac
2454-+ version_type=linux
2455-+ need_lib_prefix=no
2456-+ need_version=no
2457-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2458-+ soname_spec='${libname}${release}${shared_ext}$major'
2459-+ shlibpath_var=LD_LIBRARY_PATH
2460-+ shlibpath_overrides_runpath=yes
2461-+ hardcode_into_libs=yes
2462-+ # ldd complains unless libraries are executable
2463-+ postinstall_cmds='chmod +x $lib'
2464++ sni)
2465++ shlibpath_overrides_runpath=no
2466++ need_lib_prefix=no
2467++ runpath_var=LD_RUN_PATH
2468++ ;;
2469++ siemens)
2470++ need_lib_prefix=no
2471++ ;;
2472++ motorola)
2473++ need_lib_prefix=no
2474++ need_version=no
2475++ shlibpath_overrides_runpath=no
2476++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
2477++ ;;
2478+ esac
2479 ;;
2480
2481 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
2482 - lt_cv_deplibs_check_method=pass_all
2483-+sunos4*)
2484-+ version_type=sunos
2485-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
2486-+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
2487-+ shlibpath_var=LD_LIBRARY_PATH
2488-+ shlibpath_overrides_runpath=yes
2489-+ if test "$with_gnu_ld" = yes; then
2490-+ need_lib_prefix=no
2491++sysv4*MP*)
2492++ if test -d /usr/nec ;then
2493++ version_type=linux
2494++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
2495++ soname_spec='$libname${shared_ext}.$major'
2496++ shlibpath_var=LD_LIBRARY_PATH
2497 + fi
2498-+ need_version=yes
2499 ;;
2500 -esac
2501 -])
2502@@ -5016,29 +5321,7 @@
2503 -deplibs_check_method=$lt_cv_deplibs_check_method
2504 -test -z "$deplibs_check_method" && deplibs_check_method=unknown
2505 -])# AC_DEPLIBS_CHECK_METHOD
2506-
2507-+sysv4 | sysv4.3*)
2508-+ version_type=linux
2509-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2510-+ soname_spec='${libname}${release}${shared_ext}$major'
2511-+ shlibpath_var=LD_LIBRARY_PATH
2512-+ case $host_vendor in
2513-+ sni)
2514-+ shlibpath_overrides_runpath=no
2515-+ need_lib_prefix=no
2516-+ runpath_var=LD_RUN_PATH
2517-+ ;;
2518-+ siemens)
2519-+ need_lib_prefix=no
2520-+ ;;
2521-+ motorola)
2522-+ need_lib_prefix=no
2523-+ need_version=no
2524-+ shlibpath_overrides_runpath=no
2525-+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
2526-+ ;;
2527-+ esac
2528-+ ;;
2529+-
2530
2531 -# AC_PROG_NM
2532 -# ----------
2533@@ -5052,12 +5335,24 @@
2534 - lt_nm_to_check="${ac_tool_prefix}nm"
2535 - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
2536 - lt_nm_to_check="$lt_nm_to_check nm"
2537-+sysv4*MP*)
2538-+ if test -d /usr/nec ;then
2539-+ version_type=linux
2540-+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
2541-+ soname_spec='$libname${shared_ext}.$major'
2542-+ shlibpath_var=LD_LIBRARY_PATH
2543++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
2544++ version_type=freebsd-elf
2545++ need_lib_prefix=no
2546++ need_version=no
2547++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
2548++ soname_spec='${libname}${release}${shared_ext}$major'
2549++ shlibpath_var=LD_LIBRARY_PATH
2550++ shlibpath_overrides_runpath=yes
2551++ hardcode_into_libs=yes
2552++ if test "$with_gnu_ld" = yes; then
2553++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
2554++ else
2555++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
2556++ case $host_os in
2557++ sco3.2v5*)
2558++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
2559++ ;;
2560++ esac
2561 fi
2562 - for lt_tmp_nm in $lt_nm_to_check; do
2563 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
2564@@ -5096,27 +5391,7 @@
2565 -fi])
2566 -NM="$lt_cv_path_NM"
2567 -])# AC_PROG_NM
2568-+ ;;
2569-
2570-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
2571-+ version_type=freebsd-elf
2572-+ need_lib_prefix=no
2573-+ need_version=no
2574-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
2575-+ soname_spec='${libname}${release}${shared_ext}$major'
2576-+ shlibpath_var=LD_LIBRARY_PATH
2577-+ shlibpath_overrides_runpath=yes
2578-+ hardcode_into_libs=yes
2579-+ if test "$with_gnu_ld" = yes; then
2580-+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
2581-+ else
2582-+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
2583-+ case $host_os in
2584-+ sco3.2v5*)
2585-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
2586-+ ;;
2587-+ esac
2588-+ fi
2589+-
2590 + sys_lib_dlsearch_path_spec='/usr/lib'
2591 + ;;
2592
2593@@ -5355,11 +5630,11 @@
2594 -AC_DEFUN([AC_LIBTOOL_F77],
2595 -[AC_REQUIRE([_LT_AC_LANG_F77])
2596 -])# AC_LIBTOOL_F77
2597+-
2598 +_LT_DECL([], [MAGIC_CMD], [0],
2599 + [Used to examine libraries when file_magic_cmd begins with "file"])dnl
2600 +])# _LT_PATH_TOOL_PREFIX
2601
2602--
2603 -# _LT_AC_LANG_F77
2604 -# ---------------
2605 -AC_DEFUN([_LT_AC_LANG_F77],
2606@@ -5379,8 +5654,19 @@
2607 -AC_DEFUN([AC_LIBTOOL_GCJ],
2608 -[AC_REQUIRE([_LT_AC_LANG_GCJ])
2609 -])# AC_LIBTOOL_GCJ
2610--
2611--
2612++# find a file program which can recognize a shared library
2613++m4_defun([_LT_PATH_MAGIC],
2614++[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
2615++if test -z "$lt_cv_path_MAGIC_CMD"; then
2616++ if test -n "$ac_tool_prefix"; then
2617++ _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
2618++ else
2619++ MAGIC_CMD=:
2620++ fi
2621++fi
2622++])# _LT_PATH_MAGIC
2623+
2624+
2625 -# _LT_AC_LANG_GCJ
2626 -# ---------------
2627 -AC_DEFUN([_LT_AC_LANG_GCJ],
2628@@ -5392,26 +5678,6 @@
2629 - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
2630 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
2631 -])# _LT_AC_LANG_GCJ
2632-+# find a file program which can recognize a shared library
2633-+m4_defun([_LT_PATH_MAGIC],
2634-+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
2635-+if test -z "$lt_cv_path_MAGIC_CMD"; then
2636-+ if test -n "$ac_tool_prefix"; then
2637-+ _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
2638-+ else
2639-+ MAGIC_CMD=:
2640-+ fi
2641-+fi
2642-+])# _LT_PATH_MAGIC
2643-
2644-
2645--# AC_LIBTOOL_RC
2646--# -------------
2647--# enable support for Windows resource files
2648--AC_DEFUN([AC_LIBTOOL_RC],
2649--[AC_REQUIRE([LT_AC_PROG_RC])
2650--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
2651--])# AC_LIBTOOL_RC
2652 +# LT_PATH_LD
2653 +# ----------
2654 +# find the pathname to the GNU or non-GNU linker
2655@@ -5428,15 +5694,13 @@
2656 + [test "$withval" = no || with_gnu_ld=yes],
2657 + [with_gnu_ld=no])dnl
2658
2659--# AC_LIBTOOL_LANG_C_CONFIG
2660--# ------------------------
2661--# Ensure that the configuration vars for the C compiler are
2662--# suitably defined. Those variables are subsequently used by
2663--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
2664--AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
2665--AC_DEFUN([_LT_AC_LANG_C_CONFIG],
2666--[lt_save_CC="$CC"
2667--AC_LANG_PUSH(C)
2668+-# AC_LIBTOOL_RC
2669+-# -------------
2670+-# enable support for Windows resource files
2671+-AC_DEFUN([AC_LIBTOOL_RC],
2672+-[AC_REQUIRE([LT_AC_PROG_RC])
2673+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
2674+-])# AC_LIBTOOL_RC
2675 +ac_prog=ld
2676 +if test "$GCC" = yes; then
2677 + # Check if gcc -print-prog-name=ld gives a path.
2678@@ -5508,14 +5772,18 @@
2679 +_LT_PATH_LD_GNU
2680 +AC_SUBST([LD])
2681
2682--# Source file extension for C test sources.
2683--ac_ext=c
2684 +_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
2685 +])# LT_PATH_LD
2686
2687--# Object file extension for compiled C test sources.
2688--objext=o
2689--_LT_AC_TAGVAR(objext, $1)=$objext
2690+-# AC_LIBTOOL_LANG_C_CONFIG
2691+-# ------------------------
2692+-# Ensure that the configuration vars for the C compiler are
2693+-# suitably defined. Those variables are subsequently used by
2694+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
2695+-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
2696+-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
2697+-[lt_save_CC="$CC"
2698+-AC_LANG_PUSH(C)
2699 +# Old names:
2700 +AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
2701 +AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
2702@@ -5540,11 +5808,12 @@
2703 +with_gnu_ld=$lt_cv_prog_gnu_ld
2704 +])# _LT_PATH_LD_GNU
2705
2706--# Code to be used in simple compile tests
2707--lt_simple_compile_test_code="int some_variable = 0;"
2708+-# Source file extension for C test sources.
2709+-ac_ext=c
2710
2711--# Code to be used in simple link tests
2712--lt_simple_link_test_code='int main(){return(0);}'
2713+-# Object file extension for compiled C test sources.
2714+-objext=o
2715+-_LT_AC_TAGVAR(objext, $1)=$objext
2716 +# _LT_CMD_RELOAD
2717 +# --------------
2718 +# find reload flag for linker
2719@@ -5572,11 +5841,11 @@
2720 +_LT_DECL([], [reload_cmds], [2])dnl
2721 +])# _LT_CMD_RELOAD
2722
2723--_LT_AC_SYS_COMPILER
2724+-# Code to be used in simple compile tests
2725+-lt_simple_compile_test_code="int some_variable = 0;"
2726
2727--# save warnings/boilerplate of simple test code
2728--_LT_COMPILER_BOILERPLATE
2729--_LT_LINKER_BOILERPLATE
2730+-# Code to be used in simple link tests
2731+-lt_simple_link_test_code='int main(){return(0);}'
2732 +# _LT_CHECK_MAGIC_METHOD
2733 +# ----------------------
2734 +# how to check for library dependencies
2735@@ -5600,6 +5869,19 @@
2736 +# If you have `file' or equivalent on your system and you're not sure
2737 +# whether `pass_all' will *always* work, you probably want this one.
2738
2739+-_LT_AC_SYS_COMPILER
2740++case $host_os in
2741++aix[[4-9]]*)
2742++ lt_cv_deplibs_check_method=pass_all
2743++ ;;
2744+
2745+-# save warnings/boilerplate of simple test code
2746+-_LT_COMPILER_BOILERPLATE
2747+-_LT_LINKER_BOILERPLATE
2748++beos*)
2749++ lt_cv_deplibs_check_method=pass_all
2750++ ;;
2751+
2752 -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
2753 -AC_LIBTOOL_PROG_COMPILER_PIC($1)
2754 -AC_LIBTOOL_PROG_CC_C_O($1)
2755@@ -5613,49 +5895,28 @@
2756 -# Report which library types will actually be built
2757 -AC_MSG_CHECKING([if libtool supports shared libraries])
2758 -AC_MSG_RESULT([$can_build_shared])
2759-+case $host_os in
2760-+aix[[4-9]]*)
2761-+ lt_cv_deplibs_check_method=pass_all
2762-+ ;;
2763-
2764--AC_MSG_CHECKING([whether to build shared libraries])
2765--test "$can_build_shared" = "no" && enable_shared=no
2766-+beos*)
2767-+ lt_cv_deplibs_check_method=pass_all
2768-+ ;;
2769-
2770--# On AIX, shared libraries and static libraries use the same namespace, and
2771--# are all built from PIC.
2772--case $host_os in
2773--aix3*)
2774-- test "$enable_shared" = yes && enable_static=no
2775-- if test -n "$RANLIB"; then
2776-- archive_cmds="$archive_cmds~\$RANLIB \$lib"
2777-- postinstall_cmds='$RANLIB $lib'
2778-- fi
2779 +bsdi[[45]]*)
2780 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
2781 + lt_cv_file_magic_cmd='/usr/bin/file -L'
2782 + lt_cv_file_magic_test_file=/shlib/libc.so
2783- ;;
2784++ ;;
2785
2786--aix[[4-9]]*)
2787-- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
2788-- test "$enable_shared" = yes && enable_static=no
2789-- fi
2790-- ;;
2791--esac
2792--AC_MSG_RESULT([$enable_shared])
2793+-AC_MSG_CHECKING([whether to build shared libraries])
2794+-test "$can_build_shared" = "no" && enable_shared=no
2795 +cygwin*)
2796 + # func_win32_libid is a shell function defined in ltmain.sh
2797 + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
2798 + lt_cv_file_magic_cmd='func_win32_libid'
2799 + ;;
2800
2801--AC_MSG_CHECKING([whether to build static libraries])
2802--# Make sure either enable_shared or enable_static is yes.
2803--test "$enable_shared" = yes || enable_static=yes
2804--AC_MSG_RESULT([$enable_static])
2805+-# On AIX, shared libraries and static libraries use the same namespace, and
2806+-# are all built from PIC.
2807+-case $host_os in
2808+-aix3*)
2809+- test "$enable_shared" = yes && enable_static=no
2810+- if test -n "$RANLIB"; then
2811+- archive_cmds="$archive_cmds~\$RANLIB \$lib"
2812+- postinstall_cmds='$RANLIB $lib'
2813 +mingw* | pw32*)
2814 + # Base MSYS/MinGW do not provide the 'file' command needed by
2815 + # func_win32_libid shell function, so use a weaker test based on 'objdump',
2816@@ -5666,37 +5927,70 @@
2817 + else
2818 + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
2819 + lt_cv_file_magic_cmd='$OBJDUMP -f'
2820-+ fi
2821-+ ;;
2822+ fi
2823+ ;;
2824
2825--AC_LIBTOOL_CONFIG($1)
2826+-aix[[4-9]]*)
2827+- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
2828+- test "$enable_shared" = yes && enable_static=no
2829+- fi
2830+- ;;
2831+-esac
2832+-AC_MSG_RESULT([$enable_shared])
2833 +cegcc)
2834 + # use the weaker test based on 'objdump'. See mingw*.
2835 + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
2836 + lt_cv_file_magic_cmd='$OBJDUMP -f'
2837 + ;;
2838
2839+-AC_MSG_CHECKING([whether to build static libraries])
2840+-# Make sure either enable_shared or enable_static is yes.
2841+-test "$enable_shared" = yes || enable_static=yes
2842+-AC_MSG_RESULT([$enable_static])
2843++darwin* | rhapsody*)
2844++ lt_cv_deplibs_check_method=pass_all
2845++ ;;
2846+
2847+-AC_LIBTOOL_CONFIG($1)
2848++freebsd* | dragonfly*)
2849++ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
2850++ case $host_cpu in
2851++ i*86 )
2852++ # Not sure whether the presence of OpenBSD here was a mistake.
2853++ # Let's accept both of them until this is cleared up.
2854++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
2855++ lt_cv_file_magic_cmd=/usr/bin/file
2856++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
2857++ ;;
2858++ esac
2859++ else
2860++ lt_cv_deplibs_check_method=pass_all
2861++ fi
2862++ ;;
2863+
2864 -AC_LANG_POP
2865 -CC="$lt_save_CC"
2866 -])# AC_LIBTOOL_LANG_C_CONFIG
2867-+darwin* | rhapsody*)
2868++gnu*)
2869 + lt_cv_deplibs_check_method=pass_all
2870 + ;;
2871
2872-+freebsd* | dragonfly*)
2873-+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
2874-+ case $host_cpu in
2875-+ i*86 )
2876-+ # Not sure whether the presence of OpenBSD here was a mistake.
2877-+ # Let's accept both of them until this is cleared up.
2878-+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
2879-+ lt_cv_file_magic_cmd=/usr/bin/file
2880-+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
2881-+ ;;
2882-+ esac
2883-+ else
2884-+ lt_cv_deplibs_check_method=pass_all
2885-+ fi
2886++hpux10.20* | hpux11*)
2887++ lt_cv_file_magic_cmd=/usr/bin/file
2888++ case $host_cpu in
2889++ ia64*)
2890++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
2891++ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
2892++ ;;
2893++ hppa*64*)
2894++ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
2895++ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
2896++ ;;
2897++ *)
2898++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
2899++ lt_cv_file_magic_test_file=/usr/lib/libc.sl
2900++ ;;
2901++ esac
2902 + ;;
2903
2904 -# AC_LIBTOOL_LANG_CXX_CONFIG
2905@@ -5729,8 +6023,9 @@
2906 -_LT_AC_TAGVAR(no_undefined_flag, $1)=
2907 -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
2908 -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
2909-+gnu*)
2910-+ lt_cv_deplibs_check_method=pass_all
2911++interix[[3-9]]*)
2912++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
2913++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
2914 + ;;
2915
2916 -# Dependencies to place before and after the object being linked:
2917@@ -5740,34 +6035,6 @@
2918 -_LT_AC_TAGVAR(postdeps, $1)=
2919 -_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
2920 -_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
2921-+hpux10.20* | hpux11*)
2922-+ lt_cv_file_magic_cmd=/usr/bin/file
2923-+ case $host_cpu in
2924-+ ia64*)
2925-+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
2926-+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
2927-+ ;;
2928-+ hppa*64*)
2929-+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
2930-+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
2931-+ ;;
2932-+ *)
2933-+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
2934-+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
2935-+ ;;
2936-+ esac
2937-+ ;;
2938-
2939--# Source file extension for C++ test sources.
2940--ac_ext=cpp
2941-+interix[[3-9]]*)
2942-+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
2943-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
2944-+ ;;
2945-
2946--# Object file extension for compiled C++ test sources.
2947--objext=o
2948--_LT_AC_TAGVAR(objext, $1)=$objext
2949 +irix5* | irix6* | nonstopux*)
2950 + case $LD in
2951 + *-32|*"-32 ") libmagic=32-bit;;
2952@@ -5778,15 +6045,16 @@
2953 + lt_cv_deplibs_check_method=pass_all
2954 + ;;
2955
2956--# Code to be used in simple compile tests
2957--lt_simple_compile_test_code="int some_variable = 0;"
2958+-# Source file extension for C++ test sources.
2959+-ac_ext=cpp
2960 +# This must be Linux ELF.
2961 +linux* | k*bsd*-gnu)
2962 + lt_cv_deplibs_check_method=pass_all
2963 + ;;
2964
2965--# Code to be used in simple link tests
2966--lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
2967+-# Object file extension for compiled C++ test sources.
2968+-objext=o
2969+-_LT_AC_TAGVAR(objext, $1)=$objext
2970 +netbsd* | netbsdelf*-gnu)
2971 + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
2972 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
2973@@ -5795,51 +6063,22 @@
2974 + fi
2975 + ;;
2976
2977--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
2978--_LT_AC_SYS_COMPILER
2979+-# Code to be used in simple compile tests
2980+-lt_simple_compile_test_code="int some_variable = 0;"
2981 +newos6*)
2982 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
2983 + lt_cv_file_magic_cmd=/usr/bin/file
2984 + lt_cv_file_magic_test_file=/usr/lib/libnls.so
2985 + ;;
2986
2987--# save warnings/boilerplate of simple test code
2988--_LT_COMPILER_BOILERPLATE
2989--_LT_LINKER_BOILERPLATE
2990+-# Code to be used in simple link tests
2991+-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
2992 +*nto* | *qnx*)
2993 + lt_cv_deplibs_check_method=pass_all
2994 + ;;
2995
2996--# Allow CC to be a program name with arguments.
2997--lt_save_CC=$CC
2998--lt_save_LD=$LD
2999--lt_save_GCC=$GCC
3000--GCC=$GXX
3001--lt_save_with_gnu_ld=$with_gnu_ld
3002--lt_save_path_LD=$lt_cv_path_LD
3003--if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
3004-- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
3005--else
3006-- $as_unset lt_cv_prog_gnu_ld
3007--fi
3008--if test -n "${lt_cv_path_LDCXX+set}"; then
3009-- lt_cv_path_LD=$lt_cv_path_LDCXX
3010--else
3011-- $as_unset lt_cv_path_LD
3012--fi
3013--test -z "${LDCXX+set}" || LD=$LDCXX
3014--CC=${CXX-"c++"}
3015--compiler=$CC
3016--_LT_AC_TAGVAR(compiler, $1)=$CC
3017--_LT_CC_BASENAME([$compiler])
3018--
3019--# We don't want -fno-exception wen compiling C++ code, so set the
3020--# no_builtin_flag separately
3021--if test "$GXX" = yes; then
3022-- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
3023--else
3024-- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
3025--fi
3026+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
3027+-_LT_AC_SYS_COMPILER
3028 +openbsd*)
3029 + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
3030 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
3031@@ -5848,36 +6087,25 @@
3032 + fi
3033 + ;;
3034
3035--if test "$GXX" = yes; then
3036-- # Set up default GNU C++ configuration
3037+-# save warnings/boilerplate of simple test code
3038+-_LT_COMPILER_BOILERPLATE
3039+-_LT_LINKER_BOILERPLATE
3040 +osf3* | osf4* | osf5*)
3041 + lt_cv_deplibs_check_method=pass_all
3042 + ;;
3043-
3044-- AC_PROG_LD
3045++
3046 +rdos*)
3047 + lt_cv_deplibs_check_method=pass_all
3048 + ;;
3049-
3050-- # Check if GNU C++ uses GNU ld as the underlying linker, since the
3051-- # archiving commands below assume that GNU ld is being used.
3052-- if test "$with_gnu_ld" = yes; then
3053-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
3054-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
3055++
3056 +solaris*)
3057 + lt_cv_deplibs_check_method=pass_all
3058 + ;;
3059-
3060-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
3061-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
3062++
3063 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
3064 + lt_cv_deplibs_check_method=pass_all
3065 + ;;
3066-
3067-- # If archive_cmds runs LD, not CC, wlarc should be empty
3068-- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
3069-- # investigate it a little bit more. (MM)
3070-- wlarc='${wl}'
3071++
3072 +sysv4 | sysv4.3*)
3073 + case $host_vendor in
3074 + motorola)
3075@@ -5904,17 +6132,7 @@
3076 + ;;
3077 + esac
3078 + ;;
3079-
3080-- # ancient GNU ld didn't support --whole-archive et. al.
3081-- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
3082-- grep 'no-whole-archive' > /dev/null; then
3083-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
3084-- else
3085-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
3086-- fi
3087-- else
3088-- with_gnu_ld=no
3089-- wlarc=
3090++
3091 +tpf*)
3092 + lt_cv_deplibs_check_method=pass_all
3093 + ;;
3094@@ -5923,25 +6141,40 @@
3095 +file_magic_cmd=$lt_cv_file_magic_cmd
3096 +deplibs_check_method=$lt_cv_deplibs_check_method
3097 +test -z "$deplibs_check_method" && deplibs_check_method=unknown
3098-
3099-- # A generic and very simple default shared library creation
3100-- # command for GNU C++ for the case where it uses the native
3101-- # linker, instead of GNU ld. If possible, this setting should
3102-- # overridden to take advantage of the native linker features on
3103-- # the platform it is being used on.
3104-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
3105-- fi
3106++
3107 +_LT_DECL([], [deplibs_check_method], [1],
3108 + [Method to check whether dependent libraries are shared objects])
3109 +_LT_DECL([], [file_magic_cmd], [1],
3110 + [Command to use when deplibs_check_method == "file_magic"])
3111 +])# _LT_CHECK_MAGIC_METHOD
3112
3113-- # Commands to make compiler produce verbose output that lists
3114-- # what "hidden" libraries, object files and flags are used when
3115-- # linking a shared library.
3116-- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
3117+-# Allow CC to be a program name with arguments.
3118+-lt_save_CC=$CC
3119+-lt_save_LD=$LD
3120+-lt_save_GCC=$GCC
3121+-GCC=$GXX
3122+-lt_save_with_gnu_ld=$with_gnu_ld
3123+-lt_save_path_LD=$lt_cv_path_LD
3124+-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
3125+- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
3126+-else
3127+- $as_unset lt_cv_prog_gnu_ld
3128+-fi
3129+-if test -n "${lt_cv_path_LDCXX+set}"; then
3130+- lt_cv_path_LD=$lt_cv_path_LDCXX
3131+-else
3132+- $as_unset lt_cv_path_LD
3133+-fi
3134+-test -z "${LDCXX+set}" || LD=$LDCXX
3135+-CC=${CXX-"c++"}
3136+-compiler=$CC
3137+-_LT_AC_TAGVAR(compiler, $1)=$CC
3138+-_LT_CC_BASENAME([$compiler])
3139
3140+-# We don't want -fno-exception wen compiling C++ code, so set the
3141+-# no_builtin_flag separately
3142+-if test "$GXX" = yes; then
3143+- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
3144 +# LT_PATH_NM
3145 +# ----------
3146 +# find the pathname to a BSD- or MS-compatible name lister
3147@@ -5951,38 +6184,7 @@
3148 +[if test -n "$NM"; then
3149 + # Let the user override the test.
3150 + lt_cv_path_NM="$NM"
3151- else
3152-- GXX=no
3153-- with_gnu_ld=no
3154-- wlarc=
3155--fi
3156--
3157--# PORTME: fill in a description of your system's C++ link characteristics
3158--AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
3159--_LT_AC_TAGVAR(ld_shlibs, $1)=yes
3160--case $host_os in
3161-- aix3*)
3162-- # FIXME: insert proper C++ library support
3163-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
3164-- ;;
3165-- aix[[4-9]]*)
3166-- if test "$host_cpu" = ia64; then
3167-- # On IA64, the linker does run time linking by default, so we don't
3168-- # have to do anything special.
3169-- aix_use_runtimelinking=no
3170-- exp_sym_flag='-Bexport'
3171-- no_entry_flag=""
3172-- else
3173-- aix_use_runtimelinking=no
3174--
3175-- # Test if we are trying to use run time linking or normal
3176-- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
3177-- # need to do runtime linking.
3178-- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
3179-- for ld_flag in $LDFLAGS; do
3180-- case $ld_flag in
3181-- *-brtl*)
3182-- aix_use_runtimelinking=yes
3183++else
3184 + lt_nm_to_check="${ac_tool_prefix}nm"
3185 + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
3186 + lt_nm_to_check="$lt_nm_to_check nm"
3187@@ -6007,16 +6209,13 @@
3188 + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
3189 + */dev/null*)
3190 + lt_cv_path_NM="$tmp_nm -p"
3191- break
3192- ;;
3193++ break
3194++ ;;
3195 + *)
3196 + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
3197 + continue # so that we can try to find one that supports BSD flags
3198 + ;;
3199- esac
3200-- done
3201-- ;;
3202-- esac
3203++ esac
3204 + ;;
3205 + esac
3206 + fi
3207@@ -6027,21 +6226,21 @@
3208 +fi])
3209 +if test "$lt_cv_path_NM" != "no"; then
3210 + NM="$lt_cv_path_NM"
3211-+else
3212+ else
3213+- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
3214 + # Didn't find any BSD compatible name lister, look for dumpbin.
3215 + AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
3216 + AC_SUBST([DUMPBIN])
3217 + if test "$DUMPBIN" != ":"; then
3218 + NM="$DUMPBIN"
3219 + fi
3220-+fi
3221+ fi
3222 +test -z "$NM" && NM=nm
3223 +AC_SUBST([NM])
3224 +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
3225
3226-- exp_sym_flag='-bexport'
3227-- no_entry_flag='-bnoentry'
3228-- fi
3229+-if test "$GXX" = yes; then
3230+- # Set up default GNU C++ configuration
3231 +AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
3232 + [lt_cv_nm_interface="BSD nm"
3233 + echo "int some_variable = 0;" > conftest.$ac_ext
3234@@ -6066,57 +6265,13 @@
3235 +dnl AC_DEFUN([AM_PROG_NM], [])
3236 +dnl AC_DEFUN([AC_PROG_NM], [])
3237
3238-- # When large executables or shared objects are built, AIX ld can
3239-- # have problems creating the table of contents. If linking a library
3240-- # or program results in "error TOC overflow" add -mminimal-toc to
3241-- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
3242-- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
3243--
3244-- _LT_AC_TAGVAR(archive_cmds, $1)=''
3245-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
3246-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
3247-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
3248+- AC_PROG_LD
3249
3250-- if test "$GXX" = yes; then
3251-- case $host_os in aix4.[[012]]|aix4.[[012]].*)
3252-- # We only want to do this on AIX 4.2 and lower, the check
3253-- # below for broken collect2 doesn't work under 4.3+
3254-- collect2name=`${CC} -print-prog-name=collect2`
3255-- if test -f "$collect2name" && \
3256-- strings "$collect2name" | grep resolve_lib_name >/dev/null
3257-- then
3258-- # We have reworked collect2
3259-- :
3260-- else
3261-- # We have old collect2
3262-- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
3263-- # It fails to find uninstalled libraries when the uninstalled
3264-- # path is not listed in the libpath. Setting hardcode_minus_L
3265-- # to unsupported forces relinking
3266-- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
3267-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
3268-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
3269-- fi
3270-- ;;
3271-- esac
3272-- shared_flag='-shared'
3273-- if test "$aix_use_runtimelinking" = yes; then
3274-- shared_flag="$shared_flag "'${wl}-G'
3275-- fi
3276-- else
3277-- # not using gcc
3278-- if test "$host_cpu" = ia64; then
3279-- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
3280-- # chokes on -Wl,-G. The following line is correct:
3281-- shared_flag='-G'
3282-- else
3283-- if test "$aix_use_runtimelinking" = yes; then
3284-- shared_flag='${wl}-G'
3285-- else
3286-- shared_flag='${wl}-bM:SRE'
3287-- fi
3288-- fi
3289-- fi
3290+- # Check if GNU C++ uses GNU ld as the underlying linker, since the
3291+- # archiving commands below assume that GNU ld is being used.
3292+- if test "$with_gnu_ld" = yes; then
3293+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
3294+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
3295 +# LT_LIB_M
3296 +# --------
3297 +# check for math library
3298@@ -6138,6 +6293,171 @@
3299 +AC_SUBST([LIBM])
3300 +])# LT_LIB_M
3301
3302+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
3303+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
3304++# Old name:
3305++AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
3306++dnl aclocal-1.4 backwards compatibility:
3307++dnl AC_DEFUN([AC_CHECK_LIBM], [])
3308+
3309+- # If archive_cmds runs LD, not CC, wlarc should be empty
3310+- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
3311+- # investigate it a little bit more. (MM)
3312+- wlarc='${wl}'
3313+
3314+- # ancient GNU ld didn't support --whole-archive et. al.
3315+- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
3316+- grep 'no-whole-archive' > /dev/null; then
3317+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
3318+- else
3319+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
3320+- fi
3321+- else
3322+- with_gnu_ld=no
3323+- wlarc=
3324++# _LT_COMPILER_NO_RTTI([TAGNAME])
3325++# -------------------------------
3326++m4_defun([_LT_COMPILER_NO_RTTI],
3327++[m4_require([_LT_TAG_COMPILER])dnl
3328+
3329+- # A generic and very simple default shared library creation
3330+- # command for GNU C++ for the case where it uses the native
3331+- # linker, instead of GNU ld. If possible, this setting should
3332+- # overridden to take advantage of the native linker features on
3333+- # the platform it is being used on.
3334+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
3335+- fi
3336++_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
3337+
3338+- # Commands to make compiler produce verbose output that lists
3339+- # what "hidden" libraries, object files and flags are used when
3340+- # linking a shared library.
3341+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
3342++if test "$GCC" = yes; then
3343++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
3344+
3345+-else
3346+- GXX=no
3347+- with_gnu_ld=no
3348+- wlarc=
3349++ _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
3350++ lt_cv_prog_compiler_rtti_exceptions,
3351++ [-fno-rtti -fno-exceptions], [],
3352++ [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
3353+ fi
3354++_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
3355++ [Compiler flag to turn off builtin functions])
3356++])# _LT_COMPILER_NO_RTTI
3357+
3358+-# PORTME: fill in a description of your system's C++ link characteristics
3359+-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
3360+-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
3361+-case $host_os in
3362+- aix3*)
3363+- # FIXME: insert proper C++ library support
3364+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
3365+- ;;
3366+- aix[[4-9]]*)
3367+- if test "$host_cpu" = ia64; then
3368+- # On IA64, the linker does run time linking by default, so we don't
3369+- # have to do anything special.
3370+- aix_use_runtimelinking=no
3371+- exp_sym_flag='-Bexport'
3372+- no_entry_flag=""
3373+- else
3374+- aix_use_runtimelinking=no
3375+
3376+- # Test if we are trying to use run time linking or normal
3377+- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
3378+- # need to do runtime linking.
3379+- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
3380+- for ld_flag in $LDFLAGS; do
3381+- case $ld_flag in
3382+- *-brtl*)
3383+- aix_use_runtimelinking=yes
3384+- break
3385+- ;;
3386+- esac
3387+- done
3388+- ;;
3389+- esac
3390++# _LT_CMD_GLOBAL_SYMBOLS
3391++# ----------------------
3392++m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
3393++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
3394++AC_REQUIRE([AC_PROG_CC])dnl
3395++AC_REQUIRE([LT_PATH_NM])dnl
3396++AC_REQUIRE([LT_PATH_LD])dnl
3397++m4_require([_LT_DECL_SED])dnl
3398++m4_require([_LT_DECL_EGREP])dnl
3399++m4_require([_LT_TAG_COMPILER])dnl
3400+
3401+- exp_sym_flag='-bexport'
3402+- no_entry_flag='-bnoentry'
3403+- fi
3404++# Check for command to grab the raw symbol name followed by C symbol from nm.
3405++AC_MSG_CHECKING([command to parse $NM output from $compiler object])
3406++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
3407++[
3408++# These are sane defaults that work on at least a few old systems.
3409++# [They come from Ultrix. What could be older than Ultrix?!! ;)]
3410+
3411+- # When large executables or shared objects are built, AIX ld can
3412+- # have problems creating the table of contents. If linking a library
3413+- # or program results in "error TOC overflow" add -mminimal-toc to
3414+- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
3415+- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
3416+-
3417+- _LT_AC_TAGVAR(archive_cmds, $1)=''
3418+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
3419+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
3420+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
3421++# Character class describing NM global symbol codes.
3422++symcode='[[BCDEGRST]]'
3423+
3424+- if test "$GXX" = yes; then
3425+- case $host_os in aix4.[[012]]|aix4.[[012]].*)
3426+- # We only want to do this on AIX 4.2 and lower, the check
3427+- # below for broken collect2 doesn't work under 4.3+
3428+- collect2name=`${CC} -print-prog-name=collect2`
3429+- if test -f "$collect2name" && \
3430+- strings "$collect2name" | grep resolve_lib_name >/dev/null
3431+- then
3432+- # We have reworked collect2
3433+- :
3434+- else
3435+- # We have old collect2
3436+- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
3437+- # It fails to find uninstalled libraries when the uninstalled
3438+- # path is not listed in the libpath. Setting hardcode_minus_L
3439+- # to unsupported forces relinking
3440+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
3441+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
3442+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
3443+- fi
3444+- ;;
3445+- esac
3446+- shared_flag='-shared'
3447+- if test "$aix_use_runtimelinking" = yes; then
3448+- shared_flag="$shared_flag "'${wl}-G'
3449+- fi
3450+- else
3451+- # not using gcc
3452+- if test "$host_cpu" = ia64; then
3453+- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
3454+- # chokes on -Wl,-G. The following line is correct:
3455+- shared_flag='-G'
3456+- else
3457+- if test "$aix_use_runtimelinking" = yes; then
3458+- shared_flag='${wl}-G'
3459+- else
3460+- shared_flag='${wl}-bM:SRE'
3461+- fi
3462+- fi
3463+- fi
3464++# Regexp to match symbols that can be accessed directly from C.
3465++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
3466+
3467 - # It seems that -bexpall does not export symbols beginning with
3468 - # underscore (_), so it is better to generate a list of symbols to export.
3469 - _LT_AC_TAGVAR(always_export_symbols, $1)=yes
3470@@ -6148,10 +6468,41 @@
3471 - # Determine the default libpath from the value encoded in an empty executable.
3472 - _LT_AC_SYS_LIBPATH_AIX
3473 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
3474-+# Old name:
3475-+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
3476-+dnl aclocal-1.4 backwards compatibility:
3477-+dnl AC_DEFUN([AC_CHECK_LIBM], [])
3478++# Define system-specific variables.
3479++case $host_os in
3480++aix*)
3481++ symcode='[[BCDT]]'
3482++ ;;
3483++cygwin* | mingw* | pw32* | cegcc*)
3484++ symcode='[[ABCDGISTW]]'
3485++ ;;
3486++hpux*)
3487++ if test "$host_cpu" = ia64; then
3488++ symcode='[[ABCDEGRST]]'
3489++ fi
3490++ ;;
3491++irix* | nonstopux*)
3492++ symcode='[[BCDEGRST]]'
3493++ ;;
3494++osf*)
3495++ symcode='[[BCDEGQRST]]'
3496++ ;;
3497++solaris*)
3498++ symcode='[[BDRT]]'
3499++ ;;
3500++sco3.2v5*)
3501++ symcode='[[DT]]'
3502++ ;;
3503++sysv4.2uw2*)
3504++ symcode='[[DT]]'
3505++ ;;
3506++sysv5* | sco5v6* | unixware* | OpenUNIX*)
3507++ symcode='[[ABDT]]'
3508++ ;;
3509++sysv4)
3510++ symcode='[[DFNSTU]]'
3511++ ;;
3512++esac
3513
3514 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
3515 - else
3516@@ -6175,6 +6526,11 @@
3517 - fi
3518 - fi
3519 - ;;
3520++# If we're using GNU nm, then use its standard symbol codes.
3521++case `$NM -V 2>&1` in
3522++*GNU* | *'with BFD'*)
3523++ symcode='[[ABCDGIRSTW]]' ;;
3524++esac
3525
3526 - beos*)
3527 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
3528@@ -6186,10 +6542,10 @@
3529 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
3530 - fi
3531 - ;;
3532-+# _LT_COMPILER_NO_RTTI([TAGNAME])
3533-+# -------------------------------
3534-+m4_defun([_LT_COMPILER_NO_RTTI],
3535-+[m4_require([_LT_TAG_COMPILER])dnl
3536++# Transform an extracted symbol line into a proper C declaration.
3537++# Some systems (esp. on ia64) link data and code symbols differently,
3538++# so use this general approach.
3539++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
3540
3541 - chorus*)
3542 - case $cc_basename in
3543@@ -6199,7 +6555,9 @@
3544 - ;;
3545 - esac
3546 - ;;
3547-+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
3548++# Transform an extracted symbol line into symbol name and symbol address
3549++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
3550++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
3551
3552 - cygwin* | mingw* | pw32*)
3553 - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
3554@@ -6223,7 +6581,12 @@
3555 - else
3556 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
3557 - fi
3558-- ;;
3559++# Handle CRLF in mingw tool chain
3560++opt_cr=
3561++case $build_os in
3562++mingw*)
3563++ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
3564+ ;;
3565 - darwin* | rhapsody*)
3566 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
3567 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
3568@@ -6258,8 +6621,7 @@
3569 - esac
3570 - fi
3571 - ;;
3572-+if test "$GCC" = yes; then
3573-+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
3574++esac
3575
3576 - dgux*)
3577 - case $cc_basename in
3578@@ -6321,51 +6683,281 @@
3579 - *)
3580 - if test "$GXX" = yes; then
3581 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
3582-- else
3583++# Try without a prefix underscore, then with it.
3584++for ac_symprfx in "" "_"; do
3585++
3586++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
3587++ symxfrm="\\1 $ac_symprfx\\2 \\2"
3588++
3589++ # Write the raw and C identifiers.
3590++ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
3591++ # Fake it for dumpbin and say T for any non-static function
3592++ # and D for any global variable.
3593++ # Also find C++ and __fastcall symbols from MSVC++,
3594++ # which start with @ or ?.
3595++ lt_cv_sys_global_symbol_pipe="$AWK ['"\
3596++" {last_section=section; section=\$ 3};"\
3597++" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
3598++" \$ 0!~/External *\|/{next};"\
3599++" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
3600++" {if(hide[section]) next};"\
3601++" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
3602++" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
3603++" s[1]~/^[@?]/{print s[1], s[1]; next};"\
3604++" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
3605++" ' prfx=^$ac_symprfx]"
3606++ else
3607++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
3608++ fi
3609++
3610++ # Check to see that the pipe works correctly.
3611++ pipe_works=no
3612++
3613++ rm -f conftest*
3614++ cat > conftest.$ac_ext <<_LT_EOF
3615++#ifdef __cplusplus
3616++extern "C" {
3617++#endif
3618++char nm_test_var;
3619++void nm_test_func(void);
3620++void nm_test_func(void){}
3621++#ifdef __cplusplus
3622++}
3623++#endif
3624++int main(){nm_test_var='a';nm_test_func();return(0);}
3625++_LT_EOF
3626++
3627++ if AC_TRY_EVAL(ac_compile); then
3628++ # Now try to grab the symbols.
3629++ nlist=conftest.nm
3630++ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
3631++ # Try sorting and uniquifying the output.
3632++ if sort "$nlist" | uniq > "$nlist"T; then
3633++ mv -f "$nlist"T "$nlist"
3634+ else
3635 - # FIXME: insert proper C++ library support
3636 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
3637-- fi
3638-- ;;
3639++ rm -f "$nlist"T
3640++ fi
3641++
3642++ # Make sure that we snagged all the symbols we need.
3643++ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
3644++ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
3645++ cat <<_LT_EOF > conftest.$ac_ext
3646++#ifdef __cplusplus
3647++extern "C" {
3648++#endif
3649++
3650++_LT_EOF
3651++ # Now generate the symbol file.
3652++ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
3653++
3654++ cat <<_LT_EOF >> conftest.$ac_ext
3655++
3656++/* The mapping between symbol names and symbols. */
3657++const struct {
3658++ const char *name;
3659++ void *address;
3660++}
3661++lt__PROGRAM__LTX_preloaded_symbols[[]] =
3662++{
3663++ { "@PROGRAM@", (void *) 0 },
3664++_LT_EOF
3665++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
3666++ cat <<\_LT_EOF >> conftest.$ac_ext
3667++ {0, (void *) 0}
3668++};
3669++
3670++/* This works around a problem in FreeBSD linker */
3671++#ifdef FREEBSD_WORKAROUND
3672++static const void *lt_preloaded_setup() {
3673++ return lt__PROGRAM__LTX_preloaded_symbols;
3674++}
3675++#endif
3676++
3677++#ifdef __cplusplus
3678++}
3679++#endif
3680++_LT_EOF
3681++ # Now try linking the two files.
3682++ mv conftest.$ac_objext conftstm.$ac_objext
3683++ lt_save_LIBS="$LIBS"
3684++ lt_save_CFLAGS="$CFLAGS"
3685++ LIBS="conftstm.$ac_objext"
3686++ CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
3687++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
3688++ pipe_works=yes
3689++ fi
3690++ LIBS="$lt_save_LIBS"
3691++ CFLAGS="$lt_save_CFLAGS"
3692++ else
3693++ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
3694++ fi
3695++ else
3696++ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
3697++ fi
3698++ else
3699++ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
3700++ fi
3701++ else
3702++ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
3703++ cat conftest.$ac_ext >&5
3704++ fi
3705++ rm -rf conftest* conftst*
3706++
3707++ # Do not use the global_symbol_pipe unless it works.
3708++ if test "$pipe_works" = yes; then
3709++ break
3710++ else
3711++ lt_cv_sys_global_symbol_pipe=
3712++ fi
3713++done
3714++])
3715++if test -z "$lt_cv_sys_global_symbol_pipe"; then
3716++ lt_cv_sys_global_symbol_to_cdecl=
3717++fi
3718++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
3719++ AC_MSG_RESULT(failed)
3720++else
3721++ AC_MSG_RESULT(ok)
3722++fi
3723++
3724++_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
3725++ [Take the output of nm and produce a listing of raw symbols and C names])
3726++_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
3727++ [Transform the output of nm in a proper C declaration])
3728++_LT_DECL([global_symbol_to_c_name_address],
3729++ [lt_cv_sys_global_symbol_to_c_name_address], [1],
3730++ [Transform the output of nm in a C name address pair])
3731++_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
3732++ [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
3733++ [Transform the output of nm in a C name address pair when lib prefix is needed])
3734++]) # _LT_CMD_GLOBAL_SYMBOLS
3735++
3736++
3737++# _LT_COMPILER_PIC([TAGNAME])
3738++# ---------------------------
3739++m4_defun([_LT_COMPILER_PIC],
3740++[m4_require([_LT_TAG_COMPILER])dnl
3741++_LT_TAGVAR(lt_prog_compiler_wl, $1)=
3742++_LT_TAGVAR(lt_prog_compiler_pic, $1)=
3743++_LT_TAGVAR(lt_prog_compiler_static, $1)=
3744++
3745++AC_MSG_CHECKING([for $compiler option to produce PIC])
3746++m4_if([$1], [CXX], [
3747++ # C++ specific cases for pic, static, wl, etc.
3748++ if test "$GXX" = yes; then
3749++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3750++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
3751++
3752++ case $host_os in
3753++ aix*)
3754++ # All AIX code is PIC.
3755++ if test "$host_cpu" = ia64; then
3756++ # AIX 5 now supports IA64 processor
3757++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
3758+ fi
3759+ ;;
3760 - esac
3761 - ;;
3762 - hpux10*|hpux11*)
3763 - if test $with_gnu_ld = no; then
3764 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
3765 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
3766-+ _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
3767-+ lt_cv_prog_compiler_rtti_exceptions,
3768-+ [-fno-rtti -fno-exceptions], [],
3769-+ [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
3770-+fi
3771-+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
3772-+ [Compiler flag to turn off builtin functions])
3773-+])# _LT_COMPILER_NO_RTTI
3774
3775-- case $host_cpu in
3776++ amigaos*)
3777+ case $host_cpu in
3778 - hppa*64*|ia64*) ;;
3779 - *)
3780 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
3781-- ;;
3782-- esac
3783++ powerpc)
3784++ # see comment about AmigaOS4 .so support
3785++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
3786++ ;;
3787++ m68k)
3788++ # FIXME: we need at least 68020 code to build shared libraries, but
3789++ # adding the `-m68020' flag to GCC prevents building anything better,
3790++ # like `-m68040'.
3791++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
3792+ ;;
3793+ esac
3794 - fi
3795 - case $host_cpu in
3796 - hppa*64*|ia64*)
3797 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
3798 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
3799-- ;;
3800-- *)
3801++ ;;
3802++
3803++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
3804++ # PIC is the default for these OSes.
3805++ ;;
3806++ mingw* | cygwin* | os2* | pw32* | cegcc*)
3807++ # This hack is so that the source file can tell whether it is being
3808++ # built for inclusion in a dll (and should export symbols for example).
3809++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
3810++ # (--disable-auto-import) libraries
3811++ m4_if([$1], [GCJ], [],
3812++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
3813++ ;;
3814++ darwin* | rhapsody*)
3815++ # PIC is the default on this platform
3816++ # Common symbols not allowed in MH_DYLIB files
3817++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
3818++ ;;
3819++ *djgpp*)
3820++ # DJGPP does not support shared libraries at all
3821++ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
3822++ ;;
3823++ interix[[3-9]]*)
3824++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
3825++ # Instead, we relocate shared libraries at runtime.
3826++ ;;
3827++ sysv4*MP*)
3828++ if test -d /usr/nec; then
3829++ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
3830++ fi
3831++ ;;
3832++ hpux*)
3833++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
3834++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
3835++ # sets the default TLS model and affects inlining.
3836++ case $host_cpu in
3837++ hppa*64*)
3838++ ;;
3839++ *)
3840++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
3841++ ;;
3842++ esac
3843++ ;;
3844++ *qnx* | *nto*)
3845++ # QNX uses GNU C++, but need to define -shared option too, otherwise
3846++ # it will coredump.
3847++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
3848+ ;;
3849+ *)
3850 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
3851 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
3852 - # but as the default
3853 - # location of the library.
3854-- ;;
3855-- esac
3856-
3857++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
3858+ ;;
3859+ esac
3860+-
3861 - case $cc_basename in
3862 - CC*)
3863 - # FIXME: insert proper C++ library support
3864 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
3865-- ;;
3866++ else
3867++ case $host_os in
3868++ aix[[4-9]]*)
3869++ # All AIX code is PIC.
3870++ if test "$host_cpu" = ia64; then
3871++ # AIX 5 now supports IA64 processor
3872++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
3873++ else
3874++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
3875++ fi
3876+ ;;
3877 - aCC*)
3878 - case $host_cpu in
3879 - hppa*64*)
3880@@ -6376,8 +6968,13 @@
3881 - ;;
3882 - *)
3883 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
3884-- ;;
3885-- esac
3886++ chorus*)
3887++ case $cc_basename in
3888++ cxch68*)
3889++ # Green Hills C++ Compiler
3890++ # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
3891+ ;;
3892+ esac
3893 - # Commands to make compiler produce verbose output that lists
3894 - # what "hidden" libraries, object files and flags are used when
3895 - # linking a shared library.
3896@@ -6387,21 +6984,52 @@
3897 - # from the output so that they don't get included in the library
3898 - # dependencies.
3899 - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
3900-- ;;
3901+ ;;
3902 - *)
3903 - if test "$GXX" = yes; then
3904 - if test $with_gnu_ld = no; then
3905-- case $host_cpu in
3906++ dgux*)
3907++ case $cc_basename in
3908++ ec++*)
3909++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
3910++ ;;
3911++ ghcx*)
3912++ # Green Hills C++ Compiler
3913++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
3914++ ;;
3915++ *)
3916++ ;;
3917++ esac
3918++ ;;
3919++ freebsd* | dragonfly*)
3920++ # FreeBSD uses GNU C++
3921++ ;;
3922++ hpux9* | hpux10* | hpux11*)
3923++ case $cc_basename in
3924++ CC*)
3925++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3926++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
3927++ if test "$host_cpu" != ia64; then
3928++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
3929++ fi
3930++ ;;
3931++ aCC*)
3932++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3933++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
3934+ case $host_cpu in
3935 - hppa*64*)
3936 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
3937 - ;;
3938 - ia64*)
3939 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
3940-- ;;
3941-- *)
3942++ hppa*64*|ia64*)
3943++ # +Z the default
3944+ ;;
3945+ *)
3946 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
3947-- ;;
3948-- esac
3949++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
3950+ ;;
3951+ esac
3952 - fi
3953 - else
3954 - # FIXME: insert proper C++ library support
3955@@ -6496,7 +7124,10 @@
3956 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
3957 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
3958 - ;;
3959-- esac
3960++ ;;
3961++ *)
3962++ ;;
3963+ esac
3964 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
3965 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
3966 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
3967@@ -6515,27 +7146,11 @@
3968 - # Compaq C++
3969 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
3970 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
3971-+# _LT_CMD_GLOBAL_SYMBOLS
3972-+# ----------------------
3973-+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
3974-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
3975-+AC_REQUIRE([AC_PROG_CC])dnl
3976-+AC_REQUIRE([LT_PATH_NM])dnl
3977-+AC_REQUIRE([LT_PATH_LD])dnl
3978-+m4_require([_LT_DECL_SED])dnl
3979-+m4_require([_LT_DECL_EGREP])dnl
3980-+m4_require([_LT_TAG_COMPILER])dnl
3981-
3982+-
3983 - runpath_var=LD_RUN_PATH
3984 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
3985 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
3986-+# Check for command to grab the raw symbol name followed by C symbol from nm.
3987-+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
3988-+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
3989-+[
3990-+# These are sane defaults that work on at least a few old systems.
3991-+# [They come from Ultrix. What could be older than Ultrix?!! ;)]
3992-
3993+-
3994 - # Commands to make compiler produce verbose output that lists
3995 - # what "hidden" libraries, object files and flags are used when
3996 - # linking a shared library.
3997@@ -6545,7 +7160,7 @@
3998 - # from the output so that they don't get included in the library
3999 - # dependencies.
4000 - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
4001-- ;;
4002+ ;;
4003 - *)
4004 - case `$CC -V 2>&1 | sed 5q` in
4005 - *Sun\ C*)
4006@@ -6568,7 +7183,10 @@
4007 - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
4008 - ;;
4009 - esac
4010-- ;;
4011++ interix*)
4012++ # This is c89, which is MS Visual C++ (no shared libs)
4013++ # Anyone wants to do a port?
4014+ ;;
4015 - esac
4016 - ;;
4017 - lynxos*)
4018@@ -6584,11 +7202,71 @@
4019 - cxx*)
4020 - # FIXME: insert proper C++ library support
4021 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4022-- ;;
4023++ irix5* | irix6* | nonstopux*)
4024++ case $cc_basename in
4025++ CC*)
4026++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4027++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
4028++ # CC pic flag -KPIC is the default.
4029++ ;;
4030++ *)
4031++ ;;
4032++ esac
4033+ ;;
4034 - *)
4035 - # FIXME: insert proper C++ library support
4036 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4037-- ;;
4038++ linux* | k*bsd*-gnu)
4039++ case $cc_basename in
4040++ KCC*)
4041++ # KAI C++ Compiler
4042++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
4043++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
4044++ ;;
4045++ ecpc* )
4046++ # old Intel C++ for x86_64 which still supported -KPIC.
4047++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4048++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4049++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
4050++ ;;
4051++ icpc* )
4052++ # Intel C++, used to be incompatible with GCC.
4053++ # ICC 10 doesn't accept -KPIC any more.
4054++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4055++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
4056++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
4057++ ;;
4058++ pgCC* | pgcpp*)
4059++ # Portland Group C++ compiler
4060++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4061++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
4062++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4063++ ;;
4064++ cxx*)
4065++ # Compaq C++
4066++ # Make sure the PIC flag is empty. It appears that all Alpha
4067++ # Linux and Compaq Tru64 Unix objects are PIC.
4068++ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
4069++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
4070++ ;;
4071++ xlc* | xlC*)
4072++ # IBM XL 8.0 on PPC
4073++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4074++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
4075++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
4076++ ;;
4077++ *)
4078++ case `$CC -V 2>&1 | sed 5q` in
4079++ *Sun\ C*)
4080++ # Sun C++ 5.9
4081++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4082++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4083++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
4084++ ;;
4085++ esac
4086++ ;;
4087++ esac
4088+ ;;
4089 - esac
4090 - ;;
4091 - netbsd*)
4092@@ -6661,7 +7339,8 @@
4093 - # from the output so that they don't get included in the library
4094 - # dependencies.
4095 - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
4096-- ;;
4097++ lynxos*)
4098+ ;;
4099 - *)
4100 - if test "$GXX" = yes && test "$with_gnu_ld" = no; then
4101 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
4102@@ -6674,14 +7353,13 @@
4103 - # what "hidden" libraries, object files and flags are used when
4104 - # linking a shared library.
4105 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
4106-+# Character class describing NM global symbol codes.
4107-+symcode='[[BCDEGRST]]'
4108-
4109+-
4110 - else
4111 - # FIXME: insert proper C++ library support
4112 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4113 - fi
4114-- ;;
4115++ m88k*)
4116+ ;;
4117 - esac
4118 - ;;
4119 - osf4* | osf5*)
4120@@ -6726,7 +7404,15 @@
4121 - # from the output so that they don't get included in the library
4122 - # dependencies.
4123 - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
4124-- ;;
4125++ mvs*)
4126++ case $cc_basename in
4127++ cxx*)
4128++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
4129++ ;;
4130++ *)
4131++ ;;
4132++ esac
4133+ ;;
4134 - *)
4135 - if test "$GXX" = yes && test "$with_gnu_ld" = no; then
4136 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
4137@@ -6739,14 +7425,13 @@
4138 - # what "hidden" libraries, object files and flags are used when
4139 - # linking a shared library.
4140 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
4141-+# Regexp to match symbols that can be accessed directly from C.
4142-+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
4143-
4144+-
4145 - else
4146 - # FIXME: insert proper C++ library support
4147 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4148 - fi
4149-- ;;
4150++ netbsd* | netbsdelf*-gnu)
4151+ ;;
4152 - esac
4153 - ;;
4154 - psos*)
4155@@ -6764,11 +7449,37 @@
4156 - # Lucid
4157 - # FIXME: insert proper C++ library support
4158 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4159-- ;;
4160++ *qnx* | *nto*)
4161++ # QNX uses GNU C++, but need to define -shared option too, otherwise
4162++ # it will coredump.
4163++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
4164++ ;;
4165++ osf3* | osf4* | osf5*)
4166++ case $cc_basename in
4167++ KCC*)
4168++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
4169++ ;;
4170++ RCC*)
4171++ # Rational C++ 2.4.1
4172++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
4173++ ;;
4174++ cxx*)
4175++ # Digital/Compaq C++
4176++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4177++ # Make sure the PIC flag is empty. It appears that all Alpha
4178++ # Linux and Compaq Tru64 Unix objects are PIC.
4179++ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
4180++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
4181++ ;;
4182++ *)
4183++ ;;
4184++ esac
4185+ ;;
4186 - *)
4187 - # FIXME: insert proper C++ library support
4188 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4189-- ;;
4190++ psos*)
4191+ ;;
4192 - esac
4193 - ;;
4194 - solaris*)
4195@@ -6785,57 +7496,29 @@
4196 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
4197 - case $host_os in
4198 - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
4199-- *)
4200++ solaris*)
4201++ case $cc_basename in
4202++ CC*)
4203++ # Sun C++ 4.2, 5.x and Centerline C++
4204++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4205++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4206++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
4207++ ;;
4208++ gcx*)
4209++ # Green Hills C++ Compiler
4210++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
4211++ ;;
4212+ *)
4213 - # The compiler driver will combine and reorder linker options,
4214 - # but understands `-z linker_flag'.
4215 - # Supported since Solaris 2.6 (maybe 2.5.1?)
4216 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
4217-- ;;
4218-- esac
4219+ ;;
4220+ esac
4221 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
4222-+# Define system-specific variables.
4223-+case $host_os in
4224-+aix*)
4225-+ symcode='[[BCDT]]'
4226-+ ;;
4227-+cygwin* | mingw* | pw32* | cegcc*)
4228-+ symcode='[[ABCDGISTW]]'
4229-+ ;;
4230-+hpux*)
4231-+ if test "$host_cpu" = ia64; then
4232-+ symcode='[[ABCDEGRST]]'
4233-+ fi
4234-+ ;;
4235-+irix* | nonstopux*)
4236-+ symcode='[[BCDEGRST]]'
4237-+ ;;
4238-+osf*)
4239-+ symcode='[[BCDEGQRST]]'
4240-+ ;;
4241-+solaris*)
4242-+ symcode='[[BDRT]]'
4243-+ ;;
4244-+sco3.2v5*)
4245-+ symcode='[[DT]]'
4246-+ ;;
4247-+sysv4.2uw2*)
4248-+ symcode='[[DT]]'
4249-+ ;;
4250-+sysv5* | sco5v6* | unixware* | OpenUNIX*)
4251-+ symcode='[[ABDT]]'
4252-+ ;;
4253-+sysv4)
4254-+ symcode='[[DFNSTU]]'
4255-+ ;;
4256-+esac
4257-
4258+-
4259 - output_verbose_link_cmd='echo'
4260-+# If we're using GNU nm, then use its standard symbol codes.
4261-+case `$NM -V 2>&1` in
4262-+*GNU* | *'with BFD'*)
4263-+ symcode='[[ABCDGIRSTW]]' ;;
4264-+esac
4265-
4266+-
4267 - # Archives containing C++ object files must be created using
4268 - # "CC -xar", where "CC" is the Sun C++ compiler. This is
4269 - # necessary to make sure instantiated templates are included
4270@@ -6845,14 +7528,10 @@
4271 - gcx*)
4272 - # Green Hills C++ Compiler
4273 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
4274-+# Transform an extracted symbol line into a proper C declaration.
4275-+# Some systems (esp. on ia64) link data and code symbols differently,
4276-+# so use this general approach.
4277-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
4278-
4279+-
4280 - # The C++ compiler must be used to create the archive.
4281 - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
4282-- ;;
4283+ ;;
4284 - *)
4285 - # GNU C++ compiler with Solaris linker
4286 - if test "$GXX" = yes && test "$with_gnu_ld" = no; then
4287@@ -6861,10 +7540,7 @@
4288 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
4289 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
4290 - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
4291-+# Transform an extracted symbol line into symbol name and symbol address
4292-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
4293-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
4294-
4295+-
4296 - # Commands to make compiler produce verbose output that lists
4297 - # what "hidden" libraries, object files and flags are used when
4298 - # linking a shared library.
4299@@ -6875,28 +7551,30 @@
4300 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
4301 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
4302 - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
4303-+# Handle CRLF in mingw tool chain
4304-+opt_cr=
4305-+case $build_os in
4306-+mingw*)
4307-+ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
4308-+ ;;
4309-+esac
4310-
4311+-
4312 - # Commands to make compiler produce verbose output that lists
4313 - # what "hidden" libraries, object files and flags are used when
4314 - # linking a shared library.
4315 - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
4316 - fi
4317-+# Try without a prefix underscore, then with it.
4318-+for ac_symprfx in "" "_"; do
4319-
4320+-
4321 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
4322 - case $host_os in
4323 - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
4324-- *)
4325++ sunos4*)
4326++ case $cc_basename in
4327++ CC*)
4328++ # Sun C++ 4.x
4329++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
4330++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4331++ ;;
4332++ lcc*)
4333++ # Lucid
4334++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
4335++ ;;
4336+ *)
4337 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
4338-- ;;
4339+ ;;
4340 - esac
4341 - fi
4342 - ;;
4343@@ -6916,7 +7594,8 @@
4344 - *)
4345 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
4346 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
4347-- ;;
4348++ esac
4349+ ;;
4350 - esac
4351 - ;;
4352 - sysv5* | sco3.2v5* | sco5v6*)
4353@@ -6949,11 +7628,28 @@
4354 - CC*)
4355 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
4356 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
4357-- ;;
4358++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
4359++ case $cc_basename in
4360++ CC*)
4361++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4362++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4363++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4364++ ;;
4365++ esac
4366+ ;;
4367 - *)
4368 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
4369 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
4370-- ;;
4371++ tandem*)
4372++ case $cc_basename in
4373++ NCC*)
4374++ # NonStop-UX NCC 3.20
4375++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4376++ ;;
4377++ *)
4378++ ;;
4379++ esac
4380+ ;;
4381 - esac
4382 - ;;
4383 - tandem*)
4384@@ -6962,12 +7658,14 @@
4385 - # NonStop-UX NCC 3.20
4386 - # FIXME: insert proper C++ library support
4387 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4388-- ;;
4389-- *)
4390++ vxworks*)
4391+ ;;
4392+ *)
4393 - # FIXME: insert proper C++ library support
4394 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
4395-- ;;
4396-- esac
4397++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
4398+ ;;
4399+ esac
4400 - ;;
4401 - vxworks*)
4402 - # FIXME: insert proper C++ library support
4403@@ -6980,31 +7678,15 @@
4404 -esac
4405 -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
4406 -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
4407-+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
4408-+ symxfrm="\\1 $ac_symprfx\\2 \\2"
4409-
4410+-
4411 -_LT_AC_TAGVAR(GCC, $1)="$GXX"
4412 -_LT_AC_TAGVAR(LD, $1)="$LD"
4413-+ # Write the raw and C identifiers.
4414-+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
4415-+ # Fake it for dumpbin and say T for any non-static function
4416-+ # and D for any global variable.
4417-+ # Also find C++ and __fastcall symbols from MSVC++,
4418-+ # which start with @ or ?.
4419-+ lt_cv_sys_global_symbol_pipe="$AWK ['"\
4420-+" {last_section=section; section=\$ 3};"\
4421-+" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
4422-+" \$ 0!~/External *\|/{next};"\
4423-+" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
4424-+" {if(hide[section]) next};"\
4425-+" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
4426-+" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
4427-+" s[1]~/^[@?]/{print s[1], s[1]; next};"\
4428-+" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
4429-+" ' prfx=^$ac_symprfx]"
4430-+ else
4431-+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
4432 + fi
4433++],
4434++[
4435++ if test "$GCC" = yes; then
4436++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4437++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
4438
4439 -AC_LIBTOOL_POSTDEP_PREDEP($1)
4440 -AC_LIBTOOL_PROG_COMPILER_PIC($1)
4441@@ -7013,23 +7695,30 @@
4442 -AC_LIBTOOL_PROG_LD_SHLIBS($1)
4443 -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
4444 -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
4445-+ # Check to see that the pipe works correctly.
4446-+ pipe_works=no
4447++ case $host_os in
4448++ aix*)
4449++ # All AIX code is PIC.
4450++ if test "$host_cpu" = ia64; then
4451++ # AIX 5 now supports IA64 processor
4452++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4453++ fi
4454++ ;;
4455
4456 -AC_LIBTOOL_CONFIG($1)
4457-+ rm -f conftest*
4458-+ cat > conftest.$ac_ext <<_LT_EOF
4459-+#ifdef __cplusplus
4460-+extern "C" {
4461-+#endif
4462-+char nm_test_var;
4463-+void nm_test_func(void);
4464-+void nm_test_func(void){}
4465-+#ifdef __cplusplus
4466-+}
4467-+#endif
4468-+int main(){nm_test_var='a';nm_test_func();return(0);}
4469-+_LT_EOF
4470++ amigaos*)
4471++ case $host_cpu in
4472++ powerpc)
4473++ # see comment about AmigaOS4 .so support
4474++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
4475++ ;;
4476++ m68k)
4477++ # FIXME: we need at least 68020 code to build shared libraries, but
4478++ # adding the `-m68020' flag to GCC prevents building anything better,
4479++ # like `-m68040'.
4480++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
4481++ ;;
4482++ esac
4483++ ;;
4484
4485 -AC_LANG_POP
4486 -CC=$lt_save_CC
4487@@ -7043,16 +7732,9 @@
4488 -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
4489 -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
4490 -])# AC_LIBTOOL_LANG_CXX_CONFIG
4491-+ if AC_TRY_EVAL(ac_compile); then
4492-+ # Now try to grab the symbols.
4493-+ nlist=conftest.nm
4494-+ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
4495-+ # Try sorting and uniquifying the output.
4496-+ if sort "$nlist" | uniq > "$nlist"T; then
4497-+ mv -f "$nlist"T "$nlist"
4498-+ else
4499-+ rm -f "$nlist"T
4500-+ fi
4501++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
4502++ # PIC is the default for these OSes.
4503++ ;;
4504
4505 -# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
4506 -# ------------------------------------
4507@@ -7102,42 +7784,48 @@
4508 -if AC_TRY_EVAL(ac_compile); then
4509 - # Parse the compiler output and extract the necessary
4510 - # objects, libraries and library flags.
4511-+ # Make sure that we snagged all the symbols we need.
4512-+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
4513-+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
4514-+ cat <<_LT_EOF > conftest.$ac_ext
4515-+#ifdef __cplusplus
4516-+extern "C" {
4517-+#endif
4518++ mingw* | cygwin* | pw32* | os2* | cegcc*)
4519++ # This hack is so that the source file can tell whether it is being
4520++ # built for inclusion in a dll (and should export symbols for example).
4521++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
4522++ # (--disable-auto-import) libraries
4523++ m4_if([$1], [GCJ], [],
4524++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
4525++ ;;
4526
4527 - # Sentinel used to keep track of whether or not we are before
4528 - # the conftest object file.
4529 - pre_test_object_deps_done=no
4530-+_LT_EOF
4531-+ # Now generate the symbol file.
4532-+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
4533++ darwin* | rhapsody*)
4534++ # PIC is the default on this platform
4535++ # Common symbols not allowed in MH_DYLIB files
4536++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
4537++ ;;
4538
4539 - # The `*' in the case matches for architectures that use `case' in
4540 - # $output_verbose_cmd can trigger glob expansion during the loop
4541 - # eval without this substitution.
4542 - output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
4543-+ cat <<_LT_EOF >> conftest.$ac_ext
4544++ hpux*)
4545++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
4546++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
4547++ # sets the default TLS model and affects inlining.
4548++ case $host_cpu in
4549++ hppa*64*)
4550++ # +Z the default
4551++ ;;
4552++ *)
4553++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
4554++ ;;
4555++ esac
4556++ ;;
4557
4558 - for p in `eval $output_verbose_link_cmd`; do
4559 - case $p in
4560-+/* The mapping between symbol names and symbols. */
4561-+const struct {
4562-+ const char *name;
4563-+ void *address;
4564-+}
4565-+lt__PROGRAM__LTX_preloaded_symbols[[]] =
4566-+{
4567-+ { "@PROGRAM@", (void *) 0 },
4568-+_LT_EOF
4569-+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
4570-+ cat <<\_LT_EOF >> conftest.$ac_ext
4571-+ {0, (void *) 0}
4572-+};
4573++ interix[[3-9]]*)
4574++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
4575++ # Instead, we relocate shared libraries at runtime.
4576++ ;;
4577
4578 - -L* | -R* | -l*)
4579 - # Some compilers place space between "-{L,R}" and the path.
4580@@ -7149,12 +7837,12 @@
4581 - else
4582 - prev=
4583 - fi
4584-+/* This works around a problem in FreeBSD linker */
4585-+#ifdef FREEBSD_WORKAROUND
4586-+static const void *lt_preloaded_setup() {
4587-+ return lt__PROGRAM__LTX_preloaded_symbols;
4588-+}
4589-+#endif
4590++ msdosdjgpp*)
4591++ # Just because we use GCC doesn't mean we suddenly get shared libraries
4592++ # on systems that don't support them.
4593++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
4594++ enable_shared=no
4595++ ;;
4596
4597 - if test "$pre_test_object_deps_done" = no; then
4598 - case $p in
4599@@ -7179,7 +7867,12 @@
4600 - fi
4601 - fi
4602 - ;;
4603--
4604++ *nto* | *qnx*)
4605++ # QNX uses GNU C++, but need to define -shared option too, otherwise
4606++ # it will coredump.
4607++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
4608++ ;;
4609+
4610 - *.$objext)
4611 - # This assumes that the test object file only shows up
4612 - # once in the compiler output.
4613@@ -7204,76 +7897,42 @@
4614 - ;;
4615 -
4616 - *) ;; # Ignore the rest.
4617--
4618-- esac
4619-- done
4620-+#ifdef __cplusplus
4621-+}
4622-+#endif
4623-+_LT_EOF
4624-+ # Now try linking the two files.
4625-+ mv conftest.$ac_objext conftstm.$ac_objext
4626-+ lt_save_LIBS="$LIBS"
4627-+ lt_save_CFLAGS="$CFLAGS"
4628-+ LIBS="conftstm.$ac_objext"
4629-+ CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
4630-+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
4631-+ pipe_works=yes
4632-+ fi
4633-+ LIBS="$lt_save_LIBS"
4634-+ CFLAGS="$lt_save_CFLAGS"
4635-+ else
4636-+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
4637-+ fi
4638-+ else
4639-+ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
4640++ sysv4*MP*)
4641++ if test -d /usr/nec; then
4642++ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
4643 + fi
4644-+ else
4645-+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
4646-+ fi
4647-+ else
4648-+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
4649-+ cat conftest.$ac_ext >&5
4650-+ fi
4651-+ rm -rf conftest* conftst*
4652++ ;;
4653
4654++ *)
4655++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
4656++ ;;
4657+ esac
4658+- done
4659+-
4660 - # Clean up.
4661 - rm -f a.out a.exe
4662-+ # Do not use the global_symbol_pipe unless it works.
4663-+ if test "$pipe_works" = yes; then
4664-+ break
4665-+ else
4666-+ lt_cv_sys_global_symbol_pipe=
4667-+ fi
4668-+done
4669-+])
4670-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
4671-+ lt_cv_sys_global_symbol_to_cdecl=
4672-+fi
4673-+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
4674-+ AC_MSG_RESULT(failed)
4675- else
4676+-else
4677 - echo "libtool.m4: error: problem compiling $1 test program"
4678-+ AC_MSG_RESULT(ok)
4679- fi
4680-
4681+-fi
4682+-
4683 -$rm -f confest.$objext
4684-+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
4685-+ [Take the output of nm and produce a listing of raw symbols and C names])
4686-+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
4687-+ [Transform the output of nm in a proper C declaration])
4688-+_LT_DECL([global_symbol_to_c_name_address],
4689-+ [lt_cv_sys_global_symbol_to_c_name_address], [1],
4690-+ [Transform the output of nm in a C name address pair])
4691-+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
4692-+ [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
4693-+ [Transform the output of nm in a C name address pair when lib prefix is needed])
4694-+]) # _LT_CMD_GLOBAL_SYMBOLS
4695-
4696+-
4697 -_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
4698 -if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
4699 - _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
4700 -fi
4701++ else
4702++ # PORTME Check for flag to pass linker flags through the system compiler.
4703++ case $host_os in
4704++ aix*)
4705++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4706++ if test "$host_cpu" = ia64; then
4707++ # AIX 5 now supports IA64 processor
4708++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4709++ else
4710++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
4711++ fi
4712++ ;;
4713
4714 -# PORTME: override above test on systems where it is broken
4715 -ifelse([$1],[CXX],
4716@@ -7285,13 +7944,12 @@
4717 - _LT_AC_TAGVAR(postdep_objects,$1)=
4718 - _LT_AC_TAGVAR(postdeps,$1)=
4719 - ;;
4720-+# _LT_COMPILER_PIC([TAGNAME])
4721-+# ---------------------------
4722-+m4_defun([_LT_COMPILER_PIC],
4723-+[m4_require([_LT_TAG_COMPILER])dnl
4724-+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
4725-+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
4726-+_LT_TAGVAR(lt_prog_compiler_static, $1)=
4727++ mingw* | cygwin* | pw32* | os2* | cegcc*)
4728++ # This hack is so that the source file can tell whether it is being
4729++ # built for inclusion in a dll (and should export symbols for example).
4730++ m4_if([$1], [GCJ], [],
4731++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
4732++ ;;
4733
4734 -linux*)
4735 - case `$CC -V 2>&1 | sed 5q` in
4736@@ -7305,7 +7963,21 @@
4737 - case " $CXX $CXXFLAGS " in
4738 - *" -library=stlport4 "*)
4739 - solaris_use_stlport4=yes
4740-- ;;
4741++ hpux9* | hpux10* | hpux11*)
4742++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4743++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
4744++ # not for PA HP-UX.
4745++ case $host_cpu in
4746++ hppa*64*|ia64*)
4747++ # +Z the default
4748++ ;;
4749++ *)
4750++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
4751++ ;;
4752++ esac
4753++ # Is there a better lt_prog_compiler_static that works with the bundled CC?
4754++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
4755+ ;;
4756 - esac
4757 - if test "$solaris_use_stlport4" != yes; then
4758 - _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
4759@@ -7313,12 +7985,6 @@
4760 - ;;
4761 - esac
4762 - ;;
4763-+AC_MSG_CHECKING([for $compiler option to produce PIC])
4764-+m4_if([$1], [CXX], [
4765-+ # C++ specific cases for pic, static, wl, etc.
4766-+ if test "$GXX" = yes; then
4767-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4768-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
4769
4770 -solaris*)
4771 - case $cc_basename in
4772@@ -7330,16 +7996,13 @@
4773 - case " $CXX $CXXFLAGS " in
4774 - *" -library=stlport4 "*)
4775 - solaris_use_stlport4=yes
4776-+ case $host_os in
4777-+ aix*)
4778-+ # All AIX code is PIC.
4779-+ if test "$host_cpu" = ia64; then
4780-+ # AIX 5 now supports IA64 processor
4781-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4782-+ fi
4783++ irix5* | irix6* | nonstopux*)
4784++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4785++ # PIC (with -KPIC) is the default.
4786++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
4787 ;;
4788 - esac
4789--
4790+
4791 - # Adding this requires a known-good setup of shared libraries for
4792 - # Sun compiler versions before 5.6, else PIC objects from an old
4793 - # archive will be linked into the output, leading to subtle bugs.
4794@@ -7355,730 +8018,6 @@
4795 -*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
4796 -esac
4797 -])# AC_LIBTOOL_POSTDEP_PREDEP
4798--
4799--# AC_LIBTOOL_LANG_F77_CONFIG
4800--# --------------------------
4801--# Ensure that the configuration vars for the C compiler are
4802--# suitably defined. Those variables are subsequently used by
4803--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
4804--AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
4805--AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
4806--[AC_REQUIRE([AC_PROG_F77])
4807--AC_LANG_PUSH(Fortran 77)
4808--
4809--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
4810--_LT_AC_TAGVAR(allow_undefined_flag, $1)=
4811--_LT_AC_TAGVAR(always_export_symbols, $1)=no
4812--_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
4813--_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
4814--_LT_AC_TAGVAR(hardcode_direct, $1)=no
4815--_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
4816--_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
4817--_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
4818--_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
4819--_LT_AC_TAGVAR(hardcode_automatic, $1)=no
4820--_LT_AC_TAGVAR(module_cmds, $1)=
4821--_LT_AC_TAGVAR(module_expsym_cmds, $1)=
4822--_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
4823--_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
4824--_LT_AC_TAGVAR(no_undefined_flag, $1)=
4825--_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
4826--_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
4827--
4828--# Source file extension for f77 test sources.
4829--ac_ext=f
4830--
4831--# Object file extension for compiled f77 test sources.
4832--objext=o
4833--_LT_AC_TAGVAR(objext, $1)=$objext
4834--
4835--# Code to be used in simple compile tests
4836--lt_simple_compile_test_code="\
4837-- subroutine t
4838-- return
4839-- end
4840--"
4841--
4842--# Code to be used in simple link tests
4843--lt_simple_link_test_code="\
4844-- program t
4845-- end
4846--"
4847--
4848--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
4849--_LT_AC_SYS_COMPILER
4850--
4851--# save warnings/boilerplate of simple test code
4852--_LT_COMPILER_BOILERPLATE
4853--_LT_LINKER_BOILERPLATE
4854--
4855--# Allow CC to be a program name with arguments.
4856--lt_save_CC="$CC"
4857--CC=${F77-"f77"}
4858--compiler=$CC
4859--_LT_AC_TAGVAR(compiler, $1)=$CC
4860--_LT_CC_BASENAME([$compiler])
4861--
4862--AC_MSG_CHECKING([if libtool supports shared libraries])
4863--AC_MSG_RESULT([$can_build_shared])
4864--
4865--AC_MSG_CHECKING([whether to build shared libraries])
4866--test "$can_build_shared" = "no" && enable_shared=no
4867--
4868--# On AIX, shared libraries and static libraries use the same namespace, and
4869--# are all built from PIC.
4870--case $host_os in
4871--aix3*)
4872-- test "$enable_shared" = yes && enable_static=no
4873-- if test -n "$RANLIB"; then
4874-- archive_cmds="$archive_cmds~\$RANLIB \$lib"
4875-- postinstall_cmds='$RANLIB $lib'
4876-- fi
4877-- ;;
4878--aix[[4-9]]*)
4879-- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
4880-- test "$enable_shared" = yes && enable_static=no
4881-- fi
4882-- ;;
4883--esac
4884--AC_MSG_RESULT([$enable_shared])
4885--
4886--AC_MSG_CHECKING([whether to build static libraries])
4887--# Make sure either enable_shared or enable_static is yes.
4888--test "$enable_shared" = yes || enable_static=yes
4889--AC_MSG_RESULT([$enable_static])
4890--
4891--_LT_AC_TAGVAR(GCC, $1)="$G77"
4892--_LT_AC_TAGVAR(LD, $1)="$LD"
4893--
4894--AC_LIBTOOL_PROG_COMPILER_PIC($1)
4895--AC_LIBTOOL_PROG_CC_C_O($1)
4896--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
4897--AC_LIBTOOL_PROG_LD_SHLIBS($1)
4898--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
4899--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
4900--
4901--AC_LIBTOOL_CONFIG($1)
4902--
4903--AC_LANG_POP
4904--CC="$lt_save_CC"
4905--])# AC_LIBTOOL_LANG_F77_CONFIG
4906--
4907--
4908--# AC_LIBTOOL_LANG_GCJ_CONFIG
4909--# --------------------------
4910--# Ensure that the configuration vars for the C compiler are
4911--# suitably defined. Those variables are subsequently used by
4912--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
4913--AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
4914--AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
4915--[AC_LANG_SAVE
4916--
4917--# Source file extension for Java test sources.
4918--ac_ext=java
4919--
4920--# Object file extension for compiled Java test sources.
4921--objext=o
4922--_LT_AC_TAGVAR(objext, $1)=$objext
4923--
4924--# Code to be used in simple compile tests
4925--lt_simple_compile_test_code="class foo {}"
4926--
4927--# Code to be used in simple link tests
4928--lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
4929--
4930--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
4931--_LT_AC_SYS_COMPILER
4932--
4933--# save warnings/boilerplate of simple test code
4934--_LT_COMPILER_BOILERPLATE
4935--_LT_LINKER_BOILERPLATE
4936--
4937--# Allow CC to be a program name with arguments.
4938--lt_save_CC="$CC"
4939--CC=${GCJ-"gcj"}
4940--compiler=$CC
4941--_LT_AC_TAGVAR(compiler, $1)=$CC
4942--_LT_CC_BASENAME([$compiler])
4943--
4944--# GCJ did not exist at the time GCC didn't implicitly link libc in.
4945--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
4946--
4947--_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
4948--
4949--AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
4950--AC_LIBTOOL_PROG_COMPILER_PIC($1)
4951--AC_LIBTOOL_PROG_CC_C_O($1)
4952--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
4953--AC_LIBTOOL_PROG_LD_SHLIBS($1)
4954--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
4955--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
4956--
4957--AC_LIBTOOL_CONFIG($1)
4958--
4959--AC_LANG_RESTORE
4960--CC="$lt_save_CC"
4961--])# AC_LIBTOOL_LANG_GCJ_CONFIG
4962--
4963--
4964--# AC_LIBTOOL_LANG_RC_CONFIG
4965--# -------------------------
4966--# Ensure that the configuration vars for the Windows resource compiler are
4967--# suitably defined. Those variables are subsequently used by
4968--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
4969--AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
4970--AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
4971--[AC_LANG_SAVE
4972--
4973--# Source file extension for RC test sources.
4974--ac_ext=rc
4975--
4976--# Object file extension for compiled RC test sources.
4977--objext=o
4978--_LT_AC_TAGVAR(objext, $1)=$objext
4979--
4980--# Code to be used in simple compile tests
4981--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
4982--
4983--# Code to be used in simple link tests
4984--lt_simple_link_test_code="$lt_simple_compile_test_code"
4985--
4986--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
4987--_LT_AC_SYS_COMPILER
4988--
4989--# save warnings/boilerplate of simple test code
4990--_LT_COMPILER_BOILERPLATE
4991--_LT_LINKER_BOILERPLATE
4992--
4993--# Allow CC to be a program name with arguments.
4994--lt_save_CC="$CC"
4995--CC=${RC-"windres"}
4996--compiler=$CC
4997--_LT_AC_TAGVAR(compiler, $1)=$CC
4998--_LT_CC_BASENAME([$compiler])
4999--_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
5000--
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: