Merge lp:~logan/ubuntu/quantal/yazpp/new-upstream into lp:ubuntu/quantal/yazpp
- Quantal (12.10)
- new-upstream
- Merge into quantal
Proposed by
Logan Rosen
Status: | Merged |
---|---|
Merged at revision: | 8 |
Proposed branch: | lp:~logan/ubuntu/quantal/yazpp/new-upstream |
Merge into: | lp:ubuntu/quantal/yazpp |
Diff against target: |
6069 lines (+1503/-827) 103 files modified
ChangeLog (+137/-0) IDMETA (+3/-0) Makefile.am (+1/-1) Makefile.in (+49/-21) NEWS (+9/-0) README (+1/-1) aclocal.m4 (+44/-24) buildconf.sh (+1/-0) config.guess (+200/-203) config.sub (+150/-70) config/config.guess (+31/-18) config/config.sub (+39/-26) config/depcomp (+66/-8) config/install-sh (+18/-11) config/ltmain.sh (+57/-38) config/missing (+4/-49) configure (+157/-110) configure.ac (+4/-2) debian/changelog (+6/-0) doc/Makefile.in (+20/-13) doc/NEWS (+6/-0) doc/api.html (+1/-1) doc/common/Makefile.in (+19/-10) doc/common/common.ent (+7/-2) doc/common/style1.css (+1/-1) doc/entities.ent (+1/-1) doc/implementations.html (+1/-1) doc/index.html (+2/-2) doc/installation.html (+1/-1) doc/introduction.html (+1/-1) doc/license.html (+2/-2) doc/windows.html (+1/-1) doc/yazpp-config.1 (+3/-3) doc/zoom-connection.html (+1/-1) doc/zoom-exception.html (+1/-1) doc/zoom-query.html (+1/-1) doc/zoom-record.html (+1/-1) doc/zoom-resultset.html (+1/-1) doc/zoom.html (+1/-1) include/Makefile.in (+14/-11) include/yazpp/Makefile.in (+19/-10) include/yazpp/cql2rpn.h (+1/-1) include/yazpp/gdu.h (+1/-1) include/yazpp/gduqueue.h (+1/-1) include/yazpp/ir-assoc.h (+1/-1) include/yazpp/limit-connect.h (+1/-1) include/yazpp/pdu-assoc.h (+1/-1) include/yazpp/pdu-observer.h (+1/-1) include/yazpp/query.h (+1/-1) include/yazpp/record-cache.h (+1/-1) include/yazpp/socket-manager.h (+2/-1) include/yazpp/socket-observer.h (+1/-1) include/yazpp/timestat.h (+1/-1) include/yazpp/z-assoc.h (+1/-1) include/yazpp/z-databases.h (+1/-1) include/yazpp/z-query.h (+1/-1) include/yazpp/z-server.h (+1/-1) m4/libtool.m4 (+207/-57) m4/ltoptions.m4 (+17/-2) m4/ltversion.m4 (+5/-5) m4/yaz.m4 (+1/-1) src/Makefile.in (+30/-20) src/gdu.cpp (+1/-1) src/gduqueue.cpp (+1/-1) src/limit-connect.cpp (+1/-1) src/pdu-observer.cpp (+1/-1) src/query.cpp (+1/-1) src/socket-observer.cpp (+1/-1) src/timestat.cpp (+1/-1) src/tstquery.cpp (+1/-1) src/yaz-cql2rpn.cpp (+1/-1) src/yaz-ir-assoc.cpp (+1/-1) src/yaz-marc-sample.cpp (+1/-1) src/yaz-my-client.cpp (+1/-1) src/yaz-my-server.cpp (+1/-1) src/yaz-pdu-assoc-thread.cpp (+1/-1) src/yaz-pdu-assoc.cpp (+24/-1) src/yaz-socket-manager.cpp (+39/-19) src/yaz-z-assoc.cpp (+10/-2) src/yaz-z-cache.cpp (+1/-1) src/yaz-z-databases.cpp (+1/-1) src/yaz-z-query.cpp (+1/-1) src/yaz-z-server-ill.cpp (+1/-1) src/yaz-z-server-sr.cpp (+1/-1) src/yaz-z-server-update.cpp (+1/-1) src/yaz-z-server.cpp (+1/-1) src/z-server.cpp (+1/-1) win/makefile (+1/-1) yazpp.spec (+2/-1) zlint/Makefile.in (+13/-8) zlint/test-init-01.cpp (+1/-1) zlint/test-init-02.cpp (+1/-1) zlint/test-init-03.cpp (+1/-1) zlint/test-init-04.cpp (+1/-1) zlint/test-init-05.cpp (+1/-1) zlint/test-init-06.cpp (+1/-1) zlint/test-init-07.cpp (+1/-1) zlint/test-init-08.cpp (+1/-1) zlint/test-scan-01.cpp (+1/-1) zlint/test-search-01.cpp (+1/-1) zlint/zlint.cpp (+1/-1) zlint/zlint.h (+1/-1) zoom/Makefile.in (+21/-12) |
To merge this branch: | bzr merge lp:~logan/ubuntu/quantal/yazpp/new-upstream |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Terry | Approve | ||
Ubuntu branches | Pending | ||
Review via email:
|
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2011-11-20 21:16:52 +0000 |
3 | +++ ChangeLog 2012-06-13 02:33:18 +0000 |
4 | @@ -1,3 +1,140 @@ |
5 | +commit 4abdce174c8a101e84d7014f863ac0f442d78c3b |
6 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
7 | +Date: Wed Apr 25 12:33:33 2012 +0200 |
8 | + |
9 | + Version 1.3.0 |
10 | + |
11 | +commit 1d58071894904fae50f6c577963dbfd4c9b83062 |
12 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
13 | +Date: Wed Apr 25 12:25:43 2012 +0200 |
14 | + |
15 | + SocketManager deals with observers being lost during poll |
16 | + |
17 | +commit 11189d6e01308c7326d8a2c091e61bb79ba38d08 |
18 | +Merge: 5dddeb7 e3dbcaf |
19 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
20 | +Date: Tue Apr 24 14:40:26 2012 +0200 |
21 | + |
22 | + Merge branch 'master' into graceful_stop |
23 | + |
24 | +commit e3dbcafe1fcd29d98138b20dc82e8fc4e80d66d0 |
25 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
26 | +Date: Tue Apr 24 14:28:58 2012 +0200 |
27 | + |
28 | + Do not build for Debian lenny anymore |
29 | + |
30 | +commit 5dddeb732a1409f9787cbdb3ce993f73a47f2dcc |
31 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
32 | +Date: Tue Apr 17 14:45:32 2012 +0200 |
33 | + |
34 | + Add SocketManager::getNumberOfObservers |
35 | + |
36 | + Returns number of observers. |
37 | + |
38 | +commit 70976d316a4bf21f689d2982a362b4acb9d0273f |
39 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
40 | +Date: Tue Apr 10 13:44:06 2012 +0200 |
41 | + |
42 | + Beginnings of graceful stop |
43 | + |
44 | +commit 14f8e7a8011c30a43cfe1220cfecab063479adb4 |
45 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
46 | +Date: Fri Feb 17 15:32:15 2012 +0100 |
47 | + |
48 | + Update doc/common |
49 | + |
50 | +commit 6716ec7295c7361a205cb2dbcd5c8e3af64e8df6 |
51 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
52 | +Date: Thu Feb 2 14:09:29 2012 +0100 |
53 | + |
54 | + Update version in NEWS |
55 | + |
56 | +commit eabbf3fa73f3b7f5b5d01e1525da2d4905a4bbc9 |
57 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
58 | +Date: Thu Feb 2 13:59:12 2012 +0100 |
59 | + |
60 | + Version 1.2.8 |
61 | + |
62 | +commit d021e2044b36127a998108dba8b03c07e32ebd83 |
63 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
64 | +Date: Thu Feb 2 13:59:05 2012 +0100 |
65 | + |
66 | + Bump copyright year |
67 | + |
68 | +commit 8877957e36c071ca8f533f4411cbf12328d820cd |
69 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
70 | +Date: Thu Feb 2 13:56:38 2012 +0100 |
71 | + |
72 | + Document changes |
73 | + |
74 | +commit bed85d2160500f57db63f4ab9d5533e0225cce15 |
75 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
76 | +Date: Mon Jan 23 12:49:38 2012 +0100 |
77 | + |
78 | + Log up to 1K of buffer content if decoding fails |
79 | + |
80 | +commit e661675e0358c69a91c16e8a4e00dafbea1fabf9 |
81 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
82 | +Date: Thu Jan 19 14:43:26 2012 +0100 |
83 | + |
84 | + PDU decode failure: log lead bytes and PDU size |
85 | + |
86 | +commit 8fd53b0694e21f4d287a123daad5d99ce2243c70 |
87 | +Merge: 0084c40 462018a |
88 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
89 | +Date: Wed Jan 11 12:22:49 2012 +0100 |
90 | + |
91 | + Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp |
92 | + |
93 | +commit 0084c40d8bc6babaeb0b833b12d9cd625c807525 |
94 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
95 | +Date: Wed Jan 11 12:22:44 2012 +0100 |
96 | + |
97 | + Happy new year |
98 | + |
99 | +commit 462018a97a5ea237983be1804cdb5b7e162726a8 |
100 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
101 | +Date: Fri Nov 25 14:32:46 2011 +0100 |
102 | + |
103 | + buildconf removes autom4te.cache |
104 | + |
105 | + This is to ensure that software version is not cached but taken |
106 | + from IDMETA as it should. |
107 | + |
108 | +commit 755294703366636fb54eea1ca3371cdcfe9a25c0 |
109 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
110 | +Date: Wed Nov 23 21:33:00 2011 +0100 |
111 | + |
112 | + Remove Ubuntu karmic from build |
113 | + |
114 | +commit fc771cee3f81e165d323053ff95d4f776d26986a |
115 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
116 | +Date: Tue Nov 15 10:23:43 2011 +0100 |
117 | + |
118 | + RPM: get version from IDMETA |
119 | + |
120 | + So we don't need to update the spec file for each release anymore. |
121 | + |
122 | +commit eb27dfba785f4a50d523e89db98c2060428cee03 |
123 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
124 | +Date: Tue Nov 15 10:23:13 2011 +0100 |
125 | + |
126 | + IDMETA part of dist |
127 | + |
128 | +commit e9c4133f031ccad3a9c0af5fa86494aa4196fb10 |
129 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
130 | +Date: Tue Nov 15 10:22:33 2011 +0100 |
131 | + |
132 | + Read version from IDMETA rather than configure.ac. |
133 | + |
134 | + In other words, configure.ac gets its version from IDMETA. |
135 | + |
136 | +commit ad324c2b8432a66ae2fdb9d2cce2456108d61065 |
137 | +Author: Adam Dickmeiss <adam@indexdata.dk> |
138 | +Date: Thu Nov 10 12:48:41 2011 +0100 |
139 | + |
140 | + Update m4 |
141 | + |
142 | commit 616b106aafc7f5cf6a838ab73dd8f6ddc4f14513 |
143 | Author: Adam Dickmeiss <adam@indexdata.dk> |
144 | Date: Fri Aug 12 10:19:57 2011 +0200 |
145 | |
146 | === added file 'IDMETA' |
147 | --- IDMETA 1970-01-01 00:00:00 +0000 |
148 | +++ IDMETA 2012-06-13 02:33:18 +0000 |
149 | @@ -0,0 +1,3 @@ |
150 | +DEBIAN_DIST="wheezy squeeze" |
151 | +UBUNTU_DIST="oneiric natty maverick lucid" |
152 | +VERSION=1.3.0 |
153 | |
154 | === modified file 'Makefile.am' |
155 | --- Makefile.am 2010-09-24 20:56:47 +0000 |
156 | +++ Makefile.am 2012-06-13 02:33:18 +0000 |
157 | @@ -8,7 +8,7 @@ |
158 | aclocal_DATA = m4/yazpp.m4 |
159 | |
160 | SPEC_FILE=$(PACKAGE).spec |
161 | -EXTRA_DIST= $(SPEC_FILE) README LICENSE NEWS \ |
162 | +EXTRA_DIST= $(SPEC_FILE) IDMETA README LICENSE NEWS \ |
163 | yazpp-config.in m4/yaz.m4 m4/yazpp.m4 buildconf.sh Doxyfile.in |
164 | |
165 | dist-hook: |
166 | |
167 | === modified file 'Makefile.in' |
168 | --- Makefile.in 2011-11-20 21:16:52 +0000 |
169 | +++ Makefile.in 2012-06-13 02:33:18 +0000 |
170 | @@ -1,9 +1,9 @@ |
171 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
172 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
173 | # @configure_input@ |
174 | |
175 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
176 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
177 | -# Inc. |
178 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
179 | +# Foundation, Inc. |
180 | # This Makefile.in is free software; the Free Software Foundation |
181 | # gives unlimited permission to copy and/or distribute it, |
182 | # with or without modifications, as long as this notice is preserved. |
183 | @@ -84,6 +84,12 @@ |
184 | am__base_list = \ |
185 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
186 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
187 | +am__uninstall_files_from_dir = { \ |
188 | + test -z "$$files" \ |
189 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
190 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
191 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
192 | + } |
193 | am__installdirs = "$(DESTDIR)$(aclocaldir)" |
194 | DATA = $(aclocal_DATA) |
195 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
196 | @@ -98,9 +104,11 @@ |
197 | distdir = $(PACKAGE)-$(VERSION) |
198 | top_distdir = $(distdir) |
199 | am__remove_distdir = \ |
200 | - { test ! -d "$(distdir)" \ |
201 | - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
202 | - && rm -fr "$(distdir)"; }; } |
203 | + if test -d "$(distdir)"; then \ |
204 | + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
205 | + && rm -rf "$(distdir)" \ |
206 | + || { sleep 5 && rm -rf "$(distdir)"; }; \ |
207 | + else :; fi |
208 | am__relativize = \ |
209 | dir0=`pwd`; \ |
210 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
211 | @@ -129,6 +137,8 @@ |
212 | DIST_ARCHIVES = $(distdir).tar.gz |
213 | GZIP_ENV = --best |
214 | distuninstallcheck_listfiles = find . -type f -print |
215 | +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
216 | + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
217 | distcleancheck_listfiles = find . -type f -print |
218 | ACLOCAL = @ACLOCAL@ |
219 | AMTAR = @AMTAR@ |
220 | @@ -267,13 +277,13 @@ |
221 | aclocaldir = $(datadir)/aclocal |
222 | aclocal_DATA = m4/yazpp.m4 |
223 | SPEC_FILE = $(PACKAGE).spec |
224 | -EXTRA_DIST = $(SPEC_FILE) README LICENSE NEWS \ |
225 | +EXTRA_DIST = $(SPEC_FILE) IDMETA README LICENSE NEWS \ |
226 | yazpp-config.in m4/yaz.m4 m4/yazpp.m4 buildconf.sh Doxyfile.in |
227 | |
228 | all: all-recursive |
229 | |
230 | .SUFFIXES: |
231 | -am--refresh: |
232 | +am--refresh: Makefile |
233 | @: |
234 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
235 | @for dep in $?; do \ |
236 | @@ -337,9 +347,7 @@ |
237 | @$(NORMAL_UNINSTALL) |
238 | @list='$(aclocal_DATA)'; test -n "$(aclocaldir)" || list=; \ |
239 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
240 | - test -n "$$files" || exit 0; \ |
241 | - echo " ( cd '$(DESTDIR)$(aclocaldir)' && rm -f" $$files ")"; \ |
242 | - cd "$(DESTDIR)$(aclocaldir)" && rm -f $$files |
243 | + dir='$(DESTDIR)$(aclocaldir)'; $(am__uninstall_files_from_dir) |
244 | |
245 | # This directory's subdirectories are mostly independent; you can cd |
246 | # into them and run `make' without going through this Makefile. |
247 | @@ -551,7 +559,11 @@ |
248 | $(am__remove_distdir) |
249 | |
250 | dist-bzip2: distdir |
251 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
252 | + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
253 | + $(am__remove_distdir) |
254 | + |
255 | +dist-lzip: distdir |
256 | + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
257 | $(am__remove_distdir) |
258 | |
259 | dist-lzma: distdir |
260 | @@ -559,7 +571,7 @@ |
261 | $(am__remove_distdir) |
262 | |
263 | dist-xz: distdir |
264 | - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
265 | + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
266 | $(am__remove_distdir) |
267 | |
268 | dist-tarZ: distdir |
269 | @@ -590,6 +602,8 @@ |
270 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
271 | *.tar.lzma*) \ |
272 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
273 | + *.tar.lz*) \ |
274 | + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
275 | *.tar.xz*) \ |
276 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
277 | *.tar.Z*) \ |
278 | @@ -609,6 +623,7 @@ |
279 | && am__cwd=`pwd` \ |
280 | && $(am__cd) $(distdir)/_build \ |
281 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
282 | + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
283 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
284 | && $(MAKE) $(AM_MAKEFLAGS) \ |
285 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
286 | @@ -637,8 +652,16 @@ |
287 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
288 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
289 | distuninstallcheck: |
290 | - @$(am__cd) '$(distuninstallcheck_dir)' \ |
291 | - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
292 | + @test -n '$(distuninstallcheck_dir)' || { \ |
293 | + echo 'ERROR: trying to run $@ with an empty' \ |
294 | + '$$(distuninstallcheck_dir)' >&2; \ |
295 | + exit 1; \ |
296 | + }; \ |
297 | + $(am__cd) '$(distuninstallcheck_dir)' || { \ |
298 | + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ |
299 | + exit 1; \ |
300 | + }; \ |
301 | + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ |
302 | || { echo "ERROR: files left after uninstall:" ; \ |
303 | if test -n "$(DESTDIR)"; then \ |
304 | echo " (check DESTDIR support)"; \ |
305 | @@ -672,10 +695,15 @@ |
306 | |
307 | installcheck: installcheck-recursive |
308 | install-strip: |
309 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
310 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
311 | - `test -z '$(STRIP)' || \ |
312 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
313 | + if test -z '$(STRIP)'; then \ |
314 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
315 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
316 | + install; \ |
317 | + else \ |
318 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
319 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
320 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
321 | + fi |
322 | mostlyclean-generic: |
323 | |
324 | clean-generic: |
325 | @@ -763,8 +791,8 @@ |
326 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
327 | all all-am am--refresh check check-am clean clean-generic \ |
328 | clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
329 | - dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \ |
330 | - dist-zip distcheck distclean distclean-generic \ |
331 | + dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \ |
332 | + dist-xz dist-zip distcheck distclean distclean-generic \ |
333 | distclean-libtool distclean-tags distcleancheck distdir \ |
334 | distuninstallcheck dvi dvi-am html html-am info info-am \ |
335 | install install-aclocalDATA install-am install-data \ |
336 | |
337 | === modified file 'NEWS' |
338 | --- NEWS 2011-11-20 21:16:52 +0000 |
339 | +++ NEWS 2012-06-13 02:33:18 +0000 |
340 | @@ -1,3 +1,12 @@ |
341 | +--- 1.3.0 2012/04/25 |
342 | + |
343 | +Add facility to allow a server to close its listener. PDU_Assoc::listen |
344 | +with addr=="" stops listener. |
345 | + |
346 | +--- 1.2.8 2012/02/02 |
347 | + |
348 | +Log incoming HTTP package content if decoding fails. |
349 | + |
350 | --- 1.2.7 2011/08/12 |
351 | |
352 | Force YAZ 4.2.8 because it provides new functionality. |
353 | |
354 | === modified file 'README' |
355 | --- README 2011-11-20 21:16:52 +0000 |
356 | +++ README 2012-06-13 02:33:18 +0000 |
357 | @@ -1,6 +1,6 @@ |
358 | YAZ++ AKA yazpp - A C++ library for YAZ and a ZOOM C++ API. |
359 | |
360 | -Copyright (C) 1998-2011 Index Data |
361 | +Copyright (C) 1998-2012 Index Data |
362 | See the file LICENSE for details. |
363 | |
364 | Introduction |
365 | |
366 | === modified file 'aclocal.m4' |
367 | --- aclocal.m4 2011-11-20 21:16:52 +0000 |
368 | +++ aclocal.m4 2012-06-13 02:33:18 +0000 |
369 | @@ -1,7 +1,8 @@ |
370 | -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- |
371 | +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- |
372 | |
373 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
374 | -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
375 | +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
376 | +# Inc. |
377 | # This file is free software; the Free Software Foundation |
378 | # gives unlimited permission to copy and/or distribute it, |
379 | # with or without modifications, as long as this notice is preserved. |
380 | @@ -19,12 +20,15 @@ |
381 | If you have problems, you may need to regenerate the build system entirely. |
382 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
383 | |
384 | -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
385 | +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software |
386 | +# Foundation, Inc. |
387 | # |
388 | # This file is free software; the Free Software Foundation |
389 | # gives unlimited permission to copy and/or distribute it, |
390 | # with or without modifications, as long as this notice is preserved. |
391 | |
392 | +# serial 1 |
393 | + |
394 | # AM_AUTOMAKE_VERSION(VERSION) |
395 | # ---------------------------- |
396 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
397 | @@ -34,7 +38,7 @@ |
398 | [am__api_version='1.11' |
399 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
400 | dnl require some minimum version. Point them to the right macro. |
401 | -m4_if([$1], [1.11.1], [], |
402 | +m4_if([$1], [1.11.3], [], |
403 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
404 | ]) |
405 | |
406 | @@ -50,19 +54,21 @@ |
407 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
408 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
409 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
410 | -[AM_AUTOMAKE_VERSION([1.11.1])dnl |
411 | +[AM_AUTOMAKE_VERSION([1.11.3])dnl |
412 | m4_ifndef([AC_AUTOCONF_VERSION], |
413 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
414 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
415 | |
416 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
417 | |
418 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
419 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
420 | # |
421 | # This file is free software; the Free Software Foundation |
422 | # gives unlimited permission to copy and/or distribute it, |
423 | # with or without modifications, as long as this notice is preserved. |
424 | |
425 | +# serial 1 |
426 | + |
427 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
428 | # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
429 | # `$srcdir', `$srcdir/..', or `$srcdir/../..'. |
430 | @@ -144,14 +150,14 @@ |
431 | Usually this means the macro was only invoked conditionally.]]) |
432 | fi])]) |
433 | |
434 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 |
435 | -# Free Software Foundation, Inc. |
436 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, |
437 | +# 2010, 2011 Free Software Foundation, Inc. |
438 | # |
439 | # This file is free software; the Free Software Foundation |
440 | # gives unlimited permission to copy and/or distribute it, |
441 | # with or without modifications, as long as this notice is preserved. |
442 | |
443 | -# serial 10 |
444 | +# serial 12 |
445 | |
446 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
447 | # written in clear, in which case automake, when reading aclocal.m4, |
448 | @@ -191,6 +197,7 @@ |
449 | # instance it was reported that on HP-UX the gcc test will end up |
450 | # making a dummy file named `D' -- because `-MD' means `put the output |
451 | # in D'. |
452 | + rm -rf conftest.dir |
453 | mkdir conftest.dir |
454 | # Copy depcomp to subdir because otherwise we won't find it if we're |
455 | # using a relative directory. |
456 | @@ -255,7 +262,7 @@ |
457 | break |
458 | fi |
459 | ;; |
460 | - msvisualcpp | msvcmsys) |
461 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
462 | # This compiler won't grok `-c -o', but also, the minuso test has |
463 | # not run yet. These depmodes are late enough in the game, and |
464 | # so weak that their functioning should not be impacted. |
465 | @@ -320,10 +327,13 @@ |
466 | if test "x$enable_dependency_tracking" != xno; then |
467 | am_depcomp="$ac_aux_dir/depcomp" |
468 | AMDEPBACKSLASH='\' |
469 | + am__nodep='_no' |
470 | fi |
471 | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
472 | AC_SUBST([AMDEPBACKSLASH])dnl |
473 | _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl |
474 | +AC_SUBST([am__nodep])dnl |
475 | +_AM_SUBST_NOTMAKE([am__nodep])dnl |
476 | ]) |
477 | |
478 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
479 | @@ -545,12 +555,15 @@ |
480 | done |
481 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
482 | |
483 | -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. |
484 | +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, |
485 | +# Inc. |
486 | # |
487 | # This file is free software; the Free Software Foundation |
488 | # gives unlimited permission to copy and/or distribute it, |
489 | # with or without modifications, as long as this notice is preserved. |
490 | |
491 | +# serial 1 |
492 | + |
493 | # AM_PROG_INSTALL_SH |
494 | # ------------------ |
495 | # Define $install_sh. |
496 | @@ -682,12 +695,15 @@ |
497 | fi |
498 | ]) |
499 | |
500 | -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
501 | +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, |
502 | +# Inc. |
503 | # |
504 | # This file is free software; the Free Software Foundation |
505 | # gives unlimited permission to copy and/or distribute it, |
506 | # with or without modifications, as long as this notice is preserved. |
507 | |
508 | +# serial 1 |
509 | + |
510 | # AM_PROG_MKDIR_P |
511 | # --------------- |
512 | # Check for `mkdir -p'. |
513 | @@ -710,13 +726,14 @@ |
514 | |
515 | # Helper functions for option handling. -*- Autoconf -*- |
516 | |
517 | -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. |
518 | +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software |
519 | +# Foundation, Inc. |
520 | # |
521 | # This file is free software; the Free Software Foundation |
522 | # gives unlimited permission to copy and/or distribute it, |
523 | # with or without modifications, as long as this notice is preserved. |
524 | |
525 | -# serial 4 |
526 | +# serial 5 |
527 | |
528 | # _AM_MANGLE_OPTION(NAME) |
529 | # ----------------------- |
530 | @@ -724,13 +741,13 @@ |
531 | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) |
532 | |
533 | # _AM_SET_OPTION(NAME) |
534 | -# ------------------------------ |
535 | +# -------------------- |
536 | # Set option NAME. Presently that only means defining a flag for this option. |
537 | AC_DEFUN([_AM_SET_OPTION], |
538 | [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) |
539 | |
540 | # _AM_SET_OPTIONS(OPTIONS) |
541 | -# ---------------------------------- |
542 | +# ------------------------ |
543 | # OPTIONS is a space-separated list of Automake options. |
544 | AC_DEFUN([_AM_SET_OPTIONS], |
545 | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
546 | @@ -806,12 +823,14 @@ |
547 | fi |
548 | AC_MSG_RESULT(yes)]) |
549 | |
550 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
551 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
552 | # |
553 | # This file is free software; the Free Software Foundation |
554 | # gives unlimited permission to copy and/or distribute it, |
555 | # with or without modifications, as long as this notice is preserved. |
556 | |
557 | +# serial 1 |
558 | + |
559 | # AM_PROG_INSTALL_STRIP |
560 | # --------------------- |
561 | # One issue with vendor `install' (even GNU) is that you can't |
562 | @@ -834,13 +853,13 @@ |
563 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
564 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
565 | |
566 | -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. |
567 | +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. |
568 | # |
569 | # This file is free software; the Free Software Foundation |
570 | # gives unlimited permission to copy and/or distribute it, |
571 | # with or without modifications, as long as this notice is preserved. |
572 | |
573 | -# serial 2 |
574 | +# serial 3 |
575 | |
576 | # _AM_SUBST_NOTMAKE(VARIABLE) |
577 | # --------------------------- |
578 | @@ -849,13 +868,13 @@ |
579 | AC_DEFUN([_AM_SUBST_NOTMAKE]) |
580 | |
581 | # AM_SUBST_NOTMAKE(VARIABLE) |
582 | -# --------------------------- |
583 | +# -------------------------- |
584 | # Public sister of _AM_SUBST_NOTMAKE. |
585 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
586 | |
587 | # Check how to create a tarball. -*- Autoconf -*- |
588 | |
589 | -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. |
590 | +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. |
591 | # |
592 | # This file is free software; the Free Software Foundation |
593 | # gives unlimited permission to copy and/or distribute it, |
594 | @@ -877,10 +896,11 @@ |
595 | # a tarball read from stdin. |
596 | # $(am__untar) < result.tar |
597 | AC_DEFUN([_AM_PROG_TAR], |
598 | -[# Always define AMTAR for backward compatibility. |
599 | -AM_MISSING_PROG([AMTAR], [tar]) |
600 | +[# Always define AMTAR for backward compatibility. Yes, it's still used |
601 | +# in the wild :-( We should find a proper way to deprecate it ... |
602 | +AC_SUBST([AMTAR], ['$${TAR-tar}']) |
603 | m4_if([$1], [v7], |
604 | - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], |
605 | + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
606 | [m4_case([$1], [ustar],, [pax],, |
607 | [m4_fatal([Unknown tar format])]) |
608 | AC_MSG_CHECKING([how to create a $1 tar archive]) |
609 | |
610 | === modified file 'buildconf.sh' |
611 | --- buildconf.sh 2011-11-20 21:16:52 +0000 |
612 | +++ buildconf.sh 2012-06-13 02:33:18 +0000 |
613 | @@ -6,6 +6,7 @@ |
614 | libtoolize=libtoolize |
615 | autoheader=autoheader |
616 | |
617 | +test -d autom4te.cache && rm -r autom4te.cache |
618 | test -d config || mkdir config |
619 | if [ -d .git ]; then |
620 | git submodule init |
621 | |
622 | === modified file 'config.guess' |
623 | --- config.guess 2011-11-20 21:16:52 +0000 |
624 | +++ config.guess 2012-06-13 02:33:18 +0000 |
625 | @@ -1,10 +1,10 @@ |
626 | #! /bin/sh |
627 | # Attempt to guess a canonical system name. |
628 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
629 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
630 | -# Free Software Foundation, Inc. |
631 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
632 | +# 2011, 2012 Free Software Foundation, Inc. |
633 | |
634 | -timestamp='2009-06-10' |
635 | +timestamp='2012-02-10' |
636 | |
637 | # This file is free software; you can redistribute it and/or modify it |
638 | # under the terms of the GNU General Public License as published by |
639 | @@ -17,9 +17,7 @@ |
640 | # General Public License for more details. |
641 | # |
642 | # You should have received a copy of the GNU General Public License |
643 | -# along with this program; if not, write to the Free Software |
644 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
645 | -# 02110-1301, USA. |
646 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
647 | # |
648 | # As a special exception to the GNU General Public License, if you |
649 | # distribute this file as part of a program that contains a |
650 | @@ -27,16 +25,16 @@ |
651 | # the same distribution terms that you use for the rest of that program. |
652 | |
653 | |
654 | -# Originally written by Per Bothner <per@bothner.com>. |
655 | -# Please send patches to <config-patches@gnu.org>. Submit a context |
656 | -# diff and a properly formatted ChangeLog entry. |
657 | +# Originally written by Per Bothner. Please send patches (context |
658 | +# diff format) to <config-patches@gnu.org> and include a ChangeLog |
659 | +# entry. |
660 | # |
661 | # This script attempts to guess a canonical system name similar to |
662 | # config.sub. If it succeeds, it prints the system name on stdout, and |
663 | # exits with 0. Otherwise, it exits with 1. |
664 | # |
665 | -# The plan is that this can be called by configure scripts if you |
666 | -# don't specify an explicit build system type. |
667 | +# You can get the latest version of this script from: |
668 | +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
669 | |
670 | me=`echo "$0" | sed -e 's,.*/,,'` |
671 | |
672 | @@ -56,8 +54,9 @@ |
673 | GNU config.guess ($timestamp) |
674 | |
675 | Originally written by Per Bothner. |
676 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
677 | -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
678 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
679 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
680 | +Free Software Foundation, Inc. |
681 | |
682 | This is free software; see the source for copying conditions. There is NO |
683 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
684 | @@ -144,7 +143,7 @@ |
685 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
686 | *:NetBSD:*:*) |
687 | # NetBSD (nbsd) targets should (where applicable) match one or |
688 | - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, |
689 | + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
690 | # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently |
691 | # switched to ELF, *-*-netbsd* would select the old |
692 | # object file format. This provides both forward |
693 | @@ -180,7 +179,7 @@ |
694 | fi |
695 | ;; |
696 | *) |
697 | - os=netbsd |
698 | + os=netbsd |
699 | ;; |
700 | esac |
701 | # The OS release |
702 | @@ -223,7 +222,7 @@ |
703 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
704 | ;; |
705 | *5.*) |
706 | - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
707 | + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
708 | ;; |
709 | esac |
710 | # According to Compaq, /usr/sbin/psrinfo has been available on |
711 | @@ -269,7 +268,10 @@ |
712 | # A Xn.n version is an unreleased experimental baselevel. |
713 | # 1.2 uses "1.2" for uname -r. |
714 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
715 | - exit ;; |
716 | + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
717 | + exitcode=$? |
718 | + trap '' 0 |
719 | + exit $exitcode ;; |
720 | Alpha\ *:Windows_NT*:*) |
721 | # How do we know it's Interix rather than the generic POSIX subsystem? |
722 | # Should we change UNAME_MACHINE based on the output of uname instead |
723 | @@ -295,7 +297,7 @@ |
724 | echo s390-ibm-zvmoe |
725 | exit ;; |
726 | *:OS400:*:*) |
727 | - echo powerpc-ibm-os400 |
728 | + echo powerpc-ibm-os400 |
729 | exit ;; |
730 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
731 | echo arm-acorn-riscix${UNAME_RELEASE} |
732 | @@ -333,6 +335,9 @@ |
733 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
734 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
735 | exit ;; |
736 | + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) |
737 | + echo i386-pc-auroraux${UNAME_RELEASE} |
738 | + exit ;; |
739 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
740 | eval $set_cc_for_build |
741 | SUN_ARCH="i386" |
742 | @@ -391,23 +396,23 @@ |
743 | # MiNT. But MiNT is downward compatible to TOS, so this should |
744 | # be no problem. |
745 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
746 | - echo m68k-atari-mint${UNAME_RELEASE} |
747 | + echo m68k-atari-mint${UNAME_RELEASE} |
748 | exit ;; |
749 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
750 | echo m68k-atari-mint${UNAME_RELEASE} |
751 | - exit ;; |
752 | + exit ;; |
753 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
754 | - echo m68k-atari-mint${UNAME_RELEASE} |
755 | + echo m68k-atari-mint${UNAME_RELEASE} |
756 | exit ;; |
757 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
758 | - echo m68k-milan-mint${UNAME_RELEASE} |
759 | - exit ;; |
760 | + echo m68k-milan-mint${UNAME_RELEASE} |
761 | + exit ;; |
762 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
763 | - echo m68k-hades-mint${UNAME_RELEASE} |
764 | - exit ;; |
765 | + echo m68k-hades-mint${UNAME_RELEASE} |
766 | + exit ;; |
767 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
768 | - echo m68k-unknown-mint${UNAME_RELEASE} |
769 | - exit ;; |
770 | + echo m68k-unknown-mint${UNAME_RELEASE} |
771 | + exit ;; |
772 | m68k:machten:*:*) |
773 | echo m68k-apple-machten${UNAME_RELEASE} |
774 | exit ;; |
775 | @@ -477,8 +482,8 @@ |
776 | echo m88k-motorola-sysv3 |
777 | exit ;; |
778 | AViiON:dgux:*:*) |
779 | - # DG/UX returns AViiON for all architectures |
780 | - UNAME_PROCESSOR=`/usr/bin/uname -p` |
781 | + # DG/UX returns AViiON for all architectures |
782 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
783 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
784 | then |
785 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
786 | @@ -491,7 +496,7 @@ |
787 | else |
788 | echo i586-dg-dgux${UNAME_RELEASE} |
789 | fi |
790 | - exit ;; |
791 | + exit ;; |
792 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
793 | echo m88k-dolphin-sysv3 |
794 | exit ;; |
795 | @@ -548,7 +553,7 @@ |
796 | echo rs6000-ibm-aix3.2 |
797 | fi |
798 | exit ;; |
799 | - *:AIX:*:[456]) |
800 | + *:AIX:*:[4567]) |
801 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
802 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
803 | IBM_ARCH=rs6000 |
804 | @@ -591,52 +596,52 @@ |
805 | 9000/[678][0-9][0-9]) |
806 | if [ -x /usr/bin/getconf ]; then |
807 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
808 | - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
809 | - case "${sc_cpu_version}" in |
810 | - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
811 | - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
812 | - 532) # CPU_PA_RISC2_0 |
813 | - case "${sc_kernel_bits}" in |
814 | - 32) HP_ARCH="hppa2.0n" ;; |
815 | - 64) HP_ARCH="hppa2.0w" ;; |
816 | + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
817 | + case "${sc_cpu_version}" in |
818 | + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
819 | + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
820 | + 532) # CPU_PA_RISC2_0 |
821 | + case "${sc_kernel_bits}" in |
822 | + 32) HP_ARCH="hppa2.0n" ;; |
823 | + 64) HP_ARCH="hppa2.0w" ;; |
824 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
825 | - esac ;; |
826 | - esac |
827 | + esac ;; |
828 | + esac |
829 | fi |
830 | if [ "${HP_ARCH}" = "" ]; then |
831 | eval $set_cc_for_build |
832 | - sed 's/^ //' << EOF >$dummy.c |
833 | - |
834 | - #define _HPUX_SOURCE |
835 | - #include <stdlib.h> |
836 | - #include <unistd.h> |
837 | - |
838 | - int main () |
839 | - { |
840 | - #if defined(_SC_KERNEL_BITS) |
841 | - long bits = sysconf(_SC_KERNEL_BITS); |
842 | - #endif |
843 | - long cpu = sysconf (_SC_CPU_VERSION); |
844 | - |
845 | - switch (cpu) |
846 | - { |
847 | - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
848 | - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
849 | - case CPU_PA_RISC2_0: |
850 | - #if defined(_SC_KERNEL_BITS) |
851 | - switch (bits) |
852 | - { |
853 | - case 64: puts ("hppa2.0w"); break; |
854 | - case 32: puts ("hppa2.0n"); break; |
855 | - default: puts ("hppa2.0"); break; |
856 | - } break; |
857 | - #else /* !defined(_SC_KERNEL_BITS) */ |
858 | - puts ("hppa2.0"); break; |
859 | - #endif |
860 | - default: puts ("hppa1.0"); break; |
861 | - } |
862 | - exit (0); |
863 | - } |
864 | + sed 's/^ //' << EOF >$dummy.c |
865 | + |
866 | + #define _HPUX_SOURCE |
867 | + #include <stdlib.h> |
868 | + #include <unistd.h> |
869 | + |
870 | + int main () |
871 | + { |
872 | + #if defined(_SC_KERNEL_BITS) |
873 | + long bits = sysconf(_SC_KERNEL_BITS); |
874 | + #endif |
875 | + long cpu = sysconf (_SC_CPU_VERSION); |
876 | + |
877 | + switch (cpu) |
878 | + { |
879 | + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
880 | + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
881 | + case CPU_PA_RISC2_0: |
882 | + #if defined(_SC_KERNEL_BITS) |
883 | + switch (bits) |
884 | + { |
885 | + case 64: puts ("hppa2.0w"); break; |
886 | + case 32: puts ("hppa2.0n"); break; |
887 | + default: puts ("hppa2.0"); break; |
888 | + } break; |
889 | + #else /* !defined(_SC_KERNEL_BITS) */ |
890 | + puts ("hppa2.0"); break; |
891 | + #endif |
892 | + default: puts ("hppa1.0"); break; |
893 | + } |
894 | + exit (0); |
895 | + } |
896 | EOF |
897 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
898 | test -z "$HP_ARCH" && HP_ARCH=hppa |
899 | @@ -727,22 +732,22 @@ |
900 | exit ;; |
901 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
902 | echo c1-convex-bsd |
903 | - exit ;; |
904 | + exit ;; |
905 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
906 | if getsysinfo -f scalar_acc |
907 | then echo c32-convex-bsd |
908 | else echo c2-convex-bsd |
909 | fi |
910 | - exit ;; |
911 | + exit ;; |
912 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
913 | echo c34-convex-bsd |
914 | - exit ;; |
915 | + exit ;; |
916 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
917 | echo c38-convex-bsd |
918 | - exit ;; |
919 | + exit ;; |
920 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
921 | echo c4-convex-bsd |
922 | - exit ;; |
923 | + exit ;; |
924 | CRAY*Y-MP:*:*:*) |
925 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
926 | exit ;; |
927 | @@ -766,14 +771,14 @@ |
928 | exit ;; |
929 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
930 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
931 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
932 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
933 | - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
934 | - exit ;; |
935 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
936 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
937 | + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
938 | + exit ;; |
939 | 5000:UNIX_System_V:4.*:*) |
940 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
941 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
942 | - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
943 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
944 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
945 | + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
946 | exit ;; |
947 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
948 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
949 | @@ -785,13 +790,12 @@ |
950 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
951 | exit ;; |
952 | *:FreeBSD:*:*) |
953 | - case ${UNAME_MACHINE} in |
954 | - pc98) |
955 | - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
956 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
957 | + case ${UNAME_PROCESSOR} in |
958 | amd64) |
959 | echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
960 | *) |
961 | - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
962 | + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
963 | esac |
964 | exit ;; |
965 | i*:CYGWIN*:*) |
966 | @@ -800,19 +804,22 @@ |
967 | *:MINGW*:*) |
968 | echo ${UNAME_MACHINE}-pc-mingw32 |
969 | exit ;; |
970 | + i*:MSYS*:*) |
971 | + echo ${UNAME_MACHINE}-pc-msys |
972 | + exit ;; |
973 | i*:windows32*:*) |
974 | - # uname -m includes "-pc" on this system. |
975 | - echo ${UNAME_MACHINE}-mingw32 |
976 | + # uname -m includes "-pc" on this system. |
977 | + echo ${UNAME_MACHINE}-mingw32 |
978 | exit ;; |
979 | i*:PW*:*) |
980 | echo ${UNAME_MACHINE}-pc-pw32 |
981 | exit ;; |
982 | - *:Interix*:[3456]*) |
983 | - case ${UNAME_MACHINE} in |
984 | + *:Interix*:*) |
985 | + case ${UNAME_MACHINE} in |
986 | x86) |
987 | echo i586-pc-interix${UNAME_RELEASE} |
988 | exit ;; |
989 | - EM64T | authenticamd | genuineintel) |
990 | + authenticamd | genuineintel | EM64T) |
991 | echo x86_64-unknown-interix${UNAME_RELEASE} |
992 | exit ;; |
993 | IA64) |
994 | @@ -854,6 +861,27 @@ |
995 | i*86:Minix:*:*) |
996 | echo ${UNAME_MACHINE}-pc-minix |
997 | exit ;; |
998 | + aarch64:Linux:*:*) |
999 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1000 | + exit ;; |
1001 | + aarch64_be:Linux:*:*) |
1002 | + UNAME_MACHINE=aarch64_be |
1003 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1004 | + exit ;; |
1005 | + alpha:Linux:*:*) |
1006 | + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
1007 | + EV5) UNAME_MACHINE=alphaev5 ;; |
1008 | + EV56) UNAME_MACHINE=alphaev56 ;; |
1009 | + PCA56) UNAME_MACHINE=alphapca56 ;; |
1010 | + PCA57) UNAME_MACHINE=alphapca56 ;; |
1011 | + EV6) UNAME_MACHINE=alphaev6 ;; |
1012 | + EV67) UNAME_MACHINE=alphaev67 ;; |
1013 | + EV68*) UNAME_MACHINE=alphaev68 ;; |
1014 | + esac |
1015 | + objdump --private-headers /bin/sh | grep -q ld.so.1 |
1016 | + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
1017 | + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
1018 | + exit ;; |
1019 | arm*:Linux:*:*) |
1020 | eval $set_cc_for_build |
1021 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
1022 | @@ -861,20 +889,40 @@ |
1023 | then |
1024 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1025 | else |
1026 | - echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
1027 | + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
1028 | + | grep -q __ARM_PCS_VFP |
1029 | + then |
1030 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
1031 | + else |
1032 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf |
1033 | + fi |
1034 | fi |
1035 | exit ;; |
1036 | avr32*:Linux:*:*) |
1037 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1038 | exit ;; |
1039 | cris:Linux:*:*) |
1040 | - echo cris-axis-linux-gnu |
1041 | + echo ${UNAME_MACHINE}-axis-linux-gnu |
1042 | exit ;; |
1043 | crisv32:Linux:*:*) |
1044 | - echo crisv32-axis-linux-gnu |
1045 | + echo ${UNAME_MACHINE}-axis-linux-gnu |
1046 | exit ;; |
1047 | frv:Linux:*:*) |
1048 | - echo frv-unknown-linux-gnu |
1049 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1050 | + exit ;; |
1051 | + hexagon:Linux:*:*) |
1052 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1053 | + exit ;; |
1054 | + i*86:Linux:*:*) |
1055 | + LIBC=gnu |
1056 | + eval $set_cc_for_build |
1057 | + sed 's/^ //' << EOF >$dummy.c |
1058 | + #ifdef __dietlibc__ |
1059 | + LIBC=dietlibc |
1060 | + #endif |
1061 | +EOF |
1062 | + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
1063 | + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
1064 | exit ;; |
1065 | ia64:Linux:*:*) |
1066 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1067 | @@ -901,39 +949,18 @@ |
1068 | #endif |
1069 | #endif |
1070 | EOF |
1071 | - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' |
1072 | - /^CPU/{ |
1073 | - s: ::g |
1074 | - p |
1075 | - }'`" |
1076 | + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
1077 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
1078 | ;; |
1079 | or32:Linux:*:*) |
1080 | - echo or32-unknown-linux-gnu |
1081 | - exit ;; |
1082 | - ppc:Linux:*:*) |
1083 | - echo powerpc-unknown-linux-gnu |
1084 | - exit ;; |
1085 | - ppc64:Linux:*:*) |
1086 | - echo powerpc64-unknown-linux-gnu |
1087 | - exit ;; |
1088 | - alpha:Linux:*:*) |
1089 | - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
1090 | - EV5) UNAME_MACHINE=alphaev5 ;; |
1091 | - EV56) UNAME_MACHINE=alphaev56 ;; |
1092 | - PCA56) UNAME_MACHINE=alphapca56 ;; |
1093 | - PCA57) UNAME_MACHINE=alphapca56 ;; |
1094 | - EV6) UNAME_MACHINE=alphaev6 ;; |
1095 | - EV67) UNAME_MACHINE=alphaev67 ;; |
1096 | - EV68*) UNAME_MACHINE=alphaev68 ;; |
1097 | - esac |
1098 | - objdump --private-headers /bin/sh | grep -q ld.so.1 |
1099 | - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
1100 | - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
1101 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1102 | exit ;; |
1103 | padre:Linux:*:*) |
1104 | echo sparc-unknown-linux-gnu |
1105 | exit ;; |
1106 | + parisc64:Linux:*:* | hppa64:Linux:*:*) |
1107 | + echo hppa64-unknown-linux-gnu |
1108 | + exit ;; |
1109 | parisc:Linux:*:* | hppa:Linux:*:*) |
1110 | # Look for CPU level |
1111 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
1112 | @@ -942,14 +969,17 @@ |
1113 | *) echo hppa-unknown-linux-gnu ;; |
1114 | esac |
1115 | exit ;; |
1116 | - parisc64:Linux:*:* | hppa64:Linux:*:*) |
1117 | - echo hppa64-unknown-linux-gnu |
1118 | + ppc64:Linux:*:*) |
1119 | + echo powerpc64-unknown-linux-gnu |
1120 | + exit ;; |
1121 | + ppc:Linux:*:*) |
1122 | + echo powerpc-unknown-linux-gnu |
1123 | exit ;; |
1124 | s390:Linux:*:* | s390x:Linux:*:*) |
1125 | echo ${UNAME_MACHINE}-ibm-linux |
1126 | exit ;; |
1127 | sh64*:Linux:*:*) |
1128 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1129 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1130 | exit ;; |
1131 | sh*:Linux:*:*) |
1132 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1133 | @@ -957,67 +987,18 @@ |
1134 | sparc:Linux:*:* | sparc64:Linux:*:*) |
1135 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1136 | exit ;; |
1137 | + tile*:Linux:*:*) |
1138 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1139 | + exit ;; |
1140 | vax:Linux:*:*) |
1141 | echo ${UNAME_MACHINE}-dec-linux-gnu |
1142 | exit ;; |
1143 | x86_64:Linux:*:*) |
1144 | - echo x86_64-unknown-linux-gnu |
1145 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1146 | exit ;; |
1147 | xtensa*:Linux:*:*) |
1148 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1149 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1150 | exit ;; |
1151 | - i*86:Linux:*:*) |
1152 | - # The BFD linker knows what the default object file format is, so |
1153 | - # first see if it will tell us. cd to the root directory to prevent |
1154 | - # problems with other programs or directories called `ld' in the path. |
1155 | - # Set LC_ALL=C to ensure ld outputs messages in English. |
1156 | - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ |
1157 | - | sed -ne '/supported targets:/!d |
1158 | - s/[ ][ ]*/ /g |
1159 | - s/.*supported targets: *// |
1160 | - s/ .*// |
1161 | - p'` |
1162 | - case "$ld_supported_targets" in |
1163 | - elf32-i386) |
1164 | - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" |
1165 | - ;; |
1166 | - esac |
1167 | - # Determine whether the default compiler is a.out or elf |
1168 | - eval $set_cc_for_build |
1169 | - sed 's/^ //' << EOF >$dummy.c |
1170 | - #include <features.h> |
1171 | - #ifdef __ELF__ |
1172 | - # ifdef __GLIBC__ |
1173 | - # if __GLIBC__ >= 2 |
1174 | - LIBC=gnu |
1175 | - # else |
1176 | - LIBC=gnulibc1 |
1177 | - # endif |
1178 | - # else |
1179 | - LIBC=gnulibc1 |
1180 | - # endif |
1181 | - #else |
1182 | - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) |
1183 | - LIBC=gnu |
1184 | - #else |
1185 | - LIBC=gnuaout |
1186 | - #endif |
1187 | - #endif |
1188 | - #ifdef __dietlibc__ |
1189 | - LIBC=dietlibc |
1190 | - #endif |
1191 | -EOF |
1192 | - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' |
1193 | - /^LIBC/{ |
1194 | - s: ::g |
1195 | - p |
1196 | - }'`" |
1197 | - test x"${LIBC}" != x && { |
1198 | - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
1199 | - exit |
1200 | - } |
1201 | - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } |
1202 | - ;; |
1203 | i*86:DYNIX/ptx:4*:*) |
1204 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
1205 | # earlier versions are messed up and put the nodename in both |
1206 | @@ -1025,11 +1006,11 @@ |
1207 | echo i386-sequent-sysv4 |
1208 | exit ;; |
1209 | i*86:UNIX_SV:4.2MP:2.*) |
1210 | - # Unixware is an offshoot of SVR4, but it has its own version |
1211 | - # number series starting with 2... |
1212 | - # I am not positive that other SVR4 systems won't match this, |
1213 | + # Unixware is an offshoot of SVR4, but it has its own version |
1214 | + # number series starting with 2... |
1215 | + # I am not positive that other SVR4 systems won't match this, |
1216 | # I just have to hope. -- rms. |
1217 | - # Use sysv4.2uw... so that sysv4* matches it. |
1218 | + # Use sysv4.2uw... so that sysv4* matches it. |
1219 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
1220 | exit ;; |
1221 | i*86:OS/2:*:*) |
1222 | @@ -1061,7 +1042,7 @@ |
1223 | fi |
1224 | exit ;; |
1225 | i*86:*:5:[678]*) |
1226 | - # UnixWare 7.x, OpenUNIX and OpenServer 6. |
1227 | + # UnixWare 7.x, OpenUNIX and OpenServer 6. |
1228 | case `/bin/uname -X | grep "^Machine"` in |
1229 | *486*) UNAME_MACHINE=i486 ;; |
1230 | *Pentium) UNAME_MACHINE=i586 ;; |
1231 | @@ -1089,13 +1070,13 @@ |
1232 | exit ;; |
1233 | pc:*:*:*) |
1234 | # Left here for compatibility: |
1235 | - # uname -m prints for DJGPP always 'pc', but it prints nothing about |
1236 | - # the processor, so we play safe by assuming i586. |
1237 | + # uname -m prints for DJGPP always 'pc', but it prints nothing about |
1238 | + # the processor, so we play safe by assuming i586. |
1239 | # Note: whatever this is, it MUST be the same as what config.sub |
1240 | # prints for the "djgpp" host, or else GDB configury will decide that |
1241 | # this is a cross-build. |
1242 | echo i586-pc-msdosdjgpp |
1243 | - exit ;; |
1244 | + exit ;; |
1245 | Intel:Mach:3*:*) |
1246 | echo i386-pc-mach3 |
1247 | exit ;; |
1248 | @@ -1130,8 +1111,8 @@ |
1249 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
1250 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
1251 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
1252 | - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1253 | - && { echo i486-ncr-sysv4; exit; } ;; |
1254 | + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1255 | + && { echo i486-ncr-sysv4; exit; } ;; |
1256 | NCR*:*:4.2:* | MPRAS*:*:4.2:*) |
1257 | OS_REL='.3' |
1258 | test -r /etc/.relid \ |
1259 | @@ -1174,10 +1155,10 @@ |
1260 | echo ns32k-sni-sysv |
1261 | fi |
1262 | exit ;; |
1263 | - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
1264 | - # says <Richard.M.Bartel@ccMail.Census.GOV> |
1265 | - echo i586-unisys-sysv4 |
1266 | - exit ;; |
1267 | + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
1268 | + # says <Richard.M.Bartel@ccMail.Census.GOV> |
1269 | + echo i586-unisys-sysv4 |
1270 | + exit ;; |
1271 | *:UNIX_System_V:4*:FTX*) |
1272 | # From Gerald Hewes <hewes@openmarket.com>. |
1273 | # How about differentiating between stratus architectures? -djm |
1274 | @@ -1203,11 +1184,11 @@ |
1275 | exit ;; |
1276 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
1277 | if [ -d /usr/nec ]; then |
1278 | - echo mips-nec-sysv${UNAME_RELEASE} |
1279 | + echo mips-nec-sysv${UNAME_RELEASE} |
1280 | else |
1281 | - echo mips-unknown-sysv${UNAME_RELEASE} |
1282 | + echo mips-unknown-sysv${UNAME_RELEASE} |
1283 | fi |
1284 | - exit ;; |
1285 | + exit ;; |
1286 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
1287 | echo powerpc-be-beos |
1288 | exit ;; |
1289 | @@ -1247,6 +1228,16 @@ |
1290 | *:Darwin:*:*) |
1291 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
1292 | case $UNAME_PROCESSOR in |
1293 | + i386) |
1294 | + eval $set_cc_for_build |
1295 | + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
1296 | + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
1297 | + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
1298 | + grep IS_64BIT_ARCH >/dev/null |
1299 | + then |
1300 | + UNAME_PROCESSOR="x86_64" |
1301 | + fi |
1302 | + fi ;; |
1303 | unknown) UNAME_PROCESSOR=powerpc ;; |
1304 | esac |
1305 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
1306 | @@ -1262,6 +1253,9 @@ |
1307 | *:QNX:*:4*) |
1308 | echo i386-pc-qnx |
1309 | exit ;; |
1310 | + NEO-?:NONSTOP_KERNEL:*:*) |
1311 | + echo neo-tandem-nsk${UNAME_RELEASE} |
1312 | + exit ;; |
1313 | NSE-?:NONSTOP_KERNEL:*:*) |
1314 | echo nse-tandem-nsk${UNAME_RELEASE} |
1315 | exit ;; |
1316 | @@ -1307,13 +1301,13 @@ |
1317 | echo pdp10-unknown-its |
1318 | exit ;; |
1319 | SEI:*:*:SEIUX) |
1320 | - echo mips-sei-seiux${UNAME_RELEASE} |
1321 | + echo mips-sei-seiux${UNAME_RELEASE} |
1322 | exit ;; |
1323 | *:DragonFly:*:*) |
1324 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
1325 | exit ;; |
1326 | *:*VMS:*:*) |
1327 | - UNAME_MACHINE=`(uname -p) 2>/dev/null` |
1328 | + UNAME_MACHINE=`(uname -p) 2>/dev/null` |
1329 | case "${UNAME_MACHINE}" in |
1330 | A*) echo alpha-dec-vms ; exit ;; |
1331 | I*) echo ia64-dec-vms ; exit ;; |
1332 | @@ -1331,6 +1325,9 @@ |
1333 | i*86:AROS:*:*) |
1334 | echo ${UNAME_MACHINE}-pc-aros |
1335 | exit ;; |
1336 | + x86_64:VMkernel:*:*) |
1337 | + echo ${UNAME_MACHINE}-unknown-esx |
1338 | + exit ;; |
1339 | esac |
1340 | |
1341 | #echo '(No uname command or uname output not recognized.)' 1>&2 |
1342 | @@ -1353,11 +1350,11 @@ |
1343 | #include <sys/param.h> |
1344 | printf ("m68k-sony-newsos%s\n", |
1345 | #ifdef NEWSOS4 |
1346 | - "4" |
1347 | + "4" |
1348 | #else |
1349 | - "" |
1350 | + "" |
1351 | #endif |
1352 | - ); exit (0); |
1353 | + ); exit (0); |
1354 | #endif |
1355 | #endif |
1356 | |
1357 | |
1358 | === modified file 'config.sub' |
1359 | --- config.sub 2011-11-20 21:16:52 +0000 |
1360 | +++ config.sub 2012-06-13 02:33:18 +0000 |
1361 | @@ -1,10 +1,10 @@ |
1362 | #! /bin/sh |
1363 | # Configuration validation subroutine script. |
1364 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
1365 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
1366 | -# Free Software Foundation, Inc. |
1367 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
1368 | +# 2011, 2012 Free Software Foundation, Inc. |
1369 | |
1370 | -timestamp='2009-06-11' |
1371 | +timestamp='2012-02-10' |
1372 | |
1373 | # This file is (in principle) common to ALL GNU software. |
1374 | # The presence of a machine in this file suggests that SOME GNU software |
1375 | @@ -21,9 +21,7 @@ |
1376 | # GNU General Public License for more details. |
1377 | # |
1378 | # You should have received a copy of the GNU General Public License |
1379 | -# along with this program; if not, write to the Free Software |
1380 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
1381 | -# 02110-1301, USA. |
1382 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
1383 | # |
1384 | # As a special exception to the GNU General Public License, if you |
1385 | # distribute this file as part of a program that contains a |
1386 | @@ -32,13 +30,16 @@ |
1387 | |
1388 | |
1389 | # Please send patches to <config-patches@gnu.org>. Submit a context |
1390 | -# diff and a properly formatted ChangeLog entry. |
1391 | +# diff and a properly formatted GNU ChangeLog entry. |
1392 | # |
1393 | # Configuration subroutine to validate and canonicalize a configuration type. |
1394 | # Supply the specified configuration type as an argument. |
1395 | # If it is invalid, we print an error message on stderr and exit with code 1. |
1396 | # Otherwise, we print the canonical config type on stdout and succeed. |
1397 | |
1398 | +# You can get the latest version of this script from: |
1399 | +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD |
1400 | + |
1401 | # This file is supposed to be the same for all GNU packages |
1402 | # and recognize all the CPU types, system types and aliases |
1403 | # that are meaningful with *any* GNU software. |
1404 | @@ -72,8 +73,9 @@ |
1405 | version="\ |
1406 | GNU config.sub ($timestamp) |
1407 | |
1408 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
1409 | -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
1410 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
1411 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
1412 | +Free Software Foundation, Inc. |
1413 | |
1414 | This is free software; see the source for copying conditions. There is NO |
1415 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
1416 | @@ -120,13 +122,18 @@ |
1417 | # Here we must recognize all the valid KERNEL-OS combinations. |
1418 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
1419 | case $maybe_os in |
1420 | - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ |
1421 | - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ |
1422 | + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
1423 | + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
1424 | + knetbsd*-gnu* | netbsd*-gnu* | \ |
1425 | kopensolaris*-gnu* | \ |
1426 | storm-chaos* | os2-emx* | rtmk-nova*) |
1427 | os=-$maybe_os |
1428 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
1429 | ;; |
1430 | + android-linux) |
1431 | + os=-linux-android |
1432 | + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown |
1433 | + ;; |
1434 | *) |
1435 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` |
1436 | if [ $basic_machine != $1 ] |
1437 | @@ -149,12 +156,12 @@ |
1438 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ |
1439 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ |
1440 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ |
1441 | - -apple | -axis | -knuth | -cray) |
1442 | + -apple | -axis | -knuth | -cray | -microblaze) |
1443 | os= |
1444 | basic_machine=$1 |
1445 | ;; |
1446 | - -bluegene*) |
1447 | - os=-cnk |
1448 | + -bluegene*) |
1449 | + os=-cnk |
1450 | ;; |
1451 | -sim | -cisco | -oki | -wec | -winbond) |
1452 | os= |
1453 | @@ -170,10 +177,10 @@ |
1454 | os=-chorusos |
1455 | basic_machine=$1 |
1456 | ;; |
1457 | - -chorusrdb) |
1458 | - os=-chorusrdb |
1459 | + -chorusrdb) |
1460 | + os=-chorusrdb |
1461 | basic_machine=$1 |
1462 | - ;; |
1463 | + ;; |
1464 | -hiux*) |
1465 | os=-hiuxwe2 |
1466 | ;; |
1467 | @@ -242,17 +249,22 @@ |
1468 | # Some are omitted here because they have special meanings below. |
1469 | 1750a | 580 \ |
1470 | | a29k \ |
1471 | + | aarch64 | aarch64_be \ |
1472 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
1473 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
1474 | | am33_2.0 \ |
1475 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
1476 | + | be32 | be64 \ |
1477 | | bfin \ |
1478 | | c4x | clipper \ |
1479 | | d10v | d30v | dlx | dsp16xx \ |
1480 | + | epiphany \ |
1481 | | fido | fr30 | frv \ |
1482 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
1483 | + | hexagon \ |
1484 | | i370 | i860 | i960 | ia64 \ |
1485 | | ip2k | iq2000 \ |
1486 | + | le32 | le64 \ |
1487 | | lm32 \ |
1488 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
1489 | | maxq | mb | microblaze | mcore | mep | metag \ |
1490 | @@ -278,27 +290,39 @@ |
1491 | | moxie \ |
1492 | | mt \ |
1493 | | msp430 \ |
1494 | + | nds32 | nds32le | nds32be \ |
1495 | | nios | nios2 \ |
1496 | | ns16k | ns32k \ |
1497 | + | open8 \ |
1498 | | or32 \ |
1499 | | pdp10 | pdp11 | pj | pjl \ |
1500 | - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
1501 | + | powerpc | powerpc64 | powerpc64le | powerpcle \ |
1502 | | pyramid \ |
1503 | + | rl78 | rx \ |
1504 | | score \ |
1505 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
1506 | | sh64 | sh64le \ |
1507 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
1508 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
1509 | - | spu | strongarm \ |
1510 | - | tahoe | thumb | tic4x | tic80 | tron \ |
1511 | - | v850 | v850e \ |
1512 | + | spu \ |
1513 | + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
1514 | + | ubicom32 \ |
1515 | + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
1516 | | we32k \ |
1517 | - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
1518 | + | x86 | xc16x | xstormy16 | xtensa \ |
1519 | | z8k | z80) |
1520 | basic_machine=$basic_machine-unknown |
1521 | ;; |
1522 | - m6811 | m68hc11 | m6812 | m68hc12) |
1523 | - # Motorola 68HC11/12. |
1524 | + c54x) |
1525 | + basic_machine=tic54x-unknown |
1526 | + ;; |
1527 | + c55x) |
1528 | + basic_machine=tic55x-unknown |
1529 | + ;; |
1530 | + c6x) |
1531 | + basic_machine=tic6x-unknown |
1532 | + ;; |
1533 | + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) |
1534 | basic_machine=$basic_machine-unknown |
1535 | os=-none |
1536 | ;; |
1537 | @@ -308,6 +332,21 @@ |
1538 | basic_machine=mt-unknown |
1539 | ;; |
1540 | |
1541 | + strongarm | thumb | xscale) |
1542 | + basic_machine=arm-unknown |
1543 | + ;; |
1544 | + xgate) |
1545 | + basic_machine=$basic_machine-unknown |
1546 | + os=-none |
1547 | + ;; |
1548 | + xscaleeb) |
1549 | + basic_machine=armeb-unknown |
1550 | + ;; |
1551 | + |
1552 | + xscaleel) |
1553 | + basic_machine=armel-unknown |
1554 | + ;; |
1555 | + |
1556 | # We use `pc' rather than `unknown' |
1557 | # because (1) that's what they normally are, and |
1558 | # (2) the word "unknown" tends to confuse beginning users. |
1559 | @@ -322,25 +361,29 @@ |
1560 | # Recognize the basic CPU types with company name. |
1561 | 580-* \ |
1562 | | a29k-* \ |
1563 | + | aarch64-* | aarch64_be-* \ |
1564 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
1565 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
1566 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
1567 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
1568 | | avr-* | avr32-* \ |
1569 | + | be32-* | be64-* \ |
1570 | | bfin-* | bs2000-* \ |
1571 | - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ |
1572 | + | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
1573 | | clipper-* | craynv-* | cydra-* \ |
1574 | | d10v-* | d30v-* | dlx-* \ |
1575 | | elxsi-* \ |
1576 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
1577 | | h8300-* | h8500-* \ |
1578 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
1579 | + | hexagon-* \ |
1580 | | i*86-* | i860-* | i960-* | ia64-* \ |
1581 | | ip2k-* | iq2000-* \ |
1582 | + | le32-* | le64-* \ |
1583 | | lm32-* \ |
1584 | | m32c-* | m32r-* | m32rle-* \ |
1585 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
1586 | - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ |
1587 | + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ |
1588 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
1589 | | mips16-* \ |
1590 | | mips64-* | mips64el-* \ |
1591 | @@ -362,24 +405,29 @@ |
1592 | | mmix-* \ |
1593 | | mt-* \ |
1594 | | msp430-* \ |
1595 | + | nds32-* | nds32le-* | nds32be-* \ |
1596 | | nios-* | nios2-* \ |
1597 | | none-* | np1-* | ns16k-* | ns32k-* \ |
1598 | + | open8-* \ |
1599 | | orion-* \ |
1600 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
1601 | - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
1602 | + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
1603 | | pyramid-* \ |
1604 | - | romp-* | rs6000-* \ |
1605 | + | rl78-* | romp-* | rs6000-* | rx-* \ |
1606 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
1607 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
1608 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
1609 | | sparclite-* \ |
1610 | - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ |
1611 | - | tahoe-* | thumb-* \ |
1612 | - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ |
1613 | + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
1614 | + | tahoe-* \ |
1615 | + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
1616 | + | tile*-* \ |
1617 | | tron-* \ |
1618 | - | v850-* | v850e-* | vax-* \ |
1619 | + | ubicom32-* \ |
1620 | + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ |
1621 | + | vax-* \ |
1622 | | we32k-* \ |
1623 | - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
1624 | + | x86-* | x86_64-* | xc16x-* | xps100-* \ |
1625 | | xstormy16-* | xtensa*-* \ |
1626 | | ymp-* \ |
1627 | | z8k-* | z80-*) |
1628 | @@ -404,7 +452,7 @@ |
1629 | basic_machine=a29k-amd |
1630 | os=-udi |
1631 | ;; |
1632 | - abacus) |
1633 | + abacus) |
1634 | basic_machine=abacus-unknown |
1635 | ;; |
1636 | adobe68k) |
1637 | @@ -474,11 +522,20 @@ |
1638 | basic_machine=powerpc-ibm |
1639 | os=-cnk |
1640 | ;; |
1641 | + c54x-*) |
1642 | + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` |
1643 | + ;; |
1644 | + c55x-*) |
1645 | + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` |
1646 | + ;; |
1647 | + c6x-*) |
1648 | + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` |
1649 | + ;; |
1650 | c90) |
1651 | basic_machine=c90-cray |
1652 | os=-unicos |
1653 | ;; |
1654 | - cegcc) |
1655 | + cegcc) |
1656 | basic_machine=arm-unknown |
1657 | os=-cegcc |
1658 | ;; |
1659 | @@ -510,7 +567,7 @@ |
1660 | basic_machine=craynv-cray |
1661 | os=-unicosmp |
1662 | ;; |
1663 | - cr16) |
1664 | + cr16 | cr16-*) |
1665 | basic_machine=cr16-unknown |
1666 | os=-elf |
1667 | ;; |
1668 | @@ -668,7 +725,6 @@ |
1669 | i370-ibm* | ibm*) |
1670 | basic_machine=i370-ibm |
1671 | ;; |
1672 | -# I'm not sure what "Sysv32" means. Should this be sysv3.2? |
1673 | i*86v32) |
1674 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
1675 | os=-sysv32 |
1676 | @@ -726,6 +782,9 @@ |
1677 | basic_machine=ns32k-utek |
1678 | os=-sysv |
1679 | ;; |
1680 | + microblaze) |
1681 | + basic_machine=microblaze-xilinx |
1682 | + ;; |
1683 | mingw32) |
1684 | basic_machine=i386-pc |
1685 | os=-mingw32 |
1686 | @@ -762,10 +821,18 @@ |
1687 | ms1-*) |
1688 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
1689 | ;; |
1690 | + msys) |
1691 | + basic_machine=i386-pc |
1692 | + os=-msys |
1693 | + ;; |
1694 | mvs) |
1695 | basic_machine=i370-ibm |
1696 | os=-mvs |
1697 | ;; |
1698 | + nacl) |
1699 | + basic_machine=le32-unknown |
1700 | + os=-nacl |
1701 | + ;; |
1702 | ncr3000) |
1703 | basic_machine=i486-ncr |
1704 | os=-sysv4 |
1705 | @@ -830,6 +897,12 @@ |
1706 | np1) |
1707 | basic_machine=np1-gould |
1708 | ;; |
1709 | + neo-tandem) |
1710 | + basic_machine=neo-tandem |
1711 | + ;; |
1712 | + nse-tandem) |
1713 | + basic_machine=nse-tandem |
1714 | + ;; |
1715 | nsr-tandem) |
1716 | basic_machine=nsr-tandem |
1717 | ;; |
1718 | @@ -912,9 +985,10 @@ |
1719 | ;; |
1720 | power) basic_machine=power-ibm |
1721 | ;; |
1722 | - ppc) basic_machine=powerpc-unknown |
1723 | + ppc | ppcbe) basic_machine=powerpc-unknown |
1724 | ;; |
1725 | - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
1726 | + ppc-* | ppcbe-*) |
1727 | + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
1728 | ;; |
1729 | ppcle | powerpclittle | ppc-le | powerpc-little) |
1730 | basic_machine=powerpcle-unknown |
1731 | @@ -1008,6 +1082,9 @@ |
1732 | basic_machine=i860-stratus |
1733 | os=-sysv4 |
1734 | ;; |
1735 | + strongarm-* | thumb-*) |
1736 | + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` |
1737 | + ;; |
1738 | sun2) |
1739 | basic_machine=m68000-sun |
1740 | ;; |
1741 | @@ -1064,20 +1141,8 @@ |
1742 | basic_machine=t90-cray |
1743 | os=-unicos |
1744 | ;; |
1745 | - tic54x | c54x*) |
1746 | - basic_machine=tic54x-unknown |
1747 | - os=-coff |
1748 | - ;; |
1749 | - tic55x | c55x*) |
1750 | - basic_machine=tic55x-unknown |
1751 | - os=-coff |
1752 | - ;; |
1753 | - tic6x | c6x*) |
1754 | - basic_machine=tic6x-unknown |
1755 | - os=-coff |
1756 | - ;; |
1757 | tile*) |
1758 | - basic_machine=tile-unknown |
1759 | + basic_machine=$basic_machine-unknown |
1760 | os=-linux-gnu |
1761 | ;; |
1762 | tx39) |
1763 | @@ -1147,6 +1212,9 @@ |
1764 | xps | xps100) |
1765 | basic_machine=xps100-honeywell |
1766 | ;; |
1767 | + xscale-* | xscalee[bl]-*) |
1768 | + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` |
1769 | + ;; |
1770 | ymp) |
1771 | basic_machine=ymp-cray |
1772 | os=-unicos |
1773 | @@ -1244,9 +1312,12 @@ |
1774 | if [ x"$os" != x"" ] |
1775 | then |
1776 | case $os in |
1777 | - # First match some system type aliases |
1778 | - # that might get confused with valid system types. |
1779 | + # First match some system type aliases |
1780 | + # that might get confused with valid system types. |
1781 | # -solaris* is a basic system type, with this one exception. |
1782 | + -auroraux) |
1783 | + os=-auroraux |
1784 | + ;; |
1785 | -solaris1 | -solaris1.*) |
1786 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
1787 | ;; |
1788 | @@ -1268,8 +1339,8 @@ |
1789 | # -sysv* is not here because it comes later, after sysvr4. |
1790 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
1791 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
1792 | - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ |
1793 | - | -kopensolaris* \ |
1794 | + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ |
1795 | + | -sym* | -kopensolaris* \ |
1796 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
1797 | | -aos* | -aros* \ |
1798 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
1799 | @@ -1281,8 +1352,9 @@ |
1800 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
1801 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
1802 | | -chorusos* | -chorusrdb* | -cegcc* \ |
1803 | - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
1804 | - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ |
1805 | + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
1806 | + | -mingw32* | -linux-gnu* | -linux-android* \ |
1807 | + | -linux-newlib* | -linux-uclibc* \ |
1808 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
1809 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
1810 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
1811 | @@ -1290,7 +1362,7 @@ |
1812 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
1813 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
1814 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
1815 | - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) |
1816 | + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) |
1817 | # Remember, each alternative MUST END IN *, to match a version number. |
1818 | ;; |
1819 | -qnx*) |
1820 | @@ -1329,7 +1401,7 @@ |
1821 | -opened*) |
1822 | os=-openedition |
1823 | ;; |
1824 | - -os400*) |
1825 | + -os400*) |
1826 | os=-os400 |
1827 | ;; |
1828 | -wince*) |
1829 | @@ -1378,7 +1450,7 @@ |
1830 | -sinix*) |
1831 | os=-sysv4 |
1832 | ;; |
1833 | - -tpf*) |
1834 | + -tpf*) |
1835 | os=-tpf |
1836 | ;; |
1837 | -triton*) |
1838 | @@ -1423,6 +1495,8 @@ |
1839 | -dicos*) |
1840 | os=-dicos |
1841 | ;; |
1842 | + -nacl*) |
1843 | + ;; |
1844 | -none) |
1845 | ;; |
1846 | *) |
1847 | @@ -1445,10 +1519,10 @@ |
1848 | # system, and we'll never get to this point. |
1849 | |
1850 | case $basic_machine in |
1851 | - score-*) |
1852 | + score-*) |
1853 | os=-elf |
1854 | ;; |
1855 | - spu-*) |
1856 | + spu-*) |
1857 | os=-elf |
1858 | ;; |
1859 | *-acorn) |
1860 | @@ -1460,8 +1534,17 @@ |
1861 | arm*-semi) |
1862 | os=-aout |
1863 | ;; |
1864 | - c4x-* | tic4x-*) |
1865 | - os=-coff |
1866 | + c4x-* | tic4x-*) |
1867 | + os=-coff |
1868 | + ;; |
1869 | + tic54x-*) |
1870 | + os=-coff |
1871 | + ;; |
1872 | + tic55x-*) |
1873 | + os=-coff |
1874 | + ;; |
1875 | + tic6x-*) |
1876 | + os=-coff |
1877 | ;; |
1878 | # This must come before the *-dec entry. |
1879 | pdp10-*) |
1880 | @@ -1481,14 +1564,11 @@ |
1881 | ;; |
1882 | m68000-sun) |
1883 | os=-sunos3 |
1884 | - # This also exists in the configure program, but was not the |
1885 | - # default. |
1886 | - # os=-sunos4 |
1887 | ;; |
1888 | m68*-cisco) |
1889 | os=-aout |
1890 | ;; |
1891 | - mep-*) |
1892 | + mep-*) |
1893 | os=-elf |
1894 | ;; |
1895 | mips*-cisco) |
1896 | @@ -1515,7 +1595,7 @@ |
1897 | *-ibm) |
1898 | os=-aix |
1899 | ;; |
1900 | - *-knuth) |
1901 | + *-knuth) |
1902 | os=-mmixware |
1903 | ;; |
1904 | *-wec) |
1905 | |
1906 | === modified file 'config/config.guess' |
1907 | --- config/config.guess 2011-11-20 21:16:52 +0000 |
1908 | +++ config/config.guess 2012-06-13 02:33:18 +0000 |
1909 | @@ -2,9 +2,9 @@ |
1910 | # Attempt to guess a canonical system name. |
1911 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
1912 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
1913 | -# 2011 Free Software Foundation, Inc. |
1914 | +# 2011, 2012 Free Software Foundation, Inc. |
1915 | |
1916 | -timestamp='2011-05-11' |
1917 | +timestamp='2012-02-10' |
1918 | |
1919 | # This file is free software; you can redistribute it and/or modify it |
1920 | # under the terms of the GNU General Public License as published by |
1921 | @@ -17,9 +17,7 @@ |
1922 | # General Public License for more details. |
1923 | # |
1924 | # You should have received a copy of the GNU General Public License |
1925 | -# along with this program; if not, write to the Free Software |
1926 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
1927 | -# 02110-1301, USA. |
1928 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
1929 | # |
1930 | # As a special exception to the GNU General Public License, if you |
1931 | # distribute this file as part of a program that contains a |
1932 | @@ -57,8 +55,8 @@ |
1933 | |
1934 | Originally written by Per Bothner. |
1935 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
1936 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free |
1937 | -Software Foundation, Inc. |
1938 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
1939 | +Free Software Foundation, Inc. |
1940 | |
1941 | This is free software; see the source for copying conditions. There is NO |
1942 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
1943 | @@ -145,7 +143,7 @@ |
1944 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
1945 | *:NetBSD:*:*) |
1946 | # NetBSD (nbsd) targets should (where applicable) match one or |
1947 | - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, |
1948 | + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
1949 | # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently |
1950 | # switched to ELF, *-*-netbsd* would select the old |
1951 | # object file format. This provides both forward |
1952 | @@ -792,13 +790,12 @@ |
1953 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
1954 | exit ;; |
1955 | *:FreeBSD:*:*) |
1956 | - case ${UNAME_MACHINE} in |
1957 | - pc98) |
1958 | - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
1959 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
1960 | + case ${UNAME_PROCESSOR} in |
1961 | amd64) |
1962 | echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
1963 | *) |
1964 | - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
1965 | + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
1966 | esac |
1967 | exit ;; |
1968 | i*:CYGWIN*:*) |
1969 | @@ -807,6 +804,9 @@ |
1970 | *:MINGW*:*) |
1971 | echo ${UNAME_MACHINE}-pc-mingw32 |
1972 | exit ;; |
1973 | + i*:MSYS*:*) |
1974 | + echo ${UNAME_MACHINE}-pc-msys |
1975 | + exit ;; |
1976 | i*:windows32*:*) |
1977 | # uname -m includes "-pc" on this system. |
1978 | echo ${UNAME_MACHINE}-mingw32 |
1979 | @@ -861,6 +861,13 @@ |
1980 | i*86:Minix:*:*) |
1981 | echo ${UNAME_MACHINE}-pc-minix |
1982 | exit ;; |
1983 | + aarch64:Linux:*:*) |
1984 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1985 | + exit ;; |
1986 | + aarch64_be:Linux:*:*) |
1987 | + UNAME_MACHINE=aarch64_be |
1988 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1989 | + exit ;; |
1990 | alpha:Linux:*:*) |
1991 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
1992 | EV5) UNAME_MACHINE=alphaev5 ;; |
1993 | @@ -895,13 +902,16 @@ |
1994 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1995 | exit ;; |
1996 | cris:Linux:*:*) |
1997 | - echo cris-axis-linux-gnu |
1998 | + echo ${UNAME_MACHINE}-axis-linux-gnu |
1999 | exit ;; |
2000 | crisv32:Linux:*:*) |
2001 | - echo crisv32-axis-linux-gnu |
2002 | + echo ${UNAME_MACHINE}-axis-linux-gnu |
2003 | exit ;; |
2004 | frv:Linux:*:*) |
2005 | - echo frv-unknown-linux-gnu |
2006 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
2007 | + exit ;; |
2008 | + hexagon:Linux:*:*) |
2009 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
2010 | exit ;; |
2011 | i*86:Linux:*:*) |
2012 | LIBC=gnu |
2013 | @@ -943,7 +953,7 @@ |
2014 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
2015 | ;; |
2016 | or32:Linux:*:*) |
2017 | - echo or32-unknown-linux-gnu |
2018 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
2019 | exit ;; |
2020 | padre:Linux:*:*) |
2021 | echo sparc-unknown-linux-gnu |
2022 | @@ -978,13 +988,13 @@ |
2023 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
2024 | exit ;; |
2025 | tile*:Linux:*:*) |
2026 | - echo ${UNAME_MACHINE}-tilera-linux-gnu |
2027 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
2028 | exit ;; |
2029 | vax:Linux:*:*) |
2030 | echo ${UNAME_MACHINE}-dec-linux-gnu |
2031 | exit ;; |
2032 | x86_64:Linux:*:*) |
2033 | - echo x86_64-unknown-linux-gnu |
2034 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
2035 | exit ;; |
2036 | xtensa*:Linux:*:*) |
2037 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
2038 | @@ -1315,6 +1325,9 @@ |
2039 | i*86:AROS:*:*) |
2040 | echo ${UNAME_MACHINE}-pc-aros |
2041 | exit ;; |
2042 | + x86_64:VMkernel:*:*) |
2043 | + echo ${UNAME_MACHINE}-unknown-esx |
2044 | + exit ;; |
2045 | esac |
2046 | |
2047 | #echo '(No uname command or uname output not recognized.)' 1>&2 |
2048 | |
2049 | === modified file 'config/config.sub' |
2050 | --- config/config.sub 2011-11-20 21:16:52 +0000 |
2051 | +++ config/config.sub 2012-06-13 02:33:18 +0000 |
2052 | @@ -2,9 +2,9 @@ |
2053 | # Configuration validation subroutine script. |
2054 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
2055 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
2056 | -# 2011 Free Software Foundation, Inc. |
2057 | +# 2011, 2012 Free Software Foundation, Inc. |
2058 | |
2059 | -timestamp='2011-03-23' |
2060 | +timestamp='2012-02-10' |
2061 | |
2062 | # This file is (in principle) common to ALL GNU software. |
2063 | # The presence of a machine in this file suggests that SOME GNU software |
2064 | @@ -21,9 +21,7 @@ |
2065 | # GNU General Public License for more details. |
2066 | # |
2067 | # You should have received a copy of the GNU General Public License |
2068 | -# along with this program; if not, write to the Free Software |
2069 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
2070 | -# 02110-1301, USA. |
2071 | +# along with this program; if not, see <http://www.gnu.org/licenses/>. |
2072 | # |
2073 | # As a special exception to the GNU General Public License, if you |
2074 | # distribute this file as part of a program that contains a |
2075 | @@ -76,8 +74,8 @@ |
2076 | GNU config.sub ($timestamp) |
2077 | |
2078 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
2079 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free |
2080 | -Software Foundation, Inc. |
2081 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
2082 | +Free Software Foundation, Inc. |
2083 | |
2084 | This is free software; see the source for copying conditions. There is NO |
2085 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
2086 | @@ -132,6 +130,10 @@ |
2087 | os=-$maybe_os |
2088 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
2089 | ;; |
2090 | + android-linux) |
2091 | + os=-linux-android |
2092 | + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown |
2093 | + ;; |
2094 | *) |
2095 | basic_machine=`echo $1 | sed 's/-[^-]*$//'` |
2096 | if [ $basic_machine != $1 ] |
2097 | @@ -247,17 +249,22 @@ |
2098 | # Some are omitted here because they have special meanings below. |
2099 | 1750a | 580 \ |
2100 | | a29k \ |
2101 | + | aarch64 | aarch64_be \ |
2102 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
2103 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
2104 | | am33_2.0 \ |
2105 | | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
2106 | + | be32 | be64 \ |
2107 | | bfin \ |
2108 | | c4x | clipper \ |
2109 | | d10v | d30v | dlx | dsp16xx \ |
2110 | + | epiphany \ |
2111 | | fido | fr30 | frv \ |
2112 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
2113 | + | hexagon \ |
2114 | | i370 | i860 | i960 | ia64 \ |
2115 | | ip2k | iq2000 \ |
2116 | + | le32 | le64 \ |
2117 | | lm32 \ |
2118 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
2119 | | maxq | mb | microblaze | mcore | mep | metag \ |
2120 | @@ -291,7 +298,7 @@ |
2121 | | pdp10 | pdp11 | pj | pjl \ |
2122 | | powerpc | powerpc64 | powerpc64le | powerpcle \ |
2123 | | pyramid \ |
2124 | - | rx \ |
2125 | + | rl78 | rx \ |
2126 | | score \ |
2127 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
2128 | | sh64 | sh64le \ |
2129 | @@ -300,7 +307,7 @@ |
2130 | | spu \ |
2131 | | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
2132 | | ubicom32 \ |
2133 | - | v850 | v850e \ |
2134 | + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
2135 | | we32k \ |
2136 | | x86 | xc16x | xstormy16 | xtensa \ |
2137 | | z8k | z80) |
2138 | @@ -315,8 +322,7 @@ |
2139 | c6x) |
2140 | basic_machine=tic6x-unknown |
2141 | ;; |
2142 | - m6811 | m68hc11 | m6812 | m68hc12 | picochip) |
2143 | - # Motorola 68HC11/12. |
2144 | + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) |
2145 | basic_machine=$basic_machine-unknown |
2146 | os=-none |
2147 | ;; |
2148 | @@ -329,7 +335,10 @@ |
2149 | strongarm | thumb | xscale) |
2150 | basic_machine=arm-unknown |
2151 | ;; |
2152 | - |
2153 | + xgate) |
2154 | + basic_machine=$basic_machine-unknown |
2155 | + os=-none |
2156 | + ;; |
2157 | xscaleeb) |
2158 | basic_machine=armeb-unknown |
2159 | ;; |
2160 | @@ -352,11 +361,13 @@ |
2161 | # Recognize the basic CPU types with company name. |
2162 | 580-* \ |
2163 | | a29k-* \ |
2164 | + | aarch64-* | aarch64_be-* \ |
2165 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
2166 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
2167 | | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
2168 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
2169 | | avr-* | avr32-* \ |
2170 | + | be32-* | be64-* \ |
2171 | | bfin-* | bs2000-* \ |
2172 | | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
2173 | | clipper-* | craynv-* | cydra-* \ |
2174 | @@ -365,8 +376,10 @@ |
2175 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
2176 | | h8300-* | h8500-* \ |
2177 | | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
2178 | + | hexagon-* \ |
2179 | | i*86-* | i860-* | i960-* | ia64-* \ |
2180 | | ip2k-* | iq2000-* \ |
2181 | + | le32-* | le64-* \ |
2182 | | lm32-* \ |
2183 | | m32c-* | m32r-* | m32rle-* \ |
2184 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
2185 | @@ -400,7 +413,7 @@ |
2186 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
2187 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
2188 | | pyramid-* \ |
2189 | - | romp-* | rs6000-* | rx-* \ |
2190 | + | rl78-* | romp-* | rs6000-* | rx-* \ |
2191 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
2192 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
2193 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
2194 | @@ -408,10 +421,11 @@ |
2195 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
2196 | | tahoe-* \ |
2197 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
2198 | - | tile-* | tilegx-* \ |
2199 | + | tile*-* \ |
2200 | | tron-* \ |
2201 | | ubicom32-* \ |
2202 | - | v850-* | v850e-* | vax-* \ |
2203 | + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ |
2204 | + | vax-* \ |
2205 | | we32k-* \ |
2206 | | x86-* | x86_64-* | xc16x-* | xps100-* \ |
2207 | | xstormy16-* | xtensa*-* \ |
2208 | @@ -711,7 +725,6 @@ |
2209 | i370-ibm* | ibm*) |
2210 | basic_machine=i370-ibm |
2211 | ;; |
2212 | -# I'm not sure what "Sysv32" means. Should this be sysv3.2? |
2213 | i*86v32) |
2214 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
2215 | os=-sysv32 |
2216 | @@ -808,10 +821,18 @@ |
2217 | ms1-*) |
2218 | basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
2219 | ;; |
2220 | + msys) |
2221 | + basic_machine=i386-pc |
2222 | + os=-msys |
2223 | + ;; |
2224 | mvs) |
2225 | basic_machine=i370-ibm |
2226 | os=-mvs |
2227 | ;; |
2228 | + nacl) |
2229 | + basic_machine=le32-unknown |
2230 | + os=-nacl |
2231 | + ;; |
2232 | ncr3000) |
2233 | basic_machine=i486-ncr |
2234 | os=-sysv4 |
2235 | @@ -1120,13 +1141,8 @@ |
2236 | basic_machine=t90-cray |
2237 | os=-unicos |
2238 | ;; |
2239 | - # This must be matched before tile*. |
2240 | - tilegx*) |
2241 | - basic_machine=tilegx-unknown |
2242 | - os=-linux-gnu |
2243 | - ;; |
2244 | tile*) |
2245 | - basic_machine=tile-unknown |
2246 | + basic_machine=$basic_machine-unknown |
2247 | os=-linux-gnu |
2248 | ;; |
2249 | tx39) |
2250 | @@ -1336,7 +1352,7 @@ |
2251 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
2252 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
2253 | | -chorusos* | -chorusrdb* | -cegcc* \ |
2254 | - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
2255 | + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
2256 | | -mingw32* | -linux-gnu* | -linux-android* \ |
2257 | | -linux-newlib* | -linux-uclibc* \ |
2258 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
2259 | @@ -1548,9 +1564,6 @@ |
2260 | ;; |
2261 | m68000-sun) |
2262 | os=-sunos3 |
2263 | - # This also exists in the configure program, but was not the |
2264 | - # default. |
2265 | - # os=-sunos4 |
2266 | ;; |
2267 | m68*-cisco) |
2268 | os=-aout |
2269 | |
2270 | === modified file 'config/depcomp' |
2271 | --- config/depcomp 2010-09-24 20:56:47 +0000 |
2272 | +++ config/depcomp 2012-06-13 02:33:18 +0000 |
2273 | @@ -1,10 +1,10 @@ |
2274 | #! /bin/sh |
2275 | # depcomp - compile a program generating dependencies as side-effects |
2276 | |
2277 | -scriptversion=2009-04-28.21; # UTC |
2278 | +scriptversion=2011-12-04.11; # UTC |
2279 | |
2280 | -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free |
2281 | -# Software Foundation, Inc. |
2282 | +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, |
2283 | +# 2011 Free Software Foundation, Inc. |
2284 | |
2285 | # This program is free software; you can redistribute it and/or modify |
2286 | # it under the terms of the GNU General Public License as published by |
2287 | @@ -44,7 +44,7 @@ |
2288 | object Object file output by `PROGRAMS ARGS'. |
2289 | DEPDIR directory where to store dependencies. |
2290 | depfile Dependency file to output. |
2291 | - tmpdepfile Temporary file to use when outputing dependencies. |
2292 | + tmpdepfile Temporary file to use when outputting dependencies. |
2293 | libtool Whether libtool is used (yes/no). |
2294 | |
2295 | Report bugs to <bug-automake@gnu.org>. |
2296 | @@ -90,10 +90,18 @@ |
2297 | # This is just like msvisualcpp but w/o cygpath translation. |
2298 | # Just convert the backslash-escaped backslashes to single forward |
2299 | # slashes to satisfy depend.m4 |
2300 | - cygpath_u="sed s,\\\\\\\\,/,g" |
2301 | + cygpath_u='sed s,\\\\,/,g' |
2302 | depmode=msvisualcpp |
2303 | fi |
2304 | |
2305 | +if test "$depmode" = msvc7msys; then |
2306 | + # This is just like msvc7 but w/o cygpath translation. |
2307 | + # Just convert the backslash-escaped backslashes to single forward |
2308 | + # slashes to satisfy depend.m4 |
2309 | + cygpath_u='sed s,\\\\,/,g' |
2310 | + depmode=msvc7 |
2311 | +fi |
2312 | + |
2313 | case "$depmode" in |
2314 | gcc3) |
2315 | ## gcc 3 implements dependency tracking that does exactly what |
2316 | @@ -158,10 +166,12 @@ |
2317 | ' < "$tmpdepfile" | |
2318 | ## Some versions of gcc put a space before the `:'. On the theory |
2319 | ## that the space means something, we add a space to the output as |
2320 | -## well. |
2321 | +## well. hp depmode also adds that space, but also prefixes the VPATH |
2322 | +## to the object. Take care to not repeat it in the output. |
2323 | ## Some versions of the HPUX 10.20 sed can't process this invocation |
2324 | ## correctly. Breaking it into two sed invocations is a workaround. |
2325 | - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
2326 | + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ |
2327 | + | sed -e 's/$/ :/' >> "$depfile" |
2328 | rm -f "$tmpdepfile" |
2329 | ;; |
2330 | |
2331 | @@ -405,6 +415,52 @@ |
2332 | rm -f "$tmpdepfile" |
2333 | ;; |
2334 | |
2335 | +msvc7) |
2336 | + if test "$libtool" = yes; then |
2337 | + showIncludes=-Wc,-showIncludes |
2338 | + else |
2339 | + showIncludes=-showIncludes |
2340 | + fi |
2341 | + "$@" $showIncludes > "$tmpdepfile" |
2342 | + stat=$? |
2343 | + grep -v '^Note: including file: ' "$tmpdepfile" |
2344 | + if test "$stat" = 0; then : |
2345 | + else |
2346 | + rm -f "$tmpdepfile" |
2347 | + exit $stat |
2348 | + fi |
2349 | + rm -f "$depfile" |
2350 | + echo "$object : \\" > "$depfile" |
2351 | + # The first sed program below extracts the file names and escapes |
2352 | + # backslashes for cygpath. The second sed program outputs the file |
2353 | + # name when reading, but also accumulates all include files in the |
2354 | + # hold buffer in order to output them again at the end. This only |
2355 | + # works with sed implementations that can handle large buffers. |
2356 | + sed < "$tmpdepfile" -n ' |
2357 | +/^Note: including file: *\(.*\)/ { |
2358 | + s//\1/ |
2359 | + s/\\/\\\\/g |
2360 | + p |
2361 | +}' | $cygpath_u | sort -u | sed -n ' |
2362 | +s/ /\\ /g |
2363 | +s/\(.*\)/ \1 \\/p |
2364 | +s/.\(.*\) \\/\1:/ |
2365 | +H |
2366 | +$ { |
2367 | + s/.*/ / |
2368 | + G |
2369 | + p |
2370 | +}' >> "$depfile" |
2371 | + rm -f "$tmpdepfile" |
2372 | + ;; |
2373 | + |
2374 | +msvc7msys) |
2375 | + # This case exists only to let depend.m4 do its work. It works by |
2376 | + # looking at the text of this script. This case will never be run, |
2377 | + # since it is checked for above. |
2378 | + exit 1 |
2379 | + ;; |
2380 | + |
2381 | #nosideeffect) |
2382 | # This comment above is used by automake to tell side-effect |
2383 | # dependency tracking mechanisms from slower ones. |
2384 | @@ -503,7 +559,9 @@ |
2385 | touch "$tmpdepfile" |
2386 | ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" |
2387 | rm -f "$depfile" |
2388 | - cat < "$tmpdepfile" > "$depfile" |
2389 | + # makedepend may prepend the VPATH from the source file name to the object. |
2390 | + # No need to regex-escape $object, excess matching of '.' is harmless. |
2391 | + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" |
2392 | sed '1,2d' "$tmpdepfile" | tr ' ' ' |
2393 | ' | \ |
2394 | ## Some versions of the HPUX 10.20 sed can't process this invocation |
2395 | |
2396 | === modified file 'config/install-sh' |
2397 | --- config/install-sh 2010-09-24 20:56:47 +0000 |
2398 | +++ config/install-sh 2012-06-13 02:33:18 +0000 |
2399 | @@ -1,7 +1,7 @@ |
2400 | #!/bin/sh |
2401 | # install - install a program, script, or datafile |
2402 | |
2403 | -scriptversion=2009-04-28.21; # UTC |
2404 | +scriptversion=2011-01-19.21; # UTC |
2405 | |
2406 | # This originates from X11R5 (mit/util/scripts/install.sh), which was |
2407 | # later released in X11R6 (xc/config/util/install.sh) with the |
2408 | @@ -156,6 +156,10 @@ |
2409 | -s) stripcmd=$stripprog;; |
2410 | |
2411 | -t) dst_arg=$2 |
2412 | + # Protect names problematic for `test' and other utilities. |
2413 | + case $dst_arg in |
2414 | + -* | [=\(\)!]) dst_arg=./$dst_arg;; |
2415 | + esac |
2416 | shift;; |
2417 | |
2418 | -T) no_target_directory=true;; |
2419 | @@ -186,6 +190,10 @@ |
2420 | fi |
2421 | shift # arg |
2422 | dst_arg=$arg |
2423 | + # Protect names problematic for `test' and other utilities. |
2424 | + case $dst_arg in |
2425 | + -* | [=\(\)!]) dst_arg=./$dst_arg;; |
2426 | + esac |
2427 | done |
2428 | fi |
2429 | |
2430 | @@ -200,7 +208,11 @@ |
2431 | fi |
2432 | |
2433 | if test -z "$dir_arg"; then |
2434 | - trap '(exit $?); exit' 1 2 13 15 |
2435 | + do_exit='(exit $ret); exit $ret' |
2436 | + trap "ret=129; $do_exit" 1 |
2437 | + trap "ret=130; $do_exit" 2 |
2438 | + trap "ret=141; $do_exit" 13 |
2439 | + trap "ret=143; $do_exit" 15 |
2440 | |
2441 | # Set umask so as not to create temps with too-generous modes. |
2442 | # However, 'strip' requires both read and write access to temps. |
2443 | @@ -228,9 +240,9 @@ |
2444 | |
2445 | for src |
2446 | do |
2447 | - # Protect names starting with `-'. |
2448 | + # Protect names problematic for `test' and other utilities. |
2449 | case $src in |
2450 | - -*) src=./$src;; |
2451 | + -* | [=\(\)!]) src=./$src;; |
2452 | esac |
2453 | |
2454 | if test -n "$dir_arg"; then |
2455 | @@ -252,12 +264,7 @@ |
2456 | echo "$0: no destination specified." >&2 |
2457 | exit 1 |
2458 | fi |
2459 | - |
2460 | dst=$dst_arg |
2461 | - # Protect names starting with `-'. |
2462 | - case $dst in |
2463 | - -*) dst=./$dst;; |
2464 | - esac |
2465 | |
2466 | # If destination is a directory, append the input filename; won't work |
2467 | # if double slashes aren't ignored. |
2468 | @@ -385,7 +392,7 @@ |
2469 | |
2470 | case $dstdir in |
2471 | /*) prefix='/';; |
2472 | - -*) prefix='./';; |
2473 | + [-=\(\)!]*) prefix='./';; |
2474 | *) prefix='';; |
2475 | esac |
2476 | |
2477 | @@ -403,7 +410,7 @@ |
2478 | |
2479 | for d |
2480 | do |
2481 | - test -z "$d" && continue |
2482 | + test X"$d" = X && continue |
2483 | |
2484 | prefix=$prefix$d |
2485 | if test -d "$prefix"; then |
2486 | |
2487 | === modified file 'config/ltmain.sh' (properties changed: +x to -x) |
2488 | --- config/ltmain.sh 2011-11-20 21:16:52 +0000 |
2489 | +++ config/ltmain.sh 2012-06-13 02:33:18 +0000 |
2490 | @@ -1,9 +1,9 @@ |
2491 | |
2492 | -# libtool (GNU libtool) 2.4 |
2493 | +# libtool (GNU libtool) 2.4.2 |
2494 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 |
2495 | |
2496 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, |
2497 | -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
2498 | +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
2499 | # This is free software; see the source for copying conditions. There is NO |
2500 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
2501 | |
2502 | @@ -41,6 +41,7 @@ |
2503 | # --quiet, --silent don't print informational messages |
2504 | # --no-quiet, --no-silent |
2505 | # print informational messages (default) |
2506 | +# --no-warn don't display warning messages |
2507 | # --tag=TAG use configuration variables from tag TAG |
2508 | # -v, --verbose print more informational messages than default |
2509 | # --no-verbose don't print the extra informational messages |
2510 | @@ -69,7 +70,7 @@ |
2511 | # compiler: $LTCC |
2512 | # compiler flags: $LTCFLAGS |
2513 | # linker: $LD (gnu? $with_gnu_ld) |
2514 | -# $progname: (GNU libtool) 2.4 Debian-2.4-3 |
2515 | +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1 |
2516 | # automake: $automake_version |
2517 | # autoconf: $autoconf_version |
2518 | # |
2519 | @@ -79,9 +80,9 @@ |
2520 | |
2521 | PROGRAM=libtool |
2522 | PACKAGE=libtool |
2523 | -VERSION="2.4 Debian-2.4-3" |
2524 | +VERSION="2.4.2 Debian-2.4.2-1" |
2525 | TIMESTAMP="" |
2526 | -package_revision=1.3293 |
2527 | +package_revision=1.3337 |
2528 | |
2529 | # Be Bourne compatible |
2530 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
2531 | @@ -136,15 +137,10 @@ |
2532 | |
2533 | : ${CP="cp -f"} |
2534 | test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} |
2535 | -: ${EGREP="/bin/grep -E"} |
2536 | -: ${FGREP="/bin/grep -F"} |
2537 | -: ${GREP="/bin/grep"} |
2538 | -: ${LN_S="ln -s"} |
2539 | : ${MAKE="make"} |
2540 | : ${MKDIR="mkdir"} |
2541 | : ${MV="mv -f"} |
2542 | : ${RM="rm -f"} |
2543 | -: ${SED="/bin/sed"} |
2544 | : ${SHELL="${CONFIG_SHELL-/bin/sh}"} |
2545 | : ${Xsed="$SED -e 1s/^X//"} |
2546 | |
2547 | @@ -387,7 +383,7 @@ |
2548 | ;; |
2549 | *) |
2550 | save_IFS="$IFS" |
2551 | - IFS=: |
2552 | + IFS=${PATH_SEPARATOR-:} |
2553 | for progdir in $PATH; do |
2554 | IFS="$save_IFS" |
2555 | test -x "$progdir/$progname" && break |
2556 | @@ -771,8 +767,8 @@ |
2557 | s*\$LTCFLAGS*'"$LTCFLAGS"'* |
2558 | s*\$LD*'"$LD"'* |
2559 | s/\$with_gnu_ld/'"$with_gnu_ld"'/ |
2560 | - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ |
2561 | - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ |
2562 | + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ |
2563 | + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ |
2564 | p |
2565 | d |
2566 | } |
2567 | @@ -1052,6 +1048,7 @@ |
2568 | opt_help=false |
2569 | opt_help_all=false |
2570 | opt_silent=: |
2571 | +opt_warning=: |
2572 | opt_verbose=: |
2573 | opt_silent=false |
2574 | opt_verbose=false |
2575 | @@ -1120,6 +1117,10 @@ |
2576 | opt_silent=false |
2577 | func_append preserve_args " $opt" |
2578 | ;; |
2579 | + --no-warning|--no-warn) |
2580 | + opt_warning=false |
2581 | +func_append preserve_args " $opt" |
2582 | + ;; |
2583 | --no-verbose) |
2584 | opt_verbose=false |
2585 | func_append preserve_args " $opt" |
2586 | @@ -2059,7 +2060,7 @@ |
2587 | *.[cCFSifmso] | \ |
2588 | *.ada | *.adb | *.ads | *.asm | \ |
2589 | *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ |
2590 | - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) |
2591 | + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) |
2592 | func_xform "$libobj" |
2593 | libobj=$func_xform_result |
2594 | ;; |
2595 | @@ -3201,11 +3202,13 @@ |
2596 | |
2597 | # Set up the ranlib parameters. |
2598 | oldlib="$destdir/$name" |
2599 | + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 |
2600 | + tool_oldlib=$func_to_tool_file_result |
2601 | |
2602 | func_show_eval "$install_prog \$file \$oldlib" 'exit $?' |
2603 | |
2604 | if test -n "$stripme" && test -n "$old_striplib"; then |
2605 | - func_show_eval "$old_striplib $oldlib" 'exit $?' |
2606 | + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' |
2607 | fi |
2608 | |
2609 | # Do each command in the postinstall commands. |
2610 | @@ -3470,7 +3473,7 @@ |
2611 | # linked before any other PIC object. But we must not use |
2612 | # pic_flag when linking with -static. The problem exists in |
2613 | # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. |
2614 | - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) |
2615 | + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) |
2616 | pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; |
2617 | *-*-hpux*) |
2618 | pic_flag_for_symtable=" $pic_flag" ;; |
2619 | @@ -3982,14 +3985,17 @@ |
2620 | # launches target application with the remaining arguments. |
2621 | func_exec_program () |
2622 | { |
2623 | - for lt_wr_arg |
2624 | - do |
2625 | - case \$lt_wr_arg in |
2626 | - --lt-*) ;; |
2627 | - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; |
2628 | - esac |
2629 | - shift |
2630 | - done |
2631 | + case \" \$* \" in |
2632 | + *\\ --lt-*) |
2633 | + for lt_wr_arg |
2634 | + do |
2635 | + case \$lt_wr_arg in |
2636 | + --lt-*) ;; |
2637 | + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; |
2638 | + esac |
2639 | + shift |
2640 | + done ;; |
2641 | + esac |
2642 | func_exec_program_core \${1+\"\$@\"} |
2643 | } |
2644 | |
2645 | @@ -5057,9 +5063,15 @@ |
2646 | { |
2647 | EOF |
2648 | func_emit_wrapper yes | |
2649 | - $SED -e 's/\([\\"]\)/\\\1/g' \ |
2650 | - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' |
2651 | - |
2652 | + $SED -n -e ' |
2653 | +s/^\(.\{79\}\)\(..*\)/\1\ |
2654 | +\2/ |
2655 | +h |
2656 | +s/\([\\"]\)/\\\1/g |
2657 | +s/$/\\n/ |
2658 | +s/\([^\n]*\).*/ fputs ("\1", f);/p |
2659 | +g |
2660 | +D' |
2661 | cat <<"EOF" |
2662 | } |
2663 | EOF |
2664 | @@ -5643,7 +5655,8 @@ |
2665 | continue |
2666 | ;; |
2667 | |
2668 | - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
2669 | + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |
2670 | + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) |
2671 | func_append compiler_flags " $arg" |
2672 | func_append compile_command " $arg" |
2673 | func_append finalize_command " $arg" |
2674 | @@ -6150,7 +6163,8 @@ |
2675 | lib= |
2676 | found=no |
2677 | case $deplib in |
2678 | - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
2679 | + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |
2680 | + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) |
2681 | if test "$linkmode,$pass" = "prog,link"; then |
2682 | compile_deplibs="$deplib $compile_deplibs" |
2683 | finalize_deplibs="$deplib $finalize_deplibs" |
2684 | @@ -6834,7 +6848,7 @@ |
2685 | test "$hardcode_direct_absolute" = no; then |
2686 | add="$dir/$linklib" |
2687 | elif test "$hardcode_minus_L" = yes; then |
2688 | - add_dir="-L$dir" |
2689 | + add_dir="-L$absdir" |
2690 | # Try looking first in the location we're being installed to. |
2691 | if test -n "$inst_prefix_dir"; then |
2692 | case $libdir in |
2693 | @@ -7319,6 +7333,7 @@ |
2694 | # which has an extra 1 added just for fun |
2695 | # |
2696 | case $version_type in |
2697 | + # correct linux to gnu/linux during the next big refactor |
2698 | darwin|linux|osf|windows|none) |
2699 | func_arith $number_major + $number_minor |
2700 | current=$func_arith_result |
2701 | @@ -7438,7 +7453,7 @@ |
2702 | versuffix="$major.$revision" |
2703 | ;; |
2704 | |
2705 | - linux) |
2706 | + linux) # correct to gnu/linux during the next big refactor |
2707 | func_arith $current - $age |
2708 | major=.$func_arith_result |
2709 | versuffix="$major.$age.$revision" |
2710 | @@ -8026,6 +8041,11 @@ |
2711 | |
2712 | # Test again, we may have decided not to build it any more |
2713 | if test "$build_libtool_libs" = yes; then |
2714 | + # Remove ${wl} instances when linking with ld. |
2715 | + # FIXME: should test the right _cmds variable. |
2716 | + case $archive_cmds in |
2717 | + *\$LD\ *) wl= ;; |
2718 | + esac |
2719 | if test "$hardcode_into_libs" = yes; then |
2720 | # Hardcode the library paths |
2721 | hardcode_libdirs= |
2722 | @@ -8056,7 +8076,7 @@ |
2723 | elif test -n "$runpath_var"; then |
2724 | case "$perm_rpath " in |
2725 | *" $libdir "*) ;; |
2726 | - *) func_apped perm_rpath " $libdir" ;; |
2727 | + *) func_append perm_rpath " $libdir" ;; |
2728 | esac |
2729 | fi |
2730 | done |
2731 | @@ -8064,11 +8084,7 @@ |
2732 | if test -n "$hardcode_libdir_separator" && |
2733 | test -n "$hardcode_libdirs"; then |
2734 | libdir="$hardcode_libdirs" |
2735 | - if test -n "$hardcode_libdir_flag_spec_ld"; then |
2736 | - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" |
2737 | - else |
2738 | - eval dep_rpath=\"$hardcode_libdir_flag_spec\" |
2739 | - fi |
2740 | + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" |
2741 | fi |
2742 | if test -n "$runpath_var" && test -n "$perm_rpath"; then |
2743 | # We should set the runpath_var. |
2744 | @@ -9158,6 +9174,8 @@ |
2745 | esac |
2746 | done |
2747 | fi |
2748 | + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 |
2749 | + tool_oldlib=$func_to_tool_file_result |
2750 | eval cmds=\"$old_archive_cmds\" |
2751 | |
2752 | func_len " $cmds" |
2753 | @@ -9267,7 +9285,8 @@ |
2754 | *.la) |
2755 | func_basename "$deplib" |
2756 | name="$func_basename_result" |
2757 | - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
2758 | + func_resolve_sysroot "$deplib" |
2759 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` |
2760 | test -z "$libdir" && \ |
2761 | func_fatal_error "\`$deplib' is not a valid libtool archive" |
2762 | func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" |
2763 | |
2764 | === modified file 'config/missing' |
2765 | --- config/missing 2010-09-24 20:56:47 +0000 |
2766 | +++ config/missing 2012-06-13 02:33:18 +0000 |
2767 | @@ -1,10 +1,10 @@ |
2768 | #! /bin/sh |
2769 | # Common stub for a few missing GNU programs while installing. |
2770 | |
2771 | -scriptversion=2009-04-28.21; # UTC |
2772 | +scriptversion=2012-01-06.13; # UTC |
2773 | |
2774 | # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, |
2775 | -# 2008, 2009 Free Software Foundation, Inc. |
2776 | +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. |
2777 | # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. |
2778 | |
2779 | # This program is free software; you can redistribute it and/or modify |
2780 | @@ -84,7 +84,6 @@ |
2781 | help2man touch the output file |
2782 | lex create \`lex.yy.c', if possible, from existing .c |
2783 | makeinfo touch the output file |
2784 | - tar try tar, gnutar, gtar, then tar without non-portable flags |
2785 | yacc create \`y.tab.[ch]', if possible, from existing .[ch] |
2786 | |
2787 | Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and |
2788 | @@ -122,15 +121,6 @@ |
2789 | # Not GNU programs, they don't have --version. |
2790 | ;; |
2791 | |
2792 | - tar*) |
2793 | - if test -n "$run"; then |
2794 | - echo 1>&2 "ERROR: \`tar' requires --run" |
2795 | - exit 1 |
2796 | - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then |
2797 | - exit 1 |
2798 | - fi |
2799 | - ;; |
2800 | - |
2801 | *) |
2802 | if test -z "$run" && ($1 --version) > /dev/null 2>&1; then |
2803 | # We have it, but it failed. |
2804 | @@ -226,7 +216,7 @@ |
2805 | \`Bison' from any GNU archive site." |
2806 | rm -f y.tab.c y.tab.h |
2807 | if test $# -ne 1; then |
2808 | - eval LASTARG="\${$#}" |
2809 | + eval LASTARG=\${$#} |
2810 | case $LASTARG in |
2811 | *.y) |
2812 | SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` |
2813 | @@ -256,7 +246,7 @@ |
2814 | \`Flex' from any GNU archive site." |
2815 | rm -f lex.yy.c |
2816 | if test $# -ne 1; then |
2817 | - eval LASTARG="\${$#}" |
2818 | + eval LASTARG=\${$#} |
2819 | case $LASTARG in |
2820 | *.l) |
2821 | SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` |
2822 | @@ -318,41 +308,6 @@ |
2823 | touch $file |
2824 | ;; |
2825 | |
2826 | - tar*) |
2827 | - shift |
2828 | - |
2829 | - # We have already tried tar in the generic part. |
2830 | - # Look for gnutar/gtar before invocation to avoid ugly error |
2831 | - # messages. |
2832 | - if (gnutar --version > /dev/null 2>&1); then |
2833 | - gnutar "$@" && exit 0 |
2834 | - fi |
2835 | - if (gtar --version > /dev/null 2>&1); then |
2836 | - gtar "$@" && exit 0 |
2837 | - fi |
2838 | - firstarg="$1" |
2839 | - if shift; then |
2840 | - case $firstarg in |
2841 | - *o*) |
2842 | - firstarg=`echo "$firstarg" | sed s/o//` |
2843 | - tar "$firstarg" "$@" && exit 0 |
2844 | - ;; |
2845 | - esac |
2846 | - case $firstarg in |
2847 | - *h*) |
2848 | - firstarg=`echo "$firstarg" | sed s/h//` |
2849 | - tar "$firstarg" "$@" && exit 0 |
2850 | - ;; |
2851 | - esac |
2852 | - fi |
2853 | - |
2854 | - echo 1>&2 "\ |
2855 | -WARNING: I can't seem to be able to run \`tar' with the given arguments. |
2856 | - You may want to install GNU tar or Free paxutils, or check the |
2857 | - command line arguments." |
2858 | - exit 1 |
2859 | - ;; |
2860 | - |
2861 | *) |
2862 | echo 1>&2 "\ |
2863 | WARNING: \`$1' is needed, and is $msg. |
2864 | |
2865 | === modified file 'configure' |
2866 | --- configure 2011-11-20 21:16:52 +0000 |
2867 | +++ configure 2012-06-13 02:33:18 +0000 |
2868 | @@ -1,6 +1,6 @@ |
2869 | #! /bin/sh |
2870 | # Guess values for system-dependent variables and create Makefiles. |
2871 | -# Generated by GNU Autoconf 2.68 for yazpp 1.2.7. |
2872 | +# Generated by GNU Autoconf 2.68 for yazpp 1.3.0. |
2873 | # |
2874 | # Report bugs to <adam@indexdata.dk>. |
2875 | # |
2876 | @@ -570,8 +570,8 @@ |
2877 | # Identity of this package. |
2878 | PACKAGE_NAME='yazpp' |
2879 | PACKAGE_TARNAME='yazpp' |
2880 | -PACKAGE_VERSION='1.2.7' |
2881 | -PACKAGE_STRING='yazpp 1.2.7' |
2882 | +PACKAGE_VERSION='1.3.0' |
2883 | +PACKAGE_STRING='yazpp 1.3.0' |
2884 | PACKAGE_BUGREPORT='adam@indexdata.dk' |
2885 | PACKAGE_URL='' |
2886 | |
2887 | @@ -671,6 +671,7 @@ |
2888 | am__fastdepCC_FALSE |
2889 | am__fastdepCC_TRUE |
2890 | CCDEPMODE |
2891 | +am__nodep |
2892 | AMDEPBACKSLASH |
2893 | AMDEP_FALSE |
2894 | AMDEP_TRUE |
2895 | @@ -1317,7 +1318,7 @@ |
2896 | # Omit some internal or obsolete options to make the list less imposing. |
2897 | # This message is too long to be a string in the A/UX 3.1 sh. |
2898 | cat <<_ACEOF |
2899 | -\`configure' configures yazpp 1.2.7 to adapt to many kinds of systems. |
2900 | +\`configure' configures yazpp 1.3.0 to adapt to many kinds of systems. |
2901 | |
2902 | Usage: $0 [OPTION]... [VAR=VALUE]... |
2903 | |
2904 | @@ -1387,7 +1388,7 @@ |
2905 | |
2906 | if test -n "$ac_init_help"; then |
2907 | case $ac_init_help in |
2908 | - short | recursive ) echo "Configuration of yazpp 1.2.7:";; |
2909 | + short | recursive ) echo "Configuration of yazpp 1.3.0:";; |
2910 | esac |
2911 | cat <<\_ACEOF |
2912 | |
2913 | @@ -1407,7 +1408,7 @@ |
2914 | Optional Packages: |
2915 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] |
2916 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) |
2917 | - --with-pic try to use only PIC/non-PIC objects [default=use |
2918 | + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use |
2919 | both] |
2920 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
2921 | --with-sysroot=DIR Search for dependent libraries within DIR |
2922 | @@ -1496,7 +1497,7 @@ |
2923 | test -n "$ac_init_help" && exit $ac_status |
2924 | if $ac_init_version; then |
2925 | cat <<\_ACEOF |
2926 | -yazpp configure 1.2.7 |
2927 | +yazpp configure 1.3.0 |
2928 | generated by GNU Autoconf 2.68 |
2929 | |
2930 | Copyright (C) 2010 Free Software Foundation, Inc. |
2931 | @@ -1986,7 +1987,7 @@ |
2932 | This file contains any messages produced by compilers while |
2933 | running configure, to aid debugging if configure makes a mistake. |
2934 | |
2935 | -It was created by yazpp $as_me 1.2.7, which was |
2936 | +It was created by yazpp $as_me 1.3.0, which was |
2937 | generated by GNU Autoconf 2.68. Invocation command line was |
2938 | |
2939 | $ $0 $@ |
2940 | @@ -2804,7 +2805,7 @@ |
2941 | |
2942 | # Define the identity of the package. |
2943 | PACKAGE='yazpp' |
2944 | - VERSION='1.2.7' |
2945 | + VERSION='1.3.0' |
2946 | |
2947 | |
2948 | cat >>confdefs.h <<_ACEOF |
2949 | @@ -2834,11 +2835,11 @@ |
2950 | |
2951 | # We need awk for the "check" target. The system "awk" is bad on |
2952 | # some platforms. |
2953 | -# Always define AMTAR for backward compatibility. |
2954 | - |
2955 | -AMTAR=${AMTAR-"${am_missing_run}tar"} |
2956 | - |
2957 | -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' |
2958 | +# Always define AMTAR for backward compatibility. Yes, it's still used |
2959 | +# in the wild :-( We should find a proper way to deprecate it ... |
2960 | +AMTAR='$${TAR-tar}' |
2961 | + |
2962 | +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' |
2963 | |
2964 | |
2965 | |
2966 | @@ -3686,6 +3687,7 @@ |
2967 | if test "x$enable_dependency_tracking" != xno; then |
2968 | am_depcomp="$ac_aux_dir/depcomp" |
2969 | AMDEPBACKSLASH='\' |
2970 | + am__nodep='_no' |
2971 | fi |
2972 | if test "x$enable_dependency_tracking" != xno; then |
2973 | AMDEP_TRUE= |
2974 | @@ -3710,6 +3712,7 @@ |
2975 | # instance it was reported that on HP-UX the gcc test will end up |
2976 | # making a dummy file named `D' -- because `-MD' means `put the output |
2977 | # in D'. |
2978 | + rm -rf conftest.dir |
2979 | mkdir conftest.dir |
2980 | # Copy depcomp to subdir because otherwise we won't find it if we're |
2981 | # using a relative directory. |
2982 | @@ -3769,7 +3772,7 @@ |
2983 | break |
2984 | fi |
2985 | ;; |
2986 | - msvisualcpp | msvcmsys) |
2987 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
2988 | # This compiler won't grok `-c -o', but also, the minuso test has |
2989 | # not run yet. These depmodes are late enough in the game, and |
2990 | # so weak that their functioning should not be impacted. |
2991 | @@ -4231,6 +4234,7 @@ |
2992 | # instance it was reported that on HP-UX the gcc test will end up |
2993 | # making a dummy file named `D' -- because `-MD' means `put the output |
2994 | # in D'. |
2995 | + rm -rf conftest.dir |
2996 | mkdir conftest.dir |
2997 | # Copy depcomp to subdir because otherwise we won't find it if we're |
2998 | # using a relative directory. |
2999 | @@ -4290,7 +4294,7 @@ |
3000 | break |
3001 | fi |
3002 | ;; |
3003 | - msvisualcpp | msvcmsys) |
3004 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
3005 | # This compiler won't grok `-c -o', but also, the minuso test has |
3006 | # not run yet. These depmodes are late enough in the game, and |
3007 | # so weak that their functioning should not be impacted. |
3008 | @@ -4597,8 +4601,8 @@ |
3009 | |
3010 | |
3011 | |
3012 | -macro_version='2.4' |
3013 | -macro_revision='1.3293' |
3014 | +macro_version='2.4.2' |
3015 | +macro_revision='1.3337' |
3016 | |
3017 | |
3018 | |
3019 | @@ -5313,6 +5317,11 @@ |
3020 | lt_cv_sys_max_cmd_len=196608 |
3021 | ;; |
3022 | |
3023 | + os2*) |
3024 | + # The test takes a long time on OS/2. |
3025 | + lt_cv_sys_max_cmd_len=8192 |
3026 | + ;; |
3027 | + |
3028 | osf*) |
3029 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
3030 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
3031 | @@ -5352,7 +5361,7 @@ |
3032 | # If test is not a shell built-in, we'll probably end up computing a |
3033 | # maximum length that is only half of the actual maximum length, but |
3034 | # we can't tell. |
3035 | - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
3036 | + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
3037 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
3038 | test $i != 17 # 1/2 MB should be enough |
3039 | do |
3040 | @@ -5781,7 +5790,7 @@ |
3041 | lt_cv_deplibs_check_method=pass_all |
3042 | ;; |
3043 | |
3044 | -# This must be Linux ELF. |
3045 | +# This must be glibc/ELF. |
3046 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3047 | lt_cv_deplibs_check_method=pass_all |
3048 | ;; |
3049 | @@ -6421,13 +6430,13 @@ |
3050 | if test -n "$RANLIB"; then |
3051 | case $host_os in |
3052 | openbsd*) |
3053 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
3054 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
3055 | ;; |
3056 | *) |
3057 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
3058 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
3059 | ;; |
3060 | esac |
3061 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
3062 | + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
3063 | fi |
3064 | |
3065 | case $host_os in |
3066 | @@ -6574,6 +6583,7 @@ |
3067 | # which start with @ or ?. |
3068 | lt_cv_sys_global_symbol_pipe="$AWK '"\ |
3069 | " {last_section=section; section=\$ 3};"\ |
3070 | +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ |
3071 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
3072 | " \$ 0!~/External *\|/{next};"\ |
3073 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
3074 | @@ -6962,7 +6972,7 @@ |
3075 | CFLAGS="$SAVE_CFLAGS" |
3076 | fi |
3077 | ;; |
3078 | -sparc*-*solaris*) |
3079 | +*-*solaris*) |
3080 | # Find out which ABI we are using. |
3081 | echo 'int i;' > conftest.$ac_ext |
3082 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
3083 | @@ -6973,7 +6983,20 @@ |
3084 | case `/usr/bin/file conftest.o` in |
3085 | *64-bit*) |
3086 | case $lt_cv_prog_gnu_ld in |
3087 | - yes*) LD="${LD-ld} -m elf64_sparc" ;; |
3088 | + yes*) |
3089 | + case $host in |
3090 | + i?86-*-solaris*) |
3091 | + LD="${LD-ld} -m elf_x86_64" |
3092 | + ;; |
3093 | + sparc*-*-solaris*) |
3094 | + LD="${LD-ld} -m elf64_sparc" |
3095 | + ;; |
3096 | + esac |
3097 | + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. |
3098 | + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then |
3099 | + LD="${LD-ld}_sol2" |
3100 | + fi |
3101 | + ;; |
3102 | *) |
3103 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
3104 | LD="${LD-ld} -64" |
3105 | @@ -7613,7 +7636,13 @@ |
3106 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
3107 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
3108 | _lt_result=$? |
3109 | - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then |
3110 | + # If there is a non-empty error log, and "single_module" |
3111 | + # appears in it, assume the flag caused a linker warning |
3112 | + if test -s conftest.err && $GREP single_module conftest.err; then |
3113 | + cat conftest.err >&5 |
3114 | + # Otherwise, if the output was created with a 0 exit code from |
3115 | + # the compiler, it worked. |
3116 | + elif test -f libconftest.dylib && test $_lt_result -eq 0; then |
3117 | lt_cv_apple_cc_single_mod=yes |
3118 | else |
3119 | cat conftest.err >&5 |
3120 | @@ -7624,6 +7653,7 @@ |
3121 | fi |
3122 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 |
3123 | $as_echo "$lt_cv_apple_cc_single_mod" >&6; } |
3124 | + |
3125 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 |
3126 | $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } |
3127 | if ${lt_cv_ld_exported_symbols_list+:} false; then : |
3128 | @@ -7656,6 +7686,7 @@ |
3129 | fi |
3130 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 |
3131 | $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } |
3132 | + |
3133 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 |
3134 | $as_echo_n "checking for -force_load linker flag... " >&6; } |
3135 | if ${lt_cv_ld_force_load+:} false; then : |
3136 | @@ -7677,7 +7708,9 @@ |
3137 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 |
3138 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
3139 | _lt_result=$? |
3140 | - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then |
3141 | + if test -s conftest.err && $GREP force_load conftest.err; then |
3142 | + cat conftest.err >&5 |
3143 | + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then |
3144 | lt_cv_ld_force_load=yes |
3145 | else |
3146 | cat conftest.err >&5 |
3147 | @@ -7843,7 +7876,22 @@ |
3148 | |
3149 | # Check whether --with-pic was given. |
3150 | if test "${with_pic+set}" = set; then : |
3151 | - withval=$with_pic; pic_mode="$withval" |
3152 | + withval=$with_pic; lt_p=${PACKAGE-default} |
3153 | + case $withval in |
3154 | + yes|no) pic_mode=$withval ;; |
3155 | + *) |
3156 | + pic_mode=default |
3157 | + # Look at the argument we got. We use all the common list separators. |
3158 | + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," |
3159 | + for lt_pkg in $withval; do |
3160 | + IFS="$lt_save_ifs" |
3161 | + if test "X$lt_pkg" = "X$lt_p"; then |
3162 | + pic_mode=yes |
3163 | + fi |
3164 | + done |
3165 | + IFS="$lt_save_ifs" |
3166 | + ;; |
3167 | + esac |
3168 | else |
3169 | pic_mode=default |
3170 | fi |
3171 | @@ -7921,6 +7969,10 @@ |
3172 | |
3173 | |
3174 | |
3175 | + |
3176 | + |
3177 | + |
3178 | + |
3179 | test -z "$LN_S" && LN_S="ln -s" |
3180 | |
3181 | |
3182 | @@ -8380,7 +8432,9 @@ |
3183 | case $cc_basename in |
3184 | nvcc*) # Cuda Compiler Driver 2.2 |
3185 | lt_prog_compiler_wl='-Xlinker ' |
3186 | - lt_prog_compiler_pic='-Xcompiler -fPIC' |
3187 | + if test -n "$lt_prog_compiler_pic"; then |
3188 | + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" |
3189 | + fi |
3190 | ;; |
3191 | esac |
3192 | else |
3193 | @@ -8471,18 +8525,33 @@ |
3194 | ;; |
3195 | *) |
3196 | case `$CC -V 2>&1 | sed 5q` in |
3197 | - *Sun\ F* | *Sun*Fortran*) |
3198 | + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) |
3199 | # Sun Fortran 8.3 passes all unrecognized flags to the linker |
3200 | lt_prog_compiler_pic='-KPIC' |
3201 | lt_prog_compiler_static='-Bstatic' |
3202 | lt_prog_compiler_wl='' |
3203 | ;; |
3204 | + *Sun\ F* | *Sun*Fortran*) |
3205 | + lt_prog_compiler_pic='-KPIC' |
3206 | + lt_prog_compiler_static='-Bstatic' |
3207 | + lt_prog_compiler_wl='-Qoption ld ' |
3208 | + ;; |
3209 | *Sun\ C*) |
3210 | # Sun C 5.9 |
3211 | lt_prog_compiler_pic='-KPIC' |
3212 | lt_prog_compiler_static='-Bstatic' |
3213 | lt_prog_compiler_wl='-Wl,' |
3214 | ;; |
3215 | + *Intel*\ [CF]*Compiler*) |
3216 | + lt_prog_compiler_wl='-Wl,' |
3217 | + lt_prog_compiler_pic='-fPIC' |
3218 | + lt_prog_compiler_static='-static' |
3219 | + ;; |
3220 | + *Portland\ Group*) |
3221 | + lt_prog_compiler_wl='-Wl,' |
3222 | + lt_prog_compiler_pic='-fpic' |
3223 | + lt_prog_compiler_static='-Bstatic' |
3224 | + ;; |
3225 | esac |
3226 | ;; |
3227 | esac |
3228 | @@ -8844,7 +8913,6 @@ |
3229 | hardcode_direct=no |
3230 | hardcode_direct_absolute=no |
3231 | hardcode_libdir_flag_spec= |
3232 | - hardcode_libdir_flag_spec_ld= |
3233 | hardcode_libdir_separator= |
3234 | hardcode_minus_L=no |
3235 | hardcode_shlibpath_var=unsupported |
3236 | @@ -9097,8 +9165,7 @@ |
3237 | xlf* | bgf* | bgxlf* | mpixlf*) |
3238 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
3239 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
3240 | - hardcode_libdir_flag_spec= |
3241 | - hardcode_libdir_flag_spec_ld='-rpath $libdir' |
3242 | + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
3243 | archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
3244 | if test "x$supports_anon_versioning" = xyes; then |
3245 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
3246 | @@ -9478,6 +9545,7 @@ |
3247 | # The linker will not automatically build a static lib if we build a DLL. |
3248 | # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
3249 | enable_shared_with_static_runtimes=yes |
3250 | + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
3251 | export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
3252 | # Don't use ranlib |
3253 | old_postinstall_cmds='chmod 644 $oldlib' |
3254 | @@ -9523,6 +9591,7 @@ |
3255 | hardcode_shlibpath_var=unsupported |
3256 | if test "$lt_cv_ld_force_load" = "yes"; then |
3257 | whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
3258 | + |
3259 | else |
3260 | whole_archive_flag_spec='' |
3261 | fi |
3262 | @@ -9551,10 +9620,6 @@ |
3263 | hardcode_shlibpath_var=no |
3264 | ;; |
3265 | |
3266 | - freebsd1*) |
3267 | - ld_shlibs=no |
3268 | - ;; |
3269 | - |
3270 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
3271 | # support. Future versions do this automatically, but an explicit c++rt0.o |
3272 | # does not break anything, and helps significantly (at the cost of a little |
3273 | @@ -9567,7 +9632,7 @@ |
3274 | ;; |
3275 | |
3276 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
3277 | - freebsd2*) |
3278 | + freebsd2.*) |
3279 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
3280 | hardcode_direct=yes |
3281 | hardcode_minus_L=yes |
3282 | @@ -9606,7 +9671,6 @@ |
3283 | fi |
3284 | if test "$with_gnu_ld" = no; then |
3285 | hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
3286 | - hardcode_libdir_flag_spec_ld='+b $libdir' |
3287 | hardcode_libdir_separator=: |
3288 | hardcode_direct=yes |
3289 | hardcode_direct_absolute=yes |
3290 | @@ -10230,11 +10294,6 @@ |
3291 | |
3292 | |
3293 | |
3294 | - |
3295 | - |
3296 | - |
3297 | - |
3298 | - |
3299 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 |
3300 | $as_echo_n "checking dynamic linker characteristics... " >&6; } |
3301 | |
3302 | @@ -10324,7 +10383,7 @@ |
3303 | |
3304 | case $host_os in |
3305 | aix3*) |
3306 | - version_type=linux |
3307 | + version_type=linux # correct to gnu/linux during the next big refactor |
3308 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
3309 | shlibpath_var=LIBPATH |
3310 | |
3311 | @@ -10333,7 +10392,7 @@ |
3312 | ;; |
3313 | |
3314 | aix[4-9]*) |
3315 | - version_type=linux |
3316 | + version_type=linux # correct to gnu/linux during the next big refactor |
3317 | need_lib_prefix=no |
3318 | need_version=no |
3319 | hardcode_into_libs=yes |
3320 | @@ -10398,7 +10457,7 @@ |
3321 | ;; |
3322 | |
3323 | bsdi[45]*) |
3324 | - version_type=linux |
3325 | + version_type=linux # correct to gnu/linux during the next big refactor |
3326 | need_version=no |
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 | @@ -10537,7 +10596,7 @@ |
3330 | ;; |
3331 | |
3332 | dgux*) |
3333 | - version_type=linux |
3334 | + version_type=linux # correct to gnu/linux during the next big refactor |
3335 | need_lib_prefix=no |
3336 | need_version=no |
3337 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
3338 | @@ -10545,10 +10604,6 @@ |
3339 | shlibpath_var=LD_LIBRARY_PATH |
3340 | ;; |
3341 | |
3342 | -freebsd1*) |
3343 | - dynamic_linker=no |
3344 | - ;; |
3345 | - |
3346 | freebsd* | dragonfly*) |
3347 | # DragonFly does not have aout. When/if they implement a new |
3348 | # versioning mechanism, adjust this. |
3349 | @@ -10556,7 +10611,7 @@ |
3350 | objformat=`/usr/bin/objformat` |
3351 | else |
3352 | case $host_os in |
3353 | - freebsd[123]*) objformat=aout ;; |
3354 | + freebsd[23].*) objformat=aout ;; |
3355 | *) objformat=elf ;; |
3356 | esac |
3357 | fi |
3358 | @@ -10574,7 +10629,7 @@ |
3359 | esac |
3360 | shlibpath_var=LD_LIBRARY_PATH |
3361 | case $host_os in |
3362 | - freebsd2*) |
3363 | + freebsd2.*) |
3364 | shlibpath_overrides_runpath=yes |
3365 | ;; |
3366 | freebsd3.[01]* | freebsdelf3.[01]*) |
3367 | @@ -10594,7 +10649,7 @@ |
3368 | ;; |
3369 | |
3370 | gnu*) |
3371 | - version_type=linux |
3372 | + version_type=linux # correct to gnu/linux during the next big refactor |
3373 | need_lib_prefix=no |
3374 | need_version=no |
3375 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
3376 | @@ -10605,7 +10660,7 @@ |
3377 | ;; |
3378 | |
3379 | haiku*) |
3380 | - version_type=linux |
3381 | + version_type=linux # correct to gnu/linux during the next big refactor |
3382 | need_lib_prefix=no |
3383 | need_version=no |
3384 | dynamic_linker="$host_os runtime_loader" |
3385 | @@ -10666,7 +10721,7 @@ |
3386 | ;; |
3387 | |
3388 | interix[3-9]*) |
3389 | - version_type=linux |
3390 | + version_type=linux # correct to gnu/linux during the next big refactor |
3391 | need_lib_prefix=no |
3392 | need_version=no |
3393 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
3394 | @@ -10682,7 +10737,7 @@ |
3395 | nonstopux*) version_type=nonstopux ;; |
3396 | *) |
3397 | if test "$lt_cv_prog_gnu_ld" = yes; then |
3398 | - version_type=linux |
3399 | + version_type=linux # correct to gnu/linux during the next big refactor |
3400 | else |
3401 | version_type=irix |
3402 | fi ;; |
3403 | @@ -10719,9 +10774,9 @@ |
3404 | dynamic_linker=no |
3405 | ;; |
3406 | |
3407 | -# This must be Linux ELF. |
3408 | +# This must be glibc/ELF. |
3409 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3410 | - version_type=linux |
3411 | + version_type=linux # correct to gnu/linux during the next big refactor |
3412 | need_lib_prefix=no |
3413 | need_version=no |
3414 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3415 | @@ -10815,7 +10870,7 @@ |
3416 | ;; |
3417 | |
3418 | newsos6) |
3419 | - version_type=linux |
3420 | + version_type=linux # correct to gnu/linux during the next big refactor |
3421 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3422 | shlibpath_var=LD_LIBRARY_PATH |
3423 | shlibpath_overrides_runpath=yes |
3424 | @@ -10884,7 +10939,7 @@ |
3425 | ;; |
3426 | |
3427 | solaris*) |
3428 | - version_type=linux |
3429 | + version_type=linux # correct to gnu/linux during the next big refactor |
3430 | need_lib_prefix=no |
3431 | need_version=no |
3432 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3433 | @@ -10909,7 +10964,7 @@ |
3434 | ;; |
3435 | |
3436 | sysv4 | sysv4.3*) |
3437 | - version_type=linux |
3438 | + version_type=linux # correct to gnu/linux during the next big refactor |
3439 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3440 | soname_spec='${libname}${release}${shared_ext}$major' |
3441 | shlibpath_var=LD_LIBRARY_PATH |
3442 | @@ -10933,7 +10988,7 @@ |
3443 | |
3444 | sysv4*MP*) |
3445 | if test -d /usr/nec ;then |
3446 | - version_type=linux |
3447 | + version_type=linux # correct to gnu/linux during the next big refactor |
3448 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
3449 | soname_spec='$libname${shared_ext}.$major' |
3450 | shlibpath_var=LD_LIBRARY_PATH |
3451 | @@ -10964,7 +11019,7 @@ |
3452 | |
3453 | tpf*) |
3454 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
3455 | - version_type=linux |
3456 | + version_type=linux # correct to gnu/linux during the next big refactor |
3457 | need_lib_prefix=no |
3458 | need_version=no |
3459 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3460 | @@ -10974,7 +11029,7 @@ |
3461 | ;; |
3462 | |
3463 | uts4*) |
3464 | - version_type=linux |
3465 | + version_type=linux # correct to gnu/linux during the next big refactor |
3466 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3467 | soname_spec='${libname}${release}${shared_ext}$major' |
3468 | shlibpath_var=LD_LIBRARY_PATH |
3469 | @@ -11899,7 +11954,6 @@ |
3470 | hardcode_direct_CXX=no |
3471 | hardcode_direct_absolute_CXX=no |
3472 | hardcode_libdir_flag_spec_CXX= |
3473 | -hardcode_libdir_flag_spec_ld_CXX= |
3474 | hardcode_libdir_separator_CXX= |
3475 | hardcode_minus_L_CXX=no |
3476 | hardcode_shlibpath_var_CXX=unsupported |
3477 | @@ -12483,6 +12537,7 @@ |
3478 | hardcode_shlibpath_var_CXX=unsupported |
3479 | if test "$lt_cv_ld_force_load" = "yes"; then |
3480 | whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
3481 | + |
3482 | else |
3483 | whole_archive_flag_spec_CXX='' |
3484 | fi |
3485 | @@ -12527,7 +12582,7 @@ |
3486 | esac |
3487 | ;; |
3488 | |
3489 | - freebsd[12]*) |
3490 | + freebsd2.*) |
3491 | # C++ shared libraries reported to be fairly broken before |
3492 | # switch to ELF |
3493 | ld_shlibs_CXX=no |
3494 | @@ -13203,6 +13258,7 @@ |
3495 | case "$CC $CFLAGS " in #( |
3496 | *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; |
3497 | *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; |
3498 | +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; |
3499 | esac |
3500 | |
3501 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
3502 | @@ -13992,7 +14048,9 @@ |
3503 | ;; |
3504 | cygwin* | mingw* | cegcc*) |
3505 | case $cc_basename in |
3506 | - cl*) ;; |
3507 | + cl*) |
3508 | + exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
3509 | + ;; |
3510 | *) |
3511 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' |
3512 | exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
3513 | @@ -14148,8 +14206,6 @@ |
3514 | |
3515 | |
3516 | |
3517 | - |
3518 | - |
3519 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 |
3520 | $as_echo_n "checking dynamic linker characteristics... " >&6; } |
3521 | |
3522 | @@ -14175,7 +14231,7 @@ |
3523 | |
3524 | case $host_os in |
3525 | aix3*) |
3526 | - version_type=linux |
3527 | + version_type=linux # correct to gnu/linux during the next big refactor |
3528 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
3529 | shlibpath_var=LIBPATH |
3530 | |
3531 | @@ -14184,7 +14240,7 @@ |
3532 | ;; |
3533 | |
3534 | aix[4-9]*) |
3535 | - version_type=linux |
3536 | + version_type=linux # correct to gnu/linux during the next big refactor |
3537 | need_lib_prefix=no |
3538 | need_version=no |
3539 | hardcode_into_libs=yes |
3540 | @@ -14249,7 +14305,7 @@ |
3541 | ;; |
3542 | |
3543 | bsdi[45]*) |
3544 | - version_type=linux |
3545 | + version_type=linux # correct to gnu/linux during the next big refactor |
3546 | need_version=no |
3547 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3548 | soname_spec='${libname}${release}${shared_ext}$major' |
3549 | @@ -14386,7 +14442,7 @@ |
3550 | ;; |
3551 | |
3552 | dgux*) |
3553 | - version_type=linux |
3554 | + version_type=linux # correct to gnu/linux during the next big refactor |
3555 | need_lib_prefix=no |
3556 | need_version=no |
3557 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
3558 | @@ -14394,10 +14450,6 @@ |
3559 | shlibpath_var=LD_LIBRARY_PATH |
3560 | ;; |
3561 | |
3562 | -freebsd1*) |
3563 | - dynamic_linker=no |
3564 | - ;; |
3565 | - |
3566 | freebsd* | dragonfly*) |
3567 | # DragonFly does not have aout. When/if they implement a new |
3568 | # versioning mechanism, adjust this. |
3569 | @@ -14405,7 +14457,7 @@ |
3570 | objformat=`/usr/bin/objformat` |
3571 | else |
3572 | case $host_os in |
3573 | - freebsd[123]*) objformat=aout ;; |
3574 | + freebsd[23].*) objformat=aout ;; |
3575 | *) objformat=elf ;; |
3576 | esac |
3577 | fi |
3578 | @@ -14423,7 +14475,7 @@ |
3579 | esac |
3580 | shlibpath_var=LD_LIBRARY_PATH |
3581 | case $host_os in |
3582 | - freebsd2*) |
3583 | + freebsd2.*) |
3584 | shlibpath_overrides_runpath=yes |
3585 | ;; |
3586 | freebsd3.[01]* | freebsdelf3.[01]*) |
3587 | @@ -14443,7 +14495,7 @@ |
3588 | ;; |
3589 | |
3590 | gnu*) |
3591 | - version_type=linux |
3592 | + version_type=linux # correct to gnu/linux during the next big refactor |
3593 | need_lib_prefix=no |
3594 | need_version=no |
3595 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
3596 | @@ -14454,7 +14506,7 @@ |
3597 | ;; |
3598 | |
3599 | haiku*) |
3600 | - version_type=linux |
3601 | + version_type=linux # correct to gnu/linux during the next big refactor |
3602 | need_lib_prefix=no |
3603 | need_version=no |
3604 | dynamic_linker="$host_os runtime_loader" |
3605 | @@ -14515,7 +14567,7 @@ |
3606 | ;; |
3607 | |
3608 | interix[3-9]*) |
3609 | - version_type=linux |
3610 | + version_type=linux # correct to gnu/linux during the next big refactor |
3611 | need_lib_prefix=no |
3612 | need_version=no |
3613 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
3614 | @@ -14531,7 +14583,7 @@ |
3615 | nonstopux*) version_type=nonstopux ;; |
3616 | *) |
3617 | if test "$lt_cv_prog_gnu_ld" = yes; then |
3618 | - version_type=linux |
3619 | + version_type=linux # correct to gnu/linux during the next big refactor |
3620 | else |
3621 | version_type=irix |
3622 | fi ;; |
3623 | @@ -14568,9 +14620,9 @@ |
3624 | dynamic_linker=no |
3625 | ;; |
3626 | |
3627 | -# This must be Linux ELF. |
3628 | +# This must be glibc/ELF. |
3629 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3630 | - version_type=linux |
3631 | + version_type=linux # correct to gnu/linux during the next big refactor |
3632 | need_lib_prefix=no |
3633 | need_version=no |
3634 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3635 | @@ -14664,7 +14716,7 @@ |
3636 | ;; |
3637 | |
3638 | newsos6) |
3639 | - version_type=linux |
3640 | + version_type=linux # correct to gnu/linux during the next big refactor |
3641 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3642 | shlibpath_var=LD_LIBRARY_PATH |
3643 | shlibpath_overrides_runpath=yes |
3644 | @@ -14733,7 +14785,7 @@ |
3645 | ;; |
3646 | |
3647 | solaris*) |
3648 | - version_type=linux |
3649 | + version_type=linux # correct to gnu/linux during the next big refactor |
3650 | need_lib_prefix=no |
3651 | need_version=no |
3652 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3653 | @@ -14758,7 +14810,7 @@ |
3654 | ;; |
3655 | |
3656 | sysv4 | sysv4.3*) |
3657 | - version_type=linux |
3658 | + version_type=linux # correct to gnu/linux during the next big refactor |
3659 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3660 | soname_spec='${libname}${release}${shared_ext}$major' |
3661 | shlibpath_var=LD_LIBRARY_PATH |
3662 | @@ -14782,7 +14834,7 @@ |
3663 | |
3664 | sysv4*MP*) |
3665 | if test -d /usr/nec ;then |
3666 | - version_type=linux |
3667 | + version_type=linux # correct to gnu/linux during the next big refactor |
3668 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
3669 | soname_spec='$libname${shared_ext}.$major' |
3670 | shlibpath_var=LD_LIBRARY_PATH |
3671 | @@ -14813,7 +14865,7 @@ |
3672 | |
3673 | tpf*) |
3674 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
3675 | - version_type=linux |
3676 | + version_type=linux # correct to gnu/linux during the next big refactor |
3677 | need_lib_prefix=no |
3678 | need_version=no |
3679 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3680 | @@ -14823,7 +14875,7 @@ |
3681 | ;; |
3682 | |
3683 | uts4*) |
3684 | - version_type=linux |
3685 | + version_type=linux # correct to gnu/linux during the next big refactor |
3686 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
3687 | soname_spec='${libname}${release}${shared_ext}$major' |
3688 | shlibpath_var=LD_LIBRARY_PATH |
3689 | @@ -14962,6 +15014,8 @@ |
3690 | |
3691 | |
3692 | |
3693 | + |
3694 | + |
3695 | ac_config_commands="$ac_config_commands libtool" |
3696 | |
3697 | |
3698 | @@ -15086,7 +15140,7 @@ |
3699 | |
3700 | fi |
3701 | |
3702 | -XSLTPROC_COMPILE='xsltproc -path ".:$(srcdir)"' |
3703 | +XSLTPROC_COMPILE='xsltproc --xinclude -path ".:$(srcdir)"' |
3704 | |
3705 | MAN_COMPILE='$(XSLTPROC_COMPILE) $(srcdir)/common/id.man.xsl' |
3706 | |
3707 | @@ -15771,7 +15825,7 @@ |
3708 | # report actual input values of CONFIG_FILES etc. instead of their |
3709 | # values after options handling. |
3710 | ac_log=" |
3711 | -This file was extended by yazpp $as_me 1.2.7, which was |
3712 | +This file was extended by yazpp $as_me 1.3.0, which was |
3713 | generated by GNU Autoconf 2.68. Invocation command line was |
3714 | |
3715 | CONFIG_FILES = $CONFIG_FILES |
3716 | @@ -15837,7 +15891,7 @@ |
3717 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
3718 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
3719 | ac_cs_version="\\ |
3720 | -yazpp config.status 1.2.7 |
3721 | +yazpp config.status 1.3.0 |
3722 | configured by $0, generated by GNU Autoconf 2.68, |
3723 | with options \\"\$ac_cs_config\\" |
3724 | |
3725 | @@ -15974,6 +16028,7 @@ |
3726 | enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' |
3727 | SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' |
3728 | ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' |
3729 | +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' |
3730 | host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' |
3731 | host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' |
3732 | host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' |
3733 | @@ -16056,7 +16111,6 @@ |
3734 | allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' |
3735 | no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' |
3736 | hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' |
3737 | -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' |
3738 | hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' |
3739 | hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' |
3740 | hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' |
3741 | @@ -16128,7 +16182,6 @@ |
3742 | allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' |
3743 | no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' |
3744 | hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' |
3745 | -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`' |
3746 | hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' |
3747 | hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' |
3748 | hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' |
3749 | @@ -16167,6 +16220,7 @@ |
3750 | # Quote evaled strings. |
3751 | for var in SHELL \ |
3752 | ECHO \ |
3753 | +PATH_SEPARATOR \ |
3754 | SED \ |
3755 | GREP \ |
3756 | EGREP \ |
3757 | @@ -16217,7 +16271,6 @@ |
3758 | allow_undefined_flag \ |
3759 | no_undefined_flag \ |
3760 | hardcode_libdir_flag_spec \ |
3761 | -hardcode_libdir_flag_spec_ld \ |
3762 | hardcode_libdir_separator \ |
3763 | exclude_expsyms \ |
3764 | include_expsyms \ |
3765 | @@ -16251,7 +16304,6 @@ |
3766 | allow_undefined_flag_CXX \ |
3767 | no_undefined_flag_CXX \ |
3768 | hardcode_libdir_flag_spec_CXX \ |
3769 | -hardcode_libdir_flag_spec_ld_CXX \ |
3770 | hardcode_libdir_separator_CXX \ |
3771 | exclude_expsyms_CXX \ |
3772 | include_expsyms_CXX \ |
3773 | @@ -17070,8 +17122,8 @@ |
3774 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
3775 | # |
3776 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
3777 | -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
3778 | -# Inc. |
3779 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3780 | +# Foundation, Inc. |
3781 | # Written by Gordon Matzigkeit, 1996 |
3782 | # |
3783 | # This file is part of GNU Libtool. |
3784 | @@ -17125,6 +17177,9 @@ |
3785 | # An echo program that protects backslashes. |
3786 | ECHO=$lt_ECHO |
3787 | |
3788 | +# The PATH separator for the build system. |
3789 | +PATH_SEPARATOR=$lt_PATH_SEPARATOR |
3790 | + |
3791 | # The host system. |
3792 | host_alias=$host_alias |
3793 | host=$host |
3794 | @@ -17426,10 +17481,6 @@ |
3795 | # This must work even if \$libdir does not exist |
3796 | hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec |
3797 | |
3798 | -# If ld is used when linking, flag to hardcode \$libdir into a binary |
3799 | -# during linking. This must work even if \$libdir does not exist. |
3800 | -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld |
3801 | - |
3802 | # Whether we need a single "-rpath" flag with a separated argument. |
3803 | hardcode_libdir_separator=$lt_hardcode_libdir_separator |
3804 | |
3805 | @@ -17772,10 +17823,6 @@ |
3806 | # This must work even if \$libdir does not exist |
3807 | hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX |
3808 | |
3809 | -# If ld is used when linking, flag to hardcode \$libdir into a binary |
3810 | -# during linking. This must work even if \$libdir does not exist. |
3811 | -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX |
3812 | - |
3813 | # Whether we need a single "-rpath" flag with a separated argument. |
3814 | hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX |
3815 | |
3816 | |
3817 | === modified file 'configure.ac' |
3818 | --- configure.ac 2011-11-20 21:16:52 +0000 |
3819 | +++ configure.ac 2012-06-13 02:33:18 +0000 |
3820 | @@ -1,7 +1,9 @@ |
3821 | dnl This file is part of yazpp |
3822 | -dnl Copyright (C) 1998-2011 Index Data |
3823 | +dnl Copyright (C) 1998-2012 Index Data |
3824 | AC_PREREQ(2.60) |
3825 | -AC_INIT([yazpp],[1.2.7],[adam@indexdata.dk]) |
3826 | +AC_INIT([yazpp], |
3827 | +m4_esyscmd([. ./IDMETA; echo $VERSION|tr -d '\n']), |
3828 | +[adam@indexdata.dk]) |
3829 | AC_CONFIG_HEADERS([include/config.h]) |
3830 | AC_CONFIG_SRCDIR(configure.ac) |
3831 | AC_CONFIG_AUX_DIR([config]) |
3832 | |
3833 | === modified file 'debian/changelog' |
3834 | --- debian/changelog 2011-11-20 21:16:52 +0000 |
3835 | +++ debian/changelog 2012-06-13 02:33:18 +0000 |
3836 | @@ -1,3 +1,9 @@ |
3837 | +yazpp (1.3.0-0ubuntu1) UNRELEASED; urgency=low |
3838 | + |
3839 | + * New upstream release. |
3840 | + |
3841 | + -- Logan Rosen <logatronico@gmail.com> Tue, 12 Jun 2012 22:23:50 -0400 |
3842 | + |
3843 | yazpp (1.2.7-0ubuntu1) precise; urgency=low |
3844 | |
3845 | * New upstream release. |
3846 | |
3847 | === modified file 'doc/Makefile.in' |
3848 | --- doc/Makefile.in 2011-11-20 21:16:52 +0000 |
3849 | +++ doc/Makefile.in 2012-06-13 02:33:18 +0000 |
3850 | @@ -1,9 +1,9 @@ |
3851 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
3852 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
3853 | # @configure_input@ |
3854 | |
3855 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
3856 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
3857 | -# Inc. |
3858 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3859 | +# Foundation, Inc. |
3860 | # This Makefile.in is free software; the Free Software Foundation |
3861 | # gives unlimited permission to copy and/or distribute it, |
3862 | # with or without modifications, as long as this notice is preserved. |
3863 | @@ -78,6 +78,12 @@ |
3864 | am__base_list = \ |
3865 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
3866 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
3867 | +am__uninstall_files_from_dir = { \ |
3868 | + test -z "$$files" \ |
3869 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
3870 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
3871 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
3872 | + } |
3873 | man1dir = $(mandir)/man1 |
3874 | am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)" |
3875 | NROFF = nroff |
3876 | @@ -342,9 +348,7 @@ |
3877 | sed -n '/\.1[a-z]*$$/p'; \ |
3878 | } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ |
3879 | -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ |
3880 | - test -z "$$files" || { \ |
3881 | - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ |
3882 | - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } |
3883 | + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) |
3884 | install-docDATA: $(doc_DATA) |
3885 | @$(NORMAL_INSTALL) |
3886 | test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" |
3887 | @@ -362,9 +366,7 @@ |
3888 | @$(NORMAL_UNINSTALL) |
3889 | @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ |
3890 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
3891 | - test -n "$$files" || exit 0; \ |
3892 | - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ |
3893 | - cd "$(DESTDIR)$(docdir)" && rm -f $$files |
3894 | + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) |
3895 | |
3896 | # This directory's subdirectories are mostly independent; you can cd |
3897 | # into them and run `make' without going through this Makefile. |
3898 | @@ -593,10 +595,15 @@ |
3899 | |
3900 | installcheck: installcheck-recursive |
3901 | install-strip: |
3902 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3903 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3904 | - `test -z '$(STRIP)' || \ |
3905 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
3906 | + if test -z '$(STRIP)'; then \ |
3907 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3908 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3909 | + install; \ |
3910 | + else \ |
3911 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3912 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3913 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
3914 | + fi |
3915 | mostlyclean-generic: |
3916 | |
3917 | clean-generic: |
3918 | |
3919 | === modified file 'doc/NEWS' |
3920 | --- doc/NEWS 2011-11-20 21:16:52 +0000 |
3921 | +++ doc/NEWS 2012-06-13 02:33:18 +0000 |
3922 | @@ -1,3 +1,9 @@ |
3923 | +Log incoming HTTP package content if decoding fails. |
3924 | + |
3925 | +--- 1.2.7 2011/08/12 |
3926 | + |
3927 | +Force YAZ 4.2.8 because it provides new functionality. |
3928 | + |
3929 | --- 1.2.6 2011/06/20 |
3930 | |
3931 | Use config.h for configure defines. |
3932 | |
3933 | === modified file 'doc/api.html' |
3934 | --- doc/api.html 2010-09-24 20:56:47 +0000 |
3935 | +++ doc/api.html 2012-06-13 02:33:18 +0000 |
3936 | @@ -1,4 +1,4 @@ |
3937 | -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 4. YAZ C++ API</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="prev" href="zoom-exception.html" title="6. ZOOM::exception and subclasses"><link rel="next" href="implementations.html" title="2. Implementations"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 4. YAZ C++ API</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="zoom-exception.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="implementations.html">Next</a></td></tr></table><hr></div><div class="chapter" title="Chapter 4. YAZ C++ API"><div class="titlepage"><div><div><h2 class="title"><a name="api"></a>Chapter 4. YAZ C++ API</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="api.html#interfaces">1. Interfaces</a></span></dt><dd><dl><dt><span class="section"><a href="api.html#ISocketObservable">1.1. ISocketObservable</a></span></dt><dt><span class="section"><a href="api.html#ISocketObserver">1.2. ISocketObserver</a></span></dt><dt><span class="section"><a href="api.html#IPDU_Observable">1.3. IPDU_Observable</a></span></dt><dt><span class="section"><a href="api.html#IPDU_Observer">1.4. IPDU_Observer</a></span></dt><dt><span class="section"><a href="api.html#query">1.5. Yaz_Query</a></span></dt></dl></dd><dt><span class="section"><a href="implementations.html">2. Implementations</a></span></dt><dd><dl><dt><span class="section"><a href="implementations.html#Yaz_SocketManager">2.1. Yaz_SocketManager</a></span></dt><dt><span class="section"><a href="implementations.html#PDU_Assoc">2.2. PDU_Assoc</a></span></dt><dt><span class="section"><a href="implementations.html#Z_Assoc">2.3. Z_Assoc</a></span></dt><dt><span class="section"><a href="implementations.html#IR_Assoc">2.4. IR_Assoc</a></span></dt><dt><span class="section"><a href="implementations.html#Z_Server">2.5. Z_Server</a></span></dt></dl></dd></dl></div><p> |
3938 | +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 4. YAZ C++ API</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="prev" href="zoom-exception.html" title="6. ZOOM::exception and subclasses"><link rel="next" href="implementations.html" title="2. Implementations"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 4. YAZ C++ API</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="zoom-exception.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="implementations.html">Next</a></td></tr></table><hr></div><div class="chapter" title="Chapter 4. YAZ C++ API"><div class="titlepage"><div><div><h2 class="title"><a name="api"></a>Chapter 4. YAZ C++ API</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="api.html#interfaces">1. Interfaces</a></span></dt><dd><dl><dt><span class="section"><a href="api.html#ISocketObservable">1.1. ISocketObservable</a></span></dt><dt><span class="section"><a href="api.html#ISocketObserver">1.2. ISocketObserver</a></span></dt><dt><span class="section"><a href="api.html#IPDU_Observable">1.3. IPDU_Observable</a></span></dt><dt><span class="section"><a href="api.html#IPDU_Observer">1.4. IPDU_Observer</a></span></dt><dt><span class="section"><a href="api.html#query">1.5. Yaz_Query</a></span></dt></dl></dd><dt><span class="section"><a href="implementations.html">2. Implementations</a></span></dt><dd><dl><dt><span class="section"><a href="implementations.html#Yaz_SocketManager">2.1. Yaz_SocketManager</a></span></dt><dt><span class="section"><a href="implementations.html#PDU_Assoc">2.2. PDU_Assoc</a></span></dt><dt><span class="section"><a href="implementations.html#Z_Assoc">2.3. Z_Assoc</a></span></dt><dt><span class="section"><a href="implementations.html#IR_Assoc">2.4. IR_Assoc</a></span></dt><dt><span class="section"><a href="implementations.html#Z_Server">2.5. Z_Server</a></span></dt></dl></dd></dl></div><p> |
3939 | The YAZ C++ API is an client - and server API that exposes |
3940 | all YAZ features. The API doesn't hide YAZ C data structures, but |
3941 | provides a set of useful high-level objects for creating clients - |
3942 | |
3943 | === modified file 'doc/common/Makefile.in' |
3944 | --- doc/common/Makefile.in 2011-11-20 21:16:52 +0000 |
3945 | +++ doc/common/Makefile.in 2012-06-13 02:33:18 +0000 |
3946 | @@ -1,9 +1,9 @@ |
3947 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
3948 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
3949 | # @configure_input@ |
3950 | |
3951 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
3952 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
3953 | -# Inc. |
3954 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3955 | +# Foundation, Inc. |
3956 | # This Makefile.in is free software; the Free Software Foundation |
3957 | # gives unlimited permission to copy and/or distribute it, |
3958 | # with or without modifications, as long as this notice is preserved. |
3959 | @@ -71,6 +71,12 @@ |
3960 | am__base_list = \ |
3961 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
3962 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
3963 | +am__uninstall_files_from_dir = { \ |
3964 | + test -z "$$files" \ |
3965 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
3966 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
3967 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
3968 | + } |
3969 | am__installdirs = "$(DESTDIR)$(commondir)" |
3970 | DATA = $(common_DATA) |
3971 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
3972 | @@ -277,9 +283,7 @@ |
3973 | @$(NORMAL_UNINSTALL) |
3974 | @list='$(common_DATA)'; test -n "$(commondir)" || list=; \ |
3975 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
3976 | - test -n "$$files" || exit 0; \ |
3977 | - echo " ( cd '$(DESTDIR)$(commondir)' && rm -f" $$files ")"; \ |
3978 | - cd "$(DESTDIR)$(commondir)" && rm -f $$files |
3979 | + dir='$(DESTDIR)$(commondir)'; $(am__uninstall_files_from_dir) |
3980 | tags: TAGS |
3981 | TAGS: |
3982 | |
3983 | @@ -334,10 +338,15 @@ |
3984 | |
3985 | installcheck: installcheck-am |
3986 | install-strip: |
3987 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3988 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3989 | - `test -z '$(STRIP)' || \ |
3990 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
3991 | + if test -z '$(STRIP)'; then \ |
3992 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3993 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3994 | + install; \ |
3995 | + else \ |
3996 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3997 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3998 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
3999 | + fi |
4000 | mostlyclean-generic: |
4001 | |
4002 | clean-generic: |
4003 | |
4004 | === modified file 'doc/common/common.ent' |
4005 | --- doc/common/common.ent 2010-09-24 20:56:47 +0000 |
4006 | +++ doc/common/common.ent 2012-06-13 02:33:18 +0000 |
4007 | @@ -68,6 +68,8 @@ |
4008 | <!ENTITY url.yaz.mailinglist |
4009 | "http://lists.indexdata.dk/cgi-bin/mailman/listinfo/yazlist"> |
4010 | <!ENTITY url.yaz.mail "mailto:yaz-help@indexdata.dk"> |
4011 | +<!ENTITY url.yaz.doc "http://www.indexdata.com/yaz/doc/"> |
4012 | +<!ENTITY url.yaz.install "http://www.indexdata.com/yaz/doc/installation.html"> |
4013 | <!ENTITY url.yaz.comstack.addresses "http://www.indexdata.com/yaz/doc/comstack.addresses.html"> |
4014 | <!ENTITY url.yaz.zoom "http://www.indexdata.com/yaz/doc/zoom.html"> |
4015 | <!ENTITY url.yaz.zoom.connections "http://www.indexdata.com/yaz/doc/zoom.html#zoom.connections"> |
4016 | @@ -96,6 +98,7 @@ |
4017 | <!ENTITY url.pazpar2 "http://www.indexdata.com/pazpar2/"> |
4018 | <!ENTITY url.pazpar2.download "http://ftp.indexdata.com/pub/pazpar2/"> |
4019 | <!ENTITY url.pazpar2.download.debian "http://ftp.indexdata.com/pub/pazpar2/debian/"> |
4020 | +<!ENTITY url.pazpar2.download.ubuntu "http://ftp.indexdata.com/pub/pazpar2/ubuntu/"> |
4021 | |
4022 | <!-- Specifications and Standards --> |
4023 | <!ENTITY url.w3c "http://www.w3.org/"> |
4024 | @@ -147,6 +150,7 @@ |
4025 | <!ENTITY url.marc21 "http://www.loc.gov/marc/"> |
4026 | <!ENTITY url.marc8 "http://www.loc.gov/marc/specifications/speccharmarc8.html"> |
4027 | <!ENTITY url.marcxml "http://www.loc.gov/standards/marcxml/"> |
4028 | +<!ENTITY url.marcxchange "http://www.loc.gov/standards/iso25577/"> |
4029 | <!ENTITY url.ill "http://www.nlc-bnc.ca/iso/ill/"> |
4030 | <!ENTITY url.ber.over.tcpip "http://www.faqs.org/rfcs/rfc1729.html"> |
4031 | <!ENTITY url.http "http://www.w3.org/Protocols/"> |
4032 | @@ -160,7 +164,7 @@ |
4033 | <!ENTITY url.bison "http://www.gnu.org/software/bison/"> |
4034 | <!ENTITY url.icu "http://www.icu-project.org/"> |
4035 | <!ENTITY url.icu.unicode.set "http://www.icu-project.org/userguide/unicodeSet.html"> |
4036 | -<!ENTITY url.icu.transform "http://www.icu-project.org/userguide/Transform.html"> |
4037 | +<!ENTITY url.icu.transform "http://userguide.icu-project.org/transforms/general"> |
4038 | <!ENTITY url.libxml2 "http://xmlsoft.org/"> |
4039 | <!ENTITY url.libxml2.api "http://www.xmlsoft.org/html/index.html"> |
4040 | <!ENTITY url.libxml2.api.tree "http://www.xmlsoft.org/html/libxml-tree.html"> |
4041 | @@ -183,7 +187,7 @@ |
4042 | <!ENTITY url.boost.compilers.status "http://www.boost.org/status/compiler_status.html"> |
4043 | <!ENTITY url.openssl "http://www.openssl.org/"> |
4044 | <!ENTITY url.gnutls "http://www.gnu.org/software/gnutls/"> |
4045 | -<!ENTITY url.unxutils "http://unxutils.sourceforge.net/"> |
4046 | +<!ENTITY url.unxutils "http://sourceforge.net/projects/unxutils/"> |
4047 | <!ENTITY url.tcpwrapper "ftp://ftp.porcupine.org/pub/security/index.html"> |
4048 | |
4049 | <!-- Operating Systems --> |
4050 | @@ -204,4 +208,5 @@ |
4051 | <!ENTITY url.docbook "http://docbook.org/"> |
4052 | <!ENTITY url.usemarcon "http://www.bl.uk/bibliographic/usemarcon.html"> |
4053 | <!ENTITY url.libpcap "http://www.tcpdump.org/"> |
4054 | +<!ENTITY url.solr "http://lucene.apache.org/solr/"> |
4055 | |
4056 | |
4057 | === modified file 'doc/common/style1.css' |
4058 | --- doc/common/style1.css 2007-01-22 12:28:56 +0000 |
4059 | +++ doc/common/style1.css 2012-06-13 02:33:18 +0000 |
4060 | @@ -1,6 +1,6 @@ |
4061 | |
4062 | .table table { |
4063 | - border-collapse; |
4064 | + border-collapse: collapse; |
4065 | border: 1px solid black; |
4066 | border-spacing: 0; |
4067 | width: 94%; |
4068 | |
4069 | === modified file 'doc/entities.ent' |
4070 | --- doc/entities.ent 2011-11-20 21:16:52 +0000 |
4071 | +++ doc/entities.ent 2012-06-13 02:33:18 +0000 |
4072 | @@ -3,4 +3,4 @@ |
4073 | <!ENTITY chap-zoom SYSTEM "zoom.xml"> |
4074 | <!ENTITY chap-api SYSTEM "api.xml"> |
4075 | <!ENTITY app-license SYSTEM "license.xml"> |
4076 | -<!ENTITY copyright-year "1998-2011"> |
4077 | +<!ENTITY copyright-year "1998-2012"> |
4078 | |
4079 | === modified file 'doc/implementations.html' |
4080 | --- doc/implementations.html 2010-09-24 20:56:47 +0000 |
4081 | +++ doc/implementations.html 2012-06-13 02:33:18 +0000 |
4082 | @@ -1,4 +1,4 @@ |
4083 | -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>2. Implementations</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="api.html" title="Chapter 4. YAZ C++ API"><link rel="prev" href="api.html" title="Chapter 4. YAZ C++ API"><link rel="next" href="license.html" title="Appendix A. License"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2. Implementations</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="api.html">Prev</a> </td><th width="60%" align="center">Chapter 4. YAZ C++ API</th><td width="20%" align="right"> <a accesskey="n" href="license.html">Next</a></td></tr></table><hr></div><div class="section" title="2. Implementations"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="implementations"></a>2. Implementations</h2></div></div></div><div class="section" title="2.1. Yaz_SocketManager"><div class="titlepage"><div><div><h3 class="title"><a name="Yaz_SocketManager"></a>2.1. Yaz_SocketManager</h3></div></div></div><p> |
4084 | +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>2. Implementations</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="api.html" title="Chapter 4. YAZ C++ API"><link rel="prev" href="api.html" title="Chapter 4. YAZ C++ API"><link rel="next" href="license.html" title="Appendix A. License"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2. Implementations</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="api.html">Prev</a> </td><th width="60%" align="center">Chapter 4. YAZ C++ API</th><td width="20%" align="right"> <a accesskey="n" href="license.html">Next</a></td></tr></table><hr></div><div class="section" title="2. Implementations"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="implementations"></a>2. Implementations</h2></div></div></div><div class="section" title="2.1. Yaz_SocketManager"><div class="titlepage"><div><div><h3 class="title"><a name="Yaz_SocketManager"></a>2.1. Yaz_SocketManager</h3></div></div></div><p> |
4085 | This class implements the <a class="link" href="api.html#ISocketObservable" title="1.1. ISocketObservable"> |
4086 | ISocketObservable</a> interface and is a portable |
4087 | socket wrapper around the select call. |
4088 | |
4089 | === modified file 'doc/index.html' |
4090 | --- doc/index.html 2011-11-20 21:16:52 +0000 |
4091 | +++ doc/index.html 2012-06-13 02:33:18 +0000 |
4092 | @@ -1,4 +1,4 @@ |
4093 | -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>YAZ++ User's Guide and Reference</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><meta name="description" content="YAZ++ is a set of libraries and header files that make it easier to use the popular C-language YAZ toolkit from C++, together with some utilities written using these libraries. It includes an implementation of the C++ binding for ZOOM (ZOOM-C++). This manual covers version 1.2.7. "><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="next" href="introduction.html" title="Chapter 1. Introduction"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">YAZ++ User's Guide and Reference</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="introduction.html">Next</a></td></tr></table><hr></div><div class="book" title="YAZ++ User's Guide and Reference"><div class="titlepage"><div><div><h1 class="title"><a name="yazpp"></a>YAZ++ User's Guide and Reference</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Mike</span> <span class="surname">Taylor</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Adam</span> <span class="surname">Dickmeiss</span></h3></div></div></div><div><p class="copyright">Copyright © 1998-2011 Index Data Aps and Mike Taylor</p></div><div><div class="abstract" title="Abstract"><p class="title"><b>Abstract</b></p><p> |
4094 | +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>YAZ++ User's Guide and Reference</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><meta name="description" content="YAZ++ is a set of libraries and header files that make it easier to use the popular C-language YAZ toolkit from C++, together with some utilities written using these libraries. It includes an implementation of the C++ binding for ZOOM (ZOOM-C++). This manual covers version 1.3.0. "><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="next" href="introduction.html" title="Chapter 1. Introduction"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">YAZ++ User's Guide and Reference</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="introduction.html">Next</a></td></tr></table><hr></div><div class="book" title="YAZ++ User's Guide and Reference"><div class="titlepage"><div><div><h1 class="title"><a name="yazpp"></a>YAZ++ User's Guide and Reference</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Mike</span> <span class="surname">Taylor</span></h3></div><div class="author"><h3 class="author"><span class="firstname">Adam</span> <span class="surname">Dickmeiss</span></h3></div></div></div><div><p class="copyright">Copyright © 1998-2012 Index Data Aps and Mike Taylor</p></div><div><div class="abstract" title="Abstract"><p class="title"><b>Abstract</b></p><p> |
4095 | <a class="ulink" href="http://www.indexdata.com/yazpp/" target="_top">YAZ++</a> |
4096 | is a set of libraries and header files that make it easier |
4097 | to use the popular C-language |
4098 | @@ -7,7 +7,7 @@ |
4099 | libraries. It includes an implementation of the C++ binding for |
4100 | ZOOM (<a class="link" href="zoom.html" title="Chapter 3. ZOOM-C++">ZOOM-C++</a>). |
4101 | </p><p> |
4102 | - This manual covers version 1.2.7. |
4103 | + This manual covers version 1.3.0. |
4104 | </p><p> |
4105 | </p><p> |
4106 | <span class="inlinemediaobject"><img src="common/id.png"></span> |
4107 | |
4108 | === modified file 'doc/installation.html' |
4109 | --- doc/installation.html 2010-09-24 20:56:47 +0000 |
4110 | +++ doc/installation.html 2012-06-13 02:33:18 +0000 |
4111 | @@ -1,4 +1,4 @@ |
4112 | -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 2. Installation</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="prev" href="introduction.html" title="Chapter 1. Introduction"><link rel="next" href="windows.html" title="2. Installation on Windows"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 2. Installation</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="introduction.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="windows.html">Next</a></td></tr></table><hr></div><div class="chapter" title="Chapter 2. Installation"><div class="titlepage"><div><div><h2 class="title"><a name="installation"></a>Chapter 2. Installation</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="installation.html#unix">1. Installation on Unix (from source)</a></span></dt><dt><span class="section"><a href="windows.html">2. Installation on Windows</a></span></dt></dl></div><p> |
4113 | +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 2. Installation</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="prev" href="introduction.html" title="Chapter 1. Introduction"><link rel="next" href="windows.html" title="2. Installation on Windows"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 2. Installation</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="introduction.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="windows.html">Next</a></td></tr></table><hr></div><div class="chapter" title="Chapter 2. Installation"><div class="titlepage"><div><div><h2 class="title"><a name="installation"></a>Chapter 2. Installation</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="installation.html#unix">1. Installation on Unix (from source)</a></span></dt><dt><span class="section"><a href="windows.html">2. Installation on Windows</a></span></dt></dl></div><p> |
4114 | You need a C++ compiler to compile and use YAZ++. |
4115 | The software was implemented using <a class="ulink" href="http://gcc.gnu.org/" target="_top">GCC</a> |
4116 | so we know that works well with YAZ++. From time to time the |
4117 | |
4118 | === modified file 'doc/introduction.html' |
4119 | --- doc/introduction.html 2010-09-24 20:56:47 +0000 |
4120 | +++ doc/introduction.html 2012-06-13 02:33:18 +0000 |
4121 | @@ -1,4 +1,4 @@ |
4122 | -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 1. Introduction</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="prev" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="next" href="installation.html" title="Chapter 2. Installation"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 1. Introduction</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="installation.html">Next</a></td></tr></table><hr></div><div class="chapter" title="Chapter 1. Introduction"><div class="titlepage"><div><div><h2 class="title"><a name="introduction"></a>Chapter 1. Introduction</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="introduction.html#licensing">1. Licensing</a></span></dt></dl></div><p> |
4123 | +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 1. Introduction</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="prev" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="next" href="installation.html" title="Chapter 2. Installation"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 1. Introduction</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="installation.html">Next</a></td></tr></table><hr></div><div class="chapter" title="Chapter 1. Introduction"><div class="titlepage"><div><div><h2 class="title"><a name="introduction"></a>Chapter 1. Introduction</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="introduction.html#licensing">1. Licensing</a></span></dt></dl></div><p> |
4124 | <a class="ulink" href="http://www.indexdata.com/yazpp/" target="_top">YAZ++</a> |
4125 | is a C++ layer for YAZ and implements the ANSI |
4126 | <a class="ulink" href="http://www.loc.gov/z3950/agency/" target="_top">Z39.50</a> protocol for information |
4127 | |
4128 | === modified file 'doc/license.html' |
4129 | --- doc/license.html 2011-11-20 21:16:52 +0000 |
4130 | +++ doc/license.html 2012-06-13 02:33:18 +0000 |
4131 | @@ -1,5 +1,5 @@ |
4132 | -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Appendix A. License</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="prev" href="implementations.html" title="2. Implementations"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Appendix A. License</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="implementations.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> </td></tr></table><hr></div><div class="appendix" title="Appendix A. License"><div class="titlepage"><div><div><h2 class="title"><a name="license"></a>Appendix A. License</h2></div></div></div><p> |
4133 | - Copyright © 1998-2011 Index Data and Mike Taylor. |
4134 | +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Appendix A. License</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="prev" href="implementations.html" title="2. Implementations"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Appendix A. License</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="implementations.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> </td></tr></table><hr></div><div class="appendix" title="Appendix A. License"><div class="titlepage"><div><div><h2 class="title"><a name="license"></a>Appendix A. License</h2></div></div></div><p> |
4135 | + Copyright © 1998-2012 Index Data and Mike Taylor. |
4136 | </p><p> |
4137 | All rights reserved. |
4138 | </p><p> |
4139 | |
4140 | === modified file 'doc/windows.html' |
4141 | --- doc/windows.html 2010-09-24 20:56:47 +0000 |
4142 | +++ doc/windows.html 2012-06-13 02:33:18 +0000 |
4143 | @@ -1,4 +1,4 @@ |
4144 | -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>2. Installation on Windows</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="installation.html" title="Chapter 2. Installation"><link rel="prev" href="installation.html" title="Chapter 2. Installation"><link rel="next" href="zoom.html" title="Chapter 3. ZOOM-C++"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2. Installation on Windows</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="installation.html">Prev</a> </td><th width="60%" align="center">Chapter 2. Installation</th><td width="20%" align="right"> <a accesskey="n" href="zoom.html">Next</a></td></tr></table><hr></div><div class="section" title="2. Installation on Windows"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="windows"></a>2. Installation on Windows</h2></div></div></div><p> |
4145 | +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>2. Installation on Windows</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="installation.html" title="Chapter 2. Installation"><link rel="prev" href="installation.html" title="Chapter 2. Installation"><link rel="next" href="zoom.html" title="Chapter 3. ZOOM-C++"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2. Installation on Windows</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="installation.html">Prev</a> </td><th width="60%" align="center">Chapter 2. Installation</th><td width="20%" align="right"> <a accesskey="n" href="zoom.html">Next</a></td></tr></table><hr></div><div class="section" title="2. Installation on Windows"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="windows"></a>2. Installation on Windows</h2></div></div></div><p> |
4146 | YAZ++ is shipped with "makefiles" for the NMAKE tool that comes |
4147 | with <a class="ulink" href="http://msdn.microsoft.com/vstudio/" target="_top">Microsoft Visual Studio</a>. |
4148 | Version 2003 (7) and 2005 (8) has been tested. |
4149 | |
4150 | === modified file 'doc/yazpp-config.1' |
4151 | --- doc/yazpp-config.1 2011-11-20 21:16:52 +0000 |
4152 | +++ doc/yazpp-config.1 2012-06-13 02:33:18 +0000 |
4153 | @@ -1,13 +1,13 @@ |
4154 | '\" t |
4155 | .\" Title: yazpp-config |
4156 | .\" Author: Index Data |
4157 | -.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> |
4158 | -.\" Date: 08/12/2011 |
4159 | +.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> |
4160 | +.\" Date: 04/25/2012 |
4161 | .\" Manual: Commands |
4162 | .\" Source: yazpp |
4163 | .\" Language: English |
4164 | .\" |
4165 | -.TH "YAZPP\-CONFIG" "1" "08/12/2011" "yazpp" "Commands" |
4166 | +.TH "YAZPP\-CONFIG" "1" "04/25/2012" "yazpp" "Commands" |
4167 | .\" ----------------------------------------------------------------- |
4168 | .\" * Define some portability stuff |
4169 | .\" ----------------------------------------------------------------- |
4170 | |
4171 | === modified file 'doc/zoom-connection.html' |
4172 | --- doc/zoom-connection.html 2010-09-24 20:56:47 +0000 |
4173 | +++ doc/zoom-connection.html 2012-06-13 02:33:18 +0000 |
4174 | @@ -1,4 +1,4 @@ |
4175 | -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>2. ZOOM::connection</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="zoom.html" title="Chapter 3. ZOOM-C++"><link rel="prev" href="zoom.html" title="Chapter 3. ZOOM-C++"><link rel="next" href="zoom-query.html" title="3. ZOOM::query and subclasses"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2. <code class="literal">ZOOM::connection</code></th></tr><tr><td width="20%" align="left"><a accesskey="p" href="zoom.html">Prev</a> </td><th width="60%" align="center">Chapter 3. ZOOM-C++</th><td width="20%" align="right"> <a accesskey="n" href="zoom-query.html">Next</a></td></tr></table><hr></div><div class="sect1" title="2. ZOOM::connection"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="zoom-connection"></a>2. <code class="literal">ZOOM::connection</code></h2></div></div></div><p> |
4176 | +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>2. ZOOM::connection</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="zoom.html" title="Chapter 3. ZOOM-C++"><link rel="prev" href="zoom.html" title="Chapter 3. ZOOM-C++"><link rel="next" href="zoom-query.html" title="3. ZOOM::query and subclasses"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2. <code class="literal">ZOOM::connection</code></th></tr><tr><td width="20%" align="left"><a accesskey="p" href="zoom.html">Prev</a> </td><th width="60%" align="center">Chapter 3. ZOOM-C++</th><td width="20%" align="right"> <a accesskey="n" href="zoom-query.html">Next</a></td></tr></table><hr></div><div class="sect1" title="2. ZOOM::connection"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="zoom-connection"></a>2. <code class="literal">ZOOM::connection</code></h2></div></div></div><p> |
4177 | A <code class="literal">ZOOM::connection</code> object represents an open |
4178 | connection to a Z39.50 server. Such a connection is forged by |
4179 | constructing a <code class="literal">connection</code> object. |
4180 | |
4181 | === modified file 'doc/zoom-exception.html' |
4182 | --- doc/zoom-exception.html 2010-09-24 20:56:47 +0000 |
4183 | +++ doc/zoom-exception.html 2012-06-13 02:33:18 +0000 |
4184 | @@ -1,4 +1,4 @@ |
4185 | -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>6. ZOOM::exception and subclasses</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="zoom.html" title="Chapter 3. ZOOM-C++"><link rel="prev" href="zoom-record.html" title="5. ZOOM::record"><link rel="next" href="api.html" title="Chapter 4. YAZ C++ API"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">6. <code class="literal">ZOOM::exception</code> and subclasses</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="zoom-record.html">Prev</a> </td><th width="60%" align="center">Chapter 3. ZOOM-C++</th><td width="20%" align="right"> <a accesskey="n" href="api.html">Next</a></td></tr></table><hr></div><div class="sect1" title="6. ZOOM::exception and subclasses"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="zoom-exception"></a>6. <code class="literal">ZOOM::exception</code> and subclasses</h2></div></div></div><p> |
4186 | +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>6. ZOOM::exception and subclasses</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="zoom.html" title="Chapter 3. ZOOM-C++"><link rel="prev" href="zoom-record.html" title="5. ZOOM::record"><link rel="next" href="api.html" title="Chapter 4. YAZ C++ API"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">6. <code class="literal">ZOOM::exception</code> and subclasses</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="zoom-record.html">Prev</a> </td><th width="60%" align="center">Chapter 3. ZOOM-C++</th><td width="20%" align="right"> <a accesskey="n" href="api.html">Next</a></td></tr></table><hr></div><div class="sect1" title="6. ZOOM::exception and subclasses"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="zoom-exception"></a>6. <code class="literal">ZOOM::exception</code> and subclasses</h2></div></div></div><p> |
4187 | The <code class="literal">ZOOM::exception</code> class is a virtual base |
4188 | class, representing a diagnostic generated by the ZOOM-C++ library |
4189 | or returned from a server. Its subclasses represent particular |
4190 | |
4191 | === modified file 'doc/zoom-query.html' |
4192 | --- doc/zoom-query.html 2010-09-24 20:56:47 +0000 |
4193 | +++ doc/zoom-query.html 2012-06-13 02:33:18 +0000 |
4194 | @@ -1,4 +1,4 @@ |
4195 | -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>3. ZOOM::query and subclasses</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="zoom.html" title="Chapter 3. ZOOM-C++"><link rel="prev" href="zoom-connection.html" title="2. ZOOM::connection"><link rel="next" href="zoom-resultset.html" title="4. ZOOM::resultSet"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3. <code class="literal">ZOOM::query</code> and subclasses</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="zoom-connection.html">Prev</a> </td><th width="60%" align="center">Chapter 3. ZOOM-C++</th><td width="20%" align="right"> <a accesskey="n" href="zoom-resultset.html">Next</a></td></tr></table><hr></div><div class="sect1" title="3. ZOOM::query and subclasses"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="zoom-query"></a>3. <code class="literal">ZOOM::query</code> and subclasses</h2></div></div></div><p> |
4196 | +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>3. ZOOM::query and subclasses</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="zoom.html" title="Chapter 3. ZOOM-C++"><link rel="prev" href="zoom-connection.html" title="2. ZOOM::connection"><link rel="next" href="zoom-resultset.html" title="4. ZOOM::resultSet"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3. <code class="literal">ZOOM::query</code> and subclasses</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="zoom-connection.html">Prev</a> </td><th width="60%" align="center">Chapter 3. ZOOM-C++</th><td width="20%" align="right"> <a accesskey="n" href="zoom-resultset.html">Next</a></td></tr></table><hr></div><div class="sect1" title="3. ZOOM::query and subclasses"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="zoom-query"></a>3. <code class="literal">ZOOM::query</code> and subclasses</h2></div></div></div><p> |
4197 | The <code class="literal">ZOOM::query</code> class is a virtual base class, |
4198 | representing a query to be submitted to a server. This class has |
4199 | no methods, but two (so far) concrete subclasses, each implementing |
4200 | |
4201 | === modified file 'doc/zoom-record.html' |
4202 | --- doc/zoom-record.html 2010-09-24 20:56:47 +0000 |
4203 | +++ doc/zoom-record.html 2012-06-13 02:33:18 +0000 |
4204 | @@ -1,4 +1,4 @@ |
4205 | -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>5. ZOOM::record</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="zoom.html" title="Chapter 3. ZOOM-C++"><link rel="prev" href="zoom-resultset.html" title="4. ZOOM::resultSet"><link rel="next" href="zoom-exception.html" title="6. ZOOM::exception and subclasses"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">5. <code class="literal">ZOOM::record</code></th></tr><tr><td width="20%" align="left"><a accesskey="p" href="zoom-resultset.html">Prev</a> </td><th width="60%" align="center">Chapter 3. ZOOM-C++</th><td width="20%" align="right"> <a accesskey="n" href="zoom-exception.html">Next</a></td></tr></table><hr></div><div class="sect1" title="5. ZOOM::record"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="zoom-record"></a>5. <code class="literal">ZOOM::record</code></h2></div></div></div><p> |
4206 | +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>5. ZOOM::record</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="zoom.html" title="Chapter 3. ZOOM-C++"><link rel="prev" href="zoom-resultset.html" title="4. ZOOM::resultSet"><link rel="next" href="zoom-exception.html" title="6. ZOOM::exception and subclasses"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">5. <code class="literal">ZOOM::record</code></th></tr><tr><td width="20%" align="left"><a accesskey="p" href="zoom-resultset.html">Prev</a> </td><th width="60%" align="center">Chapter 3. ZOOM-C++</th><td width="20%" align="right"> <a accesskey="n" href="zoom-exception.html">Next</a></td></tr></table><hr></div><div class="sect1" title="5. ZOOM::record"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="zoom-record"></a>5. <code class="literal">ZOOM::record</code></h2></div></div></div><p> |
4207 | A <code class="literal">ZOOM::record</code> object represents a chunk of data |
4208 | from a <code class="literal">resultSet</code> returned from a server. |
4209 | </p><p> |
4210 | |
4211 | === modified file 'doc/zoom-resultset.html' |
4212 | --- doc/zoom-resultset.html 2010-09-24 20:56:47 +0000 |
4213 | +++ doc/zoom-resultset.html 2012-06-13 02:33:18 +0000 |
4214 | @@ -1,4 +1,4 @@ |
4215 | -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>4. ZOOM::resultSet</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="zoom.html" title="Chapter 3. ZOOM-C++"><link rel="prev" href="zoom-query.html" title="3. ZOOM::query and subclasses"><link rel="next" href="zoom-record.html" title="5. ZOOM::record"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4. <code class="literal">ZOOM::resultSet</code></th></tr><tr><td width="20%" align="left"><a accesskey="p" href="zoom-query.html">Prev</a> </td><th width="60%" align="center">Chapter 3. ZOOM-C++</th><td width="20%" align="right"> <a accesskey="n" href="zoom-record.html">Next</a></td></tr></table><hr></div><div class="sect1" title="4. ZOOM::resultSet"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="zoom-resultset"></a>4. <code class="literal">ZOOM::resultSet</code></h2></div></div></div><p> |
4216 | +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>4. ZOOM::resultSet</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="zoom.html" title="Chapter 3. ZOOM-C++"><link rel="prev" href="zoom-query.html" title="3. ZOOM::query and subclasses"><link rel="next" href="zoom-record.html" title="5. ZOOM::record"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4. <code class="literal">ZOOM::resultSet</code></th></tr><tr><td width="20%" align="left"><a accesskey="p" href="zoom-query.html">Prev</a> </td><th width="60%" align="center">Chapter 3. ZOOM-C++</th><td width="20%" align="right"> <a accesskey="n" href="zoom-record.html">Next</a></td></tr></table><hr></div><div class="sect1" title="4. ZOOM::resultSet"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="zoom-resultset"></a>4. <code class="literal">ZOOM::resultSet</code></h2></div></div></div><p> |
4217 | A <code class="literal">ZOOM::resultSet</code> object represents a set of |
4218 | records identified by a query that has been executed against a |
4219 | particular connection. The sole purpose of both |
4220 | |
4221 | === modified file 'doc/zoom.html' |
4222 | --- doc/zoom.html 2010-09-24 20:56:47 +0000 |
4223 | +++ doc/zoom.html 2012-06-13 02:33:18 +0000 |
4224 | @@ -1,4 +1,4 @@ |
4225 | -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 3. ZOOM-C++</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="prev" href="windows.html" title="2. Installation on Windows"><link rel="next" href="zoom-connection.html" title="2. ZOOM::connection"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 3. ZOOM-C++</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="windows.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="zoom-connection.html">Next</a></td></tr></table><hr></div><div class="chapter" title="Chapter 3. ZOOM-C++"><div class="titlepage"><div><div><h2 class="title"><a name="zoom"></a>Chapter 3. ZOOM-C++</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="zoom.html#zoom-introduction">1. Introduction</a></span></dt><dt><span class="sect1"><a href="zoom-connection.html">2. <code class="literal">ZOOM::connection</code></a></span></dt><dd><dl><dt><span class="sect2"><a href="zoom-connection.html#connection.references">2.1. References</a></span></dt></dl></dd><dt><span class="sect1"><a href="zoom-query.html">3. <code class="literal">ZOOM::query</code> and subclasses</a></span></dt><dd><dl><dt><span class="sect2"><a href="zoom-query.html#ZOOM::prefixQuery">3.1. <code class="literal">ZOOM::prefixQuery</code></a></span></dt><dt><span class="sect2"><a href="zoom-query.html#ZOOM::CCLQuery">3.2. <code class="literal">ZOOM::CCLQuery</code></a></span></dt><dt><span class="sect2"><a href="zoom-query.html#queries.discussion">3.3. Discussion</a></span></dt><dt><span class="sect2"><a href="zoom-query.html#query.references">3.4. References</a></span></dt></dl></dd><dt><span class="sect1"><a href="zoom-resultset.html">4. <code class="literal">ZOOM::resultSet</code></a></span></dt><dd><dl><dt><span class="sect2"><a href="zoom-resultset.html#resultset.references">4.1. References</a></span></dt></dl></dd><dt><span class="sect1"><a href="zoom-record.html">5. <code class="literal">ZOOM::record</code></a></span></dt><dd><dl><dt><span class="sect2"><a href="zoom-record.html#zoom.memory.management">5.1. Memory Management</a></span></dt><dt><span class="sect2"><a href="zoom-record.html#record.references">5.2. References</a></span></dt></dl></dd><dt><span class="sect1"><a href="zoom-exception.html">6. <code class="literal">ZOOM::exception</code> and subclasses</a></span></dt><dd><dl><dt><span class="sect2"><a href="zoom-exception.html#ZOOM::systemException">6.1. <code class="literal">ZOOM::systemException</code></a></span></dt><dt><span class="sect2"><a href="zoom-exception.html#ZOOM::bib1Exception">6.2. <code class="literal">ZOOM::bib1Exception</code></a></span></dt><dt><span class="sect2"><a href="zoom-exception.html#ZOOM::queryException">6.3. <code class="literal">ZOOM::queryException</code></a></span></dt><dt><span class="sect2"><a href="zoom-exception.html#revised-sample">6.4. Revised Sample Program</a></span></dt><dt><span class="sect2"><a href="zoom-exception.html#exception.references">6.5. References</a></span></dt></dl></dd></dl></div><div class="sect1" title="1. Introduction"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="zoom-introduction"></a>1. Introduction</h2></div></div></div><p> |
4226 | +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 3. ZOOM-C++</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"><link rel="home" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="up" href="index.html" title="YAZ++ User's Guide and Reference"><link rel="prev" href="windows.html" title="2. Installation on Windows"><link rel="next" href="zoom-connection.html" title="2. ZOOM::connection"></head><body><link rel="stylesheet" type="text/css" href="common/style1.css"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 3. ZOOM-C++</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="windows.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="zoom-connection.html">Next</a></td></tr></table><hr></div><div class="chapter" title="Chapter 3. ZOOM-C++"><div class="titlepage"><div><div><h2 class="title"><a name="zoom"></a>Chapter 3. ZOOM-C++</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="zoom.html#zoom-introduction">1. Introduction</a></span></dt><dt><span class="sect1"><a href="zoom-connection.html">2. <code class="literal">ZOOM::connection</code></a></span></dt><dd><dl><dt><span class="sect2"><a href="zoom-connection.html#connection.references">2.1. References</a></span></dt></dl></dd><dt><span class="sect1"><a href="zoom-query.html">3. <code class="literal">ZOOM::query</code> and subclasses</a></span></dt><dd><dl><dt><span class="sect2"><a href="zoom-query.html#ZOOM::prefixQuery">3.1. <code class="literal">ZOOM::prefixQuery</code></a></span></dt><dt><span class="sect2"><a href="zoom-query.html#ZOOM::CCLQuery">3.2. <code class="literal">ZOOM::CCLQuery</code></a></span></dt><dt><span class="sect2"><a href="zoom-query.html#queries.discussion">3.3. Discussion</a></span></dt><dt><span class="sect2"><a href="zoom-query.html#query.references">3.4. References</a></span></dt></dl></dd><dt><span class="sect1"><a href="zoom-resultset.html">4. <code class="literal">ZOOM::resultSet</code></a></span></dt><dd><dl><dt><span class="sect2"><a href="zoom-resultset.html#resultset.references">4.1. References</a></span></dt></dl></dd><dt><span class="sect1"><a href="zoom-record.html">5. <code class="literal">ZOOM::record</code></a></span></dt><dd><dl><dt><span class="sect2"><a href="zoom-record.html#zoom.memory.management">5.1. Memory Management</a></span></dt><dt><span class="sect2"><a href="zoom-record.html#record.references">5.2. References</a></span></dt></dl></dd><dt><span class="sect1"><a href="zoom-exception.html">6. <code class="literal">ZOOM::exception</code> and subclasses</a></span></dt><dd><dl><dt><span class="sect2"><a href="zoom-exception.html#ZOOM::systemException">6.1. <code class="literal">ZOOM::systemException</code></a></span></dt><dt><span class="sect2"><a href="zoom-exception.html#ZOOM::bib1Exception">6.2. <code class="literal">ZOOM::bib1Exception</code></a></span></dt><dt><span class="sect2"><a href="zoom-exception.html#ZOOM::queryException">6.3. <code class="literal">ZOOM::queryException</code></a></span></dt><dt><span class="sect2"><a href="zoom-exception.html#revised-sample">6.4. Revised Sample Program</a></span></dt><dt><span class="sect2"><a href="zoom-exception.html#exception.references">6.5. References</a></span></dt></dl></dd></dl></div><div class="sect1" title="1. Introduction"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="zoom-introduction"></a>1. Introduction</h2></div></div></div><p> |
4227 | <a class="ulink" href="http://zoom.z3950.org/" target="_top">ZOOM</a> |
4228 | is the emerging standard API for information retrieval programming |
4229 | using the Z39.50 protocol. ZOOM's |
4230 | |
4231 | === modified file 'include/Makefile.in' |
4232 | --- include/Makefile.in 2011-11-20 21:16:52 +0000 |
4233 | +++ include/Makefile.in 2012-06-13 02:33:18 +0000 |
4234 | @@ -1,9 +1,9 @@ |
4235 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
4236 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
4237 | # @configure_input@ |
4238 | |
4239 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
4240 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
4241 | -# Inc. |
4242 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
4243 | +# Foundation, Inc. |
4244 | # This Makefile.in is free software; the Free Software Foundation |
4245 | # gives unlimited permission to copy and/or distribute it, |
4246 | # with or without modifications, as long as this notice is preserved. |
4247 | @@ -258,10 +258,8 @@ |
4248 | $(am__aclocal_m4_deps): |
4249 | |
4250 | config.h: stamp-h1 |
4251 | - @if test ! -f $@; then \ |
4252 | - rm -f stamp-h1; \ |
4253 | - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ |
4254 | - else :; fi |
4255 | + @if test ! -f $@; then rm -f stamp-h1; else :; fi |
4256 | + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
4257 | |
4258 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
4259 | @rm -f stamp-h1 |
4260 | @@ -488,10 +486,15 @@ |
4261 | |
4262 | installcheck: installcheck-recursive |
4263 | install-strip: |
4264 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
4265 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
4266 | - `test -z '$(STRIP)' || \ |
4267 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
4268 | + if test -z '$(STRIP)'; then \ |
4269 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
4270 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
4271 | + install; \ |
4272 | + else \ |
4273 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
4274 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
4275 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
4276 | + fi |
4277 | mostlyclean-generic: |
4278 | |
4279 | clean-generic: |
4280 | |
4281 | === modified file 'include/yazpp/Makefile.in' |
4282 | --- include/yazpp/Makefile.in 2011-11-20 21:16:52 +0000 |
4283 | +++ include/yazpp/Makefile.in 2012-06-13 02:33:18 +0000 |
4284 | @@ -1,9 +1,9 @@ |
4285 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
4286 | +# Makefile.in generated by automake 1.11.3 from Makefile.am. |
4287 | # @configure_input@ |
4288 | |
4289 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
4290 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
4291 | -# Inc. |
4292 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
4293 | +# Foundation, Inc. |
4294 | # This Makefile.in is free software; the Free Software Foundation |
4295 | # gives unlimited permission to copy and/or distribute it, |
4296 | # with or without modifications, as long as this notice is preserved. |
4297 | @@ -71,6 +71,12 @@ |
4298 | am__base_list = \ |
4299 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
4300 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
4301 | +am__uninstall_files_from_dir = { \ |
4302 | + test -z "$$files" \ |
4303 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
4304 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
4305 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
4306 | + } |
4307 | am__installdirs = "$(DESTDIR)$(pkgincludedir)" |
4308 | HEADERS = $(pkginclude_HEADERS) |
4309 | ETAGS = etags |
4310 | @@ -281,9 +287,7 @@ |
4311 | @$(NORMAL_UNINSTALL) |
4312 | @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ |
4313 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
4314 | - test -n "$$files" || exit 0; \ |
4315 | - echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \ |
4316 | - cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files |
4317 | + dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir) |
4318 | |
4319 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
4320 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
4321 | @@ -384,10 +388,15 @@ |
4322 | |
4323 | installcheck: installcheck-am |
4324 | install-strip: |
4325 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
4326 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
4327 | - `test -z '$(STRIP)' || \ |
4328 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
4329 | + if test -z '$(STRIP)'; then \ |
4330 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
4331 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
4332 | + install; \ |
4333 | + else \ |
4334 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
4335 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
4336 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
4337 | + fi |
4338 | mostlyclean-generic: |
4339 | |
4340 | clean-generic: |
4341 | |
4342 | === modified file 'include/yazpp/cql2rpn.h' |
4343 | --- include/yazpp/cql2rpn.h 2011-11-20 21:16:52 +0000 |
4344 | +++ include/yazpp/cql2rpn.h 2012-06-13 02:33:18 +0000 |
4345 | @@ -1,5 +1,5 @@ |
4346 | /* This file is part of the yazpp toolkit. |
4347 | - * Copyright (C) 1998-2011 Index Data and Mike Taylor |
4348 | + * Copyright (C) 1998-2012 Index Data and Mike Taylor |
4349 | * All rights reserved. |
4350 | * Redistribution and use in source and binary forms, with or without |
4351 | * modification, are permitted provided that the following conditions are met: |
4352 | |
4353 | === modified file 'include/yazpp/gdu.h' |
4354 | --- include/yazpp/gdu.h 2011-11-20 21:16:52 +0000 |
4355 | +++ include/yazpp/gdu.h 2012-06-13 02:33:18 +0000 |
4356 | @@ -1,5 +1,5 @@ |
4357 | /* This file is part of the yazpp toolkit. |
4358 | - * Copyright (C) 1998-2011 Index Data and Mike Taylor |
4359 | + * Copyright (C) 1998-2012 Index Data and Mike Taylor |
4360 | * All rights reserved. |
4361 | * Redistribution and use in source and binary forms, with or without |
4362 | * modification, are permitted provided that the following conditions are met: |
4363 | |
4364 | === modified file 'include/yazpp/gduqueue.h' |
4365 | --- include/yazpp/gduqueue.h 2011-11-20 21:16:52 +0000 |
4366 | +++ include/yazpp/gduqueue.h 2012-06-13 02:33:18 +0000 |
4367 | @@ -1,5 +1,5 @@ |
4368 | /* This file is part of the yazpp toolkit. |
4369 | - * Copyright (C) 1998-2011 Index Data and Mike Taylor |
4370 | + * Copyright (C) 1998-2012 Index Data and Mike Taylor |
4371 | * All rights reserved. |
4372 | * Redistribution and use in source and binary forms, with or without |
4373 | * modification, are permitted provided that the following conditions are met: |
4374 | |
4375 | === modified file 'include/yazpp/ir-assoc.h' |
4376 | --- include/yazpp/ir-assoc.h 2011-11-20 21:16:52 +0000 |
4377 | +++ include/yazpp/ir-assoc.h 2012-06-13 02:33:18 +0000 |
4378 | @@ -1,5 +1,5 @@ |
4379 | /* This file is part of the yazpp toolkit. |
4380 | - * Copyright (C) 1998-2011 Index Data and Mike Taylor |
4381 | + * Copyright (C) 1998-2012 Index Data and Mike Taylor |
4382 | * All rights reserved. |
4383 | * Redistribution and use in source and binary forms, with or without |
4384 | * modification, are permitted provided that the following conditions are met: |
4385 | |
4386 | === modified file 'include/yazpp/limit-connect.h' |
4387 | --- include/yazpp/limit-connect.h 2011-11-20 21:16:52 +0000 |
4388 | +++ include/yazpp/limit-connect.h 2012-06-13 02:33:18 +0000 |
4389 | @@ -1,5 +1,5 @@ |
4390 | /* This file is part of the yazpp toolkit. |
4391 | - * Copyright (C) 1998-2011 Index Data and Mike Taylor |
4392 | + * Copyright (C) 1998-2012 Index Data and Mike Taylor |
4393 | * All rights reserved. |
4394 | * Redistribution and use in source and binary forms, with or without |
4395 | * modification, are permitted provided that the following conditions are met: |
4396 | |
4397 | === modified file 'include/yazpp/pdu-assoc.h' |
4398 | --- include/yazpp/pdu-assoc.h 2011-11-20 21:16:52 +0000 |
4399 | +++ include/yazpp/pdu-assoc.h 2012-06-13 02:33:18 +0000 |
4400 | @@ -1,5 +1,5 @@ |
4401 | /* This file is part of the yazpp toolkit. |
4402 | - * Copyright (C) 1998-2011 Index Data and Mike Taylor |
4403 | + * Copyright (C) 1998-2012 Index Data and Mike Taylor |
4404 | * All rights reserved. |
4405 | * Redistribution and use in source and binary forms, with or without |
4406 | * modification, are permitted provided that the following conditions are met: |
4407 | |
4408 | === modified file 'include/yazpp/pdu-observer.h' |
4409 | --- include/yazpp/pdu-observer.h 2011-11-20 21:16:52 +0000 |
4410 | +++ include/yazpp/pdu-observer.h 2012-06-13 02:33:18 +0000 |
4411 | @@ -1,5 +1,5 @@ |
4412 | /* This file is part of the yazpp toolkit. |
4413 | - * Copyright (C) 1998-2011 Index Data and Mike Taylor |
4414 | + * Copyright (C) 1998-2012 Index Data and Mike Taylor |
4415 | * All rights reserved. |
4416 | * Redistribution and use in source and binary forms, with or without |
4417 | * modification, are permitted provided that the following conditions are met: |
4418 | |
4419 | === modified file 'include/yazpp/query.h' |
4420 | --- include/yazpp/query.h 2011-11-20 21:16:52 +0000 |
4421 | +++ include/yazpp/query.h 2012-06-13 02:33:18 +0000 |
4422 | @@ -1,5 +1,5 @@ |
4423 | /* This file is part of the yazpp toolkit. |
4424 | - * Copyright (C) 1998-2011 Index Data and Mike Taylor |
4425 | + * Copyright (C) 1998-2012 Index Data and Mike Taylor |
4426 | * All rights reserved. |
4427 | * Redistribution and use in source and binary forms, with or without |
4428 | * modification, are permitted provided that the following conditions are met: |
4429 | |
4430 | === modified file 'include/yazpp/record-cache.h' |
4431 | --- include/yazpp/record-cache.h 2011-11-20 21:16:52 +0000 |
4432 | +++ include/yazpp/record-cache.h 2012-06-13 02:33:18 +0000 |
4433 | @@ -1,5 +1,5 @@ |
4434 | /* This file is part of the yazpp toolkit. |
4435 | - * Copyright (C) 1998-2011 Index Data and Mike Taylor |
4436 | + * Copyright (C) 1998-2012 Index Data and Mike Taylor |
4437 | * All rights reserved. |
4438 | * Redistribution and use in source and binary forms, with or without |
4439 | * modification, are permitted provided that the following conditions are met: |
4440 | |
4441 | === modified file 'include/yazpp/socket-manager.h' |
4442 | --- include/yazpp/socket-manager.h 2011-11-20 21:16:52 +0000 |
4443 | +++ include/yazpp/socket-manager.h 2012-06-13 02:33:18 +0000 |
4444 | @@ -1,5 +1,5 @@ |
4445 | /* This file is part of the yazpp toolkit. |
4446 | - * Copyright (C) 1998-2011 Index Data and Mike Taylor |
4447 | + * Copyright (C) 1998-2012 Index Data and Mike Taylor |
4448 | * All rights reserved. |
4449 | * Redistribution and use in source and binary forms, with or without |
4450 | * modification, are permitted provided that the following conditions are met: |
4451 | @@ -81,6 +81,7 @@ |
4452 | int timeout); |
4453 | /// Process one event. return > 0 if event could be processed; |
4454 | int processEvent(); |
4455 | + int getNumberOfObservers(); |
4456 | SocketManager(); |
4457 | virtual ~SocketManager(); |
4458 | }; |
4459 | |
4460 | === modified file 'include/yazpp/socket-observer.h' |
4461 | --- include/yazpp/socket-observer.h 2011-11-20 21:16:52 +0000 |
4462 | +++ include/yazpp/socket-observer.h 2012-06-13 02:33:18 +0000 |
4463 | @@ -1,5 +1,5 @@ |
4464 | /* This file is part of the yazpp toolkit. |
4465 | - * Copyright (C) 1998-2011 Index Data and Mike Taylor |
4466 | + * Copyright (C) 1998-2012 Index Data and Mike Taylor |
4467 | * All rights reserved. |
4468 | * Redistribution and use in source and binary forms, with or without |
4469 | * modification, are permitted provided that the following conditions are met: |
4470 | |
4471 | === modified file 'include/yazpp/timestat.h' |
4472 | --- include/yazpp/timestat.h 2011-11-20 21:16:52 +0000 |
4473 | +++ include/yazpp/timestat.h 2012-06-13 02:33:18 +0000 |
4474 | @@ -1,5 +1,5 @@ |
4475 | /* This file is part of the yazpp toolkit. |
4476 | - * Copyright (C) 1998-2011 Index Data and Mike Taylor |
4477 | + * Copyright (C) 1998-2012 Index Data and Mike Taylor |
4478 | * All rights reserved. |
4479 | * Redistribution and use in source and binary forms, with or without |
4480 | * modification, are permitted provided that the following conditions are met: |
4481 | |
4482 | === modified file 'include/yazpp/z-assoc.h' |
4483 | --- include/yazpp/z-assoc.h 2011-11-20 21:16:52 +0000 |
4484 | +++ include/yazpp/z-assoc.h 2012-06-13 02:33:18 +0000 |
4485 | @@ -1,5 +1,5 @@ |
4486 | /* This file is part of the yazpp toolkit. |
4487 | - * Copyright (C) 1998-2011 Index Data and Mike Taylor |
4488 | + * Copyright (C) 1998-2012 Index Data and Mike Taylor |
4489 | * All rights reserved. |
4490 | * Redistribution and use in source and binary forms, with or without |
4491 | * modification, are permitted provided that the following conditions are met: |
4492 | |
4493 | === modified file 'include/yazpp/z-databases.h' |
4494 | --- include/yazpp/z-databases.h 2011-11-20 21:16:52 +0000 |
4495 | +++ include/yazpp/z-databases.h 2012-06-13 02:33:18 +0000 |
4496 | @@ -1,5 +1,5 @@ |
4497 | /* This file is part of the yazpp toolkit. |
4498 | - * Copyright (C) 1998-2011 Index Data and Mike Taylor |
4499 | + * Copyright (C) 1998-2012 Index Data and Mike Taylor |
4500 | * All rights reserved. |
4501 | * Redistribution and use in source and binary forms, with or without |
4502 | * modification, are permitted provided that the following conditions are met: |
4503 | |
4504 | === modified file 'include/yazpp/z-query.h' |
4505 | --- include/yazpp/z-query.h 2011-11-20 21:16:52 +0000 |
4506 | +++ include/yazpp/z-query.h 2012-06-13 02:33:18 +0000 |
4507 | @@ -1,5 +1,5 @@ |
4508 | /* This file is part of the yazpp toolkit. |
4509 | - * Copyright (C) 1998-2011 Index Data and Mike Taylor |
4510 | + * Copyright (C) 1998-2012 Index Data and Mike Taylor |
4511 | * All rights reserved. |
4512 | * Redistribution and use in source and binary forms, with or without |
4513 | * modification, are permitted provided that the following conditions are met: |
4514 | |
4515 | === modified file 'include/yazpp/z-server.h' |
4516 | --- include/yazpp/z-server.h 2011-11-20 21:16:52 +0000 |
4517 | +++ include/yazpp/z-server.h 2012-06-13 02:33:18 +0000 |
4518 | @@ -1,5 +1,5 @@ |
4519 | /* This file is part of the yazpp toolkit. |
4520 | - * Copyright (C) 1998-2011 Index Data and Mike Taylor |
4521 | + * Copyright (C) 1998-2012 Index Data and Mike Taylor |
4522 | * All rights reserved. |
4523 | * Redistribution and use in source and binary forms, with or without |
4524 | * modification, are permitted provided that the following conditions are met: |
4525 | |
4526 | === modified file 'm4/libtool.m4' |
4527 | --- m4/libtool.m4 2011-11-20 21:16:52 +0000 |
4528 | +++ m4/libtool.m4 2012-06-13 02:33:18 +0000 |
4529 | @@ -1,8 +1,8 @@ |
4530 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
4531 | # |
4532 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
4533 | -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
4534 | -# Inc. |
4535 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
4536 | +# Foundation, Inc. |
4537 | # Written by Gordon Matzigkeit, 1996 |
4538 | # |
4539 | # This file is free software; the Free Software Foundation gives |
4540 | @@ -11,8 +11,8 @@ |
4541 | |
4542 | m4_define([_LT_COPYING], [dnl |
4543 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
4544 | -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
4545 | -# Inc. |
4546 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
4547 | +# Foundation, Inc. |
4548 | # Written by Gordon Matzigkeit, 1996 |
4549 | # |
4550 | # This file is part of GNU Libtool. |
4551 | @@ -146,6 +146,8 @@ |
4552 | AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl |
4553 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl |
4554 | |
4555 | +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl |
4556 | +dnl |
4557 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
4558 | _LT_DECL([], [host], [0])dnl |
4559 | _LT_DECL([], [host_os], [0])dnl |
4560 | @@ -637,7 +639,7 @@ |
4561 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
4562 | configured by $[0], generated by m4_PACKAGE_STRING. |
4563 | |
4564 | -Copyright (C) 2010 Free Software Foundation, Inc. |
4565 | +Copyright (C) 2011 Free Software Foundation, Inc. |
4566 | This config.lt script is free software; the Free Software Foundation |
4567 | gives unlimited permision to copy, distribute and modify it." |
4568 | |
4569 | @@ -801,6 +803,7 @@ |
4570 | m4_case([$1], |
4571 | [C], [_LT_LANG(C)], |
4572 | [C++], [_LT_LANG(CXX)], |
4573 | + [Go], [_LT_LANG(GO)], |
4574 | [Java], [_LT_LANG(GCJ)], |
4575 | [Fortran 77], [_LT_LANG(F77)], |
4576 | [Fortran], [_LT_LANG(FC)], |
4577 | @@ -822,6 +825,31 @@ |
4578 | ])# _LT_LANG |
4579 | |
4580 | |
4581 | +m4_ifndef([AC_PROG_GO], [ |
4582 | +############################################################ |
4583 | +# NOTE: This macro has been submitted for inclusion into # |
4584 | +# GNU Autoconf as AC_PROG_GO. When it is available in # |
4585 | +# a released version of Autoconf we should remove this # |
4586 | +# macro and use it instead. # |
4587 | +############################################################ |
4588 | +m4_defun([AC_PROG_GO], |
4589 | +[AC_LANG_PUSH(Go)dnl |
4590 | +AC_ARG_VAR([GOC], [Go compiler command])dnl |
4591 | +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl |
4592 | +_AC_ARG_VAR_LDFLAGS()dnl |
4593 | +AC_CHECK_TOOL(GOC, gccgo) |
4594 | +if test -z "$GOC"; then |
4595 | + if test -n "$ac_tool_prefix"; then |
4596 | + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) |
4597 | + fi |
4598 | +fi |
4599 | +if test -z "$GOC"; then |
4600 | + AC_CHECK_PROG(GOC, gccgo, gccgo, false) |
4601 | +fi |
4602 | +])#m4_defun |
4603 | +])#m4_ifndef |
4604 | + |
4605 | + |
4606 | # _LT_LANG_DEFAULT_CONFIG |
4607 | # ----------------------- |
4608 | m4_defun([_LT_LANG_DEFAULT_CONFIG], |
4609 | @@ -852,6 +880,10 @@ |
4610 | m4_ifdef([LT_PROG_GCJ], |
4611 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) |
4612 | |
4613 | +AC_PROVIDE_IFELSE([AC_PROG_GO], |
4614 | + [LT_LANG(GO)], |
4615 | + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) |
4616 | + |
4617 | AC_PROVIDE_IFELSE([LT_PROG_RC], |
4618 | [LT_LANG(RC)], |
4619 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) |
4620 | @@ -954,7 +986,13 @@ |
4621 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
4622 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
4623 | _lt_result=$? |
4624 | - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then |
4625 | + # If there is a non-empty error log, and "single_module" |
4626 | + # appears in it, assume the flag caused a linker warning |
4627 | + if test -s conftest.err && $GREP single_module conftest.err; then |
4628 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
4629 | + # Otherwise, if the output was created with a 0 exit code from |
4630 | + # the compiler, it worked. |
4631 | + elif test -f libconftest.dylib && test $_lt_result -eq 0; then |
4632 | lt_cv_apple_cc_single_mod=yes |
4633 | else |
4634 | cat conftest.err >&AS_MESSAGE_LOG_FD |
4635 | @@ -962,6 +1000,7 @@ |
4636 | rm -rf libconftest.dylib* |
4637 | rm -f conftest.* |
4638 | fi]) |
4639 | + |
4640 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
4641 | [lt_cv_ld_exported_symbols_list], |
4642 | [lt_cv_ld_exported_symbols_list=no |
4643 | @@ -973,6 +1012,7 @@ |
4644 | [lt_cv_ld_exported_symbols_list=no]) |
4645 | LDFLAGS="$save_LDFLAGS" |
4646 | ]) |
4647 | + |
4648 | AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], |
4649 | [lt_cv_ld_force_load=no |
4650 | cat > conftest.c << _LT_EOF |
4651 | @@ -990,7 +1030,9 @@ |
4652 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD |
4653 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
4654 | _lt_result=$? |
4655 | - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then |
4656 | + if test -s conftest.err && $GREP force_load conftest.err; then |
4657 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
4658 | + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then |
4659 | lt_cv_ld_force_load=yes |
4660 | else |
4661 | cat conftest.err >&AS_MESSAGE_LOG_FD |
4662 | @@ -1035,8 +1077,8 @@ |
4663 | ]) |
4664 | |
4665 | |
4666 | -# _LT_DARWIN_LINKER_FEATURES |
4667 | -# -------------------------- |
4668 | +# _LT_DARWIN_LINKER_FEATURES([TAG]) |
4669 | +# --------------------------------- |
4670 | # Checks for linker and compiler features on darwin |
4671 | m4_defun([_LT_DARWIN_LINKER_FEATURES], |
4672 | [ |
4673 | @@ -1047,6 +1089,8 @@ |
4674 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
4675 | if test "$lt_cv_ld_force_load" = "yes"; then |
4676 | _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\"`' |
4677 | + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], |
4678 | + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) |
4679 | else |
4680 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
4681 | fi |
4682 | @@ -1330,14 +1374,27 @@ |
4683 | CFLAGS="$SAVE_CFLAGS" |
4684 | fi |
4685 | ;; |
4686 | -sparc*-*solaris*) |
4687 | +*-*solaris*) |
4688 | # Find out which ABI we are using. |
4689 | echo 'int i;' > conftest.$ac_ext |
4690 | if AC_TRY_EVAL(ac_compile); then |
4691 | case `/usr/bin/file conftest.o` in |
4692 | *64-bit*) |
4693 | case $lt_cv_prog_gnu_ld in |
4694 | - yes*) LD="${LD-ld} -m elf64_sparc" ;; |
4695 | + yes*) |
4696 | + case $host in |
4697 | + i?86-*-solaris*) |
4698 | + LD="${LD-ld} -m elf_x86_64" |
4699 | + ;; |
4700 | + sparc*-*-solaris*) |
4701 | + LD="${LD-ld} -m elf64_sparc" |
4702 | + ;; |
4703 | + esac |
4704 | + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. |
4705 | + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then |
4706 | + LD="${LD-ld}_sol2" |
4707 | + fi |
4708 | + ;; |
4709 | *) |
4710 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
4711 | LD="${LD-ld} -64" |
4712 | @@ -1414,13 +1471,13 @@ |
4713 | if test -n "$RANLIB"; then |
4714 | case $host_os in |
4715 | openbsd*) |
4716 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
4717 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
4718 | ;; |
4719 | *) |
4720 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
4721 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
4722 | ;; |
4723 | esac |
4724 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
4725 | + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
4726 | fi |
4727 | |
4728 | case $host_os in |
4729 | @@ -1600,6 +1657,11 @@ |
4730 | lt_cv_sys_max_cmd_len=196608 |
4731 | ;; |
4732 | |
4733 | + os2*) |
4734 | + # The test takes a long time on OS/2. |
4735 | + lt_cv_sys_max_cmd_len=8192 |
4736 | + ;; |
4737 | + |
4738 | osf*) |
4739 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
4740 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
4741 | @@ -1639,7 +1701,7 @@ |
4742 | # If test is not a shell built-in, we'll probably end up computing a |
4743 | # maximum length that is only half of the actual maximum length, but |
4744 | # we can't tell. |
4745 | - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
4746 | + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
4747 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
4748 | test $i != 17 # 1/2 MB should be enough |
4749 | do |
4750 | @@ -2185,7 +2247,7 @@ |
4751 | |
4752 | case $host_os in |
4753 | aix3*) |
4754 | - version_type=linux |
4755 | + version_type=linux # correct to gnu/linux during the next big refactor |
4756 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
4757 | shlibpath_var=LIBPATH |
4758 | |
4759 | @@ -2194,7 +2256,7 @@ |
4760 | ;; |
4761 | |
4762 | aix[[4-9]]*) |
4763 | - version_type=linux |
4764 | + version_type=linux # correct to gnu/linux during the next big refactor |
4765 | need_lib_prefix=no |
4766 | need_version=no |
4767 | hardcode_into_libs=yes |
4768 | @@ -2259,7 +2321,7 @@ |
4769 | ;; |
4770 | |
4771 | bsdi[[45]]*) |
4772 | - version_type=linux |
4773 | + version_type=linux # correct to gnu/linux during the next big refactor |
4774 | need_version=no |
4775 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4776 | soname_spec='${libname}${release}${shared_ext}$major' |
4777 | @@ -2398,7 +2460,7 @@ |
4778 | ;; |
4779 | |
4780 | dgux*) |
4781 | - version_type=linux |
4782 | + version_type=linux # correct to gnu/linux during the next big refactor |
4783 | need_lib_prefix=no |
4784 | need_version=no |
4785 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
4786 | @@ -2406,10 +2468,6 @@ |
4787 | shlibpath_var=LD_LIBRARY_PATH |
4788 | ;; |
4789 | |
4790 | -freebsd1*) |
4791 | - dynamic_linker=no |
4792 | - ;; |
4793 | - |
4794 | freebsd* | dragonfly*) |
4795 | # DragonFly does not have aout. When/if they implement a new |
4796 | # versioning mechanism, adjust this. |
4797 | @@ -2417,7 +2475,7 @@ |
4798 | objformat=`/usr/bin/objformat` |
4799 | else |
4800 | case $host_os in |
4801 | - freebsd[[123]]*) objformat=aout ;; |
4802 | + freebsd[[23]].*) objformat=aout ;; |
4803 | *) objformat=elf ;; |
4804 | esac |
4805 | fi |
4806 | @@ -2435,7 +2493,7 @@ |
4807 | esac |
4808 | shlibpath_var=LD_LIBRARY_PATH |
4809 | case $host_os in |
4810 | - freebsd2*) |
4811 | + freebsd2.*) |
4812 | shlibpath_overrides_runpath=yes |
4813 | ;; |
4814 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) |
4815 | @@ -2455,7 +2513,7 @@ |
4816 | ;; |
4817 | |
4818 | gnu*) |
4819 | - version_type=linux |
4820 | + version_type=linux # correct to gnu/linux during the next big refactor |
4821 | need_lib_prefix=no |
4822 | need_version=no |
4823 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
4824 | @@ -2466,7 +2524,7 @@ |
4825 | ;; |
4826 | |
4827 | haiku*) |
4828 | - version_type=linux |
4829 | + version_type=linux # correct to gnu/linux during the next big refactor |
4830 | need_lib_prefix=no |
4831 | need_version=no |
4832 | dynamic_linker="$host_os runtime_loader" |
4833 | @@ -2527,7 +2585,7 @@ |
4834 | ;; |
4835 | |
4836 | interix[[3-9]]*) |
4837 | - version_type=linux |
4838 | + version_type=linux # correct to gnu/linux during the next big refactor |
4839 | need_lib_prefix=no |
4840 | need_version=no |
4841 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
4842 | @@ -2543,7 +2601,7 @@ |
4843 | nonstopux*) version_type=nonstopux ;; |
4844 | *) |
4845 | if test "$lt_cv_prog_gnu_ld" = yes; then |
4846 | - version_type=linux |
4847 | + version_type=linux # correct to gnu/linux during the next big refactor |
4848 | else |
4849 | version_type=irix |
4850 | fi ;; |
4851 | @@ -2580,9 +2638,9 @@ |
4852 | dynamic_linker=no |
4853 | ;; |
4854 | |
4855 | -# This must be Linux ELF. |
4856 | +# This must be glibc/ELF. |
4857 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4858 | - version_type=linux |
4859 | + version_type=linux # correct to gnu/linux during the next big refactor |
4860 | need_lib_prefix=no |
4861 | need_version=no |
4862 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4863 | @@ -2657,7 +2715,7 @@ |
4864 | ;; |
4865 | |
4866 | newsos6) |
4867 | - version_type=linux |
4868 | + version_type=linux # correct to gnu/linux during the next big refactor |
4869 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4870 | shlibpath_var=LD_LIBRARY_PATH |
4871 | shlibpath_overrides_runpath=yes |
4872 | @@ -2726,7 +2784,7 @@ |
4873 | ;; |
4874 | |
4875 | solaris*) |
4876 | - version_type=linux |
4877 | + version_type=linux # correct to gnu/linux during the next big refactor |
4878 | need_lib_prefix=no |
4879 | need_version=no |
4880 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4881 | @@ -2751,7 +2809,7 @@ |
4882 | ;; |
4883 | |
4884 | sysv4 | sysv4.3*) |
4885 | - version_type=linux |
4886 | + version_type=linux # correct to gnu/linux during the next big refactor |
4887 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4888 | soname_spec='${libname}${release}${shared_ext}$major' |
4889 | shlibpath_var=LD_LIBRARY_PATH |
4890 | @@ -2775,7 +2833,7 @@ |
4891 | |
4892 | sysv4*MP*) |
4893 | if test -d /usr/nec ;then |
4894 | - version_type=linux |
4895 | + version_type=linux # correct to gnu/linux during the next big refactor |
4896 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
4897 | soname_spec='$libname${shared_ext}.$major' |
4898 | shlibpath_var=LD_LIBRARY_PATH |
4899 | @@ -2806,7 +2864,7 @@ |
4900 | |
4901 | tpf*) |
4902 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
4903 | - version_type=linux |
4904 | + version_type=linux # correct to gnu/linux during the next big refactor |
4905 | need_lib_prefix=no |
4906 | need_version=no |
4907 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4908 | @@ -2816,7 +2874,7 @@ |
4909 | ;; |
4910 | |
4911 | uts4*) |
4912 | - version_type=linux |
4913 | + version_type=linux # correct to gnu/linux during the next big refactor |
4914 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
4915 | soname_spec='${libname}${release}${shared_ext}$major' |
4916 | shlibpath_var=LD_LIBRARY_PATH |
4917 | @@ -3238,7 +3296,7 @@ |
4918 | lt_cv_deplibs_check_method=pass_all |
4919 | ;; |
4920 | |
4921 | -# This must be Linux ELF. |
4922 | +# This must be glibc/ELF. |
4923 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4924 | lt_cv_deplibs_check_method=pass_all |
4925 | ;; |
4926 | @@ -3658,6 +3716,7 @@ |
4927 | # which start with @ or ?. |
4928 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ |
4929 | " {last_section=section; section=\$ 3};"\ |
4930 | +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ |
4931 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
4932 | " \$ 0!~/External *\|/{next};"\ |
4933 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
4934 | @@ -4242,7 +4301,9 @@ |
4935 | case $cc_basename in |
4936 | nvcc*) # Cuda Compiler Driver 2.2 |
4937 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' |
4938 | - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' |
4939 | + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then |
4940 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" |
4941 | + fi |
4942 | ;; |
4943 | esac |
4944 | else |
4945 | @@ -4334,18 +4395,33 @@ |
4946 | ;; |
4947 | *) |
4948 | case `$CC -V 2>&1 | sed 5q` in |
4949 | - *Sun\ F* | *Sun*Fortran*) |
4950 | + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) |
4951 | # Sun Fortran 8.3 passes all unrecognized flags to the linker |
4952 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4953 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4954 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
4955 | ;; |
4956 | + *Sun\ F* | *Sun*Fortran*) |
4957 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4958 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4959 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' |
4960 | + ;; |
4961 | *Sun\ C*) |
4962 | # Sun C 5.9 |
4963 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4964 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4965 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4966 | ;; |
4967 | + *Intel*\ [[CF]]*Compiler*) |
4968 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4969 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
4970 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' |
4971 | + ;; |
4972 | + *Portland\ Group*) |
4973 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4974 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' |
4975 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4976 | + ;; |
4977 | esac |
4978 | ;; |
4979 | esac |
4980 | @@ -4505,7 +4581,9 @@ |
4981 | ;; |
4982 | cygwin* | mingw* | cegcc*) |
4983 | case $cc_basename in |
4984 | - cl*) ;; |
4985 | + cl*) |
4986 | + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
4987 | + ;; |
4988 | *) |
4989 | _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' |
4990 | _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
4991 | @@ -4533,7 +4611,6 @@ |
4992 | _LT_TAGVAR(hardcode_direct, $1)=no |
4993 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
4994 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4995 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
4996 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
4997 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
4998 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
4999 | @@ -4787,8 +4864,7 @@ |
5000 | xlf* | bgf* | bgxlf* | mpixlf*) |
The diff has been truncated for viewing.
Thanks for the patch! I uploaded to quantal. One thing you should do in the future though is change the changelog entry from UNRELEASED to quantal.