Merge lp:~jtaylor/ubuntu/oneiric/gfire/update-to-0.9.4 into lp:ubuntu/oneiric/gfire
- Oneiric (11.10)
- update-to-0.9.4
- Merge into oneiric
Proposed by
Julian Taylor
Status: | Merged |
---|---|
Merge reported by: | Stefano Rivera |
Merged at revision: | not available |
Proposed branch: | lp:~jtaylor/ubuntu/oneiric/gfire/update-to-0.9.4 |
Merge into: | lp:ubuntu/oneiric/gfire |
Diff against target: |
81020 lines (+58080/-13183) 136 files modified
AUTHORS (+45/-21) ChangeLog (+77/-11) Makefile.am (+14/-14) Makefile.in (+216/-105) Makefile.mingw (+41/-0) README (+1/-2) VERSION (+1/-1) aclocal.m4 (+1585/-683) autogen.sh (+2/-0) config.guess (+83/-35) config.sub (+60/-15) configure (+6458/-4939) configure.ac (+137/-42) data/Makefile.am (+2/-10) data/Makefile.in (+120/-119) data/Makefile.mingw (+16/-0) data/games.glade (+538/-0) data/gfire_manage.glade (+0/-405) data/gfire_processes.xml (+0/-33) data/scripts/server_detection/4097.py (+0/-26) data/servers.glade (+382/-0) debian/changelog (+12/-0) debian/control (+2/-2) debian/rules (+4/-0) debian/source/format (+1/-0) debian/watch (+1/-1) depcomp (+312/-134) gfire_config.h (+0/-70) gfire_config.h.in (+126/-0) gfire_config_win.h (+110/-0) ltmain.sh (+1400/-535) m4/intltool.m4 (+216/-0) m4/libtool.m4 (+7450/-0) m4/ltoptions.m4 (+369/-0) m4/ltsugar.m4 (+123/-0) m4/ltversion.m4 (+23/-0) m4/lt~obsolete.m4 (+98/-0) mingw.mak (+23/-0) nsis/gfire-installer.nsi (+93/-0) pixmaps/Makefile.am (+6/-1) pixmaps/Makefile.in (+167/-55) pixmaps/Makefile.mingw (+19/-0) po/Makefile.in.in (+217/-0) po/Makefile.mingw (+24/-0) po/POTFILES.in (+38/-0) po/cs.po (+1203/-0) po/de.po (+1262/-0) po/ee.po (+1145/-0) po/es.po (+1228/-0) po/fr.po (+1160/-0) po/pl.po (+1255/-0) po/ro.po (+1151/-0) po/sk.po (+1227/-0) po/sv.po (+1229/-0) pre_config.h.in (+0/-69) src/Makefile.am (+92/-9) src/Makefile.in (+296/-67) src/Makefile.mingw (+108/-0) src/gf_base.h (+150/-0) src/gf_buddies.c (+1946/-0) src/gf_buddies.h (+271/-0) src/gf_buddies_proto.c (+1059/-0) src/gf_buddies_proto.h (+50/-0) src/gf_chat.c (+1111/-504) src/gf_chat.h (+101/-36) src/gf_chat_proto.c (+1271/-0) src/gf_chat_proto.h (+65/-0) src/gf_debug.h (+4/-5) src/gf_file_chunk.c (+248/-0) src/gf_file_chunk.h (+84/-0) src/gf_filetransfer.c (+423/-0) src/gf_filetransfer.h (+80/-0) src/gf_friend_search.c (+104/-0) src/gf_friend_search.h (+31/-0) src/gf_friend_search_proto.c (+75/-0) src/gf_friend_search_proto.h (+33/-0) src/gf_game_detection.c (+1273/-0) src/gf_game_detection.h (+129/-0) src/gf_game_detection_linux.c (+481/-0) src/gf_game_detection_win.c (+329/-0) src/gf_games.c (+1590/-671) src/gf_games.h (+112/-55) src/gf_groups.c (+183/-0) src/gf_groups.h (+58/-0) src/gf_groups_proto.c (+202/-0) src/gf_groups_proto.h (+40/-0) src/gf_menus.c (+242/-0) src/gf_menus.h (+49/-0) src/gf_network.c (+300/-291) src/gf_network.h (+17/-16) src/gf_p2p.c (+801/-0) src/gf_p2p.h (+131/-0) src/gf_p2p_dl_handler.c (+63/-0) src/gf_p2p_dl_handler.h (+31/-0) src/gf_p2p_dl_proto.c (+556/-0) src/gf_p2p_dl_proto.h (+55/-0) src/gf_p2p_im_handler.c (+203/-0) src/gf_p2p_im_handler.h (+37/-0) src/gf_p2p_natcheck.c (+329/-0) src/gf_p2p_natcheck.h (+72/-0) src/gf_p2p_session.c (+481/-0) src/gf_p2p_session.h (+119/-0) src/gf_packet.c (+0/-1766) src/gf_packet.h (+0/-63) src/gf_preferences.c (+132/-0) src/gf_preferences.h (+51/-0) src/gf_preferences_proto.c (+82/-0) src/gf_preferences_proto.h (+34/-0) src/gf_protocol.c (+643/-0) src/gf_protocol.h (+69/-0) src/gf_purple.c (+1300/-0) src/gf_purple.h (+29/-0) src/gf_server_browser.c (+869/-0) src/gf_server_browser.h (+86/-0) src/gf_server_browser_proto.c (+284/-0) src/gf_server_browser_proto.h (+46/-0) src/gf_server_detection.c (+213/-0) src/gf_server_detection.h (+75/-0) src/gf_server_detection_linux.c (+455/-0) src/gf_server_detection_win.c (+418/-0) src/gf_server_query.c (+364/-0) src/gf_server_query.h (+119/-0) src/gf_server_query_ase.c (+470/-0) src/gf_server_query_gamespy.c (+407/-0) src/gf_server_query_gamespy2.c (+300/-0) src/gf_server_query_gamespy3.c (+143/-0) src/gf_server_query_quake.c (+459/-0) src/gf_server_query_savage.c (+347/-0) src/gf_server_query_source.c (+502/-0) src/gf_util.c (+677/-0) src/gf_util.h (+85/-0) src/gfire.c (+1479/-2195) src/gfire.h (+177/-177) src/gfire_proto.c (+720/-0) src/gfire_proto.h (+58/-0) src/gfirerc.rc (+30/-0) |
To merge this branch: | bzr merge lp:~jtaylor/ubuntu/oneiric/gfire/update-to-0.9.4 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matthias Klose | Approve | ||
Ubuntu branches | Pending | ||
Review via email: mp+76263@code.launchpad.net |
Commit message
Description of the change
update gfire so it works with the "new" protocol and fix a build failure.
ffe was granted, see the linked bug
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 'AUTHORS' (properties changed: +x to -x) |
2 | --- AUTHORS 2009-08-19 15:00:17 +0000 |
3 | +++ AUTHORS 2011-09-20 17:01:28 +0000 |
4 | @@ -1,21 +1,45 @@ |
5 | -Authors |
6 | -======= |
7 | -Wolf Beat <asraniel@fryx.ch> |
8 | -Keith Geffert <keith@penguingurus.com> |
9 | -Laurent De Marez <laurentdemarez@gmail.com> |
10 | -Warren Dumortier <nwarrenfl@gmail.com> |
11 | -Oliver Ney <oliver@dryder.de> |
12 | - |
13 | -Special Thanks |
14 | -============== |
15 | -The folks in #pidgin (previously #gaim), especially rlaager, Paco-Paco and grim (thx grim for the build system :-)) |
16 | -And a big thx to keamos which gave me many many packet dumps because i don't have windows and Xfire doesent work with WINE. |
17 | -A big thx to Brian "TLM" Davenport, he helped me with the win32 release and some bugs :-) |
18 | -Huge thanks to Keith Geffert which sent me patches for features i would never been able to do myself, thanks! |
19 | - |
20 | -Special thank to all the guys who helped testing the beta of 0.8.0! |
21 | -Also want to thank Flames who made a nice converter for the games id list. |
22 | -Lots of kuddos to the GOD?GOD who made the patch for the buddies who don't appear online. |
23 | -And of course want to thank nwarrenfl who made the beautifull game manager and made auto game detection possible. |
24 | -Thanks to Gamma and GODJonez who helped me with the packet system. |
25 | -Finaly want to thank Chewit who is also in the dev team, he hosts the site and makes sure that the games list always is up-to-date. |
26 | +Gfire is the combined and copyrighted work of the the following authors: |
27 | + |
28 | +Programming |
29 | +----------- |
30 | +Beat Wolf <asraniel@fryx.ch> (2005-2006) |
31 | +Keith Geffert <keith@penguingurus.com> (2006) |
32 | +Laurent De Marez <laurentdemarez@gmail.com> (2008-2009) |
33 | +Warren Dumortier <nwarrenfl@gmail.com> (2009-2010) |
34 | +Oliver Ney <oliver@dryder.de> (2009-2011) |
35 | + |
36 | +Artwork |
37 | +------- |
38 | +Jakub Szypulka - Xfire protocol icons (http://cubestuff.wordpress.com/2008/06/26/xfire-goes-tango-2/) |
39 | +León Asad Castillejos - Recolouring of the small protocol icons |
40 | + |
41 | + |
42 | +Special thanks |
43 | +-------------- |
44 | +The folks in #pidgin (previously #gaim), especially rlaager, Paco-Paco and grim |
45 | + for their help with libpurple |
46 | + |
47 | +keamos |
48 | + for his numerous xfire packet dumps |
49 | + |
50 | + |
51 | +Brian "TLM" Davenport |
52 | + for his help with the initial win32 releases and some bugs :-) |
53 | + |
54 | + |
55 | +to all the guys who helped testing the beta of 0.8.0! |
56 | + |
57 | +COD?GOD |
58 | + for his the patch for the buddies who don't appear online. (0.8.X series) |
59 | + |
60 | + |
61 | +Gamma and GODJonez |
62 | + for their helpw ith the packet system. |
63 | + |
64 | +Chewit |
65 | + who is also in the teams and keeps the project running :) |
66 | + |
67 | + |
68 | +Not listed? |
69 | +----------- |
70 | +If you think that we have missed you in this file, tell us! |
71 | |
72 | === modified file 'COPYING' (properties changed: +x to -x) |
73 | === modified file 'ChangeLog' (properties changed: +x to -x) |
74 | --- ChangeLog 2009-08-19 15:00:17 +0000 |
75 | +++ ChangeLog 2011-09-20 17:01:28 +0000 |
76 | @@ -1,19 +1,84 @@ |
77 | -Gfire: Xfire for Pidgin |
78 | -Copyright 2006-2009 Wolf Beat, Keith Geffert, Laurent De Marez, Warren Dumortier, Oliver Ney |
79 | -Distributed under the GPLv3 |
80 | +# Changelog for Gfire |
81 | +# Copyright 2006-2011 Wolf Beat, Keith Geffert, Laurent De Marez, Warren Dumortier, Oliver Ney |
82 | +# Distributed under the GPLv3 |
83 | +# $Id: CHANGELOG, v0.9.4 |
84 | + |
85 | +Gfire: |
86 | + |
87 | +0.9.4 |
88 | +- Fixed rather critical crash on startup if game detection was disabled |
89 | +- Rewrote file transfer code partially |
90 | +- Added ability to create P2P connection with local network nodes |
91 | +- Changed P2P handshaking |
92 | +- NAT Type can now be looked up in the about window |
93 | +- Added --disable-game-detection flag to configure for embedded systems or servers. |
94 | + |
95 | +0.9.3 |
96 | +- Fixed further, if not almost all, P2P issues |
97 | +- Fixed infinite loop on web detection usage |
98 | +- Fixed possible crashes on web detection code |
99 | +- Fixed bug in preferences code |
100 | +- Added support for keep-alive connections on the web detection (less CPU usage) |
101 | +- Added missing lower case conversion of usernames for login |
102 | +- Added server browser with drivers for ASE, GameSpy, GameSpy2, Source and Savage query protocols |
103 | + |
104 | +0.9.2 |
105 | +- Fixed file transfer completion issues |
106 | +- Fixed bad loading of the game list when started without a working internet connection |
107 | +- Fixed timeout issues |
108 | + |
109 | +0.9.1 |
110 | +- Fixed file transfer on Windows |
111 | +- Fixed game detection issues on Linux and Windows |
112 | +- Fixed MIME-type bug in the game manager on Windows |
113 | +- Added display of a buddys status message while he's playing |
114 | +- Added support for game icons |
115 | + |
116 | +0.9.0 |
117 | +- Added File Transfer |
118 | +- Added Server Browser |
119 | +- Added Server Detection |
120 | +- Added Avatar Support |
121 | +- Added Clan/Guild Support |
122 | +- Added Friends of Friends |
123 | +- Added Improvements to Game Manager |
124 | +- Added Windows Game Detection |
125 | +- Added Internationlization Support |
126 | +- Added Advanced Status Handling |
127 | +- Added Web Game Detection |
128 | +- Added New Icons |
129 | +- Added Notifications by libnotify |
130 | +- Added Custom group management |
131 | +- Added Largely improved chat room support |
132 | +- Added VoIP software detection (requires working server detection) |
133 | +- Complete Code Rewrite |
134 | +- Better organisation of code |
135 | +- 'Get Info' Fully Working! |
136 | +- Completed network data handling issues |
137 | +- Fixed a bug preventing a user logging in, with their username containing uppercase characters |
138 | +- Status did not change if you logged off and logged back in |
139 | +- Reversed IP address in contact listings |
140 | +- In some Linux distros, the buddy list was not being displayed |
141 | +- Messages received came with html tags |
142 | +- Fixed HTML tags in status messages, if they contained an URL |
143 | +- Fixed a crash when a "Playing" status was received |
144 | +- Fixed a crash when sending an offline message |
145 | +- Fixed several bugs with the games list and game manager |
146 | +- Updated Web Links |
147 | +- Now useable with Finch again |
148 | |
149 | 0.8.3 |
150 | - * Corrected networking code (fixes problems with Xfire 1.13) |
151 | - * Added Xfires statistics packet |
152 | +- Fixed some bug in the network code which denied all logins |
153 | +- Added the Xfire statistics packet |
154 | |
155 | 0.8.2 |
156 | - * Update for server (website) change. |
157 | +- Update the Gfire URLs due to a server change |
158 | |
159 | 0.8.1 |
160 | - * Fix crash on login with some Linux distros. |
161 | - * Small bugfixes/changes. |
162 | - * Improve file paths. |
163 | - * Only 200 characters are allowed in a topic for groupchat. |
164 | +- Fix crash on login with some Linux distros. |
165 | +- Small bugfixes/changes. |
166 | +- Improve file paths. |
167 | +- Only 200 characters are allowed in a topic for groupchat. |
168 | |
169 | 0.8.0 |
170 | - Buddy authorization improved. |
171 | @@ -44,6 +109,7 @@ |
172 | - View the permissions icon next to the buddy. |
173 | - Make new groupchat channels. |
174 | |
175 | + |
176 | 0.7.1 |
177 | - Minor bug fix |
178 | - Download Game ID List function |
179 | @@ -55,7 +121,7 @@ |
180 | - Ported the gfire code from Gaim to Purple |
181 | - Added new protocol icons |
182 | - Added the about function (Will be used later to show the date of the game id list, so you know if you are out-dated or not.) |
183 | -- Fixed the “(AFK) Away From Keyboard bug (typo) |
184 | +- Fixed the “(AFK) Away From Keyboard†bug (typo) |
185 | - Fixed server port bug |
186 | |
187 | |
188 | |
189 | === modified file 'INSTALL' (properties changed: +x to -x) |
190 | === modified file 'Makefile.am' (properties changed: +x to -x) |
191 | --- Makefile.am 2009-07-25 18:03:46 +0000 |
192 | +++ Makefile.am 2011-09-20 17:01:28 +0000 |
193 | @@ -1,17 +1,17 @@ |
194 | -EXTRA_DIST = COPYING \ |
195 | - ChangeLog \ |
196 | - INSTALL \ |
197 | - NEWS \ |
198 | - README \ |
199 | - VERSION \ |
200 | - gfire.spec \ |
201 | - gfire_config.h |
202 | +EXTRA_DIST = config.rpath config.rpath COPYING \ |
203 | + ChangeLog \ |
204 | + INSTALL \ |
205 | + NEWS \ |
206 | + README \ |
207 | + VERSION \ |
208 | + gfire.spec |
209 | |
210 | SUBDIRS = data pixmaps src |
211 | |
212 | -AM_CFLAGS = -DDATADIR=\"$(datadir)\" |
213 | -BUILT_SOURCES = gfire_config.h |
214 | -$(OBJECTS): $(BUILT_SOURCES) |
215 | - |
216 | -gfire_config.h: pre_config.h |
217 | - $(sedpath) 's/#define PACKAGE/#define SNPP_PACKAGE/g' pre_config.h > $@ |
218 | +if INSTALL_NLS |
219 | +SUBDIRS += po |
220 | +endif |
221 | + |
222 | +AM_CFLAGS = -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" |
223 | + |
224 | +ACLOCAL_AMFLAGS = -I m4 |
225 | |
226 | === modified file 'Makefile.in' (properties changed: +x to -x) |
227 | --- Makefile.in 2009-07-25 18:03:46 +0000 |
228 | +++ Makefile.in 2011-09-20 17:01:28 +0000 |
229 | @@ -1,8 +1,9 @@ |
230 | -# Makefile.in generated by automake 1.10.1 from Makefile.am. |
231 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. |
232 | # @configure_input@ |
233 | |
234 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
235 | -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
236 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
237 | +# Inc. |
238 | # This Makefile.in is free software; the Free Software Foundation |
239 | # gives unlimited permission to copy and/or distribute it, |
240 | # with or without modifications, as long as this notice is preserved. |
241 | @@ -15,8 +16,9 @@ |
242 | @SET_MAKE@ |
243 | VPATH = @srcdir@ |
244 | pkgdatadir = $(datadir)/@PACKAGE@ |
245 | +pkgincludedir = $(includedir)/@PACKAGE@ |
246 | pkglibdir = $(libdir)/@PACKAGE@ |
247 | -pkgincludedir = $(includedir)/@PACKAGE@ |
248 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ |
249 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
250 | install_sh_DATA = $(install_sh) -c -m 644 |
251 | install_sh_PROGRAM = $(install_sh) -c |
252 | @@ -31,20 +33,28 @@ |
253 | POST_UNINSTALL = : |
254 | build_triplet = @build@ |
255 | host_triplet = @host@ |
256 | +@INSTALL_NLS_TRUE@am__append_1 = po |
257 | subdir = . |
258 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
259 | - $(srcdir)/Makefile.in $(srcdir)/pre_config.h.in \ |
260 | + $(srcdir)/Makefile.in $(srcdir)/gfire_config.h.in \ |
261 | $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ |
262 | config.guess config.sub depcomp install-sh ltmain.sh missing |
263 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
264 | -am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
265 | +am__aclocal_m4_deps = $(top_srcdir)/VERSION $(top_srcdir)/configure.ac |
266 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
267 | $(ACLOCAL_M4) |
268 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
269 | configure.lineno config.status.lineno |
270 | mkinstalldirs = $(install_sh) -d |
271 | -CONFIG_HEADER = pre_config.h |
272 | +CONFIG_HEADER = gfire_config.h |
273 | CONFIG_CLEAN_FILES = |
274 | +CONFIG_CLEAN_VPATH_FILES = |
275 | +AM_V_GEN = $(am__v_GEN_$(V)) |
276 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) |
277 | +am__v_GEN_0 = @echo " GEN " $@; |
278 | +AM_V_at = $(am__v_at_$(V)) |
279 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) |
280 | +am__v_at_0 = @ |
281 | SOURCES = |
282 | DIST_SOURCES = |
283 | RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
284 | @@ -56,33 +66,68 @@ |
285 | ps-recursive uninstall-recursive |
286 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
287 | distclean-recursive maintainer-clean-recursive |
288 | +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
289 | + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
290 | + distdir dist dist-all distcheck |
291 | ETAGS = etags |
292 | CTAGS = ctags |
293 | -DIST_SUBDIRS = $(SUBDIRS) |
294 | +DIST_SUBDIRS = data pixmaps src po |
295 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
296 | distdir = $(PACKAGE)-$(VERSION) |
297 | top_distdir = $(distdir) |
298 | am__remove_distdir = \ |
299 | - { test ! -d $(distdir) \ |
300 | - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ |
301 | - && rm -fr $(distdir); }; } |
302 | + { test ! -d "$(distdir)" \ |
303 | + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
304 | + && rm -fr "$(distdir)"; }; } |
305 | +am__relativize = \ |
306 | + dir0=`pwd`; \ |
307 | + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
308 | + sed_rest='s,^[^/]*/*,,'; \ |
309 | + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ |
310 | + sed_butlast='s,/*[^/]*$$,,'; \ |
311 | + while test -n "$$dir1"; do \ |
312 | + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ |
313 | + if test "$$first" != "."; then \ |
314 | + if test "$$first" = ".."; then \ |
315 | + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ |
316 | + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ |
317 | + else \ |
318 | + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ |
319 | + if test "$$first2" = "$$first"; then \ |
320 | + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ |
321 | + else \ |
322 | + dir2="../$$dir2"; \ |
323 | + fi; \ |
324 | + dir0="$$dir0"/"$$first"; \ |
325 | + fi; \ |
326 | + fi; \ |
327 | + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ |
328 | + done; \ |
329 | + reldir="$$dir2" |
330 | DIST_ARCHIVES = $(distdir).tar.gz |
331 | GZIP_ENV = --best |
332 | distuninstallcheck_listfiles = find . -type f -print |
333 | distcleancheck_listfiles = find . -type f -print |
334 | ACLOCAL = @ACLOCAL@ |
335 | +ALL_LINGUAS = @ALL_LINGUAS@ |
336 | AMTAR = @AMTAR@ |
337 | +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
338 | AR = @AR@ |
339 | AUTOCONF = @AUTOCONF@ |
340 | AUTOHEADER = @AUTOHEADER@ |
341 | AUTOMAKE = @AUTOMAKE@ |
342 | AWK = @AWK@ |
343 | +CATALOGS = @CATALOGS@ |
344 | +CATOBJEXT = @CATOBJEXT@ |
345 | CC = @CC@ |
346 | CCDEPMODE = @CCDEPMODE@ |
347 | CFLAGS = @CFLAGS@ |
348 | CPP = @CPP@ |
349 | CPPFLAGS = @CPPFLAGS@ |
350 | CYGPATH_W = @CYGPATH_W@ |
351 | +DATADIRNAME = @DATADIRNAME@ |
352 | +DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ |
353 | +DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ |
354 | DEBUG_CFLAGS = @DEBUG_CFLAGS@ |
355 | DEFS = @DEFS@ |
356 | DEPDIR = @DEPDIR@ |
357 | @@ -94,19 +139,32 @@ |
358 | EGREP = @EGREP@ |
359 | EXEEXT = @EXEEXT@ |
360 | FGREP = @FGREP@ |
361 | +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
362 | GLIB_CFLAGS = @GLIB_CFLAGS@ |
363 | GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ |
364 | GLIB_LIBS = @GLIB_LIBS@ |
365 | GLIB_MKENUMS = @GLIB_MKENUMS@ |
366 | +GMOFILES = @GMOFILES@ |
367 | +GMSGFMT = @GMSGFMT@ |
368 | GOBJECT_QUERY = @GOBJECT_QUERY@ |
369 | GREP = @GREP@ |
370 | +GTK_CFLAGS = @GTK_CFLAGS@ |
371 | +GTK_LIBS = @GTK_LIBS@ |
372 | INSTALL = @INSTALL@ |
373 | INSTALL_DATA = @INSTALL_DATA@ |
374 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
375 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
376 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
377 | +INSTOBJEXT = @INSTOBJEXT@ |
378 | +INTLLIBS = @INTLLIBS@ |
379 | +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ |
380 | +INTLTOOL_MERGE = @INTLTOOL_MERGE@ |
381 | +INTLTOOL_PERL = @INTLTOOL_PERL@ |
382 | +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ |
383 | LD = @LD@ |
384 | LDFLAGS = @LDFLAGS@ |
385 | +LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ |
386 | +LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ |
387 | LIBOBJS = @LIBOBJS@ |
388 | LIBS = @LIBS@ |
389 | LIBTOOL = @LIBTOOL@ |
390 | @@ -115,8 +173,13 @@ |
391 | LTLIBOBJS = @LTLIBOBJS@ |
392 | MAKEINFO = @MAKEINFO@ |
393 | MKDIR_P = @MKDIR_P@ |
394 | +MKINSTALLDIRS = @MKINSTALLDIRS@ |
395 | +MSGFMT = @MSGFMT@ |
396 | +MSGFMT_OPTS = @MSGFMT_OPTS@ |
397 | +MSGMERGE = @MSGMERGE@ |
398 | NM = @NM@ |
399 | NMEDIT = @NMEDIT@ |
400 | +OBJDUMP = @OBJDUMP@ |
401 | OBJEXT = @OBJEXT@ |
402 | OTOOL = @OTOOL@ |
403 | OTOOL64 = @OTOOL64@ |
404 | @@ -125,17 +188,26 @@ |
405 | PACKAGE_NAME = @PACKAGE_NAME@ |
406 | PACKAGE_STRING = @PACKAGE_STRING@ |
407 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
408 | +PACKAGE_URL = @PACKAGE_URL@ |
409 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
410 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
411 | -PIDGIN_CFLAGS = @PIDGIN_CFLAGS@ |
412 | -PIDGIN_LIBS = @PIDGIN_LIBS@ |
413 | PKG_CONFIG = @PKG_CONFIG@ |
414 | +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
415 | +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
416 | +POFILES = @POFILES@ |
417 | +POSUB = @POSUB@ |
418 | +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ |
419 | +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ |
420 | +PURPLE_CFLAGS = @PURPLE_CFLAGS@ |
421 | +PURPLE_LIBS = @PURPLE_LIBS@ |
422 | RANLIB = @RANLIB@ |
423 | SED = @SED@ |
424 | SET_MAKE = @SET_MAKE@ |
425 | SHELL = @SHELL@ |
426 | STRIP = @STRIP@ |
427 | +USE_NLS = @USE_NLS@ |
428 | VERSION = @VERSION@ |
429 | +XGETTEXT = @XGETTEXT@ |
430 | abs_builddir = @abs_builddir@ |
431 | abs_srcdir = @abs_srcdir@ |
432 | abs_top_builddir = @abs_top_builddir@ |
433 | @@ -172,7 +244,6 @@ |
434 | libexecdir = @libexecdir@ |
435 | localedir = @localedir@ |
436 | localstatedir = @localstatedir@ |
437 | -lt_ECHO = @lt_ECHO@ |
438 | mandir = @mandir@ |
439 | mkdir_p = @mkdir_p@ |
440 | oldincludedir = @oldincludedir@ |
441 | @@ -186,21 +257,21 @@ |
442 | srcdir = @srcdir@ |
443 | sysconfdir = @sysconfdir@ |
444 | target_alias = @target_alias@ |
445 | +top_build_prefix = @top_build_prefix@ |
446 | top_builddir = @top_builddir@ |
447 | top_srcdir = @top_srcdir@ |
448 | -EXTRA_DIST = COPYING \ |
449 | - ChangeLog \ |
450 | - INSTALL \ |
451 | - NEWS \ |
452 | - README \ |
453 | - VERSION \ |
454 | - gfire.spec \ |
455 | - gfire_config.h |
456 | +EXTRA_DIST = config.rpath config.rpath COPYING \ |
457 | + ChangeLog \ |
458 | + INSTALL \ |
459 | + NEWS \ |
460 | + README \ |
461 | + VERSION \ |
462 | + gfire.spec |
463 | |
464 | -SUBDIRS = data pixmaps src |
465 | -AM_CFLAGS = -DDATADIR=\"$(datadir)\" |
466 | -BUILT_SOURCES = gfire_config.h |
467 | -all: $(BUILT_SOURCES) pre_config.h |
468 | +SUBDIRS = data pixmaps src $(am__append_1) |
469 | +AM_CFLAGS = -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" |
470 | +ACLOCAL_AMFLAGS = -I m4 |
471 | +all: gfire_config.h |
472 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
473 | |
474 | .SUFFIXES: |
475 | @@ -210,15 +281,15 @@ |
476 | @for dep in $?; do \ |
477 | case '$(am__configure_deps)' in \ |
478 | *$$dep*) \ |
479 | - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ |
480 | - cd $(srcdir) && $(AUTOMAKE) --gnu \ |
481 | + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ |
482 | + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ |
483 | && exit 0; \ |
484 | exit 1;; \ |
485 | esac; \ |
486 | done; \ |
487 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ |
488 | - cd $(top_srcdir) && \ |
489 | - $(AUTOMAKE) --gnu Makefile |
490 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ |
491 | + $(am__cd) $(top_srcdir) && \ |
492 | + $(AUTOMAKE) --gnu Makefile |
493 | .PRECIOUS: Makefile |
494 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
495 | @case '$?' in \ |
496 | @@ -234,26 +305,27 @@ |
497 | $(SHELL) ./config.status --recheck |
498 | |
499 | $(top_srcdir)/configure: $(am__configure_deps) |
500 | - cd $(srcdir) && $(AUTOCONF) |
501 | + $(am__cd) $(srcdir) && $(AUTOCONF) |
502 | $(ACLOCAL_M4): $(am__aclocal_m4_deps) |
503 | - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
504 | + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
505 | +$(am__aclocal_m4_deps): |
506 | |
507 | -pre_config.h: stamp-h1 |
508 | +gfire_config.h: stamp-h1 |
509 | @if test ! -f $@; then \ |
510 | rm -f stamp-h1; \ |
511 | $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ |
512 | else :; fi |
513 | |
514 | -stamp-h1: $(srcdir)/pre_config.h.in $(top_builddir)/config.status |
515 | +stamp-h1: $(srcdir)/gfire_config.h.in $(top_builddir)/config.status |
516 | @rm -f stamp-h1 |
517 | - cd $(top_builddir) && $(SHELL) ./config.status pre_config.h |
518 | -$(srcdir)/pre_config.h.in: $(am__configure_deps) |
519 | - cd $(top_srcdir) && $(AUTOHEADER) |
520 | + cd $(top_builddir) && $(SHELL) ./config.status gfire_config.h |
521 | +$(srcdir)/gfire_config.h.in: $(am__configure_deps) |
522 | + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) |
523 | rm -f stamp-h1 |
524 | touch $@ |
525 | |
526 | distclean-hdr: |
527 | - -rm -f pre_config.h stamp-h1 |
528 | + -rm -f gfire_config.h stamp-h1 |
529 | |
530 | mostlyclean-libtool: |
531 | -rm -f *.lo |
532 | @@ -262,7 +334,7 @@ |
533 | -rm -rf .libs _libs |
534 | |
535 | distclean-libtool: |
536 | - -rm -f libtool |
537 | + -rm -f libtool config.lt |
538 | |
539 | # This directory's subdirectories are mostly independent; you can cd |
540 | # into them and run `make' without going through this Makefile. |
541 | @@ -271,7 +343,7 @@ |
542 | # (which will cause the Makefiles to be regenerated when you run `make'); |
543 | # (2) otherwise, pass the desired values on the `make' command line. |
544 | $(RECURSIVE_TARGETS): |
545 | - @failcom='exit 1'; \ |
546 | + @fail= failcom='exit 1'; \ |
547 | for f in x $$MAKEFLAGS; do \ |
548 | case $$f in \ |
549 | *=* | --[!k]*);; \ |
550 | @@ -288,7 +360,7 @@ |
551 | else \ |
552 | local_target="$$target"; \ |
553 | fi; \ |
554 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
555 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
556 | || eval $$failcom; \ |
557 | done; \ |
558 | if test "$$dot_seen" = "no"; then \ |
559 | @@ -296,7 +368,7 @@ |
560 | fi; test -z "$$fail" |
561 | |
562 | $(RECURSIVE_CLEAN_TARGETS): |
563 | - @failcom='exit 1'; \ |
564 | + @fail= failcom='exit 1'; \ |
565 | for f in x $$MAKEFLAGS; do \ |
566 | case $$f in \ |
567 | *=* | --[!k]*);; \ |
568 | @@ -322,16 +394,16 @@ |
569 | else \ |
570 | local_target="$$target"; \ |
571 | fi; \ |
572 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
573 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
574 | || eval $$failcom; \ |
575 | done && test -z "$$fail" |
576 | tags-recursive: |
577 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
578 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
579 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
580 | done |
581 | ctags-recursive: |
582 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
583 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
584 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
585 | done |
586 | |
587 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
588 | @@ -339,14 +411,14 @@ |
589 | unique=`for i in $$list; do \ |
590 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
591 | done | \ |
592 | - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ |
593 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
594 | END { if (nonempty) { for (i in files) print i; }; }'`; \ |
595 | mkid -fID $$unique |
596 | tags: TAGS |
597 | |
598 | -TAGS: tags-recursive $(HEADERS) $(SOURCES) pre_config.h.in $(TAGS_DEPENDENCIES) \ |
599 | +TAGS: tags-recursive $(HEADERS) $(SOURCES) gfire_config.h.in $(TAGS_DEPENDENCIES) \ |
600 | $(TAGS_FILES) $(LISP) |
601 | - tags=; \ |
602 | + set x; \ |
603 | here=`pwd`; \ |
604 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
605 | include_option=--etags-include; \ |
606 | @@ -358,45 +430,50 @@ |
607 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
608 | if test "$$subdir" = .; then :; else \ |
609 | test ! -f $$subdir/TAGS || \ |
610 | - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ |
611 | + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
612 | fi; \ |
613 | done; \ |
614 | - list='$(SOURCES) $(HEADERS) pre_config.h.in $(LISP) $(TAGS_FILES)'; \ |
615 | + list='$(SOURCES) $(HEADERS) gfire_config.h.in $(LISP) $(TAGS_FILES)'; \ |
616 | unique=`for i in $$list; do \ |
617 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
618 | done | \ |
619 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
620 | END { if (nonempty) { for (i in files) print i; }; }'`; \ |
621 | - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ |
622 | + shift; \ |
623 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
624 | test -n "$$unique" || unique=$$empty_fix; \ |
625 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
626 | - $$tags $$unique; \ |
627 | + if test $$# -gt 0; then \ |
628 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
629 | + "$$@" $$unique; \ |
630 | + else \ |
631 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
632 | + $$unique; \ |
633 | + fi; \ |
634 | fi |
635 | ctags: CTAGS |
636 | -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) pre_config.h.in $(TAGS_DEPENDENCIES) \ |
637 | +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) gfire_config.h.in $(TAGS_DEPENDENCIES) \ |
638 | $(TAGS_FILES) $(LISP) |
639 | - tags=; \ |
640 | - list='$(SOURCES) $(HEADERS) pre_config.h.in $(LISP) $(TAGS_FILES)'; \ |
641 | + list='$(SOURCES) $(HEADERS) gfire_config.h.in $(LISP) $(TAGS_FILES)'; \ |
642 | unique=`for i in $$list; do \ |
643 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
644 | done | \ |
645 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
646 | END { if (nonempty) { for (i in files) print i; }; }'`; \ |
647 | - test -z "$(CTAGS_ARGS)$$tags$$unique" \ |
648 | + test -z "$(CTAGS_ARGS)$$unique" \ |
649 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
650 | - $$tags $$unique |
651 | + $$unique |
652 | |
653 | GTAGS: |
654 | here=`$(am__cd) $(top_builddir) && pwd` \ |
655 | - && cd $(top_srcdir) \ |
656 | - && gtags -i $(GTAGS_ARGS) $$here |
657 | + && $(am__cd) $(top_srcdir) \ |
658 | + && gtags -i $(GTAGS_ARGS) "$$here" |
659 | |
660 | distclean-tags: |
661 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
662 | |
663 | distdir: $(DISTFILES) |
664 | $(am__remove_distdir) |
665 | - test -d $(distdir) || mkdir $(distdir) |
666 | + test -d "$(distdir)" || mkdir "$(distdir)" |
667 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
668 | topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
669 | list='$(DISTFILES)'; \ |
670 | @@ -412,38 +489,55 @@ |
671 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
672 | if test -d $$d/$$file; then \ |
673 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ |
674 | + if test -d "$(distdir)/$$file"; then \ |
675 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
676 | + fi; \ |
677 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ |
678 | - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ |
679 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ |
680 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
681 | fi; \ |
682 | - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ |
683 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ |
684 | else \ |
685 | - test -f $(distdir)/$$file \ |
686 | - || cp -p $$d/$$file $(distdir)/$$file \ |
687 | + test -f "$(distdir)/$$file" \ |
688 | + || cp -p $$d/$$file "$(distdir)/$$file" \ |
689 | || exit 1; \ |
690 | fi; \ |
691 | done |
692 | - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
693 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
694 | if test "$$subdir" = .; then :; else \ |
695 | test -d "$(distdir)/$$subdir" \ |
696 | || $(MKDIR_P) "$(distdir)/$$subdir" \ |
697 | || exit 1; \ |
698 | - distdir=`$(am__cd) $(distdir) && pwd`; \ |
699 | - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ |
700 | - (cd $$subdir && \ |
701 | + fi; \ |
702 | + done |
703 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
704 | + if test "$$subdir" = .; then :; else \ |
705 | + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
706 | + $(am__relativize); \ |
707 | + new_distdir=$$reldir; \ |
708 | + dir1=$$subdir; dir2="$(top_distdir)"; \ |
709 | + $(am__relativize); \ |
710 | + new_top_distdir=$$reldir; \ |
711 | + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ |
712 | + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ |
713 | + ($(am__cd) $$subdir && \ |
714 | $(MAKE) $(AM_MAKEFLAGS) \ |
715 | - top_distdir="$$top_distdir" \ |
716 | - distdir="$$distdir/$$subdir" \ |
717 | + top_distdir="$$new_top_distdir" \ |
718 | + distdir="$$new_distdir" \ |
719 | am__remove_distdir=: \ |
720 | am__skip_length_check=: \ |
721 | + am__skip_mode_fix=: \ |
722 | distdir) \ |
723 | || exit 1; \ |
724 | fi; \ |
725 | done |
726 | - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ |
727 | + -test -n "$(am__skip_mode_fix)" \ |
728 | + || find "$(distdir)" -type d ! -perm -755 \ |
729 | + -exec chmod u+rwx,go+rx {} \; -o \ |
730 | ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ |
731 | ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ |
732 | ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ |
733 | - || chmod -R a+r $(distdir) |
734 | + || chmod -R a+r "$(distdir)" |
735 | dist-gzip: distdir |
736 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
737 | $(am__remove_distdir) |
738 | @@ -456,6 +550,10 @@ |
739 | tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
740 | $(am__remove_distdir) |
741 | |
742 | +dist-xz: distdir |
743 | + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
744 | + $(am__remove_distdir) |
745 | + |
746 | dist-tarZ: distdir |
747 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
748 | $(am__remove_distdir) |
749 | @@ -479,15 +577,17 @@ |
750 | distcheck: dist |
751 | case '$(DIST_ARCHIVES)' in \ |
752 | *.tar.gz*) \ |
753 | - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ |
754 | + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
755 | *.tar.bz2*) \ |
756 | - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ |
757 | + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
758 | *.tar.lzma*) \ |
759 | - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ |
760 | + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
761 | + *.tar.xz*) \ |
762 | + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
763 | *.tar.Z*) \ |
764 | uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ |
765 | *.shar.gz*) \ |
766 | - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ |
767 | + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ |
768 | *.zip*) \ |
769 | unzip $(distdir).zip ;;\ |
770 | esac |
771 | @@ -495,9 +595,11 @@ |
772 | mkdir $(distdir)/_build |
773 | mkdir $(distdir)/_inst |
774 | chmod a-w $(distdir) |
775 | + test -d $(distdir)/_build || exit 0; \ |
776 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
777 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
778 | - && cd $(distdir)/_build \ |
779 | + && am__cwd=`pwd` \ |
780 | + && $(am__cd) $(distdir)/_build \ |
781 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
782 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
783 | && $(MAKE) $(AM_MAKEFLAGS) \ |
784 | @@ -519,13 +621,15 @@ |
785 | && rm -rf "$$dc_destdir" \ |
786 | && $(MAKE) $(AM_MAKEFLAGS) dist \ |
787 | && rm -rf $(DIST_ARCHIVES) \ |
788 | - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck |
789 | + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ |
790 | + && cd "$$am__cwd" \ |
791 | + || exit 1 |
792 | $(am__remove_distdir) |
793 | @(echo "$(distdir) archives ready for distribution: "; \ |
794 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
795 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
796 | distuninstallcheck: |
797 | - @cd $(distuninstallcheck_dir) \ |
798 | + @$(am__cd) '$(distuninstallcheck_dir)' \ |
799 | && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
800 | || { echo "ERROR: files left after uninstall:" ; \ |
801 | if test -n "$(DESTDIR)"; then \ |
802 | @@ -543,13 +647,11 @@ |
803 | $(distcleancheck_listfiles) ; \ |
804 | exit 1; } >&2 |
805 | check-am: all-am |
806 | -check: $(BUILT_SOURCES) |
807 | - $(MAKE) $(AM_MAKEFLAGS) check-recursive |
808 | -all-am: Makefile pre_config.h |
809 | +check: check-recursive |
810 | +all-am: Makefile gfire_config.h |
811 | installdirs: installdirs-recursive |
812 | installdirs-am: |
813 | -install: $(BUILT_SOURCES) |
814 | - $(MAKE) $(AM_MAKEFLAGS) install-recursive |
815 | +install: install-recursive |
816 | install-exec: install-exec-recursive |
817 | install-data: install-data-recursive |
818 | uninstall: uninstall-recursive |
819 | @@ -569,11 +671,11 @@ |
820 | |
821 | distclean-generic: |
822 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
823 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) |
824 | |
825 | maintainer-clean-generic: |
826 | @echo "This command is intended for maintainers to use" |
827 | @echo "it deletes files that may require special tools to rebuild." |
828 | - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) |
829 | clean: clean-recursive |
830 | |
831 | clean-am: clean-generic clean-libtool mostlyclean-am |
832 | @@ -590,6 +692,8 @@ |
833 | |
834 | html: html-recursive |
835 | |
836 | +html-am: |
837 | + |
838 | info: info-recursive |
839 | |
840 | info-am: |
841 | @@ -598,18 +702,28 @@ |
842 | |
843 | install-dvi: install-dvi-recursive |
844 | |
845 | +install-dvi-am: |
846 | + |
847 | install-exec-am: |
848 | |
849 | install-html: install-html-recursive |
850 | |
851 | +install-html-am: |
852 | + |
853 | install-info: install-info-recursive |
854 | |
855 | +install-info-am: |
856 | + |
857 | install-man: |
858 | |
859 | install-pdf: install-pdf-recursive |
860 | |
861 | +install-pdf-am: |
862 | + |
863 | install-ps: install-ps-recursive |
864 | |
865 | +install-ps-am: |
866 | + |
867 | installcheck-am: |
868 | |
869 | maintainer-clean: maintainer-clean-recursive |
870 | @@ -632,29 +746,26 @@ |
871 | |
872 | uninstall-am: |
873 | |
874 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ |
875 | - install-strip |
876 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ |
877 | + ctags-recursive install-am install-strip tags-recursive |
878 | |
879 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
880 | all all-am am--refresh check check-am clean clean-generic \ |
881 | clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
882 | - dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ |
883 | - distclean distclean-generic distclean-hdr distclean-libtool \ |
884 | - distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
885 | - dvi-am html html-am info info-am install install-am \ |
886 | - install-data install-data-am install-dvi install-dvi-am \ |
887 | - install-exec install-exec-am install-html install-html-am \ |
888 | - install-info install-info-am install-man install-pdf \ |
889 | - install-pdf-am install-ps install-ps-am install-strip \ |
890 | - installcheck installcheck-am installdirs installdirs-am \ |
891 | - maintainer-clean maintainer-clean-generic mostlyclean \ |
892 | - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
893 | - tags tags-recursive uninstall uninstall-am |
894 | - |
895 | -$(OBJECTS): $(BUILT_SOURCES) |
896 | - |
897 | -gfire_config.h: pre_config.h |
898 | - $(sedpath) 's/#define PACKAGE/#define SNPP_PACKAGE/g' pre_config.h > $@ |
899 | + dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ |
900 | + distcheck distclean distclean-generic distclean-hdr \ |
901 | + distclean-libtool distclean-tags distcleancheck distdir \ |
902 | + distuninstallcheck dvi dvi-am html html-am info info-am \ |
903 | + install install-am install-data install-data-am install-dvi \ |
904 | + install-dvi-am install-exec install-exec-am install-html \ |
905 | + install-html-am install-info install-info-am install-man \ |
906 | + install-pdf install-pdf-am install-ps install-ps-am \ |
907 | + install-strip installcheck installcheck-am installdirs \ |
908 | + installdirs-am maintainer-clean maintainer-clean-generic \ |
909 | + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ |
910 | + ps ps-am tags tags-recursive uninstall uninstall-am |
911 | + |
912 | + |
913 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
914 | # Otherwise a system limit (for SysV at least) may be exceeded. |
915 | .NOEXPORT: |
916 | |
917 | === added file 'Makefile.mingw' |
918 | --- Makefile.mingw 1970-01-01 00:00:00 +0000 |
919 | +++ Makefile.mingw 2011-09-20 17:01:28 +0000 |
920 | @@ -0,0 +1,41 @@ |
921 | +GFIRE_DIR = . |
922 | +include mingw.mak |
923 | + |
924 | +GFIRE_VERSION_STRING = `cat VERSION` |
925 | +GFIRE_VERSION_SUFFIX = `awk '{split($$1,array,"\\\.|-"); print array[4];}' VERSION` |
926 | +GFIRE_VERSION_PATCH = `awk '{split($$1,array,"\\\.|-"); print array[3];}' VERSION` |
927 | +GFIRE_VERSION_MINOR = `awk '{split($$1,array,"\\\.|-"); print array[2];}' VERSION` |
928 | +GFIRE_VERSION_MAJOR = `awk '{split($$1,array,"\\\.|-"); print array[1];}' VERSION` |
929 | + |
930 | +SUBDIRS = src po data pixmaps |
931 | + |
932 | +.PHONY: all clean installer |
933 | + |
934 | +all: gfire_config_win.h |
935 | + @list='${SUBDIRS}'; for subdir in $$list; do \ |
936 | + (cd $$subdir && $(MAKE) -f Makefile.mingw all) || exit 1; \ |
937 | + done; |
938 | + |
939 | +clean: |
940 | + @list='${SUBDIRS}'; for subdir in $$list; do \ |
941 | + (cd $$subdir && $(MAKE) -f Makefile.mingw clean) || exit 1; \ |
942 | + done; |
943 | + |
944 | +distclean: clean |
945 | + rm -rf ${WIN32_INSTALL_DIR} |
946 | + rm -f pidgin-gfire-$(GFIRE_VERSION_STRING).exe |
947 | + rm -f pidgin-gfire-$(GFIRE_VERSION_STRING).zip |
948 | + |
949 | +install: all |
950 | + @list='${SUBDIRS}'; for subdir in $$list; do \ |
951 | + (cd $$subdir && $(MAKE) -f Makefile.mingw install) || exit 1; \ |
952 | + done; |
953 | + |
954 | +installer: installer-gui installer-zip |
955 | + |
956 | +installer-gui: install VERSION |
957 | + ${MAKENSIS} -V3 -DGFIRE_VERSION="$(GFIRE_VERSION_STRING)" -DGFIRE_INSTALL_DIR="${WIN32_INSTALL_DIR}" ${GFIRE_DIR}/nsis/gfire-installer.nsi |
958 | + #${MAKENSIS} ${GFIRE_DIR}/nsis/gfire-installer.nsi |
959 | + |
960 | +installer-zip: install VERSION |
961 | + cd ${WIN32_INSTALL_DIR} && /usr/bin/zip -ru ../pidgin-gfire-`cat ../VERSION`.zip * |
962 | |
963 | === modified file 'NEWS' (properties changed: +x to -x) |
964 | === modified file 'README' (properties changed: +x to -x) |
965 | --- README 2009-08-19 15:00:17 +0000 |
966 | +++ README 2011-09-20 17:01:28 +0000 |
967 | @@ -3,8 +3,7 @@ |
968 | |
969 | About |
970 | ===== |
971 | -Gfire 0.8.3 will need Pidgin 2.5.0 or higher because of all the new |
972 | -features that are implemented. To compile it from source, it will be |
973 | +Gfire 0.9.4 will need Pidgin 2.5.0 or higher. To compile it from source, it will be |
974 | for most users easy as running: |
975 | |
976 | ./configure --prefix=/usr |
977 | |
978 | === modified file 'VERSION' (properties changed: +x to -x) |
979 | --- VERSION 2009-08-19 15:00:17 +0000 |
980 | +++ VERSION 2011-09-20 17:01:28 +0000 |
981 | @@ -1,1 +1,1 @@ |
982 | -0.8.3 |
983 | +0.9.4 |
984 | |
985 | === modified file 'aclocal.m4' (properties changed: +x to -x) |
986 | --- aclocal.m4 2009-07-25 18:03:46 +0000 |
987 | +++ aclocal.m4 2011-09-20 17:01:28 +0000 |
988 | @@ -1,7 +1,7 @@ |
989 | -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- |
990 | +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- |
991 | |
992 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
993 | -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
994 | +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
995 | # This file is free software; the Free Software Foundation |
996 | # gives unlimited permission to copy and/or distribute it, |
997 | # with or without modifications, as long as this notice is preserved. |
998 | @@ -13,8 +13,8 @@ |
999 | |
1000 | m4_ifndef([AC_AUTOCONF_VERSION], |
1001 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1002 | -m4_if(AC_AUTOCONF_VERSION, [2.61],, |
1003 | -[m4_warning([this file was generated for autoconf 2.61. |
1004 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, |
1005 | +[m4_warning([this file was generated for autoconf 2.65. |
1006 | You have another version of autoconf. It may work, but is not guaranteed to. |
1007 | If you have problems, you may need to regenerate the build system entirely. |
1008 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
1009 | @@ -115,7 +115,7 @@ |
1010 | int major, minor, micro; |
1011 | char *tmp_version; |
1012 | |
1013 | - system ("touch conf.glibtest"); |
1014 | + fclose (fopen ("conf.glibtest", "w")); |
1015 | |
1016 | /* HP/UX 9 (%@#!) writes to sscanf strings */ |
1017 | tmp_version = g_strdup("$min_glib_version"); |
1018 | @@ -231,10 +231,638 @@ |
1019 | rm -f conf.glibtest |
1020 | ]) |
1021 | |
1022 | +# Copyright (C) 1995-2002 Free Software Foundation, Inc. |
1023 | +# Copyright (C) 2001-2003,2004 Red Hat, Inc. |
1024 | +# |
1025 | +# This file is free software, distributed under the terms of the GNU |
1026 | +# General Public License. As a special exception to the GNU General |
1027 | +# Public License, this file may be distributed as part of a program |
1028 | +# that contains a configuration script generated by Autoconf, under |
1029 | +# the same distribution terms as the rest of that program. |
1030 | +# |
1031 | +# This file can be copied and used freely without restrictions. It can |
1032 | +# be used in projects which are not available under the GNU Public License |
1033 | +# but which still want to provide support for the GNU gettext functionality. |
1034 | +# |
1035 | +# Macro to add for using GNU gettext. |
1036 | +# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996 |
1037 | +# |
1038 | +# Modified to never use included libintl. |
1039 | +# Owen Taylor <otaylor@redhat.com>, 12/15/1998 |
1040 | +# |
1041 | +# Major rework to remove unused code |
1042 | +# Owen Taylor <otaylor@redhat.com>, 12/11/2002 |
1043 | +# |
1044 | +# Added better handling of ALL_LINGUAS from GNU gettext version |
1045 | +# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002 |
1046 | +# |
1047 | +# Modified to require ngettext |
1048 | +# Matthias Clasen <mclasen@redhat.com> 08/06/2004 |
1049 | +# |
1050 | +# We need this here as well, since someone might use autoconf-2.5x |
1051 | +# to configure GLib then an older version to configure a package |
1052 | +# using AM_GLIB_GNU_GETTEXT |
1053 | +AC_PREREQ(2.53) |
1054 | + |
1055 | +dnl |
1056 | +dnl We go to great lengths to make sure that aclocal won't |
1057 | +dnl try to pull in the installed version of these macros |
1058 | +dnl when running aclocal in the glib directory. |
1059 | +dnl |
1060 | +m4_copy([AC_DEFUN],[glib_DEFUN]) |
1061 | +m4_copy([AC_REQUIRE],[glib_REQUIRE]) |
1062 | +dnl |
1063 | +dnl At the end, if we're not within glib, we'll define the public |
1064 | +dnl definitions in terms of our private definitions. |
1065 | +dnl |
1066 | + |
1067 | +# GLIB_LC_MESSAGES |
1068 | +#-------------------- |
1069 | +glib_DEFUN([GLIB_LC_MESSAGES], |
1070 | + [AC_CHECK_HEADERS([locale.h]) |
1071 | + if test $ac_cv_header_locale_h = yes; then |
1072 | + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, |
1073 | + [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], |
1074 | + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) |
1075 | + if test $am_cv_val_LC_MESSAGES = yes; then |
1076 | + AC_DEFINE(HAVE_LC_MESSAGES, 1, |
1077 | + [Define if your <locale.h> file defines LC_MESSAGES.]) |
1078 | + fi |
1079 | + fi]) |
1080 | + |
1081 | +# GLIB_PATH_PROG_WITH_TEST |
1082 | +#---------------------------- |
1083 | +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, |
1084 | +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) |
1085 | +glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], |
1086 | +[# Extract the first word of "$2", so it can be a program name with args. |
1087 | +set dummy $2; ac_word=[$]2 |
1088 | +AC_MSG_CHECKING([for $ac_word]) |
1089 | +AC_CACHE_VAL(ac_cv_path_$1, |
1090 | +[case "[$]$1" in |
1091 | + /*) |
1092 | + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. |
1093 | + ;; |
1094 | + *) |
1095 | + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" |
1096 | + for ac_dir in ifelse([$5], , $PATH, [$5]); do |
1097 | + test -z "$ac_dir" && ac_dir=. |
1098 | + if test -f $ac_dir/$ac_word; then |
1099 | + if [$3]; then |
1100 | + ac_cv_path_$1="$ac_dir/$ac_word" |
1101 | + break |
1102 | + fi |
1103 | + fi |
1104 | + done |
1105 | + IFS="$ac_save_ifs" |
1106 | +dnl If no 4th arg is given, leave the cache variable unset, |
1107 | +dnl so AC_PATH_PROGS will keep looking. |
1108 | +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" |
1109 | +])dnl |
1110 | + ;; |
1111 | +esac])dnl |
1112 | +$1="$ac_cv_path_$1" |
1113 | +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then |
1114 | + AC_MSG_RESULT([$]$1) |
1115 | +else |
1116 | + AC_MSG_RESULT(no) |
1117 | +fi |
1118 | +AC_SUBST($1)dnl |
1119 | +]) |
1120 | + |
1121 | +# GLIB_WITH_NLS |
1122 | +#----------------- |
1123 | +glib_DEFUN([GLIB_WITH_NLS], |
1124 | + dnl NLS is obligatory |
1125 | + [USE_NLS=yes |
1126 | + AC_SUBST(USE_NLS) |
1127 | + |
1128 | + gt_cv_have_gettext=no |
1129 | + |
1130 | + CATOBJEXT=NONE |
1131 | + XGETTEXT=: |
1132 | + INTLLIBS= |
1133 | + |
1134 | + AC_CHECK_HEADER(libintl.h, |
1135 | + [gt_cv_func_dgettext_libintl="no" |
1136 | + libintl_extra_libs="" |
1137 | + |
1138 | + # |
1139 | + # First check in libc |
1140 | + # |
1141 | + AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, |
1142 | + [AC_TRY_LINK([ |
1143 | +#include <libintl.h> |
1144 | +], |
1145 | + [return !ngettext ("","", 1)], |
1146 | + gt_cv_func_ngettext_libc=yes, |
1147 | + gt_cv_func_ngettext_libc=no) |
1148 | + ]) |
1149 | + |
1150 | + if test "$gt_cv_func_ngettext_libc" = "yes" ; then |
1151 | + AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, |
1152 | + [AC_TRY_LINK([ |
1153 | +#include <libintl.h> |
1154 | +], |
1155 | + [return !dgettext ("","")], |
1156 | + gt_cv_func_dgettext_libc=yes, |
1157 | + gt_cv_func_dgettext_libc=no) |
1158 | + ]) |
1159 | + fi |
1160 | + |
1161 | + if test "$gt_cv_func_ngettext_libc" = "yes" ; then |
1162 | + AC_CHECK_FUNCS(bind_textdomain_codeset) |
1163 | + fi |
1164 | + |
1165 | + # |
1166 | + # If we don't have everything we want, check in libintl |
1167 | + # |
1168 | + if test "$gt_cv_func_dgettext_libc" != "yes" \ |
1169 | + || test "$gt_cv_func_ngettext_libc" != "yes" \ |
1170 | + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then |
1171 | + |
1172 | + AC_CHECK_LIB(intl, bindtextdomain, |
1173 | + [AC_CHECK_LIB(intl, ngettext, |
1174 | + [AC_CHECK_LIB(intl, dgettext, |
1175 | + gt_cv_func_dgettext_libintl=yes)])]) |
1176 | + |
1177 | + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then |
1178 | + AC_MSG_CHECKING([if -liconv is needed to use gettext]) |
1179 | + AC_MSG_RESULT([]) |
1180 | + AC_CHECK_LIB(intl, ngettext, |
1181 | + [AC_CHECK_LIB(intl, dcgettext, |
1182 | + [gt_cv_func_dgettext_libintl=yes |
1183 | + libintl_extra_libs=-liconv], |
1184 | + :,-liconv)], |
1185 | + :,-liconv) |
1186 | + fi |
1187 | + |
1188 | + # |
1189 | + # If we found libintl, then check in it for bind_textdomain_codeset(); |
1190 | + # we'll prefer libc if neither have bind_textdomain_codeset(), |
1191 | + # and both have dgettext and ngettext |
1192 | + # |
1193 | + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then |
1194 | + glib_save_LIBS="$LIBS" |
1195 | + LIBS="$LIBS -lintl $libintl_extra_libs" |
1196 | + unset ac_cv_func_bind_textdomain_codeset |
1197 | + AC_CHECK_FUNCS(bind_textdomain_codeset) |
1198 | + LIBS="$glib_save_LIBS" |
1199 | + |
1200 | + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then |
1201 | + gt_cv_func_dgettext_libc=no |
1202 | + else |
1203 | + if test "$gt_cv_func_dgettext_libc" = "yes" \ |
1204 | + && test "$gt_cv_func_ngettext_libc" = "yes"; then |
1205 | + gt_cv_func_dgettext_libintl=no |
1206 | + fi |
1207 | + fi |
1208 | + fi |
1209 | + fi |
1210 | + |
1211 | + if test "$gt_cv_func_dgettext_libc" = "yes" \ |
1212 | + || test "$gt_cv_func_dgettext_libintl" = "yes"; then |
1213 | + gt_cv_have_gettext=yes |
1214 | + fi |
1215 | + |
1216 | + if test "$gt_cv_func_dgettext_libintl" = "yes"; then |
1217 | + INTLLIBS="-lintl $libintl_extra_libs" |
1218 | + fi |
1219 | + |
1220 | + if test "$gt_cv_have_gettext" = "yes"; then |
1221 | + AC_DEFINE(HAVE_GETTEXT,1, |
1222 | + [Define if the GNU gettext() function is already present or preinstalled.]) |
1223 | + GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, |
1224 | + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl |
1225 | + if test "$MSGFMT" != "no"; then |
1226 | + glib_save_LIBS="$LIBS" |
1227 | + LIBS="$LIBS $INTLLIBS" |
1228 | + AC_CHECK_FUNCS(dcgettext) |
1229 | + MSGFMT_OPTS= |
1230 | + AC_MSG_CHECKING([if msgfmt accepts -c]) |
1231 | + GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ |
1232 | +msgid "" |
1233 | +msgstr "" |
1234 | +"Content-Type: text/plain; charset=UTF-8\n" |
1235 | +"Project-Id-Version: test 1.0\n" |
1236 | +"PO-Revision-Date: 2007-02-15 12:01+0100\n" |
1237 | +"Last-Translator: test <foo@bar.xx>\n" |
1238 | +"Language-Team: C <LL@li.org>\n" |
1239 | +"MIME-Version: 1.0\n" |
1240 | +"Content-Transfer-Encoding: 8bit\n" |
1241 | +], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) |
1242 | + AC_SUBST(MSGFMT_OPTS) |
1243 | + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) |
1244 | + GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, |
1245 | + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) |
1246 | + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; |
1247 | + return _nl_msg_cat_cntr], |
1248 | + [CATOBJEXT=.gmo |
1249 | + DATADIRNAME=share], |
1250 | + [case $host in |
1251 | + *-*-solaris*) |
1252 | + dnl On Solaris, if bind_textdomain_codeset is in libc, |
1253 | + dnl GNU format message catalog is always supported, |
1254 | + dnl since both are added to the libc all together. |
1255 | + dnl Hence, we'd like to go with DATADIRNAME=share and |
1256 | + dnl and CATOBJEXT=.gmo in this case. |
1257 | + AC_CHECK_FUNC(bind_textdomain_codeset, |
1258 | + [CATOBJEXT=.gmo |
1259 | + DATADIRNAME=share], |
1260 | + [CATOBJEXT=.mo |
1261 | + DATADIRNAME=lib]) |
1262 | + ;; |
1263 | + *) |
1264 | + CATOBJEXT=.mo |
1265 | + DATADIRNAME=lib |
1266 | + ;; |
1267 | + esac]) |
1268 | + LIBS="$glib_save_LIBS" |
1269 | + INSTOBJEXT=.mo |
1270 | + else |
1271 | + gt_cv_have_gettext=no |
1272 | + fi |
1273 | + fi |
1274 | + ]) |
1275 | + |
1276 | + if test "$gt_cv_have_gettext" = "yes" ; then |
1277 | + AC_DEFINE(ENABLE_NLS, 1, |
1278 | + [always defined to indicate that i18n is enabled]) |
1279 | + fi |
1280 | + |
1281 | + dnl Test whether we really found GNU xgettext. |
1282 | + if test "$XGETTEXT" != ":"; then |
1283 | + dnl If it is not GNU xgettext we define it as : so that the |
1284 | + dnl Makefiles still can work. |
1285 | + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then |
1286 | + : ; |
1287 | + else |
1288 | + AC_MSG_RESULT( |
1289 | + [found xgettext program is not GNU xgettext; ignore it]) |
1290 | + XGETTEXT=":" |
1291 | + fi |
1292 | + fi |
1293 | + |
1294 | + # We need to process the po/ directory. |
1295 | + POSUB=po |
1296 | + |
1297 | + AC_OUTPUT_COMMANDS( |
1298 | + [case "$CONFIG_FILES" in *po/Makefile.in*) |
1299 | + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile |
1300 | + esac]) |
1301 | + |
1302 | + dnl These rules are solely for the distribution goal. While doing this |
1303 | + dnl we only have to keep exactly one list of the available catalogs |
1304 | + dnl in configure.ac. |
1305 | + for lang in $ALL_LINGUAS; do |
1306 | + GMOFILES="$GMOFILES $lang.gmo" |
1307 | + POFILES="$POFILES $lang.po" |
1308 | + done |
1309 | + |
1310 | + dnl Make all variables we use known to autoconf. |
1311 | + AC_SUBST(CATALOGS) |
1312 | + AC_SUBST(CATOBJEXT) |
1313 | + AC_SUBST(DATADIRNAME) |
1314 | + AC_SUBST(GMOFILES) |
1315 | + AC_SUBST(INSTOBJEXT) |
1316 | + AC_SUBST(INTLLIBS) |
1317 | + AC_SUBST(PO_IN_DATADIR_TRUE) |
1318 | + AC_SUBST(PO_IN_DATADIR_FALSE) |
1319 | + AC_SUBST(POFILES) |
1320 | + AC_SUBST(POSUB) |
1321 | + ]) |
1322 | + |
1323 | +# AM_GLIB_GNU_GETTEXT |
1324 | +# ------------------- |
1325 | +# Do checks necessary for use of gettext. If a suitable implementation |
1326 | +# of gettext is found in either in libintl or in the C library, |
1327 | +# it will set INTLLIBS to the libraries needed for use of gettext |
1328 | +# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable |
1329 | +# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() |
1330 | +# on various variables needed by the Makefile.in.in installed by |
1331 | +# glib-gettextize. |
1332 | +dnl |
1333 | +glib_DEFUN([GLIB_GNU_GETTEXT], |
1334 | + [AC_REQUIRE([AC_PROG_CC])dnl |
1335 | + AC_REQUIRE([AC_HEADER_STDC])dnl |
1336 | + |
1337 | + GLIB_LC_MESSAGES |
1338 | + GLIB_WITH_NLS |
1339 | + |
1340 | + if test "$gt_cv_have_gettext" = "yes"; then |
1341 | + if test "x$ALL_LINGUAS" = "x"; then |
1342 | + LINGUAS= |
1343 | + else |
1344 | + AC_MSG_CHECKING(for catalogs to be installed) |
1345 | + NEW_LINGUAS= |
1346 | + for presentlang in $ALL_LINGUAS; do |
1347 | + useit=no |
1348 | + if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then |
1349 | + desiredlanguages="$LINGUAS" |
1350 | + else |
1351 | + desiredlanguages="$ALL_LINGUAS" |
1352 | + fi |
1353 | + for desiredlang in $desiredlanguages; do |
1354 | + # Use the presentlang catalog if desiredlang is |
1355 | + # a. equal to presentlang, or |
1356 | + # b. a variant of presentlang (because in this case, |
1357 | + # presentlang can be used as a fallback for messages |
1358 | + # which are not translated in the desiredlang catalog). |
1359 | + case "$desiredlang" in |
1360 | + "$presentlang"*) useit=yes;; |
1361 | + esac |
1362 | + done |
1363 | + if test $useit = yes; then |
1364 | + NEW_LINGUAS="$NEW_LINGUAS $presentlang" |
1365 | + fi |
1366 | + done |
1367 | + LINGUAS=$NEW_LINGUAS |
1368 | + AC_MSG_RESULT($LINGUAS) |
1369 | + fi |
1370 | + |
1371 | + dnl Construct list of names of catalog files to be constructed. |
1372 | + if test -n "$LINGUAS"; then |
1373 | + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done |
1374 | + fi |
1375 | + fi |
1376 | + |
1377 | + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly |
1378 | + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). |
1379 | + dnl Try to locate is. |
1380 | + MKINSTALLDIRS= |
1381 | + if test -n "$ac_aux_dir"; then |
1382 | + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" |
1383 | + fi |
1384 | + if test -z "$MKINSTALLDIRS"; then |
1385 | + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" |
1386 | + fi |
1387 | + AC_SUBST(MKINSTALLDIRS) |
1388 | + |
1389 | + dnl Generate list of files to be processed by xgettext which will |
1390 | + dnl be included in po/Makefile. |
1391 | + test -d po || mkdir po |
1392 | + if test "x$srcdir" != "x."; then |
1393 | + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then |
1394 | + posrcprefix="$srcdir/" |
1395 | + else |
1396 | + posrcprefix="../$srcdir/" |
1397 | + fi |
1398 | + else |
1399 | + posrcprefix="../" |
1400 | + fi |
1401 | + rm -f po/POTFILES |
1402 | + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ |
1403 | + < $srcdir/po/POTFILES.in > po/POTFILES |
1404 | + ]) |
1405 | + |
1406 | +# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) |
1407 | +# ------------------------------- |
1408 | +# Define VARIABLE to the location where catalog files will |
1409 | +# be installed by po/Makefile. |
1410 | +glib_DEFUN([GLIB_DEFINE_LOCALEDIR], |
1411 | +[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl |
1412 | +glib_save_prefix="$prefix" |
1413 | +glib_save_exec_prefix="$exec_prefix" |
1414 | +glib_save_datarootdir="$datarootdir" |
1415 | +test "x$prefix" = xNONE && prefix=$ac_default_prefix |
1416 | +test "x$exec_prefix" = xNONE && exec_prefix=$prefix |
1417 | +datarootdir=`eval echo "${datarootdir}"` |
1418 | +if test "x$CATOBJEXT" = "x.mo" ; then |
1419 | + localedir=`eval echo "${libdir}/locale"` |
1420 | +else |
1421 | + localedir=`eval echo "${datadir}/locale"` |
1422 | +fi |
1423 | +prefix="$glib_save_prefix" |
1424 | +exec_prefix="$glib_save_exec_prefix" |
1425 | +datarootdir="$glib_save_datarootdir" |
1426 | +AC_DEFINE_UNQUOTED($1, "$localedir", |
1427 | + [Define the location where the catalogs will be installed]) |
1428 | +]) |
1429 | + |
1430 | +dnl |
1431 | +dnl Now the definitions that aclocal will find |
1432 | +dnl |
1433 | +ifdef(glib_configure_ac,[],[ |
1434 | +AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) |
1435 | +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) |
1436 | +])dnl |
1437 | + |
1438 | +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) |
1439 | +# |
1440 | +# Create a temporary file with TEST-FILE as its contents and pass the |
1441 | +# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with |
1442 | +# 0 and perform ACTION-IF-FAIL for any other exit status. |
1443 | +AC_DEFUN([GLIB_RUN_PROG], |
1444 | +[cat >conftest.foo <<_ACEOF |
1445 | +$2 |
1446 | +_ACEOF |
1447 | +if AC_RUN_LOG([$1 conftest.foo]); then |
1448 | + m4_ifval([$3], [$3], [:]) |
1449 | +m4_ifvaln([$4], [else $4])dnl |
1450 | +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD |
1451 | +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD |
1452 | +fi]) |
1453 | + |
1454 | + |
1455 | + |
1456 | +dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) |
1457 | +# serial 40 IT_PROG_INTLTOOL |
1458 | +AC_DEFUN([IT_PROG_INTLTOOL], [ |
1459 | +AC_PREREQ([2.50])dnl |
1460 | +AC_REQUIRE([AM_NLS])dnl |
1461 | + |
1462 | +case "$am__api_version" in |
1463 | + 1.[01234]) |
1464 | + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) |
1465 | + ;; |
1466 | + *) |
1467 | + ;; |
1468 | +esac |
1469 | + |
1470 | +if test -n "$1"; then |
1471 | + AC_MSG_CHECKING([for intltool >= $1]) |
1472 | + |
1473 | + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` |
1474 | + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` |
1475 | + [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` |
1476 | + ] |
1477 | + AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) |
1478 | + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || |
1479 | + AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) |
1480 | +fi |
1481 | + |
1482 | +AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) |
1483 | +AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) |
1484 | +AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) |
1485 | +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then |
1486 | + AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) |
1487 | +fi |
1488 | + |
1489 | + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1490 | +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1491 | + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1492 | + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1493 | + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' |
1494 | + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1495 | + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1496 | + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1497 | +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1498 | + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1499 | + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1500 | + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' |
1501 | + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1502 | + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1503 | + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1504 | + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1505 | + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1506 | + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1507 | + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
1508 | + |
1509 | +_IT_SUBST(INTLTOOL_DESKTOP_RULE) |
1510 | +_IT_SUBST(INTLTOOL_DIRECTORY_RULE) |
1511 | +_IT_SUBST(INTLTOOL_KEYS_RULE) |
1512 | +_IT_SUBST(INTLTOOL_PROP_RULE) |
1513 | +_IT_SUBST(INTLTOOL_OAF_RULE) |
1514 | +_IT_SUBST(INTLTOOL_PONG_RULE) |
1515 | +_IT_SUBST(INTLTOOL_SERVER_RULE) |
1516 | +_IT_SUBST(INTLTOOL_SHEET_RULE) |
1517 | +_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) |
1518 | +_IT_SUBST(INTLTOOL_UI_RULE) |
1519 | +_IT_SUBST(INTLTOOL_XAM_RULE) |
1520 | +_IT_SUBST(INTLTOOL_KBD_RULE) |
1521 | +_IT_SUBST(INTLTOOL_XML_RULE) |
1522 | +_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) |
1523 | +_IT_SUBST(INTLTOOL_CAVES_RULE) |
1524 | +_IT_SUBST(INTLTOOL_SCHEMAS_RULE) |
1525 | +_IT_SUBST(INTLTOOL_THEME_RULE) |
1526 | +_IT_SUBST(INTLTOOL_SERVICE_RULE) |
1527 | +_IT_SUBST(INTLTOOL_POLICY_RULE) |
1528 | + |
1529 | +# Check the gettext tools to make sure they are GNU |
1530 | +AC_PATH_PROG(XGETTEXT, xgettext) |
1531 | +AC_PATH_PROG(MSGMERGE, msgmerge) |
1532 | +AC_PATH_PROG(MSGFMT, msgfmt) |
1533 | +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) |
1534 | +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then |
1535 | + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) |
1536 | +fi |
1537 | +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" |
1538 | +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" |
1539 | +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" |
1540 | +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then |
1541 | + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) |
1542 | +fi |
1543 | + |
1544 | +AC_PATH_PROG(INTLTOOL_PERL, perl) |
1545 | +if test -z "$INTLTOOL_PERL"; then |
1546 | + AC_MSG_ERROR([perl not found]) |
1547 | +fi |
1548 | +AC_MSG_CHECKING([for perl >= 5.8.1]) |
1549 | +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 |
1550 | +if test $? -ne 0; then |
1551 | + AC_MSG_ERROR([perl 5.8.1 is required for intltool]) |
1552 | +else |
1553 | + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" |
1554 | + AC_MSG_RESULT([$IT_PERL_VERSION]) |
1555 | +fi |
1556 | +if test "x$2" != "xno-xml"; then |
1557 | + AC_MSG_CHECKING([for XML::Parser]) |
1558 | + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then |
1559 | + AC_MSG_RESULT([ok]) |
1560 | + else |
1561 | + AC_MSG_ERROR([XML::Parser perl module is required for intltool]) |
1562 | + fi |
1563 | +fi |
1564 | + |
1565 | +# Substitute ALL_LINGUAS so we can use it in po/Makefile |
1566 | +AC_SUBST(ALL_LINGUAS) |
1567 | + |
1568 | +# Set DATADIRNAME correctly if it is not set yet |
1569 | +# (copied from glib-gettext.m4) |
1570 | +if test -z "$DATADIRNAME"; then |
1571 | + AC_LINK_IFELSE( |
1572 | + [AC_LANG_PROGRAM([[]], |
1573 | + [[extern int _nl_msg_cat_cntr; |
1574 | + return _nl_msg_cat_cntr]])], |
1575 | + [DATADIRNAME=share], |
1576 | + [case $host in |
1577 | + *-*-solaris*) |
1578 | + dnl On Solaris, if bind_textdomain_codeset is in libc, |
1579 | + dnl GNU format message catalog is always supported, |
1580 | + dnl since both are added to the libc all together. |
1581 | + dnl Hence, we'd like to go with DATADIRNAME=share |
1582 | + dnl in this case. |
1583 | + AC_CHECK_FUNC(bind_textdomain_codeset, |
1584 | + [DATADIRNAME=share], [DATADIRNAME=lib]) |
1585 | + ;; |
1586 | + *) |
1587 | + [DATADIRNAME=lib] |
1588 | + ;; |
1589 | + esac]) |
1590 | +fi |
1591 | +AC_SUBST(DATADIRNAME) |
1592 | + |
1593 | +IT_PO_SUBDIR([po]) |
1594 | + |
1595 | +]) |
1596 | + |
1597 | + |
1598 | +# IT_PO_SUBDIR(DIRNAME) |
1599 | +# --------------------- |
1600 | +# All po subdirs have to be declared with this macro; the subdir "po" is |
1601 | +# declared by IT_PROG_INTLTOOL. |
1602 | +# |
1603 | +AC_DEFUN([IT_PO_SUBDIR], |
1604 | +[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. |
1605 | +dnl |
1606 | +dnl The following CONFIG_COMMANDS should be executed at the very end |
1607 | +dnl of config.status. |
1608 | +AC_CONFIG_COMMANDS_PRE([ |
1609 | + AC_CONFIG_COMMANDS([$1/stamp-it], [ |
1610 | + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then |
1611 | + AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) |
1612 | + fi |
1613 | + rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" |
1614 | + >"$1/stamp-it.tmp" |
1615 | + [sed '/^#/d |
1616 | + s/^[[].*] *// |
1617 | + /^[ ]*$/d |
1618 | + '"s|^| $ac_top_srcdir/|" \ |
1619 | + "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" |
1620 | + ] |
1621 | + [sed '/^POTFILES =/,/[^\\]$/ { |
1622 | + /^POTFILES =/!d |
1623 | + r $1/POTFILES |
1624 | + } |
1625 | + ' "$1/Makefile.in" >"$1/Makefile"] |
1626 | + rm -f "$1/Makefile.tmp" |
1627 | + mv "$1/stamp-it.tmp" "$1/stamp-it" |
1628 | + ]) |
1629 | +])dnl |
1630 | +]) |
1631 | + |
1632 | +# _IT_SUBST(VARIABLE) |
1633 | +# ------------------- |
1634 | +# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST |
1635 | +# |
1636 | +AC_DEFUN([_IT_SUBST], |
1637 | +[ |
1638 | +AC_SUBST([$1]) |
1639 | +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) |
1640 | +] |
1641 | +) |
1642 | + |
1643 | +# deprecated macros |
1644 | +AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) |
1645 | +# A hint is needed for aclocal from Automake <= 1.9.4: |
1646 | +# AC_DEFUN([AC_PROG_INTLTOOL], ...) |
1647 | + |
1648 | + |
1649 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
1650 | # |
1651 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
1652 | -# 2006, 2007, 2008 Free Software Foundation, Inc. |
1653 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
1654 | +# Inc. |
1655 | # Written by Gordon Matzigkeit, 1996 |
1656 | # |
1657 | # This file is free software; the Free Software Foundation gives |
1658 | @@ -243,7 +871,8 @@ |
1659 | |
1660 | m4_define([_LT_COPYING], [dnl |
1661 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
1662 | -# 2006, 2007, 2008 Free Software Foundation, Inc. |
1663 | +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
1664 | +# Inc. |
1665 | # Written by Gordon Matzigkeit, 1996 |
1666 | # |
1667 | # This file is part of GNU Libtool. |
1668 | @@ -270,7 +899,7 @@ |
1669 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
1670 | ]) |
1671 | |
1672 | -# serial 56 LT_INIT |
1673 | +# serial 57 LT_INIT |
1674 | |
1675 | |
1676 | # LT_PREREQ(VERSION) |
1677 | @@ -299,6 +928,7 @@ |
1678 | # ------------------ |
1679 | AC_DEFUN([LT_INIT], |
1680 | [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT |
1681 | +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl |
1682 | AC_BEFORE([$0], [LT_LANG])dnl |
1683 | AC_BEFORE([$0], [LT_OUTPUT])dnl |
1684 | AC_BEFORE([$0], [LTDL_INIT])dnl |
1685 | @@ -315,6 +945,8 @@ |
1686 | AC_REQUIRE([LTOBSOLETE_VERSION])dnl |
1687 | m4_require([_LT_PROG_LTMAIN])dnl |
1688 | |
1689 | +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) |
1690 | + |
1691 | dnl Parse OPTIONS |
1692 | _LT_SET_OPTIONS([$0], [$1]) |
1693 | |
1694 | @@ -351,7 +983,7 @@ |
1695 | *) break;; |
1696 | esac |
1697 | done |
1698 | -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
1699 | +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` |
1700 | ]) |
1701 | |
1702 | |
1703 | @@ -371,6 +1003,9 @@ |
1704 | m4_defun([_LT_SETUP], |
1705 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
1706 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
1707 | +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl |
1708 | +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl |
1709 | + |
1710 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
1711 | _LT_DECL([], [host], [0])dnl |
1712 | _LT_DECL([], [host_os], [0])dnl |
1713 | @@ -412,7 +1047,6 @@ |
1714 | _LT_CHECK_OBJDIR |
1715 | |
1716 | m4_require([_LT_TAG_COMPILER])dnl |
1717 | -_LT_PROG_ECHO_BACKSLASH |
1718 | |
1719 | case $host_os in |
1720 | aix3*) |
1721 | @@ -426,23 +1060,6 @@ |
1722 | ;; |
1723 | esac |
1724 | |
1725 | -# Sed substitution that helps us do robust quoting. It backslashifies |
1726 | -# metacharacters that are still active within double-quoted strings. |
1727 | -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' |
1728 | - |
1729 | -# Same as above, but do not quote variable references. |
1730 | -double_quote_subst='s/\([["`\\]]\)/\\\1/g' |
1731 | - |
1732 | -# Sed substitution to delay expansion of an escaped shell variable in a |
1733 | -# double_quote_subst'ed string. |
1734 | -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
1735 | - |
1736 | -# Sed substitution to delay expansion of an escaped single quote. |
1737 | -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
1738 | - |
1739 | -# Sed substitution to avoid accidental globbing in evaled expressions |
1740 | -no_glob_subst='s/\*/\\\*/g' |
1741 | - |
1742 | # Global variables: |
1743 | ofile=libtool |
1744 | can_build_shared=yes |
1745 | @@ -483,6 +1100,28 @@ |
1746 | ])# _LT_SETUP |
1747 | |
1748 | |
1749 | +# _LT_PREPARE_SED_QUOTE_VARS |
1750 | +# -------------------------- |
1751 | +# Define a few sed substitution that help us do robust quoting. |
1752 | +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], |
1753 | +[# Backslashify metacharacters that are still active within |
1754 | +# double-quoted strings. |
1755 | +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' |
1756 | + |
1757 | +# Same as above, but do not quote variable references. |
1758 | +double_quote_subst='s/\([["`\\]]\)/\\\1/g' |
1759 | + |
1760 | +# Sed substitution to delay expansion of an escaped shell variable in a |
1761 | +# double_quote_subst'ed string. |
1762 | +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
1763 | + |
1764 | +# Sed substitution to delay expansion of an escaped single quote. |
1765 | +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
1766 | + |
1767 | +# Sed substitution to avoid accidental globbing in evaled expressions |
1768 | +no_glob_subst='s/\*/\\\*/g' |
1769 | +]) |
1770 | + |
1771 | # _LT_PROG_LTMAIN |
1772 | # --------------- |
1773 | # Note that this code is called both from `configure', and `config.status' |
1774 | @@ -607,12 +1246,12 @@ |
1775 | # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) |
1776 | # --------------------------------------------------- |
1777 | m4_define([lt_decl_varnames_tagged], |
1778 | -[_$0(m4_quote(m4_default([$1], [[, ]])), |
1779 | - m4_quote(m4_if([$2], [], |
1780 | - m4_quote(lt_decl_tag_varnames), |
1781 | - m4_quote(m4_shift($@)))), |
1782 | - m4_split(m4_normalize(m4_quote(_LT_TAGS))))]) |
1783 | -m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)]) |
1784 | +[m4_assert([$# <= 2])dnl |
1785 | +_$0(m4_quote(m4_default([$1], [[, ]])), |
1786 | + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), |
1787 | + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) |
1788 | +m4_define([_lt_decl_varnames_tagged], |
1789 | +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) |
1790 | |
1791 | |
1792 | # lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) |
1793 | @@ -635,7 +1274,7 @@ |
1794 | # declaration there will have the same value as in `configure'. VARNAME |
1795 | # must have a single quote delimited value for this to work. |
1796 | m4_define([_LT_CONFIG_STATUS_DECLARE], |
1797 | -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) |
1798 | +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) |
1799 | |
1800 | |
1801 | # _LT_CONFIG_STATUS_DECLARATIONS |
1802 | @@ -645,7 +1284,7 @@ |
1803 | # embedded single quotes properly. In configure, this macro expands |
1804 | # each variable declared with _LT_DECL (and _LT_TAGDECL) into: |
1805 | # |
1806 | -# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' |
1807 | +# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`' |
1808 | m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], |
1809 | [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), |
1810 | [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) |
1811 | @@ -744,12 +1383,20 @@ |
1812 | LTCFLAGS='$LTCFLAGS' |
1813 | compiler='$compiler_DEFAULT' |
1814 | |
1815 | +# A function that is used when there is no print builtin or printf. |
1816 | +func_fallback_echo () |
1817 | +{ |
1818 | + eval 'cat <<_LTECHO_EOF |
1819 | +\$[]1 |
1820 | +_LTECHO_EOF' |
1821 | +} |
1822 | + |
1823 | # Quote evaled strings. |
1824 | for var in lt_decl_all_varnames([[ \ |
1825 | ]], lt_decl_quote_varnames); do |
1826 | - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in |
1827 | + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
1828 | *[[\\\\\\\`\\"\\\$]]*) |
1829 | - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
1830 | + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
1831 | ;; |
1832 | *) |
1833 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
1834 | @@ -760,9 +1407,9 @@ |
1835 | # Double-quote double-evaled strings. |
1836 | for var in lt_decl_all_varnames([[ \ |
1837 | ]], lt_decl_dquote_varnames); do |
1838 | - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in |
1839 | + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
1840 | *[[\\\\\\\`\\"\\\$]]*) |
1841 | - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
1842 | + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
1843 | ;; |
1844 | *) |
1845 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
1846 | @@ -770,16 +1417,38 @@ |
1847 | esac |
1848 | done |
1849 | |
1850 | -# Fix-up fallback echo if it was mangled by the above quoting rules. |
1851 | -case \$lt_ECHO in |
1852 | -*'\\\[$]0 --fallback-echo"')dnl " |
1853 | - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` |
1854 | - ;; |
1855 | -esac |
1856 | - |
1857 | _LT_OUTPUT_LIBTOOL_INIT |
1858 | ]) |
1859 | |
1860 | +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) |
1861 | +# ------------------------------------ |
1862 | +# Generate a child script FILE with all initialization necessary to |
1863 | +# reuse the environment learned by the parent script, and make the |
1864 | +# file executable. If COMMENT is supplied, it is inserted after the |
1865 | +# `#!' sequence but before initialization text begins. After this |
1866 | +# macro, additional text can be appended to FILE to form the body of |
1867 | +# the child script. The macro ends with non-zero status if the |
1868 | +# file could not be fully written (such as if the disk is full). |
1869 | +m4_ifdef([AS_INIT_GENERATED], |
1870 | +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], |
1871 | +[m4_defun([_LT_GENERATED_FILE_INIT], |
1872 | +[m4_require([AS_PREPARE])]dnl |
1873 | +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl |
1874 | +[lt_write_fail=0 |
1875 | +cat >$1 <<_ASEOF || lt_write_fail=1 |
1876 | +#! $SHELL |
1877 | +# Generated by $as_me. |
1878 | +$2 |
1879 | +SHELL=\${CONFIG_SHELL-$SHELL} |
1880 | +export SHELL |
1881 | +_ASEOF |
1882 | +cat >>$1 <<\_ASEOF || lt_write_fail=1 |
1883 | +AS_SHELL_SANITIZE |
1884 | +_AS_PREPARE |
1885 | +exec AS_MESSAGE_FD>&1 |
1886 | +_ASEOF |
1887 | +test $lt_write_fail = 0 && chmod +x $1[]dnl |
1888 | +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT |
1889 | |
1890 | # LT_OUTPUT |
1891 | # --------- |
1892 | @@ -789,20 +1458,11 @@ |
1893 | AC_DEFUN([LT_OUTPUT], |
1894 | [: ${CONFIG_LT=./config.lt} |
1895 | AC_MSG_NOTICE([creating $CONFIG_LT]) |
1896 | -cat >"$CONFIG_LT" <<_LTEOF |
1897 | -#! $SHELL |
1898 | -# Generated by $as_me. |
1899 | -# Run this file to recreate a libtool stub with the current configuration. |
1900 | +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], |
1901 | +[# Run this file to recreate a libtool stub with the current configuration.]) |
1902 | |
1903 | +cat >>"$CONFIG_LT" <<\_LTEOF |
1904 | lt_cl_silent=false |
1905 | -SHELL=\${CONFIG_SHELL-$SHELL} |
1906 | -_LTEOF |
1907 | - |
1908 | -cat >>"$CONFIG_LT" <<\_LTEOF |
1909 | -AS_SHELL_SANITIZE |
1910 | -_AS_PREPARE |
1911 | - |
1912 | -exec AS_MESSAGE_FD>&1 |
1913 | exec AS_MESSAGE_LOG_FD>>config.log |
1914 | { |
1915 | echo |
1916 | @@ -828,7 +1488,7 @@ |
1917 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
1918 | configured by $[0], generated by m4_PACKAGE_STRING. |
1919 | |
1920 | -Copyright (C) 2008 Free Software Foundation, Inc. |
1921 | +Copyright (C) 2010 Free Software Foundation, Inc. |
1922 | This config.lt script is free software; the Free Software Foundation |
1923 | gives unlimited permision to copy, distribute and modify it." |
1924 | |
1925 | @@ -873,15 +1533,13 @@ |
1926 | # appending to config.log, which fails on DOS, as config.log is still kept |
1927 | # open by configure. Here we exec the FD to /dev/null, effectively closing |
1928 | # config.log, so it can be properly (re)opened and appended to by config.lt. |
1929 | -if test "$no_create" != yes; then |
1930 | - lt_cl_success=: |
1931 | - test "$silent" = yes && |
1932 | - lt_config_lt_args="$lt_config_lt_args --quiet" |
1933 | - exec AS_MESSAGE_LOG_FD>/dev/null |
1934 | - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false |
1935 | - exec AS_MESSAGE_LOG_FD>>config.log |
1936 | - $lt_cl_success || AS_EXIT(1) |
1937 | -fi |
1938 | +lt_cl_success=: |
1939 | +test "$silent" = yes && |
1940 | + lt_config_lt_args="$lt_config_lt_args --quiet" |
1941 | +exec AS_MESSAGE_LOG_FD>/dev/null |
1942 | +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false |
1943 | +exec AS_MESSAGE_LOG_FD>>config.log |
1944 | +$lt_cl_success || AS_EXIT(1) |
1945 | ])# LT_OUTPUT |
1946 | |
1947 | |
1948 | @@ -1058,11 +1716,13 @@ |
1949 | AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) |
1950 | AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) |
1951 | AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) |
1952 | +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) |
1953 | dnl aclocal-1.4 backwards compatibility: |
1954 | dnl AC_DEFUN([AC_LIBTOOL_CXX], []) |
1955 | dnl AC_DEFUN([AC_LIBTOOL_F77], []) |
1956 | dnl AC_DEFUN([AC_LIBTOOL_FC], []) |
1957 | dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) |
1958 | +dnl AC_DEFUN([AC_LIBTOOL_RC], []) |
1959 | |
1960 | |
1961 | # _LT_TAG_COMPILER |
1962 | @@ -1167,15 +1827,40 @@ |
1963 | [lt_cv_ld_exported_symbols_list=no]) |
1964 | LDFLAGS="$save_LDFLAGS" |
1965 | ]) |
1966 | + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], |
1967 | + [lt_cv_ld_force_load=no |
1968 | + cat > conftest.c << _LT_EOF |
1969 | +int forced_loaded() { return 2;} |
1970 | +_LT_EOF |
1971 | + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD |
1972 | + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD |
1973 | + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD |
1974 | + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD |
1975 | + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD |
1976 | + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD |
1977 | + cat > conftest.c << _LT_EOF |
1978 | +int main() { return 0;} |
1979 | +_LT_EOF |
1980 | + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD |
1981 | + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
1982 | + _lt_result=$? |
1983 | + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then |
1984 | + lt_cv_ld_force_load=yes |
1985 | + else |
1986 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
1987 | + fi |
1988 | + rm -f conftest.err libconftest.a conftest conftest.c |
1989 | + rm -rf conftest.dSYM |
1990 | + ]) |
1991 | case $host_os in |
1992 | rhapsody* | darwin1.[[012]]) |
1993 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
1994 | darwin1.*) |
1995 | _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; |
1996 | - darwin*) # darwin 5.x on |
1997 | + darwin*) # darwin 5.x on |
1998 | # if running on 10.5 or later, the deployment target defaults |
1999 | # to the OS version, if on x86, and 10.4, the deployment |
2000 | - # target defaults to 10.4. Don't you love it? |
2001 | + # target defaults to 10.4. Don't you love it? |
2002 | case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in |
2003 | 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) |
2004 | _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; |
2005 | @@ -1194,7 +1879,7 @@ |
2006 | else |
2007 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
2008 | fi |
2009 | - if test "$DSYMUTIL" != ":"; then |
2010 | + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then |
2011 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
2012 | else |
2013 | _lt_dsymutil= |
2014 | @@ -1214,11 +1899,19 @@ |
2015 | _LT_TAGVAR(hardcode_direct, $1)=no |
2016 | _LT_TAGVAR(hardcode_automatic, $1)=yes |
2017 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
2018 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
2019 | + if test "$lt_cv_ld_force_load" = "yes"; then |
2020 | + _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\"`' |
2021 | + else |
2022 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
2023 | + fi |
2024 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
2025 | _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" |
2026 | - if test "$GCC" = "yes"; then |
2027 | - output_verbose_link_cmd=echo |
2028 | + case $cc_basename in |
2029 | + ifort*) _lt_dar_can_shared=yes ;; |
2030 | + *) _lt_dar_can_shared=$GCC ;; |
2031 | + esac |
2032 | + if test "$_lt_dar_can_shared" = "yes"; then |
2033 | + output_verbose_link_cmd=func_echo_all |
2034 | _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" |
2035 | _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
2036 | _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" |
2037 | @@ -1264,170 +1957,65 @@ |
2038 | # _LT_SHELL_INIT(ARG) |
2039 | # ------------------- |
2040 | m4_define([_LT_SHELL_INIT], |
2041 | -[ifdef([AC_DIVERSION_NOTICE], |
2042 | - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], |
2043 | - [AC_DIVERT_PUSH(NOTICE)]) |
2044 | -$1 |
2045 | -AC_DIVERT_POP |
2046 | -])# _LT_SHELL_INIT |
2047 | +[m4_divert_text([M4SH-INIT], [$1 |
2048 | +])])# _LT_SHELL_INIT |
2049 | + |
2050 | |
2051 | |
2052 | # _LT_PROG_ECHO_BACKSLASH |
2053 | # ----------------------- |
2054 | -# Add some code to the start of the generated configure script which |
2055 | -# will find an echo command which doesn't interpret backslashes. |
2056 | +# Find how we can fake an echo command that does not interpret backslash. |
2057 | +# In particular, with Autoconf 2.60 or later we add some code to the start |
2058 | +# of the generated configure script which will find a shell with a builtin |
2059 | +# printf (which we can use as an echo command). |
2060 | m4_defun([_LT_PROG_ECHO_BACKSLASH], |
2061 | -[_LT_SHELL_INIT([ |
2062 | -# Check that we are running under the correct shell. |
2063 | -SHELL=${CONFIG_SHELL-/bin/sh} |
2064 | - |
2065 | -case X$lt_ECHO in |
2066 | -X*--fallback-echo) |
2067 | - # Remove one level of quotation (which was required for Make). |
2068 | - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` |
2069 | - ;; |
2070 | +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
2071 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
2072 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
2073 | + |
2074 | +AC_MSG_CHECKING([how to print strings]) |
2075 | +# Test print first, because it will be a builtin if present. |
2076 | +if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
2077 | + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
2078 | + ECHO='print -r --' |
2079 | +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
2080 | + ECHO='printf %s\n' |
2081 | +else |
2082 | + # Use this function as a fallback that always works. |
2083 | + func_fallback_echo () |
2084 | + { |
2085 | + eval 'cat <<_LTECHO_EOF |
2086 | +$[]1 |
2087 | +_LTECHO_EOF' |
2088 | + } |
2089 | + ECHO='func_fallback_echo' |
2090 | +fi |
2091 | + |
2092 | +# func_echo_all arg... |
2093 | +# Invoke $ECHO with all args, space-separated. |
2094 | +func_echo_all () |
2095 | +{ |
2096 | + $ECHO "$*" |
2097 | +} |
2098 | + |
2099 | +case "$ECHO" in |
2100 | + printf*) AC_MSG_RESULT([printf]) ;; |
2101 | + print*) AC_MSG_RESULT([print -r]) ;; |
2102 | + *) AC_MSG_RESULT([cat]) ;; |
2103 | esac |
2104 | |
2105 | -ECHO=${lt_ECHO-echo} |
2106 | -if test "X[$]1" = X--no-reexec; then |
2107 | - # Discard the --no-reexec flag, and continue. |
2108 | - shift |
2109 | -elif test "X[$]1" = X--fallback-echo; then |
2110 | - # Avoid inline document here, it may be left over |
2111 | - : |
2112 | -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then |
2113 | - # Yippee, $ECHO works! |
2114 | - : |
2115 | -else |
2116 | - # Restart under the correct shell. |
2117 | - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} |
2118 | -fi |
2119 | - |
2120 | -if test "X[$]1" = X--fallback-echo; then |
2121 | - # used as fallback echo |
2122 | - shift |
2123 | - cat <<_LT_EOF |
2124 | -[$]* |
2125 | -_LT_EOF |
2126 | - exit 0 |
2127 | -fi |
2128 | - |
2129 | -# The HP-UX ksh and POSIX shell print the target directory to stdout |
2130 | -# if CDPATH is set. |
2131 | -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
2132 | - |
2133 | -if test -z "$lt_ECHO"; then |
2134 | - if test "X${echo_test_string+set}" != Xset; then |
2135 | - # find a string as large as possible, as long as the shell can cope with it |
2136 | - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do |
2137 | - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... |
2138 | - if { echo_test_string=`eval $cmd`; } 2>/dev/null && |
2139 | - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null |
2140 | - then |
2141 | - break |
2142 | - fi |
2143 | - done |
2144 | - fi |
2145 | - |
2146 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
2147 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
2148 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2149 | - : |
2150 | - else |
2151 | - # The Solaris, AIX, and Digital Unix default echo programs unquote |
2152 | - # backslashes. This makes it impossible to quote backslashes using |
2153 | - # echo "$something" | sed 's/\\/\\\\/g' |
2154 | - # |
2155 | - # So, first we look for a working echo in the user's PATH. |
2156 | - |
2157 | - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
2158 | - for dir in $PATH /usr/ucb; do |
2159 | - IFS="$lt_save_ifs" |
2160 | - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && |
2161 | - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && |
2162 | - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && |
2163 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2164 | - ECHO="$dir/echo" |
2165 | - break |
2166 | - fi |
2167 | - done |
2168 | - IFS="$lt_save_ifs" |
2169 | - |
2170 | - if test "X$ECHO" = Xecho; then |
2171 | - # We didn't find a better echo, so look for alternatives. |
2172 | - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && |
2173 | - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && |
2174 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2175 | - # This shell has a builtin print -r that does the trick. |
2176 | - ECHO='print -r' |
2177 | - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && |
2178 | - test "X$CONFIG_SHELL" != X/bin/ksh; then |
2179 | - # If we have ksh, try running configure again with it. |
2180 | - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
2181 | - export ORIGINAL_CONFIG_SHELL |
2182 | - CONFIG_SHELL=/bin/ksh |
2183 | - export CONFIG_SHELL |
2184 | - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} |
2185 | - else |
2186 | - # Try using printf. |
2187 | - ECHO='printf %s\n' |
2188 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
2189 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
2190 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2191 | - # Cool, printf works |
2192 | - : |
2193 | - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && |
2194 | - test "X$echo_testing_string" = 'X\t' && |
2195 | - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
2196 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2197 | - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL |
2198 | - export CONFIG_SHELL |
2199 | - SHELL="$CONFIG_SHELL" |
2200 | - export SHELL |
2201 | - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" |
2202 | - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && |
2203 | - test "X$echo_testing_string" = 'X\t' && |
2204 | - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
2205 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
2206 | - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" |
2207 | - else |
2208 | - # maybe with a smaller string... |
2209 | - prev=: |
2210 | - |
2211 | - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do |
2212 | - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null |
2213 | - then |
2214 | - break |
2215 | - fi |
2216 | - prev="$cmd" |
2217 | - done |
2218 | - |
2219 | - if test "$prev" != 'sed 50q "[$]0"'; then |
2220 | - echo_test_string=`eval $prev` |
2221 | - export echo_test_string |
2222 | - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} |
2223 | - else |
2224 | - # Oops. We lost completely, so just stick with echo. |
2225 | - ECHO=echo |
2226 | - fi |
2227 | - fi |
2228 | - fi |
2229 | - fi |
2230 | - fi |
2231 | -fi |
2232 | - |
2233 | -# Copy echo and quote the copy suitably for passing to libtool from |
2234 | -# the Makefile, instead of quoting the original, which is used later. |
2235 | -lt_ECHO=$ECHO |
2236 | -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then |
2237 | - lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" |
2238 | -fi |
2239 | - |
2240 | -AC_SUBST(lt_ECHO) |
2241 | -]) |
2242 | +m4_ifdef([_AS_DETECT_SUGGESTED], |
2243 | +[_AS_DETECT_SUGGESTED([ |
2244 | + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( |
2245 | + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
2246 | + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
2247 | + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
2248 | + PATH=/empty FPATH=/empty; export PATH FPATH |
2249 | + test "X`printf %s $ECHO`" = "X$ECHO" \ |
2250 | + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) |
2251 | + |
2252 | _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) |
2253 | -_LT_DECL([], [ECHO], [1], |
2254 | - [An echo program that does not interpret backslashes]) |
2255 | +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) |
2256 | ])# _LT_PROG_ECHO_BACKSLASH |
2257 | |
2258 | |
2259 | @@ -1459,7 +2047,7 @@ |
2260 | ;; |
2261 | *-*-irix6*) |
2262 | # Find out which ABI we are using. |
2263 | - echo '[#]line __oline__ "configure"' > conftest.$ac_ext |
2264 | + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext |
2265 | if AC_TRY_EVAL(ac_compile); then |
2266 | if test "$lt_cv_prog_gnu_ld" = yes; then |
2267 | case `/usr/bin/file conftest.$ac_objext` in |
2268 | @@ -1611,10 +2199,19 @@ |
2269 | esac |
2270 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
2271 | fi |
2272 | + |
2273 | +case $host_os in |
2274 | + darwin*) |
2275 | + lock_old_archive_extraction=yes ;; |
2276 | + *) |
2277 | + lock_old_archive_extraction=no ;; |
2278 | +esac |
2279 | _LT_DECL([], [old_postinstall_cmds], [2]) |
2280 | _LT_DECL([], [old_postuninstall_cmds], [2]) |
2281 | _LT_TAGDECL([], [old_archive_cmds], [2], |
2282 | [Commands used to build an old-style archive]) |
2283 | +_LT_DECL([], [lock_old_archive_extraction], [0], |
2284 | + [Whether to use a lock for old archive extraction]) |
2285 | ])# _LT_CMD_OLD_ARCHIVE |
2286 | |
2287 | |
2288 | @@ -1639,15 +2236,15 @@ |
2289 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
2290 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
2291 | -e 's:$: $lt_compiler_flag:'` |
2292 | - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2293 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2294 | (eval "$lt_compile" 2>conftest.err) |
2295 | ac_status=$? |
2296 | cat conftest.err >&AS_MESSAGE_LOG_FD |
2297 | - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2298 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2299 | if (exit $ac_status) && test -s "$ac_outfile"; then |
2300 | # The compiler can only warn and ignore the option if not recognized |
2301 | # So say no if there are warnings other than the usual output. |
2302 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
2303 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
2304 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2305 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
2306 | $2=yes |
2307 | @@ -1687,7 +2284,7 @@ |
2308 | if test -s conftest.err; then |
2309 | # Append any errors to the config.log. |
2310 | cat conftest.err 1>&AS_MESSAGE_LOG_FD |
2311 | - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
2312 | + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp |
2313 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2314 | if diff conftest.exp conftest.er2 >/dev/null; then |
2315 | $2=yes |
2316 | @@ -1739,7 +2336,7 @@ |
2317 | lt_cv_sys_max_cmd_len=-1; |
2318 | ;; |
2319 | |
2320 | - cygwin* | mingw*) |
2321 | + cygwin* | mingw* | cegcc*) |
2322 | # On Win9x/ME, this test blows up -- it succeeds, but takes |
2323 | # about 5 minutes as the teststring grows exponentially. |
2324 | # Worse, since 9x/ME are not pre-emptively multitasking, |
2325 | @@ -1750,6 +2347,11 @@ |
2326 | lt_cv_sys_max_cmd_len=8192; |
2327 | ;; |
2328 | |
2329 | + mint*) |
2330 | + # On MiNT this can take a long time and run out of memory. |
2331 | + lt_cv_sys_max_cmd_len=8192; |
2332 | + ;; |
2333 | + |
2334 | amigaos*) |
2335 | # On AmigaOS with pdksh, this test takes hours, literally. |
2336 | # So we just punt and use a minimum line length of 8192. |
2337 | @@ -1814,8 +2416,8 @@ |
2338 | # If test is not a shell built-in, we'll probably end up computing a |
2339 | # maximum length that is only half of the actual maximum length, but |
2340 | # we can't tell. |
2341 | - while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ |
2342 | - = "XX$teststring$teststring"; } >/dev/null 2>&1 && |
2343 | + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
2344 | + = "X$teststring$teststring"; } >/dev/null 2>&1 && |
2345 | test $i != 17 # 1/2 MB should be enough |
2346 | do |
2347 | i=`expr $i + 1` |
2348 | @@ -1866,7 +2468,7 @@ |
2349 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
2350 | lt_status=$lt_dlunknown |
2351 | cat > conftest.$ac_ext <<_LT_EOF |
2352 | -[#line __oline__ "configure" |
2353 | +[#line $LINENO "configure" |
2354 | #include "confdefs.h" |
2355 | |
2356 | #if HAVE_DLFCN_H |
2357 | @@ -1907,11 +2509,13 @@ |
2358 | # endif |
2359 | #endif |
2360 | |
2361 | -#ifdef __cplusplus |
2362 | -extern "C" void exit (int); |
2363 | +/* When -fvisbility=hidden is used, assume the code has been annotated |
2364 | + correspondingly for the symbols needed. */ |
2365 | +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
2366 | +void fnord () __attribute__((visibility("default"))); |
2367 | #endif |
2368 | |
2369 | -void fnord() { int i=42;} |
2370 | +void fnord () { int i=42; } |
2371 | int main () |
2372 | { |
2373 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
2374 | @@ -1920,13 +2524,17 @@ |
2375 | if (self) |
2376 | { |
2377 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
2378 | - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
2379 | + else |
2380 | + { |
2381 | + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
2382 | + else puts (dlerror ()); |
2383 | + } |
2384 | /* dlclose (self); */ |
2385 | } |
2386 | else |
2387 | puts (dlerror ()); |
2388 | |
2389 | - exit (status); |
2390 | + return status; |
2391 | }] |
2392 | _LT_EOF |
2393 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then |
2394 | @@ -1965,7 +2573,7 @@ |
2395 | lt_cv_dlopen_self=yes |
2396 | ;; |
2397 | |
2398 | - mingw* | pw32*) |
2399 | + mingw* | pw32* | cegcc*) |
2400 | lt_cv_dlopen="LoadLibrary" |
2401 | lt_cv_dlopen_libs= |
2402 | ;; |
2403 | @@ -2096,16 +2704,16 @@ |
2404 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
2405 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
2406 | -e 's:$: $lt_compiler_flag:'` |
2407 | - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2408 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2409 | (eval "$lt_compile" 2>out/conftest.err) |
2410 | ac_status=$? |
2411 | cat out/conftest.err >&AS_MESSAGE_LOG_FD |
2412 | - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2413 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2414 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
2415 | then |
2416 | # The compiler can only warn and ignore the option if not recognized |
2417 | # So say no if there are warnings |
2418 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
2419 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp |
2420 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
2421 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
2422 | _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes |
2423 | @@ -2262,7 +2870,9 @@ |
2424 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
2425 | m4_require([_LT_DECL_EGREP])dnl |
2426 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2427 | +m4_require([_LT_DECL_OBJDUMP])dnl |
2428 | m4_require([_LT_DECL_SED])dnl |
2429 | +m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
2430 | AC_MSG_CHECKING([dynamic linker characteristics]) |
2431 | m4_if([$1], |
2432 | [], [ |
2433 | @@ -2271,16 +2881,23 @@ |
2434 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; |
2435 | *) lt_awk_arg="/^libraries:/" ;; |
2436 | esac |
2437 | - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
2438 | - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then |
2439 | + case $host_os in |
2440 | + mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; |
2441 | + *) lt_sed_strip_eq="s,=/,/,g" ;; |
2442 | + esac |
2443 | + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` |
2444 | + case $lt_search_path_spec in |
2445 | + *\;*) |
2446 | # if the path contains ";" then we assume it to be the separator |
2447 | # otherwise default to the standard path separator (i.e. ":") - it is |
2448 | # assumed that no part of a normal pathname contains ";" but that should |
2449 | # okay in the real world where ";" in dirpaths is itself problematic. |
2450 | - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` |
2451 | - else |
2452 | - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
2453 | - fi |
2454 | + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` |
2455 | + ;; |
2456 | + *) |
2457 | + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` |
2458 | + ;; |
2459 | + esac |
2460 | # Ok, now we have the path, separated by spaces, we can step through it |
2461 | # and add multilib dir if necessary. |
2462 | lt_tmp_lt_search_path_spec= |
2463 | @@ -2293,7 +2910,7 @@ |
2464 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" |
2465 | fi |
2466 | done |
2467 | - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' |
2468 | + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' |
2469 | BEGIN {RS=" "; FS="/|\n";} { |
2470 | lt_foo=""; |
2471 | lt_count=0; |
2472 | @@ -2313,7 +2930,13 @@ |
2473 | if (lt_foo != "") { lt_freq[[lt_foo]]++; } |
2474 | if (lt_freq[[lt_foo]] == 1) { print lt_foo; } |
2475 | }'` |
2476 | - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` |
2477 | + # AWK program above erroneously prepends '/' to C:/dos/paths |
2478 | + # for these hosts. |
2479 | + case $host_os in |
2480 | + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ |
2481 | + $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; |
2482 | + esac |
2483 | + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` |
2484 | else |
2485 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" |
2486 | fi]) |
2487 | @@ -2401,7 +3024,7 @@ |
2488 | m68k) |
2489 | library_names_spec='$libname.ixlibrary $libname.a' |
2490 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
2491 | - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' |
2492 | + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' |
2493 | ;; |
2494 | esac |
2495 | ;; |
2496 | @@ -2426,14 +3049,14 @@ |
2497 | # libtool to hard-code these into programs |
2498 | ;; |
2499 | |
2500 | -cygwin* | mingw* | pw32*) |
2501 | +cygwin* | mingw* | pw32* | cegcc*) |
2502 | version_type=windows |
2503 | shrext_cmds=".dll" |
2504 | need_version=no |
2505 | need_lib_prefix=no |
2506 | |
2507 | case $GCC,$host_os in |
2508 | - yes,cygwin* | yes,mingw* | yes,pw32*) |
2509 | + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
2510 | library_names_spec='$libname.dll.a' |
2511 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
2512 | postinstall_cmds='base_file=`basename \${file}`~ |
2513 | @@ -2454,23 +3077,12 @@ |
2514 | cygwin*) |
2515 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
2516 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
2517 | - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" |
2518 | +m4_if([$1], [],[ |
2519 | + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) |
2520 | ;; |
2521 | - mingw*) |
2522 | + mingw* | cegcc*) |
2523 | # MinGW DLLs use traditional 'lib' prefix |
2524 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
2525 | - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
2526 | - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then |
2527 | - # It is most probably a Windows format PATH printed by |
2528 | - # mingw gcc, but we are running on Cygwin. Gcc prints its search |
2529 | - # path with ; separators, and with drive letters. We can handle the |
2530 | - # drive letters (cygwin fileutils understands them), so leave them, |
2531 | - # especially as we might pass files found there to a mingw objdump, |
2532 | - # which wouldn't understand a cygwinified path. Ahh. |
2533 | - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
2534 | - else |
2535 | - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
2536 | - fi |
2537 | ;; |
2538 | pw32*) |
2539 | # pw32 DLLs use 'pw' prefix rather than 'lib' |
2540 | @@ -2527,7 +3139,14 @@ |
2541 | *) objformat=elf ;; |
2542 | esac |
2543 | fi |
2544 | - version_type=freebsd-$objformat |
2545 | + # Handle Gentoo/FreeBSD as it was Linux |
2546 | + case $host_vendor in |
2547 | + gentoo) |
2548 | + version_type=linux ;; |
2549 | + *) |
2550 | + version_type=freebsd-$objformat ;; |
2551 | + esac |
2552 | + |
2553 | case $version_type in |
2554 | freebsd-elf*) |
2555 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
2556 | @@ -2538,6 +3157,12 @@ |
2557 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
2558 | need_version=yes |
2559 | ;; |
2560 | + linux) |
2561 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
2562 | + soname_spec='${libname}${release}${shared_ext}$major' |
2563 | + need_lib_prefix=no |
2564 | + need_version=no |
2565 | + ;; |
2566 | esac |
2567 | shlibpath_var=LD_LIBRARY_PATH |
2568 | case $host_os in |
2569 | @@ -2570,6 +3195,19 @@ |
2570 | hardcode_into_libs=yes |
2571 | ;; |
2572 | |
2573 | +haiku*) |
2574 | + version_type=linux |
2575 | + need_lib_prefix=no |
2576 | + need_version=no |
2577 | + dynamic_linker="$host_os runtime_loader" |
2578 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
2579 | + soname_spec='${libname}${release}${shared_ext}$major' |
2580 | + shlibpath_var=LIBRARY_PATH |
2581 | + shlibpath_overrides_runpath=yes |
2582 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
2583 | + hardcode_into_libs=yes |
2584 | + ;; |
2585 | + |
2586 | hpux9* | hpux10* | hpux11*) |
2587 | # Give a soname corresponding to the major version so that dld.sl refuses to |
2588 | # link against other versions. |
2589 | @@ -2612,8 +3250,10 @@ |
2590 | soname_spec='${libname}${release}${shared_ext}$major' |
2591 | ;; |
2592 | esac |
2593 | - # HP-UX runs *really* slowly unless shared libraries are mode 555. |
2594 | + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... |
2595 | postinstall_cmds='chmod 555 $lib' |
2596 | + # or fails outright, so override atomically: |
2597 | + install_override_mode=555 |
2598 | ;; |
2599 | |
2600 | interix[[3-9]]*) |
2601 | @@ -2671,7 +3311,7 @@ |
2602 | ;; |
2603 | |
2604 | # This must be Linux ELF. |
2605 | -linux* | k*bsd*-gnu) |
2606 | +linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2607 | version_type=linux |
2608 | need_lib_prefix=no |
2609 | need_version=no |
2610 | @@ -2680,16 +3320,21 @@ |
2611 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
2612 | shlibpath_var=LD_LIBRARY_PATH |
2613 | shlibpath_overrides_runpath=no |
2614 | + |
2615 | # Some binutils ld are patched to set DT_RUNPATH |
2616 | - save_LDFLAGS=$LDFLAGS |
2617 | - save_libdir=$libdir |
2618 | - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ |
2619 | - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" |
2620 | - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
2621 | - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], |
2622 | - [shlibpath_overrides_runpath=yes])]) |
2623 | - LDFLAGS=$save_LDFLAGS |
2624 | - libdir=$save_libdir |
2625 | + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], |
2626 | + [lt_cv_shlibpath_overrides_runpath=no |
2627 | + save_LDFLAGS=$LDFLAGS |
2628 | + save_libdir=$libdir |
2629 | + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ |
2630 | + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" |
2631 | + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
2632 | + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], |
2633 | + [lt_cv_shlibpath_overrides_runpath=yes])]) |
2634 | + LDFLAGS=$save_LDFLAGS |
2635 | + libdir=$save_libdir |
2636 | + ]) |
2637 | + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath |
2638 | |
2639 | # This implies no fast_install, which is unacceptable. |
2640 | # Some rework will be needed to allow for fast_install |
2641 | @@ -2698,7 +3343,7 @@ |
2642 | |
2643 | # Append ld.so.conf contents to the search path |
2644 | if test -f /etc/ld.so.conf; then |
2645 | - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` |
2646 | + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` |
2647 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
2648 | fi |
2649 | |
2650 | @@ -2711,18 +3356,6 @@ |
2651 | dynamic_linker='GNU/Linux ld.so' |
2652 | ;; |
2653 | |
2654 | -netbsdelf*-gnu) |
2655 | - version_type=linux |
2656 | - need_lib_prefix=no |
2657 | - need_version=no |
2658 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
2659 | - soname_spec='${libname}${release}${shared_ext}$major' |
2660 | - shlibpath_var=LD_LIBRARY_PATH |
2661 | - shlibpath_overrides_runpath=no |
2662 | - hardcode_into_libs=yes |
2663 | - dynamic_linker='NetBSD ld.elf_so' |
2664 | - ;; |
2665 | - |
2666 | netbsd*) |
2667 | version_type=sunos |
2668 | need_lib_prefix=no |
2669 | @@ -2894,7 +3527,7 @@ |
2670 | version_type=linux |
2671 | need_lib_prefix=no |
2672 | need_version=no |
2673 | - library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2674 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2675 | shlibpath_var=LD_LIBRARY_PATH |
2676 | shlibpath_overrides_runpath=no |
2677 | hardcode_into_libs=yes |
2678 | @@ -2918,7 +3551,7 @@ |
2679 | if test "$GCC" = yes; then |
2680 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
2681 | fi |
2682 | - |
2683 | + |
2684 | if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then |
2685 | sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" |
2686 | fi |
2687 | @@ -2943,6 +3576,8 @@ |
2688 | The last name is the one that the linker finds with -lNAME]]) |
2689 | _LT_DECL([], [soname_spec], [1], |
2690 | [[The coded name of the library, if different from the real name]]) |
2691 | +_LT_DECL([], [install_override_mode], [1], |
2692 | + [Permission mode override for installation of shared libraries]) |
2693 | _LT_DECL([], [postinstall_cmds], [2], |
2694 | [Command to use after installation of a shared archive]) |
2695 | _LT_DECL([], [postuninstall_cmds], [2], |
2696 | @@ -3055,6 +3690,7 @@ |
2697 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
2698 | m4_require([_LT_DECL_SED])dnl |
2699 | m4_require([_LT_DECL_EGREP])dnl |
2700 | +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl |
2701 | |
2702 | AC_ARG_WITH([gnu-ld], |
2703 | [AS_HELP_STRING([--with-gnu-ld], |
2704 | @@ -3184,8 +3820,8 @@ |
2705 | fi |
2706 | ;; |
2707 | esac |
2708 | -_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl |
2709 | -_LT_DECL([], [reload_cmds], [2])dnl |
2710 | +_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl |
2711 | +_LT_TAGDECL([], [reload_cmds], [2])dnl |
2712 | ])# _LT_CMD_RELOAD |
2713 | |
2714 | |
2715 | @@ -3195,6 +3831,7 @@ |
2716 | # -- PORTME fill in with the dynamic library characteristics |
2717 | m4_defun([_LT_CHECK_MAGIC_METHOD], |
2718 | [m4_require([_LT_DECL_EGREP]) |
2719 | +m4_require([_LT_DECL_OBJDUMP]) |
2720 | AC_CACHE_CHECK([how to recognize dependent libraries], |
2721 | lt_cv_deplibs_check_method, |
2722 | [lt_cv_file_magic_cmd='$MAGIC_CMD' |
2723 | @@ -3236,15 +3873,23 @@ |
2724 | # Base MSYS/MinGW do not provide the 'file' command needed by |
2725 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
2726 | # unless we find 'file', for example because we are cross-compiling. |
2727 | - if ( file / ) >/dev/null 2>&1; then |
2728 | + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. |
2729 | + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then |
2730 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
2731 | lt_cv_file_magic_cmd='func_win32_libid' |
2732 | else |
2733 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
2734 | + # Keep this pattern in sync with the one in func_win32_libid. |
2735 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
2736 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
2737 | fi |
2738 | ;; |
2739 | |
2740 | +cegcc*) |
2741 | + # use the weaker test based on 'objdump'. See mingw*. |
2742 | + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' |
2743 | + lt_cv_file_magic_cmd='$OBJDUMP -f' |
2744 | + ;; |
2745 | + |
2746 | darwin* | rhapsody*) |
2747 | lt_cv_deplibs_check_method=pass_all |
2748 | ;; |
2749 | @@ -3269,6 +3914,10 @@ |
2750 | lt_cv_deplibs_check_method=pass_all |
2751 | ;; |
2752 | |
2753 | +haiku*) |
2754 | + lt_cv_deplibs_check_method=pass_all |
2755 | + ;; |
2756 | + |
2757 | hpux10.20* | hpux11*) |
2758 | lt_cv_file_magic_cmd=/usr/bin/file |
2759 | case $host_cpu in |
2760 | @@ -3277,11 +3926,11 @@ |
2761 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
2762 | ;; |
2763 | hppa*64*) |
2764 | - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] |
2765 | + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] |
2766 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl |
2767 | ;; |
2768 | *) |
2769 | - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' |
2770 | + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' |
2771 | lt_cv_file_magic_test_file=/usr/lib/libc.sl |
2772 | ;; |
2773 | esac |
2774 | @@ -3303,11 +3952,11 @@ |
2775 | ;; |
2776 | |
2777 | # This must be Linux ELF. |
2778 | -linux* | k*bsd*-gnu) |
2779 | +linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2780 | lt_cv_deplibs_check_method=pass_all |
2781 | ;; |
2782 | |
2783 | -netbsd* | netbsdelf*-gnu) |
2784 | +netbsd*) |
2785 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
2786 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' |
2787 | else |
2788 | @@ -3445,7 +4094,19 @@ |
2789 | NM="$lt_cv_path_NM" |
2790 | else |
2791 | # Didn't find any BSD compatible name lister, look for dumpbin. |
2792 | - AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) |
2793 | + if test -n "$DUMPBIN"; then : |
2794 | + # Let the user override the test. |
2795 | + else |
2796 | + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) |
2797 | + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in |
2798 | + *COFF*) |
2799 | + DUMPBIN="$DUMPBIN -symbols" |
2800 | + ;; |
2801 | + *) |
2802 | + DUMPBIN=: |
2803 | + ;; |
2804 | + esac |
2805 | + fi |
2806 | AC_SUBST([DUMPBIN]) |
2807 | if test "$DUMPBIN" != ":"; then |
2808 | NM="$DUMPBIN" |
2809 | @@ -3458,13 +4119,13 @@ |
2810 | AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], |
2811 | [lt_cv_nm_interface="BSD nm" |
2812 | echo "int some_variable = 0;" > conftest.$ac_ext |
2813 | - (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
2814 | + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
2815 | (eval "$ac_compile" 2>conftest.err) |
2816 | cat conftest.err >&AS_MESSAGE_LOG_FD |
2817 | - (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
2818 | + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
2819 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
2820 | cat conftest.err >&AS_MESSAGE_LOG_FD |
2821 | - (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) |
2822 | + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) |
2823 | cat conftest.out >&AS_MESSAGE_LOG_FD |
2824 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
2825 | lt_cv_nm_interface="MS dumpbin" |
2826 | @@ -3487,7 +4148,7 @@ |
2827 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
2828 | LIBM= |
2829 | case $host in |
2830 | -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) |
2831 | +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) |
2832 | # These system don't have libm, or don't need it |
2833 | ;; |
2834 | *-ncr-sysv4.3*) |
2835 | @@ -3515,7 +4176,12 @@ |
2836 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= |
2837 | |
2838 | if test "$GCC" = yes; then |
2839 | - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' |
2840 | + case $cc_basename in |
2841 | + nvcc*) |
2842 | + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; |
2843 | + *) |
2844 | + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; |
2845 | + esac |
2846 | |
2847 | _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], |
2848 | lt_cv_prog_compiler_rtti_exceptions, |
2849 | @@ -3532,6 +4198,7 @@ |
2850 | m4_defun([_LT_CMD_GLOBAL_SYMBOLS], |
2851 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
2852 | AC_REQUIRE([AC_PROG_CC])dnl |
2853 | +AC_REQUIRE([AC_PROG_AWK])dnl |
2854 | AC_REQUIRE([LT_PATH_NM])dnl |
2855 | AC_REQUIRE([LT_PATH_LD])dnl |
2856 | m4_require([_LT_DECL_SED])dnl |
2857 | @@ -3556,7 +4223,7 @@ |
2858 | aix*) |
2859 | symcode='[[BCDT]]' |
2860 | ;; |
2861 | -cygwin* | mingw* | pw32*) |
2862 | +cygwin* | mingw* | pw32* | cegcc*) |
2863 | symcode='[[ABCDGISTW]]' |
2864 | ;; |
2865 | hpux*) |
2866 | @@ -3657,7 +4324,7 @@ |
2867 | if AC_TRY_EVAL(ac_compile); then |
2868 | # Now try to grab the symbols. |
2869 | nlist=conftest.nm |
2870 | - if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then |
2871 | + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then |
2872 | # Try sorting and uniquifying the output. |
2873 | if sort "$nlist" | uniq > "$nlist"T; then |
2874 | mv -f "$nlist"T "$nlist" |
2875 | @@ -3802,7 +4469,7 @@ |
2876 | beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) |
2877 | # PIC is the default for these OSes. |
2878 | ;; |
2879 | - mingw* | cygwin* | os2* | pw32*) |
2880 | + mingw* | cygwin* | os2* | pw32* | cegcc*) |
2881 | # This hack is so that the source file can tell whether it is being |
2882 | # built for inclusion in a dll (and should export symbols for example). |
2883 | # Although the cygwin gcc ignores -fPIC, still need this for old-style |
2884 | @@ -3819,6 +4486,11 @@ |
2885 | # DJGPP does not support shared libraries at all |
2886 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
2887 | ;; |
2888 | + haiku*) |
2889 | + # PIC is the default for Haiku. |
2890 | + # The "-static" flag exists, but is broken. |
2891 | + _LT_TAGVAR(lt_prog_compiler_static, $1)= |
2892 | + ;; |
2893 | interix[[3-9]]*) |
2894 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
2895 | # Instead, we relocate shared libraries at runtime. |
2896 | @@ -3829,10 +4501,11 @@ |
2897 | fi |
2898 | ;; |
2899 | hpux*) |
2900 | - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but |
2901 | - # not for PA HP-UX. |
2902 | + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
2903 | + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
2904 | + # sets the default TLS model and affects inlining. |
2905 | case $host_cpu in |
2906 | - hppa*64*|ia64*) |
2907 | + hppa*64*) |
2908 | ;; |
2909 | *) |
2910 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
2911 | @@ -3923,19 +4596,26 @@ |
2912 | ;; |
2913 | esac |
2914 | ;; |
2915 | - linux* | k*bsd*-gnu) |
2916 | + linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2917 | case $cc_basename in |
2918 | KCC*) |
2919 | # KAI C++ Compiler |
2920 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' |
2921 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
2922 | ;; |
2923 | - icpc* | ecpc* ) |
2924 | - # Intel C++ |
2925 | + ecpc* ) |
2926 | + # old Intel C++ for x86_64 which still supported -KPIC. |
2927 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
2928 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
2929 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' |
2930 | ;; |
2931 | + icpc* ) |
2932 | + # Intel C++, used to be incompatible with GCC. |
2933 | + # ICC 10 doesn't accept -KPIC any more. |
2934 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
2935 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
2936 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' |
2937 | + ;; |
2938 | pgCC* | pgcpp*) |
2939 | # Portland Group C++ compiler |
2940 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
2941 | @@ -3949,8 +4629,8 @@ |
2942 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
2943 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
2944 | ;; |
2945 | - xlc* | xlC*) |
2946 | - # IBM XL 8.0 on PPC |
2947 | + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) |
2948 | + # IBM XL 8.0, 9.0 on PPC and BlueGene |
2949 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
2950 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
2951 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
2952 | @@ -3980,7 +4660,7 @@ |
2953 | ;; |
2954 | esac |
2955 | ;; |
2956 | - netbsd* | netbsdelf*-gnu) |
2957 | + netbsd*) |
2958 | ;; |
2959 | *qnx* | *nto*) |
2960 | # QNX uses GNU C++, but need to define -shared option too, otherwise |
2961 | @@ -4012,7 +4692,7 @@ |
2962 | ;; |
2963 | solaris*) |
2964 | case $cc_basename in |
2965 | - CC*) |
2966 | + CC* | sunCC*) |
2967 | # Sun C++ 4.2, 5.x and Centerline C++ |
2968 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
2969 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
2970 | @@ -4101,7 +4781,7 @@ |
2971 | # PIC is the default for these OSes. |
2972 | ;; |
2973 | |
2974 | - mingw* | cygwin* | pw32* | os2*) |
2975 | + mingw* | cygwin* | pw32* | os2* | cegcc*) |
2976 | # This hack is so that the source file can tell whether it is being |
2977 | # built for inclusion in a dll (and should export symbols for example). |
2978 | # Although the cygwin gcc ignores -fPIC, still need this for old-style |
2979 | @@ -4116,11 +4796,18 @@ |
2980 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' |
2981 | ;; |
2982 | |
2983 | + haiku*) |
2984 | + # PIC is the default for Haiku. |
2985 | + # The "-static" flag exists, but is broken. |
2986 | + _LT_TAGVAR(lt_prog_compiler_static, $1)= |
2987 | + ;; |
2988 | + |
2989 | hpux*) |
2990 | - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but |
2991 | - # not for PA HP-UX. |
2992 | + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
2993 | + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
2994 | + # sets the default TLS model and affects inlining. |
2995 | case $host_cpu in |
2996 | - hppa*64*|ia64*) |
2997 | + hppa*64*) |
2998 | # +Z the default |
2999 | ;; |
3000 | *) |
3001 | @@ -4157,6 +4844,13 @@ |
3002 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
3003 | ;; |
3004 | esac |
3005 | + |
3006 | + case $cc_basename in |
3007 | + nvcc*) # Cuda Compiler Driver 2.2 |
3008 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' |
3009 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' |
3010 | + ;; |
3011 | + esac |
3012 | else |
3013 | # PORTME Check for flag to pass linker flags through the system compiler. |
3014 | case $host_os in |
3015 | @@ -4170,7 +4864,7 @@ |
3016 | fi |
3017 | ;; |
3018 | |
3019 | - mingw* | cygwin* | pw32* | os2*) |
3020 | + mingw* | cygwin* | pw32* | os2* | cegcc*) |
3021 | # This hack is so that the source file can tell whether it is being |
3022 | # built for inclusion in a dll (and should export symbols for example). |
3023 | m4_if([$1], [GCJ], [], |
3024 | @@ -4199,14 +4893,28 @@ |
3025 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
3026 | ;; |
3027 | |
3028 | - linux* | k*bsd*-gnu) |
3029 | + linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3030 | case $cc_basename in |
3031 | - icc* | ecc* | ifort*) |
3032 | + # old Intel for x86_64 which still supported -KPIC. |
3033 | + ecc*) |
3034 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3035 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3036 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' |
3037 | ;; |
3038 | - pgcc* | pgf77* | pgf90* | pgf95*) |
3039 | + # icc used to be incompatible with GCC. |
3040 | + # ICC 10 doesn't accept -KPIC any more. |
3041 | + icc* | ifort*) |
3042 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3043 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
3044 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' |
3045 | + ;; |
3046 | + # Lahey Fortran 8.1. |
3047 | + lf95*) |
3048 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3049 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' |
3050 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' |
3051 | + ;; |
3052 | + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
3053 | # Portland Group compilers (*not* the Pentium gcc compiler, |
3054 | # which looks to be a dead project) |
3055 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3056 | @@ -4218,26 +4926,26 @@ |
3057 | # All Alpha code is PIC. |
3058 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
3059 | ;; |
3060 | - xl*) |
3061 | - # IBM XL C 8.0/Fortran 10.1 on PPC |
3062 | + xl* | bgxl* | bgf* | mpixl*) |
3063 | + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene |
3064 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3065 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
3066 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
3067 | ;; |
3068 | *) |
3069 | case `$CC -V 2>&1 | sed 5q` in |
3070 | + *Sun\ F* | *Sun*Fortran*) |
3071 | + # Sun Fortran 8.3 passes all unrecognized flags to the linker |
3072 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3073 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3074 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
3075 | + ;; |
3076 | *Sun\ C*) |
3077 | # Sun C 5.9 |
3078 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3079 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3080 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3081 | ;; |
3082 | - *Sun\ F*) |
3083 | - # Sun Fortran 8.3 passes all unrecognized flags to the linker |
3084 | - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3085 | - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3086 | - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
3087 | - ;; |
3088 | esac |
3089 | ;; |
3090 | esac |
3091 | @@ -4268,7 +4976,7 @@ |
3092 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3093 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3094 | case $cc_basename in |
3095 | - f77* | f90* | f95*) |
3096 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
3097 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
3098 | *) |
3099 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
3100 | @@ -4378,8 +5086,10 @@ |
3101 | aix[[4-9]]*) |
3102 | # If we're using GNU nm, then we don't want the "-C" option. |
3103 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
3104 | + # Also, AIX nm treats weak defined symbols like other global defined |
3105 | + # symbols, whereas GNU nm marks them as "W". |
3106 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
3107 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3108 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3109 | else |
3110 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3111 | fi |
3112 | @@ -4387,12 +5097,9 @@ |
3113 | pw32*) |
3114 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
3115 | ;; |
3116 | - cygwin* | mingw*) |
3117 | + cygwin* | mingw* | cegcc*) |
3118 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
3119 | ;; |
3120 | - linux* | k*bsd*-gnu) |
3121 | - _LT_TAGVAR(link_all_deplibs, $1)=no |
3122 | - ;; |
3123 | *) |
3124 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
3125 | ;; |
3126 | @@ -4442,7 +5149,7 @@ |
3127 | extract_expsyms_cmds= |
3128 | |
3129 | case $host_os in |
3130 | - cygwin* | mingw* | pw32*) |
3131 | + cygwin* | mingw* | pw32* | cegcc*) |
3132 | # FIXME: the MSVC++ port hasn't been tested in a loooong time |
3133 | # When not using gcc, we currently assume that we are using |
3134 | # Microsoft Visual C++. |
3135 | @@ -4460,7 +5167,33 @@ |
3136 | esac |
3137 | |
3138 | _LT_TAGVAR(ld_shlibs, $1)=yes |
3139 | + |
3140 | + # On some targets, GNU ld is compatible enough with the native linker |
3141 | + # that we're better off using the native interface for both. |
3142 | + lt_use_gnu_ld_interface=no |
3143 | if test "$with_gnu_ld" = yes; then |
3144 | + case $host_os in |
3145 | + aix*) |
3146 | + # The AIX port of GNU ld has always aspired to compatibility |
3147 | + # with the native linker. However, as the warning in the GNU ld |
3148 | + # block says, versions before 2.19.5* couldn't really create working |
3149 | + # shared libraries, regardless of the interface used. |
3150 | + case `$LD -v 2>&1` in |
3151 | + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; |
3152 | + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; |
3153 | + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; |
3154 | + *) |
3155 | + lt_use_gnu_ld_interface=yes |
3156 | + ;; |
3157 | + esac |
3158 | + ;; |
3159 | + *) |
3160 | + lt_use_gnu_ld_interface=yes |
3161 | + ;; |
3162 | + esac |
3163 | + fi |
3164 | + |
3165 | + if test "$lt_use_gnu_ld_interface" = yes; then |
3166 | # If archive_cmds runs LD, not CC, wlarc should be empty |
3167 | wlarc='${wl}' |
3168 | |
3169 | @@ -4478,6 +5211,7 @@ |
3170 | fi |
3171 | supports_anon_versioning=no |
3172 | case `$LD -v 2>&1` in |
3173 | + *GNU\ gold*) supports_anon_versioning=yes ;; |
3174 | *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 |
3175 | *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
3176 | *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
3177 | @@ -4493,11 +5227,12 @@ |
3178 | _LT_TAGVAR(ld_shlibs, $1)=no |
3179 | cat <<_LT_EOF 1>&2 |
3180 | |
3181 | -*** Warning: the GNU linker, at least up to release 2.9.1, is reported |
3182 | +*** Warning: the GNU linker, at least up to release 2.19, is reported |
3183 | *** to be unable to reliably create shared libraries on AIX. |
3184 | *** Therefore, libtool is disabling shared libraries support. If you |
3185 | -*** really care for shared libraries, you may want to modify your PATH |
3186 | -*** so that a non-GNU linker is found, and then restart. |
3187 | +*** really care for shared libraries, you may want to install binutils |
3188 | +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. |
3189 | +*** You will then need to restart the configuration process. |
3190 | |
3191 | _LT_EOF |
3192 | fi |
3193 | @@ -4529,10 +5264,11 @@ |
3194 | fi |
3195 | ;; |
3196 | |
3197 | - cygwin* | mingw* | pw32*) |
3198 | + cygwin* | mingw* | pw32* | cegcc*) |
3199 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
3200 | # as there is no search path for DLLs. |
3201 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
3202 | + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
3203 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
3204 | _LT_TAGVAR(always_export_symbols, $1)=no |
3205 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
3206 | @@ -4554,6 +5290,11 @@ |
3207 | fi |
3208 | ;; |
3209 | |
3210 | + haiku*) |
3211 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3212 | + _LT_TAGVAR(link_all_deplibs, $1)=yes |
3213 | + ;; |
3214 | + |
3215 | interix[[3-9]]*) |
3216 | _LT_TAGVAR(hardcode_direct, $1)=no |
3217 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
3218 | @@ -4569,7 +5310,7 @@ |
3219 | _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' |
3220 | ;; |
3221 | |
3222 | - gnu* | linux* | tpf* | k*bsd*-gnu) |
3223 | + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) |
3224 | tmp_diet=no |
3225 | if test "$host_os" = linux-dietlibc; then |
3226 | case $cc_basename in |
3227 | @@ -4583,11 +5324,12 @@ |
3228 | tmp_sharedflag='-shared' |
3229 | case $cc_basename,$host_cpu in |
3230 | pgcc*) # Portland Group C compiler |
3231 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
3232 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
3233 | tmp_addflag=' $pic_flag' |
3234 | ;; |
3235 | - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers |
3236 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
3237 | + pgf77* | pgf90* | pgf95* | pgfortran*) |
3238 | + # Portland Group f77 and f90 compilers |
3239 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
3240 | tmp_addflag=' $pic_flag -Mnomain' ;; |
3241 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
3242 | tmp_addflag=' -i_dynamic' ;; |
3243 | @@ -4595,13 +5337,20 @@ |
3244 | tmp_addflag=' -i_dynamic -nofor_main' ;; |
3245 | ifc* | ifort*) # Intel Fortran compiler |
3246 | tmp_addflag=' -nofor_main' ;; |
3247 | - xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
3248 | + lf95*) # Lahey Fortran 8.1 |
3249 | + _LT_TAGVAR(whole_archive_flag_spec, $1)= |
3250 | + tmp_sharedflag='--shared' ;; |
3251 | + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
3252 | tmp_sharedflag='-qmkshrobj' |
3253 | tmp_addflag= ;; |
3254 | + nvcc*) # Cuda Compiler Driver 2.2 |
3255 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
3256 | + _LT_TAGVAR(compiler_needs_object, $1)=yes |
3257 | + ;; |
3258 | esac |
3259 | case `$CC -V 2>&1 | sed 5q` in |
3260 | *Sun\ C*) # Sun C 5.9 |
3261 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
3262 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
3263 | _LT_TAGVAR(compiler_needs_object, $1)=yes |
3264 | tmp_sharedflag='-G' ;; |
3265 | *Sun\ F*) # Sun Fortran 8.3 |
3266 | @@ -4617,17 +5366,17 @@ |
3267 | fi |
3268 | |
3269 | case $cc_basename in |
3270 | - xlf*) |
3271 | + xlf* | bgf* | bgxlf* | mpixlf*) |
3272 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
3273 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
3274 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
3275 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' |
3276 | - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
3277 | + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
3278 | if test "x$supports_anon_versioning" = xyes; then |
3279 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
3280 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
3281 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
3282 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
3283 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
3284 | fi |
3285 | ;; |
3286 | esac |
3287 | @@ -4636,7 +5385,7 @@ |
3288 | fi |
3289 | ;; |
3290 | |
3291 | - netbsd* | netbsdelf*-gnu) |
3292 | + netbsd*) |
3293 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
3294 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
3295 | wlarc= |
3296 | @@ -4748,8 +5497,10 @@ |
3297 | else |
3298 | # If we're using GNU nm, then we don't want the "-C" option. |
3299 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
3300 | + # Also, AIX nm treats weak defined symbols like other global |
3301 | + # defined symbols, whereas GNU nm marks them as "W". |
3302 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
3303 | - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3304 | + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3305 | else |
3306 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3307 | fi |
3308 | @@ -4811,7 +5562,6 @@ |
3309 | if test "$aix_use_runtimelinking" = yes; then |
3310 | shared_flag="$shared_flag "'${wl}-G' |
3311 | fi |
3312 | - _LT_TAGVAR(link_all_deplibs, $1)=no |
3313 | else |
3314 | # not using gcc |
3315 | if test "$host_cpu" = ia64; then |
3316 | @@ -4827,6 +5577,7 @@ |
3317 | fi |
3318 | fi |
3319 | |
3320 | + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' |
3321 | # It seems that -bexpall does not export symbols beginning with |
3322 | # underscore (_), so it is better to generate a list of symbols to export. |
3323 | _LT_TAGVAR(always_export_symbols, $1)=yes |
3324 | @@ -4838,7 +5589,7 @@ |
3325 | # empty executable. |
3326 | _LT_SYS_MODULE_PATH_AIX |
3327 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
3328 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
3329 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
3330 | else |
3331 | if test "$host_cpu" = ia64; then |
3332 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
3333 | @@ -4853,8 +5604,13 @@ |
3334 | # -berok will link without error, but may produce a broken library. |
3335 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
3336 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
3337 | - # Exported symbols can be pulled into shared objects from archives |
3338 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
3339 | + if test "$with_gnu_ld" = yes; then |
3340 | + # We only use this code for GNU lds that support --whole-archive. |
3341 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
3342 | + else |
3343 | + # Exported symbols can be pulled into shared objects from archives |
3344 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
3345 | + fi |
3346 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
3347 | # This is similar to how AIX traditionally builds its shared libraries. |
3348 | _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
3349 | @@ -4881,7 +5637,7 @@ |
3350 | _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic |
3351 | ;; |
3352 | |
3353 | - cygwin* | mingw* | pw32*) |
3354 | + cygwin* | mingw* | pw32* | cegcc*) |
3355 | # When not using gcc, we currently assume that we are using |
3356 | # Microsoft Visual C++. |
3357 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
3358 | @@ -4893,7 +5649,7 @@ |
3359 | # Tell ltmain to make .dll files, not .so files. |
3360 | shrext_cmds=".dll" |
3361 | # FIXME: Setting linknames here is a bad hack. |
3362 | - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' |
3363 | + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
3364 | # The linker will automatically build a .lib file if we build a DLL. |
3365 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
3366 | # FIXME: Should let the user specify the lib program. |
3367 | @@ -4960,7 +5716,7 @@ |
3368 | ;; |
3369 | |
3370 | hpux10*) |
3371 | - if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
3372 | + if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
3373 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3374 | else |
3375 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
3376 | @@ -4979,13 +5735,13 @@ |
3377 | ;; |
3378 | |
3379 | hpux11*) |
3380 | - if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
3381 | + if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
3382 | case $host_cpu in |
3383 | hppa*64*) |
3384 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
3385 | ;; |
3386 | ia64*) |
3387 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3388 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3389 | ;; |
3390 | *) |
3391 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3392 | @@ -5000,7 +5756,14 @@ |
3393 | _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3394 | ;; |
3395 | *) |
3396 | - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3397 | + m4_if($1, [], [ |
3398 | + # Older versions of the 11.00 compiler do not understand -b yet |
3399 | + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) |
3400 | + _LT_LINKER_OPTION([if $CC understands -b], |
3401 | + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], |
3402 | + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], |
3403 | + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], |
3404 | + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) |
3405 | ;; |
3406 | esac |
3407 | fi |
3408 | @@ -5028,19 +5791,19 @@ |
3409 | |
3410 | irix5* | irix6* | nonstopux*) |
3411 | if test "$GCC" = yes; then |
3412 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3413 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3414 | # Try to use the -exported_symbol ld option, if it does not |
3415 | # work, assume that -exports_file does not work either and |
3416 | # implicitly export all symbols. |
3417 | save_LDFLAGS="$LDFLAGS" |
3418 | LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
3419 | AC_LINK_IFELSE(int foo(void) {}, |
3420 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
3421 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
3422 | ) |
3423 | LDFLAGS="$save_LDFLAGS" |
3424 | else |
3425 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
3426 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
3427 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
3428 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
3429 | fi |
3430 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
3431 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3432 | @@ -5049,7 +5812,7 @@ |
3433 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
3434 | ;; |
3435 | |
3436 | - netbsd* | netbsdelf*-gnu) |
3437 | + netbsd*) |
3438 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
3439 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
3440 | else |
3441 | @@ -5102,17 +5865,17 @@ |
3442 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
3443 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
3444 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
3445 | - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' |
3446 | + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' |
3447 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' |
3448 | ;; |
3449 | |
3450 | osf3*) |
3451 | if test "$GCC" = yes; then |
3452 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
3453 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3454 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3455 | else |
3456 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
3457 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
3458 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
3459 | fi |
3460 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
3461 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3462 | @@ -5122,13 +5885,13 @@ |
3463 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
3464 | if test "$GCC" = yes; then |
3465 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
3466 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3467 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3468 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3469 | else |
3470 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
3471 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
3472 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
3473 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ |
3474 | - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' |
3475 | + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' |
3476 | |
3477 | # Both c and cxx compiler support -rpath directly |
3478 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
3479 | @@ -5319,36 +6082,38 @@ |
3480 | # Test whether the compiler implicitly links with -lc since on some |
3481 | # systems, -lgcc has to come before -lc. If gcc already passes -lc |
3482 | # to ld, don't add -lc before -lgcc. |
3483 | - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) |
3484 | - $RM conftest* |
3485 | - echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
3486 | + AC_CACHE_CHECK([whether -lc should be explicitly linked in], |
3487 | + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), |
3488 | + [$RM conftest* |
3489 | + echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
3490 | |
3491 | - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then |
3492 | - soname=conftest |
3493 | - lib=conftest |
3494 | - libobjs=conftest.$ac_objext |
3495 | - deplibs= |
3496 | - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) |
3497 | - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) |
3498 | - compiler_flags=-v |
3499 | - linker_flags=-v |
3500 | - verstring= |
3501 | - output_objdir=. |
3502 | - libname=conftest |
3503 | - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) |
3504 | - _LT_TAGVAR(allow_undefined_flag, $1)= |
3505 | - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) |
3506 | - then |
3507 | - _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3508 | - else |
3509 | - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
3510 | - fi |
3511 | - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag |
3512 | - else |
3513 | - cat conftest.err 1>&5 |
3514 | - fi |
3515 | - $RM conftest* |
3516 | - AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) |
3517 | + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then |
3518 | + soname=conftest |
3519 | + lib=conftest |
3520 | + libobjs=conftest.$ac_objext |
3521 | + deplibs= |
3522 | + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) |
3523 | + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) |
3524 | + compiler_flags=-v |
3525 | + linker_flags=-v |
3526 | + verstring= |
3527 | + output_objdir=. |
3528 | + libname=conftest |
3529 | + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) |
3530 | + _LT_TAGVAR(allow_undefined_flag, $1)= |
3531 | + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) |
3532 | + then |
3533 | + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3534 | + else |
3535 | + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
3536 | + fi |
3537 | + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag |
3538 | + else |
3539 | + cat conftest.err 1>&5 |
3540 | + fi |
3541 | + $RM conftest* |
3542 | + ]) |
3543 | + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) |
3544 | ;; |
3545 | esac |
3546 | fi |
3547 | @@ -5514,14 +6279,14 @@ |
3548 | ])# _LT_LANG_C_CONFIG |
3549 | |
3550 | |
3551 | -# _LT_PROG_CXX |
3552 | -# ------------ |
3553 | -# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ |
3554 | -# compiler, we have our own version here. |
3555 | -m4_defun([_LT_PROG_CXX], |
3556 | -[ |
3557 | -pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) |
3558 | -AC_PROG_CXX |
3559 | +# _LT_LANG_CXX_CONFIG([TAG]) |
3560 | +# -------------------------- |
3561 | +# Ensure that the configuration variables for a C++ compiler are suitably |
3562 | +# defined. These variables are subsequently used by _LT_CONFIG to write |
3563 | +# the compiler configuration to `libtool'. |
3564 | +m4_defun([_LT_LANG_CXX_CONFIG], |
3565 | +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
3566 | +m4_require([_LT_DECL_EGREP])dnl |
3567 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
3568 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
3569 | (test "X$CXX" != "Xg++"))) ; then |
3570 | @@ -5529,22 +6294,6 @@ |
3571 | else |
3572 | _lt_caught_CXX_error=yes |
3573 | fi |
3574 | -popdef([AC_MSG_ERROR]) |
3575 | -])# _LT_PROG_CXX |
3576 | - |
3577 | -dnl aclocal-1.4 backwards compatibility: |
3578 | -dnl AC_DEFUN([_LT_PROG_CXX], []) |
3579 | - |
3580 | - |
3581 | -# _LT_LANG_CXX_CONFIG([TAG]) |
3582 | -# -------------------------- |
3583 | -# Ensure that the configuration variables for a C++ compiler are suitably |
3584 | -# defined. These variables are subsequently used by _LT_CONFIG to write |
3585 | -# the compiler configuration to `libtool'. |
3586 | -m4_defun([_LT_LANG_CXX_CONFIG], |
3587 | -[AC_REQUIRE([_LT_PROG_CXX])dnl |
3588 | -m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
3589 | -m4_require([_LT_DECL_EGREP])dnl |
3590 | |
3591 | AC_LANG_PUSH(C++) |
3592 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3593 | @@ -5566,6 +6315,8 @@ |
3594 | _LT_TAGVAR(module_expsym_cmds, $1)= |
3595 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
3596 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
3597 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
3598 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
3599 | _LT_TAGVAR(no_undefined_flag, $1)= |
3600 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
3601 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
3602 | @@ -5668,7 +6419,7 @@ |
3603 | # Commands to make compiler produce verbose output that lists |
3604 | # what "hidden" libraries, object files and flags are used when |
3605 | # linking a shared library. |
3606 | - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
3607 | + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
3608 | |
3609 | else |
3610 | GXX=no |
3611 | @@ -5766,6 +6517,7 @@ |
3612 | fi |
3613 | fi |
3614 | |
3615 | + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' |
3616 | # It seems that -bexpall does not export symbols beginning with |
3617 | # underscore (_), so it is better to generate a list of symbols to |
3618 | # export. |
3619 | @@ -5779,7 +6531,7 @@ |
3620 | _LT_SYS_MODULE_PATH_AIX |
3621 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
3622 | |
3623 | - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
3624 | + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
3625 | else |
3626 | if test "$host_cpu" = ia64; then |
3627 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
3628 | @@ -5794,8 +6546,13 @@ |
3629 | # -berok will link without error, but may produce a broken library. |
3630 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
3631 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
3632 | - # Exported symbols can be pulled into shared objects from archives |
3633 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
3634 | + if test "$with_gnu_ld" = yes; then |
3635 | + # We only use this code for GNU lds that support --whole-archive. |
3636 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
3637 | + else |
3638 | + # Exported symbols can be pulled into shared objects from archives |
3639 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
3640 | + fi |
3641 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
3642 | # This is similar to how AIX traditionally builds its shared |
3643 | # libraries. |
3644 | @@ -5824,10 +6581,11 @@ |
3645 | esac |
3646 | ;; |
3647 | |
3648 | - cygwin* | mingw* | pw32*) |
3649 | + cygwin* | mingw* | pw32* | cegcc*) |
3650 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
3651 | # as there is no search path for DLLs. |
3652 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
3653 | + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' |
3654 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
3655 | _LT_TAGVAR(always_export_symbols, $1)=no |
3656 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
3657 | @@ -5888,6 +6646,11 @@ |
3658 | gnu*) |
3659 | ;; |
3660 | |
3661 | + haiku*) |
3662 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3663 | + _LT_TAGVAR(link_all_deplibs, $1)=yes |
3664 | + ;; |
3665 | + |
3666 | hpux9*) |
3667 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
3668 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
3669 | @@ -5912,7 +6675,7 @@ |
3670 | # explicitly linking system object files so we need to strip them |
3671 | # from the output so that they don't get included in the library |
3672 | # dependencies. |
3673 | - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
3674 | + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
3675 | ;; |
3676 | *) |
3677 | if test "$GXX" = yes; then |
3678 | @@ -5977,7 +6740,7 @@ |
3679 | # explicitly linking system object files so we need to strip them |
3680 | # from the output so that they don't get included in the library |
3681 | # dependencies. |
3682 | - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
3683 | + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
3684 | ;; |
3685 | *) |
3686 | if test "$GXX" = yes; then |
3687 | @@ -6020,7 +6783,7 @@ |
3688 | case $cc_basename in |
3689 | CC*) |
3690 | # SGI C++ |
3691 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
3692 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
3693 | |
3694 | # Archives containing C++ object files must be created using |
3695 | # "CC -ar", where "CC" is the IRIX C++ compiler. This is |
3696 | @@ -6031,9 +6794,9 @@ |
3697 | *) |
3698 | if test "$GXX" = yes; then |
3699 | if test "$with_gnu_ld" = no; then |
3700 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3701 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3702 | else |
3703 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' |
3704 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' |
3705 | fi |
3706 | fi |
3707 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
3708 | @@ -6044,7 +6807,7 @@ |
3709 | _LT_TAGVAR(inherit_rpath, $1)=yes |
3710 | ;; |
3711 | |
3712 | - linux* | k*bsd*-gnu) |
3713 | + linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3714 | case $cc_basename in |
3715 | KCC*) |
3716 | # Kuck and Associates, Inc. (KAI) C++ Compiler |
3717 | @@ -6062,7 +6825,7 @@ |
3718 | # explicitly linking system object files so we need to strip them |
3719 | # from the output so that they don't get included in the library |
3720 | # dependencies. |
3721 | - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
3722 | + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
3723 | |
3724 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
3725 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
3726 | @@ -6099,26 +6862,26 @@ |
3727 | pgCC* | pgcpp*) |
3728 | # Portland Group C++ compiler |
3729 | case `$CC -V` in |
3730 | - *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) |
3731 | + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) |
3732 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ |
3733 | rm -rf $tpldir~ |
3734 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
3735 | - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' |
3736 | + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
3737 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ |
3738 | rm -rf $tpldir~ |
3739 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
3740 | - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ |
3741 | + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
3742 | $RANLIB $oldlib' |
3743 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ |
3744 | rm -rf $tpldir~ |
3745 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
3746 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
3747 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
3748 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ |
3749 | rm -rf $tpldir~ |
3750 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
3751 | - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
3752 | + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
3753 | ;; |
3754 | - *) # Version 6 will use weak symbols |
3755 | + *) # Version 6 and above use weak symbols |
3756 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
3757 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
3758 | ;; |
3759 | @@ -6126,7 +6889,7 @@ |
3760 | |
3761 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' |
3762 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
3763 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
3764 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
3765 | ;; |
3766 | cxx*) |
3767 | # Compaq C++ |
3768 | @@ -6145,9 +6908,9 @@ |
3769 | # explicitly linking system object files so we need to strip them |
3770 | # from the output so that they don't get included in the library |
3771 | # dependencies. |
3772 | - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
3773 | + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' |
3774 | ;; |
3775 | - xl*) |
3776 | + xl* | mpixl* | bgxl*) |
3777 | # IBM XL 8.0 on PPC, with GNU ld |
3778 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3779 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
3780 | @@ -6167,13 +6930,13 @@ |
3781 | _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
3782 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' |
3783 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
3784 | - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
3785 | + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
3786 | _LT_TAGVAR(compiler_needs_object, $1)=yes |
3787 | |
3788 | # Not sure whether something based on |
3789 | # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 |
3790 | # would be better. |
3791 | - output_verbose_link_cmd='echo' |
3792 | + output_verbose_link_cmd='func_echo_all' |
3793 | |
3794 | # Archives containing C++ object files must be created using |
3795 | # "CC -xar", where "CC" is the Sun C++ compiler. This is |
3796 | @@ -6242,7 +7005,7 @@ |
3797 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
3798 | _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
3799 | fi |
3800 | - output_verbose_link_cmd=echo |
3801 | + output_verbose_link_cmd=func_echo_all |
3802 | else |
3803 | _LT_TAGVAR(ld_shlibs, $1)=no |
3804 | fi |
3805 | @@ -6277,15 +7040,15 @@ |
3806 | case $host in |
3807 | osf3*) |
3808 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
3809 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
3810 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
3811 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3812 | ;; |
3813 | *) |
3814 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
3815 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
3816 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' |
3817 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ |
3818 | echo "-hidden">> $lib.exp~ |
3819 | - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ |
3820 | + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ |
3821 | $RM $lib.exp' |
3822 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
3823 | ;; |
3824 | @@ -6301,17 +7064,17 @@ |
3825 | # explicitly linking system object files so we need to strip them |
3826 | # from the output so that they don't get included in the library |
3827 | # dependencies. |
3828 | - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
3829 | + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
3830 | ;; |
3831 | *) |
3832 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
3833 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
3834 | case $host in |
3835 | osf3*) |
3836 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3837 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3838 | ;; |
3839 | *) |
3840 | - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3841 | + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
3842 | ;; |
3843 | esac |
3844 | |
3845 | @@ -6321,7 +7084,7 @@ |
3846 | # Commands to make compiler produce verbose output that lists |
3847 | # what "hidden" libraries, object files and flags are used when |
3848 | # linking a shared library. |
3849 | - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
3850 | + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
3851 | |
3852 | else |
3853 | # FIXME: insert proper C++ library support |
3854 | @@ -6357,7 +7120,7 @@ |
3855 | |
3856 | solaris*) |
3857 | case $cc_basename in |
3858 | - CC*) |
3859 | + CC* | sunCC*) |
3860 | # Sun C++ 4.2, 5.x and Centerline C++ |
3861 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes |
3862 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
3863 | @@ -6378,7 +7141,7 @@ |
3864 | esac |
3865 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
3866 | |
3867 | - output_verbose_link_cmd='echo' |
3868 | + output_verbose_link_cmd='func_echo_all' |
3869 | |
3870 | # Archives containing C++ object files must be created using |
3871 | # "CC -xar", where "CC" is the Sun C++ compiler. This is |
3872 | @@ -6405,7 +7168,7 @@ |
3873 | # Commands to make compiler produce verbose output that lists |
3874 | # what "hidden" libraries, object files and flags are used when |
3875 | # linking a shared library. |
3876 | - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
3877 | + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
3878 | else |
3879 | # g++ 2.7 appears to require `-G' NOT `-shared' on this |
3880 | # platform. |
3881 | @@ -6416,7 +7179,7 @@ |
3882 | # Commands to make compiler produce verbose output that lists |
3883 | # what "hidden" libraries, object files and flags are used when |
3884 | # linking a shared library. |
3885 | - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
3886 | + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
3887 | fi |
3888 | |
3889 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' |
3890 | @@ -6470,6 +7233,10 @@ |
3891 | CC*) |
3892 | _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3893 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3894 | + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ |
3895 | + '"$_LT_TAGVAR(old_archive_cmds, $1)" |
3896 | + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ |
3897 | + '"$_LT_TAGVAR(reload_cmds, $1)" |
3898 | ;; |
3899 | *) |
3900 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3901 | @@ -6716,7 +7483,7 @@ |
3902 | |
3903 | solaris*) |
3904 | case $cc_basename in |
3905 | - CC*) |
3906 | + CC* | sunCC*) |
3907 | # The more standards-conforming stlport4 library is |
3908 | # incompatible with the Cstd library. Avoid specifying |
3909 | # it if it's in CXXFLAGS. Ignore libCrun as |
3910 | @@ -6760,32 +7527,16 @@ |
3911 | ])# _LT_SYS_HIDDEN_LIBDEPS |
3912 | |
3913 | |
3914 | -# _LT_PROG_F77 |
3915 | -# ------------ |
3916 | -# Since AC_PROG_F77 is broken, in that it returns the empty string |
3917 | -# if there is no fortran compiler, we have our own version here. |
3918 | -m4_defun([_LT_PROG_F77], |
3919 | -[ |
3920 | -pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) |
3921 | -AC_PROG_F77 |
3922 | -if test -z "$F77" || test "X$F77" = "Xno"; then |
3923 | - _lt_disable_F77=yes |
3924 | -fi |
3925 | -popdef([AC_MSG_ERROR]) |
3926 | -])# _LT_PROG_F77 |
3927 | - |
3928 | -dnl aclocal-1.4 backwards compatibility: |
3929 | -dnl AC_DEFUN([_LT_PROG_F77], []) |
3930 | - |
3931 | - |
3932 | # _LT_LANG_F77_CONFIG([TAG]) |
3933 | # -------------------------- |
3934 | # Ensure that the configuration variables for a Fortran 77 compiler are |
3935 | # suitably defined. These variables are subsequently used by _LT_CONFIG |
3936 | # to write the compiler configuration to `libtool'. |
3937 | m4_defun([_LT_LANG_F77_CONFIG], |
3938 | -[AC_REQUIRE([_LT_PROG_F77])dnl |
3939 | -AC_LANG_PUSH(Fortran 77) |
3940 | +[AC_LANG_PUSH(Fortran 77) |
3941 | +if test -z "$F77" || test "X$F77" = "Xno"; then |
3942 | + _lt_disable_F77=yes |
3943 | +fi |
3944 | |
3945 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3946 | _LT_TAGVAR(allow_undefined_flag, $1)= |
3947 | @@ -6804,6 +7555,8 @@ |
3948 | _LT_TAGVAR(module_expsym_cmds, $1)= |
3949 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
3950 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
3951 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
3952 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
3953 | _LT_TAGVAR(no_undefined_flag, $1)= |
3954 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
3955 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
3956 | @@ -6903,32 +7656,17 @@ |
3957 | ])# _LT_LANG_F77_CONFIG |
3958 | |
3959 | |
3960 | -# _LT_PROG_FC |
3961 | -# ----------- |
3962 | -# Since AC_PROG_FC is broken, in that it returns the empty string |
3963 | -# if there is no fortran compiler, we have our own version here. |
3964 | -m4_defun([_LT_PROG_FC], |
3965 | -[ |
3966 | -pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) |
3967 | -AC_PROG_FC |
3968 | -if test -z "$FC" || test "X$FC" = "Xno"; then |
3969 | - _lt_disable_FC=yes |
3970 | -fi |
3971 | -popdef([AC_MSG_ERROR]) |
3972 | -])# _LT_PROG_FC |
3973 | - |
3974 | -dnl aclocal-1.4 backwards compatibility: |
3975 | -dnl AC_DEFUN([_LT_PROG_FC], []) |
3976 | - |
3977 | - |
3978 | # _LT_LANG_FC_CONFIG([TAG]) |
3979 | # ------------------------- |
3980 | # Ensure that the configuration variables for a Fortran compiler are |
3981 | # suitably defined. These variables are subsequently used by _LT_CONFIG |
3982 | # to write the compiler configuration to `libtool'. |
3983 | m4_defun([_LT_LANG_FC_CONFIG], |
3984 | -[AC_REQUIRE([_LT_PROG_FC])dnl |
3985 | -AC_LANG_PUSH(Fortran) |
3986 | +[AC_LANG_PUSH(Fortran) |
3987 | + |
3988 | +if test -z "$FC" || test "X$FC" = "Xno"; then |
3989 | + _lt_disable_FC=yes |
3990 | +fi |
3991 | |
3992 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3993 | _LT_TAGVAR(allow_undefined_flag, $1)= |
3994 | @@ -6947,6 +7685,8 @@ |
3995 | _LT_TAGVAR(module_expsym_cmds, $1)= |
3996 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
3997 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
3998 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
3999 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
4000 | _LT_TAGVAR(no_undefined_flag, $1)= |
4001 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
4002 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
4003 | @@ -7092,6 +7832,8 @@ |
4004 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
4005 | |
4006 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
4007 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
4008 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
4009 | |
4010 | if test -n "$compiler"; then |
4011 | _LT_COMPILER_NO_RTTI($1) |
4012 | @@ -7205,6 +7947,18 @@ |
4013 | ]) |
4014 | |
4015 | |
4016 | +# _LT_DECL_OBJDUMP |
4017 | +# -------------- |
4018 | +# If we don't have a new enough Autoconf to choose the best objdump |
4019 | +# available, choose the one first in the user's PATH. |
4020 | +m4_defun([_LT_DECL_OBJDUMP], |
4021 | +[AC_CHECK_TOOL(OBJDUMP, objdump, false) |
4022 | +test -z "$OBJDUMP" && OBJDUMP=objdump |
4023 | +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) |
4024 | +AC_SUBST([OBJDUMP]) |
4025 | +]) |
4026 | + |
4027 | + |
4028 | # _LT_DECL_SED |
4029 | # ------------ |
4030 | # Check for a fully-functional sed program, that truncates |
4031 | @@ -7441,7 +8195,7 @@ |
4032 | func_dirname () |
4033 | { |
4034 | # Extract subdirectory from the argument. |
4035 | - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` |
4036 | + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
4037 | if test "X$func_dirname_result" = "X${1}"; then |
4038 | func_dirname_result="${3}" |
4039 | else |
4040 | @@ -7452,7 +8206,7 @@ |
4041 | # func_basename file |
4042 | func_basename () |
4043 | { |
4044 | - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` |
4045 | + func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
4046 | } |
4047 | |
4048 | dnl func_dirname_and_basename |
4049 | @@ -7468,10 +8222,8 @@ |
4050 | func_stripname () |
4051 | { |
4052 | case ${2} in |
4053 | - .*) func_stripname_result=`$ECHO "X${3}" \ |
4054 | - | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; |
4055 | - *) func_stripname_result=`$ECHO "X${3}" \ |
4056 | - | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; |
4057 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
4058 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
4059 | esac |
4060 | } |
4061 | |
4062 | @@ -7482,20 +8234,20 @@ |
4063 | # func_opt_split |
4064 | func_opt_split () |
4065 | { |
4066 | - func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` |
4067 | - func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` |
4068 | + func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
4069 | + func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
4070 | } |
4071 | |
4072 | # func_lo2o object |
4073 | func_lo2o () |
4074 | { |
4075 | - func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` |
4076 | + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
4077 | } |
4078 | |
4079 | # func_xform libobj-or-source |
4080 | func_xform () |
4081 | { |
4082 | - func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` |
4083 | + func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` |
4084 | } |
4085 | |
4086 | # func_arith arithmetic-term... |
4087 | @@ -7543,14 +8295,15 @@ |
4088 | |
4089 | # Helper functions for option handling. -*- Autoconf -*- |
4090 | # |
4091 | -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. |
4092 | +# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, |
4093 | +# Inc. |
4094 | # Written by Gary V. Vaughan, 2004 |
4095 | # |
4096 | # This file is free software; the Free Software Foundation gives |
4097 | # unlimited permission to copy and/or distribute it, with or without |
4098 | # modifications, as long as this notice is preserved. |
4099 | |
4100 | -# serial 6 ltoptions.m4 |
4101 | +# serial 7 ltoptions.m4 |
4102 | |
4103 | # This is to help aclocal find these macros, as it can't see m4_define. |
4104 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) |
4105 | @@ -7665,7 +8418,7 @@ |
4106 | [enable_win32_dll=yes |
4107 | |
4108 | case $host in |
4109 | -*-*-cygwin* | *-*-mingw* | *-*-pw32*) |
4110 | +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) |
4111 | AC_CHECK_TOOL(AS, as, false) |
4112 | AC_CHECK_TOOL(DLLTOOL, dlltool, false) |
4113 | AC_CHECK_TOOL(OBJDUMP, objdump, false) |
4114 | @@ -7673,13 +8426,13 @@ |
4115 | esac |
4116 | |
4117 | test -z "$AS" && AS=as |
4118 | -_LT_DECL([], [AS], [0], [Assembler program])dnl |
4119 | +_LT_DECL([], [AS], [1], [Assembler program])dnl |
4120 | |
4121 | test -z "$DLLTOOL" && DLLTOOL=dlltool |
4122 | -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl |
4123 | +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl |
4124 | |
4125 | test -z "$OBJDUMP" && OBJDUMP=objdump |
4126 | -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl |
4127 | +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl |
4128 | ])# win32-dll |
4129 | |
4130 | AU_DEFUN([AC_LIBTOOL_WIN32_DLL], |
4131 | @@ -7906,14 +8659,14 @@ |
4132 | |
4133 | # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- |
4134 | # |
4135 | -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. |
4136 | -# Written by Gary V. Vaughan, 2004 |
4137 | +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. |
4138 | +# Written by Gary V. Vaughan, 2004 |
4139 | # |
4140 | # This file is free software; the Free Software Foundation gives |
4141 | # unlimited permission to copy and/or distribute it, with or without |
4142 | # modifications, as long as this notice is preserved. |
4143 | |
4144 | -# serial 5 ltsugar.m4 |
4145 | +# serial 6 ltsugar.m4 |
4146 | |
4147 | # This is to help aclocal find these macros, as it can't see m4_define. |
4148 | AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) |
4149 | @@ -7969,14 +8722,14 @@ |
4150 | # Produce a SEP delimited list of all paired combinations of elements of |
4151 | # PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list |
4152 | # has the form PREFIXmINFIXSUFFIXn. |
4153 | +# Needed until we can rely on m4_combine added in Autoconf 2.62. |
4154 | m4_define([lt_combine], |
4155 | -[m4_if([$2], [], [], |
4156 | - [m4_if([$4], [], [], |
4157 | - [lt_join(m4_quote(m4_default([$1], [[, ]])), |
4158 | - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2], |
4159 | - [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]), |
4160 | - [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl |
4161 | -]) |
4162 | +[m4_if(m4_eval([$# > 3]), [1], |
4163 | + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl |
4164 | +[[m4_foreach([_Lt_prefix], [$2], |
4165 | + [m4_foreach([_Lt_suffix], |
4166 | + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, |
4167 | + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) |
4168 | |
4169 | |
4170 | # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) |
4171 | @@ -8039,29 +8792,29 @@ |
4172 | |
4173 | # Generated from ltversion.in. |
4174 | |
4175 | -# serial 2976 ltversion.m4 |
4176 | +# serial 3175 ltversion.m4 |
4177 | # This file is part of GNU Libtool |
4178 | |
4179 | -m4_define([LT_PACKAGE_VERSION], [2.2.4]) |
4180 | -m4_define([LT_PACKAGE_REVISION], [1.2976]) |
4181 | +m4_define([LT_PACKAGE_VERSION], [2.2.10]) |
4182 | +m4_define([LT_PACKAGE_REVISION], [1.3175]) |
4183 | |
4184 | AC_DEFUN([LTVERSION_VERSION], |
4185 | -[macro_version='2.2.4' |
4186 | -macro_revision='1.2976' |
4187 | +[macro_version='2.2.10' |
4188 | +macro_revision='1.3175' |
4189 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) |
4190 | _LT_DECL(, macro_revision, 0) |
4191 | ]) |
4192 | |
4193 | # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- |
4194 | # |
4195 | -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. |
4196 | +# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. |
4197 | # Written by Scott James Remnant, 2004. |
4198 | # |
4199 | # This file is free software; the Free Software Foundation gives |
4200 | # unlimited permission to copy and/or distribute it, with or without |
4201 | # modifications, as long as this notice is preserved. |
4202 | |
4203 | -# serial 4 lt~obsolete.m4 |
4204 | +# serial 5 lt~obsolete.m4 |
4205 | |
4206 | # These exist entirely to fool aclocal when bootstrapping libtool. |
4207 | # |
4208 | @@ -8131,7 +8884,6 @@ |
4209 | m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) |
4210 | m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) |
4211 | m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) |
4212 | -m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) |
4213 | m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) |
4214 | m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) |
4215 | m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) |
4216 | @@ -8144,8 +8896,49 @@ |
4217 | m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) |
4218 | m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) |
4219 | m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) |
4220 | +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) |
4221 | +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) |
4222 | +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) |
4223 | +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) |
4224 | +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) |
4225 | +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) |
4226 | +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) |
4227 | + |
4228 | +# nls.m4 serial 5 (gettext-0.18) |
4229 | +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, |
4230 | +dnl Inc. |
4231 | +dnl This file is free software; the Free Software Foundation |
4232 | +dnl gives unlimited permission to copy and/or distribute it, |
4233 | +dnl with or without modifications, as long as this notice is preserved. |
4234 | +dnl |
4235 | +dnl This file can can be used in projects which are not available under |
4236 | +dnl the GNU General Public License or the GNU Library General Public |
4237 | +dnl License but which still want to provide support for the GNU gettext |
4238 | +dnl functionality. |
4239 | +dnl Please note that the actual code of the GNU gettext library is covered |
4240 | +dnl by the GNU Library General Public License, and the rest of the GNU |
4241 | +dnl gettext package package is covered by the GNU General Public License. |
4242 | +dnl They are *not* in the public domain. |
4243 | + |
4244 | +dnl Authors: |
4245 | +dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. |
4246 | +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. |
4247 | + |
4248 | +AC_PREREQ([2.50]) |
4249 | + |
4250 | +AC_DEFUN([AM_NLS], |
4251 | +[ |
4252 | + AC_MSG_CHECKING([whether NLS is requested]) |
4253 | + dnl Default is enabled NLS |
4254 | + AC_ARG_ENABLE([nls], |
4255 | + [ --disable-nls do not use Native Language Support], |
4256 | + USE_NLS=$enableval, USE_NLS=yes) |
4257 | + AC_MSG_RESULT([$USE_NLS]) |
4258 | + AC_SUBST([USE_NLS]) |
4259 | +]) |
4260 | |
4261 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
4262 | +# serial 1 (pkg-config-0.24) |
4263 | # |
4264 | # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
4265 | # |
4266 | @@ -8173,7 +8966,10 @@ |
4267 | AC_DEFUN([PKG_PROG_PKG_CONFIG], |
4268 | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
4269 | m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) |
4270 | -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl |
4271 | +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) |
4272 | +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) |
4273 | +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) |
4274 | + |
4275 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
4276 | AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
4277 | fi |
4278 | @@ -8186,7 +8982,6 @@ |
4279 | AC_MSG_RESULT([no]) |
4280 | PKG_CONFIG="" |
4281 | fi |
4282 | - |
4283 | fi[]dnl |
4284 | ])# PKG_PROG_PKG_CONFIG |
4285 | |
4286 | @@ -8195,34 +8990,31 @@ |
4287 | # Check to see whether a particular set of modules exists. Similar |
4288 | # to PKG_CHECK_MODULES(), but does not set variables or print errors. |
4289 | # |
4290 | -# |
4291 | -# Similar to PKG_CHECK_MODULES, make sure that the first instance of |
4292 | -# this or PKG_CHECK_MODULES is called, or make sure to call |
4293 | -# PKG_CHECK_EXISTS manually |
4294 | +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
4295 | +# only at the first occurence in configure.ac, so if the first place |
4296 | +# it's called might be skipped (such as if it is within an "if", you |
4297 | +# have to call PKG_CHECK_EXISTS manually |
4298 | # -------------------------------------------------------------- |
4299 | AC_DEFUN([PKG_CHECK_EXISTS], |
4300 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
4301 | if test -n "$PKG_CONFIG" && \ |
4302 | AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then |
4303 | - m4_ifval([$2], [$2], [:]) |
4304 | + m4_default([$2], [:]) |
4305 | m4_ifvaln([$3], [else |
4306 | $3])dnl |
4307 | fi]) |
4308 | |
4309 | - |
4310 | # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) |
4311 | # --------------------------------------------- |
4312 | m4_define([_PKG_CONFIG], |
4313 | -[if test -n "$PKG_CONFIG"; then |
4314 | - if test -n "$$1"; then |
4315 | - pkg_cv_[]$1="$$1" |
4316 | - else |
4317 | - PKG_CHECK_EXISTS([$3], |
4318 | - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], |
4319 | - [pkg_failed=yes]) |
4320 | - fi |
4321 | -else |
4322 | - pkg_failed=untried |
4323 | +[if test -n "$$1"; then |
4324 | + pkg_cv_[]$1="$$1" |
4325 | + elif test -n "$PKG_CONFIG"; then |
4326 | + PKG_CHECK_EXISTS([$3], |
4327 | + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], |
4328 | + [pkg_failed=yes]) |
4329 | + else |
4330 | + pkg_failed=untried |
4331 | fi[]dnl |
4332 | ])# _PKG_CONFIG |
4333 | |
4334 | @@ -8264,16 +9056,17 @@ |
4335 | See the pkg-config man page for more details.]) |
4336 | |
4337 | if test $pkg_failed = yes; then |
4338 | + AC_MSG_RESULT([no]) |
4339 | _PKG_SHORT_ERRORS_SUPPORTED |
4340 | if test $_pkg_short_errors_supported = yes; then |
4341 | - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` |
4342 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` |
4343 | else |
4344 | - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` |
4345 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` |
4346 | fi |
4347 | # Put the nasty error message in config.log where it belongs |
4348 | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
4349 | |
4350 | - ifelse([$4], , [AC_MSG_ERROR(dnl |
4351 | + m4_default([$4], [AC_MSG_ERROR( |
4352 | [Package requirements ($2) were not met: |
4353 | |
4354 | $$1_PKG_ERRORS |
4355 | @@ -8281,29 +9074,28 @@ |
4356 | Consider adjusting the PKG_CONFIG_PATH environment variable if you |
4357 | installed software in a non-standard prefix. |
4358 | |
4359 | -_PKG_TEXT |
4360 | -])], |
4361 | - [AC_MSG_RESULT([no]) |
4362 | - $4]) |
4363 | +_PKG_TEXT])[]dnl |
4364 | + ]) |
4365 | elif test $pkg_failed = untried; then |
4366 | - ifelse([$4], , [AC_MSG_FAILURE(dnl |
4367 | + AC_MSG_RESULT([no]) |
4368 | + m4_default([$4], [AC_MSG_FAILURE( |
4369 | [The pkg-config script could not be found or is too old. Make sure it |
4370 | is in your PATH or set the PKG_CONFIG environment variable to the full |
4371 | path to pkg-config. |
4372 | |
4373 | _PKG_TEXT |
4374 | |
4375 | -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], |
4376 | - [$4]) |
4377 | +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl |
4378 | + ]) |
4379 | else |
4380 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
4381 | $1[]_LIBS=$pkg_cv_[]$1[]_LIBS |
4382 | AC_MSG_RESULT([yes]) |
4383 | - ifelse([$3], , :, [$3]) |
4384 | + $3 |
4385 | fi[]dnl |
4386 | ])# PKG_CHECK_MODULES |
4387 | |
4388 | -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. |
4389 | +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
4390 | # |
4391 | # This file is free software; the Free Software Foundation |
4392 | # gives unlimited permission to copy and/or distribute it, |
4393 | @@ -8315,10 +9107,10 @@ |
4394 | # generated from the m4 files accompanying Automake X.Y. |
4395 | # (This private macro should not be called outside this file.) |
4396 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
4397 | -[am__api_version='1.10' |
4398 | +[am__api_version='1.11' |
4399 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
4400 | dnl require some minimum version. Point them to the right macro. |
4401 | -m4_if([$1], [1.10.1], [], |
4402 | +m4_if([$1], [1.11.1], [], |
4403 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
4404 | ]) |
4405 | |
4406 | @@ -8332,12 +9124,12 @@ |
4407 | # AM_SET_CURRENT_AUTOMAKE_VERSION |
4408 | # ------------------------------- |
4409 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
4410 | -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. |
4411 | +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
4412 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
4413 | -[AM_AUTOMAKE_VERSION([1.10.1])dnl |
4414 | +[AM_AUTOMAKE_VERSION([1.11.1])dnl |
4415 | m4_ifndef([AC_AUTOCONF_VERSION], |
4416 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
4417 | -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) |
4418 | +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
4419 | |
4420 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
4421 | |
4422 | @@ -8394,14 +9186,14 @@ |
4423 | |
4424 | # AM_CONDITIONAL -*- Autoconf -*- |
4425 | |
4426 | -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 |
4427 | +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 |
4428 | # Free Software Foundation, Inc. |
4429 | # |
4430 | # This file is free software; the Free Software Foundation |
4431 | # gives unlimited permission to copy and/or distribute it, |
4432 | # with or without modifications, as long as this notice is preserved. |
4433 | |
4434 | -# serial 8 |
4435 | +# serial 9 |
4436 | |
4437 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) |
4438 | # ------------------------------------- |
4439 | @@ -8414,6 +9206,7 @@ |
4440 | AC_SUBST([$1_FALSE])dnl |
4441 | _AM_SUBST_NOTMAKE([$1_TRUE])dnl |
4442 | _AM_SUBST_NOTMAKE([$1_FALSE])dnl |
4443 | +m4_define([_AM_COND_VALUE_$1], [$2])dnl |
4444 | if $2; then |
4445 | $1_TRUE= |
4446 | $1_FALSE='#' |
4447 | @@ -8427,14 +9220,14 @@ |
4448 | Usually this means the macro was only invoked conditionally.]]) |
4449 | fi])]) |
4450 | |
4451 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 |
4452 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 |
4453 | # Free Software Foundation, Inc. |
4454 | # |
4455 | # This file is free software; the Free Software Foundation |
4456 | # gives unlimited permission to copy and/or distribute it, |
4457 | # with or without modifications, as long as this notice is preserved. |
4458 | |
4459 | -# serial 9 |
4460 | +# serial 10 |
4461 | |
4462 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
4463 | # written in clear, in which case automake, when reading aclocal.m4, |
4464 | @@ -8491,6 +9284,16 @@ |
4465 | if test "$am_compiler_list" = ""; then |
4466 | am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` |
4467 | fi |
4468 | + am__universal=false |
4469 | + m4_case([$1], [CC], |
4470 | + [case " $depcc " in #( |
4471 | + *\ -arch\ *\ -arch\ *) am__universal=true ;; |
4472 | + esac], |
4473 | + [CXX], |
4474 | + [case " $depcc " in #( |
4475 | + *\ -arch\ *\ -arch\ *) am__universal=true ;; |
4476 | + esac]) |
4477 | + |
4478 | for depmode in $am_compiler_list; do |
4479 | # Setup a source with many dependencies, because some compilers |
4480 | # like to wrap large dependency lists on column 80 (with \), and |
4481 | @@ -8508,7 +9311,17 @@ |
4482 | done |
4483 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
4484 | |
4485 | + # We check with `-c' and `-o' for the sake of the "dashmstdout" |
4486 | + # mode. It turns out that the SunPro C++ compiler does not properly |
4487 | + # handle `-M -o', and we need to detect this. Also, some Intel |
4488 | + # versions had trouble with output in subdirs |
4489 | + am__obj=sub/conftest.${OBJEXT-o} |
4490 | + am__minus_obj="-o $am__obj" |
4491 | case $depmode in |
4492 | + gcc) |
4493 | + # This depmode causes a compiler race in universal mode. |
4494 | + test "$am__universal" = false || continue |
4495 | + ;; |
4496 | nosideeffect) |
4497 | # after this tag, mechanisms are not by side-effect, so they'll |
4498 | # only be used when explicitly requested |
4499 | @@ -8518,19 +9331,23 @@ |
4500 | break |
4501 | fi |
4502 | ;; |
4503 | + msvisualcpp | msvcmsys) |
4504 | + # This compiler won't grok `-c -o', but also, the minuso test has |
4505 | + # not run yet. These depmodes are late enough in the game, and |
4506 | + # so weak that their functioning should not be impacted. |
4507 | + am__obj=conftest.${OBJEXT-o} |
4508 | + am__minus_obj= |
4509 | + ;; |
4510 | none) break ;; |
4511 | esac |
4512 | - # We check with `-c' and `-o' for the sake of the "dashmstdout" |
4513 | - # mode. It turns out that the SunPro C++ compiler does not properly |
4514 | - # handle `-M -o', and we need to detect this. |
4515 | if depmode=$depmode \ |
4516 | - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ |
4517 | + source=sub/conftest.c object=$am__obj \ |
4518 | depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ |
4519 | - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ |
4520 | + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ |
4521 | >/dev/null 2>conftest.err && |
4522 | grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && |
4523 | grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && |
4524 | - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && |
4525 | + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && |
4526 | ${MAKE-make} -s -f confmf > /dev/null 2>&1; then |
4527 | # icc doesn't choke on unknown options, it will just issue warnings |
4528 | # or remarks (even with -Werror). So we grep stderr for any message |
4529 | @@ -8587,57 +9404,68 @@ |
4530 | |
4531 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
4532 | |
4533 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
4534 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 |
4535 | # Free Software Foundation, Inc. |
4536 | # |
4537 | # This file is free software; the Free Software Foundation |
4538 | # gives unlimited permission to copy and/or distribute it, |
4539 | # with or without modifications, as long as this notice is preserved. |
4540 | |
4541 | -#serial 3 |
4542 | +#serial 5 |
4543 | |
4544 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
4545 | # ------------------------------ |
4546 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
4547 | -[for mf in $CONFIG_FILES; do |
4548 | - # Strip MF so we end up with the name of the file. |
4549 | - mf=`echo "$mf" | sed -e 's/:.*$//'` |
4550 | - # Check whether this is an Automake generated Makefile or not. |
4551 | - # We used to match only the files named `Makefile.in', but |
4552 | - # some people rename them; so instead we look at the file content. |
4553 | - # Grep'ing the first line is not enough: some people post-process |
4554 | - # each Makefile.in and add a new line on top of each file to say so. |
4555 | - # Grep'ing the whole file is not good either: AIX grep has a line |
4556 | - # limit of 2048, but all sed's we know have understand at least 4000. |
4557 | - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then |
4558 | - dirpart=`AS_DIRNAME("$mf")` |
4559 | - else |
4560 | - continue |
4561 | - fi |
4562 | - # Extract the definition of DEPDIR, am__include, and am__quote |
4563 | - # from the Makefile without running `make'. |
4564 | - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
4565 | - test -z "$DEPDIR" && continue |
4566 | - am__include=`sed -n 's/^am__include = //p' < "$mf"` |
4567 | - test -z "am__include" && continue |
4568 | - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
4569 | - # When using ansi2knr, U may be empty or an underscore; expand it |
4570 | - U=`sed -n 's/^U = //p' < "$mf"` |
4571 | - # Find all dependency output files, they are included files with |
4572 | - # $(DEPDIR) in their names. We invoke sed twice because it is the |
4573 | - # simplest approach to changing $(DEPDIR) to its actual value in the |
4574 | - # expansion. |
4575 | - for file in `sed -n " |
4576 | - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
4577 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do |
4578 | - # Make sure the directory exists. |
4579 | - test -f "$dirpart/$file" && continue |
4580 | - fdir=`AS_DIRNAME(["$file"])` |
4581 | - AS_MKDIR_P([$dirpart/$fdir]) |
4582 | - # echo "creating $dirpart/$file" |
4583 | - echo '# dummy' > "$dirpart/$file" |
4584 | +[{ |
4585 | + # Autoconf 2.62 quotes --file arguments for eval, but not when files |
4586 | + # are listed without --file. Let's play safe and only enable the eval |
4587 | + # if we detect the quoting. |
4588 | + case $CONFIG_FILES in |
4589 | + *\'*) eval set x "$CONFIG_FILES" ;; |
4590 | + *) set x $CONFIG_FILES ;; |
4591 | + esac |
4592 | + shift |
4593 | + for mf |
4594 | + do |
4595 | + # Strip MF so we end up with the name of the file. |
4596 | + mf=`echo "$mf" | sed -e 's/:.*$//'` |
4597 | + # Check whether this is an Automake generated Makefile or not. |
4598 | + # We used to match only the files named `Makefile.in', but |
4599 | + # some people rename them; so instead we look at the file content. |
4600 | + # Grep'ing the first line is not enough: some people post-process |
4601 | + # each Makefile.in and add a new line on top of each file to say so. |
4602 | + # Grep'ing the whole file is not good either: AIX grep has a line |
4603 | + # limit of 2048, but all sed's we know have understand at least 4000. |
4604 | + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then |
4605 | + dirpart=`AS_DIRNAME("$mf")` |
4606 | + else |
4607 | + continue |
4608 | + fi |
4609 | + # Extract the definition of DEPDIR, am__include, and am__quote |
4610 | + # from the Makefile without running `make'. |
4611 | + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
4612 | + test -z "$DEPDIR" && continue |
4613 | + am__include=`sed -n 's/^am__include = //p' < "$mf"` |
4614 | + test -z "am__include" && continue |
4615 | + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
4616 | + # When using ansi2knr, U may be empty or an underscore; expand it |
4617 | + U=`sed -n 's/^U = //p' < "$mf"` |
4618 | + # Find all dependency output files, they are included files with |
4619 | + # $(DEPDIR) in their names. We invoke sed twice because it is the |
4620 | + # simplest approach to changing $(DEPDIR) to its actual value in the |
4621 | + # expansion. |
4622 | + for file in `sed -n " |
4623 | + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
4624 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do |
4625 | + # Make sure the directory exists. |
4626 | + test -f "$dirpart/$file" && continue |
4627 | + fdir=`AS_DIRNAME(["$file"])` |
4628 | + AS_MKDIR_P([$dirpart/$fdir]) |
4629 | + # echo "creating $dirpart/$file" |
4630 | + echo '# dummy' > "$dirpart/$file" |
4631 | + done |
4632 | done |
4633 | -done |
4634 | +} |
4635 | ])# _AM_OUTPUT_DEPENDENCY_COMMANDS |
4636 | |
4637 | |
4638 | @@ -8669,13 +9497,13 @@ |
4639 | # Do all the work for Automake. -*- Autoconf -*- |
4640 | |
4641 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
4642 | -# 2005, 2006, 2008 Free Software Foundation, Inc. |
4643 | +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. |
4644 | # |
4645 | # This file is free software; the Free Software Foundation |
4646 | # gives unlimited permission to copy and/or distribute it, |
4647 | # with or without modifications, as long as this notice is preserved. |
4648 | |
4649 | -# serial 13 |
4650 | +# serial 16 |
4651 | |
4652 | # This macro actually does too much. Some checks are only needed if |
4653 | # your package does certain things. But this isn't really a big deal. |
4654 | @@ -8692,7 +9520,7 @@ |
4655 | # arguments mandatory, and then we can depend on a new Autoconf |
4656 | # release and drop the old call support. |
4657 | AC_DEFUN([AM_INIT_AUTOMAKE], |
4658 | -[AC_PREREQ([2.60])dnl |
4659 | +[AC_PREREQ([2.62])dnl |
4660 | dnl Autoconf wants to disallow AM_ names. We explicitly allow |
4661 | dnl the ones we care about. |
4662 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl |
4663 | @@ -8743,8 +9571,8 @@ |
4664 | AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) |
4665 | AM_MISSING_PROG(AUTOHEADER, autoheader) |
4666 | AM_MISSING_PROG(MAKEINFO, makeinfo) |
4667 | -AM_PROG_INSTALL_SH |
4668 | -AM_PROG_INSTALL_STRIP |
4669 | +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
4670 | +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl |
4671 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl |
4672 | # We need awk for the "check" target. The system "awk" is bad on |
4673 | # some platforms. |
4674 | @@ -8752,23 +9580,36 @@ |
4675 | AC_REQUIRE([AC_PROG_MAKE_SET])dnl |
4676 | AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
4677 | _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], |
4678 | - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], |
4679 | - [_AM_PROG_TAR([v7])])]) |
4680 | + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], |
4681 | + [_AM_PROG_TAR([v7])])]) |
4682 | _AM_IF_OPTION([no-dependencies],, |
4683 | [AC_PROVIDE_IFELSE([AC_PROG_CC], |
4684 | - [_AM_DEPENDENCIES(CC)], |
4685 | - [define([AC_PROG_CC], |
4686 | - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl |
4687 | + [_AM_DEPENDENCIES(CC)], |
4688 | + [define([AC_PROG_CC], |
4689 | + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl |
4690 | AC_PROVIDE_IFELSE([AC_PROG_CXX], |
4691 | - [_AM_DEPENDENCIES(CXX)], |
4692 | - [define([AC_PROG_CXX], |
4693 | - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl |
4694 | + [_AM_DEPENDENCIES(CXX)], |
4695 | + [define([AC_PROG_CXX], |
4696 | + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl |
4697 | AC_PROVIDE_IFELSE([AC_PROG_OBJC], |
4698 | - [_AM_DEPENDENCIES(OBJC)], |
4699 | - [define([AC_PROG_OBJC], |
4700 | - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl |
4701 | -]) |
4702 | -]) |
4703 | + [_AM_DEPENDENCIES(OBJC)], |
4704 | + [define([AC_PROG_OBJC], |
4705 | + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl |
4706 | +]) |
4707 | +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl |
4708 | +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the |
4709 | +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro |
4710 | +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. |
4711 | +AC_CONFIG_COMMANDS_PRE(dnl |
4712 | +[m4_provide_if([_AM_COMPILER_EXEEXT], |
4713 | + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
4714 | +]) |
4715 | + |
4716 | +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
4717 | +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
4718 | +dnl mangled by Autoconf and run in a shell conditional statement. |
4719 | +m4_define([_AC_COMPILER_EXEEXT], |
4720 | +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) |
4721 | |
4722 | |
4723 | # When config.status generates a header, we must update the stamp-h file. |
4724 | @@ -8792,7 +9633,7 @@ |
4725 | done |
4726 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
4727 | |
4728 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
4729 | +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. |
4730 | # |
4731 | # This file is free software; the Free Software Foundation |
4732 | # gives unlimited permission to copy and/or distribute it, |
4733 | @@ -8803,7 +9644,14 @@ |
4734 | # Define $install_sh. |
4735 | AC_DEFUN([AM_PROG_INSTALL_SH], |
4736 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
4737 | -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} |
4738 | +if test x"${install_sh}" != xset; then |
4739 | + case $am_aux_dir in |
4740 | + *\ * | *\ *) |
4741 | + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; |
4742 | + *) |
4743 | + install_sh="\${SHELL} $am_aux_dir/install-sh" |
4744 | + esac |
4745 | +fi |
4746 | AC_SUBST(install_sh)]) |
4747 | |
4748 | # Copyright (C) 2003, 2005 Free Software Foundation, Inc. |
4749 | @@ -8829,13 +9677,13 @@ |
4750 | |
4751 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
4752 | |
4753 | -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. |
4754 | +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. |
4755 | # |
4756 | # This file is free software; the Free Software Foundation |
4757 | # gives unlimited permission to copy and/or distribute it, |
4758 | # with or without modifications, as long as this notice is preserved. |
4759 | |
4760 | -# serial 3 |
4761 | +# serial 4 |
4762 | |
4763 | # AM_MAKE_INCLUDE() |
4764 | # ----------------- |
4765 | @@ -8844,7 +9692,7 @@ |
4766 | [am_make=${MAKE-make} |
4767 | cat > confinc << 'END' |
4768 | am__doit: |
4769 | - @echo done |
4770 | + @echo this is the am__doit target |
4771 | .PHONY: am__doit |
4772 | END |
4773 | # If we don't find an include directive, just comment out the code. |
4774 | @@ -8854,24 +9702,24 @@ |
4775 | _am_result=none |
4776 | # First try GNU make style include. |
4777 | echo "include confinc" > confmf |
4778 | -# We grep out `Entering directory' and `Leaving directory' |
4779 | -# messages which can occur if `w' ends up in MAKEFLAGS. |
4780 | -# In particular we don't look at `^make:' because GNU make might |
4781 | -# be invoked under some other name (usually "gmake"), in which |
4782 | -# case it prints its new name instead of `make'. |
4783 | -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then |
4784 | - am__include=include |
4785 | - am__quote= |
4786 | - _am_result=GNU |
4787 | -fi |
4788 | +# Ignore all kinds of additional output from `make'. |
4789 | +case `$am_make -s -f confmf 2> /dev/null` in #( |
4790 | +*the\ am__doit\ target*) |
4791 | + am__include=include |
4792 | + am__quote= |
4793 | + _am_result=GNU |
4794 | + ;; |
4795 | +esac |
4796 | # Now try BSD make style include. |
4797 | if test "$am__include" = "#"; then |
4798 | echo '.include "confinc"' > confmf |
4799 | - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then |
4800 | - am__include=.include |
4801 | - am__quote="\"" |
4802 | - _am_result=BSD |
4803 | - fi |
4804 | + case `$am_make -s -f confmf 2> /dev/null` in #( |
4805 | + *the\ am__doit\ target*) |
4806 | + am__include=.include |
4807 | + am__quote="\"" |
4808 | + _am_result=BSD |
4809 | + ;; |
4810 | + esac |
4811 | fi |
4812 | AC_SUBST([am__include]) |
4813 | AC_SUBST([am__quote]) |
4814 | @@ -8881,14 +9729,14 @@ |
4815 | |
4816 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
4817 | |
4818 | -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 |
4819 | +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 |
4820 | # Free Software Foundation, Inc. |
4821 | # |
4822 | # This file is free software; the Free Software Foundation |
4823 | # gives unlimited permission to copy and/or distribute it, |
4824 | # with or without modifications, as long as this notice is preserved. |
4825 | |
4826 | -# serial 5 |
4827 | +# serial 6 |
4828 | |
4829 | # AM_MISSING_PROG(NAME, PROGRAM) |
4830 | # ------------------------------ |
4831 | @@ -8905,7 +9753,14 @@ |
4832 | AC_DEFUN([AM_MISSING_HAS_RUN], |
4833 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
4834 | AC_REQUIRE_AUX_FILE([missing])dnl |
4835 | -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" |
4836 | +if test x"${MISSING+set}" != xset; then |
4837 | + case $am_aux_dir in |
4838 | + *\ * | *\ *) |
4839 | + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; |
4840 | + *) |
4841 | + MISSING="\${SHELL} $am_aux_dir/missing" ;; |
4842 | + esac |
4843 | +fi |
4844 | # Use eval to expand $SHELL |
4845 | if eval "$MISSING --run true"; then |
4846 | am_missing_run="$MISSING --run " |
4847 | @@ -8943,13 +9798,13 @@ |
4848 | |
4849 | # Helper functions for option handling. -*- Autoconf -*- |
4850 | |
4851 | -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. |
4852 | +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. |
4853 | # |
4854 | # This file is free software; the Free Software Foundation |
4855 | # gives unlimited permission to copy and/or distribute it, |
4856 | # with or without modifications, as long as this notice is preserved. |
4857 | |
4858 | -# serial 3 |
4859 | +# serial 4 |
4860 | |
4861 | # _AM_MANGLE_OPTION(NAME) |
4862 | # ----------------------- |
4863 | @@ -8966,7 +9821,7 @@ |
4864 | # ---------------------------------- |
4865 | # OPTIONS is a space-separated list of Automake options. |
4866 | AC_DEFUN([_AM_SET_OPTIONS], |
4867 | -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
4868 | +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
4869 | |
4870 | # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) |
4871 | # ------------------------------------------- |
4872 | @@ -8976,14 +9831,14 @@ |
4873 | |
4874 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
4875 | |
4876 | -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 |
4877 | +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 |
4878 | # Free Software Foundation, Inc. |
4879 | # |
4880 | # This file is free software; the Free Software Foundation |
4881 | # gives unlimited permission to copy and/or distribute it, |
4882 | # with or without modifications, as long as this notice is preserved. |
4883 | |
4884 | -# serial 4 |
4885 | +# serial 5 |
4886 | |
4887 | # AM_SANITY_CHECK |
4888 | # --------------- |
4889 | @@ -8992,16 +9847,29 @@ |
4890 | # Just in case |
4891 | sleep 1 |
4892 | echo timestamp > conftest.file |
4893 | +# Reject unsafe characters in $srcdir or the absolute working directory |
4894 | +# name. Accept space and tab only in the latter. |
4895 | +am_lf=' |
4896 | +' |
4897 | +case `pwd` in |
4898 | + *[[\\\"\#\$\&\'\`$am_lf]]*) |
4899 | + AC_MSG_ERROR([unsafe absolute working directory name]);; |
4900 | +esac |
4901 | +case $srcdir in |
4902 | + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) |
4903 | + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; |
4904 | +esac |
4905 | + |
4906 | # Do `set' in a subshell so we don't clobber the current shell's |
4907 | # arguments. Must try -L first in case configure is actually a |
4908 | # symlink; some systems play weird games with the mod time of symlinks |
4909 | # (eg FreeBSD returns the mod time of the symlink's containing |
4910 | # directory). |
4911 | if ( |
4912 | - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` |
4913 | + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
4914 | if test "$[*]" = "X"; then |
4915 | # -L didn't work. |
4916 | - set X `ls -t $srcdir/configure conftest.file` |
4917 | + set X `ls -t "$srcdir/configure" conftest.file` |
4918 | fi |
4919 | rm -f conftest.file |
4920 | if test "$[*]" != "X $srcdir/configure conftest.file" \ |
4921 | @@ -9026,6 +9894,33 @@ |
4922 | fi |
4923 | AC_MSG_RESULT(yes)]) |
4924 | |
4925 | +# Copyright (C) 2009 Free Software Foundation, Inc. |
4926 | +# |
4927 | +# This file is free software; the Free Software Foundation |
4928 | +# gives unlimited permission to copy and/or distribute it, |
4929 | +# with or without modifications, as long as this notice is preserved. |
4930 | + |
4931 | +# serial 1 |
4932 | + |
4933 | +# AM_SILENT_RULES([DEFAULT]) |
4934 | +# -------------------------- |
4935 | +# Enable less verbose build rules; with the default set to DEFAULT |
4936 | +# (`yes' being less verbose, `no' or empty being verbose). |
4937 | +AC_DEFUN([AM_SILENT_RULES], |
4938 | +[AC_ARG_ENABLE([silent-rules], |
4939 | +[ --enable-silent-rules less verbose build output (undo: `make V=1') |
4940 | + --disable-silent-rules verbose build output (undo: `make V=0')]) |
4941 | +case $enable_silent_rules in |
4942 | +yes) AM_DEFAULT_VERBOSITY=0;; |
4943 | +no) AM_DEFAULT_VERBOSITY=1;; |
4944 | +*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; |
4945 | +esac |
4946 | +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl |
4947 | +AM_BACKSLASH='\' |
4948 | +AC_SUBST([AM_BACKSLASH])dnl |
4949 | +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
4950 | +]) |
4951 | + |
4952 | # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
4953 | # |
4954 | # This file is free software; the Free Software Foundation |
4955 | @@ -9054,18 +9949,25 @@ |
4956 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
4957 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
4958 | |
4959 | -# Copyright (C) 2006 Free Software Foundation, Inc. |
4960 | +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. |
4961 | # |
4962 | # This file is free software; the Free Software Foundation |
4963 | # gives unlimited permission to copy and/or distribute it, |
4964 | # with or without modifications, as long as this notice is preserved. |
4965 | |
4966 | +# serial 2 |
4967 | + |
4968 | # _AM_SUBST_NOTMAKE(VARIABLE) |
4969 | # --------------------------- |
4970 | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
4971 | # This macro is traced by Automake. |
4972 | AC_DEFUN([_AM_SUBST_NOTMAKE]) |
4973 | |
4974 | +# AM_SUBST_NOTMAKE(VARIABLE) |
4975 | +# --------------------------- |
4976 | +# Public sister of _AM_SUBST_NOTMAKE. |
4977 | +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
4978 | + |
4979 | # Check how to create a tarball. -*- Autoconf -*- |
4980 | |
4981 | # Copyright (C) 2004, 2005 Free Software Foundation, Inc. |
4982 | |
4983 | === modified file 'autogen.sh' |
4984 | --- autogen.sh 2009-07-25 18:03:46 +0000 |
4985 | +++ autogen.sh 2011-09-20 17:01:28 +0000 |
4986 | @@ -11,5 +11,7 @@ |
4987 | autoconf || exit; |
4988 | automake || exit; |
4989 | |
4990 | +intltoolize --copy --force --automake || exit; |
4991 | + |
4992 | echo; |
4993 | echo "Done." |
4994 | |
4995 | === modified file 'config.guess' |
4996 | --- config.guess 2009-07-25 18:03:46 +0000 |
4997 | +++ config.guess 2011-09-20 17:01:28 +0000 |
4998 | @@ -4,7 +4,7 @@ |
4999 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
5000 | # Free Software Foundation, Inc. |
The diff has been truncated for viewing.
approved in bug 845552, please upload