Merge lp:~vibhavp/ubuntu/saucy/urg/merge-from-debian into lp:ubuntu/saucy/urg
- Saucy (13.10)
- merge-from-debian
- Merge into saucy
Proposed by
Vibhav Pant
Status: | Work in progress |
---|---|
Proposed branch: | lp:~vibhavp/ubuntu/saucy/urg/merge-from-debian |
Merge into: | lp:ubuntu/saucy/urg |
Diff against target: |
52035 lines (+18644/-16574) 76 files modified
.pc/applied-patches (+0/-3) .pc/fix-as-needed-build.patch/src/c/urg/Makefile.in (+0/-509) .pc/fix-ftbfs-with-gcc-4.7/src/cpp/connection/SerialDevice_lin.cpp (+0/-205) .pc/fix-preprocessor-fdset.patch/src/c/connection/serial_ctrl_lin.c (+0/-277) ChangeLog (+26/-1) Makefile.in (+272/-102) README (+8/-9) README.txt (+8/-9) aclocal.m4 (+1720/-970) config.h.in (+11/-0) configure (+6789/-8064) configure.in (+5/-1) debian/changelog (+15/-1) debian/control (+1/-1) debian/patches/0001-add-missing-include-sys-select.h.patch (+20/-0) debian/patches/fix-ftbfs-with-gcc-4.7 (+0/-14) debian/patches/series (+1/-1) include/Makefile.in (+144/-51) include/c/Makefile.in (+126/-45) include/c/urg_ctrl.h (+10/-2) include/c/urg_delay.h (+9/-1) include/c/urg_ticks.h (+9/-1) include/cpp/Connection.h (+139/-139) include/cpp/Lock.h (+1/-1) include/cpp/LockGuard.h (+1/-1) include/cpp/Makefile.am (+1/-1) include/cpp/Makefile.in (+127/-46) include/cpp/Point.h (+22/-1) include/cpp/findUrgPorts.h (+34/-0) include/cpp/isUsingComDriver.h (+30/-30) ltmain.sh (+2657/-1409) samples/Makefile.in (+144/-51) samples/c/Makefile.am (+1/-1) samples/c/Makefile.in (+113/-53) samples/c/gd_scan.c (+5/-4) samples/c/md_scan.c (+4/-5) samples/cpp/Makefile.in (+112/-52) samples/cpp_ethernet/Makefile.in (+103/-43) samples/cpp_ethernet/captureIntensitySample.cpp (+2/-2) samples/scip_samples/Makefile.in (+111/-51) src/Makefile.in (+144/-51) src/c/Makefile.in (+144/-51) src/c/connection/Makefile.in (+147/-61) src/c/connection/serial_ctrl_lin.c (+0/-1) src/c/system/Makefile.in (+147/-61) src/c/system/urg_delay.h (+9/-1) src/c/system/urg_ticks.h (+9/-1) src/c/urg/Makefile.in (+148/-62) src/c/urg/urg_ctrl.h (+10/-2) src/cpp/Makefile.in (+144/-51) src/cpp/common/Makefile.in (+147/-61) src/cpp/connection/Connection.h (+139/-139) src/cpp/connection/FindComPorts.cpp (+287/-287) src/cpp/connection/Makefile.in (+201/-79) src/cpp/connection/SerialDevice.cpp (+214/-214) src/cpp/connection/SerialDevice_lin.cpp (+206/-206) src/cpp/connection/isUsingComDriver.cpp (+102/-102) src/cpp/connection/isUsingComDriver.h (+30/-30) src/cpp/connection/sdl/Makefile.in (+147/-61) src/cpp/coordinate/Coordinate.cpp (+210/-210) src/cpp/coordinate/Makefile.in (+147/-61) src/cpp/geometry/Angle.cpp (+1/-2) src/cpp/geometry/Makefile.in (+147/-61) src/cpp/geometry/Point.h (+22/-1) src/cpp/monitor/Makefile.in (+147/-61) src/cpp/system/Lock.h (+1/-1) src/cpp/system/LockGuard.h (+1/-1) src/cpp/system/Makefile.in (+147/-61) src/cpp/urg/Makefile.am (+1/-1) src/cpp/urg/Makefile.in (+148/-62) src/cpp/urg/ScipHandler.cpp (+842/-842) src/cpp/urg/UrgCtrl.h (+100/-0) src/cpp/urg/UrgDevice.cpp (+1021/-1020) src/cpp/urg/UrgDevice.h (+257/-0) vc8/c/c_urg.vcproj (+134/-202) vc8/cpp/urg.vcproj (+162/-310) |
To merge this branch: | bzr merge lp:~vibhavp/ubuntu/saucy/urg/merge-from-debian |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Logan Rosen (community) | Disapprove | ||
Ubuntu branches | Pending | ||
Review via email: mp+163415@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote : | # |
The sync seems to have built fine. Setting WIP to take it out of the review queue.
Unmerged revisions
- 7. By Vibhav Pant
-
* Merge from Debian Unstable. Remaining changes:
- Added missing preprocessor directive for FD_SET(3), fixing FTBFS.
- debian/patches/ fix-as- needed- build.patch:
fix build with ld --as-needed (LP: #803212)
* New upstream release (closes: #701437)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed file '.pc/applied-patches' |
2 | --- .pc/applied-patches 2013-04-13 09:21:47 +0000 |
3 | +++ .pc/applied-patches 1970-01-01 00:00:00 +0000 |
4 | @@ -1,3 +0,0 @@ |
5 | -fix-ftbfs-with-gcc-4.7 |
6 | -fix-as-needed-build.patch |
7 | -fix-preprocessor-fdset.patch |
8 | |
9 | === removed directory '.pc/fix-as-needed-build.patch' |
10 | === removed directory '.pc/fix-as-needed-build.patch/src' |
11 | === removed directory '.pc/fix-as-needed-build.patch/src/c' |
12 | === removed directory '.pc/fix-as-needed-build.patch/src/c/urg' |
13 | === removed file '.pc/fix-as-needed-build.patch/src/c/urg/Makefile.in' |
14 | --- .pc/fix-as-needed-build.patch/src/c/urg/Makefile.in 2011-08-21 17:26:14 +0000 |
15 | +++ .pc/fix-as-needed-build.patch/src/c/urg/Makefile.in 1970-01-01 00:00:00 +0000 |
16 | @@ -1,509 +0,0 @@ |
17 | -# Makefile.in generated by automake 1.10 from Makefile.am. |
18 | -# @configure_input@ |
19 | - |
20 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
21 | -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
22 | -# This Makefile.in is free software; the Free Software Foundation |
23 | -# gives unlimited permission to copy and/or distribute it, |
24 | -# with or without modifications, as long as this notice is preserved. |
25 | - |
26 | -# This program is distributed in the hope that it will be useful, |
27 | -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without |
28 | -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
29 | -# PARTICULAR PURPOSE. |
30 | - |
31 | -@SET_MAKE@ |
32 | - |
33 | - |
34 | -VPATH = @srcdir@ |
35 | -pkgdatadir = $(datadir)/@PACKAGE@ |
36 | -pkglibdir = $(libdir)/@PACKAGE@ |
37 | -pkgincludedir = $(includedir)/@PACKAGE@ |
38 | -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
39 | -install_sh_DATA = $(install_sh) -c -m 644 |
40 | -install_sh_PROGRAM = $(install_sh) -c |
41 | -install_sh_SCRIPT = $(install_sh) -c |
42 | -INSTALL_HEADER = $(INSTALL_DATA) |
43 | -transform = $(program_transform_name) |
44 | -NORMAL_INSTALL = : |
45 | -PRE_INSTALL = : |
46 | -POST_INSTALL = : |
47 | -NORMAL_UNINSTALL = : |
48 | -PRE_UNINSTALL = : |
49 | -POST_UNINSTALL = : |
50 | -build_triplet = @build@ |
51 | -host_triplet = @host@ |
52 | -subdir = src/c/urg |
53 | -DIST_COMMON = $(libc_urg_include_HEADERS) $(srcdir)/Makefile.am \ |
54 | - $(srcdir)/Makefile.in |
55 | -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
56 | -am__aclocal_m4_deps = $(top_srcdir)/configure.in |
57 | -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
58 | - $(ACLOCAL_M4) |
59 | -mkinstalldirs = $(install_sh) -d |
60 | -CONFIG_HEADER = $(top_builddir)/config.h |
61 | -CONFIG_CLEAN_FILES = |
62 | -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
63 | -am__vpath_adj = case $$p in \ |
64 | - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
65 | - *) f=$$p;; \ |
66 | - esac; |
67 | -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; |
68 | -am__installdirs = "$(DESTDIR)$(libdir)" \ |
69 | - "$(DESTDIR)$(libc_urg_includedir)" |
70 | -libLTLIBRARIES_INSTALL = $(INSTALL) |
71 | -LTLIBRARIES = $(lib_LTLIBRARIES) |
72 | -libc_urg_la_LIBADD = |
73 | -am_libc_urg_la_OBJECTS = urg_ctrl.lo scip_handler.lo urg_errno.lo |
74 | -libc_urg_la_OBJECTS = $(am_libc_urg_la_OBJECTS) |
75 | -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ |
76 | -depcomp = $(SHELL) $(top_srcdir)/depcomp |
77 | -am__depfiles_maybe = depfiles |
78 | -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
79 | - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
80 | -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ |
81 | - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ |
82 | - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
83 | -CCLD = $(CC) |
84 | -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ |
85 | - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ |
86 | - $(LDFLAGS) -o $@ |
87 | -SOURCES = $(libc_urg_la_SOURCES) |
88 | -DIST_SOURCES = $(libc_urg_la_SOURCES) |
89 | -libc_urg_includeHEADERS_INSTALL = $(INSTALL_HEADER) |
90 | -HEADERS = $(libc_urg_include_HEADERS) |
91 | -ETAGS = etags |
92 | -CTAGS = ctags |
93 | -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
94 | -ACLOCAL = @ACLOCAL@ |
95 | -AMTAR = @AMTAR@ |
96 | -AR = @AR@ |
97 | -AUTOCONF = @AUTOCONF@ |
98 | -AUTOHEADER = @AUTOHEADER@ |
99 | -AUTOMAKE = @AUTOMAKE@ |
100 | -AWK = @AWK@ |
101 | -CC = @CC@ |
102 | -CCDEPMODE = @CCDEPMODE@ |
103 | -CFLAGS = @CFLAGS@ |
104 | -CPP = @CPP@ |
105 | -CPPFLAGS = @CPPFLAGS@ |
106 | -CPP_INCLUDES = @CPP_INCLUDES@ |
107 | -CXX = @CXX@ |
108 | -CXXCPP = @CXXCPP@ |
109 | -CXXDEPMODE = @CXXDEPMODE@ |
110 | -CXXFLAGS = @CXXFLAGS@ |
111 | -CYGPATH_W = @CYGPATH_W@ |
112 | -C_INCLUDES = @C_INCLUDES@ |
113 | -C_INSTALL_LIBS = @C_INSTALL_LIBS@ |
114 | -DEFS = @DEFS@ |
115 | -DEPDIR = @DEPDIR@ |
116 | -DSYMUTIL = @DSYMUTIL@ |
117 | -DUMPBIN = @DUMPBIN@ |
118 | -ECHO_C = @ECHO_C@ |
119 | -ECHO_N = @ECHO_N@ |
120 | -ECHO_T = @ECHO_T@ |
121 | -EGREP = @EGREP@ |
122 | -EXEEXT = @EXEEXT@ |
123 | -FGREP = @FGREP@ |
124 | -GREP = @GREP@ |
125 | -INSTALL = @INSTALL@ |
126 | -INSTALL_DATA = @INSTALL_DATA@ |
127 | -INSTALL_LIBS = @INSTALL_LIBS@ |
128 | -INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
129 | -INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
130 | -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
131 | -LD = @LD@ |
132 | -LDFLAGS = @LDFLAGS@ |
133 | -LIBOBJS = @LIBOBJS@ |
134 | -LIBS = @LIBS@ |
135 | -LIBTOOL = @LIBTOOL@ |
136 | -LIPO = @LIPO@ |
137 | -LN_S = @LN_S@ |
138 | -LTLIBOBJS = @LTLIBOBJS@ |
139 | -MAKEINFO = @MAKEINFO@ |
140 | -MKDIR_P = @MKDIR_P@ |
141 | -NM = @NM@ |
142 | -NMEDIT = @NMEDIT@ |
143 | -OBJDUMP = @OBJDUMP@ |
144 | -OBJEXT = @OBJEXT@ |
145 | -OTOOL = @OTOOL@ |
146 | -OTOOL64 = @OTOOL64@ |
147 | -PACKAGE = @PACKAGE@ |
148 | -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ |
149 | -PACKAGE_NAME = @PACKAGE_NAME@ |
150 | -PACKAGE_STRING = @PACKAGE_STRING@ |
151 | -PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
152 | -PACKAGE_VERSION = @PACKAGE_VERSION@ |
153 | -PATH_SEPARATOR = @PATH_SEPARATOR@ |
154 | -RANLIB = @RANLIB@ |
155 | -SAMPLES_LIBS_PATH = @SAMPLES_LIBS_PATH@ |
156 | -SDL_CFLAGS = @SDL_CFLAGS@ |
157 | -SDL_CONFIG = @SDL_CONFIG@ |
158 | -SDL_LIBS = @SDL_LIBS@ |
159 | -SED = @SED@ |
160 | -SET_MAKE = @SET_MAKE@ |
161 | -SHELL = @SHELL@ |
162 | -STRIP = @STRIP@ |
163 | -VERSION = @VERSION@ |
164 | -abs_builddir = @abs_builddir@ |
165 | -abs_srcdir = @abs_srcdir@ |
166 | -abs_top_builddir = @abs_top_builddir@ |
167 | -abs_top_srcdir = @abs_top_srcdir@ |
168 | -ac_ct_CC = @ac_ct_CC@ |
169 | -ac_ct_CXX = @ac_ct_CXX@ |
170 | -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
171 | -am__include = @am__include@ |
172 | -am__leading_dot = @am__leading_dot@ |
173 | -am__quote = @am__quote@ |
174 | -am__tar = @am__tar@ |
175 | -am__untar = @am__untar@ |
176 | -bindir = @bindir@ |
177 | -build = @build@ |
178 | -build_alias = @build_alias@ |
179 | -build_cpu = @build_cpu@ |
180 | -build_os = @build_os@ |
181 | -build_vendor = @build_vendor@ |
182 | -builddir = @builddir@ |
183 | -datadir = @datadir@ |
184 | -datarootdir = @datarootdir@ |
185 | -docdir = @docdir@ |
186 | -dvidir = @dvidir@ |
187 | -exec_prefix = @exec_prefix@ |
188 | -host = @host@ |
189 | -host_alias = @host_alias@ |
190 | -host_cpu = @host_cpu@ |
191 | -host_os = @host_os@ |
192 | -host_vendor = @host_vendor@ |
193 | -htmldir = @htmldir@ |
194 | -includedir = @includedir@ |
195 | -infodir = @infodir@ |
196 | -install_sh = @install_sh@ |
197 | -libdir = @libdir@ |
198 | -libexecdir = @libexecdir@ |
199 | -localedir = @localedir@ |
200 | -localstatedir = @localstatedir@ |
201 | -lt_ECHO = @lt_ECHO@ |
202 | -mandir = @mandir@ |
203 | -mkdir_p = @mkdir_p@ |
204 | -oldincludedir = @oldincludedir@ |
205 | -pdfdir = @pdfdir@ |
206 | -prefix = @prefix@ |
207 | -program_transform_name = @program_transform_name@ |
208 | -psdir = @psdir@ |
209 | -sbindir = @sbindir@ |
210 | -sharedstatedir = @sharedstatedir@ |
211 | -srcdir = @srcdir@ |
212 | -sysconfdir = @sysconfdir@ |
213 | -target_alias = @target_alias@ |
214 | -top_builddir = @top_builddir@ |
215 | -top_srcdir = @top_srcdir@ |
216 | -INCLUDES = ${C_INCLUDES} |
217 | -lib_LTLIBRARIES = libc_urg.la |
218 | -libc_urg_includedir = ${includedir}/c_urg |
219 | -libc_urg_include_HEADERS = urg_ctrl.h urg_t.h urg_parameter_t.h |
220 | -libc_urg_la_SOURCES = urg_ctrl.c scip_handler.c urg_errno.c \ |
221 | -scip_handler.h urg_errno.h |
222 | - |
223 | -all: all-am |
224 | - |
225 | -.SUFFIXES: |
226 | -.SUFFIXES: .c .lo .o .obj |
227 | -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
228 | - @for dep in $?; do \ |
229 | - case '$(am__configure_deps)' in \ |
230 | - *$$dep*) \ |
231 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ |
232 | - && exit 0; \ |
233 | - exit 1;; \ |
234 | - esac; \ |
235 | - done; \ |
236 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/c/urg/Makefile'; \ |
237 | - cd $(top_srcdir) && \ |
238 | - $(AUTOMAKE) --gnu src/c/urg/Makefile |
239 | -.PRECIOUS: Makefile |
240 | -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
241 | - @case '$?' in \ |
242 | - *config.status*) \ |
243 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ |
244 | - *) \ |
245 | - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ |
246 | - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ |
247 | - esac; |
248 | - |
249 | -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
250 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
251 | - |
252 | -$(top_srcdir)/configure: $(am__configure_deps) |
253 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
254 | -$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
255 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
256 | -install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
257 | - @$(NORMAL_INSTALL) |
258 | - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" |
259 | - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ |
260 | - if test -f $$p; then \ |
261 | - f=$(am__strip_dir) \ |
262 | - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ |
263 | - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ |
264 | - else :; fi; \ |
265 | - done |
266 | - |
267 | -uninstall-libLTLIBRARIES: |
268 | - @$(NORMAL_UNINSTALL) |
269 | - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ |
270 | - p=$(am__strip_dir) \ |
271 | - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ |
272 | - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ |
273 | - done |
274 | - |
275 | -clean-libLTLIBRARIES: |
276 | - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) |
277 | - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ |
278 | - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ |
279 | - test "$$dir" != "$$p" || dir=.; \ |
280 | - echo "rm -f \"$${dir}/so_locations\""; \ |
281 | - rm -f "$${dir}/so_locations"; \ |
282 | - done |
283 | -libc_urg.la: $(libc_urg_la_OBJECTS) $(libc_urg_la_DEPENDENCIES) |
284 | - $(LINK) -rpath $(libdir) $(libc_urg_la_OBJECTS) $(libc_urg_la_LIBADD) $(LIBS) |
285 | - |
286 | -mostlyclean-compile: |
287 | - -rm -f *.$(OBJEXT) |
288 | - |
289 | -distclean-compile: |
290 | - -rm -f *.tab.c |
291 | - |
292 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scip_handler.Plo@am__quote@ |
293 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/urg_ctrl.Plo@am__quote@ |
294 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/urg_errno.Plo@am__quote@ |
295 | - |
296 | -.c.o: |
297 | -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
298 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
299 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
300 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
301 | -@am__fastdepCC_FALSE@ $(COMPILE) -c $< |
302 | - |
303 | -.c.obj: |
304 | -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` |
305 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
306 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
307 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
308 | -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` |
309 | - |
310 | -.c.lo: |
311 | -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
312 | -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo |
313 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ |
314 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
315 | -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< |
316 | - |
317 | -mostlyclean-libtool: |
318 | - -rm -f *.lo |
319 | - |
320 | -clean-libtool: |
321 | - -rm -rf .libs _libs |
322 | -install-libc_urg_includeHEADERS: $(libc_urg_include_HEADERS) |
323 | - @$(NORMAL_INSTALL) |
324 | - test -z "$(libc_urg_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libc_urg_includedir)" |
325 | - @list='$(libc_urg_include_HEADERS)'; for p in $$list; do \ |
326 | - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
327 | - f=$(am__strip_dir) \ |
328 | - echo " $(libc_urg_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libc_urg_includedir)/$$f'"; \ |
329 | - $(libc_urg_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libc_urg_includedir)/$$f"; \ |
330 | - done |
331 | - |
332 | -uninstall-libc_urg_includeHEADERS: |
333 | - @$(NORMAL_UNINSTALL) |
334 | - @list='$(libc_urg_include_HEADERS)'; for p in $$list; do \ |
335 | - f=$(am__strip_dir) \ |
336 | - echo " rm -f '$(DESTDIR)$(libc_urg_includedir)/$$f'"; \ |
337 | - rm -f "$(DESTDIR)$(libc_urg_includedir)/$$f"; \ |
338 | - done |
339 | - |
340 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
341 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
342 | - unique=`for i in $$list; do \ |
343 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
344 | - done | \ |
345 | - $(AWK) ' { files[$$0] = 1; } \ |
346 | - END { for (i in files) print i; }'`; \ |
347 | - mkid -fID $$unique |
348 | -tags: TAGS |
349 | - |
350 | -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
351 | - $(TAGS_FILES) $(LISP) |
352 | - tags=; \ |
353 | - here=`pwd`; \ |
354 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
355 | - unique=`for i in $$list; do \ |
356 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
357 | - done | \ |
358 | - $(AWK) ' { files[$$0] = 1; } \ |
359 | - END { for (i in files) print i; }'`; \ |
360 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ |
361 | - test -n "$$unique" || unique=$$empty_fix; \ |
362 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
363 | - $$tags $$unique; \ |
364 | - fi |
365 | -ctags: CTAGS |
366 | -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
367 | - $(TAGS_FILES) $(LISP) |
368 | - tags=; \ |
369 | - here=`pwd`; \ |
370 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
371 | - unique=`for i in $$list; do \ |
372 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
373 | - done | \ |
374 | - $(AWK) ' { files[$$0] = 1; } \ |
375 | - END { for (i in files) print i; }'`; \ |
376 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ |
377 | - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
378 | - $$tags $$unique |
379 | - |
380 | -GTAGS: |
381 | - here=`$(am__cd) $(top_builddir) && pwd` \ |
382 | - && cd $(top_srcdir) \ |
383 | - && gtags -i $(GTAGS_ARGS) $$here |
384 | - |
385 | -distclean-tags: |
386 | - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
387 | - |
388 | -distdir: $(DISTFILES) |
389 | - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
390 | - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
391 | - list='$(DISTFILES)'; \ |
392 | - dist_files=`for file in $$list; do echo $$file; done | \ |
393 | - sed -e "s|^$$srcdirstrip/||;t" \ |
394 | - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ |
395 | - case $$dist_files in \ |
396 | - */*) $(MKDIR_P) `echo "$$dist_files" | \ |
397 | - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ |
398 | - sort -u` ;; \ |
399 | - esac; \ |
400 | - for file in $$dist_files; do \ |
401 | - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
402 | - if test -d $$d/$$file; then \ |
403 | - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ |
404 | - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ |
405 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ |
406 | - fi; \ |
407 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ |
408 | - else \ |
409 | - test -f $(distdir)/$$file \ |
410 | - || cp -p $$d/$$file $(distdir)/$$file \ |
411 | - || exit 1; \ |
412 | - fi; \ |
413 | - done |
414 | -check-am: all-am |
415 | -check: check-am |
416 | -all-am: Makefile $(LTLIBRARIES) $(HEADERS) |
417 | -installdirs: |
418 | - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libc_urg_includedir)"; do \ |
419 | - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
420 | - done |
421 | -install: install-am |
422 | -install-exec: install-exec-am |
423 | -install-data: install-data-am |
424 | -uninstall: uninstall-am |
425 | - |
426 | -install-am: all-am |
427 | - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am |
428 | - |
429 | -installcheck: installcheck-am |
430 | -install-strip: |
431 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
432 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
433 | - `test -z '$(STRIP)' || \ |
434 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
435 | -mostlyclean-generic: |
436 | - |
437 | -clean-generic: |
438 | - |
439 | -distclean-generic: |
440 | - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
441 | - |
442 | -maintainer-clean-generic: |
443 | - @echo "This command is intended for maintainers to use" |
444 | - @echo "it deletes files that may require special tools to rebuild." |
445 | -clean: clean-am |
446 | - |
447 | -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ |
448 | - mostlyclean-am |
449 | - |
450 | -distclean: distclean-am |
451 | - -rm -rf ./$(DEPDIR) |
452 | - -rm -f Makefile |
453 | -distclean-am: clean-am distclean-compile distclean-generic \ |
454 | - distclean-tags |
455 | - |
456 | -dvi: dvi-am |
457 | - |
458 | -dvi-am: |
459 | - |
460 | -html: html-am |
461 | - |
462 | -info: info-am |
463 | - |
464 | -info-am: |
465 | - |
466 | -install-data-am: install-libc_urg_includeHEADERS |
467 | - |
468 | -install-dvi: install-dvi-am |
469 | - |
470 | -install-exec-am: install-libLTLIBRARIES |
471 | - |
472 | -install-html: install-html-am |
473 | - |
474 | -install-info: install-info-am |
475 | - |
476 | -install-man: |
477 | - |
478 | -install-pdf: install-pdf-am |
479 | - |
480 | -install-ps: install-ps-am |
481 | - |
482 | -installcheck-am: |
483 | - |
484 | -maintainer-clean: maintainer-clean-am |
485 | - -rm -rf ./$(DEPDIR) |
486 | - -rm -f Makefile |
487 | -maintainer-clean-am: distclean-am maintainer-clean-generic |
488 | - |
489 | -mostlyclean: mostlyclean-am |
490 | - |
491 | -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ |
492 | - mostlyclean-libtool |
493 | - |
494 | -pdf: pdf-am |
495 | - |
496 | -pdf-am: |
497 | - |
498 | -ps: ps-am |
499 | - |
500 | -ps-am: |
501 | - |
502 | -uninstall-am: uninstall-libLTLIBRARIES \ |
503 | - uninstall-libc_urg_includeHEADERS |
504 | - |
505 | -.MAKE: install-am install-strip |
506 | - |
507 | -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ |
508 | - clean-libLTLIBRARIES clean-libtool ctags distclean \ |
509 | - distclean-compile distclean-generic distclean-libtool \ |
510 | - distclean-tags distdir dvi dvi-am html html-am info info-am \ |
511 | - install install-am install-data install-data-am install-dvi \ |
512 | - install-dvi-am install-exec install-exec-am install-html \ |
513 | - install-html-am install-info install-info-am \ |
514 | - install-libLTLIBRARIES install-libc_urg_includeHEADERS \ |
515 | - install-man install-pdf install-pdf-am install-ps \ |
516 | - install-ps-am install-strip installcheck installcheck-am \ |
517 | - installdirs maintainer-clean maintainer-clean-generic \ |
518 | - mostlyclean mostlyclean-compile mostlyclean-generic \ |
519 | - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ |
520 | - uninstall-am uninstall-libLTLIBRARIES \ |
521 | - uninstall-libc_urg_includeHEADERS |
522 | - |
523 | -# Tell versions [3.59,3.63) of GNU make to not export all variables. |
524 | -# Otherwise a system limit (for SysV at least) may be exceeded. |
525 | -.NOEXPORT: |
526 | |
527 | === removed directory '.pc/fix-ftbfs-with-gcc-4.7' |
528 | === removed directory '.pc/fix-ftbfs-with-gcc-4.7/src' |
529 | === removed directory '.pc/fix-ftbfs-with-gcc-4.7/src/cpp' |
530 | === removed directory '.pc/fix-ftbfs-with-gcc-4.7/src/cpp/connection' |
531 | === removed file '.pc/fix-ftbfs-with-gcc-4.7/src/cpp/connection/SerialDevice_lin.cpp' |
532 | --- .pc/fix-ftbfs-with-gcc-4.7/src/cpp/connection/SerialDevice_lin.cpp 2012-04-05 00:02:25 +0000 |
533 | +++ .pc/fix-ftbfs-with-gcc-4.7/src/cpp/connection/SerialDevice_lin.cpp 1970-01-01 00:00:00 +0000 |
534 | @@ -1,205 +0,0 @@ |
535 | -/*! |
536 | - \file |
537 | - \brief ƒVƒŠƒAƒ‹’Ê�M‚ÌŽÀ�ˆ—� (Linux, Mac) |
538 | - |
539 | - \author Satofumi KAMIMURA |
540 | - |
541 | - $Id: SerialDevice_lin.cpp 1811 2010-04-30 16:12:05Z satofumi $ |
542 | -*/ |
543 | - |
544 | -#include <fcntl.h> |
545 | -#include <termios.h> |
546 | -#include <cerrno> |
547 | -#include <cstring> |
548 | -#include <cstdio> |
549 | - |
550 | - |
551 | -class RawSerialDevice |
552 | -{ |
553 | - enum { |
554 | - InvalidFd = -1, |
555 | - }; |
556 | - |
557 | - string error_message_; |
558 | - int fd_; |
559 | - struct termios sio_; //!< ’Ê�Mƒ^�[ƒ~ƒiƒ‹�§Œä |
560 | - fd_set rfds_; //!< ƒ^ƒCƒ€ƒAƒEƒg�§Œä |
561 | - |
562 | - |
563 | - bool waitReceive(int timeout) |
564 | - { |
565 | - // ƒ^ƒCƒ€ƒAƒEƒg�Ý’è |
566 | - FD_ZERO(&rfds_); |
567 | - FD_SET(fd_, &rfds_); |
568 | - |
569 | - struct timeval tv; |
570 | - tv.tv_sec = timeout / 1000; |
571 | - tv.tv_usec = (timeout % 1000) * 1000; |
572 | - |
573 | - if (select(fd_ + 1, &rfds_, NULL, NULL, |
574 | - (timeout < 0) ? NULL : &tv) <= 0) { |
575 | - /* ƒ^ƒCƒ€ƒAƒEƒg”�¶ */ |
576 | - return false; |
577 | - } |
578 | - return true; |
579 | - } |
580 | - |
581 | - |
582 | -public: |
583 | - RawSerialDevice(void) : error_message_("no error."), fd_(InvalidFd) |
584 | - { |
585 | - } |
586 | - |
587 | - |
588 | - const char* what(void) |
589 | - { |
590 | - return error_message_.c_str(); |
591 | - } |
592 | - |
593 | - |
594 | - bool connect(const char* device, long baudrate) |
595 | - { |
596 | -#ifndef MAC_OS |
597 | - enum { O_EXLOCK = 0x0 }; // Linux ‚Å‚ÍŽg‚¦‚È‚¢‚̂Ń_ƒ~�[‚ð�ì�¬‚µ‚Ä‚¨‚ |
598 | -#endif |
599 | - fd_ = open(device, O_RDWR | O_EXLOCK | O_NONBLOCK | O_NOCTTY); |
600 | - if (fd_ < 0) { |
601 | - // �Ú‘±‚ÉŽ¸”s |
602 | - error_message_ = string(device) + ": " + strerror(errno); |
603 | - return false; |
604 | - } |
605 | - int flags = fcntl(fd_, F_GETFL, 0); |
606 | - fcntl(fd_, F_SETFL, flags & ~O_NONBLOCK); |
607 | - |
608 | - // ƒVƒŠƒAƒ‹’Ê�M‚Ì�‰Šú‰» |
609 | - tcgetattr(fd_, &sio_); |
610 | - sio_.c_iflag = 0; |
611 | - sio_.c_oflag = 0; |
612 | - sio_.c_cflag &= ~(CSIZE | PARENB | CSTOPB); |
613 | - sio_.c_cflag |= CS8 | CREAD | CLOCAL; |
614 | - sio_.c_lflag &= ~(ICANON | ECHO | ISIG | IEXTEN); |
615 | - |
616 | - sio_.c_cc[VMIN] = 0; |
617 | - sio_.c_cc[VTIME] = 0; |
618 | - |
619 | - // ƒ{�[ƒŒ�[ƒg‚Ì•Ï�X |
620 | - if (! setBaudrate(baudrate)) { |
621 | - return false; |
622 | - } |
623 | - return true; |
624 | - } |
625 | - |
626 | - |
627 | - void disconnect(void) |
628 | - { |
629 | - if (fd_ != InvalidFd) { |
630 | - close(fd_); |
631 | - fd_ = InvalidFd; |
632 | - } |
633 | - } |
634 | - |
635 | - |
636 | - bool isConnected(void) |
637 | - { |
638 | - return (fd_ == InvalidFd) ? false : true; |
639 | - } |
640 | - |
641 | - |
642 | - bool setBaudrate(long baudrate) |
643 | - { |
644 | - long baudrate_value = -1; |
645 | - enum { ErrorMessageSize = 256 }; |
646 | - char error_message[ErrorMessageSize]; |
647 | - |
648 | - switch (baudrate) { |
649 | - |
650 | - case 4800: |
651 | - baudrate_value = B4800; |
652 | - break; |
653 | - |
654 | - case 9600: |
655 | - baudrate_value = B9600; |
656 | - break; |
657 | - |
658 | - case 19200: |
659 | - baudrate_value = B19200; |
660 | - break; |
661 | - |
662 | - case 38400: |
663 | - baudrate_value = B38400; |
664 | - break; |
665 | - |
666 | - case 57600: |
667 | - baudrate_value = B57600; |
668 | - break; |
669 | - |
670 | - case 115200: |
671 | - baudrate_value = B115200; |
672 | - break; |
673 | - |
674 | - default: |
675 | - sprintf(error_message, "No handle baudrate value: %ld", baudrate); |
676 | - error_message_ = string(error_message); |
677 | - return false; |
678 | - } |
679 | - |
680 | - /* ƒ{�[ƒŒ�[ƒg•Ï�X */ |
681 | - cfsetospeed(&sio_, baudrate_value); |
682 | - cfsetispeed(&sio_, baudrate_value); |
683 | - tcsetattr(fd_, TCSANOW, &sio_); |
684 | - flush(); |
685 | - |
686 | - return true; |
687 | - } |
688 | - |
689 | - |
690 | - int send(const char* data, int count) |
691 | - { |
692 | - if (! isConnected()) { |
693 | - error_message_ = "no connection."; |
694 | - return 0; |
695 | - } |
696 | - return write(fd_, data, count); |
697 | - } |
698 | - |
699 | - |
700 | - int receive(char buffer[], int count, int timeout) |
701 | - { |
702 | - int filled = 0; |
703 | - |
704 | - // Žw’èƒTƒCƒY‚Ì“Ç‚Ý�o‚µ‚ð�s‚¤ |
705 | - int n = read(fd_, buffer, count); |
706 | - if (n < 0) { |
707 | - return n; |
708 | - } |
709 | - filled += n; |
710 | - |
711 | - // Žó�M‚ªŠ®—¹‚µ‚Ä‚¢‚½‚ç�A–ß‚é |
712 | - if (filled >= count) { |
713 | - return filled; |
714 | - } |
715 | - |
716 | - // ƒ^ƒCƒ€ƒAƒEƒg•t‚«‚Å“Ç‚Ý�o‚µ‚ð�s‚¤ |
717 | - while (filled < count) { |
718 | - if (! waitReceive(timeout)) { |
719 | - break; |
720 | - } |
721 | - |
722 | - int required_n = count - filled; |
723 | - n = read(fd_, &buffer[filled], required_n); |
724 | - if (n <= 0) { |
725 | - /* “Ç‚Ý�o‚µƒGƒ‰�[�BŒ»�Ý‚Ü‚Å‚ÌŽó�M“à—e‚Å–ß‚é */ |
726 | - break; |
727 | - } |
728 | - filled += n; |
729 | - } |
730 | - return filled; |
731 | - } |
732 | - |
733 | - |
734 | - void flush(void) |
735 | - { |
736 | - tcdrain(fd_); |
737 | - tcflush(fd_, TCIOFLUSH); |
738 | - } |
739 | -}; |
740 | |
741 | === removed directory '.pc/fix-preprocessor-fdset.patch' |
742 | === removed directory '.pc/fix-preprocessor-fdset.patch/src' |
743 | === removed directory '.pc/fix-preprocessor-fdset.patch/src/c' |
744 | === removed directory '.pc/fix-preprocessor-fdset.patch/src/c/connection' |
745 | === removed file '.pc/fix-preprocessor-fdset.patch/src/c/connection/serial_ctrl_lin.c' |
746 | --- .pc/fix-preprocessor-fdset.patch/src/c/connection/serial_ctrl_lin.c 2013-04-13 09:21:47 +0000 |
747 | +++ .pc/fix-preprocessor-fdset.patch/src/c/connection/serial_ctrl_lin.c 1970-01-01 00:00:00 +0000 |
748 | @@ -1,277 +0,0 @@ |
749 | -/*! |
750 | - \file |
751 | - \brief ƒVƒŠƒAƒ‹’Ê�M (Linux, Mac ŽÀ‘•) |
752 | - |
753 | - Serial Communication Interface �§Œä |
754 | - |
755 | - |
756 | - \author Satofumi KAMIMURA |
757 | - |
758 | - $Id: serial_ctrl_lin.c 1559 2009-12-01 13:13:08Z satofumi $ |
759 | -*/ |
760 | - |
761 | -#include "serial_errno.h" |
762 | -#include "ring_buffer.h" |
763 | -#include <unistd.h> |
764 | -#include <stdio.h> |
765 | -#include <fcntl.h> |
766 | -#include <errno.h> |
767 | -#include <string.h> |
768 | - |
769 | -//#include <ctype.h> |
770 | - |
771 | -enum { |
772 | - False = 0, |
773 | - True, |
774 | -}; |
775 | - |
776 | - |
777 | -enum { |
778 | - InvalidFd = -1, |
779 | -}; |
780 | - |
781 | - |
782 | -void serial_initialize(serial_t *serial) |
783 | -{ |
784 | - serial->fd_ = InvalidFd; |
785 | - serial->errno_ = SerialNoError; |
786 | - serial->has_last_ch_ = False; |
787 | - |
788 | - ring_initialize(&serial->ring_, serial->buffer_, RingBufferSizeShift); |
789 | -} |
790 | - |
791 | - |
792 | -/* �Ú‘± */ |
793 | -int serial_connect(serial_t *serial, const char *device, long baudrate) |
794 | -{ |
795 | - int flags = 0; |
796 | - int ret = 0; |
797 | - |
798 | - serial_initialize(serial); |
799 | - |
800 | -#ifndef MAC_OS |
801 | - enum { O_EXLOCK = 0x0 }; /* Linux ‚Å‚ÍŽg‚¦‚È‚¢‚̂Ń_ƒ~�[‚ð�ì�¬‚µ‚Ä‚¨‚ */ |
802 | -#endif |
803 | - serial->fd_ = open(device, O_RDWR | O_EXLOCK | O_NONBLOCK | O_NOCTTY); |
804 | - if (serial->fd_ < 0) { |
805 | - /* �Ú‘±‚ÉŽ¸”s */ |
806 | - strerror_r(errno, serial->error_string_, SerialErrorStringSize); |
807 | - return SerialConnectionFail; |
808 | - } |
809 | - |
810 | - flags = fcntl(serial->fd_, F_GETFL, 0); |
811 | - fcntl(serial->fd_, F_SETFL, flags & ~O_NONBLOCK); |
812 | - |
813 | - /* ƒVƒŠƒAƒ‹’Ê�M‚Ì�‰Šú‰» */ |
814 | - tcgetattr(serial->fd_, &serial->sio_); |
815 | - serial->sio_.c_iflag = 0; |
816 | - serial->sio_.c_oflag = 0; |
817 | - serial->sio_.c_cflag &= ~(CSIZE | PARENB | CSTOPB); |
818 | - serial->sio_.c_cflag |= CS8 | CREAD | CLOCAL; |
819 | - serial->sio_.c_lflag &= ~(ICANON | ECHO | ISIG | IEXTEN); |
820 | - |
821 | - serial->sio_.c_cc[VMIN] = 0; |
822 | - serial->sio_.c_cc[VTIME] = 0; |
823 | - |
824 | - /* ƒ{�[ƒŒ�[ƒg‚Ì•Ï�X */ |
825 | - ret = serial_setBaudrate(serial, baudrate); |
826 | - if (ret < 0) { |
827 | - return ret; |
828 | - } |
829 | - |
830 | - /* ƒVƒŠƒAƒ‹�§Œä�\‘¢‘Ì‚Ì�‰Šú‰» */ |
831 | - serial->has_last_ch_ = False; |
832 | - |
833 | - return 0; |
834 | -} |
835 | - |
836 | - |
837 | -/* �ؒf */ |
838 | -void serial_disconnect(serial_t *serial) |
839 | -{ |
840 | - if (serial->fd_ >= 0) { |
841 | - close(serial->fd_); |
842 | - serial->fd_ = InvalidFd; |
843 | - } |
844 | -} |
845 | - |
846 | - |
847 | -int serial_isConnected(const serial_t *serial) |
848 | -{ |
849 | - return ((serial == NULL) || (serial->fd_ == InvalidFd)) ? 0 : 1; |
850 | -} |
851 | - |
852 | - |
853 | -/* ƒ{�[ƒŒ�[ƒg‚Ì�Ý’è */ |
854 | -int serial_setBaudrate(serial_t *serial, long baudrate) |
855 | -{ |
856 | - long baudrate_value = -1; |
857 | - |
858 | - switch (baudrate) { |
859 | - case 4800: |
860 | - baudrate_value = B4800; |
861 | - break; |
862 | - |
863 | - case 9600: |
864 | - baudrate_value = B9600; |
865 | - break; |
866 | - |
867 | - case 19200: |
868 | - baudrate_value = B19200; |
869 | - break; |
870 | - |
871 | - case 38400: |
872 | - baudrate_value = B38400; |
873 | - break; |
874 | - |
875 | - case 57600: |
876 | - baudrate_value = B57600; |
877 | - break; |
878 | - |
879 | - case 115200: |
880 | - baudrate_value = B115200; |
881 | - break; |
882 | - |
883 | - default: |
884 | - return SerialSetBaudrateFail; |
885 | - } |
886 | - |
887 | - /* ƒ{�[ƒŒ�[ƒg•Ï�X */ |
888 | - cfsetospeed(&serial->sio_, baudrate_value); |
889 | - cfsetispeed(&serial->sio_, baudrate_value); |
890 | - tcsetattr(serial->fd_, TCSADRAIN, &serial->sio_); |
891 | - serial_clear(serial); |
892 | - |
893 | - return 0; |
894 | -} |
895 | - |
896 | - |
897 | -/* ‘—�M */ |
898 | -int serial_send(serial_t *serial, const char *data, int data_size) |
899 | -{ |
900 | - if (! serial_isConnected(serial)) { |
901 | - return SerialConnectionFail; |
902 | - } |
903 | - return write(serial->fd_, data, data_size); |
904 | -} |
905 | - |
906 | - |
907 | -static int waitReceive(serial_t* serial, int timeout) |
908 | -{ |
909 | - fd_set rfds; |
910 | - struct timeval tv; |
911 | - |
912 | - // ƒ^ƒCƒ€ƒAƒEƒg�Ý’è |
913 | - FD_ZERO(&rfds); |
914 | - FD_SET(serial->fd_, &rfds); |
915 | - |
916 | - tv.tv_sec = timeout / 1000; |
917 | - tv.tv_usec = (timeout % 1000) * 1000; |
918 | - |
919 | - if (select(serial->fd_ + 1, &rfds, NULL, NULL, |
920 | - (timeout < 0) ? NULL : &tv) <= 0) { |
921 | - /* ƒ^ƒCƒ€ƒAƒEƒg”�¶ */ |
922 | - return 0; |
923 | - } |
924 | - return 1; |
925 | -} |
926 | - |
927 | - |
928 | -static int internal_receive(char data[], int data_size_max, |
929 | - serial_t* serial, int timeout) |
930 | -{ |
931 | - int filled = 0; |
932 | - |
933 | - if (data_size_max <= 0) { |
934 | - return 0; |
935 | - } |
936 | - |
937 | - while (filled < data_size_max) { |
938 | - int require_n; |
939 | - int read_n; |
940 | - |
941 | - if (! waitReceive(serial, timeout)) { |
942 | - break; |
943 | - } |
944 | - |
945 | - require_n = data_size_max - filled; |
946 | - read_n = read(serial->fd_, &data[filled], require_n); |
947 | - if (read_n <= 0) { |
948 | - /* “Ç‚Ý�o‚µƒGƒ‰�[�BŒ»�Ý‚Ü‚Å‚ÌŽó�M“à—e‚Å–ß‚é */ |
949 | - break; |
950 | - } |
951 | - filled += read_n; |
952 | - } |
953 | - return filled; |
954 | -} |
955 | - |
956 | - |
957 | -/* Žó�M */ |
958 | -int serial_recv(serial_t *serial, char* data, int data_size_max, int timeout) |
959 | -{ |
960 | - int filled; |
961 | - int read_n; |
962 | - int buffer_size; |
963 | - |
964 | - if (data_size_max <= 0) { |
965 | - return 0; |
966 | - } |
967 | - |
968 | - /* �‘‚«–ß‚µ‚½‚P•¶Žš‚ª‚ ‚ê‚Î�A�‘‚«�o‚· */ |
969 | - filled = 0; |
970 | - if (serial->has_last_ch_ != False) { |
971 | - data[0] = serial->last_ch_; |
972 | - serial->has_last_ch_ = False; |
973 | - ++filled; |
974 | - } |
975 | - |
976 | - if (! serial_isConnected(serial)) { |
977 | - if (filled > 0) { |
978 | - return filled; |
979 | - } |
980 | - return SerialConnectionFail; |
981 | - } |
982 | - |
983 | - buffer_size = ring_size(&serial->ring_); |
984 | - read_n = data_size_max - filled; |
985 | - if (buffer_size < read_n) { |
986 | - // ƒŠƒ“ƒOƒoƒbƒtƒ@“à‚̃f�[ƒ^‚Å‘«‚è‚È‚¯‚ê‚Î�Aƒf�[ƒ^‚ð“Ç‚Ý‘«‚· |
987 | - char buffer[RingBufferSize]; |
988 | - int n = internal_receive(buffer, |
989 | - ring_capacity(&serial->ring_) - buffer_size, |
990 | - serial, 0); |
991 | - ring_write(&serial->ring_, buffer, n); |
992 | - } |
993 | - buffer_size = ring_size(&serial->ring_); |
994 | - |
995 | - // ƒŠƒ“ƒOƒoƒbƒtƒ@“à‚̃f�[ƒ^‚ð•Ô‚· |
996 | - if (read_n > buffer_size) { |
997 | - read_n = buffer_size; |
998 | - } |
999 | - if (read_n > 0) { |
1000 | - ring_read(&serial->ring_, &data[filled], read_n); |
1001 | - filled += read_n; |
1002 | - } |
1003 | - |
1004 | - // ƒf�[ƒ^‚ðƒ^ƒCƒ€ƒAƒEƒg•t‚«‚Å“Ç‚Ý�o‚· |
1005 | - filled += internal_receive(&data[filled], |
1006 | - data_size_max - filled, serial, timeout); |
1007 | - return filled; |
1008 | -} |
1009 | - |
1010 | - |
1011 | -/* ‚P•¶Žš�‘‚«–ß‚· */ |
1012 | -void serial_ungetc(serial_t *serial, char ch) |
1013 | -{ |
1014 | - serial->has_last_ch_ = True; |
1015 | - serial->last_ch_ = ch; |
1016 | -} |
1017 | - |
1018 | - |
1019 | -void serial_clear(serial_t* serial) |
1020 | -{ |
1021 | - tcdrain(serial->fd_); |
1022 | - tcflush(serial->fd_, TCIOFLUSH); |
1023 | - ring_clear(&serial->ring_); |
1024 | - serial->has_last_ch_ = False; |
1025 | -} |
1026 | |
1027 | === modified file 'ChangeLog' |
1028 | --- ChangeLog 2011-05-20 11:33:03 +0000 |
1029 | +++ ChangeLog 2013-05-12 04:05:28 +0000 |
1030 | @@ -1,3 +1,29 @@ |
1031 | +2012-10-30 Satofumi KAMIMURA <satofumi@uers.sourceforge.jp> |
1032 | + * Fixed to compile with Ubuntu 12.10. |
1033 | + * 0.8.18 released. |
1034 | + |
1035 | +2012-04-06 Satofumi KAMIMURA <satofumi@uers.sourceforge.jp> |
1036 | + * Added include/cpp/findUrgPorts.h file. |
1037 | + * 0.8.17 released. |
1038 | + |
1039 | +2012-02-17 Satofumi KAMIMURA <satofumi@uers.sourceforge.jp> |
1040 | + * Fixed runtime error of cpp_ethernet/captureIntensitySample.cpp. |
1041 | + |
1042 | +2012-02-17 Satofumi KAMIMURA <satofumi@uers.sourceforge.jp> |
1043 | + * Added extern "C" for c/urg_ctrl.h |
1044 | + * 0.8.16 released. |
1045 | + |
1046 | +2011-11-05 Satofumi KAMIMURA <satofumi@uers.sourceforge.jp> |
1047 | + * Fixed capture function's timestamp bug. |
1048 | + |
1049 | +2011-10-28 Satofumi KAMIMURA <satofumi@uers.sourceforge.jp> |
1050 | + * added UrgDevice.h. |
1051 | + * 0.8.14 released. |
1052 | + |
1053 | +2011-07-13 Satofumi KAMIMURA <satofumi@uers.sourceforge.jp> |
1054 | + * Fixed added UrgDevice.h. |
1055 | + * 0.8.13 released. |
1056 | + |
1057 | 2011-05-10 Satofumi KAMIMURA <satofumi@uers.sourceforge.jp> |
1058 | * Fixed size_t errors. |
1059 | * 0.8.12 released. |
1060 | @@ -125,7 +151,6 @@ |
1061 | |
1062 | 2009-02-03 Satofumi KAMIMURA <satofumi@uers.sourceforge.jp> |
1063 | * Fixed to ignore previously remained receive data when connected. |
1064 | - c/urg_ctrl.c |
1065 | |
1066 | 2009-02-02 Satofumi KAMIMURA <satofumi@uers.sourceforge.jp> |
1067 | * Implementation of urg_receivePartialData() in c/urg_ctrl.c |
1068 | |
1069 | === modified file 'Makefile.in' |
1070 | --- Makefile.in 2011-05-20 11:33:03 +0000 |
1071 | +++ Makefile.in 2013-05-12 04:05:28 +0000 |
1072 | @@ -1,8 +1,9 @@ |
1073 | -# Makefile.in generated by automake 1.10 from Makefile.am. |
1074 | +# Makefile.in generated by automake 1.11.6 from Makefile.am. |
1075 | # @configure_input@ |
1076 | |
1077 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
1078 | -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
1079 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1080 | +# Foundation, Inc. |
1081 | # This Makefile.in is free software; the Free Software Foundation |
1082 | # gives unlimited permission to copy and/or distribute it, |
1083 | # with or without modifications, as long as this notice is preserved. |
1084 | @@ -15,9 +16,27 @@ |
1085 | @SET_MAKE@ |
1086 | |
1087 | VPATH = @srcdir@ |
1088 | +am__make_dryrun = \ |
1089 | + { \ |
1090 | + am__dry=no; \ |
1091 | + case $$MAKEFLAGS in \ |
1092 | + *\\[\ \ ]*) \ |
1093 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
1094 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
1095 | + *) \ |
1096 | + for am__flg in $$MAKEFLAGS; do \ |
1097 | + case $$am__flg in \ |
1098 | + *=*|--*) ;; \ |
1099 | + *n*) am__dry=yes; break;; \ |
1100 | + esac; \ |
1101 | + done;; \ |
1102 | + esac; \ |
1103 | + test $$am__dry = yes; \ |
1104 | + } |
1105 | pkgdatadir = $(datadir)/@PACKAGE@ |
1106 | +pkgincludedir = $(includedir)/@PACKAGE@ |
1107 | pkglibdir = $(libdir)/@PACKAGE@ |
1108 | -pkgincludedir = $(includedir)/@PACKAGE@ |
1109 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ |
1110 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
1111 | install_sh_DATA = $(install_sh) -c -m 644 |
1112 | install_sh_PROGRAM = $(install_sh) -c |
1113 | @@ -47,8 +66,35 @@ |
1114 | mkinstalldirs = $(install_sh) -d |
1115 | CONFIG_HEADER = config.h |
1116 | CONFIG_CLEAN_FILES = urg-config c_urg-config |
1117 | +CONFIG_CLEAN_VPATH_FILES = |
1118 | +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
1119 | +am__vpath_adj = case $$p in \ |
1120 | + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
1121 | + *) f=$$p;; \ |
1122 | + esac; |
1123 | +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; |
1124 | +am__install_max = 40 |
1125 | +am__nobase_strip_setup = \ |
1126 | + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` |
1127 | +am__nobase_strip = \ |
1128 | + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" |
1129 | +am__nobase_list = $(am__nobase_strip_setup); \ |
1130 | + for p in $$list; do echo "$$p $$p"; done | \ |
1131 | + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ |
1132 | + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ |
1133 | + if (++n[$$2] == $(am__install_max)) \ |
1134 | + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ |
1135 | + END { for (dir in files) print dir, files[dir] }' |
1136 | +am__base_list = \ |
1137 | + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
1138 | + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
1139 | +am__uninstall_files_from_dir = { \ |
1140 | + test -z "$$files" \ |
1141 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
1142 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
1143 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
1144 | + } |
1145 | am__installdirs = "$(DESTDIR)$(bindir)" |
1146 | -binSCRIPT_INSTALL = $(INSTALL_SCRIPT) |
1147 | SCRIPTS = $(bin_SCRIPTS) |
1148 | SOURCES = |
1149 | DIST_SOURCES = |
1150 | @@ -59,8 +105,16 @@ |
1151 | install-pdf-recursive install-ps-recursive install-recursive \ |
1152 | installcheck-recursive installdirs-recursive pdf-recursive \ |
1153 | ps-recursive uninstall-recursive |
1154 | +am__can_run_installinfo = \ |
1155 | + case $$AM_UPDATE_INFO_DIR in \ |
1156 | + n|no|NO) false;; \ |
1157 | + *) (install-info --version) >/dev/null 2>&1;; \ |
1158 | + esac |
1159 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
1160 | distclean-recursive maintainer-clean-recursive |
1161 | +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
1162 | + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
1163 | + distdir dist dist-all distcheck |
1164 | ETAGS = etags |
1165 | CTAGS = ctags |
1166 | DIST_SUBDIRS = $(SUBDIRS) |
1167 | @@ -68,12 +122,41 @@ |
1168 | distdir = $(PACKAGE)-$(VERSION) |
1169 | top_distdir = $(distdir) |
1170 | am__remove_distdir = \ |
1171 | - { test ! -d $(distdir) \ |
1172 | - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ |
1173 | - && rm -fr $(distdir); }; } |
1174 | + if test -d "$(distdir)"; then \ |
1175 | + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
1176 | + && rm -rf "$(distdir)" \ |
1177 | + || { sleep 5 && rm -rf "$(distdir)"; }; \ |
1178 | + else :; fi |
1179 | +am__relativize = \ |
1180 | + dir0=`pwd`; \ |
1181 | + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
1182 | + sed_rest='s,^[^/]*/*,,'; \ |
1183 | + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ |
1184 | + sed_butlast='s,/*[^/]*$$,,'; \ |
1185 | + while test -n "$$dir1"; do \ |
1186 | + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ |
1187 | + if test "$$first" != "."; then \ |
1188 | + if test "$$first" = ".."; then \ |
1189 | + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ |
1190 | + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ |
1191 | + else \ |
1192 | + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ |
1193 | + if test "$$first2" = "$$first"; then \ |
1194 | + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ |
1195 | + else \ |
1196 | + dir2="../$$dir2"; \ |
1197 | + fi; \ |
1198 | + dir0="$$dir0"/"$$first"; \ |
1199 | + fi; \ |
1200 | + fi; \ |
1201 | + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ |
1202 | + done; \ |
1203 | + reldir="$$dir2" |
1204 | DIST_ARCHIVES = $(distdir).tar.gz |
1205 | GZIP_ENV = --best |
1206 | distuninstallcheck_listfiles = find . -type f -print |
1207 | +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
1208 | + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
1209 | distcleancheck_listfiles = find . -type f -print |
1210 | ACLOCAL = @ACLOCAL@ |
1211 | AMTAR = @AMTAR@ |
1212 | @@ -97,6 +180,7 @@ |
1213 | C_INSTALL_LIBS = @C_INSTALL_LIBS@ |
1214 | DEFS = @DEFS@ |
1215 | DEPDIR = @DEPDIR@ |
1216 | +DLLTOOL = @DLLTOOL@ |
1217 | DSYMUTIL = @DSYMUTIL@ |
1218 | DUMPBIN = @DUMPBIN@ |
1219 | ECHO_C = @ECHO_C@ |
1220 | @@ -121,6 +205,7 @@ |
1221 | LN_S = @LN_S@ |
1222 | LTLIBOBJS = @LTLIBOBJS@ |
1223 | MAKEINFO = @MAKEINFO@ |
1224 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
1225 | MKDIR_P = @MKDIR_P@ |
1226 | NM = @NM@ |
1227 | NMEDIT = @NMEDIT@ |
1228 | @@ -133,6 +218,7 @@ |
1229 | PACKAGE_NAME = @PACKAGE_NAME@ |
1230 | PACKAGE_STRING = @PACKAGE_STRING@ |
1231 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
1232 | +PACKAGE_URL = @PACKAGE_URL@ |
1233 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
1234 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
1235 | RANLIB = @RANLIB@ |
1236 | @@ -149,6 +235,7 @@ |
1237 | abs_srcdir = @abs_srcdir@ |
1238 | abs_top_builddir = @abs_top_builddir@ |
1239 | abs_top_srcdir = @abs_top_srcdir@ |
1240 | +ac_ct_AR = @ac_ct_AR@ |
1241 | ac_ct_CC = @ac_ct_CC@ |
1242 | ac_ct_CXX = @ac_ct_CXX@ |
1243 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
1244 | @@ -182,7 +269,6 @@ |
1245 | libexecdir = @libexecdir@ |
1246 | localedir = @localedir@ |
1247 | localstatedir = @localstatedir@ |
1248 | -lt_ECHO = @lt_ECHO@ |
1249 | mandir = @mandir@ |
1250 | mkdir_p = @mkdir_p@ |
1251 | oldincludedir = @oldincludedir@ |
1252 | @@ -195,6 +281,7 @@ |
1253 | srcdir = @srcdir@ |
1254 | sysconfdir = @sysconfdir@ |
1255 | target_alias = @target_alias@ |
1256 | +top_build_prefix = @top_build_prefix@ |
1257 | top_builddir = @top_builddir@ |
1258 | top_srcdir = @top_srcdir@ |
1259 | SUBDIRS = include src samples |
1260 | @@ -204,21 +291,21 @@ |
1261 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
1262 | |
1263 | .SUFFIXES: |
1264 | -am--refresh: |
1265 | +am--refresh: Makefile |
1266 | @: |
1267 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
1268 | @for dep in $?; do \ |
1269 | case '$(am__configure_deps)' in \ |
1270 | *$$dep*) \ |
1271 | - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ |
1272 | - cd $(srcdir) && $(AUTOMAKE) --gnu \ |
1273 | + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ |
1274 | + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ |
1275 | && exit 0; \ |
1276 | exit 1;; \ |
1277 | esac; \ |
1278 | done; \ |
1279 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ |
1280 | - cd $(top_srcdir) && \ |
1281 | - $(AUTOMAKE) --gnu Makefile |
1282 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ |
1283 | + $(am__cd) $(top_srcdir) && \ |
1284 | + $(AUTOMAKE) --gnu Makefile |
1285 | .PRECIOUS: Makefile |
1286 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
1287 | @case '$?' in \ |
1288 | @@ -234,21 +321,20 @@ |
1289 | $(SHELL) ./config.status --recheck |
1290 | |
1291 | $(top_srcdir)/configure: $(am__configure_deps) |
1292 | - cd $(srcdir) && $(AUTOCONF) |
1293 | + $(am__cd) $(srcdir) && $(AUTOCONF) |
1294 | $(ACLOCAL_M4): $(am__aclocal_m4_deps) |
1295 | - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
1296 | + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
1297 | +$(am__aclocal_m4_deps): |
1298 | |
1299 | config.h: stamp-h1 |
1300 | - @if test ! -f $@; then \ |
1301 | - rm -f stamp-h1; \ |
1302 | - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ |
1303 | - else :; fi |
1304 | + @if test ! -f $@; then rm -f stamp-h1; else :; fi |
1305 | + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
1306 | |
1307 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
1308 | @rm -f stamp-h1 |
1309 | cd $(top_builddir) && $(SHELL) ./config.status config.h |
1310 | $(srcdir)/config.h.in: $(am__configure_deps) |
1311 | - cd $(top_srcdir) && $(AUTOHEADER) |
1312 | + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) |
1313 | rm -f stamp-h1 |
1314 | touch $@ |
1315 | |
1316 | @@ -260,23 +346,39 @@ |
1317 | cd $(top_builddir) && $(SHELL) ./config.status $@ |
1318 | install-binSCRIPTS: $(bin_SCRIPTS) |
1319 | @$(NORMAL_INSTALL) |
1320 | - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
1321 | - @list='$(bin_SCRIPTS)'; for p in $$list; do \ |
1322 | + @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ |
1323 | + if test -n "$$list"; then \ |
1324 | + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ |
1325 | + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ |
1326 | + fi; \ |
1327 | + for p in $$list; do \ |
1328 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
1329 | - if test -f $$d$$p; then \ |
1330 | - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ |
1331 | - echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ |
1332 | - $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ |
1333 | - else :; fi; \ |
1334 | - done |
1335 | + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ |
1336 | + done | \ |
1337 | + sed -e 'p;s,.*/,,;n' \ |
1338 | + -e 'h;s|.*|.|' \ |
1339 | + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ |
1340 | + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ |
1341 | + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ |
1342 | + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ |
1343 | + if (++n[d] == $(am__install_max)) { \ |
1344 | + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ |
1345 | + else { print "f", d "/" $$4, $$1 } } \ |
1346 | + END { for (d in files) print "f", d, files[d] }' | \ |
1347 | + while read type dir files; do \ |
1348 | + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ |
1349 | + test -z "$$files" || { \ |
1350 | + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ |
1351 | + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ |
1352 | + } \ |
1353 | + ; done |
1354 | |
1355 | uninstall-binSCRIPTS: |
1356 | @$(NORMAL_UNINSTALL) |
1357 | - @list='$(bin_SCRIPTS)'; for p in $$list; do \ |
1358 | - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ |
1359 | - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ |
1360 | - rm -f "$(DESTDIR)$(bindir)/$$f"; \ |
1361 | - done |
1362 | + @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ |
1363 | + files=`for p in $$list; do echo "$$p"; done | \ |
1364 | + sed -e 's,.*/,,;$(transform)'`; \ |
1365 | + dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) |
1366 | |
1367 | mostlyclean-libtool: |
1368 | -rm -f *.lo |
1369 | @@ -285,7 +387,7 @@ |
1370 | -rm -rf .libs _libs |
1371 | |
1372 | distclean-libtool: |
1373 | - -rm -f libtool |
1374 | + -rm -f libtool config.lt |
1375 | |
1376 | # This directory's subdirectories are mostly independent; you can cd |
1377 | # into them and run `make' without going through this Makefile. |
1378 | @@ -294,7 +396,7 @@ |
1379 | # (which will cause the Makefiles to be regenerated when you run `make'); |
1380 | # (2) otherwise, pass the desired values on the `make' command line. |
1381 | $(RECURSIVE_TARGETS): |
1382 | - @failcom='exit 1'; \ |
1383 | + @fail= failcom='exit 1'; \ |
1384 | for f in x $$MAKEFLAGS; do \ |
1385 | case $$f in \ |
1386 | *=* | --[!k]*);; \ |
1387 | @@ -311,7 +413,7 @@ |
1388 | else \ |
1389 | local_target="$$target"; \ |
1390 | fi; \ |
1391 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
1392 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
1393 | || eval $$failcom; \ |
1394 | done; \ |
1395 | if test "$$dot_seen" = "no"; then \ |
1396 | @@ -319,7 +421,7 @@ |
1397 | fi; test -z "$$fail" |
1398 | |
1399 | $(RECURSIVE_CLEAN_TARGETS): |
1400 | - @failcom='exit 1'; \ |
1401 | + @fail= failcom='exit 1'; \ |
1402 | for f in x $$MAKEFLAGS; do \ |
1403 | case $$f in \ |
1404 | *=* | --[!k]*);; \ |
1405 | @@ -345,16 +447,16 @@ |
1406 | else \ |
1407 | local_target="$$target"; \ |
1408 | fi; \ |
1409 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
1410 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
1411 | || eval $$failcom; \ |
1412 | done && test -z "$$fail" |
1413 | tags-recursive: |
1414 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
1415 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
1416 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
1417 | done |
1418 | ctags-recursive: |
1419 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
1420 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
1421 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
1422 | done |
1423 | |
1424 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
1425 | @@ -362,14 +464,14 @@ |
1426 | unique=`for i in $$list; do \ |
1427 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1428 | done | \ |
1429 | - $(AWK) ' { files[$$0] = 1; } \ |
1430 | - END { for (i in files) print i; }'`; \ |
1431 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
1432 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
1433 | mkid -fID $$unique |
1434 | tags: TAGS |
1435 | |
1436 | TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
1437 | $(TAGS_FILES) $(LISP) |
1438 | - tags=; \ |
1439 | + set x; \ |
1440 | here=`pwd`; \ |
1441 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
1442 | include_option=--etags-include; \ |
1443 | @@ -381,46 +483,50 @@ |
1444 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
1445 | if test "$$subdir" = .; then :; else \ |
1446 | test ! -f $$subdir/TAGS || \ |
1447 | - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ |
1448 | + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
1449 | fi; \ |
1450 | done; \ |
1451 | list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
1452 | unique=`for i in $$list; do \ |
1453 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1454 | done | \ |
1455 | - $(AWK) ' { files[$$0] = 1; } \ |
1456 | - END { for (i in files) print i; }'`; \ |
1457 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ |
1458 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
1459 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
1460 | + shift; \ |
1461 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
1462 | test -n "$$unique" || unique=$$empty_fix; \ |
1463 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
1464 | - $$tags $$unique; \ |
1465 | + if test $$# -gt 0; then \ |
1466 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
1467 | + "$$@" $$unique; \ |
1468 | + else \ |
1469 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
1470 | + $$unique; \ |
1471 | + fi; \ |
1472 | fi |
1473 | ctags: CTAGS |
1474 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
1475 | $(TAGS_FILES) $(LISP) |
1476 | - tags=; \ |
1477 | - here=`pwd`; \ |
1478 | list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
1479 | unique=`for i in $$list; do \ |
1480 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1481 | done | \ |
1482 | - $(AWK) ' { files[$$0] = 1; } \ |
1483 | - END { for (i in files) print i; }'`; \ |
1484 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ |
1485 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
1486 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
1487 | + test -z "$(CTAGS_ARGS)$$unique" \ |
1488 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
1489 | - $$tags $$unique |
1490 | + $$unique |
1491 | |
1492 | GTAGS: |
1493 | here=`$(am__cd) $(top_builddir) && pwd` \ |
1494 | - && cd $(top_srcdir) \ |
1495 | - && gtags -i $(GTAGS_ARGS) $$here |
1496 | + && $(am__cd) $(top_srcdir) \ |
1497 | + && gtags -i $(GTAGS_ARGS) "$$here" |
1498 | |
1499 | distclean-tags: |
1500 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
1501 | |
1502 | distdir: $(DISTFILES) |
1503 | $(am__remove_distdir) |
1504 | - test -d $(distdir) || mkdir $(distdir) |
1505 | + test -d "$(distdir)" || mkdir "$(distdir)" |
1506 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
1507 | topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
1508 | list='$(DISTFILES)'; \ |
1509 | @@ -436,44 +542,70 @@ |
1510 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
1511 | if test -d $$d/$$file; then \ |
1512 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ |
1513 | + if test -d "$(distdir)/$$file"; then \ |
1514 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
1515 | + fi; \ |
1516 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ |
1517 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ |
1518 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ |
1519 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
1520 | fi; \ |
1521 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ |
1522 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ |
1523 | else \ |
1524 | - test -f $(distdir)/$$file \ |
1525 | - || cp -p $$d/$$file $(distdir)/$$file \ |
1526 | + test -f "$(distdir)/$$file" \ |
1527 | + || cp -p $$d/$$file "$(distdir)/$$file" \ |
1528 | || exit 1; \ |
1529 | fi; \ |
1530 | done |
1531 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
1532 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
1533 | if test "$$subdir" = .; then :; else \ |
1534 | - test -d "$(distdir)/$$subdir" \ |
1535 | - || $(MKDIR_P) "$(distdir)/$$subdir" \ |
1536 | - || exit 1; \ |
1537 | - distdir=`$(am__cd) $(distdir) && pwd`; \ |
1538 | - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ |
1539 | - (cd $$subdir && \ |
1540 | + $(am__make_dryrun) \ |
1541 | + || test -d "$(distdir)/$$subdir" \ |
1542 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
1543 | + || exit 1; \ |
1544 | + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
1545 | + $(am__relativize); \ |
1546 | + new_distdir=$$reldir; \ |
1547 | + dir1=$$subdir; dir2="$(top_distdir)"; \ |
1548 | + $(am__relativize); \ |
1549 | + new_top_distdir=$$reldir; \ |
1550 | + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ |
1551 | + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ |
1552 | + ($(am__cd) $$subdir && \ |
1553 | $(MAKE) $(AM_MAKEFLAGS) \ |
1554 | - top_distdir="$$top_distdir" \ |
1555 | - distdir="$$distdir/$$subdir" \ |
1556 | + top_distdir="$$new_top_distdir" \ |
1557 | + distdir="$$new_distdir" \ |
1558 | am__remove_distdir=: \ |
1559 | am__skip_length_check=: \ |
1560 | + am__skip_mode_fix=: \ |
1561 | distdir) \ |
1562 | || exit 1; \ |
1563 | fi; \ |
1564 | done |
1565 | - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ |
1566 | + -test -n "$(am__skip_mode_fix)" \ |
1567 | + || find "$(distdir)" -type d ! -perm -755 \ |
1568 | + -exec chmod u+rwx,go+rx {} \; -o \ |
1569 | ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ |
1570 | ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ |
1571 | ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ |
1572 | - || chmod -R a+r $(distdir) |
1573 | + || chmod -R a+r "$(distdir)" |
1574 | dist-gzip: distdir |
1575 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
1576 | $(am__remove_distdir) |
1577 | |
1578 | dist-bzip2: distdir |
1579 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
1580 | + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
1581 | + $(am__remove_distdir) |
1582 | + |
1583 | +dist-lzip: distdir |
1584 | + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
1585 | + $(am__remove_distdir) |
1586 | + |
1587 | +dist-lzma: distdir |
1588 | + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
1589 | + $(am__remove_distdir) |
1590 | + |
1591 | +dist-xz: distdir |
1592 | + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
1593 | $(am__remove_distdir) |
1594 | |
1595 | dist-tarZ: distdir |
1596 | @@ -499,24 +631,33 @@ |
1597 | distcheck: dist |
1598 | case '$(DIST_ARCHIVES)' in \ |
1599 | *.tar.gz*) \ |
1600 | - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ |
1601 | + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
1602 | *.tar.bz2*) \ |
1603 | - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ |
1604 | + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
1605 | + *.tar.lzma*) \ |
1606 | + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
1607 | + *.tar.lz*) \ |
1608 | + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
1609 | + *.tar.xz*) \ |
1610 | + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
1611 | *.tar.Z*) \ |
1612 | uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ |
1613 | *.shar.gz*) \ |
1614 | - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ |
1615 | + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ |
1616 | *.zip*) \ |
1617 | unzip $(distdir).zip ;;\ |
1618 | esac |
1619 | - chmod -R a-w $(distdir); chmod a+w $(distdir) |
1620 | + chmod -R a-w $(distdir); chmod u+w $(distdir) |
1621 | mkdir $(distdir)/_build |
1622 | mkdir $(distdir)/_inst |
1623 | chmod a-w $(distdir) |
1624 | + test -d $(distdir)/_build || exit 0; \ |
1625 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
1626 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
1627 | - && cd $(distdir)/_build \ |
1628 | + && am__cwd=`pwd` \ |
1629 | + && $(am__cd) $(distdir)/_build \ |
1630 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
1631 | + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
1632 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
1633 | && $(MAKE) $(AM_MAKEFLAGS) \ |
1634 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
1635 | @@ -537,14 +678,24 @@ |
1636 | && rm -rf "$$dc_destdir" \ |
1637 | && $(MAKE) $(AM_MAKEFLAGS) dist \ |
1638 | && rm -rf $(DIST_ARCHIVES) \ |
1639 | - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck |
1640 | + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ |
1641 | + && cd "$$am__cwd" \ |
1642 | + || exit 1 |
1643 | $(am__remove_distdir) |
1644 | @(echo "$(distdir) archives ready for distribution: "; \ |
1645 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
1646 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
1647 | distuninstallcheck: |
1648 | - @cd $(distuninstallcheck_dir) \ |
1649 | - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
1650 | + @test -n '$(distuninstallcheck_dir)' || { \ |
1651 | + echo 'ERROR: trying to run $@ with an empty' \ |
1652 | + '$$(distuninstallcheck_dir)' >&2; \ |
1653 | + exit 1; \ |
1654 | + }; \ |
1655 | + $(am__cd) '$(distuninstallcheck_dir)' || { \ |
1656 | + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ |
1657 | + exit 1; \ |
1658 | + }; \ |
1659 | + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ |
1660 | || { echo "ERROR: files left after uninstall:" ; \ |
1661 | if test -n "$(DESTDIR)"; then \ |
1662 | echo " (check DESTDIR support)"; \ |
1663 | @@ -578,16 +729,22 @@ |
1664 | |
1665 | installcheck: installcheck-recursive |
1666 | install-strip: |
1667 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1668 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1669 | - `test -z '$(STRIP)' || \ |
1670 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
1671 | + if test -z '$(STRIP)'; then \ |
1672 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1673 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1674 | + install; \ |
1675 | + else \ |
1676 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1677 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1678 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
1679 | + fi |
1680 | mostlyclean-generic: |
1681 | |
1682 | clean-generic: |
1683 | |
1684 | distclean-generic: |
1685 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
1686 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) |
1687 | |
1688 | maintainer-clean-generic: |
1689 | @echo "This command is intended for maintainers to use" |
1690 | @@ -608,6 +765,8 @@ |
1691 | |
1692 | html: html-recursive |
1693 | |
1694 | +html-am: |
1695 | + |
1696 | info: info-recursive |
1697 | |
1698 | info-am: |
1699 | @@ -616,18 +775,28 @@ |
1700 | |
1701 | install-dvi: install-dvi-recursive |
1702 | |
1703 | +install-dvi-am: |
1704 | + |
1705 | install-exec-am: install-binSCRIPTS |
1706 | |
1707 | install-html: install-html-recursive |
1708 | |
1709 | +install-html-am: |
1710 | + |
1711 | install-info: install-info-recursive |
1712 | |
1713 | +install-info-am: |
1714 | + |
1715 | install-man: |
1716 | |
1717 | install-pdf: install-pdf-recursive |
1718 | |
1719 | +install-pdf-am: |
1720 | + |
1721 | install-ps: install-ps-recursive |
1722 | |
1723 | +install-ps-am: |
1724 | + |
1725 | installcheck-am: |
1726 | |
1727 | maintainer-clean: maintainer-clean-recursive |
1728 | @@ -650,25 +819,25 @@ |
1729 | |
1730 | uninstall-am: uninstall-binSCRIPTS |
1731 | |
1732 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ |
1733 | - install-strip |
1734 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ |
1735 | + ctags-recursive install-am install-strip tags-recursive |
1736 | |
1737 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
1738 | all all-am am--refresh check check-am clean clean-generic \ |
1739 | clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
1740 | - dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ |
1741 | - distclean-generic distclean-hdr distclean-libtool \ |
1742 | - distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
1743 | - dvi-am html html-am info info-am install install-am \ |
1744 | - install-binSCRIPTS install-data install-data-am install-dvi \ |
1745 | - install-dvi-am install-exec install-exec-am install-html \ |
1746 | - install-html-am install-info install-info-am install-man \ |
1747 | - install-pdf install-pdf-am install-ps install-ps-am \ |
1748 | - install-strip installcheck installcheck-am installdirs \ |
1749 | - installdirs-am maintainer-clean maintainer-clean-generic \ |
1750 | - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ |
1751 | - ps ps-am tags tags-recursive uninstall uninstall-am \ |
1752 | - uninstall-binSCRIPTS |
1753 | + dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ |
1754 | + dist-zip distcheck distclean distclean-generic distclean-hdr \ |
1755 | + distclean-libtool distclean-tags distcleancheck distdir \ |
1756 | + distuninstallcheck dvi dvi-am html html-am info info-am \ |
1757 | + install install-am install-binSCRIPTS install-data \ |
1758 | + install-data-am install-dvi install-dvi-am install-exec \ |
1759 | + install-exec-am install-html install-html-am install-info \ |
1760 | + install-info-am install-man install-pdf install-pdf-am \ |
1761 | + install-ps install-ps-am install-strip installcheck \ |
1762 | + installcheck-am installdirs installdirs-am maintainer-clean \ |
1763 | + maintainer-clean-generic mostlyclean mostlyclean-generic \ |
1764 | + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ |
1765 | + uninstall uninstall-am uninstall-binSCRIPTS |
1766 | |
1767 | |
1768 | ${PACKAGE}-${VERSION}.tar.gz: dist |
1769 | @@ -687,6 +856,7 @@ |
1770 | zip -r ${PACKAGE}-${VERSION}.zip ${PACKAGE}-${VERSION}/ |
1771 | ${RM} -rf ${PACKAGE}-${VERSION} |
1772 | ${RM} ${PACKAGE}-${VERSION}.tar.gz |
1773 | + |
1774 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
1775 | # Otherwise a system limit (for SysV at least) may be exceeded. |
1776 | .NOEXPORT: |
1777 | |
1778 | === modified file 'README' |
1779 | --- README 2011-05-20 11:33:03 +0000 |
1780 | +++ README 2013-05-12 04:05:28 +0000 |
1781 | @@ -4,8 +4,7 @@ |
1782 | |
1783 | About |
1784 | ---------------------------------------- |
1785 | -This is Library for URG Sensors. (Classic-URG, Rapid-URG, Hi-URG, Top-URG) |
1786 | - |
1787 | +This is the library for the Hokuyo URG Sensor series (Classic-URG, Rapid-URG, Hi-URG, Top-URG) |
1788 | |
1789 | License |
1790 | ---------------------------------------- |
1791 | @@ -15,15 +14,15 @@ |
1792 | Compiling and Running |
1793 | ---------------------------------------- |
1794 | - Windows (Visual Studio 2005) |
1795 | - - Decompress package folder and select "urg-X.X.X/samples/c/*/*.vcproj" |
1796 | - - After project opens in Visual Studio, press F5 to Build and Run. |
1797 | - - If COM port is not detected, change the "device" in the main. |
1798 | + - Decompress the package folder and select "urg-X.X.X/samples/c/*/*.vcproj", where "X.X.X" corresponds to the library's current version number. |
1799 | + - After project opens in Visual Studio, make sure to select the build type "Release" (in "Debug" mode the library may become slow.) |
1800 | + - Press Build button and Run. |
1801 | + - If the COM port is not detected, change the "device" variable inside main. |
1802 | |
1803 | - Linux, Mac |
1804 | - - Decompress and ./configure & make |
1805 | - |
1806 | -- C++ Library required boost(>=1.35) and SDL(>=1.2.10) library. |
1807 | - |
1808 | + - Decompress the package and then build it using the conventional commands: ./configure & make |
1809 | + |
1810 | +- Required C++ Libraries: SDL(>=1.2.10), SDL_net. |
1811 | |
1812 | Contact |
1813 | ---------------------------------------- |
1814 | |
1815 | === modified file 'README.txt' |
1816 | --- README.txt 2011-05-20 11:33:03 +0000 |
1817 | +++ README.txt 2013-05-12 04:05:28 +0000 |
1818 | @@ -4,8 +4,7 @@ |
1819 | |
1820 | About |
1821 | ---------------------------------------- |
1822 | -This is Library for URG Sensors. (Classic-URG, Rapid-URG, Hi-URG, Top-URG) |
1823 | - |
1824 | +This is the library for the Hokuyo URG Sensor series (Classic-URG, Rapid-URG, Hi-URG, Top-URG) |
1825 | |
1826 | License |
1827 | ---------------------------------------- |
1828 | @@ -15,15 +14,15 @@ |
1829 | Compiling and Running |
1830 | ---------------------------------------- |
1831 | - Windows (Visual Studio 2005) |
1832 | - - Decompress package folder and select "urg-X.X.X/samples/c/*/*.vcproj" |
1833 | - - After project opens in Visual Studio, press F5 to Build and Run. |
1834 | - - If COM port is not detected, change the "device" in the main. |
1835 | + - Decompress the package folder and select "urg-X.X.X/samples/c/*/*.vcproj", where "X.X.X" corresponds to the library's current version number. |
1836 | + - After project opens in Visual Studio, make sure to select the build type "Release" (in "Debug" mode the library may become slow.) |
1837 | + - Press Build button and Run. |
1838 | + - If the COM port is not detected, change the "device" variable inside main. |
1839 | |
1840 | - Linux, Mac |
1841 | - - Decompress and ./configure & make |
1842 | - |
1843 | -- C++ Library required boost(>=1.35) and SDL(>=1.2.10) library. |
1844 | - |
1845 | + - Decompress the package and then build it using the conventional commands: ./configure & make |
1846 | + |
1847 | +- Required C++ Libraries: SDL(>=1.2.10), SDL_net. |
1848 | |
1849 | Contact |
1850 | ---------------------------------------- |
1851 | |
1852 | === modified file 'aclocal.m4' |
1853 | --- aclocal.m4 2011-05-20 11:33:03 +0000 |
1854 | +++ aclocal.m4 2013-05-12 04:05:28 +0000 |
1855 | @@ -1,7 +1,8 @@ |
1856 | -# generated automatically by aclocal 1.10 -*- Autoconf -*- |
1857 | +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- |
1858 | |
1859 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
1860 | -# 2005, 2006 Free Software Foundation, Inc. |
1861 | +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
1862 | +# Inc. |
1863 | # This file is free software; the Free Software Foundation |
1864 | # gives unlimited permission to copy and/or distribute it, |
1865 | # with or without modifications, as long as this notice is preserved. |
1866 | @@ -11,15 +12,19 @@ |
1867 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1868 | # PARTICULAR PURPOSE. |
1869 | |
1870 | -m4_if(m4_PACKAGE_VERSION, [2.61],, |
1871 | -[m4_fatal([this file was generated for autoconf 2.61. |
1872 | -You have another version of autoconf. If you want to use that, |
1873 | -you should regenerate the build system entirely.], [63])]) |
1874 | +m4_ifndef([AC_AUTOCONF_VERSION], |
1875 | + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1876 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
1877 | +[m4_warning([this file was generated for autoconf 2.69. |
1878 | +You have another version of autoconf. It may work, but is not guaranteed to. |
1879 | +If you have problems, you may need to regenerate the build system entirely. |
1880 | +To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
1881 | |
1882 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
1883 | # |
1884 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
1885 | -# 2006, 2007, 2008 Free Software Foundation, Inc. |
1886 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1887 | +# Foundation, Inc. |
1888 | # Written by Gordon Matzigkeit, 1996 |
1889 | # |
1890 | # This file is free software; the Free Software Foundation gives |
1891 | @@ -28,7 +33,8 @@ |
1892 | |
1893 | m4_define([_LT_COPYING], [dnl |
1894 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
1895 | -# 2006, 2007, 2008 Free Software Foundation, Inc. |
1896 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1897 | +# Foundation, Inc. |
1898 | # Written by Gordon Matzigkeit, 1996 |
1899 | # |
1900 | # This file is part of GNU Libtool. |
1901 | @@ -55,7 +61,7 @@ |
1902 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
1903 | ]) |
1904 | |
1905 | -# serial 56 LT_INIT |
1906 | +# serial 57 LT_INIT |
1907 | |
1908 | |
1909 | # LT_PREREQ(VERSION) |
1910 | @@ -84,6 +90,7 @@ |
1911 | # ------------------ |
1912 | AC_DEFUN([LT_INIT], |
1913 | [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT |
1914 | +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl |
1915 | AC_BEFORE([$0], [LT_LANG])dnl |
1916 | AC_BEFORE([$0], [LT_OUTPUT])dnl |
1917 | AC_BEFORE([$0], [LTDL_INIT])dnl |
1918 | @@ -100,6 +107,8 @@ |
1919 | AC_REQUIRE([LTOBSOLETE_VERSION])dnl |
1920 | m4_require([_LT_PROG_LTMAIN])dnl |
1921 | |
1922 | +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) |
1923 | + |
1924 | dnl Parse OPTIONS |
1925 | _LT_SET_OPTIONS([$0], [$1]) |
1926 | |
1927 | @@ -136,7 +145,7 @@ |
1928 | *) break;; |
1929 | esac |
1930 | done |
1931 | -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
1932 | +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` |
1933 | ]) |
1934 | |
1935 | |
1936 | @@ -156,6 +165,11 @@ |
1937 | m4_defun([_LT_SETUP], |
1938 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
1939 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
1940 | +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl |
1941 | +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl |
1942 | + |
1943 | +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl |
1944 | +dnl |
1945 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
1946 | _LT_DECL([], [host], [0])dnl |
1947 | _LT_DECL([], [host_os], [0])dnl |
1948 | @@ -178,10 +192,13 @@ |
1949 | dnl |
1950 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
1951 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
1952 | +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl |
1953 | m4_require([_LT_CMD_RELOAD])dnl |
1954 | m4_require([_LT_CHECK_MAGIC_METHOD])dnl |
1955 | +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl |
1956 | m4_require([_LT_CMD_OLD_ARCHIVE])dnl |
1957 | m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl |
1958 | +m4_require([_LT_WITH_SYSROOT])dnl |
1959 | |
1960 | _LT_CONFIG_LIBTOOL_INIT([ |
1961 | # See if we are running on zsh, and set the options which allow our |
1962 | @@ -197,7 +214,6 @@ |
1963 | _LT_CHECK_OBJDIR |
1964 | |
1965 | m4_require([_LT_TAG_COMPILER])dnl |
1966 | -_LT_PROG_ECHO_BACKSLASH |
1967 | |
1968 | case $host_os in |
1969 | aix3*) |
1970 | @@ -211,23 +227,6 @@ |
1971 | ;; |
1972 | esac |
1973 | |
1974 | -# Sed substitution that helps us do robust quoting. It backslashifies |
1975 | -# metacharacters that are still active within double-quoted strings. |
1976 | -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' |
1977 | - |
1978 | -# Same as above, but do not quote variable references. |
1979 | -double_quote_subst='s/\([["`\\]]\)/\\\1/g' |
1980 | - |
1981 | -# Sed substitution to delay expansion of an escaped shell variable in a |
1982 | -# double_quote_subst'ed string. |
1983 | -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
1984 | - |
1985 | -# Sed substitution to delay expansion of an escaped single quote. |
1986 | -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
1987 | - |
1988 | -# Sed substitution to avoid accidental globbing in evaled expressions |
1989 | -no_glob_subst='s/\*/\\\*/g' |
1990 | - |
1991 | # Global variables: |
1992 | ofile=libtool |
1993 | can_build_shared=yes |
1994 | @@ -268,6 +267,28 @@ |
1995 | ])# _LT_SETUP |
1996 | |
1997 | |
1998 | +# _LT_PREPARE_SED_QUOTE_VARS |
1999 | +# -------------------------- |
2000 | +# Define a few sed substitution that help us do robust quoting. |
2001 | +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], |
2002 | +[# Backslashify metacharacters that are still active within |
2003 | +# double-quoted strings. |
2004 | +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' |
2005 | + |
2006 | +# Same as above, but do not quote variable references. |
2007 | +double_quote_subst='s/\([["`\\]]\)/\\\1/g' |
2008 | + |
2009 | +# Sed substitution to delay expansion of an escaped shell variable in a |
2010 | +# double_quote_subst'ed string. |
2011 | +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
2012 | + |
2013 | +# Sed substitution to delay expansion of an escaped single quote. |
2014 | +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
2015 | + |
2016 | +# Sed substitution to avoid accidental globbing in evaled expressions |
2017 | +no_glob_subst='s/\*/\\\*/g' |
2018 | +]) |
2019 | + |
2020 | # _LT_PROG_LTMAIN |
2021 | # --------------- |
2022 | # Note that this code is called both from `configure', and `config.status' |
2023 | @@ -420,7 +441,7 @@ |
2024 | # declaration there will have the same value as in `configure'. VARNAME |
2025 | # must have a single quote delimited value for this to work. |
2026 | m4_define([_LT_CONFIG_STATUS_DECLARE], |
2027 | -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) |
2028 | +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) |
2029 | |
2030 | |
2031 | # _LT_CONFIG_STATUS_DECLARATIONS |
2032 | @@ -430,7 +451,7 @@ |
2033 | # embedded single quotes properly. In configure, this macro expands |
2034 | # each variable declared with _LT_DECL (and _LT_TAGDECL) into: |
2035 | # |
2036 | -# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' |
2037 | +# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`' |
2038 | m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], |
2039 | [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), |
2040 | [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) |
2041 | @@ -529,12 +550,20 @@ |
2042 | LTCFLAGS='$LTCFLAGS' |
2043 | compiler='$compiler_DEFAULT' |
2044 | |
2045 | +# A function that is used when there is no print builtin or printf. |
2046 | +func_fallback_echo () |
2047 | +{ |
2048 | + eval 'cat <<_LTECHO_EOF |
2049 | +\$[]1 |
2050 | +_LTECHO_EOF' |
2051 | +} |
2052 | + |
2053 | # Quote evaled strings. |
2054 | for var in lt_decl_all_varnames([[ \ |
2055 | ]], lt_decl_quote_varnames); do |
2056 | - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in |
2057 | + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
2058 | *[[\\\\\\\`\\"\\\$]]*) |
2059 | - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
2060 | + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
2061 | ;; |
2062 | *) |
2063 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
2064 | @@ -545,9 +574,9 @@ |
2065 | # Double-quote double-evaled strings. |
2066 | for var in lt_decl_all_varnames([[ \ |
2067 | ]], lt_decl_dquote_varnames); do |
2068 | - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in |
2069 | + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
2070 | *[[\\\\\\\`\\"\\\$]]*) |
2071 | - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
2072 | + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
2073 | ;; |
2074 | *) |
2075 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
2076 | @@ -555,16 +584,38 @@ |
2077 | esac |
2078 | done |
2079 | |
2080 | -# Fix-up fallback echo if it was mangled by the above quoting rules. |
2081 | -case \$lt_ECHO in |
2082 | -*'\\\[$]0 --fallback-echo"')dnl " |
2083 | - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` |
2084 | - ;; |
2085 | -esac |
2086 | - |
2087 | _LT_OUTPUT_LIBTOOL_INIT |
2088 | ]) |
2089 | |
2090 | +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) |
2091 | +# ------------------------------------ |
2092 | +# Generate a child script FILE with all initialization necessary to |
2093 | +# reuse the environment learned by the parent script, and make the |
2094 | +# file executable. If COMMENT is supplied, it is inserted after the |
2095 | +# `#!' sequence but before initialization text begins. After this |
2096 | +# macro, additional text can be appended to FILE to form the body of |
2097 | +# the child script. The macro ends with non-zero status if the |
2098 | +# file could not be fully written (such as if the disk is full). |
2099 | +m4_ifdef([AS_INIT_GENERATED], |
2100 | +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], |
2101 | +[m4_defun([_LT_GENERATED_FILE_INIT], |
2102 | +[m4_require([AS_PREPARE])]dnl |
2103 | +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl |
2104 | +[lt_write_fail=0 |
2105 | +cat >$1 <<_ASEOF || lt_write_fail=1 |
2106 | +#! $SHELL |
2107 | +# Generated by $as_me. |
2108 | +$2 |
2109 | +SHELL=\${CONFIG_SHELL-$SHELL} |
2110 | +export SHELL |
2111 | +_ASEOF |
2112 | +cat >>$1 <<\_ASEOF || lt_write_fail=1 |
2113 | +AS_SHELL_SANITIZE |
2114 | +_AS_PREPARE |
2115 | +exec AS_MESSAGE_FD>&1 |
2116 | +_ASEOF |
2117 | +test $lt_write_fail = 0 && chmod +x $1[]dnl |
2118 | +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT |
2119 | |
2120 | # LT_OUTPUT |
2121 | # --------- |
2122 | @@ -574,20 +625,11 @@ |
2123 | AC_DEFUN([LT_OUTPUT], |
2124 | [: ${CONFIG_LT=./config.lt} |
2125 | AC_MSG_NOTICE([creating $CONFIG_LT]) |
2126 | -cat >"$CONFIG_LT" <<_LTEOF |
2127 | -#! $SHELL |
2128 | -# Generated by $as_me. |
2129 | -# Run this file to recreate a libtool stub with the current configuration. |
2130 | +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], |
2131 | +[# Run this file to recreate a libtool stub with the current configuration.]) |
2132 | |
2133 | +cat >>"$CONFIG_LT" <<\_LTEOF |
2134 | lt_cl_silent=false |
2135 | -SHELL=\${CONFIG_SHELL-$SHELL} |
2136 | -_LTEOF |
2137 | - |
2138 | -cat >>"$CONFIG_LT" <<\_LTEOF |
2139 | -AS_SHELL_SANITIZE |
2140 | -_AS_PREPARE |
2141 | - |
2142 | -exec AS_MESSAGE_FD>&1 |
2143 | exec AS_MESSAGE_LOG_FD>>config.log |
2144 | { |
2145 | echo |
2146 | @@ -613,7 +655,7 @@ |
2147 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
2148 | configured by $[0], generated by m4_PACKAGE_STRING. |
2149 | |
2150 | -Copyright (C) 2008 Free Software Foundation, Inc. |
2151 | +Copyright (C) 2011 Free Software Foundation, Inc. |
2152 | This config.lt script is free software; the Free Software Foundation |
2153 | gives unlimited permision to copy, distribute and modify it." |
2154 | |
2155 | @@ -658,15 +700,13 @@ |
2156 | # appending to config.log, which fails on DOS, as config.log is still kept |
2157 | # open by configure. Here we exec the FD to /dev/null, effectively closing |
2158 | # config.log, so it can be properly (re)opened and appended to by config.lt. |
2159 | -if test "$no_create" != yes; then |
2160 | - lt_cl_success=: |
2161 | - test "$silent" = yes && |
2162 | - lt_config_lt_args="$lt_config_lt_args --quiet" |
2163 | - exec AS_MESSAGE_LOG_FD>/dev/null |
2164 | - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false |
2165 | - exec AS_MESSAGE_LOG_FD>>config.log |
2166 | - $lt_cl_success || AS_EXIT(1) |
2167 | -fi |
2168 | +lt_cl_success=: |
2169 | +test "$silent" = yes && |
2170 | + lt_config_lt_args="$lt_config_lt_args --quiet" |
2171 | +exec AS_MESSAGE_LOG_FD>/dev/null |
2172 | +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false |
2173 | +exec AS_MESSAGE_LOG_FD>>config.log |
2174 | +$lt_cl_success || AS_EXIT(1) |
2175 | ])# LT_OUTPUT |
2176 | |
2177 | |
2178 | @@ -729,15 +769,12 @@ |
2179 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
2180 | # text mode, it properly converts lines to CR/LF. This bash problem |
2181 | # is reportedly fixed, but why not run on old versions too? |
2182 | - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
2183 | - || (rm -f "$cfgfile"; exit 1) |
2184 | - |
2185 | - _LT_PROG_XSI_SHELLFNS |
2186 | - |
2187 | - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
2188 | - || (rm -f "$cfgfile"; exit 1) |
2189 | - |
2190 | - mv -f "$cfgfile" "$ofile" || |
2191 | + sed '$q' "$ltmain" >> "$cfgfile" \ |
2192 | + || (rm -f "$cfgfile"; exit 1) |
2193 | + |
2194 | + _LT_PROG_REPLACE_SHELLFNS |
2195 | + |
2196 | + mv -f "$cfgfile" "$ofile" || |
2197 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
2198 | chmod +x "$ofile" |
2199 | ], |
2200 | @@ -782,6 +819,7 @@ |
2201 | m4_case([$1], |
2202 | [C], [_LT_LANG(C)], |
2203 | [C++], [_LT_LANG(CXX)], |
2204 | + [Go], [_LT_LANG(GO)], |
2205 | [Java], [_LT_LANG(GCJ)], |
2206 | [Fortran 77], [_LT_LANG(F77)], |
2207 | [Fortran], [_LT_LANG(FC)], |
2208 | @@ -803,6 +841,29 @@ |
2209 | ])# _LT_LANG |
2210 | |
2211 | |
2212 | +m4_ifndef([AC_PROG_GO], [ |
2213 | +# NOTE: This macro has been submitted for inclusion into # |
2214 | +# GNU Autoconf as AC_PROG_GO. When it is available in # |
2215 | +# a released version of Autoconf we should remove this # |
2216 | +# macro and use it instead. # |
2217 | +m4_defun([AC_PROG_GO], |
2218 | +[AC_LANG_PUSH(Go)dnl |
2219 | +AC_ARG_VAR([GOC], [Go compiler command])dnl |
2220 | +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl |
2221 | +_AC_ARG_VAR_LDFLAGS()dnl |
2222 | +AC_CHECK_TOOL(GOC, gccgo) |
2223 | +if test -z "$GOC"; then |
2224 | + if test -n "$ac_tool_prefix"; then |
2225 | + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) |
2226 | + fi |
2227 | +fi |
2228 | +if test -z "$GOC"; then |
2229 | + AC_CHECK_PROG(GOC, gccgo, gccgo, false) |
2230 | +fi |
2231 | +])#m4_defun |
2232 | +])#m4_ifndef |
2233 | + |
2234 | + |
2235 | # _LT_LANG_DEFAULT_CONFIG |
2236 | # ----------------------- |
2237 | m4_defun([_LT_LANG_DEFAULT_CONFIG], |
2238 | @@ -833,6 +894,10 @@ |
2239 | m4_ifdef([LT_PROG_GCJ], |
2240 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) |
2241 | |
2242 | +AC_PROVIDE_IFELSE([AC_PROG_GO], |
2243 | + [LT_LANG(GO)], |
2244 | + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) |
2245 | + |
2246 | AC_PROVIDE_IFELSE([LT_PROG_RC], |
2247 | [LT_LANG(RC)], |
2248 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) |
2249 | @@ -843,11 +908,13 @@ |
2250 | AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) |
2251 | AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) |
2252 | AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) |
2253 | +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) |
2254 | dnl aclocal-1.4 backwards compatibility: |
2255 | dnl AC_DEFUN([AC_LIBTOOL_CXX], []) |
2256 | dnl AC_DEFUN([AC_LIBTOOL_F77], []) |
2257 | dnl AC_DEFUN([AC_LIBTOOL_FC], []) |
2258 | dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) |
2259 | +dnl AC_DEFUN([AC_LIBTOOL_RC], []) |
2260 | |
2261 | |
2262 | # _LT_TAG_COMPILER |
2263 | @@ -933,7 +1000,13 @@ |
2264 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
2265 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
2266 | _lt_result=$? |
2267 | - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then |
2268 | + # If there is a non-empty error log, and "single_module" |
2269 | + # appears in it, assume the flag caused a linker warning |
2270 | + if test -s conftest.err && $GREP single_module conftest.err; then |
2271 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
2272 | + # Otherwise, if the output was created with a 0 exit code from |
2273 | + # the compiler, it worked. |
2274 | + elif test -f libconftest.dylib && test $_lt_result -eq 0; then |
2275 | lt_cv_apple_cc_single_mod=yes |
2276 | else |
2277 | cat conftest.err >&AS_MESSAGE_LOG_FD |
2278 | @@ -941,6 +1014,7 @@ |
2279 | rm -rf libconftest.dylib* |
2280 | rm -f conftest.* |
2281 | fi]) |
2282 | + |
2283 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
2284 | [lt_cv_ld_exported_symbols_list], |
2285 | [lt_cv_ld_exported_symbols_list=no |
2286 | @@ -952,6 +1026,34 @@ |
2287 | [lt_cv_ld_exported_symbols_list=no]) |
2288 | LDFLAGS="$save_LDFLAGS" |
2289 | ]) |
2290 | + |
2291 | + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], |
2292 | + [lt_cv_ld_force_load=no |
2293 | + cat > conftest.c << _LT_EOF |
2294 | +int forced_loaded() { return 2;} |
2295 | +_LT_EOF |
2296 | + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD |
2297 | + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD |
2298 | + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD |
2299 | + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD |
2300 | + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD |
2301 | + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD |
2302 | + cat > conftest.c << _LT_EOF |
2303 | +int main() { return 0;} |
2304 | +_LT_EOF |
2305 | + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD |
2306 | + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
2307 | + _lt_result=$? |
2308 | + if test -s conftest.err && $GREP force_load conftest.err; then |
2309 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
2310 | + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then |
2311 | + lt_cv_ld_force_load=yes |
2312 | + else |
2313 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
2314 | + fi |
2315 | + rm -f conftest.err libconftest.a conftest conftest.c |
2316 | + rm -rf conftest.dSYM |
2317 | + ]) |
2318 | case $host_os in |
2319 | rhapsody* | darwin1.[[012]]) |
2320 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
2321 | @@ -979,7 +1081,7 @@ |
2322 | else |
2323 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
2324 | fi |
2325 | - if test "$DSYMUTIL" != ":"; then |
2326 | + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then |
2327 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
2328 | else |
2329 | _lt_dsymutil= |
2330 | @@ -989,8 +1091,8 @@ |
2331 | ]) |
2332 | |
2333 | |
2334 | -# _LT_DARWIN_LINKER_FEATURES |
2335 | -# -------------------------- |
2336 | +# _LT_DARWIN_LINKER_FEATURES([TAG]) |
2337 | +# --------------------------------- |
2338 | # Checks for linker and compiler features on darwin |
2339 | m4_defun([_LT_DARWIN_LINKER_FEATURES], |
2340 | [ |
2341 | @@ -999,7 +1101,13 @@ |
2342 | _LT_TAGVAR(hardcode_direct, $1)=no |
2343 | _LT_TAGVAR(hardcode_automatic, $1)=yes |
2344 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
2345 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
2346 | + if test "$lt_cv_ld_force_load" = "yes"; then |
2347 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
2348 | + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], |
2349 | + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) |
2350 | + else |
2351 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
2352 | + fi |
2353 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
2354 | _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" |
2355 | case $cc_basename in |
2356 | @@ -1007,7 +1115,7 @@ |
2357 | *) _lt_dar_can_shared=$GCC ;; |
2358 | esac |
2359 | if test "$_lt_dar_can_shared" = "yes"; then |
2360 | - output_verbose_link_cmd=echo |
2361 | + output_verbose_link_cmd=func_echo_all |
2362 | _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}" |
2363 | _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
2364 | _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}" |
2365 | @@ -1023,203 +1131,142 @@ |
2366 | fi |
2367 | ]) |
2368 | |
2369 | -# _LT_SYS_MODULE_PATH_AIX |
2370 | -# ----------------------- |
2371 | +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) |
2372 | +# ---------------------------------- |
2373 | # Links a minimal program and checks the executable |
2374 | # for the system default hardcoded library path. In most cases, |
2375 | # this is /usr/lib:/lib, but when the MPI compilers are used |
2376 | # the location of the communication and MPI libs are included too. |
2377 | # If we don't find anything, use the default library path according |
2378 | # to the aix ld manual. |
2379 | +# Store the results from the different compilers for each TAGNAME. |
2380 | +# Allow to override them for all tags through lt_cv_aix_libpath. |
2381 | m4_defun([_LT_SYS_MODULE_PATH_AIX], |
2382 | [m4_require([_LT_DECL_SED])dnl |
2383 | -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ |
2384 | -lt_aix_libpath_sed=' |
2385 | - /Import File Strings/,/^$/ { |
2386 | - /^0/ { |
2387 | - s/^0 *\(.*\)$/\1/ |
2388 | - p |
2389 | - } |
2390 | - }' |
2391 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
2392 | -# Check for a 64-bit object if we didn't find anything. |
2393 | -if test -z "$aix_libpath"; then |
2394 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
2395 | -fi],[]) |
2396 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
2397 | +if test "${lt_cv_aix_libpath+set}" = set; then |
2398 | + aix_libpath=$lt_cv_aix_libpath |
2399 | +else |
2400 | + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], |
2401 | + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ |
2402 | + lt_aix_libpath_sed='[ |
2403 | + /Import File Strings/,/^$/ { |
2404 | + /^0/ { |
2405 | + s/^0 *\([^ ]*\) *$/\1/ |
2406 | + p |
2407 | + } |
2408 | + }]' |
2409 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
2410 | + # Check for a 64-bit object if we didn't find anything. |
2411 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then |
2412 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
2413 | + fi],[]) |
2414 | + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then |
2415 | + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" |
2416 | + fi |
2417 | + ]) |
2418 | + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) |
2419 | +fi |
2420 | ])# _LT_SYS_MODULE_PATH_AIX |
2421 | |
2422 | |
2423 | # _LT_SHELL_INIT(ARG) |
2424 | # ------------------- |
2425 | m4_define([_LT_SHELL_INIT], |
2426 | -[ifdef([AC_DIVERSION_NOTICE], |
2427 | - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], |
2428 | - [AC_DIVERT_PUSH(NOTICE)]) |
2429 | -$1 |
2430 | -AC_DIVERT_POP |
2431 | -])# _LT_SHELL_INIT |
2432 | +[m4_divert_text([M4SH-INIT], [$1 |
2433 | +])])# _LT_SHELL_INIT |
2434 | + |
2435 | |
2436 | |
2437 | # _LT_PROG_ECHO_BACKSLASH |
2438 | # ----------------------- |
2439 | -# Add some code to the start of the generated configure script which |
2440 | -# will find an echo command which doesn't interpret backslashes. |
2441 | +# Find how we can fake an echo command that does not interpret backslash. |
2442 | +# In particular, with Autoconf 2.60 or later we add some code to the start |
2443 | +# of the generated configure script which will find a shell with a builtin |
2444 | +# printf (which we can use as an echo command). |
2445 | m4_defun([_LT_PROG_ECHO_BACKSLASH], |
2446 | -[_LT_SHELL_INIT([ |
2447 | -# Check that we are running under the correct shell. |
2448 | -SHELL=${CONFIG_SHELL-/bin/sh} |
2449 | - |
2450 | -case X$lt_ECHO in |
2451 | -X*--fallback-echo) |
2452 | - # Remove one level of quotation (which was required for Make). |
2453 | - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` |
2454 | - ;; |
2455 | +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
2456 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
2457 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
2458 | + |
2459 | +AC_MSG_CHECKING([how to print strings]) |
2460 | +# Test print first, because it will be a builtin if present. |
2461 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
2462 | + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
2463 | + ECHO='print -r --' |
2464 | +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
2465 | + ECHO='printf %s\n' |
2466 | +else |
2467 | + # Use this function as a fallback that always works. |
2468 | + func_fallback_echo () |
2469 | + { |
2470 | + eval 'cat <<_LTECHO_EOF |
2471 | +$[]1 |
2472 | +_LTECHO_EOF' |
2473 | + } |
2474 | + ECHO='func_fallback_echo' |
2475 | +fi |
2476 | + |
2477 | +# func_echo_all arg... |
2478 | +# Invoke $ECHO with all args, space-separated. |
2479 | +func_echo_all () |
2480 | +{ |
2481 | + $ECHO "$*" |
2482 | +} |
2483 | + |
2484 | +case "$ECHO" in |
2485 | + printf*) AC_MSG_RESULT([printf]) ;; |
2486 | + print*) AC_MSG_RESULT([print -r]) ;; |
2487 | + *) AC_MSG_RESULT([cat]) ;; |
2488 | esac |
2489 | |
2490 | -ECHO=${lt_ECHO-echo} |
2491 | -if test "X[$]1" = X--no-reexec; then |
2492 | - # Discard the --no-reexec flag, and continue. |
2493 | - shift |
2494 | -elif test "X[$]1" = X--fallback-echo; then |
2495 | - # Avoid inline document here, it may be left over |
2496 | - : |
2497 | -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then |
2498 | - # Yippee, $ECHO works! |
2499 | - : |
2500 | -else |
2501 | - # Restart under the correct shell. |
2502 | - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} |
2503 | -fi |
2504 | - |
2505 | -if test "X[$]1" = X--fallback-echo; then |
2506 | - # used as fallback echo |
2507 | - shift |
2508 | - cat <<_LT_EOF |
2509 | -[$]* |
2510 | -_LT_EOF |
2511 | - exit 0 |
2512 | -fi |
2513 | - |
2514 | -# The HP-UX ksh and POSIX shell print the target directory to stdout |
2515 | -# if CDPATH is set. |
2516 | -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
2517 | - |
2518 | -if test -z "$lt_ECHO"; then |
2519 | - if test "X${echo_test_string+set}" != Xset; then |
2520 | - # find a string as large as possible, as long as the shell can cope with it |
2521 | - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do |
2522 | - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... |
2523 | - if { echo_test_string=`eval $cmd`; } 2>/dev/null && |
2524 | - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null |
2525 | - then |
2526 | - break |
2527 | - fi |
2528 | - done |
2529 | - fi |
2530 | - |
2531 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
2532 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
2533 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2534 | - : |
2535 | - else |
2536 | - # The Solaris, AIX, and Digital Unix default echo programs unquote |
2537 | - # backslashes. This makes it impossible to quote backslashes using |
2538 | - # echo "$something" | sed 's/\\/\\\\/g' |
2539 | - # |
2540 | - # So, first we look for a working echo in the user's PATH. |
2541 | - |
2542 | - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
2543 | - for dir in $PATH /usr/ucb; do |
2544 | - IFS="$lt_save_ifs" |
2545 | - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && |
2546 | - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && |
2547 | - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && |
2548 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2549 | - ECHO="$dir/echo" |
2550 | - break |
2551 | - fi |
2552 | - done |
2553 | - IFS="$lt_save_ifs" |
2554 | - |
2555 | - if test "X$ECHO" = Xecho; then |
2556 | - # We didn't find a better echo, so look for alternatives. |
2557 | - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && |
2558 | - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && |
2559 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2560 | - # This shell has a builtin print -r that does the trick. |
2561 | - ECHO='print -r' |
2562 | - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && |
2563 | - test "X$CONFIG_SHELL" != X/bin/ksh; then |
2564 | - # If we have ksh, try running configure again with it. |
2565 | - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
2566 | - export ORIGINAL_CONFIG_SHELL |
2567 | - CONFIG_SHELL=/bin/ksh |
2568 | - export CONFIG_SHELL |
2569 | - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} |
2570 | - else |
2571 | - # Try using printf. |
2572 | - ECHO='printf %s\n' |
2573 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
2574 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
2575 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2576 | - # Cool, printf works |
2577 | - : |
2578 | - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && |
2579 | - test "X$echo_testing_string" = 'X\t' && |
2580 | - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
2581 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2582 | - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL |
2583 | - export CONFIG_SHELL |
2584 | - SHELL="$CONFIG_SHELL" |
2585 | - export SHELL |
2586 | - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" |
2587 | - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && |
2588 | - test "X$echo_testing_string" = 'X\t' && |
2589 | - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
2590 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2591 | - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" |
2592 | - else |
2593 | - # maybe with a smaller string... |
2594 | - prev=: |
2595 | - |
2596 | - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do |
2597 | - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null |
2598 | - then |
2599 | - break |
2600 | - fi |
2601 | - prev="$cmd" |
2602 | - done |
2603 | - |
2604 | - if test "$prev" != 'sed 50q "[$]0"'; then |
2605 | - echo_test_string=`eval $prev` |
2606 | - export echo_test_string |
2607 | - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} |
2608 | - else |
2609 | - # Oops. We lost completely, so just stick with echo. |
2610 | - ECHO=echo |
2611 | - fi |
2612 | - fi |
2613 | - fi |
2614 | - fi |
2615 | - fi |
2616 | -fi |
2617 | - |
2618 | -# Copy echo and quote the copy suitably for passing to libtool from |
2619 | -# the Makefile, instead of quoting the original, which is used later. |
2620 | -lt_ECHO=$ECHO |
2621 | -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then |
2622 | - lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" |
2623 | -fi |
2624 | - |
2625 | -AC_SUBST(lt_ECHO) |
2626 | -]) |
2627 | +m4_ifdef([_AS_DETECT_SUGGESTED], |
2628 | +[_AS_DETECT_SUGGESTED([ |
2629 | + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( |
2630 | + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
2631 | + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
2632 | + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
2633 | + PATH=/empty FPATH=/empty; export PATH FPATH |
2634 | + test "X`printf %s $ECHO`" = "X$ECHO" \ |
2635 | + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) |
2636 | + |
2637 | _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) |
2638 | -_LT_DECL([], [ECHO], [1], |
2639 | - [An echo program that does not interpret backslashes]) |
2640 | +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) |
2641 | ])# _LT_PROG_ECHO_BACKSLASH |
2642 | |
2643 | |
2644 | +# _LT_WITH_SYSROOT |
2645 | +# ---------------- |
2646 | +AC_DEFUN([_LT_WITH_SYSROOT], |
2647 | +[AC_MSG_CHECKING([for sysroot]) |
2648 | +AC_ARG_WITH([sysroot], |
2649 | +[ --with-sysroot[=DIR] Search for dependent libraries within DIR |
2650 | + (or the compiler's sysroot if not specified).], |
2651 | +[], [with_sysroot=no]) |
2652 | + |
2653 | +dnl lt_sysroot will always be passed unquoted. We quote it here |
2654 | +dnl in case the user passed a directory name. |
2655 | +lt_sysroot= |
2656 | +case ${with_sysroot} in #( |
2657 | + yes) |
2658 | + if test "$GCC" = yes; then |
2659 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
2660 | + fi |
2661 | + ;; #( |
2662 | + /*) |
2663 | + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` |
2664 | + ;; #( |
2665 | + no|'') |
2666 | + ;; #( |
2667 | + *) |
2668 | + AC_MSG_RESULT([${with_sysroot}]) |
2669 | + AC_MSG_ERROR([The sysroot must be an absolute path.]) |
2670 | + ;; |
2671 | +esac |
2672 | + |
2673 | + AC_MSG_RESULT([${lt_sysroot:-no}]) |
2674 | +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl |
2675 | +[dependent libraries, and in which our libraries should be installed.])]) |
2676 | + |
2677 | # _LT_ENABLE_LOCK |
2678 | # --------------- |
2679 | m4_defun([_LT_ENABLE_LOCK], |
2680 | @@ -1248,7 +1295,7 @@ |
2681 | ;; |
2682 | *-*-irix6*) |
2683 | # Find out which ABI we are using. |
2684 | - echo '[#]line __oline__ "configure"' > conftest.$ac_ext |
2685 | + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext |
2686 | if AC_TRY_EVAL(ac_compile); then |
2687 | if test "$lt_cv_prog_gnu_ld" = yes; then |
2688 | case `/usr/bin/file conftest.$ac_objext` in |
2689 | @@ -1341,14 +1388,27 @@ |
2690 | CFLAGS="$SAVE_CFLAGS" |
2691 | fi |
2692 | ;; |
2693 | -sparc*-*solaris*) |
2694 | +*-*solaris*) |
2695 | # Find out which ABI we are using. |
2696 | echo 'int i;' > conftest.$ac_ext |
2697 | if AC_TRY_EVAL(ac_compile); then |
2698 | case `/usr/bin/file conftest.o` in |
2699 | *64-bit*) |
2700 | case $lt_cv_prog_gnu_ld in |
2701 | - yes*) LD="${LD-ld} -m elf64_sparc" ;; |
2702 | + yes*) |
2703 | + case $host in |
2704 | + i?86-*-solaris*) |
2705 | + LD="${LD-ld} -m elf_x86_64" |
2706 | + ;; |
2707 | + sparc*-*-solaris*) |
2708 | + LD="${LD-ld} -m elf64_sparc" |
2709 | + ;; |
2710 | + esac |
2711 | + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. |
2712 | + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then |
2713 | + LD="${LD-ld}_sol2" |
2714 | + fi |
2715 | + ;; |
2716 | *) |
2717 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
2718 | LD="${LD-ld} -64" |
2719 | @@ -1366,14 +1426,47 @@ |
2720 | ])# _LT_ENABLE_LOCK |
2721 | |
2722 | |
2723 | +# _LT_PROG_AR |
2724 | +# ----------- |
2725 | +m4_defun([_LT_PROG_AR], |
2726 | +[AC_CHECK_TOOLS(AR, [ar], false) |
2727 | +: ${AR=ar} |
2728 | +: ${AR_FLAGS=cru} |
2729 | +_LT_DECL([], [AR], [1], [The archiver]) |
2730 | +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) |
2731 | + |
2732 | +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], |
2733 | + [lt_cv_ar_at_file=no |
2734 | + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], |
2735 | + [echo conftest.$ac_objext > conftest.lst |
2736 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' |
2737 | + AC_TRY_EVAL([lt_ar_try]) |
2738 | + if test "$ac_status" -eq 0; then |
2739 | + # Ensure the archiver fails upon bogus file names. |
2740 | + rm -f conftest.$ac_objext libconftest.a |
2741 | + AC_TRY_EVAL([lt_ar_try]) |
2742 | + if test "$ac_status" -ne 0; then |
2743 | + lt_cv_ar_at_file=@ |
2744 | + fi |
2745 | + fi |
2746 | + rm -f conftest.* libconftest.a |
2747 | + ]) |
2748 | + ]) |
2749 | + |
2750 | +if test "x$lt_cv_ar_at_file" = xno; then |
2751 | + archiver_list_spec= |
2752 | +else |
2753 | + archiver_list_spec=$lt_cv_ar_at_file |
2754 | +fi |
2755 | +_LT_DECL([], [archiver_list_spec], [1], |
2756 | + [How to feed a file listing to the archiver]) |
2757 | +])# _LT_PROG_AR |
2758 | + |
2759 | + |
2760 | # _LT_CMD_OLD_ARCHIVE |
2761 | # ------------------- |
2762 | m4_defun([_LT_CMD_OLD_ARCHIVE], |
2763 | -[AC_CHECK_TOOL(AR, ar, false) |
2764 | -test -z "$AR" && AR=ar |
2765 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
2766 | -_LT_DECL([], [AR], [1], [The archiver]) |
2767 | -_LT_DECL([], [AR_FLAGS], [1]) |
2768 | +[_LT_PROG_AR |
2769 | |
2770 | AC_CHECK_TOOL(STRIP, strip, :) |
2771 | test -z "$STRIP" && STRIP=: |
2772 | @@ -1392,18 +1485,27 @@ |
2773 | if test -n "$RANLIB"; then |
2774 | case $host_os in |
2775 | openbsd*) |
2776 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
2777 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
2778 | ;; |
2779 | *) |
2780 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
2781 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
2782 | ;; |
2783 | esac |
2784 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
2785 | + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
2786 | fi |
2787 | + |
2788 | +case $host_os in |
2789 | + darwin*) |
2790 | + lock_old_archive_extraction=yes ;; |
2791 | + *) |
2792 | + lock_old_archive_extraction=no ;; |
2793 | +esac |
2794 | _LT_DECL([], [old_postinstall_cmds], [2]) |
2795 | _LT_DECL([], [old_postuninstall_cmds], [2]) |
2796 | _LT_TAGDECL([], [old_archive_cmds], [2], |
2797 | [Commands used to build an old-style archive]) |
2798 | +_LT_DECL([], [lock_old_archive_extraction], [0], |
2799 | + [Whether to use a lock for old archive extraction]) |
2800 | ])# _LT_CMD_OLD_ARCHIVE |
2801 | |
2802 | |
2803 | @@ -1428,15 +1530,15 @@ |
2804 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
2805 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
2806 | -e 's:$: $lt_compiler_flag:'` |
2807 | - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2808 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2809 | (eval "$lt_compile" 2>conftest.err) |
2810 | ac_status=$? |
2811 | cat conftest.err >&AS_MESSAGE_LOG_FD |
2812 | - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2813 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2814 | if (exit $ac_status) && test -s "$ac_outfile"; then |
2815 | # The compiler can only warn and ignore the option if not recognized |
2816 | # So say no if there are warnings other than the usual output. |
2817 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
2818 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
2819 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2820 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
2821 | $2=yes |
2822 | @@ -1476,7 +1578,7 @@ |
2823 | if test -s conftest.err; then |
2824 | # Append any errors to the config.log. |
2825 | cat conftest.err 1>&AS_MESSAGE_LOG_FD |
2826 | - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
2827 | + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp |
2828 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2829 | if diff conftest.exp conftest.er2 >/dev/null; then |
2830 | $2=yes |
2831 | @@ -1539,6 +1641,11 @@ |
2832 | lt_cv_sys_max_cmd_len=8192; |
2833 | ;; |
2834 | |
2835 | + mint*) |
2836 | + # On MiNT this can take a long time and run out of memory. |
2837 | + lt_cv_sys_max_cmd_len=8192; |
2838 | + ;; |
2839 | + |
2840 | amigaos*) |
2841 | # On AmigaOS with pdksh, this test takes hours, literally. |
2842 | # So we just punt and use a minimum line length of 8192. |
2843 | @@ -1564,6 +1671,11 @@ |
2844 | lt_cv_sys_max_cmd_len=196608 |
2845 | ;; |
2846 | |
2847 | + os2*) |
2848 | + # The test takes a long time on OS/2. |
2849 | + lt_cv_sys_max_cmd_len=8192 |
2850 | + ;; |
2851 | + |
2852 | osf*) |
2853 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
2854 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
2855 | @@ -1603,8 +1715,8 @@ |
2856 | # If test is not a shell built-in, we'll probably end up computing a |
2857 | # maximum length that is only half of the actual maximum length, but |
2858 | # we can't tell. |
2859 | - while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ |
2860 | - = "XX$teststring$teststring"; } >/dev/null 2>&1 && |
2861 | + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
2862 | + = "X$teststring$teststring"; } >/dev/null 2>&1 && |
2863 | test $i != 17 # 1/2 MB should be enough |
2864 | do |
2865 | i=`expr $i + 1` |
2866 | @@ -1655,7 +1767,7 @@ |
2867 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
2868 | lt_status=$lt_dlunknown |
2869 | cat > conftest.$ac_ext <<_LT_EOF |
2870 | -[#line __oline__ "configure" |
2871 | +[#line $LINENO "configure" |
2872 | #include "confdefs.h" |
2873 | |
2874 | #if HAVE_DLFCN_H |
2875 | @@ -1696,7 +1808,13 @@ |
2876 | # endif |
2877 | #endif |
2878 | |
2879 | -void fnord() { int i=42;} |
2880 | +/* When -fvisbility=hidden is used, assume the code has been annotated |
2881 | + correspondingly for the symbols needed. */ |
2882 | +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
2883 | +int fnord () __attribute__((visibility("default"))); |
2884 | +#endif |
2885 | + |
2886 | +int fnord () { return 42; } |
2887 | int main () |
2888 | { |
2889 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
2890 | @@ -1705,7 +1823,11 @@ |
2891 | if (self) |
2892 | { |
2893 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
2894 | - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
2895 | + else |
2896 | + { |
2897 | + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
2898 | + else puts (dlerror ()); |
2899 | + } |
2900 | /* dlclose (self); */ |
2901 | } |
2902 | else |
2903 | @@ -1881,16 +2003,16 @@ |
2904 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
2905 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
2906 | -e 's:$: $lt_compiler_flag:'` |
2907 | - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2908 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2909 | (eval "$lt_compile" 2>out/conftest.err) |
2910 | ac_status=$? |
2911 | cat out/conftest.err >&AS_MESSAGE_LOG_FD |
2912 | - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2913 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2914 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
2915 | then |
2916 | # The compiler can only warn and ignore the option if not recognized |
2917 | # So say no if there are warnings |
2918 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
2919 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp |
2920 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
2921 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
2922 | _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes |
2923 | @@ -2049,6 +2171,7 @@ |
2924 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2925 | m4_require([_LT_DECL_OBJDUMP])dnl |
2926 | m4_require([_LT_DECL_SED])dnl |
2927 | +m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
2928 | AC_MSG_CHECKING([dynamic linker characteristics]) |
2929 | m4_if([$1], |
2930 | [], [ |
2931 | @@ -2057,16 +2180,23 @@ |
2932 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; |
2933 | *) lt_awk_arg="/^libraries:/" ;; |
2934 | esac |
2935 | - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
2936 | - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then |
2937 | + case $host_os in |
2938 | + mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; |
2939 | + *) lt_sed_strip_eq="s,=/,/,g" ;; |
2940 | + esac |
2941 | + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` |
2942 | + case $lt_search_path_spec in |
2943 | + *\;*) |
2944 | # if the path contains ";" then we assume it to be the separator |
2945 | # otherwise default to the standard path separator (i.e. ":") - it is |
2946 | # assumed that no part of a normal pathname contains ";" but that should |
2947 | # okay in the real world where ";" in dirpaths is itself problematic. |
2948 | - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` |
2949 | - else |
2950 | - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
2951 | - fi |
2952 | + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` |
2953 | + ;; |
2954 | + *) |
2955 | + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` |
2956 | + ;; |
2957 | + esac |
2958 | # Ok, now we have the path, separated by spaces, we can step through it |
2959 | # and add multilib dir if necessary. |
2960 | lt_tmp_lt_search_path_spec= |
2961 | @@ -2079,7 +2209,7 @@ |
2962 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" |
2963 | fi |
2964 | done |
2965 | - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' |
2966 | + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' |
2967 | BEGIN {RS=" "; FS="/|\n";} { |
2968 | lt_foo=""; |
2969 | lt_count=0; |
2970 | @@ -2099,7 +2229,13 @@ |
2971 | if (lt_foo != "") { lt_freq[[lt_foo]]++; } |
2972 | if (lt_freq[[lt_foo]] == 1) { print lt_foo; } |
2973 | }'` |
2974 | - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` |
2975 | + # AWK program above erroneously prepends '/' to C:/dos/paths |
2976 | + # for these hosts. |
2977 | + case $host_os in |
2978 | + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ |
2979 | + $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; |
2980 | + esac |
2981 | + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` |
2982 | else |
2983 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" |
2984 | fi]) |
2985 | @@ -2125,7 +2261,7 @@ |
2986 | |
2987 | case $host_os in |
2988 | aix3*) |
2989 | - version_type=linux |
2990 | + version_type=linux # correct to gnu/linux during the next big refactor |
2991 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
2992 | shlibpath_var=LIBPATH |
2993 | |
2994 | @@ -2134,7 +2270,7 @@ |
2995 | ;; |
2996 | |
2997 | aix[[4-9]]*) |
2998 | - version_type=linux |
2999 | + version_type=linux # correct to gnu/linux during the next big refactor |
3000 | need_lib_prefix=no |
3001 | need_version=no |
3002 | hardcode_into_libs=yes |
3003 | @@ -2187,7 +2323,7 @@ |
3004 | m68k) |
3005 | library_names_spec='$libname.ixlibrary $libname.a' |
3006 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
3007 | - 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' |
3008 | + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''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' |
3009 | ;; |
3010 | esac |
3011 | ;; |
3012 | @@ -2199,7 +2335,7 @@ |
3013 | ;; |
3014 | |
3015 | bsdi[[45]]*) |
3016 | - version_type=linux |
3017 | + version_type=linux # correct to gnu/linux during the next big refactor |
3018 | need_version=no |
3019 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3020 | soname_spec='${libname}${release}${shared_ext}$major' |
3021 | @@ -2218,8 +2354,9 @@ |
3022 | need_version=no |
3023 | need_lib_prefix=no |
3024 | |
3025 | - case $GCC,$host_os in |
3026 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
3027 | + case $GCC,$cc_basename in |
3028 | + yes,*) |
3029 | + # gcc |
3030 | library_names_spec='$libname.dll.a' |
3031 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
3032 | postinstall_cmds='base_file=`basename \${file}`~ |
3033 | @@ -2240,36 +2377,83 @@ |
3034 | cygwin*) |
3035 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
3036 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
3037 | - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" |
3038 | +m4_if([$1], [],[ |
3039 | + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) |
3040 | ;; |
3041 | mingw* | cegcc*) |
3042 | # MinGW DLLs use traditional 'lib' prefix |
3043 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
3044 | - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
3045 | - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then |
3046 | - # It is most probably a Windows format PATH printed by |
3047 | - # mingw gcc, but we are running on Cygwin. Gcc prints its search |
3048 | - # path with ; separators, and with drive letters. We can handle the |
3049 | - # drive letters (cygwin fileutils understands them), so leave them, |
3050 | - # especially as we might pass files found there to a mingw objdump, |
3051 | - # which wouldn't understand a cygwinified path. Ahh. |
3052 | - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
3053 | - else |
3054 | - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
3055 | - fi |
3056 | ;; |
3057 | pw32*) |
3058 | # pw32 DLLs use 'pw' prefix rather than 'lib' |
3059 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
3060 | ;; |
3061 | esac |
3062 | + dynamic_linker='Win32 ld.exe' |
3063 | + ;; |
3064 | + |
3065 | + *,cl*) |
3066 | + # Native MSVC |
3067 | + libname_spec='$name' |
3068 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
3069 | + library_names_spec='${libname}.dll.lib' |
3070 | + |
3071 | + case $build_os in |
3072 | + mingw*) |
3073 | + sys_lib_search_path_spec= |
3074 | + lt_save_ifs=$IFS |
3075 | + IFS=';' |
3076 | + for lt_path in $LIB |
3077 | + do |
3078 | + IFS=$lt_save_ifs |
3079 | + # Let DOS variable expansion print the short 8.3 style file name. |
3080 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
3081 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
3082 | + done |
3083 | + IFS=$lt_save_ifs |
3084 | + # Convert to MSYS style. |
3085 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` |
3086 | + ;; |
3087 | + cygwin*) |
3088 | + # Convert to unix form, then to dos form, then back to unix form |
3089 | + # but this time dos style (no spaces!) so that the unix form looks |
3090 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
3091 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
3092 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
3093 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
3094 | + ;; |
3095 | + *) |
3096 | + sys_lib_search_path_spec="$LIB" |
3097 | + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then |
3098 | + # It is most probably a Windows format PATH. |
3099 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
3100 | + else |
3101 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
3102 | + fi |
3103 | + # FIXME: find the short name or the path components, as spaces are |
3104 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
3105 | + ;; |
3106 | + esac |
3107 | + |
3108 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
3109 | + postinstall_cmds='base_file=`basename \${file}`~ |
3110 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
3111 | + dldir=$destdir/`dirname \$dlpath`~ |
3112 | + test -d \$dldir || mkdir -p \$dldir~ |
3113 | + $install_prog $dir/$dlname \$dldir/$dlname' |
3114 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
3115 | + dlpath=$dir/\$dldll~ |
3116 | + $RM \$dlpath' |
3117 | + shlibpath_overrides_runpath=yes |
3118 | + dynamic_linker='Win32 link.exe' |
3119 | ;; |
3120 | |
3121 | *) |
3122 | + # Assume MSVC wrapper |
3123 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' |
3124 | + dynamic_linker='Win32 ld.exe' |
3125 | ;; |
3126 | esac |
3127 | - dynamic_linker='Win32 ld.exe' |
3128 | # FIXME: first we should search . and the directory the executable is in |
3129 | shlibpath_var=PATH |
3130 | ;; |
3131 | @@ -2290,7 +2474,7 @@ |
3132 | ;; |
3133 | |
3134 | dgux*) |
3135 | - version_type=linux |
3136 | + version_type=linux # correct to gnu/linux during the next big refactor |
3137 | need_lib_prefix=no |
3138 | need_version=no |
3139 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
3140 | @@ -2298,10 +2482,6 @@ |
3141 | shlibpath_var=LD_LIBRARY_PATH |
3142 | ;; |
3143 | |
3144 | -freebsd1*) |
3145 | - dynamic_linker=no |
3146 | - ;; |
3147 | - |
3148 | freebsd* | dragonfly*) |
3149 | # DragonFly does not have aout. When/if they implement a new |
3150 | # versioning mechanism, adjust this. |
3151 | @@ -2309,7 +2489,7 @@ |
3152 | objformat=`/usr/bin/objformat` |
3153 | else |
3154 | case $host_os in |
3155 | - freebsd[[123]]*) objformat=aout ;; |
3156 | + freebsd[[23]].*) objformat=aout ;; |
3157 | *) objformat=elf ;; |
3158 | esac |
3159 | fi |
3160 | @@ -2327,7 +2507,7 @@ |
3161 | esac |
3162 | shlibpath_var=LD_LIBRARY_PATH |
3163 | case $host_os in |
3164 | - freebsd2*) |
3165 | + freebsd2.*) |
3166 | shlibpath_overrides_runpath=yes |
3167 | ;; |
3168 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) |
3169 | @@ -2347,12 +2527,26 @@ |
3170 | ;; |
3171 | |
3172 | gnu*) |
3173 | - version_type=linux |
3174 | + version_type=linux # correct to gnu/linux during the next big refactor |
3175 | need_lib_prefix=no |
3176 | need_version=no |
3177 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
3178 | soname_spec='${libname}${release}${shared_ext}$major' |
3179 | shlibpath_var=LD_LIBRARY_PATH |
3180 | + shlibpath_overrides_runpath=no |
3181 | + hardcode_into_libs=yes |
3182 | + ;; |
3183 | + |
3184 | +haiku*) |
3185 | + version_type=linux # correct to gnu/linux during the next big refactor |
3186 | + need_lib_prefix=no |
3187 | + need_version=no |
3188 | + dynamic_linker="$host_os runtime_loader" |
3189 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
3190 | + soname_spec='${libname}${release}${shared_ext}$major' |
3191 | + shlibpath_var=LIBRARY_PATH |
3192 | + shlibpath_overrides_runpath=yes |
3193 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
3194 | hardcode_into_libs=yes |
3195 | ;; |
3196 | |
3197 | @@ -2398,12 +2592,14 @@ |
3198 | soname_spec='${libname}${release}${shared_ext}$major' |
3199 | ;; |
3200 | esac |
3201 | - # HP-UX runs *really* slowly unless shared libraries are mode 555. |
3202 | + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... |
3203 | postinstall_cmds='chmod 555 $lib' |
3204 | + # or fails outright, so override atomically: |
3205 | + install_override_mode=555 |
3206 | ;; |
3207 | |
3208 | interix[[3-9]]*) |
3209 | - version_type=linux |
3210 | + version_type=linux # correct to gnu/linux during the next big refactor |
3211 | need_lib_prefix=no |
3212 | need_version=no |
3213 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
3214 | @@ -2419,7 +2615,7 @@ |
3215 | nonstopux*) version_type=nonstopux ;; |
3216 | *) |
3217 | if test "$lt_cv_prog_gnu_ld" = yes; then |
3218 | - version_type=linux |
3219 | + version_type=linux # correct to gnu/linux during the next big refactor |
3220 | else |
3221 | version_type=irix |
3222 | fi ;; |
3223 | @@ -2456,9 +2652,9 @@ |
3224 | dynamic_linker=no |
3225 | ;; |
3226 | |
3227 | -# This must be Linux ELF. |
3228 | -linux* | k*bsd*-gnu) |
3229 | - version_type=linux |
3230 | +# This must be glibc/ELF. |
3231 | +linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3232 | + version_type=linux # correct to gnu/linux during the next big refactor |
3233 | need_lib_prefix=no |
3234 | need_version=no |
3235 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3236 | @@ -2466,16 +2662,21 @@ |
3237 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
3238 | shlibpath_var=LD_LIBRARY_PATH |
3239 | shlibpath_overrides_runpath=no |
3240 | + |
3241 | # Some binutils ld are patched to set DT_RUNPATH |
3242 | - save_LDFLAGS=$LDFLAGS |
3243 | - save_libdir=$libdir |
3244 | - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ |
3245 | - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" |
3246 | - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
3247 | - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], |
3248 | - [shlibpath_overrides_runpath=yes])]) |
3249 | - LDFLAGS=$save_LDFLAGS |
3250 | - libdir=$save_libdir |
3251 | + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], |
3252 | + [lt_cv_shlibpath_overrides_runpath=no |
3253 | + save_LDFLAGS=$LDFLAGS |
3254 | + save_libdir=$libdir |
3255 | + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ |
3256 | + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" |
3257 | + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
3258 | + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], |
3259 | + [lt_cv_shlibpath_overrides_runpath=yes])]) |
3260 | + LDFLAGS=$save_LDFLAGS |
3261 | + libdir=$save_libdir |
3262 | + ]) |
3263 | + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath |
3264 | |
3265 | # This implies no fast_install, which is unacceptable. |
3266 | # Some rework will be needed to allow for fast_install |
3267 | @@ -2484,7 +2685,7 @@ |
3268 | |
3269 | # Append ld.so.conf contents to the search path |
3270 | if test -f /etc/ld.so.conf; then |
3271 | - 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' ' '` |
3272 | + 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;s/"//g;/^$/d' | tr '\n' ' '` |
3273 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
3274 | fi |
3275 | |
3276 | @@ -2516,7 +2717,7 @@ |
3277 | ;; |
3278 | |
3279 | newsos6) |
3280 | - version_type=linux |
3281 | + version_type=linux # correct to gnu/linux during the next big refactor |
3282 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3283 | shlibpath_var=LD_LIBRARY_PATH |
3284 | shlibpath_overrides_runpath=yes |
3285 | @@ -2585,7 +2786,7 @@ |
3286 | ;; |
3287 | |
3288 | solaris*) |
3289 | - version_type=linux |
3290 | + version_type=linux # correct to gnu/linux during the next big refactor |
3291 | need_lib_prefix=no |
3292 | need_version=no |
3293 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3294 | @@ -2610,7 +2811,7 @@ |
3295 | ;; |
3296 | |
3297 | sysv4 | sysv4.3*) |
3298 | - version_type=linux |
3299 | + version_type=linux # correct to gnu/linux during the next big refactor |
3300 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3301 | soname_spec='${libname}${release}${shared_ext}$major' |
3302 | shlibpath_var=LD_LIBRARY_PATH |
3303 | @@ -2634,7 +2835,7 @@ |
3304 | |
3305 | sysv4*MP*) |
3306 | if test -d /usr/nec ;then |
3307 | - version_type=linux |
3308 | + version_type=linux # correct to gnu/linux during the next big refactor |
3309 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
3310 | soname_spec='$libname${shared_ext}.$major' |
3311 | shlibpath_var=LD_LIBRARY_PATH |
3312 | @@ -2665,7 +2866,7 @@ |
3313 | |
3314 | tpf*) |
3315 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
3316 | - version_type=linux |
3317 | + version_type=linux # correct to gnu/linux during the next big refactor |
3318 | need_lib_prefix=no |
3319 | need_version=no |
3320 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3321 | @@ -2675,7 +2876,7 @@ |
3322 | ;; |
3323 | |
3324 | uts4*) |
3325 | - version_type=linux |
3326 | + version_type=linux # correct to gnu/linux during the next big refactor |
3327 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3328 | soname_spec='${libname}${release}${shared_ext}$major' |
3329 | shlibpath_var=LD_LIBRARY_PATH |
3330 | @@ -2717,6 +2918,8 @@ |
3331 | The last name is the one that the linker finds with -lNAME]]) |
3332 | _LT_DECL([], [soname_spec], [1], |
3333 | [[The coded name of the library, if different from the real name]]) |
3334 | +_LT_DECL([], [install_override_mode], [1], |
3335 | + [Permission mode override for installation of shared libraries]) |
3336 | _LT_DECL([], [postinstall_cmds], [2], |
3337 | [Command to use after installation of a shared archive]) |
3338 | _LT_DECL([], [postuninstall_cmds], [2], |
3339 | @@ -2829,6 +3032,7 @@ |
3340 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
3341 | m4_require([_LT_DECL_SED])dnl |
3342 | m4_require([_LT_DECL_EGREP])dnl |
3343 | +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl |
3344 | |
3345 | AC_ARG_WITH([gnu-ld], |
3346 | [AS_HELP_STRING([--with-gnu-ld], |
3347 | @@ -2950,6 +3154,11 @@ |
3348 | esac |
3349 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
3350 | case $host_os in |
3351 | + cygwin* | mingw* | pw32* | cegcc*) |
3352 | + if test "$GCC" != yes; then |
3353 | + reload_cmds=false |
3354 | + fi |
3355 | + ;; |
3356 | darwin*) |
3357 | if test "$GCC" = yes; then |
3358 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
3359 | @@ -2958,8 +3167,8 @@ |
3360 | fi |
3361 | ;; |
3362 | esac |
3363 | -_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl |
3364 | -_LT_DECL([], [reload_cmds], [2])dnl |
3365 | +_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl |
3366 | +_LT_TAGDECL([], [reload_cmds], [2])dnl |
3367 | ])# _LT_CMD_RELOAD |
3368 | |
3369 | |
3370 | @@ -3011,16 +3220,18 @@ |
3371 | # Base MSYS/MinGW do not provide the 'file' command needed by |
3372 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
3373 | # unless we find 'file', for example because we are cross-compiling. |
3374 | - if ( file / ) >/dev/null 2>&1; then |
3375 | + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. |
3376 | + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then |
3377 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
3378 | lt_cv_file_magic_cmd='func_win32_libid' |
3379 | else |
3380 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
3381 | + # Keep this pattern in sync with the one in func_win32_libid. |
3382 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
3383 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
3384 | fi |
3385 | ;; |
3386 | |
3387 | -cegcc) |
3388 | +cegcc*) |
3389 | # use the weaker test based on 'objdump'. See mingw*. |
3390 | lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' |
3391 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
3392 | @@ -3050,6 +3261,10 @@ |
3393 | lt_cv_deplibs_check_method=pass_all |
3394 | ;; |
3395 | |
3396 | +haiku*) |
3397 | + lt_cv_deplibs_check_method=pass_all |
3398 | + ;; |
3399 | + |
3400 | hpux10.20* | hpux11*) |
3401 | lt_cv_file_magic_cmd=/usr/bin/file |
3402 | case $host_cpu in |
3403 | @@ -3058,11 +3273,11 @@ |
3404 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
3405 | ;; |
3406 | hppa*64*) |
3407 | - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] |
3408 | + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] |
3409 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl |
3410 | ;; |
3411 | *) |
3412 | - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' |
3413 | + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' |
3414 | lt_cv_file_magic_test_file=/usr/lib/libc.sl |
3415 | ;; |
3416 | esac |
3417 | @@ -3083,8 +3298,8 @@ |
3418 | lt_cv_deplibs_check_method=pass_all |
3419 | ;; |
3420 | |
3421 | -# This must be Linux ELF. |
3422 | -linux* | k*bsd*-gnu) |
3423 | +# This must be glibc/ELF. |
3424 | +linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3425 | lt_cv_deplibs_check_method=pass_all |
3426 | ;; |
3427 | |
3428 | @@ -3162,6 +3377,21 @@ |
3429 | ;; |
3430 | esac |
3431 | ]) |
3432 | + |
3433 | +file_magic_glob= |
3434 | +want_nocaseglob=no |
3435 | +if test "$build" = "$host"; then |
3436 | + case $host_os in |
3437 | + mingw* | pw32*) |
3438 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
3439 | + want_nocaseglob=yes |
3440 | + else |
3441 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` |
3442 | + fi |
3443 | + ;; |
3444 | + esac |
3445 | +fi |
3446 | + |
3447 | file_magic_cmd=$lt_cv_file_magic_cmd |
3448 | deplibs_check_method=$lt_cv_deplibs_check_method |
3449 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
3450 | @@ -3169,7 +3399,11 @@ |
3451 | _LT_DECL([], [deplibs_check_method], [1], |
3452 | [Method to check whether dependent libraries are shared objects]) |
3453 | _LT_DECL([], [file_magic_cmd], [1], |
3454 | - [Command to use when deplibs_check_method == "file_magic"]) |
3455 | + [Command to use when deplibs_check_method = "file_magic"]) |
3456 | +_LT_DECL([], [file_magic_glob], [1], |
3457 | + [How to find potential files when deplibs_check_method = "file_magic"]) |
3458 | +_LT_DECL([], [want_nocaseglob], [1], |
3459 | + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) |
3460 | ])# _LT_CHECK_MAGIC_METHOD |
3461 | |
3462 | |
3463 | @@ -3226,7 +3460,19 @@ |
3464 | NM="$lt_cv_path_NM" |
3465 | else |
3466 | # Didn't find any BSD compatible name lister, look for dumpbin. |
3467 | - AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) |
3468 | + if test -n "$DUMPBIN"; then : |
3469 | + # Let the user override the test. |
3470 | + else |
3471 | + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) |
3472 | + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in |
3473 | + *COFF*) |
3474 | + DUMPBIN="$DUMPBIN -symbols" |
3475 | + ;; |
3476 | + *) |
3477 | + DUMPBIN=: |
3478 | + ;; |
3479 | + esac |
3480 | + fi |
3481 | AC_SUBST([DUMPBIN]) |
3482 | if test "$DUMPBIN" != ":"; then |
3483 | NM="$DUMPBIN" |
3484 | @@ -3239,13 +3485,13 @@ |
3485 | AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], |
3486 | [lt_cv_nm_interface="BSD nm" |
3487 | echo "int some_variable = 0;" > conftest.$ac_ext |
3488 | - (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
3489 | + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
3490 | (eval "$ac_compile" 2>conftest.err) |
3491 | cat conftest.err >&AS_MESSAGE_LOG_FD |
3492 | - (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
3493 | + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
3494 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
3495 | cat conftest.err >&AS_MESSAGE_LOG_FD |
3496 | - (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) |
3497 | + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) |
3498 | cat conftest.out >&AS_MESSAGE_LOG_FD |
3499 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
3500 | lt_cv_nm_interface="MS dumpbin" |
3501 | @@ -3260,6 +3506,67 @@ |
3502 | dnl AC_DEFUN([AM_PROG_NM], []) |
3503 | dnl AC_DEFUN([AC_PROG_NM], []) |
3504 | |
3505 | +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB |
3506 | +# -------------------------------- |
3507 | +# how to determine the name of the shared library |
3508 | +# associated with a specific link library. |
3509 | +# -- PORTME fill in with the dynamic library characteristics |
3510 | +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], |
3511 | +[m4_require([_LT_DECL_EGREP]) |
3512 | +m4_require([_LT_DECL_OBJDUMP]) |
3513 | +m4_require([_LT_DECL_DLLTOOL]) |
3514 | +AC_CACHE_CHECK([how to associate runtime and link libraries], |
3515 | +lt_cv_sharedlib_from_linklib_cmd, |
3516 | +[lt_cv_sharedlib_from_linklib_cmd='unknown' |
3517 | + |
3518 | +case $host_os in |
3519 | +cygwin* | mingw* | pw32* | cegcc*) |
3520 | + # two different shell functions defined in ltmain.sh |
3521 | + # decide which to use based on capabilities of $DLLTOOL |
3522 | + case `$DLLTOOL --help 2>&1` in |
3523 | + *--identify-strict*) |
3524 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
3525 | + ;; |
3526 | + *) |
3527 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
3528 | + ;; |
3529 | + esac |
3530 | + ;; |
3531 | +*) |
3532 | + # fallback: assume linklib IS sharedlib |
3533 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
3534 | + ;; |
3535 | +esac |
3536 | +]) |
3537 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
3538 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
3539 | + |
3540 | +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], |
3541 | + [Command to associate shared and link libraries]) |
3542 | +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB |
3543 | + |
3544 | + |
3545 | +# _LT_PATH_MANIFEST_TOOL |
3546 | +# ---------------------- |
3547 | +# locate the manifest tool |
3548 | +m4_defun([_LT_PATH_MANIFEST_TOOL], |
3549 | +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) |
3550 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
3551 | +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], |
3552 | + [lt_cv_path_mainfest_tool=no |
3553 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD |
3554 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
3555 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
3556 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
3557 | + lt_cv_path_mainfest_tool=yes |
3558 | + fi |
3559 | + rm -f conftest*]) |
3560 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
3561 | + MANIFEST_TOOL=: |
3562 | +fi |
3563 | +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl |
3564 | +])# _LT_PATH_MANIFEST_TOOL |
3565 | + |
3566 | |
3567 | # LT_LIB_M |
3568 | # -------- |
3569 | @@ -3268,7 +3575,7 @@ |
3570 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
3571 | LIBM= |
3572 | case $host in |
3573 | -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) |
3574 | +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) |
3575 | # These system don't have libm, or don't need it |
3576 | ;; |
3577 | *-ncr-sysv4.3*) |
3578 | @@ -3296,7 +3603,12 @@ |
3579 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= |
3580 | |
3581 | if test "$GCC" = yes; then |
3582 | - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' |
3583 | + case $cc_basename in |
3584 | + nvcc*) |
3585 | + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; |
3586 | + *) |
3587 | + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; |
3588 | + esac |
3589 | |
3590 | _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], |
3591 | lt_cv_prog_compiler_rtti_exceptions, |
3592 | @@ -3313,6 +3625,7 @@ |
3593 | m4_defun([_LT_CMD_GLOBAL_SYMBOLS], |
3594 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
3595 | AC_REQUIRE([AC_PROG_CC])dnl |
3596 | +AC_REQUIRE([AC_PROG_AWK])dnl |
3597 | AC_REQUIRE([LT_PATH_NM])dnl |
3598 | AC_REQUIRE([LT_PATH_LD])dnl |
3599 | m4_require([_LT_DECL_SED])dnl |
3600 | @@ -3380,8 +3693,8 @@ |
3601 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
3602 | |
3603 | # Transform an extracted symbol line into symbol name and symbol address |
3604 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
3605 | -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
3606 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
3607 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
3608 | |
3609 | # Handle CRLF in mingw tool chain |
3610 | opt_cr= |
3611 | @@ -3405,6 +3718,7 @@ |
3612 | # which start with @ or ?. |
3613 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ |
3614 | " {last_section=section; section=\$ 3};"\ |
3615 | +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ |
3616 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
3617 | " \$ 0!~/External *\|/{next};"\ |
3618 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
3619 | @@ -3417,6 +3731,7 @@ |
3620 | else |
3621 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
3622 | fi |
3623 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
3624 | |
3625 | # Check to see that the pipe works correctly. |
3626 | pipe_works=no |
3627 | @@ -3438,7 +3753,7 @@ |
3628 | if AC_TRY_EVAL(ac_compile); then |
3629 | # Now try to grab the symbols. |
3630 | nlist=conftest.nm |
3631 | - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then |
3632 | + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then |
3633 | # Try sorting and uniquifying the output. |
3634 | if sort "$nlist" | uniq > "$nlist"T; then |
3635 | mv -f "$nlist"T "$nlist" |
3636 | @@ -3450,6 +3765,18 @@ |
3637 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
3638 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
3639 | cat <<_LT_EOF > conftest.$ac_ext |
3640 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
3641 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
3642 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
3643 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
3644 | +# define LT@&t@_DLSYM_CONST |
3645 | +#elif defined(__osf__) |
3646 | +/* This system does not cope well with relocations in const data. */ |
3647 | +# define LT@&t@_DLSYM_CONST |
3648 | +#else |
3649 | +# define LT@&t@_DLSYM_CONST const |
3650 | +#endif |
3651 | + |
3652 | #ifdef __cplusplus |
3653 | extern "C" { |
3654 | #endif |
3655 | @@ -3461,7 +3788,7 @@ |
3656 | cat <<_LT_EOF >> conftest.$ac_ext |
3657 | |
3658 | /* The mapping between symbol names and symbols. */ |
3659 | -const struct { |
3660 | +LT@&t@_DLSYM_CONST struct { |
3661 | const char *name; |
3662 | void *address; |
3663 | } |
3664 | @@ -3487,15 +3814,15 @@ |
3665 | _LT_EOF |
3666 | # Now try linking the two files. |
3667 | mv conftest.$ac_objext conftstm.$ac_objext |
3668 | - lt_save_LIBS="$LIBS" |
3669 | - lt_save_CFLAGS="$CFLAGS" |
3670 | + lt_globsym_save_LIBS=$LIBS |
3671 | + lt_globsym_save_CFLAGS=$CFLAGS |
3672 | LIBS="conftstm.$ac_objext" |
3673 | CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" |
3674 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then |
3675 | pipe_works=yes |
3676 | fi |
3677 | - LIBS="$lt_save_LIBS" |
3678 | - CFLAGS="$lt_save_CFLAGS" |
3679 | + LIBS=$lt_globsym_save_LIBS |
3680 | + CFLAGS=$lt_globsym_save_CFLAGS |
3681 | else |
3682 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD |
3683 | fi |
3684 | @@ -3528,6 +3855,13 @@ |
3685 | AC_MSG_RESULT(ok) |
3686 | fi |
3687 | |
3688 | +# Response file support. |
3689 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
3690 | + nm_file_list_spec='@' |
3691 | +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then |
3692 | + nm_file_list_spec='@' |
3693 | +fi |
3694 | + |
3695 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], |
3696 | [Take the output of nm and produce a listing of raw symbols and C names]) |
3697 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], |
3698 | @@ -3538,6 +3872,8 @@ |
3699 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], |
3700 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], |
3701 | [Transform the output of nm in a C name address pair when lib prefix is needed]) |
3702 | +_LT_DECL([], [nm_file_list_spec], [1], |
3703 | + [Specify filename containing input files for $NM]) |
3704 | ]) # _LT_CMD_GLOBAL_SYMBOLS |
3705 | |
3706 | |
3707 | @@ -3549,7 +3885,6 @@ |
3708 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
3709 | _LT_TAGVAR(lt_prog_compiler_static, $1)= |
3710 | |
3711 | -AC_MSG_CHECKING([for $compiler option to produce PIC]) |
3712 | m4_if([$1], [CXX], [ |
3713 | # C++ specific cases for pic, static, wl, etc. |
3714 | if test "$GXX" = yes; then |
3715 | @@ -3600,6 +3935,11 @@ |
3716 | # DJGPP does not support shared libraries at all |
3717 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
3718 | ;; |
3719 | + haiku*) |
3720 | + # PIC is the default for Haiku. |
3721 | + # The "-static" flag exists, but is broken. |
3722 | + _LT_TAGVAR(lt_prog_compiler_static, $1)= |
3723 | + ;; |
3724 | interix[[3-9]]*) |
3725 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
3726 | # Instead, we relocate shared libraries at runtime. |
3727 | @@ -3649,6 +3989,12 @@ |
3728 | ;; |
3729 | esac |
3730 | ;; |
3731 | + mingw* | cygwin* | os2* | pw32* | cegcc*) |
3732 | + # This hack is so that the source file can tell whether it is being |
3733 | + # built for inclusion in a dll (and should export symbols for example). |
3734 | + m4_if([$1], [GCJ], [], |
3735 | + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) |
3736 | + ;; |
3737 | dgux*) |
3738 | case $cc_basename in |
3739 | ec++*) |
3740 | @@ -3705,7 +4051,7 @@ |
3741 | ;; |
3742 | esac |
3743 | ;; |
3744 | - linux* | k*bsd*-gnu) |
3745 | + linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3746 | case $cc_basename in |
3747 | KCC*) |
3748 | # KAI C++ Compiler |
3749 | @@ -3738,8 +4084,8 @@ |
3750 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
3751 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
3752 | ;; |
3753 | - xlc* | xlC*) |
3754 | - # IBM XL 8.0 on PPC |
3755 | + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) |
3756 | + # IBM XL 8.0, 9.0 on PPC and BlueGene |
3757 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3758 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
3759 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
3760 | @@ -3801,7 +4147,7 @@ |
3761 | ;; |
3762 | solaris*) |
3763 | case $cc_basename in |
3764 | - CC*) |
3765 | + CC* | sunCC*) |
3766 | # Sun C++ 4.2, 5.x and Centerline C++ |
3767 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3768 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3769 | @@ -3905,6 +4251,12 @@ |
3770 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' |
3771 | ;; |
3772 | |
3773 | + haiku*) |
3774 | + # PIC is the default for Haiku. |
3775 | + # The "-static" flag exists, but is broken. |
3776 | + _LT_TAGVAR(lt_prog_compiler_static, $1)= |
3777 | + ;; |
3778 | + |
3779 | hpux*) |
3780 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
3781 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
3782 | @@ -3947,6 +4299,15 @@ |
3783 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
3784 | ;; |
3785 | esac |
3786 | + |
3787 | + case $cc_basename in |
3788 | + nvcc*) # Cuda Compiler Driver 2.2 |
3789 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' |
3790 | + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then |
3791 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" |
3792 | + fi |
3793 | + ;; |
3794 | + esac |
3795 | else |
3796 | # PORTME Check for flag to pass linker flags through the system compiler. |
3797 | case $host_os in |
3798 | @@ -3989,7 +4350,7 @@ |
3799 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
3800 | ;; |
3801 | |
3802 | - linux* | k*bsd*-gnu) |
3803 | + linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3804 | case $cc_basename in |
3805 | # old Intel for x86_64 which still supported -KPIC. |
3806 | ecc*) |
3807 | @@ -4010,7 +4371,13 @@ |
3808 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' |
3809 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' |
3810 | ;; |
3811 | - pgcc* | pgf77* | pgf90* | pgf95*) |
3812 | + nagfor*) |
3813 | + # NAG Fortran compiler |
3814 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' |
3815 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' |
3816 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3817 | + ;; |
3818 | + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
3819 | # Portland Group compilers (*not* the Pentium gcc compiler, |
3820 | # which looks to be a dead project) |
3821 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3822 | @@ -4022,25 +4389,40 @@ |
3823 | # All Alpha code is PIC. |
3824 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
3825 | ;; |
3826 | - xl*) |
3827 | - # IBM XL C 8.0/Fortran 10.1 on PPC |
3828 | + xl* | bgxl* | bgf* | mpixl*) |
3829 | + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene |
3830 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3831 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
3832 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
3833 | ;; |
3834 | *) |
3835 | case `$CC -V 2>&1 | sed 5q` in |
3836 | + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) |
3837 | + # Sun Fortran 8.3 passes all unrecognized flags to the linker |
3838 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3839 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3840 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
3841 | + ;; |
3842 | + *Sun\ F* | *Sun*Fortran*) |
3843 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3844 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3845 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' |
3846 | + ;; |
3847 | *Sun\ C*) |
3848 | # Sun C 5.9 |
3849 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3850 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3851 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3852 | ;; |
3853 | - *Sun\ F*) |
3854 | - # Sun Fortran 8.3 passes all unrecognized flags to the linker |
3855 | - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3856 | + *Intel*\ [[CF]]*Compiler*) |
3857 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3858 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
3859 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' |
3860 | + ;; |
3861 | + *Portland\ Group*) |
3862 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3863 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' |
3864 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3865 | - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
3866 | ;; |
3867 | esac |
3868 | ;; |
3869 | @@ -4072,7 +4454,7 @@ |
3870 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3871 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3872 | case $cc_basename in |
3873 | - f77* | f90* | f95*) |
3874 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
3875 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
3876 | *) |
3877 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
3878 | @@ -4129,9 +4511,11 @@ |
3879 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" |
3880 | ;; |
3881 | esac |
3882 | -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) |
3883 | -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], |
3884 | - [How to pass a linker flag through the compiler]) |
3885 | + |
3886 | +AC_CACHE_CHECK([for $compiler option to produce PIC], |
3887 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], |
3888 | + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) |
3889 | +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) |
3890 | |
3891 | # |
3892 | # Check to make sure the PIC flag actually works. |
3893 | @@ -4150,6 +4534,8 @@ |
3894 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], |
3895 | [Additional compiler flags for building library objects]) |
3896 | |
3897 | +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], |
3898 | + [How to pass a linker flag through the compiler]) |
3899 | # |
3900 | # Check to make sure the static flag actually works. |
3901 | # |
3902 | @@ -4170,6 +4556,7 @@ |
3903 | m4_defun([_LT_LINKER_SHLIBS], |
3904 | [AC_REQUIRE([LT_PATH_LD])dnl |
3905 | AC_REQUIRE([LT_PATH_NM])dnl |
3906 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl |
3907 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
3908 | m4_require([_LT_DECL_EGREP])dnl |
3909 | m4_require([_LT_DECL_SED])dnl |
3910 | @@ -4178,27 +4565,37 @@ |
3911 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) |
3912 | m4_if([$1], [CXX], [ |
3913 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
3914 | + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
3915 | case $host_os in |
3916 | aix[[4-9]]*) |
3917 | # If we're using GNU nm, then we don't want the "-C" option. |
3918 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
3919 | + # Also, AIX nm treats weak defined symbols like other global defined |
3920 | + # symbols, whereas GNU nm marks them as "W". |
3921 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
3922 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3923 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3924 | else |
3925 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3926 | fi |
3927 | ;; |
3928 | pw32*) |
3929 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
3930 | - ;; |
3931 | + ;; |
3932 | cygwin* | mingw* | cegcc*) |
3933 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
3934 | - ;; |
3935 | + case $cc_basename in |
3936 | + cl*) |
3937 | + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
3938 | + ;; |
3939 | + *) |
3940 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
3941 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
3942 | + ;; |
3943 | + esac |
3944 | + ;; |
3945 | *) |
3946 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
3947 | - ;; |
3948 | + ;; |
3949 | esac |
3950 | - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] |
3951 | ], [ |
3952 | runpath_var= |
3953 | _LT_TAGVAR(allow_undefined_flag, $1)= |
3954 | @@ -4213,7 +4610,6 @@ |
3955 | _LT_TAGVAR(hardcode_direct, $1)=no |
3956 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
3957 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
3958 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
3959 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
3960 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
3961 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
3962 | @@ -4261,7 +4657,33 @@ |
3963 | esac |
3964 | |
3965 | _LT_TAGVAR(ld_shlibs, $1)=yes |
3966 | + |
3967 | + # On some targets, GNU ld is compatible enough with the native linker |
3968 | + # that we're better off using the native interface for both. |
3969 | + lt_use_gnu_ld_interface=no |
3970 | if test "$with_gnu_ld" = yes; then |
3971 | + case $host_os in |
3972 | + aix*) |
3973 | + # The AIX port of GNU ld has always aspired to compatibility |
3974 | + # with the native linker. However, as the warning in the GNU ld |
3975 | + # block says, versions before 2.19.5* couldn't really create working |
3976 | + # shared libraries, regardless of the interface used. |
3977 | + case `$LD -v 2>&1` in |
3978 | + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; |
3979 | + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; |
3980 | + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; |
3981 | + *) |
3982 | + lt_use_gnu_ld_interface=yes |
3983 | + ;; |
3984 | + esac |
3985 | + ;; |
3986 | + *) |
3987 | + lt_use_gnu_ld_interface=yes |
3988 | + ;; |
3989 | + esac |
3990 | + fi |
3991 | + |
3992 | + if test "$lt_use_gnu_ld_interface" = yes; then |
3993 | # If archive_cmds runs LD, not CC, wlarc should be empty |
3994 | wlarc='${wl}' |
3995 | |
3996 | @@ -4279,6 +4701,7 @@ |
3997 | fi |
3998 | supports_anon_versioning=no |
3999 | case `$LD -v 2>&1` in |
4000 | + *GNU\ gold*) supports_anon_versioning=yes ;; |
4001 | *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 |
4002 | *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
4003 | *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
4004 | @@ -4294,11 +4717,12 @@ |
4005 | _LT_TAGVAR(ld_shlibs, $1)=no |
4006 | cat <<_LT_EOF 1>&2 |
4007 | |
4008 | -*** Warning: the GNU linker, at least up to release 2.9.1, is reported |
4009 | +*** Warning: the GNU linker, at least up to release 2.19, is reported |
4010 | *** to be unable to reliably create shared libraries on AIX. |
4011 | *** Therefore, libtool is disabling shared libraries support. If you |
4012 | -*** really care for shared libraries, you may want to modify your PATH |
4013 | -*** so that a non-GNU linker is found, and then restart. |
4014 | +*** really care for shared libraries, you may want to install binutils |
4015 | +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. |
4016 | +*** You will then need to restart the configuration process. |
4017 | |
4018 | _LT_EOF |
4019 | fi |
4020 | @@ -4334,10 +4758,12 @@ |
4021 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
4022 | # as there is no search path for DLLs. |
4023 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
4024 | + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
4025 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
4026 | _LT_TAGVAR(always_export_symbols, $1)=no |
4027 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
4028 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' |
4029 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
4030 | + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
4031 | |
4032 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
4033 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
4034 | @@ -4355,6 +4781,11 @@ |
4035 | fi |
4036 | ;; |
4037 | |
4038 | + haiku*) |
4039 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4040 | + _LT_TAGVAR(link_all_deplibs, $1)=yes |
4041 | + ;; |
4042 | + |
4043 | interix[[3-9]]*) |
4044 | _LT_TAGVAR(hardcode_direct, $1)=no |
4045 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
4046 | @@ -4370,7 +4801,7 @@ |
4047 | _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
4048 | ;; |
4049 | |
4050 | - gnu* | linux* | tpf* | k*bsd*-gnu) |
4051 | + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) |
4052 | tmp_diet=no |
4053 | if test "$host_os" = linux-dietlibc; then |
4054 | case $cc_basename in |
4055 | @@ -4380,15 +4811,16 @@ |
4056 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
4057 | && test "$tmp_diet" = no |
4058 | then |
4059 | - tmp_addflag= |
4060 | + tmp_addflag=' $pic_flag' |
4061 | tmp_sharedflag='-shared' |
4062 | case $cc_basename,$host_cpu in |
4063 | pgcc*) # Portland Group C compiler |
4064 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4065 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4066 | tmp_addflag=' $pic_flag' |
4067 | ;; |
4068 | - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers |
4069 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4070 | + pgf77* | pgf90* | pgf95* | pgfortran*) |
4071 | + # Portland Group f77 and f90 compilers |
4072 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4073 | tmp_addflag=' $pic_flag -Mnomain' ;; |
4074 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
4075 | tmp_addflag=' -i_dynamic' ;; |
4076 | @@ -4399,13 +4831,17 @@ |
4077 | lf95*) # Lahey Fortran 8.1 |
4078 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
4079 | tmp_sharedflag='--shared' ;; |
4080 | - xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
4081 | + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
4082 | tmp_sharedflag='-qmkshrobj' |
4083 | tmp_addflag= ;; |
4084 | + nvcc*) # Cuda Compiler Driver 2.2 |
4085 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4086 | + _LT_TAGVAR(compiler_needs_object, $1)=yes |
4087 | + ;; |
4088 | esac |
4089 | case `$CC -V 2>&1 | sed 5q` in |
4090 | *Sun\ C*) # Sun C 5.9 |
4091 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4092 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4093 | _LT_TAGVAR(compiler_needs_object, $1)=yes |
4094 | tmp_sharedflag='-G' ;; |
4095 | *Sun\ F*) # Sun Fortran 8.3 |
4096 | @@ -4421,17 +4857,16 @@ |
4097 | fi |
4098 | |
4099 | case $cc_basename in |
4100 | - xlf*) |
4101 | + xlf* | bgf* | bgxlf* | mpixlf*) |
4102 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
4103 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
4104 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4105 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' |
4106 | - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
4107 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4108 | + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
4109 | if test "x$supports_anon_versioning" = xyes; then |
4110 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
4111 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
4112 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
4113 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
4114 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
4115 | fi |
4116 | ;; |
4117 | esac |
4118 | @@ -4445,8 +4880,8 @@ |
4119 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
4120 | wlarc= |
4121 | else |
4122 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4123 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4124 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4125 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4126 | fi |
4127 | ;; |
4128 | |
4129 | @@ -4464,8 +4899,8 @@ |
4130 | |
4131 | _LT_EOF |
4132 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
4133 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4134 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4135 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4136 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4137 | else |
4138 | _LT_TAGVAR(ld_shlibs, $1)=no |
4139 | fi |
4140 | @@ -4511,8 +4946,8 @@ |
4141 | |
4142 | *) |
4143 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
4144 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4145 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4146 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4147 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4148 | else |
4149 | _LT_TAGVAR(ld_shlibs, $1)=no |
4150 | fi |
4151 | @@ -4552,8 +4987,10 @@ |
4152 | else |
4153 | # If we're using GNU nm, then we don't want the "-C" option. |
4154 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
4155 | + # Also, AIX nm treats weak defined symbols like other global |
4156 | + # defined symbols, whereas GNU nm marks them as "W". |
4157 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
4158 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4159 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4160 | else |
4161 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4162 | fi |
4163 | @@ -4640,9 +5077,9 @@ |
4164 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
4165 | # Determine the default libpath from the value encoded in an |
4166 | # empty executable. |
4167 | - _LT_SYS_MODULE_PATH_AIX |
4168 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
4169 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
4170 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
4171 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
4172 | else |
4173 | if test "$host_cpu" = ia64; then |
4174 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
4175 | @@ -4651,14 +5088,19 @@ |
4176 | else |
4177 | # Determine the default libpath from the value encoded in an |
4178 | # empty executable. |
4179 | - _LT_SYS_MODULE_PATH_AIX |
4180 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
4181 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
4182 | # Warning - without using the other run time loading flags, |
4183 | # -berok will link without error, but may produce a broken library. |
4184 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
4185 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
4186 | - # Exported symbols can be pulled into shared objects from archives |
4187 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
4188 | + if test "$with_gnu_ld" = yes; then |
4189 | + # We only use this code for GNU lds that support --whole-archive. |
4190 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
4191 | + else |
4192 | + # Exported symbols can be pulled into shared objects from archives |
4193 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
4194 | + fi |
4195 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
4196 | # This is similar to how AIX traditionally builds its shared libraries. |
4197 | _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
4198 | @@ -4690,20 +5132,64 @@ |
4199 | # Microsoft Visual C++. |
4200 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
4201 | # no search path for DLLs. |
4202 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
4203 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
4204 | - # Tell ltmain to make .lib files, not .a files. |
4205 | - libext=lib |
4206 | - # Tell ltmain to make .dll files, not .so files. |
4207 | - shrext_cmds=".dll" |
4208 | - # FIXME: Setting linknames here is a bad hack. |
4209 | - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' |
4210 | - # The linker will automatically build a .lib file if we build a DLL. |
4211 | - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
4212 | - # FIXME: Should let the user specify the lib program. |
4213 | - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
4214 | - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' |
4215 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
4216 | + case $cc_basename in |
4217 | + cl*) |
4218 | + # Native MSVC |
4219 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
4220 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
4221 | + _LT_TAGVAR(always_export_symbols, $1)=yes |
4222 | + _LT_TAGVAR(file_list_spec, $1)='@' |
4223 | + # Tell ltmain to make .lib files, not .a files. |
4224 | + libext=lib |
4225 | + # Tell ltmain to make .dll files, not .so files. |
4226 | + shrext_cmds=".dll" |
4227 | + # FIXME: Setting linknames here is a bad hack. |
4228 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
4229 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
4230 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
4231 | + else |
4232 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
4233 | + fi~ |
4234 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
4235 | + linknames=' |
4236 | + # The linker will not automatically build a static lib if we build a DLL. |
4237 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
4238 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
4239 | + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
4240 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' |
4241 | + # Don't use ranlib |
4242 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
4243 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ |
4244 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
4245 | + case $lt_outputfile in |
4246 | + *.exe|*.EXE) ;; |
4247 | + *) |
4248 | + lt_outputfile="$lt_outputfile.exe" |
4249 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
4250 | + ;; |
4251 | + esac~ |
4252 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
4253 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
4254 | + $RM "$lt_outputfile.manifest"; |
4255 | + fi' |
4256 | + ;; |
4257 | + *) |
4258 | + # Assume MSVC wrapper |
4259 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
4260 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
4261 | + # Tell ltmain to make .lib files, not .a files. |
4262 | + libext=lib |
4263 | + # Tell ltmain to make .dll files, not .so files. |
4264 | + shrext_cmds=".dll" |
4265 | + # FIXME: Setting linknames here is a bad hack. |
4266 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
4267 | + # The linker will automatically build a .lib file if we build a DLL. |
4268 | + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
4269 | + # FIXME: Should let the user specify the lib program. |
4270 | + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
4271 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
4272 | + ;; |
4273 | + esac |
4274 | ;; |
4275 | |
4276 | darwin* | rhapsody*) |
4277 | @@ -4716,10 +5202,6 @@ |
4278 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
4279 | ;; |
4280 | |
4281 | - freebsd1*) |
4282 | - _LT_TAGVAR(ld_shlibs, $1)=no |
4283 | - ;; |
4284 | - |
4285 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
4286 | # support. Future versions do this automatically, but an explicit c++rt0.o |
4287 | # does not break anything, and helps significantly (at the cost of a little |
4288 | @@ -4732,7 +5214,7 @@ |
4289 | ;; |
4290 | |
4291 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
4292 | - freebsd2*) |
4293 | + freebsd2.*) |
4294 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
4295 | _LT_TAGVAR(hardcode_direct, $1)=yes |
4296 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
4297 | @@ -4741,7 +5223,7 @@ |
4298 | |
4299 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
4300 | freebsd* | dragonfly*) |
4301 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
4302 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
4303 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
4304 | _LT_TAGVAR(hardcode_direct, $1)=yes |
4305 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
4306 | @@ -4749,7 +5231,7 @@ |
4307 | |
4308 | hpux9*) |
4309 | if test "$GCC" = yes; then |
4310 | - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4311 | + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4312 | else |
4313 | _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4314 | fi |
4315 | @@ -4764,14 +5246,13 @@ |
4316 | ;; |
4317 | |
4318 | hpux10*) |
4319 | - if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
4320 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4321 | + if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
4322 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4323 | else |
4324 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
4325 | fi |
4326 | if test "$with_gnu_ld" = no; then |
4327 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
4328 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' |
4329 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
4330 | _LT_TAGVAR(hardcode_direct, $1)=yes |
4331 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes |
4332 | @@ -4783,16 +5264,16 @@ |
4333 | ;; |
4334 | |
4335 | hpux11*) |
4336 | - if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
4337 | + if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
4338 | case $host_cpu in |
4339 | hppa*64*) |
4340 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4341 | ;; |
4342 | ia64*) |
4343 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
4344 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
4345 | ;; |
4346 | *) |
4347 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4348 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4349 | ;; |
4350 | esac |
4351 | else |
4352 | @@ -4804,7 +5285,14 @@ |
4353 | _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
4354 | ;; |
4355 | *) |
4356 | - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4357 | + m4_if($1, [], [ |
4358 | + # Older versions of the 11.00 compiler do not understand -b yet |
4359 | + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) |
4360 | + _LT_LINKER_OPTION([if $CC understands -b], |
4361 | + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], |
4362 | + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], |
4363 | + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], |
4364 | + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) |
4365 | ;; |
4366 | esac |
4367 | fi |
4368 | @@ -4832,19 +5320,34 @@ |
4369 | |
4370 | irix5* | irix6* | nonstopux*) |
4371 | if test "$GCC" = yes; then |
4372 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4373 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4374 | # Try to use the -exported_symbol ld option, if it does not |
4375 | # work, assume that -exports_file does not work either and |
4376 | # implicitly export all symbols. |
4377 | - save_LDFLAGS="$LDFLAGS" |
4378 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
4379 | - AC_LINK_IFELSE(int foo(void) {}, |
4380 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
4381 | - ) |
4382 | - LDFLAGS="$save_LDFLAGS" |
4383 | + # This should be the same for all languages, so no per-tag cache variable. |
4384 | + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], |
4385 | + [lt_cv_irix_exported_symbol], |
4386 | + [save_LDFLAGS="$LDFLAGS" |
4387 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
4388 | + AC_LINK_IFELSE( |
4389 | + [AC_LANG_SOURCE( |
4390 | + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], |
4391 | + [C++], [[int foo (void) { return 0; }]], |
4392 | + [Fortran 77], [[ |
4393 | + subroutine foo |
4394 | + end]], |
4395 | + [Fortran], [[ |
4396 | + subroutine foo |
4397 | + end]])])], |
4398 | + [lt_cv_irix_exported_symbol=yes], |
4399 | + [lt_cv_irix_exported_symbol=no]) |
4400 | + LDFLAGS="$save_LDFLAGS"]) |
4401 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
4402 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
4403 | + fi |
4404 | else |
4405 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
4406 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
4407 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
4408 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
4409 | fi |
4410 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
4411 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4412 | @@ -4906,17 +5409,17 @@ |
4413 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
4414 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
4415 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
4416 | - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' |
4417 | + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' |
4418 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' |
4419 | ;; |
4420 | |
4421 | osf3*) |
4422 | if test "$GCC" = yes; then |
4423 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
4424 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4425 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4426 | else |
4427 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
4428 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
4429 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
4430 | fi |
4431 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
4432 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4433 | @@ -4926,13 +5429,13 @@ |
4434 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
4435 | if test "$GCC" = yes; then |
4436 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
4437 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4438 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4439 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4440 | else |
4441 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
4442 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
4443 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
4444 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ |
4445 | - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' |
4446 | + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' |
4447 | |
4448 | # Both c and cxx compiler support -rpath directly |
4449 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
4450 | @@ -4945,9 +5448,9 @@ |
4451 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' |
4452 | if test "$GCC" = yes; then |
4453 | wlarc='${wl}' |
4454 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4455 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4456 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
4457 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
4458 | + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
4459 | else |
4460 | case `$CC -V 2>&1` in |
4461 | *"Compilers 5.0"*) |
4462 | @@ -5123,36 +5626,38 @@ |
4463 | # Test whether the compiler implicitly links with -lc since on some |
4464 | # systems, -lgcc has to come before -lc. If gcc already passes -lc |
4465 | # to ld, don't add -lc before -lgcc. |
4466 | - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) |
4467 | - $RM conftest* |
4468 | - echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
4469 | + AC_CACHE_CHECK([whether -lc should be explicitly linked in], |
4470 | + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), |
4471 | + [$RM conftest* |
4472 | + echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
4473 | |
4474 | - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then |
4475 | - soname=conftest |
4476 | - lib=conftest |
4477 | - libobjs=conftest.$ac_objext |
4478 | - deplibs= |
4479 | - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) |
4480 | - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) |
4481 | - compiler_flags=-v |
4482 | - linker_flags=-v |
4483 | - verstring= |
4484 | - output_objdir=. |
4485 | - libname=conftest |
4486 | - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) |
4487 | - _LT_TAGVAR(allow_undefined_flag, $1)= |
4488 | - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) |
4489 | - then |
4490 | - _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
4491 | - else |
4492 | - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
4493 | - fi |
4494 | - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag |
4495 | - else |
4496 | - cat conftest.err 1>&5 |
4497 | - fi |
4498 | - $RM conftest* |
4499 | - AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) |
4500 | + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then |
4501 | + soname=conftest |
4502 | + lib=conftest |
4503 | + libobjs=conftest.$ac_objext |
4504 | + deplibs= |
4505 | + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) |
4506 | + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) |
4507 | + compiler_flags=-v |
4508 | + linker_flags=-v |
4509 | + verstring= |
4510 | + output_objdir=. |
4511 | + libname=conftest |
4512 | + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) |
4513 | + _LT_TAGVAR(allow_undefined_flag, $1)= |
4514 | + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) |
4515 | + then |
4516 | + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no |
4517 | + else |
4518 | + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
4519 | + fi |
4520 | + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag |
4521 | + else |
4522 | + cat conftest.err 1>&5 |
4523 | + fi |
4524 | + $RM conftest* |
4525 | + ]) |
4526 | + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) |
4527 | ;; |
4528 | esac |
4529 | fi |
4530 | @@ -5189,9 +5694,6 @@ |
4531 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], |
4532 | [Flag to hardcode $libdir into a binary during linking. |
4533 | This must work even if $libdir does not exist]) |
4534 | -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], |
4535 | - [[If ld is used when linking, flag to hardcode $libdir into a binary |
4536 | - during linking. This must work even if $libdir does not exist]]) |
4537 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], |
4538 | [Whether we need a single "-rpath" flag with a separated argument]) |
4539 | _LT_TAGDECL([], [hardcode_direct], [0], |
4540 | @@ -5217,8 +5719,6 @@ |
4541 | to runtime path list]) |
4542 | _LT_TAGDECL([], [link_all_deplibs], [0], |
4543 | [Whether libtool must link a program against all its dependency libraries]) |
4544 | -_LT_TAGDECL([], [fix_srcfile_path], [1], |
4545 | - [Fix the shell variable $srcfile for the compiler]) |
4546 | _LT_TAGDECL([], [always_export_symbols], [0], |
4547 | [Set to "yes" if exported symbols are required]) |
4548 | _LT_TAGDECL([], [export_symbols_cmds], [2], |
4549 | @@ -5229,6 +5729,8 @@ |
4550 | [Symbols that must always be exported]) |
4551 | _LT_TAGDECL([], [prelink_cmds], [2], |
4552 | [Commands necessary for linking programs (against libraries) with templates]) |
4553 | +_LT_TAGDECL([], [postlink_cmds], [2], |
4554 | + [Commands necessary for finishing linking programs]) |
4555 | _LT_TAGDECL([], [file_list_spec], [1], |
4556 | [Specify filename containing input files]) |
4557 | dnl FIXME: Not yet implemented |
4558 | @@ -5318,14 +5820,15 @@ |
4559 | ])# _LT_LANG_C_CONFIG |
4560 | |
4561 | |
4562 | -# _LT_PROG_CXX |
4563 | -# ------------ |
4564 | -# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ |
4565 | -# compiler, we have our own version here. |
4566 | -m4_defun([_LT_PROG_CXX], |
4567 | -[ |
4568 | -pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) |
4569 | -AC_PROG_CXX |
4570 | +# _LT_LANG_CXX_CONFIG([TAG]) |
4571 | +# -------------------------- |
4572 | +# Ensure that the configuration variables for a C++ compiler are suitably |
4573 | +# defined. These variables are subsequently used by _LT_CONFIG to write |
4574 | +# the compiler configuration to `libtool'. |
4575 | +m4_defun([_LT_LANG_CXX_CONFIG], |
4576 | +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
4577 | +m4_require([_LT_DECL_EGREP])dnl |
4578 | +m4_require([_LT_PATH_MANIFEST_TOOL])dnl |
4579 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
4580 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
4581 | (test "X$CXX" != "Xg++"))) ; then |
4582 | @@ -5333,22 +5836,6 @@ |
4583 | else |
4584 | _lt_caught_CXX_error=yes |
4585 | fi |
4586 | -popdef([AC_MSG_ERROR]) |
4587 | -])# _LT_PROG_CXX |
4588 | - |
4589 | -dnl aclocal-1.4 backwards compatibility: |
4590 | -dnl AC_DEFUN([_LT_PROG_CXX], []) |
4591 | - |
4592 | - |
4593 | -# _LT_LANG_CXX_CONFIG([TAG]) |
4594 | -# -------------------------- |
4595 | -# Ensure that the configuration variables for a C++ compiler are suitably |
4596 | -# defined. These variables are subsequently used by _LT_CONFIG to write |
4597 | -# the compiler configuration to `libtool'. |
4598 | -m4_defun([_LT_LANG_CXX_CONFIG], |
4599 | -[AC_REQUIRE([_LT_PROG_CXX])dnl |
4600 | -m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
4601 | -m4_require([_LT_DECL_EGREP])dnl |
4602 | |
4603 | AC_LANG_PUSH(C++) |
4604 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
4605 | @@ -5360,7 +5847,6 @@ |
4606 | _LT_TAGVAR(hardcode_direct, $1)=no |
4607 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
4608 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4609 | -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
4610 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
4611 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
4612 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
4613 | @@ -5370,6 +5856,8 @@ |
4614 | _LT_TAGVAR(module_expsym_cmds, $1)= |
4615 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
4616 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
4617 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
4618 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
4619 | _LT_TAGVAR(no_undefined_flag, $1)= |
4620 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
4621 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
4622 | @@ -5401,6 +5889,7 @@ |
4623 | |
4624 | # Allow CC to be a program name with arguments. |
4625 | lt_save_CC=$CC |
4626 | + lt_save_CFLAGS=$CFLAGS |
4627 | lt_save_LD=$LD |
4628 | lt_save_GCC=$GCC |
4629 | GCC=$GXX |
4630 | @@ -5418,6 +5907,7 @@ |
4631 | fi |
4632 | test -z "${LDCXX+set}" || LD=$LDCXX |
4633 | CC=${CXX-"c++"} |
4634 | + CFLAGS=$CXXFLAGS |
4635 | compiler=$CC |
4636 | _LT_TAGVAR(compiler, $1)=$CC |
4637 | _LT_CC_BASENAME([$compiler]) |
4638 | @@ -5439,8 +5929,8 @@ |
4639 | # Check if GNU C++ uses GNU ld as the underlying linker, since the |
4640 | # archiving commands below assume that GNU ld is being used. |
4641 | if test "$with_gnu_ld" = yes; then |
4642 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4643 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4644 | + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4645 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4646 | |
4647 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4648 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
4649 | @@ -5472,7 +5962,7 @@ |
4650 | # Commands to make compiler produce verbose output that lists |
4651 | # what "hidden" libraries, object files and flags are used when |
4652 | # linking a shared library. |
4653 | - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
4654 | + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
4655 | |
4656 | else |
4657 | GXX=no |
4658 | @@ -5581,10 +6071,10 @@ |
4659 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
4660 | # Determine the default libpath from the value encoded in an empty |
4661 | # executable. |
4662 | - _LT_SYS_MODULE_PATH_AIX |
4663 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
4664 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
4665 | |
4666 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
4667 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
4668 | else |
4669 | if test "$host_cpu" = ia64; then |
4670 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
4671 | @@ -5593,14 +6083,19 @@ |
4672 | else |
4673 | # Determine the default libpath from the value encoded in an |
4674 | # empty executable. |
4675 | - _LT_SYS_MODULE_PATH_AIX |
4676 | + _LT_SYS_MODULE_PATH_AIX([$1]) |
4677 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
4678 | # Warning - without using the other run time loading flags, |
4679 | # -berok will link without error, but may produce a broken library. |
4680 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
4681 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
4682 | - # Exported symbols can be pulled into shared objects from archives |
4683 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
4684 | + if test "$with_gnu_ld" = yes; then |
4685 | + # We only use this code for GNU lds that support --whole-archive. |
4686 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
4687 | + else |
4688 | + # Exported symbols can be pulled into shared objects from archives |
4689 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
4690 | + fi |
4691 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
4692 | # This is similar to how AIX traditionally builds its shared |
4693 | # libraries. |
4694 | @@ -5630,28 +6125,75 @@ |
4695 | ;; |
4696 | |
4697 | cygwin* | mingw* | pw32* | cegcc*) |
4698 | - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
4699 | - # as there is no search path for DLLs. |
4700 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
4701 | - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
4702 | - _LT_TAGVAR(always_export_symbols, $1)=no |
4703 | - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
4704 | + case $GXX,$cc_basename in |
4705 | + ,cl* | no,cl*) |
4706 | + # Native MSVC |
4707 | + # hardcode_libdir_flag_spec is actually meaningless, as there is |
4708 | + # no search path for DLLs. |
4709 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
4710 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
4711 | + _LT_TAGVAR(always_export_symbols, $1)=yes |
4712 | + _LT_TAGVAR(file_list_spec, $1)='@' |
4713 | + # Tell ltmain to make .lib files, not .a files. |
4714 | + libext=lib |
4715 | + # Tell ltmain to make .dll files, not .so files. |
4716 | + shrext_cmds=".dll" |
4717 | + # FIXME: Setting linknames here is a bad hack. |
4718 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
4719 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
4720 | + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
4721 | + else |
4722 | + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
4723 | + fi~ |
4724 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
4725 | + linknames=' |
4726 | + # The linker will not automatically build a static lib if we build a DLL. |
4727 | + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
4728 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
4729 | + # Don't use ranlib |
4730 | + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
4731 | + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ |
4732 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
4733 | + case $lt_outputfile in |
4734 | + *.exe|*.EXE) ;; |
4735 | + *) |
4736 | + lt_outputfile="$lt_outputfile.exe" |
4737 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
4738 | + ;; |
4739 | + esac~ |
4740 | + func_to_tool_file "$lt_outputfile"~ |
4741 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
4742 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
4743 | + $RM "$lt_outputfile.manifest"; |
4744 | + fi' |
4745 | + ;; |
4746 | + *) |
4747 | + # g++ |
4748 | + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
4749 | + # as there is no search path for DLLs. |
4750 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
4751 | + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
4752 | + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
4753 | + _LT_TAGVAR(always_export_symbols, $1)=no |
4754 | + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
4755 | |
4756 | - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
4757 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
4758 | - # If the export-symbols file already is a .def file (1st line |
4759 | - # is EXPORTS), use it as is; otherwise, prepend... |
4760 | - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
4761 | - cp $export_symbols $output_objdir/$soname.def; |
4762 | - else |
4763 | - echo EXPORTS > $output_objdir/$soname.def; |
4764 | - cat $export_symbols >> $output_objdir/$soname.def; |
4765 | - fi~ |
4766 | - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
4767 | - else |
4768 | - _LT_TAGVAR(ld_shlibs, $1)=no |
4769 | - fi |
4770 | - ;; |
4771 | + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
4772 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
4773 | + # If the export-symbols file already is a .def file (1st line |
4774 | + # is EXPORTS), use it as is; otherwise, prepend... |
4775 | + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
4776 | + cp $export_symbols $output_objdir/$soname.def; |
4777 | + else |
4778 | + echo EXPORTS > $output_objdir/$soname.def; |
4779 | + cat $export_symbols >> $output_objdir/$soname.def; |
4780 | + fi~ |
4781 | + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
4782 | + else |
4783 | + _LT_TAGVAR(ld_shlibs, $1)=no |
4784 | + fi |
4785 | + ;; |
4786 | + esac |
4787 | + ;; |
4788 | darwin* | rhapsody*) |
4789 | _LT_DARWIN_LINKER_FEATURES($1) |
4790 | ;; |
4791 | @@ -5674,7 +6216,7 @@ |
4792 | esac |
4793 | ;; |
4794 | |
4795 | - freebsd[[12]]*) |
4796 | + freebsd2.*) |
4797 | # C++ shared libraries reported to be fairly broken before |
4798 | # switch to ELF |
4799 | _LT_TAGVAR(ld_shlibs, $1)=no |
4800 | @@ -5693,6 +6235,11 @@ |
4801 | gnu*) |
4802 | ;; |
4803 | |
4804 | + haiku*) |
4805 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4806 | + _LT_TAGVAR(link_all_deplibs, $1)=yes |
4807 | + ;; |
4808 | + |
4809 | hpux9*) |
4810 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
4811 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
4812 | @@ -5717,11 +6264,11 @@ |
4813 | # explicitly linking system object files so we need to strip them |
4814 | # from the output so that they don't get included in the library |
4815 | # dependencies. |
4816 | - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
4817 | + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
4818 | ;; |
4819 | *) |
4820 | if test "$GXX" = yes; then |
4821 | - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4822 | + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4823 | else |
4824 | # FIXME: insert proper C++ library support |
4825 | _LT_TAGVAR(ld_shlibs, $1)=no |
4826 | @@ -5782,7 +6329,7 @@ |
4827 | # explicitly linking system object files so we need to strip them |
4828 | # from the output so that they don't get included in the library |
4829 | # dependencies. |
4830 | - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
4831 | + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
4832 | ;; |
4833 | *) |
4834 | if test "$GXX" = yes; then |
4835 | @@ -5792,10 +6339,10 @@ |
4836 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4837 | ;; |
4838 | ia64*) |
4839 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4840 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4841 | ;; |
4842 | *) |
4843 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4844 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4845 | ;; |
4846 | esac |
4847 | fi |
4848 | @@ -5825,7 +6372,7 @@ |
4849 | case $cc_basename in |
4850 | CC*) |
4851 | # SGI C++ |
4852 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
4853 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
4854 | |
4855 | # Archives containing C++ object files must be created using |
4856 | # "CC -ar", where "CC" is the IRIX C++ compiler. This is |
4857 | @@ -5836,9 +6383,9 @@ |
4858 | *) |
4859 | if test "$GXX" = yes; then |
4860 | if test "$with_gnu_ld" = no; then |
4861 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4862 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4863 | else |
4864 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' |
4865 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' |
4866 | fi |
4867 | fi |
4868 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
4869 | @@ -5849,7 +6396,7 @@ |
4870 | _LT_TAGVAR(inherit_rpath, $1)=yes |
4871 | ;; |
4872 | |
4873 | - linux* | k*bsd*-gnu) |
4874 | + linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4875 | case $cc_basename in |
4876 | KCC*) |
4877 | # Kuck and Associates, Inc. (KAI) C++ Compiler |
4878 | @@ -5867,7 +6414,7 @@ |
4879 | # explicitly linking system object files so we need to strip them |
4880 | # from the output so that they don't get included in the library |
4881 | # dependencies. |
4882 | - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
4883 | + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
4884 | |
4885 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
4886 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
4887 | @@ -5904,26 +6451,26 @@ |
4888 | pgCC* | pgcpp*) |
4889 | # Portland Group C++ compiler |
4890 | case `$CC -V` in |
4891 | - *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) |
4892 | + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) |
4893 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ |
4894 | rm -rf $tpldir~ |
4895 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
4896 | - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' |
4897 | + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
4898 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ |
4899 | rm -rf $tpldir~ |
4900 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
4901 | - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ |
4902 | + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
4903 | $RANLIB $oldlib' |
4904 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ |
4905 | rm -rf $tpldir~ |
4906 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
4907 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
4908 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
4909 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ |
4910 | rm -rf $tpldir~ |
4911 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
4912 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
4913 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
4914 | ;; |
4915 | - *) # Version 6 will use weak symbols |
4916 | + *) # Version 6 and above use weak symbols |
4917 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
4918 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
4919 | ;; |
4920 | @@ -5931,7 +6478,7 @@ |
4921 | |
4922 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' |
4923 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
4924 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4925 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4926 | ;; |
4927 | cxx*) |
4928 | # Compaq C++ |
4929 | @@ -5950,9 +6497,9 @@ |
4930 | # explicitly linking system object files so we need to strip them |
4931 | # from the output so that they don't get included in the library |
4932 | # dependencies. |
4933 | - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
4934 | + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' |
4935 | ;; |
4936 | - xl*) |
4937 | + xl* | mpixl* | bgxl*) |
4938 | # IBM XL 8.0 on PPC, with GNU ld |
4939 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4940 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
4941 | @@ -5972,13 +6519,13 @@ |
4942 | _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
4943 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' |
4944 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
4945 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4946 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4947 | _LT_TAGVAR(compiler_needs_object, $1)=yes |
4948 | |
4949 | # Not sure whether something based on |
4950 | # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 |
4951 | # would be better. |
4952 | - output_verbose_link_cmd='echo' |
4953 | + output_verbose_link_cmd='func_echo_all' |
4954 | |
4955 | # Archives containing C++ object files must be created using |
4956 | # "CC -xar", where "CC" is the Sun C++ compiler. This is |
4957 | @@ -6047,7 +6594,7 @@ |
4958 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
4959 | _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
4960 | fi |
4961 | - output_verbose_link_cmd=echo |
4962 | + output_verbose_link_cmd=func_echo_all |
4963 | else |
4964 | _LT_TAGVAR(ld_shlibs, $1)=no |
4965 | fi |
4966 | @@ -6082,15 +6629,15 @@ |
4967 | case $host in |
4968 | osf3*) |
4969 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
4970 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
4971 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
4972 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
4973 | ;; |
4974 | *) |
4975 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
4976 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
4977 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
4978 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ |
4979 | echo "-hidden">> $lib.exp~ |
4980 | - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ |
4981 | + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ |
4982 | $RM $lib.exp' |
4983 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
4984 | ;; |
4985 | @@ -6106,17 +6653,17 @@ |
4986 | # explicitly linking system object files so we need to strip them |
4987 | # from the output so that they don't get included in the library |
4988 | # dependencies. |
4989 | - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
4990 | + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
4991 | ;; |
4992 | *) |
4993 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
4994 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
4995 | case $host in |
4996 | osf3*) |
4997 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4998 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4999 | ;; |
5000 | *) |
The diff has been truncated for viewing.
Just did a sync. The version from Debian builds fine locally in my amd64 pbuilder, so the Ubuntu delta is no longer necessary.