Merge lp:~micahg/ubuntu/maverick/libfxscintilla/update-2.11.0 into lp:ubuntu/maverick/libfxscintilla
- Maverick (10.10)
- update-2.11.0
- Merge into maverick
Proposed by
Micah Gersten
Status: | Merged |
---|---|
Merged at revision: | 4 |
Proposed branch: | lp:~micahg/ubuntu/maverick/libfxscintilla/update-2.11.0 |
Merge into: | lp:ubuntu/maverick/libfxscintilla |
Diff against target: | 161311 lines |
To merge this branch: | bzr merge lp:~micahg/ubuntu/maverick/libfxscintilla/update-2.11.0 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Artur Rona (community) | Approve | ||
Review via email: mp+37706@code.launchpad.net |
Commit message
Description of the change
Update to 2.11.0 and many packaging fixes
To post a comment you must log in.
- 13. By Micah Gersten
-
* Clean up changelog
- 14. By Micah Gersten
-
releasing version 2.11.0-0ubuntu1 to ubuntu/maverick
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed file '.cdtproject' |
2 | --- .cdtproject 2005-12-16 10:03:34 +0000 |
3 | +++ .cdtproject 1970-01-01 00:00:00 +0000 |
4 | @@ -1,29 +0,0 @@ |
5 | -<?xml version="1.0" encoding="UTF-8"?> |
6 | -<?eclipse-cdt version="2.0"?> |
7 | - |
8 | -<cdtproject id="org.eclipse.cdt.make.core.make"> |
9 | -<extension point="org.eclipse.cdt.core.BinaryParser" id="org.eclipse.cdt.core.Elf"/> |
10 | -<data> |
11 | - |
12 | - <item id="org.eclipse.cdt.make.core.buildtargets"> |
13 | -<buildTargets> |
14 | -<target name="all" targetID="org.eclipse.cdt.make.MakeTargetBuilder" path=""> |
15 | -<buildCommand>make</buildCommand> |
16 | -<buildTarget>all</buildTarget> |
17 | -<stopOnError>true</stopOnError> |
18 | -<useDefaultCommand>true</useDefaultCommand> |
19 | -</target> |
20 | -<target name="clean" targetID="org.eclipse.cdt.make.MakeTargetBuilder" path=""> |
21 | -<buildCommand>make</buildCommand> |
22 | -<buildTarget>clean</buildTarget> |
23 | -<stopOnError>true</stopOnError> |
24 | -<useDefaultCommand>true</useDefaultCommand> |
25 | -</target> |
26 | -</buildTargets> |
27 | -</item> |
28 | -<item id="org.eclipse.cdt.core.pathentry"> |
29 | -<pathentry kind="src" path=""/> |
30 | -<pathentry kind="out" path=""/> |
31 | -</item> |
32 | -</data> |
33 | -</cdtproject> |
34 | |
35 | === removed file '.project' |
36 | --- .project 2005-12-16 10:03:34 +0000 |
37 | +++ .project 1970-01-01 00:00:00 +0000 |
38 | @@ -1,63 +0,0 @@ |
39 | -<?xml version="1.0" encoding="UTF-8"?> |
40 | -<projectDescription> |
41 | - <name>fxscintilla</name> |
42 | - <comment></comment> |
43 | - <projects> |
44 | - </projects> |
45 | - <buildSpec> |
46 | - <buildCommand> |
47 | - <name>org.eclipse.cdt.make.core.makeBuilder</name> |
48 | - <arguments> |
49 | - <dictionary> |
50 | - <key>org.eclipse.cdt.make.core.autoBuildTarget</key> |
51 | - <value>all</value> |
52 | - </dictionary> |
53 | - <dictionary> |
54 | - <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key> |
55 | - <value>true</value> |
56 | - </dictionary> |
57 | - <dictionary> |
58 | - <key>org.eclipse.cdt.make.core.buildLocation</key> |
59 | - <value></value> |
60 | - </dictionary> |
61 | - <dictionary> |
62 | - <key>org.eclipse.cdt.make.core.stopOnError</key> |
63 | - <value>true</value> |
64 | - </dictionary> |
65 | - <dictionary> |
66 | - <key>org.eclipse.cdt.core.errorOutputParser</key> |
67 | - <value>org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.VCErrorParser;</value> |
68 | - </dictionary> |
69 | - <dictionary> |
70 | - <key>org.eclipse.cdt.make.core.buildCommand</key> |
71 | - <value>make</value> |
72 | - </dictionary> |
73 | - <dictionary> |
74 | - <key>org.eclipse.cdt.make.core.enableFullBuild</key> |
75 | - <value>true</value> |
76 | - </dictionary> |
77 | - <dictionary> |
78 | - <key>org.eclipse.cdt.make.core.enableAutoBuild</key> |
79 | - <value>false</value> |
80 | - </dictionary> |
81 | - <dictionary> |
82 | - <key>org.eclipse.cdt.make.core.incrementalBuildTarget</key> |
83 | - <value>all</value> |
84 | - </dictionary> |
85 | - <dictionary> |
86 | - <key>org.eclipse.cdt.make.core.fullBuildTarget</key> |
87 | - <value>clean all</value> |
88 | - </dictionary> |
89 | - <dictionary> |
90 | - <key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key> |
91 | - <value>true</value> |
92 | - </dictionary> |
93 | - </arguments> |
94 | - </buildCommand> |
95 | - </buildSpec> |
96 | - <natures> |
97 | - <nature>org.eclipse.cdt.core.cnature</nature> |
98 | - <nature>org.eclipse.cdt.core.ccnature</nature> |
99 | - <nature>org.eclipse.cdt.make.core.makeNature</nature> |
100 | - </natures> |
101 | -</projectDescription> |
102 | |
103 | === added file 'COPYRIGHTS' |
104 | --- COPYRIGHTS 1970-01-01 00:00:00 +0000 |
105 | +++ COPYRIGHTS 2010-10-06 17:11:03 +0000 |
106 | @@ -0,0 +1,6 @@ |
107 | +FXScintilla is a derivative work from the Scintilla widget. |
108 | + |
109 | +See the file "COPYING" for the FXScintilla license. |
110 | + |
111 | +See the file "scintilla/License.txt" for the original Scintilla license. |
112 | + |
113 | |
114 | === modified file 'ChangeLog' |
115 | --- ChangeLog 2005-12-16 10:03:34 +0000 |
116 | +++ ChangeLog 2010-10-06 17:11:03 +0000 |
117 | @@ -1,3 +1,48 @@ |
118 | +2010-05-06 |
119 | + * Updated to Scintilla 2.11 (from current Scintilla CVS) |
120 | + |
121 | +2010-01-25 |
122 | + * Updated to Scintilla 2.02 |
123 | + * Fix a bug when middle-click pasting to an empty top line. |
124 | + |
125 | +2009-11-15 |
126 | + * Improved handling of UTF-8 text |
127 | + |
128 | +2009-08-27 Jeff Pohlmeyer <yetanothergeek@gmail.com> |
129 | + * Changed pkg-config --modversion to show package release, |
130 | + instead of library numbering scheme. |
131 | + |
132 | +2009-08-22 Jeff Pohlmeyer <yetanothergeek@gmail.com> |
133 | + * Updated to Scintilla 2.01 |
134 | + * Reworked selection code to work with new Scintilla multiple selections. |
135 | + * Fixed a bug where DND was not properly releasing mouse grab after drop. |
136 | + * Fixed a null-pointer crash in onSelectionRequest() |
137 | + |
138 | +2009-08-13 Jeff Pohlmeyer <yetanothergeek@gmail.com> |
139 | + * Updated to Scintilla 1.79 |
140 | + |
141 | +2009-06-10 Jeff Pohlmeyer <yetanothergeek@gmail.com> |
142 | + * Migrated my local copy into Savannah CVS, see FXSCINTILLA-1_78 branch. |
143 | + * Removed many non-essential and/or unmaintained files from source tree. |
144 | + |
145 | +2009-05-15 Jeff Pohlmeyer <yetanothergeek@gmail.com> |
146 | + * Updated to Scintilla 1.78 |
147 | + * Install also headers from ./scintilla/include/*.h |
148 | + * Implemented calltips, see ScintillaFOX::CreateCallTipWindow() |
149 | + * Added support for Fox 1.7 |
150 | + * Dropped support for Fox 1.5.x and earlier. |
151 | + * Removed custom m4 macros, use pkg-config instead. |
152 | + * Reworked ReceivedSelection() for better middle-click pasting. |
153 | + * Fixed a null-pointer crash in onDNDRequest() |
154 | + * Added GetMonitorRect() function for newer Scintilla. (not tested!) |
155 | + |
156 | +2006-10-19 Gilles Filippini <pini@free.fr> |
157 | + |
158 | + * Updated to Scintilla 1.71 |
159 | + |
160 | + * Added Fox 1.6 support |
161 | + * Dropped support for Fox-1.0 |
162 | + |
163 | 2005-04-22 Gilles Filippini <pini@free.fr> |
164 | |
165 | * Updated to Scintilla 1.63 |
166 | |
167 | === modified file 'INSTALL' |
168 | --- INSTALL 2005-12-16 10:03:34 +0000 |
169 | +++ INSTALL 2010-10-06 17:11:03 +0000 |
170 | @@ -1,9 +1,15 @@ |
171 | Install FOX |
172 | =========== |
173 | |
174 | -FXScintilla depends on the FOX GUI toolkit version 1.0.x, 1.2.x or 1.4.x: |
175 | - |
176 | - http://fox-toolkit.org |
177 | +This version of FXScintilla depends on the FOX GUI toolkit version 1.6.x: |
178 | + |
179 | + http://fox-toolkit.org |
180 | + |
181 | +If for some reason you need to use an older version of Fox, you will also need |
182 | +an earlier version of FXScintilla, this version requires at least Fox-1.6.0. |
183 | + |
184 | +Newer versions of Fox (1.7 or later) are not currently supported. |
185 | + |
186 | |
187 | The instructions below assume you have FOX installed on your box. |
188 | |
189 | @@ -34,15 +40,12 @@ |
190 | IMPORTANT: |
191 | * Before building anything you have to adapt each project's |
192 | compilation and link settings with the correct FOX install path. |
193 | -* Depending on the FOX version you use, you have to: |
194 | +* Depending on the FOX version you use, you may have to: |
195 | - add the following define to the compiler's settings: |
196 | - HAVE_FOX_1_0=1 for Fox 1.0.x |
197 | - HAVE_FOX_1_2=1 for Fox 1.2.x |
198 | - HAVE_FOX_1_4=1 for Fox 1.4.x |
199 | + HAVE_FOX_1_?=1 for Fox 1.?.x |
200 | - adapt the Fox lib name in the linker settings: |
201 | - fox.lib (release) and foxd.lib (debug) for Fox 1.0.x |
202 | - fox-1.2.lib (release) and foxd-1.2.lib (debug) for Fox 1.2.x |
203 | - fox-1.4.lib (release) and foxd-1.4.lib (debug) for Fox 1.4.x |
204 | + fox-1.?.lib (release) and foxd-1.?.lib (debug) for Fox 1.?.x |
205 | +(Substitute ? for the Fox minor version number) |
206 | |
207 | The library files are built into the lib directory: |
208 | |
209 | |
210 | === removed file 'License.txt' |
211 | --- License.txt 2005-12-16 10:03:34 +0000 |
212 | +++ License.txt 1970-01-01 00:00:00 +0000 |
213 | @@ -1,26 +0,0 @@ |
214 | -FXScintilla is a derivated work from the Scintilla widget. |
215 | -See the file COPYING for the FXScintilla license. |
216 | -Below is the original license for Scintilla. |
217 | - |
218 | ------------------------------------------------------------------------- |
219 | - |
220 | -License for Scintilla and SciTE |
221 | - |
222 | -Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org> |
223 | - |
224 | -All Rights Reserved |
225 | - |
226 | -Permission to use, copy, modify, and distribute this software and its |
227 | -documentation for any purpose and without fee is hereby granted, |
228 | -provided that the above copyright notice appear in all copies and that |
229 | -both that copyright notice and this permission notice appear in |
230 | -supporting documentation. |
231 | - |
232 | -NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS |
233 | -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY |
234 | -AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY |
235 | -SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
236 | -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, |
237 | -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER |
238 | -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE |
239 | -OR PERFORMANCE OF THIS SOFTWARE. |
240 | \ No newline at end of file |
241 | |
242 | === modified file 'Makefile.am' |
243 | --- Makefile.am 2005-12-16 10:03:34 +0000 |
244 | +++ Makefile.am 2010-10-06 17:11:03 +0000 |
245 | @@ -1,1 +1,21 @@ |
246 | -SUBDIRS = scintilla include ltdl src tests . |
247 | +ACLOCAL_AMFLAGS = -I m4 |
248 | +SUBDIRS = scintilla include src tests . |
249 | + |
250 | +pkgconfigdir = $(libdir)/pkgconfig |
251 | + |
252 | +pkgconfig_DATA = fxscintilla.pc |
253 | + |
254 | +EXTRA_DIST = \ |
255 | +COPYRIGHTS \ |
256 | +bootstrap.sh \ |
257 | +m4 \ |
258 | +scintilla/License.txt \ |
259 | +scintilla/version.txt \ |
260 | +scintilla/include/Face.py \ |
261 | +scintilla/include/HFacer.py \ |
262 | +scintilla/src/LexGen.py \ |
263 | +scintilla/include/Scintilla.iface \ |
264 | +scintilla/doc/ScintillaDoc.html \ |
265 | +util/Platform.h.patch \ |
266 | +util/cleanup.sh \ |
267 | +util/sci-update.sh |
268 | |
269 | === modified file 'Makefile.in' |
270 | --- Makefile.in 2005-12-16 10:03:34 +0000 |
271 | +++ Makefile.in 2010-10-06 17:11:03 +0000 |
272 | @@ -1,8 +1,9 @@ |
273 | -# Makefile.in generated by automake 1.9.5 from Makefile.am. |
274 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. |
275 | # @configure_input@ |
276 | |
277 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
278 | -# 2003, 2004, 2005 Free Software Foundation, Inc. |
279 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
280 | +# Inc. |
281 | # This Makefile.in is free software; the Free Software Foundation |
282 | # gives unlimited permission to copy and/or distribute it, |
283 | # with or without modifications, as long as this notice is preserved. |
284 | @@ -13,15 +14,13 @@ |
285 | # PARTICULAR PURPOSE. |
286 | |
287 | @SET_MAKE@ |
288 | -srcdir = @srcdir@ |
289 | -top_srcdir = @top_srcdir@ |
290 | + |
291 | VPATH = @srcdir@ |
292 | pkgdatadir = $(datadir)/@PACKAGE@ |
293 | +pkgincludedir = $(includedir)/@PACKAGE@ |
294 | pkglibdir = $(libdir)/@PACKAGE@ |
295 | -pkgincludedir = $(includedir)/@PACKAGE@ |
296 | -top_builddir = . |
297 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ |
298 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
299 | -INSTALL = @INSTALL@ |
300 | install_sh_DATA = $(install_sh) -c -m 644 |
301 | install_sh_PROGRAM = $(install_sh) -c |
302 | install_sh_SCRIPT = $(install_sh) -c |
303 | @@ -35,29 +34,57 @@ |
304 | POST_UNINSTALL = : |
305 | build_triplet = @build@ |
306 | host_triplet = @host@ |
307 | +subdir = . |
308 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
309 | - $(srcdir)/Makefile.in $(top_srcdir)/configure COPYING \ |
310 | - ChangeLog INSTALL config/config.guess config/config.sub \ |
311 | - config/depcomp config/install-sh config/ltmain.sh \ |
312 | - config/missing config/mkinstalldirs |
313 | -subdir = . |
314 | + $(srcdir)/Makefile.in $(srcdir)/fxscintilla.pc.in \ |
315 | + $(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \ |
316 | + config.sub depcomp install-sh ltmain.sh missing |
317 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
318 | -am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \ |
319 | - $(top_srcdir)/config/acx_pthread.m4 $(top_srcdir)/configure.in |
320 | +am__aclocal_m4_deps = $(top_srcdir)/configure.in |
321 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
322 | $(ACLOCAL_M4) |
323 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
324 | - configure.lineno configure.status.lineno |
325 | -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs |
326 | -CONFIG_CLEAN_FILES = |
327 | + configure.lineno config.status.lineno |
328 | +mkinstalldirs = $(install_sh) -d |
329 | +CONFIG_CLEAN_FILES = fxscintilla.pc |
330 | +CONFIG_CLEAN_VPATH_FILES = |
331 | SOURCES = |
332 | DIST_SOURCES = |
333 | RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
334 | html-recursive info-recursive install-data-recursive \ |
335 | - install-exec-recursive install-info-recursive \ |
336 | - install-recursive installcheck-recursive installdirs-recursive \ |
337 | - pdf-recursive ps-recursive uninstall-info-recursive \ |
338 | - uninstall-recursive |
339 | + install-dvi-recursive install-exec-recursive \ |
340 | + install-html-recursive install-info-recursive \ |
341 | + install-pdf-recursive install-ps-recursive install-recursive \ |
342 | + installcheck-recursive installdirs-recursive pdf-recursive \ |
343 | + ps-recursive uninstall-recursive |
344 | +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
345 | +am__vpath_adj = case $$p in \ |
346 | + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
347 | + *) f=$$p;; \ |
348 | + esac; |
349 | +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; |
350 | +am__install_max = 40 |
351 | +am__nobase_strip_setup = \ |
352 | + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` |
353 | +am__nobase_strip = \ |
354 | + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" |
355 | +am__nobase_list = $(am__nobase_strip_setup); \ |
356 | + for p in $$list; do echo "$$p $$p"; done | \ |
357 | + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ |
358 | + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ |
359 | + if (++n[$$2] == $(am__install_max)) \ |
360 | + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ |
361 | + END { for (dir in files) print dir, files[dir] }' |
362 | +am__base_list = \ |
363 | + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
364 | + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
365 | +am__installdirs = "$(DESTDIR)$(pkgconfigdir)" |
366 | +DATA = $(pkgconfig_DATA) |
367 | +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
368 | + distclean-recursive maintainer-clean-recursive |
369 | +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
370 | + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
371 | + distdir dist dist-all distcheck |
372 | ETAGS = etags |
373 | CTAGS = ctags |
374 | DIST_SUBDIRS = $(SUBDIRS) |
375 | @@ -65,16 +92,39 @@ |
376 | distdir = $(PACKAGE)-$(VERSION) |
377 | top_distdir = $(distdir) |
378 | am__remove_distdir = \ |
379 | - { test ! -d $(distdir) \ |
380 | - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ |
381 | - && rm -fr $(distdir); }; } |
382 | + { test ! -d "$(distdir)" \ |
383 | + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
384 | + && rm -fr "$(distdir)"; }; } |
385 | +am__relativize = \ |
386 | + dir0=`pwd`; \ |
387 | + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
388 | + sed_rest='s,^[^/]*/*,,'; \ |
389 | + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ |
390 | + sed_butlast='s,/*[^/]*$$,,'; \ |
391 | + while test -n "$$dir1"; do \ |
392 | + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ |
393 | + if test "$$first" != "."; then \ |
394 | + if test "$$first" = ".."; then \ |
395 | + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ |
396 | + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ |
397 | + else \ |
398 | + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ |
399 | + if test "$$first2" = "$$first"; then \ |
400 | + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ |
401 | + else \ |
402 | + dir2="../$$dir2"; \ |
403 | + fi; \ |
404 | + dir0="$$dir0"/"$$first"; \ |
405 | + fi; \ |
406 | + fi; \ |
407 | + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ |
408 | + done; \ |
409 | + reldir="$$dir2" |
410 | DIST_ARCHIVES = $(distdir).tar.gz |
411 | GZIP_ENV = --best |
412 | distuninstallcheck_listfiles = find . -type f -print |
413 | distcleancheck_listfiles = find . -type f -print |
414 | ACLOCAL = @ACLOCAL@ |
415 | -AMDEP_FALSE = @AMDEP_FALSE@ |
416 | -AMDEP_TRUE = @AMDEP_TRUE@ |
417 | AMTAR = @AMTAR@ |
418 | AR = @AR@ |
419 | AUTOCONF = @AUTOCONF@ |
420 | @@ -84,8 +134,6 @@ |
421 | CC = @CC@ |
422 | CCDEPMODE = @CCDEPMODE@ |
423 | CFLAGS = @CFLAGS@ |
424 | -CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@ |
425 | -CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@ |
426 | CPP = @CPP@ |
427 | CPPFLAGS = @CPPFLAGS@ |
428 | CXX = @CXX@ |
429 | @@ -95,37 +143,28 @@ |
430 | CYGPATH_W = @CYGPATH_W@ |
431 | DEFS = @DEFS@ |
432 | DEPDIR = @DEPDIR@ |
433 | -ECHO = @ECHO@ |
434 | +DSYMUTIL = @DSYMUTIL@ |
435 | +DUMPBIN = @DUMPBIN@ |
436 | ECHO_C = @ECHO_C@ |
437 | ECHO_N = @ECHO_N@ |
438 | ECHO_T = @ECHO_T@ |
439 | EGREP = @EGREP@ |
440 | EXEEXT = @EXEEXT@ |
441 | -F77 = @F77@ |
442 | -FFLAGS = @FFLAGS@ |
443 | -FOX_INCLUDE_DIR = @FOX_INCLUDE_DIR@ |
444 | -FOX_LIB_DIR = @FOX_LIB_DIR@ |
445 | -HAVE_CYGWIN_FALSE = @HAVE_CYGWIN_FALSE@ |
446 | -HAVE_CYGWIN_TRUE = @HAVE_CYGWIN_TRUE@ |
447 | -HAVE_FOX_1_0_FALSE = @HAVE_FOX_1_0_FALSE@ |
448 | -HAVE_FOX_1_0_TRUE = @HAVE_FOX_1_0_TRUE@ |
449 | -HAVE_FOX_1_2_FALSE = @HAVE_FOX_1_2_FALSE@ |
450 | -HAVE_FOX_1_2_TRUE = @HAVE_FOX_1_2_TRUE@ |
451 | -HAVE_FOX_1_4_FALSE = @HAVE_FOX_1_4_FALSE@ |
452 | -HAVE_FOX_1_4_TRUE = @HAVE_FOX_1_4_TRUE@ |
453 | -HAVE_MINGW32_FALSE = @HAVE_MINGW32_FALSE@ |
454 | -HAVE_MINGW32_TRUE = @HAVE_MINGW32_TRUE@ |
455 | +FGREP = @FGREP@ |
456 | +FOX_CFLAGS = @FOX_CFLAGS@ |
457 | +FOX_LIBS = @FOX_LIBS@ |
458 | +GREP = @GREP@ |
459 | +INSTALL = @INSTALL@ |
460 | INSTALL_DATA = @INSTALL_DATA@ |
461 | -INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@ |
462 | -INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@ |
463 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
464 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
465 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
466 | +LD = @LD@ |
467 | LDFLAGS = @LDFLAGS@ |
468 | -LIBADD_DL = @LIBADD_DL@ |
469 | LIBOBJS = @LIBOBJS@ |
470 | LIBS = @LIBS@ |
471 | LIBTOOL = @LIBTOOL@ |
472 | +LIPO = @LIPO@ |
473 | LN_S = @LN_S@ |
474 | LTLIBOBJS = @LTLIBOBJS@ |
475 | LT_FXSCINTILLANOLEXER_AGE = @LT_FXSCINTILLANOLEXER_AGE@ |
476 | @@ -137,35 +176,36 @@ |
477 | MAJOR_VERSION = @MAJOR_VERSION@ |
478 | MAKEINFO = @MAKEINFO@ |
479 | MINOR_VERSION = @MINOR_VERSION@ |
480 | -NOLEXER_FALSE = @NOLEXER_FALSE@ |
481 | -NOLEXER_TRUE = @NOLEXER_TRUE@ |
482 | +MKDIR_P = @MKDIR_P@ |
483 | +NM = @NM@ |
484 | +NMEDIT = @NMEDIT@ |
485 | +OBJDUMP = @OBJDUMP@ |
486 | OBJEXT = @OBJEXT@ |
487 | +OTOOL = @OTOOL@ |
488 | +OTOOL64 = @OTOOL64@ |
489 | PACKAGE = @PACKAGE@ |
490 | PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ |
491 | PACKAGE_NAME = @PACKAGE_NAME@ |
492 | PACKAGE_STRING = @PACKAGE_STRING@ |
493 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
494 | +PACKAGE_URL = @PACKAGE_URL@ |
495 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
496 | PATCH_LEVEL = @PATCH_LEVEL@ |
497 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
498 | -PTHREAD_CC = @PTHREAD_CC@ |
499 | -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ |
500 | -PTHREAD_LIBS = @PTHREAD_LIBS@ |
501 | +PKG_CONFIG = @PKG_CONFIG@ |
502 | RANLIB = @RANLIB@ |
503 | +SED = @SED@ |
504 | SET_MAKE = @SET_MAKE@ |
505 | SHELL = @SHELL@ |
506 | STRIP = @STRIP@ |
507 | VERSION = @VERSION@ |
508 | -ac_ct_AR = @ac_ct_AR@ |
509 | +abs_builddir = @abs_builddir@ |
510 | +abs_srcdir = @abs_srcdir@ |
511 | +abs_top_builddir = @abs_top_builddir@ |
512 | +abs_top_srcdir = @abs_top_srcdir@ |
513 | ac_ct_CC = @ac_ct_CC@ |
514 | ac_ct_CXX = @ac_ct_CXX@ |
515 | -ac_ct_F77 = @ac_ct_F77@ |
516 | -ac_ct_RANLIB = @ac_ct_RANLIB@ |
517 | -ac_ct_STRIP = @ac_ct_STRIP@ |
518 | -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ |
519 | -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ |
520 | -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ |
521 | -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ |
522 | +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
523 | am__include = @am__include@ |
524 | am__leading_dot = @am__leading_dot@ |
525 | am__quote = @am__quote@ |
526 | @@ -177,29 +217,60 @@ |
527 | build_cpu = @build_cpu@ |
528 | build_os = @build_os@ |
529 | build_vendor = @build_vendor@ |
530 | +builddir = @builddir@ |
531 | datadir = @datadir@ |
532 | +datarootdir = @datarootdir@ |
533 | +docdir = @docdir@ |
534 | +dvidir = @dvidir@ |
535 | exec_prefix = @exec_prefix@ |
536 | host = @host@ |
537 | host_alias = @host_alias@ |
538 | host_cpu = @host_cpu@ |
539 | host_os = @host_os@ |
540 | host_vendor = @host_vendor@ |
541 | +htmldir = @htmldir@ |
542 | includedir = @includedir@ |
543 | infodir = @infodir@ |
544 | install_sh = @install_sh@ |
545 | libdir = @libdir@ |
546 | libexecdir = @libexecdir@ |
547 | +localedir = @localedir@ |
548 | localstatedir = @localstatedir@ |
549 | +lt_ECHO = @lt_ECHO@ |
550 | mandir = @mandir@ |
551 | mkdir_p = @mkdir_p@ |
552 | oldincludedir = @oldincludedir@ |
553 | +pdfdir = @pdfdir@ |
554 | prefix = @prefix@ |
555 | program_transform_name = @program_transform_name@ |
556 | +psdir = @psdir@ |
557 | sbindir = @sbindir@ |
558 | sharedstatedir = @sharedstatedir@ |
559 | +srcdir = @srcdir@ |
560 | sysconfdir = @sysconfdir@ |
561 | target_alias = @target_alias@ |
562 | -SUBDIRS = scintilla include ltdl src tests . |
563 | +top_build_prefix = @top_build_prefix@ |
564 | +top_builddir = @top_builddir@ |
565 | +top_srcdir = @top_srcdir@ |
566 | +ACLOCAL_AMFLAGS = -I m4 |
567 | +SUBDIRS = scintilla include src tests . |
568 | +pkgconfigdir = $(libdir)/pkgconfig |
569 | +pkgconfig_DATA = fxscintilla.pc |
570 | +EXTRA_DIST = \ |
571 | +COPYRIGHTS \ |
572 | +bootstrap.sh \ |
573 | +m4 \ |
574 | +scintilla/License.txt \ |
575 | +scintilla/version.txt \ |
576 | +scintilla/include/Face.py \ |
577 | +scintilla/include/HFacer.py \ |
578 | +scintilla/src/LexGen.py \ |
579 | +scintilla/include/Scintilla.iface \ |
580 | +scintilla/doc/ScintillaDoc.html \ |
581 | +util/Platform.h.patch \ |
582 | +util/cleanup.sh \ |
583 | +util/sci-update.sh |
584 | + |
585 | all: all-recursive |
586 | |
587 | .SUFFIXES: |
588 | @@ -209,15 +280,15 @@ |
589 | @for dep in $?; do \ |
590 | case '$(am__configure_deps)' in \ |
591 | *$$dep*) \ |
592 | - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ |
593 | - cd $(srcdir) && $(AUTOMAKE) --foreign \ |
594 | + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ |
595 | + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ |
596 | && exit 0; \ |
597 | exit 1;; \ |
598 | esac; \ |
599 | done; \ |
600 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ |
601 | - cd $(top_srcdir) && \ |
602 | - $(AUTOMAKE) --foreign Makefile |
603 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ |
604 | + $(am__cd) $(top_srcdir) && \ |
605 | + $(AUTOMAKE) --foreign Makefile |
606 | .PRECIOUS: Makefile |
607 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
608 | @case '$?' in \ |
609 | @@ -233,9 +304,12 @@ |
610 | $(SHELL) ./config.status --recheck |
611 | |
612 | $(top_srcdir)/configure: $(am__configure_deps) |
613 | - cd $(srcdir) && $(AUTOCONF) |
614 | + $(am__cd) $(srcdir) && $(AUTOCONF) |
615 | $(ACLOCAL_M4): $(am__aclocal_m4_deps) |
616 | - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
617 | + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
618 | +$(am__aclocal_m4_deps): |
619 | +fxscintilla.pc: $(top_builddir)/config.status $(srcdir)/fxscintilla.pc.in |
620 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
621 | |
622 | mostlyclean-libtool: |
623 | -rm -f *.lo |
624 | @@ -244,8 +318,27 @@ |
625 | -rm -rf .libs _libs |
626 | |
627 | distclean-libtool: |
628 | - -rm -f libtool |
629 | -uninstall-info-am: |
630 | + -rm -f libtool config.lt |
631 | +install-pkgconfigDATA: $(pkgconfig_DATA) |
632 | + @$(NORMAL_INSTALL) |
633 | + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" |
634 | + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
635 | + for p in $$list; do \ |
636 | + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
637 | + echo "$$d$$p"; \ |
638 | + done | $(am__base_list) | \ |
639 | + while read files; do \ |
640 | + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ |
641 | + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ |
642 | + done |
643 | + |
644 | +uninstall-pkgconfigDATA: |
645 | + @$(NORMAL_UNINSTALL) |
646 | + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
647 | + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
648 | + test -n "$$files" || exit 0; \ |
649 | + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ |
650 | + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files |
651 | |
652 | # This directory's subdirectories are mostly independent; you can cd |
653 | # into them and run `make' without going through this Makefile. |
654 | @@ -254,7 +347,7 @@ |
655 | # (which will cause the Makefiles to be regenerated when you run `make'); |
656 | # (2) otherwise, pass the desired values on the `make' command line. |
657 | $(RECURSIVE_TARGETS): |
658 | - @failcom='exit 1'; \ |
659 | + @fail= failcom='exit 1'; \ |
660 | for f in x $$MAKEFLAGS; do \ |
661 | case $$f in \ |
662 | *=* | --[!k]*);; \ |
663 | @@ -271,16 +364,15 @@ |
664 | else \ |
665 | local_target="$$target"; \ |
666 | fi; \ |
667 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
668 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
669 | || eval $$failcom; \ |
670 | done; \ |
671 | if test "$$dot_seen" = "no"; then \ |
672 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
673 | fi; test -z "$$fail" |
674 | |
675 | -mostlyclean-recursive clean-recursive distclean-recursive \ |
676 | -maintainer-clean-recursive: |
677 | - @failcom='exit 1'; \ |
678 | +$(RECURSIVE_CLEAN_TARGETS): |
679 | + @fail= failcom='exit 1'; \ |
680 | for f in x $$MAKEFLAGS; do \ |
681 | case $$f in \ |
682 | *=* | --[!k]*);; \ |
683 | @@ -306,16 +398,16 @@ |
684 | else \ |
685 | local_target="$$target"; \ |
686 | fi; \ |
687 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
688 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
689 | || eval $$failcom; \ |
690 | done && test -z "$$fail" |
691 | tags-recursive: |
692 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
693 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
694 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
695 | done |
696 | ctags-recursive: |
697 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
698 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
699 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
700 | done |
701 | |
702 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
703 | @@ -323,14 +415,14 @@ |
704 | unique=`for i in $$list; do \ |
705 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
706 | done | \ |
707 | - $(AWK) ' { files[$$0] = 1; } \ |
708 | - END { for (i in files) print i; }'`; \ |
709 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
710 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
711 | mkid -fID $$unique |
712 | tags: TAGS |
713 | |
714 | TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
715 | $(TAGS_FILES) $(LISP) |
716 | - tags=; \ |
717 | + set x; \ |
718 | here=`pwd`; \ |
719 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
720 | include_option=--etags-include; \ |
721 | @@ -342,93 +434,114 @@ |
722 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
723 | if test "$$subdir" = .; then :; else \ |
724 | test ! -f $$subdir/TAGS || \ |
725 | - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ |
726 | + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
727 | fi; \ |
728 | done; \ |
729 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
730 | unique=`for i in $$list; do \ |
731 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
732 | done | \ |
733 | - $(AWK) ' { files[$$0] = 1; } \ |
734 | - END { for (i in files) print i; }'`; \ |
735 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ |
736 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
737 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
738 | + shift; \ |
739 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
740 | test -n "$$unique" || unique=$$empty_fix; \ |
741 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
742 | - $$tags $$unique; \ |
743 | + if test $$# -gt 0; then \ |
744 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
745 | + "$$@" $$unique; \ |
746 | + else \ |
747 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
748 | + $$unique; \ |
749 | + fi; \ |
750 | fi |
751 | ctags: CTAGS |
752 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
753 | $(TAGS_FILES) $(LISP) |
754 | - tags=; \ |
755 | - here=`pwd`; \ |
756 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
757 | unique=`for i in $$list; do \ |
758 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
759 | done | \ |
760 | - $(AWK) ' { files[$$0] = 1; } \ |
761 | - END { for (i in files) print i; }'`; \ |
762 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ |
763 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
764 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
765 | + test -z "$(CTAGS_ARGS)$$unique" \ |
766 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
767 | - $$tags $$unique |
768 | + $$unique |
769 | |
770 | GTAGS: |
771 | here=`$(am__cd) $(top_builddir) && pwd` \ |
772 | - && cd $(top_srcdir) \ |
773 | - && gtags -i $(GTAGS_ARGS) $$here |
774 | + && $(am__cd) $(top_srcdir) \ |
775 | + && gtags -i $(GTAGS_ARGS) "$$here" |
776 | |
777 | distclean-tags: |
778 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
779 | |
780 | distdir: $(DISTFILES) |
781 | $(am__remove_distdir) |
782 | - mkdir $(distdir) |
783 | - $(mkdir_p) $(distdir)/config $(distdir)/src |
784 | - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ |
785 | - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ |
786 | - list='$(DISTFILES)'; for file in $$list; do \ |
787 | - case $$file in \ |
788 | - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ |
789 | - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ |
790 | - esac; \ |
791 | + test -d "$(distdir)" || mkdir "$(distdir)" |
792 | + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
793 | + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
794 | + list='$(DISTFILES)'; \ |
795 | + dist_files=`for file in $$list; do echo $$file; done | \ |
796 | + sed -e "s|^$$srcdirstrip/||;t" \ |
797 | + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ |
798 | + case $$dist_files in \ |
799 | + */*) $(MKDIR_P) `echo "$$dist_files" | \ |
800 | + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ |
801 | + sort -u` ;; \ |
802 | + esac; \ |
803 | + for file in $$dist_files; do \ |
804 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
805 | - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ |
806 | - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ |
807 | - dir="/$$dir"; \ |
808 | - $(mkdir_p) "$(distdir)$$dir"; \ |
809 | - else \ |
810 | - dir=''; \ |
811 | - fi; \ |
812 | if test -d $$d/$$file; then \ |
813 | + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ |
814 | + if test -d "$(distdir)/$$file"; then \ |
815 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
816 | + fi; \ |
817 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ |
818 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ |
819 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ |
820 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
821 | fi; \ |
822 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ |
823 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ |
824 | else \ |
825 | - test -f $(distdir)/$$file \ |
826 | - || cp -p $$d/$$file $(distdir)/$$file \ |
827 | + test -f "$(distdir)/$$file" \ |
828 | + || cp -p $$d/$$file "$(distdir)/$$file" \ |
829 | || exit 1; \ |
830 | fi; \ |
831 | done |
832 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
833 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
834 | if test "$$subdir" = .; then :; else \ |
835 | test -d "$(distdir)/$$subdir" \ |
836 | - || $(mkdir_p) "$(distdir)/$$subdir" \ |
837 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
838 | || exit 1; \ |
839 | - distdir=`$(am__cd) $(distdir) && pwd`; \ |
840 | - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ |
841 | - (cd $$subdir && \ |
842 | + fi; \ |
843 | + done |
844 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
845 | + if test "$$subdir" = .; then :; else \ |
846 | + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
847 | + $(am__relativize); \ |
848 | + new_distdir=$$reldir; \ |
849 | + dir1=$$subdir; dir2="$(top_distdir)"; \ |
850 | + $(am__relativize); \ |
851 | + new_top_distdir=$$reldir; \ |
852 | + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ |
853 | + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ |
854 | + ($(am__cd) $$subdir && \ |
855 | $(MAKE) $(AM_MAKEFLAGS) \ |
856 | - top_distdir="$$top_distdir" \ |
857 | - distdir="$$distdir/$$subdir" \ |
858 | + top_distdir="$$new_top_distdir" \ |
859 | + distdir="$$new_distdir" \ |
860 | + am__remove_distdir=: \ |
861 | + am__skip_length_check=: \ |
862 | + am__skip_mode_fix=: \ |
863 | distdir) \ |
864 | || exit 1; \ |
865 | fi; \ |
866 | done |
867 | - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ |
868 | + -test -n "$(am__skip_mode_fix)" \ |
869 | + || find "$(distdir)" -type d ! -perm -755 \ |
870 | + -exec chmod u+rwx,go+rx {} \; -o \ |
871 | ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ |
872 | ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ |
873 | - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ |
874 | - || chmod -R a+r $(distdir) |
875 | + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ |
876 | + || chmod -R a+r "$(distdir)" |
877 | dist-gzip: distdir |
878 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
879 | $(am__remove_distdir) |
880 | @@ -437,6 +550,14 @@ |
881 | tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
882 | $(am__remove_distdir) |
883 | |
884 | +dist-lzma: distdir |
885 | + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
886 | + $(am__remove_distdir) |
887 | + |
888 | +dist-xz: distdir |
889 | + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
890 | + $(am__remove_distdir) |
891 | + |
892 | dist-tarZ: distdir |
893 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
894 | $(am__remove_distdir) |
895 | @@ -460,13 +581,17 @@ |
896 | distcheck: dist |
897 | case '$(DIST_ARCHIVES)' in \ |
898 | *.tar.gz*) \ |
899 | - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ |
900 | + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
901 | *.tar.bz2*) \ |
902 | - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ |
903 | + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
904 | + *.tar.lzma*) \ |
905 | + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
906 | + *.tar.xz*) \ |
907 | + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
908 | *.tar.Z*) \ |
909 | uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ |
910 | *.shar.gz*) \ |
911 | - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ |
912 | + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ |
913 | *.zip*) \ |
914 | unzip $(distdir).zip ;;\ |
915 | esac |
916 | @@ -474,9 +599,11 @@ |
917 | mkdir $(distdir)/_build |
918 | mkdir $(distdir)/_inst |
919 | chmod a-w $(distdir) |
920 | + test -d $(distdir)/_build || exit 0; \ |
921 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
922 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
923 | - && cd $(distdir)/_build \ |
924 | + && am__cwd=`pwd` \ |
925 | + && $(am__cd) $(distdir)/_build \ |
926 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
927 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
928 | && $(MAKE) $(AM_MAKEFLAGS) \ |
929 | @@ -498,13 +625,15 @@ |
930 | && rm -rf "$$dc_destdir" \ |
931 | && $(MAKE) $(AM_MAKEFLAGS) dist \ |
932 | && rm -rf $(DIST_ARCHIVES) \ |
933 | - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck |
934 | + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ |
935 | + && cd "$$am__cwd" \ |
936 | + || exit 1 |
937 | $(am__remove_distdir) |
938 | @(echo "$(distdir) archives ready for distribution: "; \ |
939 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
940 | - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' |
941 | + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
942 | distuninstallcheck: |
943 | - @cd $(distuninstallcheck_dir) \ |
944 | + @$(am__cd) '$(distuninstallcheck_dir)' \ |
945 | && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
946 | || { echo "ERROR: files left after uninstall:" ; \ |
947 | if test -n "$(DESTDIR)"; then \ |
948 | @@ -523,9 +652,12 @@ |
949 | exit 1; } >&2 |
950 | check-am: all-am |
951 | check: check-recursive |
952 | -all-am: Makefile |
953 | +all-am: Makefile $(DATA) |
954 | installdirs: installdirs-recursive |
955 | installdirs-am: |
956 | + for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ |
957 | + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
958 | + done |
959 | install: install-recursive |
960 | install-exec: install-exec-recursive |
961 | install-data: install-data-recursive |
962 | @@ -546,6 +678,7 @@ |
963 | |
964 | distclean-generic: |
965 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
966 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) |
967 | |
968 | maintainer-clean-generic: |
969 | @echo "This command is intended for maintainers to use" |
970 | @@ -566,18 +699,38 @@ |
971 | |
972 | html: html-recursive |
973 | |
974 | +html-am: |
975 | + |
976 | info: info-recursive |
977 | |
978 | info-am: |
979 | |
980 | -install-data-am: |
981 | +install-data-am: install-pkgconfigDATA |
982 | + |
983 | +install-dvi: install-dvi-recursive |
984 | + |
985 | +install-dvi-am: |
986 | |
987 | install-exec-am: |
988 | |
989 | +install-html: install-html-recursive |
990 | + |
991 | +install-html-am: |
992 | + |
993 | install-info: install-info-recursive |
994 | |
995 | +install-info-am: |
996 | + |
997 | install-man: |
998 | |
999 | +install-pdf: install-pdf-recursive |
1000 | + |
1001 | +install-pdf-am: |
1002 | + |
1003 | +install-ps: install-ps-recursive |
1004 | + |
1005 | +install-ps-am: |
1006 | + |
1007 | installcheck-am: |
1008 | |
1009 | maintainer-clean: maintainer-clean-recursive |
1010 | @@ -598,24 +751,28 @@ |
1011 | |
1012 | ps-am: |
1013 | |
1014 | -uninstall-am: uninstall-info-am |
1015 | - |
1016 | -uninstall-info: uninstall-info-recursive |
1017 | - |
1018 | -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ |
1019 | - check-am clean clean-generic clean-libtool clean-recursive \ |
1020 | - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ |
1021 | - dist-shar dist-tarZ dist-zip distcheck distclean \ |
1022 | - distclean-generic distclean-libtool distclean-recursive \ |
1023 | +uninstall-am: uninstall-pkgconfigDATA |
1024 | + |
1025 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ |
1026 | + install-am install-strip tags-recursive |
1027 | + |
1028 | +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
1029 | + all all-am am--refresh check check-am clean clean-generic \ |
1030 | + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
1031 | + dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ |
1032 | + distcheck distclean distclean-generic distclean-libtool \ |
1033 | distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
1034 | dvi-am html html-am info info-am install install-am \ |
1035 | - install-data install-data-am install-exec install-exec-am \ |
1036 | - install-info install-info-am install-man install-strip \ |
1037 | - installcheck installcheck-am installdirs installdirs-am \ |
1038 | - maintainer-clean maintainer-clean-generic \ |
1039 | - maintainer-clean-recursive mostlyclean mostlyclean-generic \ |
1040 | - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ |
1041 | - tags tags-recursive uninstall uninstall-am uninstall-info-am |
1042 | + install-data install-data-am install-dvi install-dvi-am \ |
1043 | + install-exec install-exec-am install-html install-html-am \ |
1044 | + install-info install-info-am install-man install-pdf \ |
1045 | + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ |
1046 | + install-strip installcheck installcheck-am installdirs \ |
1047 | + installdirs-am maintainer-clean maintainer-clean-generic \ |
1048 | + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ |
1049 | + ps ps-am tags tags-recursive uninstall uninstall-am \ |
1050 | + uninstall-pkgconfigDATA |
1051 | + |
1052 | |
1053 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
1054 | # Otherwise a system limit (for SysV at least) may be exceeded. |
1055 | |
1056 | === modified file 'aclocal.m4' |
1057 | --- aclocal.m4 2005-12-16 10:03:34 +0000 |
1058 | +++ aclocal.m4 2010-10-06 17:11:03 +0000 |
1059 | @@ -1,7 +1,7 @@ |
1060 | -# generated automatically by aclocal 1.9.5 -*- Autoconf -*- |
1061 | +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- |
1062 | |
1063 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
1064 | -# 2005 Free Software Foundation, Inc. |
1065 | +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
1066 | # This file is free software; the Free Software Foundation |
1067 | # gives unlimited permission to copy and/or distribute it, |
1068 | # with or without modifications, as long as this notice is preserved. |
1069 | @@ -11,104 +11,196 @@ |
1070 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1071 | # PARTICULAR PURPOSE. |
1072 | |
1073 | +m4_ifndef([AC_AUTOCONF_VERSION], |
1074 | + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1075 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, |
1076 | +[m4_warning([this file was generated for autoconf 2.65. |
1077 | +You have another version of autoconf. It may work, but is not guaranteed to. |
1078 | +If you have problems, you may need to regenerate the build system entirely. |
1079 | +To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
1080 | + |
1081 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
1082 | - |
1083 | -# serial 47 AC_PROG_LIBTOOL |
1084 | -# Debian $Rev: 214 $ |
1085 | - |
1086 | - |
1087 | -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) |
1088 | -# ----------------------------------------------------------- |
1089 | -# If this macro is not defined by Autoconf, define it here. |
1090 | -m4_ifdef([AC_PROVIDE_IFELSE], |
1091 | - [], |
1092 | - [m4_define([AC_PROVIDE_IFELSE], |
1093 | - [m4_ifdef([AC_PROVIDE_$1], |
1094 | - [$2], [$3])])]) |
1095 | - |
1096 | - |
1097 | -# AC_PROG_LIBTOOL |
1098 | -# --------------- |
1099 | -AC_DEFUN([AC_PROG_LIBTOOL], |
1100 | -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl |
1101 | -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX |
1102 | -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. |
1103 | - AC_PROVIDE_IFELSE([AC_PROG_CXX], |
1104 | - [AC_LIBTOOL_CXX], |
1105 | - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX |
1106 | - ])]) |
1107 | -dnl And a similar setup for Fortran 77 support |
1108 | - AC_PROVIDE_IFELSE([AC_PROG_F77], |
1109 | - [AC_LIBTOOL_F77], |
1110 | - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 |
1111 | -])]) |
1112 | - |
1113 | -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. |
1114 | -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run |
1115 | -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. |
1116 | - AC_PROVIDE_IFELSE([AC_PROG_GCJ], |
1117 | - [AC_LIBTOOL_GCJ], |
1118 | - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], |
1119 | - [AC_LIBTOOL_GCJ], |
1120 | - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], |
1121 | - [AC_LIBTOOL_GCJ], |
1122 | - [ifdef([AC_PROG_GCJ], |
1123 | - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) |
1124 | - ifdef([A][M_PROG_GCJ], |
1125 | - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) |
1126 | - ifdef([LT_AC_PROG_GCJ], |
1127 | - [define([LT_AC_PROG_GCJ], |
1128 | - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) |
1129 | -])])# AC_PROG_LIBTOOL |
1130 | - |
1131 | - |
1132 | -# _AC_PROG_LIBTOOL |
1133 | -# ---------------- |
1134 | -AC_DEFUN([_AC_PROG_LIBTOOL], |
1135 | -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl |
1136 | -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl |
1137 | -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl |
1138 | -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl |
1139 | +# |
1140 | +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
1141 | +# 2006, 2007, 2008 Free Software Foundation, Inc. |
1142 | +# Written by Gordon Matzigkeit, 1996 |
1143 | +# |
1144 | +# This file is free software; the Free Software Foundation gives |
1145 | +# unlimited permission to copy and/or distribute it, with or without |
1146 | +# modifications, as long as this notice is preserved. |
1147 | + |
1148 | +m4_define([_LT_COPYING], [dnl |
1149 | +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
1150 | +# 2006, 2007, 2008 Free Software Foundation, Inc. |
1151 | +# Written by Gordon Matzigkeit, 1996 |
1152 | +# |
1153 | +# This file is part of GNU Libtool. |
1154 | +# |
1155 | +# GNU Libtool is free software; you can redistribute it and/or |
1156 | +# modify it under the terms of the GNU General Public License as |
1157 | +# published by the Free Software Foundation; either version 2 of |
1158 | +# the License, or (at your option) any later version. |
1159 | +# |
1160 | +# As a special exception to the GNU General Public License, |
1161 | +# if you distribute this file as part of a program or library that |
1162 | +# is built using GNU Libtool, you may include this file under the |
1163 | +# same distribution terms that you use for the rest of that program. |
1164 | +# |
1165 | +# GNU Libtool is distributed in the hope that it will be useful, |
1166 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1167 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1168 | +# GNU General Public License for more details. |
1169 | +# |
1170 | +# You should have received a copy of the GNU General Public License |
1171 | +# along with GNU Libtool; see the file COPYING. If not, a copy |
1172 | +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or |
1173 | +# obtained by writing to the Free Software Foundation, Inc., |
1174 | +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
1175 | +]) |
1176 | + |
1177 | +# serial 56 LT_INIT |
1178 | + |
1179 | + |
1180 | +# LT_PREREQ(VERSION) |
1181 | +# ------------------ |
1182 | +# Complain and exit if this libtool version is less that VERSION. |
1183 | +m4_defun([LT_PREREQ], |
1184 | +[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, |
1185 | + [m4_default([$3], |
1186 | + [m4_fatal([Libtool version $1 or higher is required], |
1187 | + 63)])], |
1188 | + [$2])]) |
1189 | + |
1190 | + |
1191 | +# _LT_CHECK_BUILDDIR |
1192 | +# ------------------ |
1193 | +# Complain if the absolute build directory name contains unusual characters |
1194 | +m4_defun([_LT_CHECK_BUILDDIR], |
1195 | +[case `pwd` in |
1196 | + *\ * | *\ *) |
1197 | + AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; |
1198 | +esac |
1199 | +]) |
1200 | + |
1201 | + |
1202 | +# LT_INIT([OPTIONS]) |
1203 | +# ------------------ |
1204 | +AC_DEFUN([LT_INIT], |
1205 | +[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT |
1206 | +AC_BEFORE([$0], [LT_LANG])dnl |
1207 | +AC_BEFORE([$0], [LT_OUTPUT])dnl |
1208 | +AC_BEFORE([$0], [LTDL_INIT])dnl |
1209 | +m4_require([_LT_CHECK_BUILDDIR])dnl |
1210 | + |
1211 | +dnl Autoconf doesn't catch unexpanded LT_ macros by default: |
1212 | +m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl |
1213 | +m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl |
1214 | +dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 |
1215 | +dnl unless we require an AC_DEFUNed macro: |
1216 | +AC_REQUIRE([LTOPTIONS_VERSION])dnl |
1217 | +AC_REQUIRE([LTSUGAR_VERSION])dnl |
1218 | +AC_REQUIRE([LTVERSION_VERSION])dnl |
1219 | +AC_REQUIRE([LTOBSOLETE_VERSION])dnl |
1220 | +m4_require([_LT_PROG_LTMAIN])dnl |
1221 | + |
1222 | +dnl Parse OPTIONS |
1223 | +_LT_SET_OPTIONS([$0], [$1]) |
1224 | |
1225 | # This can be used to rebuild libtool when needed |
1226 | -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" |
1227 | +LIBTOOL_DEPS="$ltmain" |
1228 | |
1229 | # Always use our own libtool. |
1230 | LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
1231 | AC_SUBST(LIBTOOL)dnl |
1232 | |
1233 | -# Prevent multiple expansion |
1234 | -define([AC_PROG_LIBTOOL], []) |
1235 | -])# _AC_PROG_LIBTOOL |
1236 | - |
1237 | - |
1238 | -# AC_LIBTOOL_SETUP |
1239 | -# ---------------- |
1240 | -AC_DEFUN([AC_LIBTOOL_SETUP], |
1241 | -[AC_PREREQ(2.50)dnl |
1242 | -AC_REQUIRE([AC_ENABLE_SHARED])dnl |
1243 | -AC_REQUIRE([AC_ENABLE_STATIC])dnl |
1244 | -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl |
1245 | -AC_REQUIRE([AC_CANONICAL_HOST])dnl |
1246 | +_LT_SETUP |
1247 | + |
1248 | +# Only expand once: |
1249 | +m4_define([LT_INIT]) |
1250 | +])# LT_INIT |
1251 | + |
1252 | +# Old names: |
1253 | +AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) |
1254 | +AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) |
1255 | +dnl aclocal-1.4 backwards compatibility: |
1256 | +dnl AC_DEFUN([AC_PROG_LIBTOOL], []) |
1257 | +dnl AC_DEFUN([AM_PROG_LIBTOOL], []) |
1258 | + |
1259 | + |
1260 | +# _LT_CC_BASENAME(CC) |
1261 | +# ------------------- |
1262 | +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. |
1263 | +m4_defun([_LT_CC_BASENAME], |
1264 | +[for cc_temp in $1""; do |
1265 | + case $cc_temp in |
1266 | + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; |
1267 | + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; |
1268 | + \-*) ;; |
1269 | + *) break;; |
1270 | + esac |
1271 | +done |
1272 | +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
1273 | +]) |
1274 | + |
1275 | + |
1276 | +# _LT_FILEUTILS_DEFAULTS |
1277 | +# ---------------------- |
1278 | +# It is okay to use these file commands and assume they have been set |
1279 | +# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. |
1280 | +m4_defun([_LT_FILEUTILS_DEFAULTS], |
1281 | +[: ${CP="cp -f"} |
1282 | +: ${MV="mv -f"} |
1283 | +: ${RM="rm -f"} |
1284 | +])# _LT_FILEUTILS_DEFAULTS |
1285 | + |
1286 | + |
1287 | +# _LT_SETUP |
1288 | +# --------- |
1289 | +m4_defun([_LT_SETUP], |
1290 | +[AC_REQUIRE([AC_CANONICAL_HOST])dnl |
1291 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
1292 | +_LT_DECL([], [host_alias], [0], [The host system])dnl |
1293 | +_LT_DECL([], [host], [0])dnl |
1294 | +_LT_DECL([], [host_os], [0])dnl |
1295 | +dnl |
1296 | +_LT_DECL([], [build_alias], [0], [The build system])dnl |
1297 | +_LT_DECL([], [build], [0])dnl |
1298 | +_LT_DECL([], [build_os], [0])dnl |
1299 | +dnl |
1300 | AC_REQUIRE([AC_PROG_CC])dnl |
1301 | -AC_REQUIRE([AC_PROG_LD])dnl |
1302 | -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl |
1303 | -AC_REQUIRE([AC_PROG_NM])dnl |
1304 | - |
1305 | +AC_REQUIRE([LT_PATH_LD])dnl |
1306 | +AC_REQUIRE([LT_PATH_NM])dnl |
1307 | +dnl |
1308 | AC_REQUIRE([AC_PROG_LN_S])dnl |
1309 | -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl |
1310 | -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! |
1311 | -AC_REQUIRE([AC_OBJEXT])dnl |
1312 | -AC_REQUIRE([AC_EXEEXT])dnl |
1313 | -dnl |
1314 | - |
1315 | -AC_LIBTOOL_SYS_MAX_CMD_LEN |
1316 | -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE |
1317 | -AC_LIBTOOL_OBJDIR |
1318 | - |
1319 | -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl |
1320 | -_LT_AC_PROG_ECHO_BACKSLASH |
1321 | +test -z "$LN_S" && LN_S="ln -s" |
1322 | +_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl |
1323 | +dnl |
1324 | +AC_REQUIRE([LT_CMD_MAX_LEN])dnl |
1325 | +_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl |
1326 | +_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl |
1327 | +dnl |
1328 | +m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
1329 | +m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
1330 | +m4_require([_LT_CMD_RELOAD])dnl |
1331 | +m4_require([_LT_CHECK_MAGIC_METHOD])dnl |
1332 | +m4_require([_LT_CMD_OLD_ARCHIVE])dnl |
1333 | +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl |
1334 | + |
1335 | +_LT_CONFIG_LIBTOOL_INIT([ |
1336 | +# See if we are running on zsh, and set the options which allow our |
1337 | +# commands through without removal of \ escapes INIT. |
1338 | +if test -n "\${ZSH_VERSION+set}" ; then |
1339 | + setopt NO_GLOB_SUBST |
1340 | +fi |
1341 | +]) |
1342 | +if test -n "${ZSH_VERSION+set}" ; then |
1343 | + setopt NO_GLOB_SUBST |
1344 | +fi |
1345 | + |
1346 | +_LT_CHECK_OBJDIR |
1347 | + |
1348 | +m4_require([_LT_TAG_COMPILER])dnl |
1349 | +_LT_PROG_ECHO_BACKSLASH |
1350 | |
1351 | case $host_os in |
1352 | aix3*) |
1353 | @@ -124,174 +216,879 @@ |
1354 | |
1355 | # Sed substitution that helps us do robust quoting. It backslashifies |
1356 | # metacharacters that are still active within double-quoted strings. |
1357 | -Xsed='sed -e s/^X//' |
1358 | -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] |
1359 | +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' |
1360 | |
1361 | # Same as above, but do not quote variable references. |
1362 | -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] |
1363 | +double_quote_subst='s/\([["`\\]]\)/\\\1/g' |
1364 | |
1365 | # Sed substitution to delay expansion of an escaped shell variable in a |
1366 | # double_quote_subst'ed string. |
1367 | delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
1368 | |
1369 | +# Sed substitution to delay expansion of an escaped single quote. |
1370 | +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
1371 | + |
1372 | # Sed substitution to avoid accidental globbing in evaled expressions |
1373 | no_glob_subst='s/\*/\\\*/g' |
1374 | |
1375 | -# Constants: |
1376 | -rm="rm -f" |
1377 | - |
1378 | # Global variables: |
1379 | -default_ofile=libtool |
1380 | +ofile=libtool |
1381 | can_build_shared=yes |
1382 | |
1383 | -# All known linkers require a `.a' archive for static linking (except M$VC, |
1384 | +# All known linkers require a `.a' archive for static linking (except MSVC, |
1385 | # which needs '.lib'). |
1386 | libext=a |
1387 | -ltmain="$ac_aux_dir/ltmain.sh" |
1388 | -ofile="$default_ofile" |
1389 | + |
1390 | with_gnu_ld="$lt_cv_prog_gnu_ld" |
1391 | |
1392 | -AC_CHECK_TOOL(AR, ar, false) |
1393 | -AC_CHECK_TOOL(RANLIB, ranlib, :) |
1394 | -AC_CHECK_TOOL(STRIP, strip, :) |
1395 | - |
1396 | old_CC="$CC" |
1397 | old_CFLAGS="$CFLAGS" |
1398 | |
1399 | # Set sane defaults for various variables |
1400 | -test -z "$AR" && AR=ar |
1401 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
1402 | -test -z "$AS" && AS=as |
1403 | test -z "$CC" && CC=cc |
1404 | test -z "$LTCC" && LTCC=$CC |
1405 | -test -z "$DLLTOOL" && DLLTOOL=dlltool |
1406 | +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS |
1407 | test -z "$LD" && LD=ld |
1408 | -test -z "$LN_S" && LN_S="ln -s" |
1409 | -test -z "$MAGIC_CMD" && MAGIC_CMD=file |
1410 | -test -z "$NM" && NM=nm |
1411 | -test -z "$SED" && SED=sed |
1412 | -test -z "$OBJDUMP" && OBJDUMP=objdump |
1413 | -test -z "$RANLIB" && RANLIB=: |
1414 | -test -z "$STRIP" && STRIP=: |
1415 | test -z "$ac_objext" && ac_objext=o |
1416 | |
1417 | -# Determine commands to create old-style static archives. |
1418 | -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' |
1419 | -old_postinstall_cmds='chmod 644 $oldlib' |
1420 | -old_postuninstall_cmds= |
1421 | - |
1422 | -if test -n "$RANLIB"; then |
1423 | - case $host_os in |
1424 | - openbsd*) |
1425 | - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" |
1426 | - ;; |
1427 | - *) |
1428 | - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" |
1429 | - ;; |
1430 | - esac |
1431 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
1432 | -fi |
1433 | +_LT_CC_BASENAME([$compiler]) |
1434 | |
1435 | # Only perform the check for file, if the check method requires it |
1436 | +test -z "$MAGIC_CMD" && MAGIC_CMD=file |
1437 | case $deplibs_check_method in |
1438 | file_magic*) |
1439 | if test "$file_magic_cmd" = '$MAGIC_CMD'; then |
1440 | - AC_PATH_MAGIC |
1441 | + _LT_PATH_MAGIC |
1442 | fi |
1443 | ;; |
1444 | esac |
1445 | |
1446 | -AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) |
1447 | -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], |
1448 | -enable_win32_dll=yes, enable_win32_dll=no) |
1449 | - |
1450 | -AC_ARG_ENABLE([libtool-lock], |
1451 | - [AC_HELP_STRING([--disable-libtool-lock], |
1452 | - [avoid locking (might break parallel builds)])]) |
1453 | -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes |
1454 | - |
1455 | -AC_ARG_WITH([pic], |
1456 | - [AC_HELP_STRING([--with-pic], |
1457 | - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], |
1458 | - [pic_mode="$withval"], |
1459 | - [pic_mode=default]) |
1460 | -test -z "$pic_mode" && pic_mode=default |
1461 | - |
1462 | # Use C for the default configuration in the libtool script |
1463 | -tagname= |
1464 | -AC_LIBTOOL_LANG_C_CONFIG |
1465 | -_LT_AC_TAGCONFIG |
1466 | -])# AC_LIBTOOL_SETUP |
1467 | - |
1468 | - |
1469 | -# _LT_AC_SYS_COMPILER |
1470 | +LT_SUPPORTED_TAG([CC]) |
1471 | +_LT_LANG_C_CONFIG |
1472 | +_LT_LANG_DEFAULT_CONFIG |
1473 | +_LT_CONFIG_COMMANDS |
1474 | +])# _LT_SETUP |
1475 | + |
1476 | + |
1477 | +# _LT_PROG_LTMAIN |
1478 | +# --------------- |
1479 | +# Note that this code is called both from `configure', and `config.status' |
1480 | +# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, |
1481 | +# `config.status' has no value for ac_aux_dir unless we are using Automake, |
1482 | +# so we pass a copy along to make sure it has a sensible value anyway. |
1483 | +m4_defun([_LT_PROG_LTMAIN], |
1484 | +[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl |
1485 | +_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) |
1486 | +ltmain="$ac_aux_dir/ltmain.sh" |
1487 | +])# _LT_PROG_LTMAIN |
1488 | + |
1489 | + |
1490 | + |
1491 | +# So that we can recreate a full libtool script including additional |
1492 | +# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS |
1493 | +# in macros and then make a single call at the end using the `libtool' |
1494 | +# label. |
1495 | + |
1496 | + |
1497 | +# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) |
1498 | +# ---------------------------------------- |
1499 | +# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. |
1500 | +m4_define([_LT_CONFIG_LIBTOOL_INIT], |
1501 | +[m4_ifval([$1], |
1502 | + [m4_append([_LT_OUTPUT_LIBTOOL_INIT], |
1503 | + [$1 |
1504 | +])])]) |
1505 | + |
1506 | +# Initialize. |
1507 | +m4_define([_LT_OUTPUT_LIBTOOL_INIT]) |
1508 | + |
1509 | + |
1510 | +# _LT_CONFIG_LIBTOOL([COMMANDS]) |
1511 | +# ------------------------------ |
1512 | +# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. |
1513 | +m4_define([_LT_CONFIG_LIBTOOL], |
1514 | +[m4_ifval([$1], |
1515 | + [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], |
1516 | + [$1 |
1517 | +])])]) |
1518 | + |
1519 | +# Initialize. |
1520 | +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) |
1521 | + |
1522 | + |
1523 | +# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) |
1524 | +# ----------------------------------------------------- |
1525 | +m4_defun([_LT_CONFIG_SAVE_COMMANDS], |
1526 | +[_LT_CONFIG_LIBTOOL([$1]) |
1527 | +_LT_CONFIG_LIBTOOL_INIT([$2]) |
1528 | +]) |
1529 | + |
1530 | + |
1531 | +# _LT_FORMAT_COMMENT([COMMENT]) |
1532 | +# ----------------------------- |
1533 | +# Add leading comment marks to the start of each line, and a trailing |
1534 | +# full-stop to the whole comment if one is not present already. |
1535 | +m4_define([_LT_FORMAT_COMMENT], |
1536 | +[m4_ifval([$1], [ |
1537 | +m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], |
1538 | + [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) |
1539 | +)]) |
1540 | + |
1541 | + |
1542 | + |
1543 | + |
1544 | + |
1545 | +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) |
1546 | +# ------------------------------------------------------------------- |
1547 | +# CONFIGNAME is the name given to the value in the libtool script. |
1548 | +# VARNAME is the (base) name used in the configure script. |
1549 | +# VALUE may be 0, 1 or 2 for a computed quote escaped value based on |
1550 | +# VARNAME. Any other value will be used directly. |
1551 | +m4_define([_LT_DECL], |
1552 | +[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], |
1553 | + [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], |
1554 | + [m4_ifval([$1], [$1], [$2])]) |
1555 | + lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) |
1556 | + m4_ifval([$4], |
1557 | + [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) |
1558 | + lt_dict_add_subkey([lt_decl_dict], [$2], |
1559 | + [tagged?], [m4_ifval([$5], [yes], [no])])]) |
1560 | +]) |
1561 | + |
1562 | + |
1563 | +# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) |
1564 | +# -------------------------------------------------------- |
1565 | +m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) |
1566 | + |
1567 | + |
1568 | +# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) |
1569 | +# ------------------------------------------------ |
1570 | +m4_define([lt_decl_tag_varnames], |
1571 | +[_lt_decl_filter([tagged?], [yes], $@)]) |
1572 | + |
1573 | + |
1574 | +# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) |
1575 | +# --------------------------------------------------------- |
1576 | +m4_define([_lt_decl_filter], |
1577 | +[m4_case([$#], |
1578 | + [0], [m4_fatal([$0: too few arguments: $#])], |
1579 | + [1], [m4_fatal([$0: too few arguments: $#: $1])], |
1580 | + [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], |
1581 | + [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], |
1582 | + [lt_dict_filter([lt_decl_dict], $@)])[]dnl |
1583 | +]) |
1584 | + |
1585 | + |
1586 | +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) |
1587 | +# -------------------------------------------------- |
1588 | +m4_define([lt_decl_quote_varnames], |
1589 | +[_lt_decl_filter([value], [1], $@)]) |
1590 | + |
1591 | + |
1592 | +# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) |
1593 | +# --------------------------------------------------- |
1594 | +m4_define([lt_decl_dquote_varnames], |
1595 | +[_lt_decl_filter([value], [2], $@)]) |
1596 | + |
1597 | + |
1598 | +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) |
1599 | +# --------------------------------------------------- |
1600 | +m4_define([lt_decl_varnames_tagged], |
1601 | +[m4_assert([$# <= 2])dnl |
1602 | +_$0(m4_quote(m4_default([$1], [[, ]])), |
1603 | + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), |
1604 | + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) |
1605 | +m4_define([_lt_decl_varnames_tagged], |
1606 | +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) |
1607 | + |
1608 | + |
1609 | +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) |
1610 | +# ------------------------------------------------ |
1611 | +m4_define([lt_decl_all_varnames], |
1612 | +[_$0(m4_quote(m4_default([$1], [[, ]])), |
1613 | + m4_if([$2], [], |
1614 | + m4_quote(lt_decl_varnames), |
1615 | + m4_quote(m4_shift($@))))[]dnl |
1616 | +]) |
1617 | +m4_define([_lt_decl_all_varnames], |
1618 | +[lt_join($@, lt_decl_varnames_tagged([$1], |
1619 | + lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl |
1620 | +]) |
1621 | + |
1622 | + |
1623 | +# _LT_CONFIG_STATUS_DECLARE([VARNAME]) |
1624 | +# ------------------------------------ |
1625 | +# Quote a variable value, and forward it to `config.status' so that its |
1626 | +# declaration there will have the same value as in `configure'. VARNAME |
1627 | +# must have a single quote delimited value for this to work. |
1628 | +m4_define([_LT_CONFIG_STATUS_DECLARE], |
1629 | +[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) |
1630 | + |
1631 | + |
1632 | +# _LT_CONFIG_STATUS_DECLARATIONS |
1633 | +# ------------------------------ |
1634 | +# We delimit libtool config variables with single quotes, so when |
1635 | +# we write them to config.status, we have to be sure to quote all |
1636 | +# embedded single quotes properly. In configure, this macro expands |
1637 | +# each variable declared with _LT_DECL (and _LT_TAGDECL) into: |
1638 | +# |
1639 | +# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' |
1640 | +m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], |
1641 | +[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), |
1642 | + [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) |
1643 | + |
1644 | + |
1645 | +# _LT_LIBTOOL_TAGS |
1646 | +# ---------------- |
1647 | +# Output comment and list of tags supported by the script |
1648 | +m4_defun([_LT_LIBTOOL_TAGS], |
1649 | +[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl |
1650 | +available_tags="_LT_TAGS"dnl |
1651 | +]) |
1652 | + |
1653 | + |
1654 | +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) |
1655 | +# ----------------------------------- |
1656 | +# Extract the dictionary values for VARNAME (optionally with TAG) and |
1657 | +# expand to a commented shell variable setting: |
1658 | +# |
1659 | +# # Some comment about what VAR is for. |
1660 | +# visible_name=$lt_internal_name |
1661 | +m4_define([_LT_LIBTOOL_DECLARE], |
1662 | +[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], |
1663 | + [description])))[]dnl |
1664 | +m4_pushdef([_libtool_name], |
1665 | + m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl |
1666 | +m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), |
1667 | + [0], [_libtool_name=[$]$1], |
1668 | + [1], [_libtool_name=$lt_[]$1], |
1669 | + [2], [_libtool_name=$lt_[]$1], |
1670 | + [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl |
1671 | +m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl |
1672 | +]) |
1673 | + |
1674 | + |
1675 | +# _LT_LIBTOOL_CONFIG_VARS |
1676 | +# ----------------------- |
1677 | +# Produce commented declarations of non-tagged libtool config variables |
1678 | +# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' |
1679 | +# script. Tagged libtool config variables (even for the LIBTOOL CONFIG |
1680 | +# section) are produced by _LT_LIBTOOL_TAG_VARS. |
1681 | +m4_defun([_LT_LIBTOOL_CONFIG_VARS], |
1682 | +[m4_foreach([_lt_var], |
1683 | + m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), |
1684 | + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) |
1685 | + |
1686 | + |
1687 | +# _LT_LIBTOOL_TAG_VARS(TAG) |
1688 | +# ------------------------- |
1689 | +m4_define([_LT_LIBTOOL_TAG_VARS], |
1690 | +[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), |
1691 | + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) |
1692 | + |
1693 | + |
1694 | +# _LT_TAGVAR(VARNAME, [TAGNAME]) |
1695 | +# ------------------------------ |
1696 | +m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) |
1697 | + |
1698 | + |
1699 | +# _LT_CONFIG_COMMANDS |
1700 | # ------------------- |
1701 | -AC_DEFUN([_LT_AC_SYS_COMPILER], |
1702 | +# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of |
1703 | +# variables for single and double quote escaping we saved from calls |
1704 | +# to _LT_DECL, we can put quote escaped variables declarations |
1705 | +# into `config.status', and then the shell code to quote escape them in |
1706 | +# for loops in `config.status'. Finally, any additional code accumulated |
1707 | +# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. |
1708 | +m4_defun([_LT_CONFIG_COMMANDS], |
1709 | +[AC_PROVIDE_IFELSE([LT_OUTPUT], |
1710 | + dnl If the libtool generation code has been placed in $CONFIG_LT, |
1711 | + dnl instead of duplicating it all over again into config.status, |
1712 | + dnl then we will have config.status run $CONFIG_LT later, so it |
1713 | + dnl needs to know what name is stored there: |
1714 | + [AC_CONFIG_COMMANDS([libtool], |
1715 | + [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], |
1716 | + dnl If the libtool generation code is destined for config.status, |
1717 | + dnl expand the accumulated commands and init code now: |
1718 | + [AC_CONFIG_COMMANDS([libtool], |
1719 | + [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) |
1720 | +])#_LT_CONFIG_COMMANDS |
1721 | + |
1722 | + |
1723 | +# Initialize. |
1724 | +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], |
1725 | +[ |
1726 | + |
1727 | +# The HP-UX ksh and POSIX shell print the target directory to stdout |
1728 | +# if CDPATH is set. |
1729 | +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
1730 | + |
1731 | +sed_quote_subst='$sed_quote_subst' |
1732 | +double_quote_subst='$double_quote_subst' |
1733 | +delay_variable_subst='$delay_variable_subst' |
1734 | +_LT_CONFIG_STATUS_DECLARATIONS |
1735 | +LTCC='$LTCC' |
1736 | +LTCFLAGS='$LTCFLAGS' |
1737 | +compiler='$compiler_DEFAULT' |
1738 | + |
1739 | +# Quote evaled strings. |
1740 | +for var in lt_decl_all_varnames([[ \ |
1741 | +]], lt_decl_quote_varnames); do |
1742 | + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in |
1743 | + *[[\\\\\\\`\\"\\\$]]*) |
1744 | + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
1745 | + ;; |
1746 | + *) |
1747 | + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
1748 | + ;; |
1749 | + esac |
1750 | +done |
1751 | + |
1752 | +# Double-quote double-evaled strings. |
1753 | +for var in lt_decl_all_varnames([[ \ |
1754 | +]], lt_decl_dquote_varnames); do |
1755 | + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in |
1756 | + *[[\\\\\\\`\\"\\\$]]*) |
1757 | + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
1758 | + ;; |
1759 | + *) |
1760 | + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
1761 | + ;; |
1762 | + esac |
1763 | +done |
1764 | + |
1765 | +# Fix-up fallback echo if it was mangled by the above quoting rules. |
1766 | +case \$lt_ECHO in |
1767 | +*'\\\[$]0 --fallback-echo"')dnl " |
1768 | + lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` |
1769 | + ;; |
1770 | +esac |
1771 | + |
1772 | +_LT_OUTPUT_LIBTOOL_INIT |
1773 | +]) |
1774 | + |
1775 | + |
1776 | +# LT_OUTPUT |
1777 | +# --------- |
1778 | +# This macro allows early generation of the libtool script (before |
1779 | +# AC_OUTPUT is called), incase it is used in configure for compilation |
1780 | +# tests. |
1781 | +AC_DEFUN([LT_OUTPUT], |
1782 | +[: ${CONFIG_LT=./config.lt} |
1783 | +AC_MSG_NOTICE([creating $CONFIG_LT]) |
1784 | +cat >"$CONFIG_LT" <<_LTEOF |
1785 | +#! $SHELL |
1786 | +# Generated by $as_me. |
1787 | +# Run this file to recreate a libtool stub with the current configuration. |
1788 | + |
1789 | +lt_cl_silent=false |
1790 | +SHELL=\${CONFIG_SHELL-$SHELL} |
1791 | +_LTEOF |
1792 | + |
1793 | +cat >>"$CONFIG_LT" <<\_LTEOF |
1794 | +AS_SHELL_SANITIZE |
1795 | +_AS_PREPARE |
1796 | + |
1797 | +exec AS_MESSAGE_FD>&1 |
1798 | +exec AS_MESSAGE_LOG_FD>>config.log |
1799 | +{ |
1800 | + echo |
1801 | + AS_BOX([Running $as_me.]) |
1802 | +} >&AS_MESSAGE_LOG_FD |
1803 | + |
1804 | +lt_cl_help="\ |
1805 | +\`$as_me' creates a local libtool stub from the current configuration, |
1806 | +for use in further configure time tests before the real libtool is |
1807 | +generated. |
1808 | + |
1809 | +Usage: $[0] [[OPTIONS]] |
1810 | + |
1811 | + -h, --help print this help, then exit |
1812 | + -V, --version print version number, then exit |
1813 | + -q, --quiet do not print progress messages |
1814 | + -d, --debug don't remove temporary files |
1815 | + |
1816 | +Report bugs to <bug-libtool@gnu.org>." |
1817 | + |
1818 | +lt_cl_version="\ |
1819 | +m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl |
1820 | +m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
1821 | +configured by $[0], generated by m4_PACKAGE_STRING. |
1822 | + |
1823 | +Copyright (C) 2008 Free Software Foundation, Inc. |
1824 | +This config.lt script is free software; the Free Software Foundation |
1825 | +gives unlimited permision to copy, distribute and modify it." |
1826 | + |
1827 | +while test $[#] != 0 |
1828 | +do |
1829 | + case $[1] in |
1830 | + --version | --v* | -V ) |
1831 | + echo "$lt_cl_version"; exit 0 ;; |
1832 | + --help | --h* | -h ) |
1833 | + echo "$lt_cl_help"; exit 0 ;; |
1834 | + --debug | --d* | -d ) |
1835 | + debug=: ;; |
1836 | + --quiet | --q* | --silent | --s* | -q ) |
1837 | + lt_cl_silent=: ;; |
1838 | + |
1839 | + -*) AC_MSG_ERROR([unrecognized option: $[1] |
1840 | +Try \`$[0] --help' for more information.]) ;; |
1841 | + |
1842 | + *) AC_MSG_ERROR([unrecognized argument: $[1] |
1843 | +Try \`$[0] --help' for more information.]) ;; |
1844 | + esac |
1845 | + shift |
1846 | +done |
1847 | + |
1848 | +if $lt_cl_silent; then |
1849 | + exec AS_MESSAGE_FD>/dev/null |
1850 | +fi |
1851 | +_LTEOF |
1852 | + |
1853 | +cat >>"$CONFIG_LT" <<_LTEOF |
1854 | +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT |
1855 | +_LTEOF |
1856 | + |
1857 | +cat >>"$CONFIG_LT" <<\_LTEOF |
1858 | +AC_MSG_NOTICE([creating $ofile]) |
1859 | +_LT_OUTPUT_LIBTOOL_COMMANDS |
1860 | +AS_EXIT(0) |
1861 | +_LTEOF |
1862 | +chmod +x "$CONFIG_LT" |
1863 | + |
1864 | +# configure is writing to config.log, but config.lt does its own redirection, |
1865 | +# appending to config.log, which fails on DOS, as config.log is still kept |
1866 | +# open by configure. Here we exec the FD to /dev/null, effectively closing |
1867 | +# config.log, so it can be properly (re)opened and appended to by config.lt. |
1868 | +if test "$no_create" != yes; then |
1869 | + lt_cl_success=: |
1870 | + test "$silent" = yes && |
1871 | + lt_config_lt_args="$lt_config_lt_args --quiet" |
1872 | + exec AS_MESSAGE_LOG_FD>/dev/null |
1873 | + $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false |
1874 | + exec AS_MESSAGE_LOG_FD>>config.log |
1875 | + $lt_cl_success || AS_EXIT(1) |
1876 | +fi |
1877 | +])# LT_OUTPUT |
1878 | + |
1879 | + |
1880 | +# _LT_CONFIG(TAG) |
1881 | +# --------------- |
1882 | +# If TAG is the built-in tag, create an initial libtool script with a |
1883 | +# default configuration from the untagged config vars. Otherwise add code |
1884 | +# to config.status for appending the configuration named by TAG from the |
1885 | +# matching tagged config vars. |
1886 | +m4_defun([_LT_CONFIG], |
1887 | +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
1888 | +_LT_CONFIG_SAVE_COMMANDS([ |
1889 | + m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl |
1890 | + m4_if(_LT_TAG, [C], [ |
1891 | + # See if we are running on zsh, and set the options which allow our |
1892 | + # commands through without removal of \ escapes. |
1893 | + if test -n "${ZSH_VERSION+set}" ; then |
1894 | + setopt NO_GLOB_SUBST |
1895 | + fi |
1896 | + |
1897 | + cfgfile="${ofile}T" |
1898 | + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 |
1899 | + $RM "$cfgfile" |
1900 | + |
1901 | + cat <<_LT_EOF >> "$cfgfile" |
1902 | +#! $SHELL |
1903 | + |
1904 | +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. |
1905 | +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION |
1906 | +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: |
1907 | +# NOTE: Changes made to this file will be lost: look at ltmain.sh. |
1908 | +# |
1909 | +_LT_COPYING |
1910 | +_LT_LIBTOOL_TAGS |
1911 | + |
1912 | +# ### BEGIN LIBTOOL CONFIG |
1913 | +_LT_LIBTOOL_CONFIG_VARS |
1914 | +_LT_LIBTOOL_TAG_VARS |
1915 | +# ### END LIBTOOL CONFIG |
1916 | + |
1917 | +_LT_EOF |
1918 | + |
1919 | + case $host_os in |
1920 | + aix3*) |
1921 | + cat <<\_LT_EOF >> "$cfgfile" |
1922 | +# AIX sometimes has problems with the GCC collect2 program. For some |
1923 | +# reason, if we set the COLLECT_NAMES environment variable, the problems |
1924 | +# vanish in a puff of smoke. |
1925 | +if test "X${COLLECT_NAMES+set}" != Xset; then |
1926 | + COLLECT_NAMES= |
1927 | + export COLLECT_NAMES |
1928 | +fi |
1929 | +_LT_EOF |
1930 | + ;; |
1931 | + esac |
1932 | + |
1933 | + _LT_PROG_LTMAIN |
1934 | + |
1935 | + # We use sed instead of cat because bash on DJGPP gets confused if |
1936 | + # if finds mixed CR/LF and LF-only lines. Since sed operates in |
1937 | + # text mode, it properly converts lines to CR/LF. This bash problem |
1938 | + # is reportedly fixed, but why not run on old versions too? |
1939 | + sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
1940 | + || (rm -f "$cfgfile"; exit 1) |
1941 | + |
1942 | + _LT_PROG_XSI_SHELLFNS |
1943 | + |
1944 | + sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
1945 | + || (rm -f "$cfgfile"; exit 1) |
1946 | + |
1947 | + mv -f "$cfgfile" "$ofile" || |
1948 | + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
1949 | + chmod +x "$ofile" |
1950 | +], |
1951 | +[cat <<_LT_EOF >> "$ofile" |
1952 | + |
1953 | +dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded |
1954 | +dnl in a comment (ie after a #). |
1955 | +# ### BEGIN LIBTOOL TAG CONFIG: $1 |
1956 | +_LT_LIBTOOL_TAG_VARS(_LT_TAG) |
1957 | +# ### END LIBTOOL TAG CONFIG: $1 |
1958 | +_LT_EOF |
1959 | +])dnl /m4_if |
1960 | +], |
1961 | +[m4_if([$1], [], [ |
1962 | + PACKAGE='$PACKAGE' |
1963 | + VERSION='$VERSION' |
1964 | + TIMESTAMP='$TIMESTAMP' |
1965 | + RM='$RM' |
1966 | + ofile='$ofile'], []) |
1967 | +])dnl /_LT_CONFIG_SAVE_COMMANDS |
1968 | +])# _LT_CONFIG |
1969 | + |
1970 | + |
1971 | +# LT_SUPPORTED_TAG(TAG) |
1972 | +# --------------------- |
1973 | +# Trace this macro to discover what tags are supported by the libtool |
1974 | +# --tag option, using: |
1975 | +# autoconf --trace 'LT_SUPPORTED_TAG:$1' |
1976 | +AC_DEFUN([LT_SUPPORTED_TAG], []) |
1977 | + |
1978 | + |
1979 | +# C support is built-in for now |
1980 | +m4_define([_LT_LANG_C_enabled], []) |
1981 | +m4_define([_LT_TAGS], []) |
1982 | + |
1983 | + |
1984 | +# LT_LANG(LANG) |
1985 | +# ------------- |
1986 | +# Enable libtool support for the given language if not already enabled. |
1987 | +AC_DEFUN([LT_LANG], |
1988 | +[AC_BEFORE([$0], [LT_OUTPUT])dnl |
1989 | +m4_case([$1], |
1990 | + [C], [_LT_LANG(C)], |
1991 | + [C++], [_LT_LANG(CXX)], |
1992 | + [Java], [_LT_LANG(GCJ)], |
1993 | + [Fortran 77], [_LT_LANG(F77)], |
1994 | + [Fortran], [_LT_LANG(FC)], |
1995 | + [Windows Resource], [_LT_LANG(RC)], |
1996 | + [m4_ifdef([_LT_LANG_]$1[_CONFIG], |
1997 | + [_LT_LANG($1)], |
1998 | + [m4_fatal([$0: unsupported language: "$1"])])])dnl |
1999 | +])# LT_LANG |
2000 | + |
2001 | + |
2002 | +# _LT_LANG(LANGNAME) |
2003 | +# ------------------ |
2004 | +m4_defun([_LT_LANG], |
2005 | +[m4_ifdef([_LT_LANG_]$1[_enabled], [], |
2006 | + [LT_SUPPORTED_TAG([$1])dnl |
2007 | + m4_append([_LT_TAGS], [$1 ])dnl |
2008 | + m4_define([_LT_LANG_]$1[_enabled], [])dnl |
2009 | + _LT_LANG_$1_CONFIG($1)])dnl |
2010 | +])# _LT_LANG |
2011 | + |
2012 | + |
2013 | +# _LT_LANG_DEFAULT_CONFIG |
2014 | +# ----------------------- |
2015 | +m4_defun([_LT_LANG_DEFAULT_CONFIG], |
2016 | +[AC_PROVIDE_IFELSE([AC_PROG_CXX], |
2017 | + [LT_LANG(CXX)], |
2018 | + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) |
2019 | + |
2020 | +AC_PROVIDE_IFELSE([AC_PROG_F77], |
2021 | + [LT_LANG(F77)], |
2022 | + [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) |
2023 | + |
2024 | +AC_PROVIDE_IFELSE([AC_PROG_FC], |
2025 | + [LT_LANG(FC)], |
2026 | + [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) |
2027 | + |
2028 | +dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal |
2029 | +dnl pulling things in needlessly. |
2030 | +AC_PROVIDE_IFELSE([AC_PROG_GCJ], |
2031 | + [LT_LANG(GCJ)], |
2032 | + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], |
2033 | + [LT_LANG(GCJ)], |
2034 | + [AC_PROVIDE_IFELSE([LT_PROG_GCJ], |
2035 | + [LT_LANG(GCJ)], |
2036 | + [m4_ifdef([AC_PROG_GCJ], |
2037 | + [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) |
2038 | + m4_ifdef([A][M_PROG_GCJ], |
2039 | + [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) |
2040 | + m4_ifdef([LT_PROG_GCJ], |
2041 | + [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) |
2042 | + |
2043 | +AC_PROVIDE_IFELSE([LT_PROG_RC], |
2044 | + [LT_LANG(RC)], |
2045 | + [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) |
2046 | +])# _LT_LANG_DEFAULT_CONFIG |
2047 | + |
2048 | +# Obsolete macros: |
2049 | +AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) |
2050 | +AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) |
2051 | +AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) |
2052 | +AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) |
2053 | +dnl aclocal-1.4 backwards compatibility: |
2054 | +dnl AC_DEFUN([AC_LIBTOOL_CXX], []) |
2055 | +dnl AC_DEFUN([AC_LIBTOOL_F77], []) |
2056 | +dnl AC_DEFUN([AC_LIBTOOL_FC], []) |
2057 | +dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) |
2058 | + |
2059 | + |
2060 | +# _LT_TAG_COMPILER |
2061 | +# ---------------- |
2062 | +m4_defun([_LT_TAG_COMPILER], |
2063 | [AC_REQUIRE([AC_PROG_CC])dnl |
2064 | |
2065 | +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl |
2066 | +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl |
2067 | +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl |
2068 | +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl |
2069 | + |
2070 | # If no C compiler was specified, use CC. |
2071 | LTCC=${LTCC-"$CC"} |
2072 | |
2073 | +# If no C compiler flags were specified, use CFLAGS. |
2074 | +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} |
2075 | + |
2076 | # Allow CC to be a program name with arguments. |
2077 | compiler=$CC |
2078 | -])# _LT_AC_SYS_COMPILER |
2079 | - |
2080 | - |
2081 | -# _LT_AC_SYS_LIBPATH_AIX |
2082 | +])# _LT_TAG_COMPILER |
2083 | + |
2084 | + |
2085 | +# _LT_COMPILER_BOILERPLATE |
2086 | +# ------------------------ |
2087 | +# Check for compiler boilerplate output or warnings with |
2088 | +# the simple compiler test code. |
2089 | +m4_defun([_LT_COMPILER_BOILERPLATE], |
2090 | +[m4_require([_LT_DECL_SED])dnl |
2091 | +ac_outfile=conftest.$ac_objext |
2092 | +echo "$lt_simple_compile_test_code" >conftest.$ac_ext |
2093 | +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
2094 | +_lt_compiler_boilerplate=`cat conftest.err` |
2095 | +$RM conftest* |
2096 | +])# _LT_COMPILER_BOILERPLATE |
2097 | + |
2098 | + |
2099 | +# _LT_LINKER_BOILERPLATE |
2100 | # ---------------------- |
2101 | +# Check for linker boilerplate output or warnings with |
2102 | +# the simple link test code. |
2103 | +m4_defun([_LT_LINKER_BOILERPLATE], |
2104 | +[m4_require([_LT_DECL_SED])dnl |
2105 | +ac_outfile=conftest.$ac_objext |
2106 | +echo "$lt_simple_link_test_code" >conftest.$ac_ext |
2107 | +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err |
2108 | +_lt_linker_boilerplate=`cat conftest.err` |
2109 | +$RM -r conftest* |
2110 | +])# _LT_LINKER_BOILERPLATE |
2111 | + |
2112 | +# _LT_REQUIRED_DARWIN_CHECKS |
2113 | +# ------------------------- |
2114 | +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ |
2115 | + case $host_os in |
2116 | + rhapsody* | darwin*) |
2117 | + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) |
2118 | + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) |
2119 | + AC_CHECK_TOOL([LIPO], [lipo], [:]) |
2120 | + AC_CHECK_TOOL([OTOOL], [otool], [:]) |
2121 | + AC_CHECK_TOOL([OTOOL64], [otool64], [:]) |
2122 | + _LT_DECL([], [DSYMUTIL], [1], |
2123 | + [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) |
2124 | + _LT_DECL([], [NMEDIT], [1], |
2125 | + [Tool to change global to local symbols on Mac OS X]) |
2126 | + _LT_DECL([], [LIPO], [1], |
2127 | + [Tool to manipulate fat objects and archives on Mac OS X]) |
2128 | + _LT_DECL([], [OTOOL], [1], |
2129 | + [ldd/readelf like tool for Mach-O binaries on Mac OS X]) |
2130 | + _LT_DECL([], [OTOOL64], [1], |
2131 | + [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) |
2132 | + |
2133 | + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], |
2134 | + [lt_cv_apple_cc_single_mod=no |
2135 | + if test -z "${LT_MULTI_MODULE}"; then |
2136 | + # By default we will add the -single_module flag. You can override |
2137 | + # by either setting the environment variable LT_MULTI_MODULE |
2138 | + # non-empty at configure time, or by adding -multi_module to the |
2139 | + # link flags. |
2140 | + rm -rf libconftest.dylib* |
2141 | + echo "int foo(void){return 1;}" > conftest.c |
2142 | + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
2143 | +-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD |
2144 | + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
2145 | + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
2146 | + _lt_result=$? |
2147 | + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then |
2148 | + lt_cv_apple_cc_single_mod=yes |
2149 | + else |
2150 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
2151 | + fi |
2152 | + rm -rf libconftest.dylib* |
2153 | + rm -f conftest.* |
2154 | + fi]) |
2155 | + AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
2156 | + [lt_cv_ld_exported_symbols_list], |
2157 | + [lt_cv_ld_exported_symbols_list=no |
2158 | + save_LDFLAGS=$LDFLAGS |
2159 | + echo "_main" > conftest.sym |
2160 | + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" |
2161 | + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
2162 | + [lt_cv_ld_exported_symbols_list=yes], |
2163 | + [lt_cv_ld_exported_symbols_list=no]) |
2164 | + LDFLAGS="$save_LDFLAGS" |
2165 | + ]) |
2166 | + case $host_os in |
2167 | + rhapsody* | darwin1.[[012]]) |
2168 | + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
2169 | + darwin1.*) |
2170 | + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; |
2171 | + darwin*) # darwin 5.x on |
2172 | + # if running on 10.5 or later, the deployment target defaults |
2173 | + # to the OS version, if on x86, and 10.4, the deployment |
2174 | + # target defaults to 10.4. Don't you love it? |
2175 | + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in |
2176 | + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) |
2177 | + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; |
2178 | + 10.[[012]]*) |
2179 | + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; |
2180 | + 10.*) |
2181 | + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; |
2182 | + esac |
2183 | + ;; |
2184 | + esac |
2185 | + if test "$lt_cv_apple_cc_single_mod" = "yes"; then |
2186 | + _lt_dar_single_mod='$single_module' |
2187 | + fi |
2188 | + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then |
2189 | + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' |
2190 | + else |
2191 | + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
2192 | + fi |
2193 | + if test "$DSYMUTIL" != ":"; then |
2194 | + _lt_dsymutil='~$DSYMUTIL $lib || :' |
2195 | + else |
2196 | + _lt_dsymutil= |
2197 | + fi |
2198 | + ;; |
2199 | + esac |
2200 | +]) |
2201 | + |
2202 | + |
2203 | +# _LT_DARWIN_LINKER_FEATURES |
2204 | +# -------------------------- |
2205 | +# Checks for linker and compiler features on darwin |
2206 | +m4_defun([_LT_DARWIN_LINKER_FEATURES], |
2207 | +[ |
2208 | + m4_require([_LT_REQUIRED_DARWIN_CHECKS]) |
2209 | + _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
2210 | + _LT_TAGVAR(hardcode_direct, $1)=no |
2211 | + _LT_TAGVAR(hardcode_automatic, $1)=yes |
2212 | + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
2213 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
2214 | + _LT_TAGVAR(link_all_deplibs, $1)=yes |
2215 | + _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" |
2216 | + case $cc_basename in |
2217 | + ifort*) _lt_dar_can_shared=yes ;; |
2218 | + *) _lt_dar_can_shared=$GCC ;; |
2219 | + esac |
2220 | + if test "$_lt_dar_can_shared" = "yes"; then |
2221 | + output_verbose_link_cmd=echo |
2222 | + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" |
2223 | + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
2224 | + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" |
2225 | + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" |
2226 | + m4_if([$1], [CXX], |
2227 | +[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then |
2228 | + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" |
2229 | + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" |
2230 | + fi |
2231 | +],[]) |
2232 | + else |
2233 | + _LT_TAGVAR(ld_shlibs, $1)=no |
2234 | + fi |
2235 | +]) |
2236 | + |
2237 | +# _LT_SYS_MODULE_PATH_AIX |
2238 | +# ----------------------- |
2239 | # Links a minimal program and checks the executable |
2240 | # for the system default hardcoded library path. In most cases, |
2241 | # this is /usr/lib:/lib, but when the MPI compilers are used |
2242 | # the location of the communication and MPI libs are included too. |
2243 | # If we don't find anything, use the default library path according |
2244 | # to the aix ld manual. |
2245 | -AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], |
2246 | -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ |
2247 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } |
2248 | -}'` |
2249 | +m4_defun([_LT_SYS_MODULE_PATH_AIX], |
2250 | +[m4_require([_LT_DECL_SED])dnl |
2251 | +AC_LINK_IFELSE(AC_LANG_PROGRAM,[ |
2252 | +lt_aix_libpath_sed=' |
2253 | + /Import File Strings/,/^$/ { |
2254 | + /^0/ { |
2255 | + s/^0 *\(.*\)$/\1/ |
2256 | + p |
2257 | + } |
2258 | + }' |
2259 | +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
2260 | # Check for a 64-bit object if we didn't find anything. |
2261 | -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } |
2262 | -}'`; fi],[]) |
2263 | +if test -z "$aix_libpath"; then |
2264 | + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
2265 | +fi],[]) |
2266 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
2267 | -])# _LT_AC_SYS_LIBPATH_AIX |
2268 | - |
2269 | - |
2270 | -# _LT_AC_SHELL_INIT(ARG) |
2271 | -# ---------------------- |
2272 | -AC_DEFUN([_LT_AC_SHELL_INIT], |
2273 | +])# _LT_SYS_MODULE_PATH_AIX |
2274 | + |
2275 | + |
2276 | +# _LT_SHELL_INIT(ARG) |
2277 | +# ------------------- |
2278 | +m4_define([_LT_SHELL_INIT], |
2279 | [ifdef([AC_DIVERSION_NOTICE], |
2280 | [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], |
2281 | [AC_DIVERT_PUSH(NOTICE)]) |
2282 | $1 |
2283 | AC_DIVERT_POP |
2284 | -])# _LT_AC_SHELL_INIT |
2285 | - |
2286 | - |
2287 | -# _LT_AC_PROG_ECHO_BACKSLASH |
2288 | -# -------------------------- |
2289 | +])# _LT_SHELL_INIT |
2290 | + |
2291 | + |
2292 | +# _LT_PROG_ECHO_BACKSLASH |
2293 | +# ----------------------- |
2294 | # Add some code to the start of the generated configure script which |
2295 | # will find an echo command which doesn't interpret backslashes. |
2296 | -AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], |
2297 | -[_LT_AC_SHELL_INIT([ |
2298 | +m4_defun([_LT_PROG_ECHO_BACKSLASH], |
2299 | +[_LT_SHELL_INIT([ |
2300 | # Check that we are running under the correct shell. |
2301 | SHELL=${CONFIG_SHELL-/bin/sh} |
2302 | |
2303 | -case X$ECHO in |
2304 | +case X$lt_ECHO in |
2305 | X*--fallback-echo) |
2306 | # Remove one level of quotation (which was required for Make). |
2307 | - ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` |
2308 | + ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` |
2309 | ;; |
2310 | esac |
2311 | |
2312 | -echo=${ECHO-echo} |
2313 | +ECHO=${lt_ECHO-echo} |
2314 | if test "X[$]1" = X--no-reexec; then |
2315 | # Discard the --no-reexec flag, and continue. |
2316 | shift |
2317 | elif test "X[$]1" = X--fallback-echo; then |
2318 | # Avoid inline document here, it may be left over |
2319 | : |
2320 | -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then |
2321 | - # Yippee, $echo works! |
2322 | +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then |
2323 | + # Yippee, $ECHO works! |
2324 | : |
2325 | else |
2326 | # Restart under the correct shell. |
2327 | @@ -301,134 +1098,137 @@ |
2328 | if test "X[$]1" = X--fallback-echo; then |
2329 | # used as fallback echo |
2330 | shift |
2331 | - cat <<EOF |
2332 | + cat <<_LT_EOF |
2333 | [$]* |
2334 | -EOF |
2335 | +_LT_EOF |
2336 | exit 0 |
2337 | fi |
2338 | |
2339 | # The HP-UX ksh and POSIX shell print the target directory to stdout |
2340 | # if CDPATH is set. |
2341 | -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi |
2342 | - |
2343 | -if test -z "$ECHO"; then |
2344 | -if test "X${echo_test_string+set}" != Xset; then |
2345 | -# find a string as large as possible, as long as the shell can cope with it |
2346 | - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do |
2347 | - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... |
2348 | - if (echo_test_string="`eval $cmd`") 2>/dev/null && |
2349 | - echo_test_string="`eval $cmd`" && |
2350 | - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null |
2351 | - then |
2352 | - break |
2353 | - fi |
2354 | - done |
2355 | -fi |
2356 | - |
2357 | -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && |
2358 | - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && |
2359 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2360 | - : |
2361 | -else |
2362 | - # The Solaris, AIX, and Digital Unix default echo programs unquote |
2363 | - # backslashes. This makes it impossible to quote backslashes using |
2364 | - # echo "$something" | sed 's/\\/\\\\/g' |
2365 | - # |
2366 | - # So, first we look for a working echo in the user's PATH. |
2367 | - |
2368 | - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
2369 | - for dir in $PATH /usr/ucb; do |
2370 | +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
2371 | + |
2372 | +if test -z "$lt_ECHO"; then |
2373 | + if test "X${echo_test_string+set}" != Xset; then |
2374 | + # find a string as large as possible, as long as the shell can cope with it |
2375 | + for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do |
2376 | + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... |
2377 | + if { echo_test_string=`eval $cmd`; } 2>/dev/null && |
2378 | + { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null |
2379 | + then |
2380 | + break |
2381 | + fi |
2382 | + done |
2383 | + fi |
2384 | + |
2385 | + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
2386 | + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
2387 | + test "X$echo_testing_string" = "X$echo_test_string"; then |
2388 | + : |
2389 | + else |
2390 | + # The Solaris, AIX, and Digital Unix default echo programs unquote |
2391 | + # backslashes. This makes it impossible to quote backslashes using |
2392 | + # echo "$something" | sed 's/\\/\\\\/g' |
2393 | + # |
2394 | + # So, first we look for a working echo in the user's PATH. |
2395 | + |
2396 | + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
2397 | + for dir in $PATH /usr/ucb; do |
2398 | + IFS="$lt_save_ifs" |
2399 | + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && |
2400 | + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && |
2401 | + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && |
2402 | + test "X$echo_testing_string" = "X$echo_test_string"; then |
2403 | + ECHO="$dir/echo" |
2404 | + break |
2405 | + fi |
2406 | + done |
2407 | IFS="$lt_save_ifs" |
2408 | - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && |
2409 | - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && |
2410 | - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && |
2411 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2412 | - echo="$dir/echo" |
2413 | - break |
2414 | - fi |
2415 | - done |
2416 | - IFS="$lt_save_ifs" |
2417 | |
2418 | - if test "X$echo" = Xecho; then |
2419 | - # We didn't find a better echo, so look for alternatives. |
2420 | - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && |
2421 | - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && |
2422 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2423 | - # This shell has a builtin print -r that does the trick. |
2424 | - echo='print -r' |
2425 | - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && |
2426 | - test "X$CONFIG_SHELL" != X/bin/ksh; then |
2427 | - # If we have ksh, try running configure again with it. |
2428 | - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
2429 | - export ORIGINAL_CONFIG_SHELL |
2430 | - CONFIG_SHELL=/bin/ksh |
2431 | - export CONFIG_SHELL |
2432 | - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} |
2433 | - else |
2434 | - # Try using printf. |
2435 | - echo='printf %s\n' |
2436 | - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && |
2437 | - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && |
2438 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2439 | - # Cool, printf works |
2440 | - : |
2441 | - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && |
2442 | - test "X$echo_testing_string" = 'X\t' && |
2443 | - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
2444 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2445 | - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL |
2446 | - export CONFIG_SHELL |
2447 | - SHELL="$CONFIG_SHELL" |
2448 | - export SHELL |
2449 | - echo="$CONFIG_SHELL [$]0 --fallback-echo" |
2450 | - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && |
2451 | - test "X$echo_testing_string" = 'X\t' && |
2452 | - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
2453 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2454 | - echo="$CONFIG_SHELL [$]0 --fallback-echo" |
2455 | + if test "X$ECHO" = Xecho; then |
2456 | + # We didn't find a better echo, so look for alternatives. |
2457 | + if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && |
2458 | + echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && |
2459 | + test "X$echo_testing_string" = "X$echo_test_string"; then |
2460 | + # This shell has a builtin print -r that does the trick. |
2461 | + ECHO='print -r' |
2462 | + elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && |
2463 | + test "X$CONFIG_SHELL" != X/bin/ksh; then |
2464 | + # If we have ksh, try running configure again with it. |
2465 | + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
2466 | + export ORIGINAL_CONFIG_SHELL |
2467 | + CONFIG_SHELL=/bin/ksh |
2468 | + export CONFIG_SHELL |
2469 | + exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} |
2470 | else |
2471 | - # maybe with a smaller string... |
2472 | - prev=: |
2473 | - |
2474 | - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do |
2475 | - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null |
2476 | - then |
2477 | - break |
2478 | + # Try using printf. |
2479 | + ECHO='printf %s\n' |
2480 | + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
2481 | + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
2482 | + test "X$echo_testing_string" = "X$echo_test_string"; then |
2483 | + # Cool, printf works |
2484 | + : |
2485 | + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && |
2486 | + test "X$echo_testing_string" = 'X\t' && |
2487 | + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
2488 | + test "X$echo_testing_string" = "X$echo_test_string"; then |
2489 | + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL |
2490 | + export CONFIG_SHELL |
2491 | + SHELL="$CONFIG_SHELL" |
2492 | + export SHELL |
2493 | + ECHO="$CONFIG_SHELL [$]0 --fallback-echo" |
2494 | + elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && |
2495 | + test "X$echo_testing_string" = 'X\t' && |
2496 | + echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
2497 | + test "X$echo_testing_string" = "X$echo_test_string"; then |
2498 | + ECHO="$CONFIG_SHELL [$]0 --fallback-echo" |
2499 | + else |
2500 | + # maybe with a smaller string... |
2501 | + prev=: |
2502 | + |
2503 | + for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do |
2504 | + if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null |
2505 | + then |
2506 | + break |
2507 | + fi |
2508 | + prev="$cmd" |
2509 | + done |
2510 | + |
2511 | + if test "$prev" != 'sed 50q "[$]0"'; then |
2512 | + echo_test_string=`eval $prev` |
2513 | + export echo_test_string |
2514 | + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} |
2515 | + else |
2516 | + # Oops. We lost completely, so just stick with echo. |
2517 | + ECHO=echo |
2518 | fi |
2519 | - prev="$cmd" |
2520 | - done |
2521 | - |
2522 | - if test "$prev" != 'sed 50q "[$]0"'; then |
2523 | - echo_test_string=`eval $prev` |
2524 | - export echo_test_string |
2525 | - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} |
2526 | - else |
2527 | - # Oops. We lost completely, so just stick with echo. |
2528 | - echo=echo |
2529 | - fi |
2530 | + fi |
2531 | fi |
2532 | fi |
2533 | fi |
2534 | fi |
2535 | -fi |
2536 | |
2537 | # Copy echo and quote the copy suitably for passing to libtool from |
2538 | # the Makefile, instead of quoting the original, which is used later. |
2539 | -ECHO=$echo |
2540 | -if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then |
2541 | - ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" |
2542 | +lt_ECHO=$ECHO |
2543 | +if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then |
2544 | + lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" |
2545 | fi |
2546 | |
2547 | -AC_SUBST(ECHO) |
2548 | -])])# _LT_AC_PROG_ECHO_BACKSLASH |
2549 | - |
2550 | - |
2551 | -# _LT_AC_LOCK |
2552 | -# ----------- |
2553 | -AC_DEFUN([_LT_AC_LOCK], |
2554 | +AC_SUBST(lt_ECHO) |
2555 | +]) |
2556 | +_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) |
2557 | +_LT_DECL([], [ECHO], [1], |
2558 | + [An echo program that does not interpret backslashes]) |
2559 | +])# _LT_PROG_ECHO_BACKSLASH |
2560 | + |
2561 | + |
2562 | +# _LT_ENABLE_LOCK |
2563 | +# --------------- |
2564 | +m4_defun([_LT_ENABLE_LOCK], |
2565 | [AC_ARG_ENABLE([libtool-lock], |
2566 | - [AC_HELP_STRING([--disable-libtool-lock], |
2567 | - [avoid locking (might break parallel builds)])]) |
2568 | + [AS_HELP_STRING([--disable-libtool-lock], |
2569 | + [avoid locking (might break parallel builds)])]) |
2570 | test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes |
2571 | |
2572 | # Some flags need to be propagated to the compiler or linker for good |
2573 | @@ -439,12 +1239,12 @@ |
2574 | echo 'int i;' > conftest.$ac_ext |
2575 | if AC_TRY_EVAL(ac_compile); then |
2576 | case `/usr/bin/file conftest.$ac_objext` in |
2577 | - *ELF-32*) |
2578 | - HPUX_IA64_MODE="32" |
2579 | - ;; |
2580 | - *ELF-64*) |
2581 | - HPUX_IA64_MODE="64" |
2582 | - ;; |
2583 | + *ELF-32*) |
2584 | + HPUX_IA64_MODE="32" |
2585 | + ;; |
2586 | + *ELF-64*) |
2587 | + HPUX_IA64_MODE="64" |
2588 | + ;; |
2589 | esac |
2590 | fi |
2591 | rm -rf conftest* |
2592 | @@ -453,72 +1253,79 @@ |
2593 | # Find out which ABI we are using. |
2594 | echo '[#]line __oline__ "configure"' > conftest.$ac_ext |
2595 | if AC_TRY_EVAL(ac_compile); then |
2596 | - if test "$lt_cv_prog_gnu_ld" = yes; then |
2597 | - case `/usr/bin/file conftest.$ac_objext` in |
2598 | - *32-bit*) |
2599 | - LD="${LD-ld} -melf32bsmip" |
2600 | - ;; |
2601 | - *N32*) |
2602 | - LD="${LD-ld} -melf32bmipn32" |
2603 | - ;; |
2604 | - *64-bit*) |
2605 | - LD="${LD-ld} -melf64bmip" |
2606 | - ;; |
2607 | - esac |
2608 | - else |
2609 | - case `/usr/bin/file conftest.$ac_objext` in |
2610 | - *32-bit*) |
2611 | - LD="${LD-ld} -32" |
2612 | - ;; |
2613 | - *N32*) |
2614 | - LD="${LD-ld} -n32" |
2615 | - ;; |
2616 | - *64-bit*) |
2617 | - LD="${LD-ld} -64" |
2618 | - ;; |
2619 | - esac |
2620 | - fi |
2621 | + if test "$lt_cv_prog_gnu_ld" = yes; then |
2622 | + case `/usr/bin/file conftest.$ac_objext` in |
2623 | + *32-bit*) |
2624 | + LD="${LD-ld} -melf32bsmip" |
2625 | + ;; |
2626 | + *N32*) |
2627 | + LD="${LD-ld} -melf32bmipn32" |
2628 | + ;; |
2629 | + *64-bit*) |
2630 | + LD="${LD-ld} -melf64bmip" |
2631 | + ;; |
2632 | + esac |
2633 | + else |
2634 | + case `/usr/bin/file conftest.$ac_objext` in |
2635 | + *32-bit*) |
2636 | + LD="${LD-ld} -32" |
2637 | + ;; |
2638 | + *N32*) |
2639 | + LD="${LD-ld} -n32" |
2640 | + ;; |
2641 | + *64-bit*) |
2642 | + LD="${LD-ld} -64" |
2643 | + ;; |
2644 | + esac |
2645 | + fi |
2646 | fi |
2647 | rm -rf conftest* |
2648 | ;; |
2649 | |
2650 | -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) |
2651 | +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ |
2652 | +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
2653 | # Find out which ABI we are using. |
2654 | echo 'int i;' > conftest.$ac_ext |
2655 | if AC_TRY_EVAL(ac_compile); then |
2656 | - case "`/usr/bin/file conftest.o`" in |
2657 | - *32-bit*) |
2658 | - case $host in |
2659 | - x86_64-*linux*) |
2660 | - LD="${LD-ld} -m elf_i386" |
2661 | - ;; |
2662 | - ppc64-*linux*|powerpc64-*linux*) |
2663 | - LD="${LD-ld} -m elf32ppclinux" |
2664 | - ;; |
2665 | - s390x-*linux*) |
2666 | - LD="${LD-ld} -m elf_s390" |
2667 | - ;; |
2668 | - sparc64-*linux*) |
2669 | - LD="${LD-ld} -m elf32_sparc" |
2670 | - ;; |
2671 | - esac |
2672 | - ;; |
2673 | - *64-bit*) |
2674 | - case $host in |
2675 | - x86_64-*linux*) |
2676 | - LD="${LD-ld} -m elf_x86_64" |
2677 | - ;; |
2678 | - ppc*-*linux*|powerpc*-*linux*) |
2679 | - LD="${LD-ld} -m elf64ppc" |
2680 | - ;; |
2681 | - s390*-*linux*) |
2682 | - LD="${LD-ld} -m elf64_s390" |
2683 | - ;; |
2684 | - sparc*-*linux*) |
2685 | - LD="${LD-ld} -m elf64_sparc" |
2686 | - ;; |
2687 | - esac |
2688 | - ;; |
2689 | + case `/usr/bin/file conftest.o` in |
2690 | + *32-bit*) |
2691 | + case $host in |
2692 | + x86_64-*kfreebsd*-gnu) |
2693 | + LD="${LD-ld} -m elf_i386_fbsd" |
2694 | + ;; |
2695 | + x86_64-*linux*) |
2696 | + LD="${LD-ld} -m elf_i386" |
2697 | + ;; |
2698 | + ppc64-*linux*|powerpc64-*linux*) |
2699 | + LD="${LD-ld} -m elf32ppclinux" |
2700 | + ;; |
2701 | + s390x-*linux*) |
2702 | + LD="${LD-ld} -m elf_s390" |
2703 | + ;; |
2704 | + sparc64-*linux*) |
2705 | + LD="${LD-ld} -m elf32_sparc" |
2706 | + ;; |
2707 | + esac |
2708 | + ;; |
2709 | + *64-bit*) |
2710 | + case $host in |
2711 | + x86_64-*kfreebsd*-gnu) |
2712 | + LD="${LD-ld} -m elf_x86_64_fbsd" |
2713 | + ;; |
2714 | + x86_64-*linux*) |
2715 | + LD="${LD-ld} -m elf_x86_64" |
2716 | + ;; |
2717 | + ppc*-*linux*|powerpc*-*linux*) |
2718 | + LD="${LD-ld} -m elf64ppc" |
2719 | + ;; |
2720 | + s390*-*linux*|s390*-*tpf*) |
2721 | + LD="${LD-ld} -m elf64_s390" |
2722 | + ;; |
2723 | + sparc*-*linux*) |
2724 | + LD="${LD-ld} -m elf64_sparc" |
2725 | + ;; |
2726 | + esac |
2727 | + ;; |
2728 | esac |
2729 | fi |
2730 | rm -rf conftest* |
2731 | @@ -530,37 +1337,90 @@ |
2732 | CFLAGS="$CFLAGS -belf" |
2733 | AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, |
2734 | [AC_LANG_PUSH(C) |
2735 | - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) |
2736 | + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) |
2737 | AC_LANG_POP]) |
2738 | if test x"$lt_cv_cc_needs_belf" != x"yes"; then |
2739 | # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf |
2740 | CFLAGS="$SAVE_CFLAGS" |
2741 | fi |
2742 | ;; |
2743 | -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], |
2744 | -[*-*-cygwin* | *-*-mingw* | *-*-pw32*) |
2745 | - AC_CHECK_TOOL(DLLTOOL, dlltool, false) |
2746 | - AC_CHECK_TOOL(AS, as, false) |
2747 | - AC_CHECK_TOOL(OBJDUMP, objdump, false) |
2748 | +sparc*-*solaris*) |
2749 | + # Find out which ABI we are using. |
2750 | + echo 'int i;' > conftest.$ac_ext |
2751 | + if AC_TRY_EVAL(ac_compile); then |
2752 | + case `/usr/bin/file conftest.o` in |
2753 | + *64-bit*) |
2754 | + case $lt_cv_prog_gnu_ld in |
2755 | + yes*) LD="${LD-ld} -m elf64_sparc" ;; |
2756 | + *) |
2757 | + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
2758 | + LD="${LD-ld} -64" |
2759 | + fi |
2760 | + ;; |
2761 | + esac |
2762 | + ;; |
2763 | + esac |
2764 | + fi |
2765 | + rm -rf conftest* |
2766 | ;; |
2767 | - ]) |
2768 | esac |
2769 | |
2770 | need_locks="$enable_libtool_lock" |
2771 | - |
2772 | -])# _LT_AC_LOCK |
2773 | - |
2774 | - |
2775 | -# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, |
2776 | +])# _LT_ENABLE_LOCK |
2777 | + |
2778 | + |
2779 | +# _LT_CMD_OLD_ARCHIVE |
2780 | +# ------------------- |
2781 | +m4_defun([_LT_CMD_OLD_ARCHIVE], |
2782 | +[AC_CHECK_TOOL(AR, ar, false) |
2783 | +test -z "$AR" && AR=ar |
2784 | +test -z "$AR_FLAGS" && AR_FLAGS=cru |
2785 | +_LT_DECL([], [AR], [1], [The archiver]) |
2786 | +_LT_DECL([], [AR_FLAGS], [1]) |
2787 | + |
2788 | +AC_CHECK_TOOL(STRIP, strip, :) |
2789 | +test -z "$STRIP" && STRIP=: |
2790 | +_LT_DECL([], [STRIP], [1], [A symbol stripping program]) |
2791 | + |
2792 | +AC_CHECK_TOOL(RANLIB, ranlib, :) |
2793 | +test -z "$RANLIB" && RANLIB=: |
2794 | +_LT_DECL([], [RANLIB], [1], |
2795 | + [Commands used to install an old-style archive]) |
2796 | + |
2797 | +# Determine commands to create old-style static archives. |
2798 | +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' |
2799 | +old_postinstall_cmds='chmod 644 $oldlib' |
2800 | +old_postuninstall_cmds= |
2801 | + |
2802 | +if test -n "$RANLIB"; then |
2803 | + case $host_os in |
2804 | + openbsd*) |
2805 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
2806 | + ;; |
2807 | + *) |
2808 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
2809 | + ;; |
2810 | + esac |
2811 | + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
2812 | +fi |
2813 | +_LT_DECL([], [old_postinstall_cmds], [2]) |
2814 | +_LT_DECL([], [old_postuninstall_cmds], [2]) |
2815 | +_LT_TAGDECL([], [old_archive_cmds], [2], |
2816 | + [Commands used to build an old-style archive]) |
2817 | +])# _LT_CMD_OLD_ARCHIVE |
2818 | + |
2819 | + |
2820 | +# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, |
2821 | # [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) |
2822 | # ---------------------------------------------------------------- |
2823 | # Check whether the given compiler option works |
2824 | -AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], |
2825 | -[AC_REQUIRE([LT_AC_PROG_SED]) |
2826 | +AC_DEFUN([_LT_COMPILER_OPTION], |
2827 | +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2828 | +m4_require([_LT_DECL_SED])dnl |
2829 | AC_CACHE_CHECK([$1], [$2], |
2830 | [$2=no |
2831 | - ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) |
2832 | - printf "$lt_simple_compile_test_code" > conftest.$ac_ext |
2833 | + m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) |
2834 | + echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
2835 | lt_compiler_flag="$3" |
2836 | # Insert the option either (1) after the last *FLAGS variable, or |
2837 | # (2) before a word containing "conftest.", or (3) at the end. |
2838 | @@ -568,7 +1428,7 @@ |
2839 | # with a dollar sign (not a hyphen), so the echo should work correctly. |
2840 | # The option is referenced via a variable to avoid confusing sed. |
2841 | lt_compile=`echo "$ac_compile" | $SED \ |
2842 | - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
2843 | + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
2844 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
2845 | -e 's:$: $lt_compiler_flag:'` |
2846 | (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2847 | @@ -578,58 +1438,78 @@ |
2848 | echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2849 | if (exit $ac_status) && test -s "$ac_outfile"; then |
2850 | # The compiler can only warn and ignore the option if not recognized |
2851 | - # So say no if there are warnings |
2852 | - if test ! -s conftest.err; then |
2853 | + # So say no if there are warnings other than the usual output. |
2854 | + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
2855 | + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2856 | + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
2857 | $2=yes |
2858 | fi |
2859 | fi |
2860 | - $rm conftest* |
2861 | + $RM conftest* |
2862 | ]) |
2863 | |
2864 | if test x"[$]$2" = xyes; then |
2865 | - ifelse([$5], , :, [$5]) |
2866 | + m4_if([$5], , :, [$5]) |
2867 | else |
2868 | - ifelse([$6], , :, [$6]) |
2869 | + m4_if([$6], , :, [$6]) |
2870 | fi |
2871 | -])# AC_LIBTOOL_COMPILER_OPTION |
2872 | - |
2873 | - |
2874 | -# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, |
2875 | -# [ACTION-SUCCESS], [ACTION-FAILURE]) |
2876 | -# ------------------------------------------------------------ |
2877 | -# Check whether the given compiler option works |
2878 | -AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], |
2879 | -[AC_CACHE_CHECK([$1], [$2], |
2880 | +])# _LT_COMPILER_OPTION |
2881 | + |
2882 | +# Old name: |
2883 | +AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) |
2884 | +dnl aclocal-1.4 backwards compatibility: |
2885 | +dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) |
2886 | + |
2887 | + |
2888 | +# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, |
2889 | +# [ACTION-SUCCESS], [ACTION-FAILURE]) |
2890 | +# ---------------------------------------------------- |
2891 | +# Check whether the given linker option works |
2892 | +AC_DEFUN([_LT_LINKER_OPTION], |
2893 | +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2894 | +m4_require([_LT_DECL_SED])dnl |
2895 | +AC_CACHE_CHECK([$1], [$2], |
2896 | [$2=no |
2897 | save_LDFLAGS="$LDFLAGS" |
2898 | LDFLAGS="$LDFLAGS $3" |
2899 | - printf "$lt_simple_link_test_code" > conftest.$ac_ext |
2900 | + echo "$lt_simple_link_test_code" > conftest.$ac_ext |
2901 | if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
2902 | - # The compiler can only warn and ignore the option if not recognized |
2903 | + # The linker can only warn and ignore the option if not recognized |
2904 | # So say no if there are warnings |
2905 | if test -s conftest.err; then |
2906 | # Append any errors to the config.log. |
2907 | cat conftest.err 1>&AS_MESSAGE_LOG_FD |
2908 | + $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
2909 | + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2910 | + if diff conftest.exp conftest.er2 >/dev/null; then |
2911 | + $2=yes |
2912 | + fi |
2913 | else |
2914 | $2=yes |
2915 | fi |
2916 | fi |
2917 | - $rm conftest* |
2918 | + $RM -r conftest* |
2919 | LDFLAGS="$save_LDFLAGS" |
2920 | ]) |
2921 | |
2922 | if test x"[$]$2" = xyes; then |
2923 | - ifelse([$4], , :, [$4]) |
2924 | + m4_if([$4], , :, [$4]) |
2925 | else |
2926 | - ifelse([$5], , :, [$5]) |
2927 | + m4_if([$5], , :, [$5]) |
2928 | fi |
2929 | -])# AC_LIBTOOL_LINKER_OPTION |
2930 | - |
2931 | - |
2932 | -# AC_LIBTOOL_SYS_MAX_CMD_LEN |
2933 | -# -------------------------- |
2934 | -AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], |
2935 | -[# find the maximum length of command line arguments |
2936 | +])# _LT_LINKER_OPTION |
2937 | + |
2938 | +# Old name: |
2939 | +AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) |
2940 | +dnl aclocal-1.4 backwards compatibility: |
2941 | +dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) |
2942 | + |
2943 | + |
2944 | +# LT_CMD_MAX_LEN |
2945 | +#--------------- |
2946 | +AC_DEFUN([LT_CMD_MAX_LEN], |
2947 | +[AC_REQUIRE([AC_CANONICAL_HOST])dnl |
2948 | +# find the maximum length of command line arguments |
2949 | AC_MSG_CHECKING([the maximum length of command line arguments]) |
2950 | AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl |
2951 | i=0 |
2952 | @@ -651,7 +1531,7 @@ |
2953 | lt_cv_sys_max_cmd_len=-1; |
2954 | ;; |
2955 | |
2956 | - cygwin* | mingw*) |
2957 | + cygwin* | mingw* | cegcc*) |
2958 | # On Win9x/ME, this test blows up -- it succeeds, but takes |
2959 | # about 5 minutes as the teststring grows exponentially. |
2960 | # Worse, since 9x/ME are not pre-emptively multitasking, |
2961 | @@ -668,24 +1548,79 @@ |
2962 | lt_cv_sys_max_cmd_len=8192; |
2963 | ;; |
2964 | |
2965 | - *) |
2966 | - # If test is not a shell built-in, we'll probably end up computing a |
2967 | - # maximum length that is only half of the actual maximum length, but |
2968 | - # we can't tell. |
2969 | - while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ |
2970 | - = "XX$teststring") >/dev/null 2>&1 && |
2971 | - new_result=`expr "X$teststring" : ".*" 2>&1` && |
2972 | - lt_cv_sys_max_cmd_len=$new_result && |
2973 | - test $i != 17 # 1/2 MB should be enough |
2974 | - do |
2975 | - i=`expr $i + 1` |
2976 | - teststring=$teststring$teststring |
2977 | - done |
2978 | - teststring= |
2979 | - # Add a significant safety factor because C++ compilers can tack on massive |
2980 | - # amounts of additional arguments before passing them to the linker. |
2981 | - # It appears as though 1/2 is a usable value. |
2982 | - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` |
2983 | + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) |
2984 | + # This has been around since 386BSD, at least. Likely further. |
2985 | + if test -x /sbin/sysctl; then |
2986 | + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` |
2987 | + elif test -x /usr/sbin/sysctl; then |
2988 | + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` |
2989 | + else |
2990 | + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs |
2991 | + fi |
2992 | + # And add a safety zone |
2993 | + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` |
2994 | + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` |
2995 | + ;; |
2996 | + |
2997 | + interix*) |
2998 | + # We know the value 262144 and hardcode it with a safety zone (like BSD) |
2999 | + lt_cv_sys_max_cmd_len=196608 |
3000 | + ;; |
3001 | + |
3002 | + osf*) |
3003 | + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
3004 | + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
3005 | + # nice to cause kernel panics so lets avoid the loop below. |
3006 | + # First set a reasonable default. |
3007 | + lt_cv_sys_max_cmd_len=16384 |
3008 | + # |
3009 | + if test -x /sbin/sysconfig; then |
3010 | + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in |
3011 | + *1*) lt_cv_sys_max_cmd_len=-1 ;; |
3012 | + esac |
3013 | + fi |
3014 | + ;; |
3015 | + sco3.2v5*) |
3016 | + lt_cv_sys_max_cmd_len=102400 |
3017 | + ;; |
3018 | + sysv5* | sco5v6* | sysv4.2uw2*) |
3019 | + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` |
3020 | + if test -n "$kargmax"; then |
3021 | + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` |
3022 | + else |
3023 | + lt_cv_sys_max_cmd_len=32768 |
3024 | + fi |
3025 | + ;; |
3026 | + *) |
3027 | + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` |
3028 | + if test -n "$lt_cv_sys_max_cmd_len"; then |
3029 | + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` |
3030 | + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` |
3031 | + else |
3032 | + # Make teststring a little bigger before we do anything with it. |
3033 | + # a 1K string should be a reasonable start. |
3034 | + for i in 1 2 3 4 5 6 7 8 ; do |
3035 | + teststring=$teststring$teststring |
3036 | + done |
3037 | + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} |
3038 | + # If test is not a shell built-in, we'll probably end up computing a |
3039 | + # maximum length that is only half of the actual maximum length, but |
3040 | + # we can't tell. |
3041 | + while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ |
3042 | + = "XX$teststring$teststring"; } >/dev/null 2>&1 && |
3043 | + test $i != 17 # 1/2 MB should be enough |
3044 | + do |
3045 | + i=`expr $i + 1` |
3046 | + teststring=$teststring$teststring |
3047 | + done |
3048 | + # Only check the string length outside the loop. |
3049 | + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` |
3050 | + teststring= |
3051 | + # Add a significant safety factor because C++ compilers can tack on |
3052 | + # massive amounts of additional arguments before passing them to the |
3053 | + # linker. It appears as though 1/2 is a usable value. |
3054 | + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` |
3055 | + fi |
3056 | ;; |
3057 | esac |
3058 | ]) |
3059 | @@ -694,27 +1629,35 @@ |
3060 | else |
3061 | AC_MSG_RESULT(none) |
3062 | fi |
3063 | -])# AC_LIBTOOL_SYS_MAX_CMD_LEN |
3064 | - |
3065 | - |
3066 | -# _LT_AC_CHECK_DLFCN |
3067 | -# -------------------- |
3068 | -AC_DEFUN([_LT_AC_CHECK_DLFCN], |
3069 | -[AC_CHECK_HEADERS(dlfcn.h)dnl |
3070 | -])# _LT_AC_CHECK_DLFCN |
3071 | - |
3072 | - |
3073 | -# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, |
3074 | -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) |
3075 | -# ------------------------------------------------------------------ |
3076 | -AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], |
3077 | -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl |
3078 | +max_cmd_len=$lt_cv_sys_max_cmd_len |
3079 | +_LT_DECL([], [max_cmd_len], [0], |
3080 | + [What is the maximum length of a command?]) |
3081 | +])# LT_CMD_MAX_LEN |
3082 | + |
3083 | +# Old name: |
3084 | +AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) |
3085 | +dnl aclocal-1.4 backwards compatibility: |
3086 | +dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) |
3087 | + |
3088 | + |
3089 | +# _LT_HEADER_DLFCN |
3090 | +# ---------------- |
3091 | +m4_defun([_LT_HEADER_DLFCN], |
3092 | +[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl |
3093 | +])# _LT_HEADER_DLFCN |
3094 | + |
3095 | + |
3096 | +# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, |
3097 | +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) |
3098 | +# ---------------------------------------------------------------- |
3099 | +m4_defun([_LT_TRY_DLOPEN_SELF], |
3100 | +[m4_require([_LT_HEADER_DLFCN])dnl |
3101 | if test "$cross_compiling" = yes; then : |
3102 | [$4] |
3103 | else |
3104 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
3105 | lt_status=$lt_dlunknown |
3106 | - cat > conftest.$ac_ext <<EOF |
3107 | + cat > conftest.$ac_ext <<_LT_EOF |
3108 | [#line __oline__ "configure" |
3109 | #include "confdefs.h" |
3110 | |
3111 | @@ -756,10 +1699,6 @@ |
3112 | # endif |
3113 | #endif |
3114 | |
3115 | -#ifdef __cplusplus |
3116 | -extern "C" void exit (int); |
3117 | -#endif |
3118 | - |
3119 | void fnord() { int i=42;} |
3120 | int main () |
3121 | { |
3122 | @@ -772,17 +1711,19 @@ |
3123 | else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
3124 | /* dlclose (self); */ |
3125 | } |
3126 | + else |
3127 | + puts (dlerror ()); |
3128 | |
3129 | - exit (status); |
3130 | + return status; |
3131 | }] |
3132 | -EOF |
3133 | +_LT_EOF |
3134 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then |
3135 | - (./conftest; exit; ) 2>/dev/null |
3136 | + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null |
3137 | lt_status=$? |
3138 | case x$lt_status in |
3139 | x$lt_dlno_uscore) $1 ;; |
3140 | x$lt_dlneed_uscore) $2 ;; |
3141 | - x$lt_unknown|x*) $3 ;; |
3142 | + x$lt_dlunknown|x*) $3 ;; |
3143 | esac |
3144 | else : |
3145 | # compilation failed |
3146 | @@ -790,13 +1731,13 @@ |
3147 | fi |
3148 | fi |
3149 | rm -fr conftest* |
3150 | -])# _LT_AC_TRY_DLOPEN_SELF |
3151 | - |
3152 | - |
3153 | -# AC_LIBTOOL_DLOPEN_SELF |
3154 | -# ------------------- |
3155 | -AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], |
3156 | -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl |
3157 | +])# _LT_TRY_DLOPEN_SELF |
3158 | + |
3159 | + |
3160 | +# LT_SYS_DLOPEN_SELF |
3161 | +# ------------------ |
3162 | +AC_DEFUN([LT_SYS_DLOPEN_SELF], |
3163 | +[m4_require([_LT_HEADER_DLFCN])dnl |
3164 | if test "x$enable_dlopen" != xyes; then |
3165 | enable_dlopen=unknown |
3166 | enable_dlopen_self=unknown |
3167 | @@ -812,15 +1753,15 @@ |
3168 | lt_cv_dlopen_self=yes |
3169 | ;; |
3170 | |
3171 | - mingw* | pw32*) |
3172 | + mingw* | pw32* | cegcc*) |
3173 | lt_cv_dlopen="LoadLibrary" |
3174 | lt_cv_dlopen_libs= |
3175 | - ;; |
3176 | + ;; |
3177 | |
3178 | cygwin*) |
3179 | lt_cv_dlopen="dlopen" |
3180 | lt_cv_dlopen_libs= |
3181 | - ;; |
3182 | + ;; |
3183 | |
3184 | darwin*) |
3185 | # if libdl is installed we need to link against it |
3186 | @@ -830,13 +1771,13 @@ |
3187 | lt_cv_dlopen_libs= |
3188 | lt_cv_dlopen_self=yes |
3189 | ]) |
3190 | - ;; |
3191 | + ;; |
3192 | |
3193 | *) |
3194 | AC_CHECK_FUNC([shl_load], |
3195 | [lt_cv_dlopen="shl_load"], |
3196 | [AC_CHECK_LIB([dld], [shl_load], |
3197 | - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], |
3198 | + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], |
3199 | [AC_CHECK_FUNC([dlopen], |
3200 | [lt_cv_dlopen="dlopen"], |
3201 | [AC_CHECK_LIB([dl], [dlopen], |
3202 | @@ -844,7 +1785,7 @@ |
3203 | [AC_CHECK_LIB([svld], [dlopen], |
3204 | [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], |
3205 | [AC_CHECK_LIB([dld], [dld_link], |
3206 | - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) |
3207 | + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) |
3208 | ]) |
3209 | ]) |
3210 | ]) |
3211 | @@ -865,23 +1806,23 @@ |
3212 | test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" |
3213 | |
3214 | save_LDFLAGS="$LDFLAGS" |
3215 | - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" |
3216 | + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" |
3217 | |
3218 | save_LIBS="$LIBS" |
3219 | LIBS="$lt_cv_dlopen_libs $LIBS" |
3220 | |
3221 | AC_CACHE_CHECK([whether a program can dlopen itself], |
3222 | lt_cv_dlopen_self, [dnl |
3223 | - _LT_AC_TRY_DLOPEN_SELF( |
3224 | + _LT_TRY_DLOPEN_SELF( |
3225 | lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, |
3226 | lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) |
3227 | ]) |
3228 | |
3229 | if test "x$lt_cv_dlopen_self" = xyes; then |
3230 | - LDFLAGS="$LDFLAGS $link_static_flag" |
3231 | + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" |
3232 | AC_CACHE_CHECK([whether a statically linked program can dlopen itself], |
3233 | - lt_cv_dlopen_self_static, [dnl |
3234 | - _LT_AC_TRY_DLOPEN_SELF( |
3235 | + lt_cv_dlopen_self_static, [dnl |
3236 | + _LT_TRY_DLOPEN_SELF( |
3237 | lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, |
3238 | lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) |
3239 | ]) |
3240 | @@ -903,22 +1844,36 @@ |
3241 | *) enable_dlopen_self_static=unknown ;; |
3242 | esac |
3243 | fi |
3244 | -])# AC_LIBTOOL_DLOPEN_SELF |
3245 | - |
3246 | - |
3247 | -# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) |
3248 | -# --------------------------------- |
3249 | -# Check to see if options -c and -o are simultaneously supported by compiler |
3250 | -AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], |
3251 | -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl |
3252 | +_LT_DECL([dlopen_support], [enable_dlopen], [0], |
3253 | + [Whether dlopen is supported]) |
3254 | +_LT_DECL([dlopen_self], [enable_dlopen_self], [0], |
3255 | + [Whether dlopen of programs is supported]) |
3256 | +_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], |
3257 | + [Whether dlopen of statically linked programs is supported]) |
3258 | +])# LT_SYS_DLOPEN_SELF |
3259 | + |
3260 | +# Old name: |
3261 | +AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) |
3262 | +dnl aclocal-1.4 backwards compatibility: |
3263 | +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) |
3264 | + |
3265 | + |
3266 | +# _LT_COMPILER_C_O([TAGNAME]) |
3267 | +# --------------------------- |
3268 | +# Check to see if options -c and -o are simultaneously supported by compiler. |
3269 | +# This macro does not hard code the compiler like AC_PROG_CC_C_O. |
3270 | +m4_defun([_LT_COMPILER_C_O], |
3271 | +[m4_require([_LT_DECL_SED])dnl |
3272 | +m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
3273 | +m4_require([_LT_TAG_COMPILER])dnl |
3274 | AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], |
3275 | - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], |
3276 | - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no |
3277 | - $rm -r conftest 2>/dev/null |
3278 | + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], |
3279 | + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no |
3280 | + $RM -r conftest 2>/dev/null |
3281 | mkdir conftest |
3282 | cd conftest |
3283 | mkdir out |
3284 | - printf "$lt_simple_compile_test_code" > conftest.$ac_ext |
3285 | + echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
3286 | |
3287 | lt_compiler_flag="-o out/conftest2.$ac_objext" |
3288 | # Insert the option either (1) after the last *FLAGS variable, or |
3289 | @@ -926,7 +1881,7 @@ |
3290 | # Note that $ac_compile itself does not contain backslashes and begins |
3291 | # with a dollar sign (not a hyphen), so the echo should work correctly. |
3292 | lt_compile=`echo "$ac_compile" | $SED \ |
3293 | - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ |
3294 | + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
3295 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
3296 | -e 's:$: $lt_compiler_flag:'` |
3297 | (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
3298 | @@ -938,35 +1893,41 @@ |
3299 | then |
3300 | # The compiler can only warn and ignore the option if not recognized |
3301 | # So say no if there are warnings |
3302 | - if test ! -s out/conftest.err; then |
3303 | - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes |
3304 | + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
3305 | + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
3306 | + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
3307 | + _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes |
3308 | fi |
3309 | fi |
3310 | - chmod u+w . |
3311 | - $rm conftest* |
3312 | + chmod u+w . 2>&AS_MESSAGE_LOG_FD |
3313 | + $RM conftest* |
3314 | # SGI C++ compiler will create directory out/ii_files/ for |
3315 | # template instantiation |
3316 | - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files |
3317 | - $rm out/* && rmdir out |
3318 | + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files |
3319 | + $RM out/* && rmdir out |
3320 | cd .. |
3321 | - rmdir conftest |
3322 | - $rm conftest* |
3323 | + $RM -r conftest |
3324 | + $RM conftest* |
3325 | ]) |
3326 | -])# AC_LIBTOOL_PROG_CC_C_O |
3327 | - |
3328 | - |
3329 | -# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) |
3330 | -# ----------------------------------------- |
3331 | +_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], |
3332 | + [Does compiler simultaneously support -c and -o options?]) |
3333 | +])# _LT_COMPILER_C_O |
3334 | + |
3335 | + |
3336 | +# _LT_COMPILER_FILE_LOCKS([TAGNAME]) |
3337 | +# ---------------------------------- |
3338 | # Check to see if we can do hard links to lock some files if needed |
3339 | -AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], |
3340 | -[AC_REQUIRE([_LT_AC_LOCK])dnl |
3341 | +m4_defun([_LT_COMPILER_FILE_LOCKS], |
3342 | +[m4_require([_LT_ENABLE_LOCK])dnl |
3343 | +m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
3344 | +_LT_COMPILER_C_O([$1]) |
3345 | |
3346 | hard_links="nottested" |
3347 | -if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then |
3348 | +if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then |
3349 | # do not overwrite the value of need_locks provided by the user |
3350 | AC_MSG_CHECKING([if we can lock with hard links]) |
3351 | hard_links=yes |
3352 | - $rm conftest* |
3353 | + $RM conftest* |
3354 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
3355 | touch conftest.a |
3356 | ln conftest.a conftest.b 2>&5 || hard_links=no |
3357 | @@ -979,12 +1940,13 @@ |
3358 | else |
3359 | need_locks=no |
3360 | fi |
3361 | -])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS |
3362 | - |
3363 | - |
3364 | -# AC_LIBTOOL_OBJDIR |
3365 | -# ----------------- |
3366 | -AC_DEFUN([AC_LIBTOOL_OBJDIR], |
3367 | +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) |
3368 | +])# _LT_COMPILER_FILE_LOCKS |
3369 | + |
3370 | + |
3371 | +# _LT_CHECK_OBJDIR |
3372 | +# ---------------- |
3373 | +m4_defun([_LT_CHECK_OBJDIR], |
3374 | [AC_CACHE_CHECK([for objdir], [lt_cv_objdir], |
3375 | [rm -f .libs 2>/dev/null |
3376 | mkdir .libs 2>/dev/null |
3377 | @@ -996,40 +1958,46 @@ |
3378 | fi |
3379 | rmdir .libs 2>/dev/null]) |
3380 | objdir=$lt_cv_objdir |
3381 | -])# AC_LIBTOOL_OBJDIR |
3382 | - |
3383 | - |
3384 | -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) |
3385 | -# ---------------------------------------------- |
3386 | +_LT_DECL([], [objdir], [0], |
3387 | + [The name of the directory that contains temporary libtool files])dnl |
3388 | +m4_pattern_allow([LT_OBJDIR])dnl |
3389 | +AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", |
3390 | + [Define to the sub-directory in which libtool stores uninstalled libraries.]) |
3391 | +])# _LT_CHECK_OBJDIR |
3392 | + |
3393 | + |
3394 | +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) |
3395 | +# -------------------------------------- |
3396 | # Check hardcoding attributes. |
3397 | -AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], |
3398 | +m4_defun([_LT_LINKER_HARDCODE_LIBPATH], |
3399 | [AC_MSG_CHECKING([how to hardcode library paths into programs]) |
3400 | -_LT_AC_TAGVAR(hardcode_action, $1)= |
3401 | -if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ |
3402 | - test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ |
3403 | - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then |
3404 | +_LT_TAGVAR(hardcode_action, $1)= |
3405 | +if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || |
3406 | + test -n "$_LT_TAGVAR(runpath_var, $1)" || |
3407 | + test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then |
3408 | |
3409 | - # We can hardcode non-existant directories. |
3410 | - if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && |
3411 | + # We can hardcode non-existent directories. |
3412 | + if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && |
3413 | # If the only mechanism to avoid hardcoding is shlibpath_var, we |
3414 | # have to relink, otherwise we might link with an installed library |
3415 | # when we should be linking with a yet-to-be-installed one |
3416 | - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && |
3417 | - test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then |
3418 | + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && |
3419 | + test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then |
3420 | # Linking always hardcodes the temporary library directory. |
3421 | - _LT_AC_TAGVAR(hardcode_action, $1)=relink |
3422 | + _LT_TAGVAR(hardcode_action, $1)=relink |
3423 | else |
3424 | # We can link without hardcoding, and we can hardcode nonexisting dirs. |
3425 | - _LT_AC_TAGVAR(hardcode_action, $1)=immediate |
3426 | + _LT_TAGVAR(hardcode_action, $1)=immediate |
3427 | fi |
3428 | else |
3429 | # We cannot hardcode anything, or else we can only hardcode existing |
3430 | # directories. |
3431 | - _LT_AC_TAGVAR(hardcode_action, $1)=unsupported |
3432 | + _LT_TAGVAR(hardcode_action, $1)=unsupported |
3433 | fi |
3434 | -AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) |
3435 | +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) |
3436 | |
3437 | -if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then |
3438 | +if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || |
3439 | + test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then |
3440 | # Fast installation is not supported |
3441 | enable_fast_install=no |
3442 | elif test "$shlibpath_overrides_runpath" = yes || |
3443 | @@ -1037,43 +2005,107 @@ |
3444 | # Fast installation is not necessary |
3445 | enable_fast_install=needless |
3446 | fi |
3447 | -])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH |
3448 | - |
3449 | - |
3450 | -# AC_LIBTOOL_SYS_LIB_STRIP |
3451 | -# ------------------------ |
3452 | -AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], |
3453 | -[striplib= |
3454 | +_LT_TAGDECL([], [hardcode_action], [0], |
3455 | + [How to hardcode a shared library path into an executable]) |
3456 | +])# _LT_LINKER_HARDCODE_LIBPATH |
3457 | + |
3458 | + |
3459 | +# _LT_CMD_STRIPLIB |
3460 | +# ---------------- |
3461 | +m4_defun([_LT_CMD_STRIPLIB], |
3462 | +[m4_require([_LT_DECL_EGREP]) |
3463 | +striplib= |
3464 | old_striplib= |
3465 | AC_MSG_CHECKING([whether stripping libraries is possible]) |
3466 | -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then |
3467 | +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then |
3468 | test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" |
3469 | test -z "$striplib" && striplib="$STRIP --strip-unneeded" |
3470 | AC_MSG_RESULT([yes]) |
3471 | else |
3472 | # FIXME - insert some real tests, host_os isn't really good enough |
3473 | case $host_os in |
3474 | - darwin*) |
3475 | - if test -n "$STRIP" ; then |
3476 | - striplib="$STRIP -x" |
3477 | - AC_MSG_RESULT([yes]) |
3478 | - else |
3479 | - AC_MSG_RESULT([no]) |
3480 | -fi |
3481 | - ;; |
3482 | - *) |
3483 | - AC_MSG_RESULT([no]) |
3484 | + darwin*) |
3485 | + if test -n "$STRIP" ; then |
3486 | + striplib="$STRIP -x" |
3487 | + old_striplib="$STRIP -S" |
3488 | + AC_MSG_RESULT([yes]) |
3489 | + else |
3490 | + AC_MSG_RESULT([no]) |
3491 | + fi |
3492 | + ;; |
3493 | + *) |
3494 | + AC_MSG_RESULT([no]) |
3495 | ;; |
3496 | esac |
3497 | fi |
3498 | -])# AC_LIBTOOL_SYS_LIB_STRIP |
3499 | - |
3500 | - |
3501 | -# AC_LIBTOOL_SYS_DYNAMIC_LINKER |
3502 | +_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) |
3503 | +_LT_DECL([], [striplib], [1]) |
3504 | +])# _LT_CMD_STRIPLIB |
3505 | + |
3506 | + |
3507 | +# _LT_SYS_DYNAMIC_LINKER([TAG]) |
3508 | # ----------------------------- |
3509 | # PORTME Fill in your ld.so characteristics |
3510 | -AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], |
3511 | -[AC_MSG_CHECKING([dynamic linker characteristics]) |
3512 | +m4_defun([_LT_SYS_DYNAMIC_LINKER], |
3513 | +[AC_REQUIRE([AC_CANONICAL_HOST])dnl |
3514 | +m4_require([_LT_DECL_EGREP])dnl |
3515 | +m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
3516 | +m4_require([_LT_DECL_OBJDUMP])dnl |
3517 | +m4_require([_LT_DECL_SED])dnl |
3518 | +AC_MSG_CHECKING([dynamic linker characteristics]) |
3519 | +m4_if([$1], |
3520 | + [], [ |
3521 | +if test "$GCC" = yes; then |
3522 | + case $host_os in |
3523 | + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; |
3524 | + *) lt_awk_arg="/^libraries:/" ;; |
3525 | + esac |
3526 | + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
3527 | + if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then |
3528 | + # if the path contains ";" then we assume it to be the separator |
3529 | + # otherwise default to the standard path separator (i.e. ":") - it is |
3530 | + # assumed that no part of a normal pathname contains ";" but that should |
3531 | + # okay in the real world where ";" in dirpaths is itself problematic. |
3532 | + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` |
3533 | + else |
3534 | + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
3535 | + fi |
3536 | + # Ok, now we have the path, separated by spaces, we can step through it |
3537 | + # and add multilib dir if necessary. |
3538 | + lt_tmp_lt_search_path_spec= |
3539 | + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` |
3540 | + for lt_sys_path in $lt_search_path_spec; do |
3541 | + if test -d "$lt_sys_path/$lt_multi_os_dir"; then |
3542 | + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" |
3543 | + else |
3544 | + test -d "$lt_sys_path" && \ |
3545 | + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" |
3546 | + fi |
3547 | + done |
3548 | + lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' |
3549 | +BEGIN {RS=" "; FS="/|\n";} { |
3550 | + lt_foo=""; |
3551 | + lt_count=0; |
3552 | + for (lt_i = NF; lt_i > 0; lt_i--) { |
3553 | + if ($lt_i != "" && $lt_i != ".") { |
3554 | + if ($lt_i == "..") { |
3555 | + lt_count++; |
3556 | + } else { |
3557 | + if (lt_count == 0) { |
3558 | + lt_foo="/" $lt_i lt_foo; |
3559 | + } else { |
3560 | + lt_count--; |
3561 | + } |
3562 | + } |
3563 | + } |
3564 | + } |
3565 | + if (lt_foo != "") { lt_freq[[lt_foo]]++; } |
3566 | + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } |
3567 | +}'` |
3568 | + sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` |
3569 | +else |
3570 | + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" |
3571 | +fi]) |
3572 | library_names_spec= |
3573 | libname_spec='lib$name' |
3574 | soname_spec= |
3575 | @@ -1087,20 +2119,6 @@ |
3576 | version_type=none |
3577 | dynamic_linker="$host_os ld.so" |
3578 | sys_lib_dlsearch_path_spec="/lib /usr/lib" |
3579 | -if test "$GCC" = yes; then |
3580 | - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
3581 | - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then |
3582 | - # if the path contains ";" then we assume it to be the separator |
3583 | - # otherwise default to the standard path separator (i.e. ":") - it is |
3584 | - # assumed that no part of a normal pathname contains ";" but that should |
3585 | - # okay in the real world where ";" in dirpaths is itself problematic. |
3586 | - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
3587 | - else |
3588 | - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
3589 | - fi |
3590 | -else |
3591 | - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" |
3592 | -fi |
3593 | need_lib_prefix=unknown |
3594 | hardcode_into_libs=no |
3595 | |
3596 | @@ -1118,7 +2136,7 @@ |
3597 | soname_spec='${libname}${release}${shared_ext}$major' |
3598 | ;; |
3599 | |
3600 | -aix4* | aix5*) |
3601 | +aix[[4-9]]*) |
3602 | version_type=linux |
3603 | need_lib_prefix=no |
3604 | need_version=no |
3605 | @@ -1137,7 +2155,7 @@ |
3606 | aix4 | aix4.[[01]] | aix4.[[01]].*) |
3607 | if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' |
3608 | echo ' yes ' |
3609 | - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then |
3610 | + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then |
3611 | : |
3612 | else |
3613 | can_build_shared=no |
3614 | @@ -1163,9 +2181,18 @@ |
3615 | ;; |
3616 | |
3617 | amigaos*) |
3618 | - library_names_spec='$libname.ixlibrary $libname.a' |
3619 | - # Create ${libname}_ixlibrary.a entries in /sys/libs. |
3620 | - 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' |
3621 | + case $host_cpu in |
3622 | + powerpc) |
3623 | + # Since July 2007 AmigaOS4 officially supports .so libraries. |
3624 | + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. |
3625 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3626 | + ;; |
3627 | + m68k) |
3628 | + library_names_spec='$libname.ixlibrary $libname.a' |
3629 | + # Create ${libname}_ixlibrary.a entries in /sys/libs. |
3630 | + 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' |
3631 | + ;; |
3632 | + esac |
3633 | ;; |
3634 | |
3635 | beos*) |
3636 | @@ -1174,7 +2201,7 @@ |
3637 | shlibpath_var=LIBRARY_PATH |
3638 | ;; |
3639 | |
3640 | -bsdi4*) |
3641 | +bsdi[[45]]*) |
3642 | version_type=linux |
3643 | need_version=no |
3644 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3645 | @@ -1188,24 +2215,28 @@ |
3646 | # libtool to hard-code these into programs |
3647 | ;; |
3648 | |
3649 | -cygwin* | mingw* | pw32*) |
3650 | +cygwin* | mingw* | pw32* | cegcc*) |
3651 | version_type=windows |
3652 | shrext_cmds=".dll" |
3653 | need_version=no |
3654 | need_lib_prefix=no |
3655 | |
3656 | case $GCC,$host_os in |
3657 | - yes,cygwin* | yes,mingw* | yes,pw32*) |
3658 | + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
3659 | library_names_spec='$libname.dll.a' |
3660 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
3661 | postinstall_cmds='base_file=`basename \${file}`~ |
3662 | - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ |
3663 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
3664 | dldir=$destdir/`dirname \$dlpath`~ |
3665 | test -d \$dldir || mkdir -p \$dldir~ |
3666 | - $install_prog $dir/$dlname \$dldir/$dlname' |
3667 | + $install_prog $dir/$dlname \$dldir/$dlname~ |
3668 | + chmod a+x \$dldir/$dlname~ |
3669 | + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then |
3670 | + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; |
3671 | + fi' |
3672 | postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
3673 | dlpath=$dir/\$dldll~ |
3674 | - $rm \$dlpath' |
3675 | + $RM \$dlpath' |
3676 | shlibpath_overrides_runpath=yes |
3677 | |
3678 | case $host_os in |
3679 | @@ -1214,25 +2245,25 @@ |
3680 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
3681 | sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" |
3682 | ;; |
3683 | - mingw*) |
3684 | + mingw* | cegcc*) |
3685 | # MinGW DLLs use traditional 'lib' prefix |
3686 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
3687 | - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
3688 | - if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then |
3689 | + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
3690 | + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then |
3691 | # It is most probably a Windows format PATH printed by |
3692 | # mingw gcc, but we are running on Cygwin. Gcc prints its search |
3693 | # path with ; separators, and with drive letters. We can handle the |
3694 | # drive letters (cygwin fileutils understands them), so leave them, |
3695 | # especially as we might pass files found there to a mingw objdump, |
3696 | # which wouldn't understand a cygwinified path. Ahh. |
3697 | - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
3698 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
3699 | else |
3700 | - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
3701 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
3702 | fi |
3703 | ;; |
3704 | pw32*) |
3705 | # pw32 DLLs use 'pw' prefix rather than 'lib' |
3706 | - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
3707 | + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
3708 | ;; |
3709 | esac |
3710 | ;; |
3711 | @@ -1251,17 +2282,13 @@ |
3712 | version_type=darwin |
3713 | need_lib_prefix=no |
3714 | need_version=no |
3715 | - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' |
3716 | + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' |
3717 | soname_spec='${libname}${release}${major}$shared_ext' |
3718 | shlibpath_overrides_runpath=yes |
3719 | shlibpath_var=DYLD_LIBRARY_PATH |
3720 | - shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' |
3721 | - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. |
3722 | - if test "$GCC" = yes; then |
3723 | - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` |
3724 | - else |
3725 | - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' |
3726 | - fi |
3727 | + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' |
3728 | +m4_if([$1], [],[ |
3729 | + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) |
3730 | sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' |
3731 | ;; |
3732 | |
3733 | @@ -1278,20 +2305,17 @@ |
3734 | dynamic_linker=no |
3735 | ;; |
3736 | |
3737 | -kfreebsd*-gnu) |
3738 | - version_type=linux |
3739 | - need_lib_prefix=no |
3740 | - need_version=no |
3741 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
3742 | - soname_spec='${libname}${release}${shared_ext}$major' |
3743 | - shlibpath_var=LD_LIBRARY_PATH |
3744 | - shlibpath_overrides_runpath=no |
3745 | - hardcode_into_libs=yes |
3746 | - dynamic_linker='GNU ld.so' |
3747 | - ;; |
3748 | - |
3749 | -freebsd*) |
3750 | - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` |
3751 | +freebsd* | dragonfly*) |
3752 | + # DragonFly does not have aout. When/if they implement a new |
3753 | + # versioning mechanism, adjust this. |
3754 | + if test -x /usr/bin/objformat; then |
3755 | + objformat=`/usr/bin/objformat` |
3756 | + else |
3757 | + case $host_os in |
3758 | + freebsd[[123]]*) objformat=aout ;; |
3759 | + *) objformat=elf ;; |
3760 | + esac |
3761 | + fi |
3762 | version_type=freebsd-$objformat |
3763 | case $version_type in |
3764 | freebsd-elf*) |
3765 | @@ -1309,14 +2333,19 @@ |
3766 | freebsd2*) |
3767 | shlibpath_overrides_runpath=yes |
3768 | ;; |
3769 | - freebsd3.[01]* | freebsdelf3.[01]*) |
3770 | + freebsd3.[[01]]* | freebsdelf3.[[01]]*) |
3771 | shlibpath_overrides_runpath=yes |
3772 | hardcode_into_libs=yes |
3773 | ;; |
3774 | - *) # from 3.2 on |
3775 | + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ |
3776 | + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) |
3777 | shlibpath_overrides_runpath=no |
3778 | hardcode_into_libs=yes |
3779 | ;; |
3780 | + *) # from 4.6 on, and DragonFly |
3781 | + shlibpath_overrides_runpath=yes |
3782 | + hardcode_into_libs=yes |
3783 | + ;; |
3784 | esac |
3785 | ;; |
3786 | |
3787 | @@ -1336,7 +2365,7 @@ |
3788 | version_type=sunos |
3789 | need_lib_prefix=no |
3790 | need_version=no |
3791 | - case "$host_cpu" in |
3792 | + case $host_cpu in |
3793 | ia64*) |
3794 | shrext_cmds='.so' |
3795 | hardcode_into_libs=yes |
3796 | @@ -1352,18 +2381,18 @@ |
3797 | fi |
3798 | sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
3799 | ;; |
3800 | - hppa*64*) |
3801 | - shrext_cmds='.sl' |
3802 | - hardcode_into_libs=yes |
3803 | - dynamic_linker="$host_os dld.sl" |
3804 | - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH |
3805 | - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. |
3806 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3807 | - soname_spec='${libname}${release}${shared_ext}$major' |
3808 | - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" |
3809 | - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
3810 | - ;; |
3811 | - *) |
3812 | + hppa*64*) |
3813 | + shrext_cmds='.sl' |
3814 | + hardcode_into_libs=yes |
3815 | + dynamic_linker="$host_os dld.sl" |
3816 | + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH |
3817 | + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. |
3818 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3819 | + soname_spec='${libname}${release}${shared_ext}$major' |
3820 | + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" |
3821 | + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec |
3822 | + ;; |
3823 | + *) |
3824 | shrext_cmds='.sl' |
3825 | dynamic_linker="$host_os dld.sl" |
3826 | shlibpath_var=SHLIB_PATH |
3827 | @@ -1376,6 +2405,18 @@ |
3828 | postinstall_cmds='chmod 555 $lib' |
3829 | ;; |
3830 | |
3831 | +interix[[3-9]]*) |
3832 | + version_type=linux |
3833 | + need_lib_prefix=no |
3834 | + need_version=no |
3835 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
3836 | + soname_spec='${libname}${release}${shared_ext}$major' |
3837 | + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' |
3838 | + shlibpath_var=LD_LIBRARY_PATH |
3839 | + shlibpath_overrides_runpath=no |
3840 | + hardcode_into_libs=yes |
3841 | + ;; |
3842 | + |
3843 | irix5* | irix6* | nonstopux*) |
3844 | case $host_os in |
3845 | nonstopux*) version_type=nonstopux ;; |
3846 | @@ -1419,7 +2460,7 @@ |
3847 | ;; |
3848 | |
3849 | # This must be Linux ELF. |
3850 | -linux*) |
3851 | +linux* | k*bsd*-gnu) |
3852 | version_type=linux |
3853 | need_lib_prefix=no |
3854 | need_version=no |
3855 | @@ -1428,6 +2469,17 @@ |
3856 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
3857 | shlibpath_var=LD_LIBRARY_PATH |
3858 | shlibpath_overrides_runpath=no |
3859 | + # Some binutils ld are patched to set DT_RUNPATH |
3860 | + save_LDFLAGS=$LDFLAGS |
3861 | + save_libdir=$libdir |
3862 | + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ |
3863 | + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" |
3864 | + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
3865 | + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], |
3866 | + [shlibpath_overrides_runpath=yes])]) |
3867 | + LDFLAGS=$save_LDFLAGS |
3868 | + libdir=$save_libdir |
3869 | + |
3870 | # This implies no fast_install, which is unacceptable. |
3871 | # Some rework will be needed to allow for fast_install |
3872 | # before this can be enabled. |
3873 | @@ -1435,7 +2487,7 @@ |
3874 | |
3875 | # Append ld.so.conf contents to the search path |
3876 | if test -f /etc/ld.so.conf; then |
3877 | - lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '` |
3878 | + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
3879 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
3880 | fi |
3881 | |
3882 | @@ -1448,35 +2500,11 @@ |
3883 | dynamic_linker='GNU/Linux ld.so' |
3884 | ;; |
3885 | |
3886 | -netbsdelf*-gnu) |
3887 | - version_type=linux |
3888 | - need_lib_prefix=no |
3889 | - need_version=no |
3890 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
3891 | - soname_spec='${libname}${release}${shared_ext}$major' |
3892 | - shlibpath_var=LD_LIBRARY_PATH |
3893 | - shlibpath_overrides_runpath=no |
3894 | - hardcode_into_libs=yes |
3895 | - dynamic_linker='NetBSD ld.elf_so' |
3896 | - ;; |
3897 | - |
3898 | -knetbsd*-gnu) |
3899 | - version_type=linux |
3900 | - need_lib_prefix=no |
3901 | - need_version=no |
3902 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
3903 | - soname_spec='${libname}${release}${shared_ext}$major' |
3904 | - shlibpath_var=LD_LIBRARY_PATH |
3905 | - shlibpath_overrides_runpath=no |
3906 | - hardcode_into_libs=yes |
3907 | - dynamic_linker='GNU ld.so' |
3908 | - ;; |
3909 | - |
3910 | netbsd*) |
3911 | version_type=sunos |
3912 | need_lib_prefix=no |
3913 | need_version=no |
3914 | - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then |
3915 | + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
3916 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
3917 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
3918 | dynamic_linker='NetBSD (a.out) ld.so' |
3919 | @@ -1497,24 +2525,31 @@ |
3920 | shlibpath_overrides_runpath=yes |
3921 | ;; |
3922 | |
3923 | -nto-qnx*) |
3924 | - version_type=linux |
3925 | +*nto* | *qnx*) |
3926 | + version_type=qnx |
3927 | need_lib_prefix=no |
3928 | need_version=no |
3929 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3930 | soname_spec='${libname}${release}${shared_ext}$major' |
3931 | shlibpath_var=LD_LIBRARY_PATH |
3932 | - shlibpath_overrides_runpath=yes |
3933 | + shlibpath_overrides_runpath=no |
3934 | + hardcode_into_libs=yes |
3935 | + dynamic_linker='ldqnx.so' |
3936 | ;; |
3937 | |
3938 | openbsd*) |
3939 | version_type=sunos |
3940 | + sys_lib_dlsearch_path_spec="/usr/lib" |
3941 | need_lib_prefix=no |
3942 | - need_version=yes |
3943 | + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. |
3944 | + case $host_os in |
3945 | + openbsd3.3 | openbsd3.3.*) need_version=yes ;; |
3946 | + *) need_version=no ;; |
3947 | + esac |
3948 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' |
3949 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' |
3950 | shlibpath_var=LD_LIBRARY_PATH |
3951 | - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
3952 | + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
3953 | case $host_os in |
3954 | openbsd2.[[89]] | openbsd2.[[89]].*) |
3955 | shlibpath_overrides_runpath=no |
3956 | @@ -1548,11 +2583,8 @@ |
3957 | sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" |
3958 | ;; |
3959 | |
3960 | -sco3.2v5*) |
3961 | - version_type=osf |
3962 | - soname_spec='${libname}${release}${shared_ext}$major' |
3963 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3964 | - shlibpath_var=LD_LIBRARY_PATH |
3965 | +rdos*) |
3966 | + dynamic_linker=no |
3967 | ;; |
3968 | |
3969 | solaris*) |
3970 | @@ -1580,7 +2612,7 @@ |
3971 | need_version=yes |
3972 | ;; |
3973 | |
3974 | -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
3975 | +sysv4 | sysv4.3*) |
3976 | version_type=linux |
3977 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3978 | soname_spec='${libname}${release}${shared_ext}$major' |
3979 | @@ -1589,7 +2621,6 @@ |
3980 | sni) |
3981 | shlibpath_overrides_runpath=no |
3982 | need_lib_prefix=no |
3983 | - export_dynamic_flag_spec='${wl}-Blargedynsym' |
3984 | runpath_var=LD_RUN_PATH |
3985 | ;; |
3986 | siemens) |
3987 | @@ -1613,6 +2644,39 @@ |
3988 | fi |
3989 | ;; |
3990 | |
3991 | +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) |
3992 | + version_type=freebsd-elf |
3993 | + need_lib_prefix=no |
3994 | + need_version=no |
3995 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
3996 | + soname_spec='${libname}${release}${shared_ext}$major' |
3997 | + shlibpath_var=LD_LIBRARY_PATH |
3998 | + shlibpath_overrides_runpath=yes |
3999 | + hardcode_into_libs=yes |
4000 | + if test "$with_gnu_ld" = yes; then |
4001 | + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' |
4002 | + else |
4003 | + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' |
4004 | + case $host_os in |
4005 | + sco3.2v5*) |
4006 | + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" |
4007 | + ;; |
4008 | + esac |
4009 | + fi |
4010 | + sys_lib_dlsearch_path_spec='/usr/lib' |
4011 | + ;; |
4012 | + |
4013 | +tpf*) |
4014 | + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
4015 | + version_type=linux |
4016 | + need_lib_prefix=no |
4017 | + need_version=no |
4018 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4019 | + shlibpath_var=LD_LIBRARY_PATH |
4020 | + shlibpath_overrides_runpath=no |
4021 | + hardcode_into_libs=yes |
4022 | + ;; |
4023 | + |
4024 | uts4*) |
4025 | version_type=linux |
4026 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4027 | @@ -1626,271 +2690,59 @@ |
4028 | esac |
4029 | AC_MSG_RESULT([$dynamic_linker]) |
4030 | test "$dynamic_linker" = no && can_build_shared=no |
4031 | -])# AC_LIBTOOL_SYS_DYNAMIC_LINKER |
4032 | - |
4033 | - |
4034 | -# _LT_AC_TAGCONFIG |
4035 | -# ---------------- |
4036 | -AC_DEFUN([_LT_AC_TAGCONFIG], |
4037 | -[AC_ARG_WITH([tags], |
4038 | - [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], |
4039 | - [include additional configurations @<:@automatic@:>@])], |
4040 | - [tagnames="$withval"]) |
4041 | - |
4042 | -if test -f "$ltmain" && test -n "$tagnames"; then |
4043 | - if test ! -f "${ofile}"; then |
4044 | - AC_MSG_WARN([output file `$ofile' does not exist]) |
4045 | - fi |
4046 | - |
4047 | - if test -z "$LTCC"; then |
4048 | - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" |
4049 | - if test -z "$LTCC"; then |
4050 | - AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) |
4051 | - else |
4052 | - AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) |
4053 | - fi |
4054 | - fi |
4055 | - |
4056 | - # Extract list of available tagged configurations in $ofile. |
4057 | - # Note that this assumes the entire list is on one line. |
4058 | - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` |
4059 | - |
4060 | - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," |
4061 | - for tagname in $tagnames; do |
4062 | - IFS="$lt_save_ifs" |
4063 | - # Check whether tagname contains only valid characters |
4064 | - case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in |
4065 | - "") ;; |
4066 | - *) AC_MSG_ERROR([invalid tag name: $tagname]) |
4067 | - ;; |
4068 | - esac |
4069 | - |
4070 | - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null |
4071 | - then |
4072 | - AC_MSG_ERROR([tag name \"$tagname\" already exists]) |
4073 | - fi |
4074 | - |
4075 | - # Update the list of available tags. |
4076 | - if test -n "$tagname"; then |
4077 | - echo appending configuration tag \"$tagname\" to $ofile |
4078 | - |
4079 | - case $tagname in |
4080 | - CXX) |
4081 | - if test -n "$CXX" && test "X$CXX" != "Xno"; then |
4082 | - AC_LIBTOOL_LANG_CXX_CONFIG |
4083 | - else |
4084 | - tagname="" |
4085 | - fi |
4086 | - ;; |
4087 | - |
4088 | - F77) |
4089 | - if test -n "$F77" && test "X$F77" != "Xno"; then |
4090 | - AC_LIBTOOL_LANG_F77_CONFIG |
4091 | - else |
4092 | - tagname="" |
4093 | - fi |
4094 | - ;; |
4095 | - |
4096 | - GCJ) |
4097 | - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then |
4098 | - AC_LIBTOOL_LANG_GCJ_CONFIG |
4099 | - else |
4100 | - tagname="" |
4101 | - fi |
4102 | - ;; |
4103 | - |
4104 | - RC) |
4105 | - AC_LIBTOOL_LANG_RC_CONFIG |
4106 | - ;; |
4107 | - |
4108 | - *) |
4109 | - AC_MSG_ERROR([Unsupported tag name: $tagname]) |
4110 | - ;; |
4111 | - esac |
4112 | - |
4113 | - # Append the new tag name to the list of available tags. |
4114 | - if test -n "$tagname" ; then |
4115 | - available_tags="$available_tags $tagname" |
4116 | - fi |
4117 | - fi |
4118 | - done |
4119 | - IFS="$lt_save_ifs" |
4120 | - |
4121 | - # Now substitute the updated list of available tags. |
4122 | - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then |
4123 | - mv "${ofile}T" "$ofile" |
4124 | - chmod +x "$ofile" |
4125 | - else |
4126 | - rm -f "${ofile}T" |
4127 | - AC_MSG_ERROR([unable to update list of available tagged configurations.]) |
4128 | - fi |
4129 | -fi |
4130 | -])# _LT_AC_TAGCONFIG |
4131 | - |
4132 | - |
4133 | -# AC_LIBTOOL_DLOPEN |
4134 | -# ----------------- |
4135 | -# enable checks for dlopen support |
4136 | -AC_DEFUN([AC_LIBTOOL_DLOPEN], |
4137 | - [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) |
4138 | -])# AC_LIBTOOL_DLOPEN |
4139 | - |
4140 | - |
4141 | -# AC_LIBTOOL_WIN32_DLL |
4142 | -# -------------------- |
4143 | -# declare package support for building win32 dll's |
4144 | -AC_DEFUN([AC_LIBTOOL_WIN32_DLL], |
4145 | -[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) |
4146 | -])# AC_LIBTOOL_WIN32_DLL |
4147 | - |
4148 | - |
4149 | -# AC_ENABLE_SHARED([DEFAULT]) |
4150 | -# --------------------------- |
4151 | -# implement the --enable-shared flag |
4152 | -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. |
4153 | -AC_DEFUN([AC_ENABLE_SHARED], |
4154 | -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl |
4155 | -AC_ARG_ENABLE([shared], |
4156 | - [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], |
4157 | - [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], |
4158 | - [p=${PACKAGE-default} |
4159 | - case $enableval in |
4160 | - yes) enable_shared=yes ;; |
4161 | - no) enable_shared=no ;; |
4162 | - *) |
4163 | - enable_shared=no |
4164 | - # Look at the argument we got. We use all the common list separators. |
4165 | - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," |
4166 | - for pkg in $enableval; do |
4167 | - IFS="$lt_save_ifs" |
4168 | - if test "X$pkg" = "X$p"; then |
4169 | - enable_shared=yes |
4170 | - fi |
4171 | - done |
4172 | - IFS="$lt_save_ifs" |
4173 | - ;; |
4174 | - esac], |
4175 | - [enable_shared=]AC_ENABLE_SHARED_DEFAULT) |
4176 | -])# AC_ENABLE_SHARED |
4177 | - |
4178 | - |
4179 | -# AC_DISABLE_SHARED |
4180 | -# ----------------- |
4181 | -#- set the default shared flag to --disable-shared |
4182 | -AC_DEFUN([AC_DISABLE_SHARED], |
4183 | -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl |
4184 | -AC_ENABLE_SHARED(no) |
4185 | -])# AC_DISABLE_SHARED |
4186 | - |
4187 | - |
4188 | -# AC_ENABLE_STATIC([DEFAULT]) |
4189 | -# --------------------------- |
4190 | -# implement the --enable-static flag |
4191 | -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. |
4192 | -AC_DEFUN([AC_ENABLE_STATIC], |
4193 | -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl |
4194 | -AC_ARG_ENABLE([static], |
4195 | - [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], |
4196 | - [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], |
4197 | - [p=${PACKAGE-default} |
4198 | - case $enableval in |
4199 | - yes) enable_static=yes ;; |
4200 | - no) enable_static=no ;; |
4201 | - *) |
4202 | - enable_static=no |
4203 | - # Look at the argument we got. We use all the common list separators. |
4204 | - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," |
4205 | - for pkg in $enableval; do |
4206 | - IFS="$lt_save_ifs" |
4207 | - if test "X$pkg" = "X$p"; then |
4208 | - enable_static=yes |
4209 | - fi |
4210 | - done |
4211 | - IFS="$lt_save_ifs" |
4212 | - ;; |
4213 | - esac], |
4214 | - [enable_static=]AC_ENABLE_STATIC_DEFAULT) |
4215 | -])# AC_ENABLE_STATIC |
4216 | - |
4217 | - |
4218 | -# AC_DISABLE_STATIC |
4219 | -# ----------------- |
4220 | -# set the default static flag to --disable-static |
4221 | -AC_DEFUN([AC_DISABLE_STATIC], |
4222 | -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl |
4223 | -AC_ENABLE_STATIC(no) |
4224 | -])# AC_DISABLE_STATIC |
4225 | - |
4226 | - |
4227 | -# AC_ENABLE_FAST_INSTALL([DEFAULT]) |
4228 | -# --------------------------------- |
4229 | -# implement the --enable-fast-install flag |
4230 | -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. |
4231 | -AC_DEFUN([AC_ENABLE_FAST_INSTALL], |
4232 | -[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl |
4233 | -AC_ARG_ENABLE([fast-install], |
4234 | - [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], |
4235 | - [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], |
4236 | - [p=${PACKAGE-default} |
4237 | - case $enableval in |
4238 | - yes) enable_fast_install=yes ;; |
4239 | - no) enable_fast_install=no ;; |
4240 | - *) |
4241 | - enable_fast_install=no |
4242 | - # Look at the argument we got. We use all the common list separators. |
4243 | - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," |
4244 | - for pkg in $enableval; do |
4245 | - IFS="$lt_save_ifs" |
4246 | - if test "X$pkg" = "X$p"; then |
4247 | - enable_fast_install=yes |
4248 | - fi |
4249 | - done |
4250 | - IFS="$lt_save_ifs" |
4251 | - ;; |
4252 | - esac], |
4253 | - [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) |
4254 | -])# AC_ENABLE_FAST_INSTALL |
4255 | - |
4256 | - |
4257 | -# AC_DISABLE_FAST_INSTALL |
4258 | -# ----------------------- |
4259 | -# set the default to --disable-fast-install |
4260 | -AC_DEFUN([AC_DISABLE_FAST_INSTALL], |
4261 | -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl |
4262 | -AC_ENABLE_FAST_INSTALL(no) |
4263 | -])# AC_DISABLE_FAST_INSTALL |
4264 | - |
4265 | - |
4266 | -# AC_LIBTOOL_PICMODE([MODE]) |
4267 | + |
4268 | +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" |
4269 | +if test "$GCC" = yes; then |
4270 | + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
4271 | +fi |
4272 | + |
4273 | +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then |
4274 | + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" |
4275 | +fi |
4276 | +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then |
4277 | + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" |
4278 | +fi |
4279 | + |
4280 | +_LT_DECL([], [variables_saved_for_relink], [1], |
4281 | + [Variables whose values should be saved in libtool wrapper scripts and |
4282 | + restored at link time]) |
4283 | +_LT_DECL([], [need_lib_prefix], [0], |
4284 | + [Do we need the "lib" prefix for modules?]) |
4285 | +_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) |
4286 | +_LT_DECL([], [version_type], [0], [Library versioning type]) |
4287 | +_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) |
4288 | +_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) |
4289 | +_LT_DECL([], [shlibpath_overrides_runpath], [0], |
4290 | + [Is shlibpath searched before the hard-coded library search path?]) |
4291 | +_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) |
4292 | +_LT_DECL([], [library_names_spec], [1], |
4293 | + [[List of archive names. First name is the real one, the rest are links. |
4294 | + The last name is the one that the linker finds with -lNAME]]) |
4295 | +_LT_DECL([], [soname_spec], [1], |
4296 | + [[The coded name of the library, if different from the real name]]) |
4297 | +_LT_DECL([], [postinstall_cmds], [2], |
4298 | + [Command to use after installation of a shared archive]) |
4299 | +_LT_DECL([], [postuninstall_cmds], [2], |
4300 | + [Command to use after uninstallation of a shared archive]) |
4301 | +_LT_DECL([], [finish_cmds], [2], |
4302 | + [Commands used to finish a libtool library installation in a directory]) |
4303 | +_LT_DECL([], [finish_eval], [1], |
4304 | + [[As "finish_cmds", except a single script fragment to be evaled but |
4305 | + not shown]]) |
4306 | +_LT_DECL([], [hardcode_into_libs], [0], |
4307 | + [Whether we should hardcode library paths into libraries]) |
4308 | +_LT_DECL([], [sys_lib_search_path_spec], [2], |
4309 | + [Compile-time system search path for libraries]) |
4310 | +_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], |
4311 | + [Run-time system search path for libraries]) |
4312 | +])# _LT_SYS_DYNAMIC_LINKER |
4313 | + |
4314 | + |
4315 | +# _LT_PATH_TOOL_PREFIX(TOOL) |
4316 | # -------------------------- |
4317 | -# implement the --with-pic flag |
4318 | -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. |
4319 | -AC_DEFUN([AC_LIBTOOL_PICMODE], |
4320 | -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl |
4321 | -pic_mode=ifelse($#,1,$1,default) |
4322 | -])# AC_LIBTOOL_PICMODE |
4323 | - |
4324 | - |
4325 | -# AC_PROG_EGREP |
4326 | -# ------------- |
4327 | -# This is predefined starting with Autoconf 2.54, so this conditional |
4328 | -# definition can be removed once we require Autoconf 2.54 or later. |
4329 | -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], |
4330 | -[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], |
4331 | - [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 |
4332 | - then ac_cv_prog_egrep='grep -E' |
4333 | - else ac_cv_prog_egrep='egrep' |
4334 | - fi]) |
4335 | - EGREP=$ac_cv_prog_egrep |
4336 | - AC_SUBST([EGREP]) |
4337 | -])]) |
4338 | - |
4339 | - |
4340 | -# AC_PATH_TOOL_PREFIX |
4341 | -# ------------------- |
4342 | -# find a file program which can recognise shared library |
4343 | -AC_DEFUN([AC_PATH_TOOL_PREFIX], |
4344 | -[AC_REQUIRE([AC_PROG_EGREP])dnl |
4345 | +# find a file program which can recognize shared library |
4346 | +AC_DEFUN([_LT_PATH_TOOL_PREFIX], |
4347 | +[m4_require([_LT_DECL_EGREP])dnl |
4348 | AC_MSG_CHECKING([for $1]) |
4349 | AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, |
4350 | [case $MAGIC_CMD in |
4351 | @@ -1903,7 +2755,7 @@ |
4352 | dnl $ac_dummy forces splitting on constant user-supplied paths. |
4353 | dnl POSIX.2 word splitting is done only on the output of word expansions, |
4354 | dnl not every word. This closes a longstanding sh security hole. |
4355 | - ac_dummy="ifelse([$2], , $PATH, [$2])" |
4356 | + ac_dummy="m4_if([$2], , $PATH, [$2])" |
4357 | for ac_dir in $ac_dummy; do |
4358 | IFS="$lt_save_ifs" |
4359 | test -z "$ac_dir" && ac_dir=. |
4360 | @@ -1912,13 +2764,13 @@ |
4361 | if test -n "$file_magic_test_file"; then |
4362 | case $deplibs_check_method in |
4363 | "file_magic "*) |
4364 | - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" |
4365 | + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` |
4366 | MAGIC_CMD="$lt_cv_path_MAGIC_CMD" |
4367 | if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | |
4368 | $EGREP "$file_magic_regex" > /dev/null; then |
4369 | : |
4370 | else |
4371 | - cat <<EOF 1>&2 |
4372 | + cat <<_LT_EOF 1>&2 |
4373 | |
4374 | *** Warning: the command libtool uses to detect shared libraries, |
4375 | *** $file_magic_cmd, produces output that libtool cannot recognize. |
4376 | @@ -1929,7 +2781,7 @@ |
4377 | *** may want to report the problem to your system manager and/or to |
4378 | *** bug-libtool@gnu.org |
4379 | |
4380 | -EOF |
4381 | +_LT_EOF |
4382 | fi ;; |
4383 | esac |
4384 | fi |
4385 | @@ -1946,37 +2798,47 @@ |
4386 | else |
4387 | AC_MSG_RESULT(no) |
4388 | fi |
4389 | -])# AC_PATH_TOOL_PREFIX |
4390 | - |
4391 | - |
4392 | -# AC_PATH_MAGIC |
4393 | -# ------------- |
4394 | -# find a file program which can recognise a shared library |
4395 | -AC_DEFUN([AC_PATH_MAGIC], |
4396 | -[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) |
4397 | +_LT_DECL([], [MAGIC_CMD], [0], |
4398 | + [Used to examine libraries when file_magic_cmd begins with "file"])dnl |
4399 | +])# _LT_PATH_TOOL_PREFIX |
4400 | + |
4401 | +# Old name: |
4402 | +AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) |
4403 | +dnl aclocal-1.4 backwards compatibility: |
4404 | +dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) |
4405 | + |
4406 | + |
4407 | +# _LT_PATH_MAGIC |
4408 | +# -------------- |
4409 | +# find a file program which can recognize a shared library |
4410 | +m4_defun([_LT_PATH_MAGIC], |
4411 | +[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) |
4412 | if test -z "$lt_cv_path_MAGIC_CMD"; then |
4413 | if test -n "$ac_tool_prefix"; then |
4414 | - AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) |
4415 | + _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) |
4416 | else |
4417 | MAGIC_CMD=: |
4418 | fi |
4419 | fi |
4420 | -])# AC_PATH_MAGIC |
4421 | - |
4422 | - |
4423 | -# AC_PROG_LD |
4424 | +])# _LT_PATH_MAGIC |
4425 | + |
4426 | + |
4427 | +# LT_PATH_LD |
4428 | # ---------- |
4429 | # find the pathname to the GNU or non-GNU linker |
4430 | -AC_DEFUN([AC_PROG_LD], |
4431 | -[AC_ARG_WITH([gnu-ld], |
4432 | - [AC_HELP_STRING([--with-gnu-ld], |
4433 | +AC_DEFUN([LT_PATH_LD], |
4434 | +[AC_REQUIRE([AC_PROG_CC])dnl |
4435 | +AC_REQUIRE([AC_CANONICAL_HOST])dnl |
4436 | +AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
4437 | +m4_require([_LT_DECL_SED])dnl |
4438 | +m4_require([_LT_DECL_EGREP])dnl |
4439 | + |
4440 | +AC_ARG_WITH([gnu-ld], |
4441 | + [AS_HELP_STRING([--with-gnu-ld], |
4442 | [assume the C compiler uses GNU ld @<:@default=no@:>@])], |
4443 | [test "$withval" = no || with_gnu_ld=yes], |
4444 | - [with_gnu_ld=no]) |
4445 | -AC_REQUIRE([LT_AC_PROG_SED])dnl |
4446 | -AC_REQUIRE([AC_PROG_CC])dnl |
4447 | -AC_REQUIRE([AC_CANONICAL_HOST])dnl |
4448 | -AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
4449 | + [with_gnu_ld=no])dnl |
4450 | + |
4451 | ac_prog=ld |
4452 | if test "$GCC" = yes; then |
4453 | # Check if gcc -print-prog-name=ld gives a path. |
4454 | @@ -1993,9 +2855,9 @@ |
4455 | [[\\/]]* | ?:[[\\/]]*) |
4456 | re_direlt='/[[^/]][[^/]]*/\.\./' |
4457 | # Canonicalize the pathname of ld |
4458 | - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` |
4459 | - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do |
4460 | - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` |
4461 | + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` |
4462 | + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do |
4463 | + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` |
4464 | done |
4465 | test -z "$LD" && LD="$ac_prog" |
4466 | ;; |
4467 | @@ -2022,7 +2884,7 @@ |
4468 | if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then |
4469 | lt_cv_path_LD="$ac_dir/$ac_prog" |
4470 | # Check to see if the program is GNU ld. I'd rather use --version, |
4471 | - # but apparently some GNU ld's only accept -v. |
4472 | + # but apparently some variants of GNU ld only accept -v. |
4473 | # Break only if it was the GNU/non-GNU ld that we prefer. |
4474 | case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in |
4475 | *GNU* | *'with BFD'*) |
4476 | @@ -2045,16 +2907,25 @@ |
4477 | AC_MSG_RESULT(no) |
4478 | fi |
4479 | test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) |
4480 | -AC_PROG_LD_GNU |
4481 | -])# AC_PROG_LD |
4482 | - |
4483 | - |
4484 | -# AC_PROG_LD_GNU |
4485 | -# -------------- |
4486 | -AC_DEFUN([AC_PROG_LD_GNU], |
4487 | -[AC_REQUIRE([AC_PROG_EGREP])dnl |
4488 | -AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, |
4489 | -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. |
4490 | +_LT_PATH_LD_GNU |
4491 | +AC_SUBST([LD]) |
4492 | + |
4493 | +_LT_TAGDECL([], [LD], [1], [The linker used to build libraries]) |
4494 | +])# LT_PATH_LD |
4495 | + |
4496 | +# Old names: |
4497 | +AU_ALIAS([AM_PROG_LD], [LT_PATH_LD]) |
4498 | +AU_ALIAS([AC_PROG_LD], [LT_PATH_LD]) |
4499 | +dnl aclocal-1.4 backwards compatibility: |
4500 | +dnl AC_DEFUN([AM_PROG_LD], []) |
4501 | +dnl AC_DEFUN([AC_PROG_LD], []) |
4502 | + |
4503 | + |
4504 | +# _LT_PATH_LD_GNU |
4505 | +#- -------------- |
4506 | +m4_defun([_LT_PATH_LD_GNU], |
4507 | +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, |
4508 | +[# I'd rather use --version here, but apparently some GNU lds only accept -v. |
4509 | case `$LD -v 2>&1 </dev/null` in |
4510 | *GNU* | *'with BFD'*) |
4511 | lt_cv_prog_gnu_ld=yes |
4512 | @@ -2064,14 +2935,14 @@ |
4513 | ;; |
4514 | esac]) |
4515 | with_gnu_ld=$lt_cv_prog_gnu_ld |
4516 | -])# AC_PROG_LD_GNU |
4517 | - |
4518 | - |
4519 | -# AC_PROG_LD_RELOAD_FLAG |
4520 | -# ---------------------- |
4521 | +])# _LT_PATH_LD_GNU |
4522 | + |
4523 | + |
4524 | +# _LT_CMD_RELOAD |
4525 | +# -------------- |
4526 | # find reload flag for linker |
4527 | # -- PORTME Some linkers may need a different reload flag. |
4528 | -AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], |
4529 | +m4_defun([_LT_CMD_RELOAD], |
4530 | [AC_CACHE_CHECK([for $LD option to reload object files], |
4531 | lt_cv_ld_reload_flag, |
4532 | [lt_cv_ld_reload_flag='-r']) |
4533 | @@ -2081,15 +2952,28 @@ |
4534 | *) reload_flag=" $reload_flag" ;; |
4535 | esac |
4536 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
4537 | -])# AC_PROG_LD_RELOAD_FLAG |
4538 | - |
4539 | - |
4540 | -# AC_DEPLIBS_CHECK_METHOD |
4541 | -# ----------------------- |
4542 | +case $host_os in |
4543 | + darwin*) |
4544 | + if test "$GCC" = yes; then |
4545 | + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
4546 | + else |
4547 | + reload_cmds='$LD$reload_flag -o $output$reload_objs' |
4548 | + fi |
4549 | + ;; |
4550 | +esac |
4551 | +_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl |
4552 | +_LT_DECL([], [reload_cmds], [2])dnl |
4553 | +])# _LT_CMD_RELOAD |
4554 | + |
4555 | + |
4556 | +# _LT_CHECK_MAGIC_METHOD |
4557 | +# ---------------------- |
4558 | # how to check for library dependencies |
4559 | # -- PORTME fill in with the dynamic library characteristics |
4560 | -AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], |
4561 | -[AC_CACHE_CHECK([how to recognise dependent libraries], |
4562 | +m4_defun([_LT_CHECK_MAGIC_METHOD], |
4563 | +[m4_require([_LT_DECL_EGREP]) |
4564 | +m4_require([_LT_DECL_OBJDUMP]) |
4565 | +AC_CACHE_CHECK([how to recognize dependent libraries], |
4566 | lt_cv_deplibs_check_method, |
4567 | [lt_cv_file_magic_cmd='$MAGIC_CMD' |
4568 | lt_cv_file_magic_test_file= |
4569 | @@ -2106,7 +2990,7 @@ |
4570 | # whether `pass_all' will *always* work, you probably want this one. |
4571 | |
4572 | case $host_os in |
4573 | -aix4* | aix5*) |
4574 | +aix[[4-9]]*) |
4575 | lt_cv_deplibs_check_method=pass_all |
4576 | ;; |
4577 | |
4578 | @@ -2114,7 +2998,7 @@ |
4579 | lt_cv_deplibs_check_method=pass_all |
4580 | ;; |
4581 | |
4582 | -bsdi4*) |
4583 | +bsdi[[45]]*) |
4584 | lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' |
4585 | lt_cv_file_magic_cmd='/usr/bin/file -L' |
4586 | lt_cv_file_magic_test_file=/shlib/libc.so |
4587 | @@ -2128,8 +3012,20 @@ |
4588 | |
4589 | mingw* | pw32*) |
4590 | # Base MSYS/MinGW do not provide the 'file' command needed by |
4591 | - # func_win32_libid shell function, so use a weaker test based on 'objdump'. |
4592 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
4593 | + # func_win32_libid shell function, so use a weaker test based on 'objdump', |
4594 | + # unless we find 'file', for example because we are cross-compiling. |
4595 | + if ( file / ) >/dev/null 2>&1; then |
4596 | + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
4597 | + lt_cv_file_magic_cmd='func_win32_libid' |
4598 | + else |
4599 | + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
4600 | + lt_cv_file_magic_cmd='$OBJDUMP -f' |
4601 | + fi |
4602 | + ;; |
4603 | + |
4604 | +cegcc) |
4605 | + # use the weaker test based on 'objdump'. See mingw*. |
4606 | + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' |
4607 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
4608 | ;; |
4609 | |
4610 | @@ -2137,13 +3033,13 @@ |
4611 | lt_cv_deplibs_check_method=pass_all |
4612 | ;; |
4613 | |
4614 | -freebsd* | kfreebsd*-gnu) |
4615 | - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
4616 | +freebsd* | dragonfly*) |
4617 | + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
4618 | case $host_cpu in |
4619 | i*86 ) |
4620 | # Not sure whether the presence of OpenBSD here was a mistake. |
4621 | # Let's accept both of them until this is cleared up. |
4622 | - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' |
4623 | + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' |
4624 | lt_cv_file_magic_cmd=/usr/bin/file |
4625 | lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` |
4626 | ;; |
4627 | @@ -2159,7 +3055,7 @@ |
4628 | |
4629 | hpux10.20* | hpux11*) |
4630 | lt_cv_file_magic_cmd=/usr/bin/file |
4631 | - case "$host_cpu" in |
4632 | + case $host_cpu in |
4633 | ia64*) |
4634 | lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' |
4635 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
4636 | @@ -2175,6 +3071,11 @@ |
4637 | esac |
4638 | ;; |
4639 | |
4640 | +interix[[3-9]]*) |
4641 | + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here |
4642 | + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' |
4643 | + ;; |
4644 | + |
4645 | irix5* | irix6* | nonstopux*) |
4646 | case $LD in |
4647 | *-32|*"-32 ") libmagic=32-bit;; |
4648 | @@ -2186,12 +3087,12 @@ |
4649 | ;; |
4650 | |
4651 | # This must be Linux ELF. |
4652 | -linux*) |
4653 | +linux* | k*bsd*-gnu) |
4654 | lt_cv_deplibs_check_method=pass_all |
4655 | ;; |
4656 | |
4657 | -netbsd* | netbsdelf*-gnu | knetbsd*-gnu) |
4658 | - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then |
4659 | +netbsd*) |
4660 | + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
4661 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' |
4662 | else |
4663 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' |
4664 | @@ -2204,17 +3105,15 @@ |
4665 | lt_cv_file_magic_test_file=/usr/lib/libnls.so |
4666 | ;; |
4667 | |
4668 | -nto-qnx*) |
4669 | - lt_cv_deplibs_check_method=unknown |
4670 | +*nto* | *qnx*) |
4671 | + lt_cv_deplibs_check_method=pass_all |
4672 | ;; |
4673 | |
4674 | openbsd*) |
4675 | - lt_cv_file_magic_cmd=/usr/bin/file |
4676 | - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` |
4677 | - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
4678 | - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' |
4679 | + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
4680 | + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' |
4681 | else |
4682 | - lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' |
4683 | + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' |
4684 | fi |
4685 | ;; |
4686 | |
4687 | @@ -2222,7 +3121,7 @@ |
4688 | lt_cv_deplibs_check_method=pass_all |
4689 | ;; |
4690 | |
4691 | -sco3.2v5*) |
4692 | +rdos*) |
4693 | lt_cv_deplibs_check_method=pass_all |
4694 | ;; |
4695 | |
4696 | @@ -2230,7 +3129,11 @@ |
4697 | lt_cv_deplibs_check_method=pass_all |
4698 | ;; |
4699 | |
4700 | -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) |
4701 | +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) |
4702 | + lt_cv_deplibs_check_method=pass_all |
4703 | + ;; |
4704 | + |
4705 | +sysv4 | sysv4.3*) |
4706 | case $host_vendor in |
4707 | motorola) |
4708 | 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]]' |
4709 | @@ -2251,10 +3154,13 @@ |
4710 | siemens) |
4711 | lt_cv_deplibs_check_method=pass_all |
4712 | ;; |
4713 | + pc) |
4714 | + lt_cv_deplibs_check_method=pass_all |
4715 | + ;; |
4716 | esac |
4717 | ;; |
4718 | |
4719 | -sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*) |
4720 | +tpf*) |
4721 | lt_cv_deplibs_check_method=pass_all |
4722 | ;; |
4723 | esac |
4724 | @@ -2262,58 +3168,106 @@ |
4725 | file_magic_cmd=$lt_cv_file_magic_cmd |
4726 | deplibs_check_method=$lt_cv_deplibs_check_method |
4727 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
4728 | -])# AC_DEPLIBS_CHECK_METHOD |
4729 | - |
4730 | - |
4731 | -# AC_PROG_NM |
4732 | + |
4733 | +_LT_DECL([], [deplibs_check_method], [1], |
4734 | + [Method to check whether dependent libraries are shared objects]) |
4735 | +_LT_DECL([], [file_magic_cmd], [1], |
4736 | + [Command to use when deplibs_check_method == "file_magic"]) |
4737 | +])# _LT_CHECK_MAGIC_METHOD |
4738 | + |
4739 | + |
4740 | +# LT_PATH_NM |
4741 | # ---------- |
4742 | -# find the pathname to a BSD-compatible name lister |
4743 | -AC_DEFUN([AC_PROG_NM], |
4744 | -[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, |
4745 | +# find the pathname to a BSD- or MS-compatible name lister |
4746 | +AC_DEFUN([LT_PATH_NM], |
4747 | +[AC_REQUIRE([AC_PROG_CC])dnl |
4748 | +AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, |
4749 | [if test -n "$NM"; then |
4750 | # Let the user override the test. |
4751 | lt_cv_path_NM="$NM" |
4752 | else |
4753 | - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
4754 | - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do |
4755 | - IFS="$lt_save_ifs" |
4756 | - test -z "$ac_dir" && ac_dir=. |
4757 | - tmp_nm="$ac_dir/${ac_tool_prefix}nm" |
4758 | - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then |
4759 | - # Check to see if the nm accepts a BSD-compat flag. |
4760 | - # Adding the `sed 1q' prevents false positives on HP-UX, which says: |
4761 | - # nm: unknown option "B" ignored |
4762 | - # Tru64's nm complains that /dev/null is an invalid object file |
4763 | - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in |
4764 | - */dev/null* | *'Invalid file or object type'*) |
4765 | - lt_cv_path_NM="$tmp_nm -B" |
4766 | - break |
4767 | - ;; |
4768 | - *) |
4769 | - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in |
4770 | - */dev/null*) |
4771 | - lt_cv_path_NM="$tmp_nm -p" |
4772 | + lt_nm_to_check="${ac_tool_prefix}nm" |
4773 | + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then |
4774 | + lt_nm_to_check="$lt_nm_to_check nm" |
4775 | + fi |
4776 | + for lt_tmp_nm in $lt_nm_to_check; do |
4777 | + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
4778 | + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do |
4779 | + IFS="$lt_save_ifs" |
4780 | + test -z "$ac_dir" && ac_dir=. |
4781 | + tmp_nm="$ac_dir/$lt_tmp_nm" |
4782 | + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then |
4783 | + # Check to see if the nm accepts a BSD-compat flag. |
4784 | + # Adding the `sed 1q' prevents false positives on HP-UX, which says: |
4785 | + # nm: unknown option "B" ignored |
4786 | + # Tru64's nm complains that /dev/null is an invalid object file |
4787 | + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in |
4788 | + */dev/null* | *'Invalid file or object type'*) |
4789 | + lt_cv_path_NM="$tmp_nm -B" |
4790 | break |
4791 | ;; |
4792 | *) |
4793 | - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but |
4794 | - continue # so that we can try to find one that supports BSD flags |
4795 | + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in |
4796 | + */dev/null*) |
4797 | + lt_cv_path_NM="$tmp_nm -p" |
4798 | + break |
4799 | + ;; |
4800 | + *) |
4801 | + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but |
4802 | + continue # so that we can try to find one that supports BSD flags |
4803 | + ;; |
4804 | + esac |
4805 | ;; |
4806 | esac |
4807 | - esac |
4808 | - fi |
4809 | + fi |
4810 | + done |
4811 | + IFS="$lt_save_ifs" |
4812 | done |
4813 | - IFS="$lt_save_ifs" |
4814 | - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm |
4815 | + : ${lt_cv_path_NM=no} |
4816 | fi]) |
4817 | -NM="$lt_cv_path_NM" |
4818 | -])# AC_PROG_NM |
4819 | - |
4820 | - |
4821 | -# AC_CHECK_LIBM |
4822 | -# ------------- |
4823 | +if test "$lt_cv_path_NM" != "no"; then |
4824 | + NM="$lt_cv_path_NM" |
4825 | +else |
4826 | + # Didn't find any BSD compatible name lister, look for dumpbin. |
4827 | + AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) |
4828 | + AC_SUBST([DUMPBIN]) |
4829 | + if test "$DUMPBIN" != ":"; then |
4830 | + NM="$DUMPBIN" |
4831 | + fi |
4832 | +fi |
4833 | +test -z "$NM" && NM=nm |
4834 | +AC_SUBST([NM]) |
4835 | +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl |
4836 | + |
4837 | +AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], |
4838 | + [lt_cv_nm_interface="BSD nm" |
4839 | + echo "int some_variable = 0;" > conftest.$ac_ext |
4840 | + (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
4841 | + (eval "$ac_compile" 2>conftest.err) |
4842 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
4843 | + (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
4844 | + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
4845 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
4846 | + (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) |
4847 | + cat conftest.out >&AS_MESSAGE_LOG_FD |
4848 | + if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
4849 | + lt_cv_nm_interface="MS dumpbin" |
4850 | + fi |
4851 | + rm -f conftest*]) |
4852 | +])# LT_PATH_NM |
4853 | + |
4854 | +# Old names: |
4855 | +AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) |
4856 | +AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) |
4857 | +dnl aclocal-1.4 backwards compatibility: |
4858 | +dnl AC_DEFUN([AM_PROG_NM], []) |
4859 | +dnl AC_DEFUN([AC_PROG_NM], []) |
4860 | + |
4861 | + |
4862 | +# LT_LIB_M |
4863 | +# -------- |
4864 | # check for math library |
4865 | -AC_DEFUN([AC_CHECK_LIBM], |
4866 | +AC_DEFUN([LT_LIB_M], |
4867 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
4868 | LIBM= |
4869 | case $host in |
4870 | @@ -2328,1999 +3282,46 @@ |
4871 | AC_CHECK_LIB(m, cos, LIBM="-lm") |
4872 | ;; |
4873 | esac |
4874 | -])# AC_CHECK_LIBM |
4875 | - |
4876 | - |
4877 | -# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) |
4878 | -# ----------------------------------- |
4879 | -# sets LIBLTDL to the link flags for the libltdl convenience library and |
4880 | -# LTDLINCL to the include flags for the libltdl header and adds |
4881 | -# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL |
4882 | -# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If |
4883 | -# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will |
4884 | -# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with |
4885 | -# '${top_srcdir}/' (note the single quotes!). If your package is not |
4886 | -# flat and you're not using automake, define top_builddir and |
4887 | -# top_srcdir appropriately in the Makefiles. |
4888 | -AC_DEFUN([AC_LIBLTDL_CONVENIENCE], |
4889 | -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl |
4890 | - case $enable_ltdl_convenience in |
4891 | - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; |
4892 | - "") enable_ltdl_convenience=yes |
4893 | - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; |
4894 | - esac |
4895 | - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la |
4896 | - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) |
4897 | - # For backwards non-gettext consistent compatibility... |
4898 | - INCLTDL="$LTDLINCL" |
4899 | -])# AC_LIBLTDL_CONVENIENCE |
4900 | - |
4901 | - |
4902 | -# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) |
4903 | -# ----------------------------------- |
4904 | -# sets LIBLTDL to the link flags for the libltdl installable library and |
4905 | -# LTDLINCL to the include flags for the libltdl header and adds |
4906 | -# --enable-ltdl-install to the configure arguments. Note that LIBLTDL |
4907 | -# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If |
4908 | -# DIRECTORY is not provided and an installed libltdl is not found, it is |
4909 | -# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' |
4910 | -# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single |
4911 | -# quotes!). If your package is not flat and you're not using automake, |
4912 | -# define top_builddir and top_srcdir appropriately in the Makefiles. |
4913 | -# In the future, this macro may have to be called after AC_PROG_LIBTOOL. |
4914 | -AC_DEFUN([AC_LIBLTDL_INSTALLABLE], |
4915 | -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl |
4916 | - AC_CHECK_LIB(ltdl, lt_dlinit, |
4917 | - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], |
4918 | - [if test x"$enable_ltdl_install" = xno; then |
4919 | - AC_MSG_WARN([libltdl not installed, but installation disabled]) |
4920 | - else |
4921 | - enable_ltdl_install=yes |
4922 | - fi |
4923 | - ]) |
4924 | - if test x"$enable_ltdl_install" = x"yes"; then |
4925 | - ac_configure_args="$ac_configure_args --enable-ltdl-install" |
4926 | - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la |
4927 | - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) |
4928 | - else |
4929 | - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" |
4930 | - LIBLTDL="-lltdl" |
4931 | - LTDLINCL= |
4932 | - fi |
4933 | - # For backwards non-gettext consistent compatibility... |
4934 | - INCLTDL="$LTDLINCL" |
4935 | -])# AC_LIBLTDL_INSTALLABLE |
4936 | - |
4937 | - |
4938 | -# AC_LIBTOOL_CXX |
4939 | -# -------------- |
4940 | -# enable support for C++ libraries |
4941 | -AC_DEFUN([AC_LIBTOOL_CXX], |
4942 | -[AC_REQUIRE([_LT_AC_LANG_CXX]) |
4943 | -])# AC_LIBTOOL_CXX |
4944 | - |
4945 | - |
4946 | -# _LT_AC_LANG_CXX |
4947 | -# --------------- |
4948 | -AC_DEFUN([_LT_AC_LANG_CXX], |
4949 | -[AC_REQUIRE([AC_PROG_CXX]) |
4950 | -AC_REQUIRE([AC_PROG_CXXCPP]) |
4951 | -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) |
4952 | -])# _LT_AC_LANG_CXX |
4953 | - |
4954 | - |
4955 | -# AC_LIBTOOL_F77 |
4956 | -# -------------- |
4957 | -# enable support for Fortran 77 libraries |
4958 | -AC_DEFUN([AC_LIBTOOL_F77], |
4959 | -[AC_REQUIRE([_LT_AC_LANG_F77]) |
4960 | -])# AC_LIBTOOL_F77 |
4961 | - |
4962 | - |
4963 | -# _LT_AC_LANG_F77 |
4964 | -# --------------- |
4965 | -AC_DEFUN([_LT_AC_LANG_F77], |
4966 | -[AC_REQUIRE([AC_PROG_F77]) |
4967 | -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) |
4968 | -])# _LT_AC_LANG_F77 |
4969 | - |
4970 | - |
4971 | -# AC_LIBTOOL_GCJ |
4972 | -# -------------- |
4973 | -# enable support for GCJ libraries |
4974 | -AC_DEFUN([AC_LIBTOOL_GCJ], |
4975 | -[AC_REQUIRE([_LT_AC_LANG_GCJ]) |
4976 | -])# AC_LIBTOOL_GCJ |
4977 | - |
4978 | - |
4979 | -# _LT_AC_LANG_GCJ |
4980 | -# --------------- |
4981 | -AC_DEFUN([_LT_AC_LANG_GCJ], |
4982 | -[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], |
4983 | - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], |
4984 | - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], |
4985 | - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], |
4986 | - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], |
4987 | - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) |
4988 | -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) |
4989 | -])# _LT_AC_LANG_GCJ |
4990 | - |
4991 | - |
4992 | -# AC_LIBTOOL_RC |
4993 | -# -------------- |
4994 | -# enable support for Windows resource files |
4995 | -AC_DEFUN([AC_LIBTOOL_RC], |
4996 | -[AC_REQUIRE([LT_AC_PROG_RC]) |
4997 | -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) |
4998 | -])# AC_LIBTOOL_RC |
4999 | - |
5000 | - |
The diff has been truncated for viewing.
Looks good.