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 @@ | |||
26 | 1 | Authors | 1 | Gfire is the combined and copyrighted work of the the following authors: |
27 | 2 | ======= | 2 | |
28 | 3 | Wolf Beat <asraniel@fryx.ch> | 3 | Programming |
29 | 4 | Keith Geffert <keith@penguingurus.com> | 4 | ----------- |
30 | 5 | Laurent De Marez <laurentdemarez@gmail.com> | 5 | Beat Wolf <asraniel@fryx.ch> (2005-2006) |
31 | 6 | Warren Dumortier <nwarrenfl@gmail.com> | 6 | Keith Geffert <keith@penguingurus.com> (2006) |
32 | 7 | Oliver Ney <oliver@dryder.de> | 7 | Laurent De Marez <laurentdemarez@gmail.com> (2008-2009) |
33 | 8 | 8 | Warren Dumortier <nwarrenfl@gmail.com> (2009-2010) | |
34 | 9 | Special Thanks | 9 | Oliver Ney <oliver@dryder.de> (2009-2011) |
35 | 10 | ============== | 10 | |
36 | 11 | The folks in #pidgin (previously #gaim), especially rlaager, Paco-Paco and grim (thx grim for the build system :-)) | 11 | Artwork |
37 | 12 | 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. | 12 | ------- |
38 | 13 | A big thx to Brian "TLM" Davenport, he helped me with the win32 release and some bugs :-) | 13 | Jakub Szypulka - Xfire protocol icons (http://cubestuff.wordpress.com/2008/06/26/xfire-goes-tango-2/) |
39 | 14 | Huge thanks to Keith Geffert which sent me patches for features i would never been able to do myself, thanks! | 14 | León Asad Castillejos - Recolouring of the small protocol icons |
40 | 15 | 15 | ||
41 | 16 | Special thank to all the guys who helped testing the beta of 0.8.0! | 16 | |
42 | 17 | Also want to thank Flames who made a nice converter for the games id list. | 17 | Special thanks |
43 | 18 | Lots of kuddos to the GOD?GOD who made the patch for the buddies who don't appear online. | 18 | -------------- |
44 | 19 | And of course want to thank nwarrenfl who made the beautifull game manager and made auto game detection possible. | 19 | The folks in #pidgin (previously #gaim), especially rlaager, Paco-Paco and grim |
45 | 20 | Thanks to Gamma and GODJonez who helped me with the packet system. | 20 | for their help with libpurple |
46 | 21 | 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. | 21 | |
47 | 22 | keamos | ||
48 | 23 | for his numerous xfire packet dumps | ||
49 | 24 | |||
50 | 25 | |||
51 | 26 | Brian "TLM" Davenport | ||
52 | 27 | for his help with the initial win32 releases and some bugs :-) | ||
53 | 28 | |||
54 | 29 | |||
55 | 30 | to all the guys who helped testing the beta of 0.8.0! | ||
56 | 31 | |||
57 | 32 | COD?GOD | ||
58 | 33 | for his the patch for the buddies who don't appear online. (0.8.X series) | ||
59 | 34 | |||
60 | 35 | |||
61 | 36 | Gamma and GODJonez | ||
62 | 37 | for their helpw ith the packet system. | ||
63 | 38 | |||
64 | 39 | Chewit | ||
65 | 40 | who is also in the teams and keeps the project running :) | ||
66 | 41 | |||
67 | 42 | |||
68 | 43 | Not listed? | ||
69 | 44 | ----------- | ||
70 | 45 | If you think that we have missed you in this file, tell us! | ||
71 | 22 | 46 | ||
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 @@ | |||
80 | 1 | Gfire: Xfire for Pidgin | 1 | # Changelog for Gfire |
81 | 2 | Copyright 2006-2009 Wolf Beat, Keith Geffert, Laurent De Marez, Warren Dumortier, Oliver Ney | 2 | # Copyright 2006-2011 Wolf Beat, Keith Geffert, Laurent De Marez, Warren Dumortier, Oliver Ney |
82 | 3 | Distributed under the GPLv3 | 3 | # Distributed under the GPLv3 |
83 | 4 | # $Id: CHANGELOG, v0.9.4 | ||
84 | 5 | |||
85 | 6 | Gfire: | ||
86 | 7 | |||
87 | 8 | 0.9.4 | ||
88 | 9 | - Fixed rather critical crash on startup if game detection was disabled | ||
89 | 10 | - Rewrote file transfer code partially | ||
90 | 11 | - Added ability to create P2P connection with local network nodes | ||
91 | 12 | - Changed P2P handshaking | ||
92 | 13 | - NAT Type can now be looked up in the about window | ||
93 | 14 | - Added --disable-game-detection flag to configure for embedded systems or servers. | ||
94 | 15 | |||
95 | 16 | 0.9.3 | ||
96 | 17 | - Fixed further, if not almost all, P2P issues | ||
97 | 18 | - Fixed infinite loop on web detection usage | ||
98 | 19 | - Fixed possible crashes on web detection code | ||
99 | 20 | - Fixed bug in preferences code | ||
100 | 21 | - Added support for keep-alive connections on the web detection (less CPU usage) | ||
101 | 22 | - Added missing lower case conversion of usernames for login | ||
102 | 23 | - Added server browser with drivers for ASE, GameSpy, GameSpy2, Source and Savage query protocols | ||
103 | 24 | |||
104 | 25 | 0.9.2 | ||
105 | 26 | - Fixed file transfer completion issues | ||
106 | 27 | - Fixed bad loading of the game list when started without a working internet connection | ||
107 | 28 | - Fixed timeout issues | ||
108 | 29 | |||
109 | 30 | 0.9.1 | ||
110 | 31 | - Fixed file transfer on Windows | ||
111 | 32 | - Fixed game detection issues on Linux and Windows | ||
112 | 33 | - Fixed MIME-type bug in the game manager on Windows | ||
113 | 34 | - Added display of a buddys status message while he's playing | ||
114 | 35 | - Added support for game icons | ||
115 | 36 | |||
116 | 37 | 0.9.0 | ||
117 | 38 | - Added File Transfer | ||
118 | 39 | - Added Server Browser | ||
119 | 40 | - Added Server Detection | ||
120 | 41 | - Added Avatar Support | ||
121 | 42 | - Added Clan/Guild Support | ||
122 | 43 | - Added Friends of Friends | ||
123 | 44 | - Added Improvements to Game Manager | ||
124 | 45 | - Added Windows Game Detection | ||
125 | 46 | - Added Internationlization Support | ||
126 | 47 | - Added Advanced Status Handling | ||
127 | 48 | - Added Web Game Detection | ||
128 | 49 | - Added New Icons | ||
129 | 50 | - Added Notifications by libnotify | ||
130 | 51 | - Added Custom group management | ||
131 | 52 | - Added Largely improved chat room support | ||
132 | 53 | - Added VoIP software detection (requires working server detection) | ||
133 | 54 | - Complete Code Rewrite | ||
134 | 55 | - Better organisation of code | ||
135 | 56 | - 'Get Info' Fully Working! | ||
136 | 57 | - Completed network data handling issues | ||
137 | 58 | - Fixed a bug preventing a user logging in, with their username containing uppercase characters | ||
138 | 59 | - Status did not change if you logged off and logged back in | ||
139 | 60 | - Reversed IP address in contact listings | ||
140 | 61 | - In some Linux distros, the buddy list was not being displayed | ||
141 | 62 | - Messages received came with html tags | ||
142 | 63 | - Fixed HTML tags in status messages, if they contained an URL | ||
143 | 64 | - Fixed a crash when a "Playing" status was received | ||
144 | 65 | - Fixed a crash when sending an offline message | ||
145 | 66 | - Fixed several bugs with the games list and game manager | ||
146 | 67 | - Updated Web Links | ||
147 | 68 | - Now useable with Finch again | ||
148 | 4 | 69 | ||
149 | 5 | 0.8.3 | 70 | 0.8.3 |
152 | 6 | * Corrected networking code (fixes problems with Xfire 1.13) | 71 | - Fixed some bug in the network code which denied all logins |
153 | 7 | * Added Xfires statistics packet | 72 | - Added the Xfire statistics packet |
154 | 8 | 73 | ||
155 | 9 | 0.8.2 | 74 | 0.8.2 |
157 | 10 | * Update for server (website) change. | 75 | - Update the Gfire URLs due to a server change |
158 | 11 | 76 | ||
159 | 12 | 0.8.1 | 77 | 0.8.1 |
164 | 13 | * Fix crash on login with some Linux distros. | 78 | - Fix crash on login with some Linux distros. |
165 | 14 | * Small bugfixes/changes. | 79 | - Small bugfixes/changes. |
166 | 15 | * Improve file paths. | 80 | - Improve file paths. |
167 | 16 | * Only 200 characters are allowed in a topic for groupchat. | 81 | - Only 200 characters are allowed in a topic for groupchat. |
168 | 17 | 82 | ||
169 | 18 | 0.8.0 | 83 | 0.8.0 |
170 | 19 | - Buddy authorization improved. | 84 | - Buddy authorization improved. |
171 | @@ -44,6 +109,7 @@ | |||
172 | 44 | - View the permissions icon next to the buddy. | 109 | - View the permissions icon next to the buddy. |
173 | 45 | - Make new groupchat channels. | 110 | - Make new groupchat channels. |
174 | 46 | 111 | ||
175 | 112 | |||
176 | 47 | 0.7.1 | 113 | 0.7.1 |
177 | 48 | - Minor bug fix | 114 | - Minor bug fix |
178 | 49 | - Download Game ID List function | 115 | - Download Game ID List function |
179 | @@ -55,7 +121,7 @@ | |||
180 | 55 | - Ported the gfire code from Gaim to Purple | 121 | - Ported the gfire code from Gaim to Purple |
181 | 56 | - Added new protocol icons | 122 | - Added new protocol icons |
182 | 57 | - 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.) | 123 | - 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.) |
184 | 58 | - Fixed the “(AFK) Away From Keyboard bug (typo) | 124 | - Fixed the “(AFK) Away From Keyboard†bug (typo) |
185 | 59 | - Fixed server port bug | 125 | - Fixed server port bug |
186 | 60 | 126 | ||
187 | 61 | 127 | ||
188 | 62 | 128 | ||
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 @@ | |||
202 | 1 | EXTRA_DIST = COPYING \ | 1 | EXTRA_DIST = config.rpath config.rpath COPYING \ |
203 | 2 | ChangeLog \ | 2 | ChangeLog \ |
204 | 3 | INSTALL \ | 3 | INSTALL \ |
205 | 4 | NEWS \ | 4 | NEWS \ |
206 | 5 | README \ | 5 | README \ |
207 | 6 | VERSION \ | 6 | VERSION \ |
208 | 7 | gfire.spec \ | 7 | gfire.spec |
201 | 8 | gfire_config.h | ||
209 | 9 | 8 | ||
210 | 10 | SUBDIRS = data pixmaps src | 9 | SUBDIRS = data pixmaps src |
211 | 11 | 10 | ||
218 | 12 | AM_CFLAGS = -DDATADIR=\"$(datadir)\" | 11 | if INSTALL_NLS |
219 | 13 | BUILT_SOURCES = gfire_config.h | 12 | SUBDIRS += po |
220 | 14 | $(OBJECTS): $(BUILT_SOURCES) | 13 | endif |
221 | 15 | 14 | ||
222 | 16 | gfire_config.h: pre_config.h | 15 | AM_CFLAGS = -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" |
223 | 17 | $(sedpath) 's/#define PACKAGE/#define SNPP_PACKAGE/g' pre_config.h > $@ | 16 | |
224 | 17 | ACLOCAL_AMFLAGS = -I m4 | ||
225 | 18 | 18 | ||
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 @@ | |||
231 | 1 | # Makefile.in generated by automake 1.10.1 from Makefile.am. | 1 | # Makefile.in generated by automake 1.11.1 from Makefile.am. |
232 | 2 | # @configure_input@ | 2 | # @configure_input@ |
233 | 3 | 3 | ||
234 | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
236 | 5 | # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | 5 | # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
237 | 6 | # Inc. | ||
238 | 6 | # This Makefile.in is free software; the Free Software Foundation | 7 | # This Makefile.in is free software; the Free Software Foundation |
239 | 7 | # gives unlimited permission to copy and/or distribute it, | 8 | # gives unlimited permission to copy and/or distribute it, |
240 | 8 | # with or without modifications, as long as this notice is preserved. | 9 | # with or without modifications, as long as this notice is preserved. |
241 | @@ -15,8 +16,9 @@ | |||
242 | 15 | @SET_MAKE@ | 16 | @SET_MAKE@ |
243 | 16 | VPATH = @srcdir@ | 17 | VPATH = @srcdir@ |
244 | 17 | pkgdatadir = $(datadir)/@PACKAGE@ | 18 | pkgdatadir = $(datadir)/@PACKAGE@ |
245 | 19 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
246 | 18 | pkglibdir = $(libdir)/@PACKAGE@ | 20 | pkglibdir = $(libdir)/@PACKAGE@ |
248 | 19 | pkgincludedir = $(includedir)/@PACKAGE@ | 21 | pkglibexecdir = $(libexecdir)/@PACKAGE@ |
249 | 20 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | 22 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
250 | 21 | install_sh_DATA = $(install_sh) -c -m 644 | 23 | install_sh_DATA = $(install_sh) -c -m 644 |
251 | 22 | install_sh_PROGRAM = $(install_sh) -c | 24 | install_sh_PROGRAM = $(install_sh) -c |
252 | @@ -31,20 +33,28 @@ | |||
253 | 31 | POST_UNINSTALL = : | 33 | POST_UNINSTALL = : |
254 | 32 | build_triplet = @build@ | 34 | build_triplet = @build@ |
255 | 33 | host_triplet = @host@ | 35 | host_triplet = @host@ |
256 | 36 | @INSTALL_NLS_TRUE@am__append_1 = po | ||
257 | 34 | subdir = . | 37 | subdir = . |
258 | 35 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ | 38 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
260 | 36 | $(srcdir)/Makefile.in $(srcdir)/pre_config.h.in \ | 39 | $(srcdir)/Makefile.in $(srcdir)/gfire_config.h.in \ |
261 | 37 | $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ | 40 | $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ |
262 | 38 | config.guess config.sub depcomp install-sh ltmain.sh missing | 41 | config.guess config.sub depcomp install-sh ltmain.sh missing |
263 | 39 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 42 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
265 | 40 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac | 43 | am__aclocal_m4_deps = $(top_srcdir)/VERSION $(top_srcdir)/configure.ac |
266 | 41 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
267 | 42 | $(ACLOCAL_M4) | 45 | $(ACLOCAL_M4) |
268 | 43 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ | 46 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
269 | 44 | configure.lineno config.status.lineno | 47 | configure.lineno config.status.lineno |
270 | 45 | mkinstalldirs = $(install_sh) -d | 48 | mkinstalldirs = $(install_sh) -d |
272 | 46 | CONFIG_HEADER = pre_config.h | 49 | CONFIG_HEADER = gfire_config.h |
273 | 47 | CONFIG_CLEAN_FILES = | 50 | CONFIG_CLEAN_FILES = |
274 | 51 | CONFIG_CLEAN_VPATH_FILES = | ||
275 | 52 | AM_V_GEN = $(am__v_GEN_$(V)) | ||
276 | 53 | am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
277 | 54 | am__v_GEN_0 = @echo " GEN " $@; | ||
278 | 55 | AM_V_at = $(am__v_at_$(V)) | ||
279 | 56 | am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
280 | 57 | am__v_at_0 = @ | ||
281 | 48 | SOURCES = | 58 | SOURCES = |
282 | 49 | DIST_SOURCES = | 59 | DIST_SOURCES = |
283 | 50 | RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ | 60 | RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
284 | @@ -56,33 +66,68 @@ | |||
285 | 56 | ps-recursive uninstall-recursive | 66 | ps-recursive uninstall-recursive |
286 | 57 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | 67 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
287 | 58 | distclean-recursive maintainer-clean-recursive | 68 | distclean-recursive maintainer-clean-recursive |
288 | 69 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | ||
289 | 70 | $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ | ||
290 | 71 | distdir dist dist-all distcheck | ||
291 | 59 | ETAGS = etags | 72 | ETAGS = etags |
292 | 60 | CTAGS = ctags | 73 | CTAGS = ctags |
294 | 61 | DIST_SUBDIRS = $(SUBDIRS) | 74 | DIST_SUBDIRS = data pixmaps src po |
295 | 62 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | 75 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
296 | 63 | distdir = $(PACKAGE)-$(VERSION) | 76 | distdir = $(PACKAGE)-$(VERSION) |
297 | 64 | top_distdir = $(distdir) | 77 | top_distdir = $(distdir) |
298 | 65 | am__remove_distdir = \ | 78 | am__remove_distdir = \ |
302 | 66 | { test ! -d $(distdir) \ | 79 | { test ! -d "$(distdir)" \ |
303 | 67 | || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ | 80 | || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
304 | 68 | && rm -fr $(distdir); }; } | 81 | && rm -fr "$(distdir)"; }; } |
305 | 82 | am__relativize = \ | ||
306 | 83 | dir0=`pwd`; \ | ||
307 | 84 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ | ||
308 | 85 | sed_rest='s,^[^/]*/*,,'; \ | ||
309 | 86 | sed_last='s,^.*/\([^/]*\)$$,\1,'; \ | ||
310 | 87 | sed_butlast='s,/*[^/]*$$,,'; \ | ||
311 | 88 | while test -n "$$dir1"; do \ | ||
312 | 89 | first=`echo "$$dir1" | sed -e "$$sed_first"`; \ | ||
313 | 90 | if test "$$first" != "."; then \ | ||
314 | 91 | if test "$$first" = ".."; then \ | ||
315 | 92 | dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ | ||
316 | 93 | dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ | ||
317 | 94 | else \ | ||
318 | 95 | first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ | ||
319 | 96 | if test "$$first2" = "$$first"; then \ | ||
320 | 97 | dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ | ||
321 | 98 | else \ | ||
322 | 99 | dir2="../$$dir2"; \ | ||
323 | 100 | fi; \ | ||
324 | 101 | dir0="$$dir0"/"$$first"; \ | ||
325 | 102 | fi; \ | ||
326 | 103 | fi; \ | ||
327 | 104 | dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ | ||
328 | 105 | done; \ | ||
329 | 106 | reldir="$$dir2" | ||
330 | 69 | DIST_ARCHIVES = $(distdir).tar.gz | 107 | DIST_ARCHIVES = $(distdir).tar.gz |
331 | 70 | GZIP_ENV = --best | 108 | GZIP_ENV = --best |
332 | 71 | distuninstallcheck_listfiles = find . -type f -print | 109 | distuninstallcheck_listfiles = find . -type f -print |
333 | 72 | distcleancheck_listfiles = find . -type f -print | 110 | distcleancheck_listfiles = find . -type f -print |
334 | 73 | ACLOCAL = @ACLOCAL@ | 111 | ACLOCAL = @ACLOCAL@ |
335 | 112 | ALL_LINGUAS = @ALL_LINGUAS@ | ||
336 | 74 | AMTAR = @AMTAR@ | 113 | AMTAR = @AMTAR@ |
337 | 114 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ | ||
338 | 75 | AR = @AR@ | 115 | AR = @AR@ |
339 | 76 | AUTOCONF = @AUTOCONF@ | 116 | AUTOCONF = @AUTOCONF@ |
340 | 77 | AUTOHEADER = @AUTOHEADER@ | 117 | AUTOHEADER = @AUTOHEADER@ |
341 | 78 | AUTOMAKE = @AUTOMAKE@ | 118 | AUTOMAKE = @AUTOMAKE@ |
342 | 79 | AWK = @AWK@ | 119 | AWK = @AWK@ |
343 | 120 | CATALOGS = @CATALOGS@ | ||
344 | 121 | CATOBJEXT = @CATOBJEXT@ | ||
345 | 80 | CC = @CC@ | 122 | CC = @CC@ |
346 | 81 | CCDEPMODE = @CCDEPMODE@ | 123 | CCDEPMODE = @CCDEPMODE@ |
347 | 82 | CFLAGS = @CFLAGS@ | 124 | CFLAGS = @CFLAGS@ |
348 | 83 | CPP = @CPP@ | 125 | CPP = @CPP@ |
349 | 84 | CPPFLAGS = @CPPFLAGS@ | 126 | CPPFLAGS = @CPPFLAGS@ |
350 | 85 | CYGPATH_W = @CYGPATH_W@ | 127 | CYGPATH_W = @CYGPATH_W@ |
351 | 128 | DATADIRNAME = @DATADIRNAME@ | ||
352 | 129 | DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ | ||
353 | 130 | DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ | ||
354 | 86 | DEBUG_CFLAGS = @DEBUG_CFLAGS@ | 131 | DEBUG_CFLAGS = @DEBUG_CFLAGS@ |
355 | 87 | DEFS = @DEFS@ | 132 | DEFS = @DEFS@ |
356 | 88 | DEPDIR = @DEPDIR@ | 133 | DEPDIR = @DEPDIR@ |
357 | @@ -94,19 +139,32 @@ | |||
358 | 94 | EGREP = @EGREP@ | 139 | EGREP = @EGREP@ |
359 | 95 | EXEEXT = @EXEEXT@ | 140 | EXEEXT = @EXEEXT@ |
360 | 96 | FGREP = @FGREP@ | 141 | FGREP = @FGREP@ |
361 | 142 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | ||
362 | 97 | GLIB_CFLAGS = @GLIB_CFLAGS@ | 143 | GLIB_CFLAGS = @GLIB_CFLAGS@ |
363 | 98 | GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ | 144 | GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ |
364 | 99 | GLIB_LIBS = @GLIB_LIBS@ | 145 | GLIB_LIBS = @GLIB_LIBS@ |
365 | 100 | GLIB_MKENUMS = @GLIB_MKENUMS@ | 146 | GLIB_MKENUMS = @GLIB_MKENUMS@ |
366 | 147 | GMOFILES = @GMOFILES@ | ||
367 | 148 | GMSGFMT = @GMSGFMT@ | ||
368 | 101 | GOBJECT_QUERY = @GOBJECT_QUERY@ | 149 | GOBJECT_QUERY = @GOBJECT_QUERY@ |
369 | 102 | GREP = @GREP@ | 150 | GREP = @GREP@ |
370 | 151 | GTK_CFLAGS = @GTK_CFLAGS@ | ||
371 | 152 | GTK_LIBS = @GTK_LIBS@ | ||
372 | 103 | INSTALL = @INSTALL@ | 153 | INSTALL = @INSTALL@ |
373 | 104 | INSTALL_DATA = @INSTALL_DATA@ | 154 | INSTALL_DATA = @INSTALL_DATA@ |
374 | 105 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ | 155 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
375 | 106 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ | 156 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
376 | 107 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ | 157 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
377 | 158 | INSTOBJEXT = @INSTOBJEXT@ | ||
378 | 159 | INTLLIBS = @INTLLIBS@ | ||
379 | 160 | INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ | ||
380 | 161 | INTLTOOL_MERGE = @INTLTOOL_MERGE@ | ||
381 | 162 | INTLTOOL_PERL = @INTLTOOL_PERL@ | ||
382 | 163 | INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ | ||
383 | 108 | LD = @LD@ | 164 | LD = @LD@ |
384 | 109 | LDFLAGS = @LDFLAGS@ | 165 | LDFLAGS = @LDFLAGS@ |
385 | 166 | LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ | ||
386 | 167 | LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ | ||
387 | 110 | LIBOBJS = @LIBOBJS@ | 168 | LIBOBJS = @LIBOBJS@ |
388 | 111 | LIBS = @LIBS@ | 169 | LIBS = @LIBS@ |
389 | 112 | LIBTOOL = @LIBTOOL@ | 170 | LIBTOOL = @LIBTOOL@ |
390 | @@ -115,8 +173,13 @@ | |||
391 | 115 | LTLIBOBJS = @LTLIBOBJS@ | 173 | LTLIBOBJS = @LTLIBOBJS@ |
392 | 116 | MAKEINFO = @MAKEINFO@ | 174 | MAKEINFO = @MAKEINFO@ |
393 | 117 | MKDIR_P = @MKDIR_P@ | 175 | MKDIR_P = @MKDIR_P@ |
394 | 176 | MKINSTALLDIRS = @MKINSTALLDIRS@ | ||
395 | 177 | MSGFMT = @MSGFMT@ | ||
396 | 178 | MSGFMT_OPTS = @MSGFMT_OPTS@ | ||
397 | 179 | MSGMERGE = @MSGMERGE@ | ||
398 | 118 | NM = @NM@ | 180 | NM = @NM@ |
399 | 119 | NMEDIT = @NMEDIT@ | 181 | NMEDIT = @NMEDIT@ |
400 | 182 | OBJDUMP = @OBJDUMP@ | ||
401 | 120 | OBJEXT = @OBJEXT@ | 183 | OBJEXT = @OBJEXT@ |
402 | 121 | OTOOL = @OTOOL@ | 184 | OTOOL = @OTOOL@ |
403 | 122 | OTOOL64 = @OTOOL64@ | 185 | OTOOL64 = @OTOOL64@ |
404 | @@ -125,17 +188,26 @@ | |||
405 | 125 | PACKAGE_NAME = @PACKAGE_NAME@ | 188 | PACKAGE_NAME = @PACKAGE_NAME@ |
406 | 126 | PACKAGE_STRING = @PACKAGE_STRING@ | 189 | PACKAGE_STRING = @PACKAGE_STRING@ |
407 | 127 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | 190 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
408 | 191 | PACKAGE_URL = @PACKAGE_URL@ | ||
409 | 128 | PACKAGE_VERSION = @PACKAGE_VERSION@ | 192 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
410 | 129 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 193 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
411 | 130 | PIDGIN_CFLAGS = @PIDGIN_CFLAGS@ | ||
412 | 131 | PIDGIN_LIBS = @PIDGIN_LIBS@ | ||
413 | 132 | PKG_CONFIG = @PKG_CONFIG@ | 194 | PKG_CONFIG = @PKG_CONFIG@ |
414 | 195 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
415 | 196 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
416 | 197 | POFILES = @POFILES@ | ||
417 | 198 | POSUB = @POSUB@ | ||
418 | 199 | PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ | ||
419 | 200 | PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ | ||
420 | 201 | PURPLE_CFLAGS = @PURPLE_CFLAGS@ | ||
421 | 202 | PURPLE_LIBS = @PURPLE_LIBS@ | ||
422 | 133 | RANLIB = @RANLIB@ | 203 | RANLIB = @RANLIB@ |
423 | 134 | SED = @SED@ | 204 | SED = @SED@ |
424 | 135 | SET_MAKE = @SET_MAKE@ | 205 | SET_MAKE = @SET_MAKE@ |
425 | 136 | SHELL = @SHELL@ | 206 | SHELL = @SHELL@ |
426 | 137 | STRIP = @STRIP@ | 207 | STRIP = @STRIP@ |
427 | 208 | USE_NLS = @USE_NLS@ | ||
428 | 138 | VERSION = @VERSION@ | 209 | VERSION = @VERSION@ |
429 | 210 | XGETTEXT = @XGETTEXT@ | ||
430 | 139 | abs_builddir = @abs_builddir@ | 211 | abs_builddir = @abs_builddir@ |
431 | 140 | abs_srcdir = @abs_srcdir@ | 212 | abs_srcdir = @abs_srcdir@ |
432 | 141 | abs_top_builddir = @abs_top_builddir@ | 213 | abs_top_builddir = @abs_top_builddir@ |
433 | @@ -172,7 +244,6 @@ | |||
434 | 172 | libexecdir = @libexecdir@ | 244 | libexecdir = @libexecdir@ |
435 | 173 | localedir = @localedir@ | 245 | localedir = @localedir@ |
436 | 174 | localstatedir = @localstatedir@ | 246 | localstatedir = @localstatedir@ |
437 | 175 | lt_ECHO = @lt_ECHO@ | ||
438 | 176 | mandir = @mandir@ | 247 | mandir = @mandir@ |
439 | 177 | mkdir_p = @mkdir_p@ | 248 | mkdir_p = @mkdir_p@ |
440 | 178 | oldincludedir = @oldincludedir@ | 249 | oldincludedir = @oldincludedir@ |
441 | @@ -186,21 +257,21 @@ | |||
442 | 186 | srcdir = @srcdir@ | 257 | srcdir = @srcdir@ |
443 | 187 | sysconfdir = @sysconfdir@ | 258 | sysconfdir = @sysconfdir@ |
444 | 188 | target_alias = @target_alias@ | 259 | target_alias = @target_alias@ |
445 | 260 | top_build_prefix = @top_build_prefix@ | ||
446 | 189 | top_builddir = @top_builddir@ | 261 | top_builddir = @top_builddir@ |
447 | 190 | top_srcdir = @top_srcdir@ | 262 | top_srcdir = @top_srcdir@ |
456 | 191 | EXTRA_DIST = COPYING \ | 263 | EXTRA_DIST = config.rpath config.rpath COPYING \ |
457 | 192 | ChangeLog \ | 264 | ChangeLog \ |
458 | 193 | INSTALL \ | 265 | INSTALL \ |
459 | 194 | NEWS \ | 266 | NEWS \ |
460 | 195 | README \ | 267 | README \ |
461 | 196 | VERSION \ | 268 | VERSION \ |
462 | 197 | gfire.spec \ | 269 | gfire.spec |
455 | 198 | gfire_config.h | ||
463 | 199 | 270 | ||
468 | 200 | SUBDIRS = data pixmaps src | 271 | SUBDIRS = data pixmaps src $(am__append_1) |
469 | 201 | AM_CFLAGS = -DDATADIR=\"$(datadir)\" | 272 | AM_CFLAGS = -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" |
470 | 202 | BUILT_SOURCES = gfire_config.h | 273 | ACLOCAL_AMFLAGS = -I m4 |
471 | 203 | all: $(BUILT_SOURCES) pre_config.h | 274 | all: gfire_config.h |
472 | 204 | $(MAKE) $(AM_MAKEFLAGS) all-recursive | 275 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
473 | 205 | 276 | ||
474 | 206 | .SUFFIXES: | 277 | .SUFFIXES: |
475 | @@ -210,15 +281,15 @@ | |||
476 | 210 | @for dep in $?; do \ | 281 | @for dep in $?; do \ |
477 | 211 | case '$(am__configure_deps)' in \ | 282 | case '$(am__configure_deps)' in \ |
478 | 212 | *$$dep*) \ | 283 | *$$dep*) \ |
481 | 213 | echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ | 284 | echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ |
482 | 214 | cd $(srcdir) && $(AUTOMAKE) --gnu \ | 285 | $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ |
483 | 215 | && exit 0; \ | 286 | && exit 0; \ |
484 | 216 | exit 1;; \ | 287 | exit 1;; \ |
485 | 217 | esac; \ | 288 | esac; \ |
486 | 218 | done; \ | 289 | done; \ |
490 | 219 | echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ | 290 | echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ |
491 | 220 | cd $(top_srcdir) && \ | 291 | $(am__cd) $(top_srcdir) && \ |
492 | 221 | $(AUTOMAKE) --gnu Makefile | 292 | $(AUTOMAKE) --gnu Makefile |
493 | 222 | .PRECIOUS: Makefile | 293 | .PRECIOUS: Makefile |
494 | 223 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | 294 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
495 | 224 | @case '$?' in \ | 295 | @case '$?' in \ |
496 | @@ -234,26 +305,27 @@ | |||
497 | 234 | $(SHELL) ./config.status --recheck | 305 | $(SHELL) ./config.status --recheck |
498 | 235 | 306 | ||
499 | 236 | $(top_srcdir)/configure: $(am__configure_deps) | 307 | $(top_srcdir)/configure: $(am__configure_deps) |
501 | 237 | cd $(srcdir) && $(AUTOCONF) | 308 | $(am__cd) $(srcdir) && $(AUTOCONF) |
502 | 238 | $(ACLOCAL_M4): $(am__aclocal_m4_deps) | 309 | $(ACLOCAL_M4): $(am__aclocal_m4_deps) |
504 | 239 | cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) | 310 | $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
505 | 311 | $(am__aclocal_m4_deps): | ||
506 | 240 | 312 | ||
508 | 241 | pre_config.h: stamp-h1 | 313 | gfire_config.h: stamp-h1 |
509 | 242 | @if test ! -f $@; then \ | 314 | @if test ! -f $@; then \ |
510 | 243 | rm -f stamp-h1; \ | 315 | rm -f stamp-h1; \ |
511 | 244 | $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ | 316 | $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ |
512 | 245 | else :; fi | 317 | else :; fi |
513 | 246 | 318 | ||
515 | 247 | stamp-h1: $(srcdir)/pre_config.h.in $(top_builddir)/config.status | 319 | stamp-h1: $(srcdir)/gfire_config.h.in $(top_builddir)/config.status |
516 | 248 | @rm -f stamp-h1 | 320 | @rm -f stamp-h1 |
520 | 249 | cd $(top_builddir) && $(SHELL) ./config.status pre_config.h | 321 | cd $(top_builddir) && $(SHELL) ./config.status gfire_config.h |
521 | 250 | $(srcdir)/pre_config.h.in: $(am__configure_deps) | 322 | $(srcdir)/gfire_config.h.in: $(am__configure_deps) |
522 | 251 | cd $(top_srcdir) && $(AUTOHEADER) | 323 | ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) |
523 | 252 | rm -f stamp-h1 | 324 | rm -f stamp-h1 |
524 | 253 | touch $@ | 325 | touch $@ |
525 | 254 | 326 | ||
526 | 255 | distclean-hdr: | 327 | distclean-hdr: |
528 | 256 | -rm -f pre_config.h stamp-h1 | 328 | -rm -f gfire_config.h stamp-h1 |
529 | 257 | 329 | ||
530 | 258 | mostlyclean-libtool: | 330 | mostlyclean-libtool: |
531 | 259 | -rm -f *.lo | 331 | -rm -f *.lo |
532 | @@ -262,7 +334,7 @@ | |||
533 | 262 | -rm -rf .libs _libs | 334 | -rm -rf .libs _libs |
534 | 263 | 335 | ||
535 | 264 | distclean-libtool: | 336 | distclean-libtool: |
537 | 265 | -rm -f libtool | 337 | -rm -f libtool config.lt |
538 | 266 | 338 | ||
539 | 267 | # This directory's subdirectories are mostly independent; you can cd | 339 | # This directory's subdirectories are mostly independent; you can cd |
540 | 268 | # into them and run `make' without going through this Makefile. | 340 | # into them and run `make' without going through this Makefile. |
541 | @@ -271,7 +343,7 @@ | |||
542 | 271 | # (which will cause the Makefiles to be regenerated when you run `make'); | 343 | # (which will cause the Makefiles to be regenerated when you run `make'); |
543 | 272 | # (2) otherwise, pass the desired values on the `make' command line. | 344 | # (2) otherwise, pass the desired values on the `make' command line. |
544 | 273 | $(RECURSIVE_TARGETS): | 345 | $(RECURSIVE_TARGETS): |
546 | 274 | @failcom='exit 1'; \ | 346 | @fail= failcom='exit 1'; \ |
547 | 275 | for f in x $$MAKEFLAGS; do \ | 347 | for f in x $$MAKEFLAGS; do \ |
548 | 276 | case $$f in \ | 348 | case $$f in \ |
549 | 277 | *=* | --[!k]*);; \ | 349 | *=* | --[!k]*);; \ |
550 | @@ -288,7 +360,7 @@ | |||
551 | 288 | else \ | 360 | else \ |
552 | 289 | local_target="$$target"; \ | 361 | local_target="$$target"; \ |
553 | 290 | fi; \ | 362 | fi; \ |
555 | 291 | (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | 363 | ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
556 | 292 | || eval $$failcom; \ | 364 | || eval $$failcom; \ |
557 | 293 | done; \ | 365 | done; \ |
558 | 294 | if test "$$dot_seen" = "no"; then \ | 366 | if test "$$dot_seen" = "no"; then \ |
559 | @@ -296,7 +368,7 @@ | |||
560 | 296 | fi; test -z "$$fail" | 368 | fi; test -z "$$fail" |
561 | 297 | 369 | ||
562 | 298 | $(RECURSIVE_CLEAN_TARGETS): | 370 | $(RECURSIVE_CLEAN_TARGETS): |
564 | 299 | @failcom='exit 1'; \ | 371 | @fail= failcom='exit 1'; \ |
565 | 300 | for f in x $$MAKEFLAGS; do \ | 372 | for f in x $$MAKEFLAGS; do \ |
566 | 301 | case $$f in \ | 373 | case $$f in \ |
567 | 302 | *=* | --[!k]*);; \ | 374 | *=* | --[!k]*);; \ |
568 | @@ -322,16 +394,16 @@ | |||
569 | 322 | else \ | 394 | else \ |
570 | 323 | local_target="$$target"; \ | 395 | local_target="$$target"; \ |
571 | 324 | fi; \ | 396 | fi; \ |
573 | 325 | (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | 397 | ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
574 | 326 | || eval $$failcom; \ | 398 | || eval $$failcom; \ |
575 | 327 | done && test -z "$$fail" | 399 | done && test -z "$$fail" |
576 | 328 | tags-recursive: | 400 | tags-recursive: |
577 | 329 | list='$(SUBDIRS)'; for subdir in $$list; do \ | 401 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
579 | 330 | test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | 402 | test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
580 | 331 | done | 403 | done |
581 | 332 | ctags-recursive: | 404 | ctags-recursive: |
582 | 333 | list='$(SUBDIRS)'; for subdir in $$list; do \ | 405 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
584 | 334 | test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | 406 | test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
585 | 335 | done | 407 | done |
586 | 336 | 408 | ||
587 | 337 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | 409 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
588 | @@ -339,14 +411,14 @@ | |||
589 | 339 | unique=`for i in $$list; do \ | 411 | unique=`for i in $$list; do \ |
590 | 340 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | 412 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
591 | 341 | done | \ | 413 | done | \ |
593 | 342 | $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ | 414 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
594 | 343 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | 415 | END { if (nonempty) { for (i in files) print i; }; }'`; \ |
595 | 344 | mkid -fID $$unique | 416 | mkid -fID $$unique |
596 | 345 | tags: TAGS | 417 | tags: TAGS |
597 | 346 | 418 | ||
599 | 347 | TAGS: tags-recursive $(HEADERS) $(SOURCES) pre_config.h.in $(TAGS_DEPENDENCIES) \ | 419 | TAGS: tags-recursive $(HEADERS) $(SOURCES) gfire_config.h.in $(TAGS_DEPENDENCIES) \ |
600 | 348 | $(TAGS_FILES) $(LISP) | 420 | $(TAGS_FILES) $(LISP) |
602 | 349 | tags=; \ | 421 | set x; \ |
603 | 350 | here=`pwd`; \ | 422 | here=`pwd`; \ |
604 | 351 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ | 423 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
605 | 352 | include_option=--etags-include; \ | 424 | include_option=--etags-include; \ |
606 | @@ -358,45 +430,50 @@ | |||
607 | 358 | list='$(SUBDIRS)'; for subdir in $$list; do \ | 430 | list='$(SUBDIRS)'; for subdir in $$list; do \ |
608 | 359 | if test "$$subdir" = .; then :; else \ | 431 | if test "$$subdir" = .; then :; else \ |
609 | 360 | test ! -f $$subdir/TAGS || \ | 432 | test ! -f $$subdir/TAGS || \ |
611 | 361 | tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ | 433 | set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
612 | 362 | fi; \ | 434 | fi; \ |
613 | 363 | done; \ | 435 | done; \ |
615 | 364 | list='$(SOURCES) $(HEADERS) pre_config.h.in $(LISP) $(TAGS_FILES)'; \ | 436 | list='$(SOURCES) $(HEADERS) gfire_config.h.in $(LISP) $(TAGS_FILES)'; \ |
616 | 365 | unique=`for i in $$list; do \ | 437 | unique=`for i in $$list; do \ |
617 | 366 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | 438 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
618 | 367 | done | \ | 439 | done | \ |
619 | 368 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | 440 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
620 | 369 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | 441 | END { if (nonempty) { for (i in files) print i; }; }'`; \ |
622 | 370 | if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | 442 | shift; \ |
623 | 443 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | ||
624 | 371 | test -n "$$unique" || unique=$$empty_fix; \ | 444 | test -n "$$unique" || unique=$$empty_fix; \ |
627 | 372 | $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | 445 | if test $$# -gt 0; then \ |
628 | 373 | $$tags $$unique; \ | 446 | $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
629 | 447 | "$$@" $$unique; \ | ||
630 | 448 | else \ | ||
631 | 449 | $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
632 | 450 | $$unique; \ | ||
633 | 451 | fi; \ | ||
634 | 374 | fi | 452 | fi |
635 | 375 | ctags: CTAGS | 453 | ctags: CTAGS |
637 | 376 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) pre_config.h.in $(TAGS_DEPENDENCIES) \ | 454 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) gfire_config.h.in $(TAGS_DEPENDENCIES) \ |
638 | 377 | $(TAGS_FILES) $(LISP) | 455 | $(TAGS_FILES) $(LISP) |
641 | 378 | tags=; \ | 456 | list='$(SOURCES) $(HEADERS) gfire_config.h.in $(LISP) $(TAGS_FILES)'; \ |
640 | 379 | list='$(SOURCES) $(HEADERS) pre_config.h.in $(LISP) $(TAGS_FILES)'; \ | ||
642 | 380 | unique=`for i in $$list; do \ | 457 | unique=`for i in $$list; do \ |
643 | 381 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | 458 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
644 | 382 | done | \ | 459 | done | \ |
645 | 383 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | 460 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
646 | 384 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | 461 | END { if (nonempty) { for (i in files) print i; }; }'`; \ |
648 | 385 | test -z "$(CTAGS_ARGS)$$tags$$unique" \ | 462 | test -z "$(CTAGS_ARGS)$$unique" \ |
649 | 386 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | 463 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
651 | 387 | $$tags $$unique | 464 | $$unique |
652 | 388 | 465 | ||
653 | 389 | GTAGS: | 466 | GTAGS: |
654 | 390 | here=`$(am__cd) $(top_builddir) && pwd` \ | 467 | here=`$(am__cd) $(top_builddir) && pwd` \ |
657 | 391 | && cd $(top_srcdir) \ | 468 | && $(am__cd) $(top_srcdir) \ |
658 | 392 | && gtags -i $(GTAGS_ARGS) $$here | 469 | && gtags -i $(GTAGS_ARGS) "$$here" |
659 | 393 | 470 | ||
660 | 394 | distclean-tags: | 471 | distclean-tags: |
661 | 395 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | 472 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
662 | 396 | 473 | ||
663 | 397 | distdir: $(DISTFILES) | 474 | distdir: $(DISTFILES) |
664 | 398 | $(am__remove_distdir) | 475 | $(am__remove_distdir) |
666 | 399 | test -d $(distdir) || mkdir $(distdir) | 476 | test -d "$(distdir)" || mkdir "$(distdir)" |
667 | 400 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | 477 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
668 | 401 | topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | 478 | topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
669 | 402 | list='$(DISTFILES)'; \ | 479 | list='$(DISTFILES)'; \ |
670 | @@ -412,38 +489,55 @@ | |||
671 | 412 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | 489 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
672 | 413 | if test -d $$d/$$file; then \ | 490 | if test -d $$d/$$file; then \ |
673 | 414 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | 491 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ |
674 | 492 | if test -d "$(distdir)/$$file"; then \ | ||
675 | 493 | find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
676 | 494 | fi; \ | ||
677 | 415 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | 495 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ |
679 | 416 | cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | 496 | cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ |
680 | 497 | find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
681 | 417 | fi; \ | 498 | fi; \ |
683 | 418 | cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | 499 | cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ |
684 | 419 | else \ | 500 | else \ |
687 | 420 | test -f $(distdir)/$$file \ | 501 | test -f "$(distdir)/$$file" \ |
688 | 421 | || cp -p $$d/$$file $(distdir)/$$file \ | 502 | || cp -p $$d/$$file "$(distdir)/$$file" \ |
689 | 422 | || exit 1; \ | 503 | || exit 1; \ |
690 | 423 | fi; \ | 504 | fi; \ |
691 | 424 | done | 505 | done |
693 | 425 | list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | 506 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
694 | 426 | if test "$$subdir" = .; then :; else \ | 507 | if test "$$subdir" = .; then :; else \ |
695 | 427 | test -d "$(distdir)/$$subdir" \ | 508 | test -d "$(distdir)/$$subdir" \ |
696 | 428 | || $(MKDIR_P) "$(distdir)/$$subdir" \ | 509 | || $(MKDIR_P) "$(distdir)/$$subdir" \ |
697 | 429 | || exit 1; \ | 510 | || exit 1; \ |
701 | 430 | distdir=`$(am__cd) $(distdir) && pwd`; \ | 511 | fi; \ |
702 | 431 | top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ | 512 | done |
703 | 432 | (cd $$subdir && \ | 513 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
704 | 514 | if test "$$subdir" = .; then :; else \ | ||
705 | 515 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ | ||
706 | 516 | $(am__relativize); \ | ||
707 | 517 | new_distdir=$$reldir; \ | ||
708 | 518 | dir1=$$subdir; dir2="$(top_distdir)"; \ | ||
709 | 519 | $(am__relativize); \ | ||
710 | 520 | new_top_distdir=$$reldir; \ | ||
711 | 521 | echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ | ||
712 | 522 | echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ | ||
713 | 523 | ($(am__cd) $$subdir && \ | ||
714 | 433 | $(MAKE) $(AM_MAKEFLAGS) \ | 524 | $(MAKE) $(AM_MAKEFLAGS) \ |
717 | 434 | top_distdir="$$top_distdir" \ | 525 | top_distdir="$$new_top_distdir" \ |
718 | 435 | distdir="$$distdir/$$subdir" \ | 526 | distdir="$$new_distdir" \ |
719 | 436 | am__remove_distdir=: \ | 527 | am__remove_distdir=: \ |
720 | 437 | am__skip_length_check=: \ | 528 | am__skip_length_check=: \ |
721 | 529 | am__skip_mode_fix=: \ | ||
722 | 438 | distdir) \ | 530 | distdir) \ |
723 | 439 | || exit 1; \ | 531 | || exit 1; \ |
724 | 440 | fi; \ | 532 | fi; \ |
725 | 441 | done | 533 | done |
727 | 442 | -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ | 534 | -test -n "$(am__skip_mode_fix)" \ |
728 | 535 | || find "$(distdir)" -type d ! -perm -755 \ | ||
729 | 536 | -exec chmod u+rwx,go+rx {} \; -o \ | ||
730 | 443 | ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ | 537 | ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ |
731 | 444 | ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ | 538 | ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ |
732 | 445 | ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ | 539 | ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ |
734 | 446 | || chmod -R a+r $(distdir) | 540 | || chmod -R a+r "$(distdir)" |
735 | 447 | dist-gzip: distdir | 541 | dist-gzip: distdir |
736 | 448 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | 542 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
737 | 449 | $(am__remove_distdir) | 543 | $(am__remove_distdir) |
738 | @@ -456,6 +550,10 @@ | |||
739 | 456 | tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma | 550 | tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
740 | 457 | $(am__remove_distdir) | 551 | $(am__remove_distdir) |
741 | 458 | 552 | ||
742 | 553 | dist-xz: distdir | ||
743 | 554 | tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz | ||
744 | 555 | $(am__remove_distdir) | ||
745 | 556 | |||
746 | 459 | dist-tarZ: distdir | 557 | dist-tarZ: distdir |
747 | 460 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z | 558 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
748 | 461 | $(am__remove_distdir) | 559 | $(am__remove_distdir) |
749 | @@ -479,15 +577,17 @@ | |||
750 | 479 | distcheck: dist | 577 | distcheck: dist |
751 | 480 | case '$(DIST_ARCHIVES)' in \ | 578 | case '$(DIST_ARCHIVES)' in \ |
752 | 481 | *.tar.gz*) \ | 579 | *.tar.gz*) \ |
754 | 482 | GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ | 580 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
755 | 483 | *.tar.bz2*) \ | 581 | *.tar.bz2*) \ |
757 | 484 | bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ | 582 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
758 | 485 | *.tar.lzma*) \ | 583 | *.tar.lzma*) \ |
760 | 486 | unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ | 584 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
761 | 585 | *.tar.xz*) \ | ||
762 | 586 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ | ||
763 | 487 | *.tar.Z*) \ | 587 | *.tar.Z*) \ |
764 | 488 | uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ | 588 | uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ |
765 | 489 | *.shar.gz*) \ | 589 | *.shar.gz*) \ |
767 | 490 | GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ | 590 | GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ |
768 | 491 | *.zip*) \ | 591 | *.zip*) \ |
769 | 492 | unzip $(distdir).zip ;;\ | 592 | unzip $(distdir).zip ;;\ |
770 | 493 | esac | 593 | esac |
771 | @@ -495,9 +595,11 @@ | |||
772 | 495 | mkdir $(distdir)/_build | 595 | mkdir $(distdir)/_build |
773 | 496 | mkdir $(distdir)/_inst | 596 | mkdir $(distdir)/_inst |
774 | 497 | chmod a-w $(distdir) | 597 | chmod a-w $(distdir) |
775 | 598 | test -d $(distdir)/_build || exit 0; \ | ||
776 | 498 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ | 599 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
777 | 499 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ | 600 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
779 | 500 | && cd $(distdir)/_build \ | 601 | && am__cwd=`pwd` \ |
780 | 602 | && $(am__cd) $(distdir)/_build \ | ||
781 | 501 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ | 603 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
782 | 502 | $(DISTCHECK_CONFIGURE_FLAGS) \ | 604 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
783 | 503 | && $(MAKE) $(AM_MAKEFLAGS) \ | 605 | && $(MAKE) $(AM_MAKEFLAGS) \ |
784 | @@ -519,13 +621,15 @@ | |||
785 | 519 | && rm -rf "$$dc_destdir" \ | 621 | && rm -rf "$$dc_destdir" \ |
786 | 520 | && $(MAKE) $(AM_MAKEFLAGS) dist \ | 622 | && $(MAKE) $(AM_MAKEFLAGS) dist \ |
787 | 521 | && rm -rf $(DIST_ARCHIVES) \ | 623 | && rm -rf $(DIST_ARCHIVES) \ |
789 | 522 | && $(MAKE) $(AM_MAKEFLAGS) distcleancheck | 624 | && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ |
790 | 625 | && cd "$$am__cwd" \ | ||
791 | 626 | || exit 1 | ||
792 | 523 | $(am__remove_distdir) | 627 | $(am__remove_distdir) |
793 | 524 | @(echo "$(distdir) archives ready for distribution: "; \ | 628 | @(echo "$(distdir) archives ready for distribution: "; \ |
794 | 525 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ | 629 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
795 | 526 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' | 630 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
796 | 527 | distuninstallcheck: | 631 | distuninstallcheck: |
798 | 528 | @cd $(distuninstallcheck_dir) \ | 632 | @$(am__cd) '$(distuninstallcheck_dir)' \ |
799 | 529 | && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ | 633 | && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
800 | 530 | || { echo "ERROR: files left after uninstall:" ; \ | 634 | || { echo "ERROR: files left after uninstall:" ; \ |
801 | 531 | if test -n "$(DESTDIR)"; then \ | 635 | if test -n "$(DESTDIR)"; then \ |
802 | @@ -543,13 +647,11 @@ | |||
803 | 543 | $(distcleancheck_listfiles) ; \ | 647 | $(distcleancheck_listfiles) ; \ |
804 | 544 | exit 1; } >&2 | 648 | exit 1; } >&2 |
805 | 545 | check-am: all-am | 649 | check-am: all-am |
809 | 546 | check: $(BUILT_SOURCES) | 650 | check: check-recursive |
810 | 547 | $(MAKE) $(AM_MAKEFLAGS) check-recursive | 651 | all-am: Makefile gfire_config.h |
808 | 548 | all-am: Makefile pre_config.h | ||
811 | 549 | installdirs: installdirs-recursive | 652 | installdirs: installdirs-recursive |
812 | 550 | installdirs-am: | 653 | installdirs-am: |
815 | 551 | install: $(BUILT_SOURCES) | 654 | install: install-recursive |
814 | 552 | $(MAKE) $(AM_MAKEFLAGS) install-recursive | ||
816 | 553 | install-exec: install-exec-recursive | 655 | install-exec: install-exec-recursive |
817 | 554 | install-data: install-data-recursive | 656 | install-data: install-data-recursive |
818 | 555 | uninstall: uninstall-recursive | 657 | uninstall: uninstall-recursive |
819 | @@ -569,11 +671,11 @@ | |||
820 | 569 | 671 | ||
821 | 570 | distclean-generic: | 672 | distclean-generic: |
822 | 571 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | 673 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
823 | 674 | -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
824 | 572 | 675 | ||
825 | 573 | maintainer-clean-generic: | 676 | maintainer-clean-generic: |
826 | 574 | @echo "This command is intended for maintainers to use" | 677 | @echo "This command is intended for maintainers to use" |
827 | 575 | @echo "it deletes files that may require special tools to rebuild." | 678 | @echo "it deletes files that may require special tools to rebuild." |
828 | 576 | -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) | ||
829 | 577 | clean: clean-recursive | 679 | clean: clean-recursive |
830 | 578 | 680 | ||
831 | 579 | clean-am: clean-generic clean-libtool mostlyclean-am | 681 | clean-am: clean-generic clean-libtool mostlyclean-am |
832 | @@ -590,6 +692,8 @@ | |||
833 | 590 | 692 | ||
834 | 591 | html: html-recursive | 693 | html: html-recursive |
835 | 592 | 694 | ||
836 | 695 | html-am: | ||
837 | 696 | |||
838 | 593 | info: info-recursive | 697 | info: info-recursive |
839 | 594 | 698 | ||
840 | 595 | info-am: | 699 | info-am: |
841 | @@ -598,18 +702,28 @@ | |||
842 | 598 | 702 | ||
843 | 599 | install-dvi: install-dvi-recursive | 703 | install-dvi: install-dvi-recursive |
844 | 600 | 704 | ||
845 | 705 | install-dvi-am: | ||
846 | 706 | |||
847 | 601 | install-exec-am: | 707 | install-exec-am: |
848 | 602 | 708 | ||
849 | 603 | install-html: install-html-recursive | 709 | install-html: install-html-recursive |
850 | 604 | 710 | ||
851 | 711 | install-html-am: | ||
852 | 712 | |||
853 | 605 | install-info: install-info-recursive | 713 | install-info: install-info-recursive |
854 | 606 | 714 | ||
855 | 715 | install-info-am: | ||
856 | 716 | |||
857 | 607 | install-man: | 717 | install-man: |
858 | 608 | 718 | ||
859 | 609 | install-pdf: install-pdf-recursive | 719 | install-pdf: install-pdf-recursive |
860 | 610 | 720 | ||
861 | 721 | install-pdf-am: | ||
862 | 722 | |||
863 | 611 | install-ps: install-ps-recursive | 723 | install-ps: install-ps-recursive |
864 | 612 | 724 | ||
865 | 725 | install-ps-am: | ||
866 | 726 | |||
867 | 613 | installcheck-am: | 727 | installcheck-am: |
868 | 614 | 728 | ||
869 | 615 | maintainer-clean: maintainer-clean-recursive | 729 | maintainer-clean: maintainer-clean-recursive |
870 | @@ -632,29 +746,26 @@ | |||
871 | 632 | 746 | ||
872 | 633 | uninstall-am: | 747 | uninstall-am: |
873 | 634 | 748 | ||
876 | 635 | .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ | 749 | .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ |
877 | 636 | install-strip | 750 | ctags-recursive install-am install-strip tags-recursive |
878 | 637 | 751 | ||
879 | 638 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | 752 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
880 | 639 | all all-am am--refresh check check-am clean clean-generic \ | 753 | all all-am am--refresh check check-am clean clean-generic \ |
881 | 640 | clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ | 754 | clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ |
899 | 641 | dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ | 755 | dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ |
900 | 642 | distclean distclean-generic distclean-hdr distclean-libtool \ | 756 | distcheck distclean distclean-generic distclean-hdr \ |
901 | 643 | distclean-tags distcleancheck distdir distuninstallcheck dvi \ | 757 | distclean-libtool distclean-tags distcleancheck distdir \ |
902 | 644 | dvi-am html html-am info info-am install install-am \ | 758 | distuninstallcheck dvi dvi-am html html-am info info-am \ |
903 | 645 | install-data install-data-am install-dvi install-dvi-am \ | 759 | install install-am install-data install-data-am install-dvi \ |
904 | 646 | install-exec install-exec-am install-html install-html-am \ | 760 | install-dvi-am install-exec install-exec-am install-html \ |
905 | 647 | install-info install-info-am install-man install-pdf \ | 761 | install-html-am install-info install-info-am install-man \ |
906 | 648 | install-pdf-am install-ps install-ps-am install-strip \ | 762 | install-pdf install-pdf-am install-ps install-ps-am \ |
907 | 649 | installcheck installcheck-am installdirs installdirs-am \ | 763 | install-strip installcheck installcheck-am installdirs \ |
908 | 650 | maintainer-clean maintainer-clean-generic mostlyclean \ | 764 | installdirs-am maintainer-clean maintainer-clean-generic \ |
909 | 651 | mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ | 765 | mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ |
910 | 652 | tags tags-recursive uninstall uninstall-am | 766 | ps ps-am tags tags-recursive uninstall uninstall-am |
911 | 653 | 767 | ||
912 | 654 | $(OBJECTS): $(BUILT_SOURCES) | 768 | |
896 | 655 | |||
897 | 656 | gfire_config.h: pre_config.h | ||
898 | 657 | $(sedpath) 's/#define PACKAGE/#define SNPP_PACKAGE/g' pre_config.h > $@ | ||
913 | 658 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | 769 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
914 | 659 | # Otherwise a system limit (for SysV at least) may be exceeded. | 770 | # Otherwise a system limit (for SysV at least) may be exceeded. |
915 | 660 | .NOEXPORT: | 771 | .NOEXPORT: |
916 | 661 | 772 | ||
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 | 1 | GFIRE_DIR = . | ||
922 | 2 | include mingw.mak | ||
923 | 3 | |||
924 | 4 | GFIRE_VERSION_STRING = `cat VERSION` | ||
925 | 5 | GFIRE_VERSION_SUFFIX = `awk '{split($$1,array,"\\\.|-"); print array[4];}' VERSION` | ||
926 | 6 | GFIRE_VERSION_PATCH = `awk '{split($$1,array,"\\\.|-"); print array[3];}' VERSION` | ||
927 | 7 | GFIRE_VERSION_MINOR = `awk '{split($$1,array,"\\\.|-"); print array[2];}' VERSION` | ||
928 | 8 | GFIRE_VERSION_MAJOR = `awk '{split($$1,array,"\\\.|-"); print array[1];}' VERSION` | ||
929 | 9 | |||
930 | 10 | SUBDIRS = src po data pixmaps | ||
931 | 11 | |||
932 | 12 | .PHONY: all clean installer | ||
933 | 13 | |||
934 | 14 | all: gfire_config_win.h | ||
935 | 15 | @list='${SUBDIRS}'; for subdir in $$list; do \ | ||
936 | 16 | (cd $$subdir && $(MAKE) -f Makefile.mingw all) || exit 1; \ | ||
937 | 17 | done; | ||
938 | 18 | |||
939 | 19 | clean: | ||
940 | 20 | @list='${SUBDIRS}'; for subdir in $$list; do \ | ||
941 | 21 | (cd $$subdir && $(MAKE) -f Makefile.mingw clean) || exit 1; \ | ||
942 | 22 | done; | ||
943 | 23 | |||
944 | 24 | distclean: clean | ||
945 | 25 | rm -rf ${WIN32_INSTALL_DIR} | ||
946 | 26 | rm -f pidgin-gfire-$(GFIRE_VERSION_STRING).exe | ||
947 | 27 | rm -f pidgin-gfire-$(GFIRE_VERSION_STRING).zip | ||
948 | 28 | |||
949 | 29 | install: all | ||
950 | 30 | @list='${SUBDIRS}'; for subdir in $$list; do \ | ||
951 | 31 | (cd $$subdir && $(MAKE) -f Makefile.mingw install) || exit 1; \ | ||
952 | 32 | done; | ||
953 | 33 | |||
954 | 34 | installer: installer-gui installer-zip | ||
955 | 35 | |||
956 | 36 | installer-gui: install VERSION | ||
957 | 37 | ${MAKENSIS} -V3 -DGFIRE_VERSION="$(GFIRE_VERSION_STRING)" -DGFIRE_INSTALL_DIR="${WIN32_INSTALL_DIR}" ${GFIRE_DIR}/nsis/gfire-installer.nsi | ||
958 | 38 | #${MAKENSIS} ${GFIRE_DIR}/nsis/gfire-installer.nsi | ||
959 | 39 | |||
960 | 40 | installer-zip: install VERSION | ||
961 | 41 | cd ${WIN32_INSTALL_DIR} && /usr/bin/zip -ru ../pidgin-gfire-`cat ../VERSION`.zip * | ||
962 | 0 | 42 | ||
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 | 3 | 3 | ||
969 | 4 | About | 4 | About |
970 | 5 | ===== | 5 | ===== |
973 | 6 | Gfire 0.8.3 will need Pidgin 2.5.0 or higher because of all the new | 6 | Gfire 0.9.4 will need Pidgin 2.5.0 or higher. To compile it from source, it will be |
972 | 7 | features that are implemented. To compile it from source, it will be | ||
974 | 8 | for most users easy as running: | 7 | for most users easy as running: |
975 | 9 | 8 | ||
976 | 10 | ./configure --prefix=/usr | 9 | ./configure --prefix=/usr |
977 | 11 | 10 | ||
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 @@ | |||
983 | 1 | 0.8.3 | 1 | 0.9.4 |
984 | 2 | 2 | ||
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 @@ | |||
990 | 1 | # generated automatically by aclocal 1.10.1 -*- Autoconf -*- | 1 | # generated automatically by aclocal 1.11.1 -*- Autoconf -*- |
991 | 2 | 2 | ||
992 | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
994 | 4 | # 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | 4 | # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
995 | 5 | # This file is free software; the Free Software Foundation | 5 | # This file is free software; the Free Software Foundation |
996 | 6 | # gives unlimited permission to copy and/or distribute it, | 6 | # gives unlimited permission to copy and/or distribute it, |
997 | 7 | # with or without modifications, as long as this notice is preserved. | 7 | # with or without modifications, as long as this notice is preserved. |
998 | @@ -13,8 +13,8 @@ | |||
999 | 13 | 13 | ||
1000 | 14 | m4_ifndef([AC_AUTOCONF_VERSION], | 14 | m4_ifndef([AC_AUTOCONF_VERSION], |
1001 | 15 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | 15 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1004 | 16 | m4_if(AC_AUTOCONF_VERSION, [2.61],, | 16 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, |
1005 | 17 | [m4_warning([this file was generated for autoconf 2.61. | 17 | [m4_warning([this file was generated for autoconf 2.65. |
1006 | 18 | You have another version of autoconf. It may work, but is not guaranteed to. | 18 | You have another version of autoconf. It may work, but is not guaranteed to. |
1007 | 19 | If you have problems, you may need to regenerate the build system entirely. | 19 | If you have problems, you may need to regenerate the build system entirely. |
1008 | 20 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) | 20 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
1009 | @@ -115,7 +115,7 @@ | |||
1010 | 115 | int major, minor, micro; | 115 | int major, minor, micro; |
1011 | 116 | char *tmp_version; | 116 | char *tmp_version; |
1012 | 117 | 117 | ||
1014 | 118 | system ("touch conf.glibtest"); | 118 | fclose (fopen ("conf.glibtest", "w")); |
1015 | 119 | 119 | ||
1016 | 120 | /* HP/UX 9 (%@#!) writes to sscanf strings */ | 120 | /* HP/UX 9 (%@#!) writes to sscanf strings */ |
1017 | 121 | tmp_version = g_strdup("$min_glib_version"); | 121 | tmp_version = g_strdup("$min_glib_version"); |
1018 | @@ -231,10 +231,638 @@ | |||
1019 | 231 | rm -f conf.glibtest | 231 | rm -f conf.glibtest |
1020 | 232 | ]) | 232 | ]) |
1021 | 233 | 233 | ||
1022 | 234 | # Copyright (C) 1995-2002 Free Software Foundation, Inc. | ||
1023 | 235 | # Copyright (C) 2001-2003,2004 Red Hat, Inc. | ||
1024 | 236 | # | ||
1025 | 237 | # This file is free software, distributed under the terms of the GNU | ||
1026 | 238 | # General Public License. As a special exception to the GNU General | ||
1027 | 239 | # Public License, this file may be distributed as part of a program | ||
1028 | 240 | # that contains a configuration script generated by Autoconf, under | ||
1029 | 241 | # the same distribution terms as the rest of that program. | ||
1030 | 242 | # | ||
1031 | 243 | # This file can be copied and used freely without restrictions. It can | ||
1032 | 244 | # be used in projects which are not available under the GNU Public License | ||
1033 | 245 | # but which still want to provide support for the GNU gettext functionality. | ||
1034 | 246 | # | ||
1035 | 247 | # Macro to add for using GNU gettext. | ||
1036 | 248 | # Ulrich Drepper <drepper@cygnus.com>, 1995, 1996 | ||
1037 | 249 | # | ||
1038 | 250 | # Modified to never use included libintl. | ||
1039 | 251 | # Owen Taylor <otaylor@redhat.com>, 12/15/1998 | ||
1040 | 252 | # | ||
1041 | 253 | # Major rework to remove unused code | ||
1042 | 254 | # Owen Taylor <otaylor@redhat.com>, 12/11/2002 | ||
1043 | 255 | # | ||
1044 | 256 | # Added better handling of ALL_LINGUAS from GNU gettext version | ||
1045 | 257 | # written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002 | ||
1046 | 258 | # | ||
1047 | 259 | # Modified to require ngettext | ||
1048 | 260 | # Matthias Clasen <mclasen@redhat.com> 08/06/2004 | ||
1049 | 261 | # | ||
1050 | 262 | # We need this here as well, since someone might use autoconf-2.5x | ||
1051 | 263 | # to configure GLib then an older version to configure a package | ||
1052 | 264 | # using AM_GLIB_GNU_GETTEXT | ||
1053 | 265 | AC_PREREQ(2.53) | ||
1054 | 266 | |||
1055 | 267 | dnl | ||
1056 | 268 | dnl We go to great lengths to make sure that aclocal won't | ||
1057 | 269 | dnl try to pull in the installed version of these macros | ||
1058 | 270 | dnl when running aclocal in the glib directory. | ||
1059 | 271 | dnl | ||
1060 | 272 | m4_copy([AC_DEFUN],[glib_DEFUN]) | ||
1061 | 273 | m4_copy([AC_REQUIRE],[glib_REQUIRE]) | ||
1062 | 274 | dnl | ||
1063 | 275 | dnl At the end, if we're not within glib, we'll define the public | ||
1064 | 276 | dnl definitions in terms of our private definitions. | ||
1065 | 277 | dnl | ||
1066 | 278 | |||
1067 | 279 | # GLIB_LC_MESSAGES | ||
1068 | 280 | #-------------------- | ||
1069 | 281 | glib_DEFUN([GLIB_LC_MESSAGES], | ||
1070 | 282 | [AC_CHECK_HEADERS([locale.h]) | ||
1071 | 283 | if test $ac_cv_header_locale_h = yes; then | ||
1072 | 284 | AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, | ||
1073 | 285 | [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], | ||
1074 | 286 | am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) | ||
1075 | 287 | if test $am_cv_val_LC_MESSAGES = yes; then | ||
1076 | 288 | AC_DEFINE(HAVE_LC_MESSAGES, 1, | ||
1077 | 289 | [Define if your <locale.h> file defines LC_MESSAGES.]) | ||
1078 | 290 | fi | ||
1079 | 291 | fi]) | ||
1080 | 292 | |||
1081 | 293 | # GLIB_PATH_PROG_WITH_TEST | ||
1082 | 294 | #---------------------------- | ||
1083 | 295 | dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, | ||
1084 | 296 | dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) | ||
1085 | 297 | glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], | ||
1086 | 298 | [# Extract the first word of "$2", so it can be a program name with args. | ||
1087 | 299 | set dummy $2; ac_word=[$]2 | ||
1088 | 300 | AC_MSG_CHECKING([for $ac_word]) | ||
1089 | 301 | AC_CACHE_VAL(ac_cv_path_$1, | ||
1090 | 302 | [case "[$]$1" in | ||
1091 | 303 | /*) | ||
1092 | 304 | ac_cv_path_$1="[$]$1" # Let the user override the test with a path. | ||
1093 | 305 | ;; | ||
1094 | 306 | *) | ||
1095 | 307 | IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" | ||
1096 | 308 | for ac_dir in ifelse([$5], , $PATH, [$5]); do | ||
1097 | 309 | test -z "$ac_dir" && ac_dir=. | ||
1098 | 310 | if test -f $ac_dir/$ac_word; then | ||
1099 | 311 | if [$3]; then | ||
1100 | 312 | ac_cv_path_$1="$ac_dir/$ac_word" | ||
1101 | 313 | break | ||
1102 | 314 | fi | ||
1103 | 315 | fi | ||
1104 | 316 | done | ||
1105 | 317 | IFS="$ac_save_ifs" | ||
1106 | 318 | dnl If no 4th arg is given, leave the cache variable unset, | ||
1107 | 319 | dnl so AC_PATH_PROGS will keep looking. | ||
1108 | 320 | ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" | ||
1109 | 321 | ])dnl | ||
1110 | 322 | ;; | ||
1111 | 323 | esac])dnl | ||
1112 | 324 | $1="$ac_cv_path_$1" | ||
1113 | 325 | if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then | ||
1114 | 326 | AC_MSG_RESULT([$]$1) | ||
1115 | 327 | else | ||
1116 | 328 | AC_MSG_RESULT(no) | ||
1117 | 329 | fi | ||
1118 | 330 | AC_SUBST($1)dnl | ||
1119 | 331 | ]) | ||
1120 | 332 | |||
1121 | 333 | # GLIB_WITH_NLS | ||
1122 | 334 | #----------------- | ||
1123 | 335 | glib_DEFUN([GLIB_WITH_NLS], | ||
1124 | 336 | dnl NLS is obligatory | ||
1125 | 337 | [USE_NLS=yes | ||
1126 | 338 | AC_SUBST(USE_NLS) | ||
1127 | 339 | |||
1128 | 340 | gt_cv_have_gettext=no | ||
1129 | 341 | |||
1130 | 342 | CATOBJEXT=NONE | ||
1131 | 343 | XGETTEXT=: | ||
1132 | 344 | INTLLIBS= | ||
1133 | 345 | |||
1134 | 346 | AC_CHECK_HEADER(libintl.h, | ||
1135 | 347 | [gt_cv_func_dgettext_libintl="no" | ||
1136 | 348 | libintl_extra_libs="" | ||
1137 | 349 | |||
1138 | 350 | # | ||
1139 | 351 | # First check in libc | ||
1140 | 352 | # | ||
1141 | 353 | AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, | ||
1142 | 354 | [AC_TRY_LINK([ | ||
1143 | 355 | #include <libintl.h> | ||
1144 | 356 | ], | ||
1145 | 357 | [return !ngettext ("","", 1)], | ||
1146 | 358 | gt_cv_func_ngettext_libc=yes, | ||
1147 | 359 | gt_cv_func_ngettext_libc=no) | ||
1148 | 360 | ]) | ||
1149 | 361 | |||
1150 | 362 | if test "$gt_cv_func_ngettext_libc" = "yes" ; then | ||
1151 | 363 | AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, | ||
1152 | 364 | [AC_TRY_LINK([ | ||
1153 | 365 | #include <libintl.h> | ||
1154 | 366 | ], | ||
1155 | 367 | [return !dgettext ("","")], | ||
1156 | 368 | gt_cv_func_dgettext_libc=yes, | ||
1157 | 369 | gt_cv_func_dgettext_libc=no) | ||
1158 | 370 | ]) | ||
1159 | 371 | fi | ||
1160 | 372 | |||
1161 | 373 | if test "$gt_cv_func_ngettext_libc" = "yes" ; then | ||
1162 | 374 | AC_CHECK_FUNCS(bind_textdomain_codeset) | ||
1163 | 375 | fi | ||
1164 | 376 | |||
1165 | 377 | # | ||
1166 | 378 | # If we don't have everything we want, check in libintl | ||
1167 | 379 | # | ||
1168 | 380 | if test "$gt_cv_func_dgettext_libc" != "yes" \ | ||
1169 | 381 | || test "$gt_cv_func_ngettext_libc" != "yes" \ | ||
1170 | 382 | || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then | ||
1171 | 383 | |||
1172 | 384 | AC_CHECK_LIB(intl, bindtextdomain, | ||
1173 | 385 | [AC_CHECK_LIB(intl, ngettext, | ||
1174 | 386 | [AC_CHECK_LIB(intl, dgettext, | ||
1175 | 387 | gt_cv_func_dgettext_libintl=yes)])]) | ||
1176 | 388 | |||
1177 | 389 | if test "$gt_cv_func_dgettext_libintl" != "yes" ; then | ||
1178 | 390 | AC_MSG_CHECKING([if -liconv is needed to use gettext]) | ||
1179 | 391 | AC_MSG_RESULT([]) | ||
1180 | 392 | AC_CHECK_LIB(intl, ngettext, | ||
1181 | 393 | [AC_CHECK_LIB(intl, dcgettext, | ||
1182 | 394 | [gt_cv_func_dgettext_libintl=yes | ||
1183 | 395 | libintl_extra_libs=-liconv], | ||
1184 | 396 | :,-liconv)], | ||
1185 | 397 | :,-liconv) | ||
1186 | 398 | fi | ||
1187 | 399 | |||
1188 | 400 | # | ||
1189 | 401 | # If we found libintl, then check in it for bind_textdomain_codeset(); | ||
1190 | 402 | # we'll prefer libc if neither have bind_textdomain_codeset(), | ||
1191 | 403 | # and both have dgettext and ngettext | ||
1192 | 404 | # | ||
1193 | 405 | if test "$gt_cv_func_dgettext_libintl" = "yes" ; then | ||
1194 | 406 | glib_save_LIBS="$LIBS" | ||
1195 | 407 | LIBS="$LIBS -lintl $libintl_extra_libs" | ||
1196 | 408 | unset ac_cv_func_bind_textdomain_codeset | ||
1197 | 409 | AC_CHECK_FUNCS(bind_textdomain_codeset) | ||
1198 | 410 | LIBS="$glib_save_LIBS" | ||
1199 | 411 | |||
1200 | 412 | if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then | ||
1201 | 413 | gt_cv_func_dgettext_libc=no | ||
1202 | 414 | else | ||
1203 | 415 | if test "$gt_cv_func_dgettext_libc" = "yes" \ | ||
1204 | 416 | && test "$gt_cv_func_ngettext_libc" = "yes"; then | ||
1205 | 417 | gt_cv_func_dgettext_libintl=no | ||
1206 | 418 | fi | ||
1207 | 419 | fi | ||
1208 | 420 | fi | ||
1209 | 421 | fi | ||
1210 | 422 | |||
1211 | 423 | if test "$gt_cv_func_dgettext_libc" = "yes" \ | ||
1212 | 424 | || test "$gt_cv_func_dgettext_libintl" = "yes"; then | ||
1213 | 425 | gt_cv_have_gettext=yes | ||
1214 | 426 | fi | ||
1215 | 427 | |||
1216 | 428 | if test "$gt_cv_func_dgettext_libintl" = "yes"; then | ||
1217 | 429 | INTLLIBS="-lintl $libintl_extra_libs" | ||
1218 | 430 | fi | ||
1219 | 431 | |||
1220 | 432 | if test "$gt_cv_have_gettext" = "yes"; then | ||
1221 | 433 | AC_DEFINE(HAVE_GETTEXT,1, | ||
1222 | 434 | [Define if the GNU gettext() function is already present or preinstalled.]) | ||
1223 | 435 | GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, | ||
1224 | 436 | [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl | ||
1225 | 437 | if test "$MSGFMT" != "no"; then | ||
1226 | 438 | glib_save_LIBS="$LIBS" | ||
1227 | 439 | LIBS="$LIBS $INTLLIBS" | ||
1228 | 440 | AC_CHECK_FUNCS(dcgettext) | ||
1229 | 441 | MSGFMT_OPTS= | ||
1230 | 442 | AC_MSG_CHECKING([if msgfmt accepts -c]) | ||
1231 | 443 | GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ | ||
1232 | 444 | msgid "" | ||
1233 | 445 | msgstr "" | ||
1234 | 446 | "Content-Type: text/plain; charset=UTF-8\n" | ||
1235 | 447 | "Project-Id-Version: test 1.0\n" | ||
1236 | 448 | "PO-Revision-Date: 2007-02-15 12:01+0100\n" | ||
1237 | 449 | "Last-Translator: test <foo@bar.xx>\n" | ||
1238 | 450 | "Language-Team: C <LL@li.org>\n" | ||
1239 | 451 | "MIME-Version: 1.0\n" | ||
1240 | 452 | "Content-Transfer-Encoding: 8bit\n" | ||
1241 | 453 | ], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) | ||
1242 | 454 | AC_SUBST(MSGFMT_OPTS) | ||
1243 | 455 | AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) | ||
1244 | 456 | GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, | ||
1245 | 457 | [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) | ||
1246 | 458 | AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; | ||
1247 | 459 | return _nl_msg_cat_cntr], | ||
1248 | 460 | [CATOBJEXT=.gmo | ||
1249 | 461 | DATADIRNAME=share], | ||
1250 | 462 | [case $host in | ||
1251 | 463 | *-*-solaris*) | ||
1252 | 464 | dnl On Solaris, if bind_textdomain_codeset is in libc, | ||
1253 | 465 | dnl GNU format message catalog is always supported, | ||
1254 | 466 | dnl since both are added to the libc all together. | ||
1255 | 467 | dnl Hence, we'd like to go with DATADIRNAME=share and | ||
1256 | 468 | dnl and CATOBJEXT=.gmo in this case. | ||
1257 | 469 | AC_CHECK_FUNC(bind_textdomain_codeset, | ||
1258 | 470 | [CATOBJEXT=.gmo | ||
1259 | 471 | DATADIRNAME=share], | ||
1260 | 472 | [CATOBJEXT=.mo | ||
1261 | 473 | DATADIRNAME=lib]) | ||
1262 | 474 | ;; | ||
1263 | 475 | *) | ||
1264 | 476 | CATOBJEXT=.mo | ||
1265 | 477 | DATADIRNAME=lib | ||
1266 | 478 | ;; | ||
1267 | 479 | esac]) | ||
1268 | 480 | LIBS="$glib_save_LIBS" | ||
1269 | 481 | INSTOBJEXT=.mo | ||
1270 | 482 | else | ||
1271 | 483 | gt_cv_have_gettext=no | ||
1272 | 484 | fi | ||
1273 | 485 | fi | ||
1274 | 486 | ]) | ||
1275 | 487 | |||
1276 | 488 | if test "$gt_cv_have_gettext" = "yes" ; then | ||
1277 | 489 | AC_DEFINE(ENABLE_NLS, 1, | ||
1278 | 490 | [always defined to indicate that i18n is enabled]) | ||
1279 | 491 | fi | ||
1280 | 492 | |||
1281 | 493 | dnl Test whether we really found GNU xgettext. | ||
1282 | 494 | if test "$XGETTEXT" != ":"; then | ||
1283 | 495 | dnl If it is not GNU xgettext we define it as : so that the | ||
1284 | 496 | dnl Makefiles still can work. | ||
1285 | 497 | if $XGETTEXT --omit-header /dev/null 2> /dev/null; then | ||
1286 | 498 | : ; | ||
1287 | 499 | else | ||
1288 | 500 | AC_MSG_RESULT( | ||
1289 | 501 | [found xgettext program is not GNU xgettext; ignore it]) | ||
1290 | 502 | XGETTEXT=":" | ||
1291 | 503 | fi | ||
1292 | 504 | fi | ||
1293 | 505 | |||
1294 | 506 | # We need to process the po/ directory. | ||
1295 | 507 | POSUB=po | ||
1296 | 508 | |||
1297 | 509 | AC_OUTPUT_COMMANDS( | ||
1298 | 510 | [case "$CONFIG_FILES" in *po/Makefile.in*) | ||
1299 | 511 | sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile | ||
1300 | 512 | esac]) | ||
1301 | 513 | |||
1302 | 514 | dnl These rules are solely for the distribution goal. While doing this | ||
1303 | 515 | dnl we only have to keep exactly one list of the available catalogs | ||
1304 | 516 | dnl in configure.ac. | ||
1305 | 517 | for lang in $ALL_LINGUAS; do | ||
1306 | 518 | GMOFILES="$GMOFILES $lang.gmo" | ||
1307 | 519 | POFILES="$POFILES $lang.po" | ||
1308 | 520 | done | ||
1309 | 521 | |||
1310 | 522 | dnl Make all variables we use known to autoconf. | ||
1311 | 523 | AC_SUBST(CATALOGS) | ||
1312 | 524 | AC_SUBST(CATOBJEXT) | ||
1313 | 525 | AC_SUBST(DATADIRNAME) | ||
1314 | 526 | AC_SUBST(GMOFILES) | ||
1315 | 527 | AC_SUBST(INSTOBJEXT) | ||
1316 | 528 | AC_SUBST(INTLLIBS) | ||
1317 | 529 | AC_SUBST(PO_IN_DATADIR_TRUE) | ||
1318 | 530 | AC_SUBST(PO_IN_DATADIR_FALSE) | ||
1319 | 531 | AC_SUBST(POFILES) | ||
1320 | 532 | AC_SUBST(POSUB) | ||
1321 | 533 | ]) | ||
1322 | 534 | |||
1323 | 535 | # AM_GLIB_GNU_GETTEXT | ||
1324 | 536 | # ------------------- | ||
1325 | 537 | # Do checks necessary for use of gettext. If a suitable implementation | ||
1326 | 538 | # of gettext is found in either in libintl or in the C library, | ||
1327 | 539 | # it will set INTLLIBS to the libraries needed for use of gettext | ||
1328 | 540 | # and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable | ||
1329 | 541 | # gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() | ||
1330 | 542 | # on various variables needed by the Makefile.in.in installed by | ||
1331 | 543 | # glib-gettextize. | ||
1332 | 544 | dnl | ||
1333 | 545 | glib_DEFUN([GLIB_GNU_GETTEXT], | ||
1334 | 546 | [AC_REQUIRE([AC_PROG_CC])dnl | ||
1335 | 547 | AC_REQUIRE([AC_HEADER_STDC])dnl | ||
1336 | 548 | |||
1337 | 549 | GLIB_LC_MESSAGES | ||
1338 | 550 | GLIB_WITH_NLS | ||
1339 | 551 | |||
1340 | 552 | if test "$gt_cv_have_gettext" = "yes"; then | ||
1341 | 553 | if test "x$ALL_LINGUAS" = "x"; then | ||
1342 | 554 | LINGUAS= | ||
1343 | 555 | else | ||
1344 | 556 | AC_MSG_CHECKING(for catalogs to be installed) | ||
1345 | 557 | NEW_LINGUAS= | ||
1346 | 558 | for presentlang in $ALL_LINGUAS; do | ||
1347 | 559 | useit=no | ||
1348 | 560 | if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then | ||
1349 | 561 | desiredlanguages="$LINGUAS" | ||
1350 | 562 | else | ||
1351 | 563 | desiredlanguages="$ALL_LINGUAS" | ||
1352 | 564 | fi | ||
1353 | 565 | for desiredlang in $desiredlanguages; do | ||
1354 | 566 | # Use the presentlang catalog if desiredlang is | ||
1355 | 567 | # a. equal to presentlang, or | ||
1356 | 568 | # b. a variant of presentlang (because in this case, | ||
1357 | 569 | # presentlang can be used as a fallback for messages | ||
1358 | 570 | # which are not translated in the desiredlang catalog). | ||
1359 | 571 | case "$desiredlang" in | ||
1360 | 572 | "$presentlang"*) useit=yes;; | ||
1361 | 573 | esac | ||
1362 | 574 | done | ||
1363 | 575 | if test $useit = yes; then | ||
1364 | 576 | NEW_LINGUAS="$NEW_LINGUAS $presentlang" | ||
1365 | 577 | fi | ||
1366 | 578 | done | ||
1367 | 579 | LINGUAS=$NEW_LINGUAS | ||
1368 | 580 | AC_MSG_RESULT($LINGUAS) | ||
1369 | 581 | fi | ||
1370 | 582 | |||
1371 | 583 | dnl Construct list of names of catalog files to be constructed. | ||
1372 | 584 | if test -n "$LINGUAS"; then | ||
1373 | 585 | for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done | ||
1374 | 586 | fi | ||
1375 | 587 | fi | ||
1376 | 588 | |||
1377 | 589 | dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly | ||
1378 | 590 | dnl find the mkinstalldirs script in another subdir but ($top_srcdir). | ||
1379 | 591 | dnl Try to locate is. | ||
1380 | 592 | MKINSTALLDIRS= | ||
1381 | 593 | if test -n "$ac_aux_dir"; then | ||
1382 | 594 | MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" | ||
1383 | 595 | fi | ||
1384 | 596 | if test -z "$MKINSTALLDIRS"; then | ||
1385 | 597 | MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" | ||
1386 | 598 | fi | ||
1387 | 599 | AC_SUBST(MKINSTALLDIRS) | ||
1388 | 600 | |||
1389 | 601 | dnl Generate list of files to be processed by xgettext which will | ||
1390 | 602 | dnl be included in po/Makefile. | ||
1391 | 603 | test -d po || mkdir po | ||
1392 | 604 | if test "x$srcdir" != "x."; then | ||
1393 | 605 | if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then | ||
1394 | 606 | posrcprefix="$srcdir/" | ||
1395 | 607 | else | ||
1396 | 608 | posrcprefix="../$srcdir/" | ||
1397 | 609 | fi | ||
1398 | 610 | else | ||
1399 | 611 | posrcprefix="../" | ||
1400 | 612 | fi | ||
1401 | 613 | rm -f po/POTFILES | ||
1402 | 614 | sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ | ||
1403 | 615 | < $srcdir/po/POTFILES.in > po/POTFILES | ||
1404 | 616 | ]) | ||
1405 | 617 | |||
1406 | 618 | # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) | ||
1407 | 619 | # ------------------------------- | ||
1408 | 620 | # Define VARIABLE to the location where catalog files will | ||
1409 | 621 | # be installed by po/Makefile. | ||
1410 | 622 | glib_DEFUN([GLIB_DEFINE_LOCALEDIR], | ||
1411 | 623 | [glib_REQUIRE([GLIB_GNU_GETTEXT])dnl | ||
1412 | 624 | glib_save_prefix="$prefix" | ||
1413 | 625 | glib_save_exec_prefix="$exec_prefix" | ||
1414 | 626 | glib_save_datarootdir="$datarootdir" | ||
1415 | 627 | test "x$prefix" = xNONE && prefix=$ac_default_prefix | ||
1416 | 628 | test "x$exec_prefix" = xNONE && exec_prefix=$prefix | ||
1417 | 629 | datarootdir=`eval echo "${datarootdir}"` | ||
1418 | 630 | if test "x$CATOBJEXT" = "x.mo" ; then | ||
1419 | 631 | localedir=`eval echo "${libdir}/locale"` | ||
1420 | 632 | else | ||
1421 | 633 | localedir=`eval echo "${datadir}/locale"` | ||
1422 | 634 | fi | ||
1423 | 635 | prefix="$glib_save_prefix" | ||
1424 | 636 | exec_prefix="$glib_save_exec_prefix" | ||
1425 | 637 | datarootdir="$glib_save_datarootdir" | ||
1426 | 638 | AC_DEFINE_UNQUOTED($1, "$localedir", | ||
1427 | 639 | [Define the location where the catalogs will be installed]) | ||
1428 | 640 | ]) | ||
1429 | 641 | |||
1430 | 642 | dnl | ||
1431 | 643 | dnl Now the definitions that aclocal will find | ||
1432 | 644 | dnl | ||
1433 | 645 | ifdef(glib_configure_ac,[],[ | ||
1434 | 646 | AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) | ||
1435 | 647 | AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) | ||
1436 | 648 | ])dnl | ||
1437 | 649 | |||
1438 | 650 | # GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) | ||
1439 | 651 | # | ||
1440 | 652 | # Create a temporary file with TEST-FILE as its contents and pass the | ||
1441 | 653 | # file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with | ||
1442 | 654 | # 0 and perform ACTION-IF-FAIL for any other exit status. | ||
1443 | 655 | AC_DEFUN([GLIB_RUN_PROG], | ||
1444 | 656 | [cat >conftest.foo <<_ACEOF | ||
1445 | 657 | $2 | ||
1446 | 658 | _ACEOF | ||
1447 | 659 | if AC_RUN_LOG([$1 conftest.foo]); then | ||
1448 | 660 | m4_ifval([$3], [$3], [:]) | ||
1449 | 661 | m4_ifvaln([$4], [else $4])dnl | ||
1450 | 662 | echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD | ||
1451 | 663 | sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD | ||
1452 | 664 | fi]) | ||
1453 | 665 | |||
1454 | 666 | |||
1455 | 667 | |||
1456 | 668 | dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) | ||
1457 | 669 | # serial 40 IT_PROG_INTLTOOL | ||
1458 | 670 | AC_DEFUN([IT_PROG_INTLTOOL], [ | ||
1459 | 671 | AC_PREREQ([2.50])dnl | ||
1460 | 672 | AC_REQUIRE([AM_NLS])dnl | ||
1461 | 673 | |||
1462 | 674 | case "$am__api_version" in | ||
1463 | 675 | 1.[01234]) | ||
1464 | 676 | AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) | ||
1465 | 677 | ;; | ||
1466 | 678 | *) | ||
1467 | 679 | ;; | ||
1468 | 680 | esac | ||
1469 | 681 | |||
1470 | 682 | if test -n "$1"; then | ||
1471 | 683 | AC_MSG_CHECKING([for intltool >= $1]) | ||
1472 | 684 | |||
1473 | 685 | INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` | ||
1474 | 686 | INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` | ||
1475 | 687 | [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` | ||
1476 | 688 | ] | ||
1477 | 689 | AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) | ||
1478 | 690 | test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || | ||
1479 | 691 | AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) | ||
1480 | 692 | fi | ||
1481 | 693 | |||
1482 | 694 | AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) | ||
1483 | 695 | AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) | ||
1484 | 696 | AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) | ||
1485 | 697 | if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then | ||
1486 | 698 | AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) | ||
1487 | 699 | fi | ||
1488 | 700 | |||
1489 | 701 | 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 | 702 | 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 | 703 | 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 | 704 | 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 | 705 | INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' | ||
1494 | 706 | 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 | 707 | 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 | 708 | 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 | 709 | 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 | 710 | 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 | 711 | 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 | 712 | INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' | ||
1501 | 713 | 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 | 714 | 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 | 715 | 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 | 716 | 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 | 717 | 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 | 718 | 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 | 719 | 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 | 720 | |||
1509 | 721 | _IT_SUBST(INTLTOOL_DESKTOP_RULE) | ||
1510 | 722 | _IT_SUBST(INTLTOOL_DIRECTORY_RULE) | ||
1511 | 723 | _IT_SUBST(INTLTOOL_KEYS_RULE) | ||
1512 | 724 | _IT_SUBST(INTLTOOL_PROP_RULE) | ||
1513 | 725 | _IT_SUBST(INTLTOOL_OAF_RULE) | ||
1514 | 726 | _IT_SUBST(INTLTOOL_PONG_RULE) | ||
1515 | 727 | _IT_SUBST(INTLTOOL_SERVER_RULE) | ||
1516 | 728 | _IT_SUBST(INTLTOOL_SHEET_RULE) | ||
1517 | 729 | _IT_SUBST(INTLTOOL_SOUNDLIST_RULE) | ||
1518 | 730 | _IT_SUBST(INTLTOOL_UI_RULE) | ||
1519 | 731 | _IT_SUBST(INTLTOOL_XAM_RULE) | ||
1520 | 732 | _IT_SUBST(INTLTOOL_KBD_RULE) | ||
1521 | 733 | _IT_SUBST(INTLTOOL_XML_RULE) | ||
1522 | 734 | _IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) | ||
1523 | 735 | _IT_SUBST(INTLTOOL_CAVES_RULE) | ||
1524 | 736 | _IT_SUBST(INTLTOOL_SCHEMAS_RULE) | ||
1525 | 737 | _IT_SUBST(INTLTOOL_THEME_RULE) | ||
1526 | 738 | _IT_SUBST(INTLTOOL_SERVICE_RULE) | ||
1527 | 739 | _IT_SUBST(INTLTOOL_POLICY_RULE) | ||
1528 | 740 | |||
1529 | 741 | # Check the gettext tools to make sure they are GNU | ||
1530 | 742 | AC_PATH_PROG(XGETTEXT, xgettext) | ||
1531 | 743 | AC_PATH_PROG(MSGMERGE, msgmerge) | ||
1532 | 744 | AC_PATH_PROG(MSGFMT, msgfmt) | ||
1533 | 745 | AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) | ||
1534 | 746 | if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then | ||
1535 | 747 | AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) | ||
1536 | 748 | fi | ||
1537 | 749 | xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" | ||
1538 | 750 | mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" | ||
1539 | 751 | mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" | ||
1540 | 752 | if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then | ||
1541 | 753 | AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) | ||
1542 | 754 | fi | ||
1543 | 755 | |||
1544 | 756 | AC_PATH_PROG(INTLTOOL_PERL, perl) | ||
1545 | 757 | if test -z "$INTLTOOL_PERL"; then | ||
1546 | 758 | AC_MSG_ERROR([perl not found]) | ||
1547 | 759 | fi | ||
1548 | 760 | AC_MSG_CHECKING([for perl >= 5.8.1]) | ||
1549 | 761 | $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 | ||
1550 | 762 | if test $? -ne 0; then | ||
1551 | 763 | AC_MSG_ERROR([perl 5.8.1 is required for intltool]) | ||
1552 | 764 | else | ||
1553 | 765 | IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" | ||
1554 | 766 | AC_MSG_RESULT([$IT_PERL_VERSION]) | ||
1555 | 767 | fi | ||
1556 | 768 | if test "x$2" != "xno-xml"; then | ||
1557 | 769 | AC_MSG_CHECKING([for XML::Parser]) | ||
1558 | 770 | if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then | ||
1559 | 771 | AC_MSG_RESULT([ok]) | ||
1560 | 772 | else | ||
1561 | 773 | AC_MSG_ERROR([XML::Parser perl module is required for intltool]) | ||
1562 | 774 | fi | ||
1563 | 775 | fi | ||
1564 | 776 | |||
1565 | 777 | # Substitute ALL_LINGUAS so we can use it in po/Makefile | ||
1566 | 778 | AC_SUBST(ALL_LINGUAS) | ||
1567 | 779 | |||
1568 | 780 | # Set DATADIRNAME correctly if it is not set yet | ||
1569 | 781 | # (copied from glib-gettext.m4) | ||
1570 | 782 | if test -z "$DATADIRNAME"; then | ||
1571 | 783 | AC_LINK_IFELSE( | ||
1572 | 784 | [AC_LANG_PROGRAM([[]], | ||
1573 | 785 | [[extern int _nl_msg_cat_cntr; | ||
1574 | 786 | return _nl_msg_cat_cntr]])], | ||
1575 | 787 | [DATADIRNAME=share], | ||
1576 | 788 | [case $host in | ||
1577 | 789 | *-*-solaris*) | ||
1578 | 790 | dnl On Solaris, if bind_textdomain_codeset is in libc, | ||
1579 | 791 | dnl GNU format message catalog is always supported, | ||
1580 | 792 | dnl since both are added to the libc all together. | ||
1581 | 793 | dnl Hence, we'd like to go with DATADIRNAME=share | ||
1582 | 794 | dnl in this case. | ||
1583 | 795 | AC_CHECK_FUNC(bind_textdomain_codeset, | ||
1584 | 796 | [DATADIRNAME=share], [DATADIRNAME=lib]) | ||
1585 | 797 | ;; | ||
1586 | 798 | *) | ||
1587 | 799 | [DATADIRNAME=lib] | ||
1588 | 800 | ;; | ||
1589 | 801 | esac]) | ||
1590 | 802 | fi | ||
1591 | 803 | AC_SUBST(DATADIRNAME) | ||
1592 | 804 | |||
1593 | 805 | IT_PO_SUBDIR([po]) | ||
1594 | 806 | |||
1595 | 807 | ]) | ||
1596 | 808 | |||
1597 | 809 | |||
1598 | 810 | # IT_PO_SUBDIR(DIRNAME) | ||
1599 | 811 | # --------------------- | ||
1600 | 812 | # All po subdirs have to be declared with this macro; the subdir "po" is | ||
1601 | 813 | # declared by IT_PROG_INTLTOOL. | ||
1602 | 814 | # | ||
1603 | 815 | AC_DEFUN([IT_PO_SUBDIR], | ||
1604 | 816 | [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. | ||
1605 | 817 | dnl | ||
1606 | 818 | dnl The following CONFIG_COMMANDS should be executed at the very end | ||
1607 | 819 | dnl of config.status. | ||
1608 | 820 | AC_CONFIG_COMMANDS_PRE([ | ||
1609 | 821 | AC_CONFIG_COMMANDS([$1/stamp-it], [ | ||
1610 | 822 | if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then | ||
1611 | 823 | AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) | ||
1612 | 824 | fi | ||
1613 | 825 | rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" | ||
1614 | 826 | >"$1/stamp-it.tmp" | ||
1615 | 827 | [sed '/^#/d | ||
1616 | 828 | s/^[[].*] *// | ||
1617 | 829 | /^[ ]*$/d | ||
1618 | 830 | '"s|^| $ac_top_srcdir/|" \ | ||
1619 | 831 | "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" | ||
1620 | 832 | ] | ||
1621 | 833 | [sed '/^POTFILES =/,/[^\\]$/ { | ||
1622 | 834 | /^POTFILES =/!d | ||
1623 | 835 | r $1/POTFILES | ||
1624 | 836 | } | ||
1625 | 837 | ' "$1/Makefile.in" >"$1/Makefile"] | ||
1626 | 838 | rm -f "$1/Makefile.tmp" | ||
1627 | 839 | mv "$1/stamp-it.tmp" "$1/stamp-it" | ||
1628 | 840 | ]) | ||
1629 | 841 | ])dnl | ||
1630 | 842 | ]) | ||
1631 | 843 | |||
1632 | 844 | # _IT_SUBST(VARIABLE) | ||
1633 | 845 | # ------------------- | ||
1634 | 846 | # Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST | ||
1635 | 847 | # | ||
1636 | 848 | AC_DEFUN([_IT_SUBST], | ||
1637 | 849 | [ | ||
1638 | 850 | AC_SUBST([$1]) | ||
1639 | 851 | m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) | ||
1640 | 852 | ] | ||
1641 | 853 | ) | ||
1642 | 854 | |||
1643 | 855 | # deprecated macros | ||
1644 | 856 | AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) | ||
1645 | 857 | # A hint is needed for aclocal from Automake <= 1.9.4: | ||
1646 | 858 | # AC_DEFUN([AC_PROG_INTLTOOL], ...) | ||
1647 | 859 | |||
1648 | 860 | |||
1649 | 234 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | 861 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
1650 | 235 | # | 862 | # |
1651 | 236 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 863 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
1653 | 237 | # 2006, 2007, 2008 Free Software Foundation, Inc. | 864 | # 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
1654 | 865 | # Inc. | ||
1655 | 238 | # Written by Gordon Matzigkeit, 1996 | 866 | # Written by Gordon Matzigkeit, 1996 |
1656 | 239 | # | 867 | # |
1657 | 240 | # This file is free software; the Free Software Foundation gives | 868 | # This file is free software; the Free Software Foundation gives |
1658 | @@ -243,7 +871,8 @@ | |||
1659 | 243 | 871 | ||
1660 | 244 | m4_define([_LT_COPYING], [dnl | 872 | m4_define([_LT_COPYING], [dnl |
1661 | 245 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 873 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
1663 | 246 | # 2006, 2007, 2008 Free Software Foundation, Inc. | 874 | # 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
1664 | 875 | # Inc. | ||
1665 | 247 | # Written by Gordon Matzigkeit, 1996 | 876 | # Written by Gordon Matzigkeit, 1996 |
1666 | 248 | # | 877 | # |
1667 | 249 | # This file is part of GNU Libtool. | 878 | # This file is part of GNU Libtool. |
1668 | @@ -270,7 +899,7 @@ | |||
1669 | 270 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | 899 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
1670 | 271 | ]) | 900 | ]) |
1671 | 272 | 901 | ||
1673 | 273 | # serial 56 LT_INIT | 902 | # serial 57 LT_INIT |
1674 | 274 | 903 | ||
1675 | 275 | 904 | ||
1676 | 276 | # LT_PREREQ(VERSION) | 905 | # LT_PREREQ(VERSION) |
1677 | @@ -299,6 +928,7 @@ | |||
1678 | 299 | # ------------------ | 928 | # ------------------ |
1679 | 300 | AC_DEFUN([LT_INIT], | 929 | AC_DEFUN([LT_INIT], |
1680 | 301 | [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT | 930 | [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT |
1681 | 931 | AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl | ||
1682 | 302 | AC_BEFORE([$0], [LT_LANG])dnl | 932 | AC_BEFORE([$0], [LT_LANG])dnl |
1683 | 303 | AC_BEFORE([$0], [LT_OUTPUT])dnl | 933 | AC_BEFORE([$0], [LT_OUTPUT])dnl |
1684 | 304 | AC_BEFORE([$0], [LTDL_INIT])dnl | 934 | AC_BEFORE([$0], [LTDL_INIT])dnl |
1685 | @@ -315,6 +945,8 @@ | |||
1686 | 315 | AC_REQUIRE([LTOBSOLETE_VERSION])dnl | 945 | AC_REQUIRE([LTOBSOLETE_VERSION])dnl |
1687 | 316 | m4_require([_LT_PROG_LTMAIN])dnl | 946 | m4_require([_LT_PROG_LTMAIN])dnl |
1688 | 317 | 947 | ||
1689 | 948 | _LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) | ||
1690 | 949 | |||
1691 | 318 | dnl Parse OPTIONS | 950 | dnl Parse OPTIONS |
1692 | 319 | _LT_SET_OPTIONS([$0], [$1]) | 951 | _LT_SET_OPTIONS([$0], [$1]) |
1693 | 320 | 952 | ||
1694 | @@ -351,7 +983,7 @@ | |||
1695 | 351 | *) break;; | 983 | *) break;; |
1696 | 352 | esac | 984 | esac |
1697 | 353 | done | 985 | done |
1699 | 354 | cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` | 986 | cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` |
1700 | 355 | ]) | 987 | ]) |
1701 | 356 | 988 | ||
1702 | 357 | 989 | ||
1703 | @@ -371,6 +1003,9 @@ | |||
1704 | 371 | m4_defun([_LT_SETUP], | 1003 | m4_defun([_LT_SETUP], |
1705 | 372 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl | 1004 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
1706 | 373 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl | 1005 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
1707 | 1006 | AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl | ||
1708 | 1007 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl | ||
1709 | 1008 | |||
1710 | 374 | _LT_DECL([], [host_alias], [0], [The host system])dnl | 1009 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
1711 | 375 | _LT_DECL([], [host], [0])dnl | 1010 | _LT_DECL([], [host], [0])dnl |
1712 | 376 | _LT_DECL([], [host_os], [0])dnl | 1011 | _LT_DECL([], [host_os], [0])dnl |
1713 | @@ -412,7 +1047,6 @@ | |||
1714 | 412 | _LT_CHECK_OBJDIR | 1047 | _LT_CHECK_OBJDIR |
1715 | 413 | 1048 | ||
1716 | 414 | m4_require([_LT_TAG_COMPILER])dnl | 1049 | m4_require([_LT_TAG_COMPILER])dnl |
1717 | 415 | _LT_PROG_ECHO_BACKSLASH | ||
1718 | 416 | 1050 | ||
1719 | 417 | case $host_os in | 1051 | case $host_os in |
1720 | 418 | aix3*) | 1052 | aix3*) |
1721 | @@ -426,23 +1060,6 @@ | |||
1722 | 426 | ;; | 1060 | ;; |
1723 | 427 | esac | 1061 | esac |
1724 | 428 | 1062 | ||
1725 | 429 | # Sed substitution that helps us do robust quoting. It backslashifies | ||
1726 | 430 | # metacharacters that are still active within double-quoted strings. | ||
1727 | 431 | sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' | ||
1728 | 432 | |||
1729 | 433 | # Same as above, but do not quote variable references. | ||
1730 | 434 | double_quote_subst='s/\([["`\\]]\)/\\\1/g' | ||
1731 | 435 | |||
1732 | 436 | # Sed substitution to delay expansion of an escaped shell variable in a | ||
1733 | 437 | # double_quote_subst'ed string. | ||
1734 | 438 | delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' | ||
1735 | 439 | |||
1736 | 440 | # Sed substitution to delay expansion of an escaped single quote. | ||
1737 | 441 | delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' | ||
1738 | 442 | |||
1739 | 443 | # Sed substitution to avoid accidental globbing in evaled expressions | ||
1740 | 444 | no_glob_subst='s/\*/\\\*/g' | ||
1741 | 445 | |||
1742 | 446 | # Global variables: | 1063 | # Global variables: |
1743 | 447 | ofile=libtool | 1064 | ofile=libtool |
1744 | 448 | can_build_shared=yes | 1065 | can_build_shared=yes |
1745 | @@ -483,6 +1100,28 @@ | |||
1746 | 483 | ])# _LT_SETUP | 1100 | ])# _LT_SETUP |
1747 | 484 | 1101 | ||
1748 | 485 | 1102 | ||
1749 | 1103 | # _LT_PREPARE_SED_QUOTE_VARS | ||
1750 | 1104 | # -------------------------- | ||
1751 | 1105 | # Define a few sed substitution that help us do robust quoting. | ||
1752 | 1106 | m4_defun([_LT_PREPARE_SED_QUOTE_VARS], | ||
1753 | 1107 | [# Backslashify metacharacters that are still active within | ||
1754 | 1108 | # double-quoted strings. | ||
1755 | 1109 | sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' | ||
1756 | 1110 | |||
1757 | 1111 | # Same as above, but do not quote variable references. | ||
1758 | 1112 | double_quote_subst='s/\([["`\\]]\)/\\\1/g' | ||
1759 | 1113 | |||
1760 | 1114 | # Sed substitution to delay expansion of an escaped shell variable in a | ||
1761 | 1115 | # double_quote_subst'ed string. | ||
1762 | 1116 | delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' | ||
1763 | 1117 | |||
1764 | 1118 | # Sed substitution to delay expansion of an escaped single quote. | ||
1765 | 1119 | delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' | ||
1766 | 1120 | |||
1767 | 1121 | # Sed substitution to avoid accidental globbing in evaled expressions | ||
1768 | 1122 | no_glob_subst='s/\*/\\\*/g' | ||
1769 | 1123 | ]) | ||
1770 | 1124 | |||
1771 | 486 | # _LT_PROG_LTMAIN | 1125 | # _LT_PROG_LTMAIN |
1772 | 487 | # --------------- | 1126 | # --------------- |
1773 | 488 | # Note that this code is called both from `configure', and `config.status' | 1127 | # Note that this code is called both from `configure', and `config.status' |
1774 | @@ -607,12 +1246,12 @@ | |||
1775 | 607 | # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) | 1246 | # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) |
1776 | 608 | # --------------------------------------------------- | 1247 | # --------------------------------------------------- |
1777 | 609 | m4_define([lt_decl_varnames_tagged], | 1248 | m4_define([lt_decl_varnames_tagged], |
1784 | 610 | [_$0(m4_quote(m4_default([$1], [[, ]])), | 1249 | [m4_assert([$# <= 2])dnl |
1785 | 611 | m4_quote(m4_if([$2], [], | 1250 | _$0(m4_quote(m4_default([$1], [[, ]])), |
1786 | 612 | m4_quote(lt_decl_tag_varnames), | 1251 | m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), |
1787 | 613 | m4_quote(m4_shift($@)))), | 1252 | m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) |
1788 | 614 | m4_split(m4_normalize(m4_quote(_LT_TAGS))))]) | 1253 | m4_define([_lt_decl_varnames_tagged], |
1789 | 615 | m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)]) | 1254 | [m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) |
1790 | 616 | 1255 | ||
1791 | 617 | 1256 | ||
1792 | 618 | # lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) | 1257 | # lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) |
1793 | @@ -635,7 +1274,7 @@ | |||
1794 | 635 | # declaration there will have the same value as in `configure'. VARNAME | 1274 | # declaration there will have the same value as in `configure'. VARNAME |
1795 | 636 | # must have a single quote delimited value for this to work. | 1275 | # must have a single quote delimited value for this to work. |
1796 | 637 | m4_define([_LT_CONFIG_STATUS_DECLARE], | 1276 | m4_define([_LT_CONFIG_STATUS_DECLARE], |
1798 | 638 | [$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) | 1277 | [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) |
1799 | 639 | 1278 | ||
1800 | 640 | 1279 | ||
1801 | 641 | # _LT_CONFIG_STATUS_DECLARATIONS | 1280 | # _LT_CONFIG_STATUS_DECLARATIONS |
1802 | @@ -645,7 +1284,7 @@ | |||
1803 | 645 | # embedded single quotes properly. In configure, this macro expands | 1284 | # embedded single quotes properly. In configure, this macro expands |
1804 | 646 | # each variable declared with _LT_DECL (and _LT_TAGDECL) into: | 1285 | # each variable declared with _LT_DECL (and _LT_TAGDECL) into: |
1805 | 647 | # | 1286 | # |
1807 | 648 | # <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' | 1287 | # <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`' |
1808 | 649 | m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], | 1288 | m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], |
1809 | 650 | [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), | 1289 | [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), |
1810 | 651 | [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) | 1290 | [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) |
1811 | @@ -744,12 +1383,20 @@ | |||
1812 | 744 | LTCFLAGS='$LTCFLAGS' | 1383 | LTCFLAGS='$LTCFLAGS' |
1813 | 745 | compiler='$compiler_DEFAULT' | 1384 | compiler='$compiler_DEFAULT' |
1814 | 746 | 1385 | ||
1815 | 1386 | # A function that is used when there is no print builtin or printf. | ||
1816 | 1387 | func_fallback_echo () | ||
1817 | 1388 | { | ||
1818 | 1389 | eval 'cat <<_LTECHO_EOF | ||
1819 | 1390 | \$[]1 | ||
1820 | 1391 | _LTECHO_EOF' | ||
1821 | 1392 | } | ||
1822 | 1393 | |||
1823 | 747 | # Quote evaled strings. | 1394 | # Quote evaled strings. |
1824 | 748 | for var in lt_decl_all_varnames([[ \ | 1395 | for var in lt_decl_all_varnames([[ \ |
1825 | 749 | ]], lt_decl_quote_varnames); do | 1396 | ]], lt_decl_quote_varnames); do |
1827 | 750 | case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in | 1397 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
1828 | 751 | *[[\\\\\\\`\\"\\\$]]*) | 1398 | *[[\\\\\\\`\\"\\\$]]*) |
1830 | 752 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" | 1399 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
1831 | 753 | ;; | 1400 | ;; |
1832 | 754 | *) | 1401 | *) |
1833 | 755 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | 1402 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
1834 | @@ -760,9 +1407,9 @@ | |||
1835 | 760 | # Double-quote double-evaled strings. | 1407 | # Double-quote double-evaled strings. |
1836 | 761 | for var in lt_decl_all_varnames([[ \ | 1408 | for var in lt_decl_all_varnames([[ \ |
1837 | 762 | ]], lt_decl_dquote_varnames); do | 1409 | ]], lt_decl_dquote_varnames); do |
1839 | 763 | case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in | 1410 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
1840 | 764 | *[[\\\\\\\`\\"\\\$]]*) | 1411 | *[[\\\\\\\`\\"\\\$]]*) |
1842 | 765 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" | 1412 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
1843 | 766 | ;; | 1413 | ;; |
1844 | 767 | *) | 1414 | *) |
1845 | 768 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | 1415 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
1846 | @@ -770,16 +1417,38 @@ | |||
1847 | 770 | esac | 1417 | esac |
1848 | 771 | done | 1418 | done |
1849 | 772 | 1419 | ||
1850 | 773 | # Fix-up fallback echo if it was mangled by the above quoting rules. | ||
1851 | 774 | case \$lt_ECHO in | ||
1852 | 775 | *'\\\[$]0 --fallback-echo"')dnl " | ||
1853 | 776 | lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` | ||
1854 | 777 | ;; | ||
1855 | 778 | esac | ||
1856 | 779 | |||
1857 | 780 | _LT_OUTPUT_LIBTOOL_INIT | 1420 | _LT_OUTPUT_LIBTOOL_INIT |
1858 | 781 | ]) | 1421 | ]) |
1859 | 782 | 1422 | ||
1860 | 1423 | # _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) | ||
1861 | 1424 | # ------------------------------------ | ||
1862 | 1425 | # Generate a child script FILE with all initialization necessary to | ||
1863 | 1426 | # reuse the environment learned by the parent script, and make the | ||
1864 | 1427 | # file executable. If COMMENT is supplied, it is inserted after the | ||
1865 | 1428 | # `#!' sequence but before initialization text begins. After this | ||
1866 | 1429 | # macro, additional text can be appended to FILE to form the body of | ||
1867 | 1430 | # the child script. The macro ends with non-zero status if the | ||
1868 | 1431 | # file could not be fully written (such as if the disk is full). | ||
1869 | 1432 | m4_ifdef([AS_INIT_GENERATED], | ||
1870 | 1433 | [m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], | ||
1871 | 1434 | [m4_defun([_LT_GENERATED_FILE_INIT], | ||
1872 | 1435 | [m4_require([AS_PREPARE])]dnl | ||
1873 | 1436 | [m4_pushdef([AS_MESSAGE_LOG_FD])]dnl | ||
1874 | 1437 | [lt_write_fail=0 | ||
1875 | 1438 | cat >$1 <<_ASEOF || lt_write_fail=1 | ||
1876 | 1439 | #! $SHELL | ||
1877 | 1440 | # Generated by $as_me. | ||
1878 | 1441 | $2 | ||
1879 | 1442 | SHELL=\${CONFIG_SHELL-$SHELL} | ||
1880 | 1443 | export SHELL | ||
1881 | 1444 | _ASEOF | ||
1882 | 1445 | cat >>$1 <<\_ASEOF || lt_write_fail=1 | ||
1883 | 1446 | AS_SHELL_SANITIZE | ||
1884 | 1447 | _AS_PREPARE | ||
1885 | 1448 | exec AS_MESSAGE_FD>&1 | ||
1886 | 1449 | _ASEOF | ||
1887 | 1450 | test $lt_write_fail = 0 && chmod +x $1[]dnl | ||
1888 | 1451 | m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT | ||
1889 | 783 | 1452 | ||
1890 | 784 | # LT_OUTPUT | 1453 | # LT_OUTPUT |
1891 | 785 | # --------- | 1454 | # --------- |
1892 | @@ -789,20 +1458,11 @@ | |||
1893 | 789 | AC_DEFUN([LT_OUTPUT], | 1458 | AC_DEFUN([LT_OUTPUT], |
1894 | 790 | [: ${CONFIG_LT=./config.lt} | 1459 | [: ${CONFIG_LT=./config.lt} |
1895 | 791 | AC_MSG_NOTICE([creating $CONFIG_LT]) | 1460 | AC_MSG_NOTICE([creating $CONFIG_LT]) |
1900 | 792 | cat >"$CONFIG_LT" <<_LTEOF | 1461 | _LT_GENERATED_FILE_INIT(["$CONFIG_LT"], |
1901 | 793 | #! $SHELL | 1462 | [# Run this file to recreate a libtool stub with the current configuration.]) |
1898 | 794 | # Generated by $as_me. | ||
1899 | 795 | # Run this file to recreate a libtool stub with the current configuration. | ||
1902 | 796 | 1463 | ||
1903 | 1464 | cat >>"$CONFIG_LT" <<\_LTEOF | ||
1904 | 797 | lt_cl_silent=false | 1465 | lt_cl_silent=false |
1905 | 798 | SHELL=\${CONFIG_SHELL-$SHELL} | ||
1906 | 799 | _LTEOF | ||
1907 | 800 | |||
1908 | 801 | cat >>"$CONFIG_LT" <<\_LTEOF | ||
1909 | 802 | AS_SHELL_SANITIZE | ||
1910 | 803 | _AS_PREPARE | ||
1911 | 804 | |||
1912 | 805 | exec AS_MESSAGE_FD>&1 | ||
1913 | 806 | exec AS_MESSAGE_LOG_FD>>config.log | 1466 | exec AS_MESSAGE_LOG_FD>>config.log |
1914 | 807 | { | 1467 | { |
1915 | 808 | echo | 1468 | echo |
1916 | @@ -828,7 +1488,7 @@ | |||
1917 | 828 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) | 1488 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
1918 | 829 | configured by $[0], generated by m4_PACKAGE_STRING. | 1489 | configured by $[0], generated by m4_PACKAGE_STRING. |
1919 | 830 | 1490 | ||
1921 | 831 | Copyright (C) 2008 Free Software Foundation, Inc. | 1491 | Copyright (C) 2010 Free Software Foundation, Inc. |
1922 | 832 | This config.lt script is free software; the Free Software Foundation | 1492 | This config.lt script is free software; the Free Software Foundation |
1923 | 833 | gives unlimited permision to copy, distribute and modify it." | 1493 | gives unlimited permision to copy, distribute and modify it." |
1924 | 834 | 1494 | ||
1925 | @@ -873,15 +1533,13 @@ | |||
1926 | 873 | # appending to config.log, which fails on DOS, as config.log is still kept | 1533 | # appending to config.log, which fails on DOS, as config.log is still kept |
1927 | 874 | # open by configure. Here we exec the FD to /dev/null, effectively closing | 1534 | # open by configure. Here we exec the FD to /dev/null, effectively closing |
1928 | 875 | # config.log, so it can be properly (re)opened and appended to by config.lt. | 1535 | # config.log, so it can be properly (re)opened and appended to by config.lt. |
1938 | 876 | if test "$no_create" != yes; then | 1536 | lt_cl_success=: |
1939 | 877 | lt_cl_success=: | 1537 | test "$silent" = yes && |
1940 | 878 | test "$silent" = yes && | 1538 | lt_config_lt_args="$lt_config_lt_args --quiet" |
1941 | 879 | lt_config_lt_args="$lt_config_lt_args --quiet" | 1539 | exec AS_MESSAGE_LOG_FD>/dev/null |
1942 | 880 | exec AS_MESSAGE_LOG_FD>/dev/null | 1540 | $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false |
1943 | 881 | $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false | 1541 | exec AS_MESSAGE_LOG_FD>>config.log |
1944 | 882 | exec AS_MESSAGE_LOG_FD>>config.log | 1542 | $lt_cl_success || AS_EXIT(1) |
1936 | 883 | $lt_cl_success || AS_EXIT(1) | ||
1937 | 884 | fi | ||
1945 | 885 | ])# LT_OUTPUT | 1543 | ])# LT_OUTPUT |
1946 | 886 | 1544 | ||
1947 | 887 | 1545 | ||
1948 | @@ -1058,11 +1716,13 @@ | |||
1949 | 1058 | AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) | 1716 | AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) |
1950 | 1059 | AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) | 1717 | AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) |
1951 | 1060 | AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) | 1718 | AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) |
1952 | 1719 | AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) | ||
1953 | 1061 | dnl aclocal-1.4 backwards compatibility: | 1720 | dnl aclocal-1.4 backwards compatibility: |
1954 | 1062 | dnl AC_DEFUN([AC_LIBTOOL_CXX], []) | 1721 | dnl AC_DEFUN([AC_LIBTOOL_CXX], []) |
1955 | 1063 | dnl AC_DEFUN([AC_LIBTOOL_F77], []) | 1722 | dnl AC_DEFUN([AC_LIBTOOL_F77], []) |
1956 | 1064 | dnl AC_DEFUN([AC_LIBTOOL_FC], []) | 1723 | dnl AC_DEFUN([AC_LIBTOOL_FC], []) |
1957 | 1065 | dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) | 1724 | dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) |
1958 | 1725 | dnl AC_DEFUN([AC_LIBTOOL_RC], []) | ||
1959 | 1066 | 1726 | ||
1960 | 1067 | 1727 | ||
1961 | 1068 | # _LT_TAG_COMPILER | 1728 | # _LT_TAG_COMPILER |
1962 | @@ -1167,15 +1827,40 @@ | |||
1963 | 1167 | [lt_cv_ld_exported_symbols_list=no]) | 1827 | [lt_cv_ld_exported_symbols_list=no]) |
1964 | 1168 | LDFLAGS="$save_LDFLAGS" | 1828 | LDFLAGS="$save_LDFLAGS" |
1965 | 1169 | ]) | 1829 | ]) |
1966 | 1830 | AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], | ||
1967 | 1831 | [lt_cv_ld_force_load=no | ||
1968 | 1832 | cat > conftest.c << _LT_EOF | ||
1969 | 1833 | int forced_loaded() { return 2;} | ||
1970 | 1834 | _LT_EOF | ||
1971 | 1835 | echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD | ||
1972 | 1836 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD | ||
1973 | 1837 | echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD | ||
1974 | 1838 | $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD | ||
1975 | 1839 | echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD | ||
1976 | 1840 | $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD | ||
1977 | 1841 | cat > conftest.c << _LT_EOF | ||
1978 | 1842 | int main() { return 0;} | ||
1979 | 1843 | _LT_EOF | ||
1980 | 1844 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD | ||
1981 | 1845 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err | ||
1982 | 1846 | _lt_result=$? | ||
1983 | 1847 | if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then | ||
1984 | 1848 | lt_cv_ld_force_load=yes | ||
1985 | 1849 | else | ||
1986 | 1850 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
1987 | 1851 | fi | ||
1988 | 1852 | rm -f conftest.err libconftest.a conftest conftest.c | ||
1989 | 1853 | rm -rf conftest.dSYM | ||
1990 | 1854 | ]) | ||
1991 | 1170 | case $host_os in | 1855 | case $host_os in |
1992 | 1171 | rhapsody* | darwin1.[[012]]) | 1856 | rhapsody* | darwin1.[[012]]) |
1993 | 1172 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; | 1857 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
1994 | 1173 | darwin1.*) | 1858 | darwin1.*) |
1995 | 1174 | _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; | 1859 | _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; |
1997 | 1175 | darwin*) # darwin 5.x on | 1860 | darwin*) # darwin 5.x on |
1998 | 1176 | # if running on 10.5 or later, the deployment target defaults | 1861 | # if running on 10.5 or later, the deployment target defaults |
1999 | 1177 | # to the OS version, if on x86, and 10.4, the deployment | 1862 | # to the OS version, if on x86, and 10.4, the deployment |
2001 | 1178 | # target defaults to 10.4. Don't you love it? | 1863 | # target defaults to 10.4. Don't you love it? |
2002 | 1179 | case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in | 1864 | case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in |
2003 | 1180 | 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) | 1865 | 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) |
2004 | 1181 | _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; | 1866 | _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; |
2005 | @@ -1194,7 +1879,7 @@ | |||
2006 | 1194 | else | 1879 | else |
2007 | 1195 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' | 1880 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
2008 | 1196 | fi | 1881 | fi |
2010 | 1197 | if test "$DSYMUTIL" != ":"; then | 1882 | if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then |
2011 | 1198 | _lt_dsymutil='~$DSYMUTIL $lib || :' | 1883 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
2012 | 1199 | else | 1884 | else |
2013 | 1200 | _lt_dsymutil= | 1885 | _lt_dsymutil= |
2014 | @@ -1214,11 +1899,19 @@ | |||
2015 | 1214 | _LT_TAGVAR(hardcode_direct, $1)=no | 1899 | _LT_TAGVAR(hardcode_direct, $1)=no |
2016 | 1215 | _LT_TAGVAR(hardcode_automatic, $1)=yes | 1900 | _LT_TAGVAR(hardcode_automatic, $1)=yes |
2017 | 1216 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 1901 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
2019 | 1217 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' | 1902 | if test "$lt_cv_ld_force_load" = "yes"; then |
2020 | 1903 | _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 | 1904 | else | ||
2022 | 1905 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' | ||
2023 | 1906 | fi | ||
2024 | 1218 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 1907 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
2025 | 1219 | _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" | 1908 | _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" |
2028 | 1220 | if test "$GCC" = "yes"; then | 1909 | case $cc_basename in |
2029 | 1221 | output_verbose_link_cmd=echo | 1910 | ifort*) _lt_dar_can_shared=yes ;; |
2030 | 1911 | *) _lt_dar_can_shared=$GCC ;; | ||
2031 | 1912 | esac | ||
2032 | 1913 | if test "$_lt_dar_can_shared" = "yes"; then | ||
2033 | 1914 | output_verbose_link_cmd=func_echo_all | ||
2034 | 1222 | _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}" | 1915 | _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 | 1223 | _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" | 1916 | _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
2036 | 1224 | _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}" | 1917 | _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 | 1264 | # _LT_SHELL_INIT(ARG) | 1957 | # _LT_SHELL_INIT(ARG) |
2039 | 1265 | # ------------------- | 1958 | # ------------------- |
2040 | 1266 | m4_define([_LT_SHELL_INIT], | 1959 | m4_define([_LT_SHELL_INIT], |
2047 | 1267 | [ifdef([AC_DIVERSION_NOTICE], | 1960 | [m4_divert_text([M4SH-INIT], [$1 |
2048 | 1268 | [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], | 1961 | ])])# _LT_SHELL_INIT |
2049 | 1269 | [AC_DIVERT_PUSH(NOTICE)]) | 1962 | |
2044 | 1270 | $1 | ||
2045 | 1271 | AC_DIVERT_POP | ||
2046 | 1272 | ])# _LT_SHELL_INIT | ||
2050 | 1273 | 1963 | ||
2051 | 1274 | 1964 | ||
2052 | 1275 | # _LT_PROG_ECHO_BACKSLASH | 1965 | # _LT_PROG_ECHO_BACKSLASH |
2053 | 1276 | # ----------------------- | 1966 | # ----------------------- |
2056 | 1277 | # Add some code to the start of the generated configure script which | 1967 | # Find how we can fake an echo command that does not interpret backslash. |
2057 | 1278 | # will find an echo command which doesn't interpret backslashes. | 1968 | # In particular, with Autoconf 2.60 or later we add some code to the start |
2058 | 1969 | # of the generated configure script which will find a shell with a builtin | ||
2059 | 1970 | # printf (which we can use as an echo command). | ||
2060 | 1279 | m4_defun([_LT_PROG_ECHO_BACKSLASH], | 1971 | m4_defun([_LT_PROG_ECHO_BACKSLASH], |
2070 | 1280 | [_LT_SHELL_INIT([ | 1972 | [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
2071 | 1281 | # Check that we are running under the correct shell. | 1973 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
2072 | 1282 | SHELL=${CONFIG_SHELL-/bin/sh} | 1974 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
2073 | 1283 | 1975 | ||
2074 | 1284 | case X$lt_ECHO in | 1976 | AC_MSG_CHECKING([how to print strings]) |
2075 | 1285 | X*--fallback-echo) | 1977 | # Test print first, because it will be a builtin if present. |
2076 | 1286 | # Remove one level of quotation (which was required for Make). | 1978 | if test "X`print -r -- -n 2>/dev/null`" = X-n && \ |
2077 | 1287 | ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` | 1979 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
2078 | 1288 | ;; | 1980 | ECHO='print -r --' |
2079 | 1981 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
2080 | 1982 | ECHO='printf %s\n' | ||
2081 | 1983 | else | ||
2082 | 1984 | # Use this function as a fallback that always works. | ||
2083 | 1985 | func_fallback_echo () | ||
2084 | 1986 | { | ||
2085 | 1987 | eval 'cat <<_LTECHO_EOF | ||
2086 | 1988 | $[]1 | ||
2087 | 1989 | _LTECHO_EOF' | ||
2088 | 1990 | } | ||
2089 | 1991 | ECHO='func_fallback_echo' | ||
2090 | 1992 | fi | ||
2091 | 1993 | |||
2092 | 1994 | # func_echo_all arg... | ||
2093 | 1995 | # Invoke $ECHO with all args, space-separated. | ||
2094 | 1996 | func_echo_all () | ||
2095 | 1997 | { | ||
2096 | 1998 | $ECHO "$*" | ||
2097 | 1999 | } | ||
2098 | 2000 | |||
2099 | 2001 | case "$ECHO" in | ||
2100 | 2002 | printf*) AC_MSG_RESULT([printf]) ;; | ||
2101 | 2003 | print*) AC_MSG_RESULT([print -r]) ;; | ||
2102 | 2004 | *) AC_MSG_RESULT([cat]) ;; | ||
2103 | 1289 | esac | 2005 | esac |
2104 | 1290 | 2006 | ||
2242 | 1291 | ECHO=${lt_ECHO-echo} | 2007 | m4_ifdef([_AS_DETECT_SUGGESTED], |
2243 | 1292 | if test "X[$]1" = X--no-reexec; then | 2008 | [_AS_DETECT_SUGGESTED([ |
2244 | 1293 | # Discard the --no-reexec flag, and continue. | 2009 | test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( |
2245 | 1294 | shift | 2010 | ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
2246 | 1295 | elif test "X[$]1" = X--fallback-echo; then | 2011 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
2247 | 1296 | # Avoid inline document here, it may be left over | 2012 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
2248 | 1297 | : | 2013 | PATH=/empty FPATH=/empty; export PATH FPATH |
2249 | 1298 | elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then | 2014 | test "X`printf %s $ECHO`" = "X$ECHO" \ |
2250 | 1299 | # Yippee, $ECHO works! | 2015 | || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) |
2251 | 1300 | : | 2016 | |
2115 | 1301 | else | ||
2116 | 1302 | # Restart under the correct shell. | ||
2117 | 1303 | exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} | ||
2118 | 1304 | fi | ||
2119 | 1305 | |||
2120 | 1306 | if test "X[$]1" = X--fallback-echo; then | ||
2121 | 1307 | # used as fallback echo | ||
2122 | 1308 | shift | ||
2123 | 1309 | cat <<_LT_EOF | ||
2124 | 1310 | [$]* | ||
2125 | 1311 | _LT_EOF | ||
2126 | 1312 | exit 0 | ||
2127 | 1313 | fi | ||
2128 | 1314 | |||
2129 | 1315 | # The HP-UX ksh and POSIX shell print the target directory to stdout | ||
2130 | 1316 | # if CDPATH is set. | ||
2131 | 1317 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH | ||
2132 | 1318 | |||
2133 | 1319 | if test -z "$lt_ECHO"; then | ||
2134 | 1320 | if test "X${echo_test_string+set}" != Xset; then | ||
2135 | 1321 | # find a string as large as possible, as long as the shell can cope with it | ||
2136 | 1322 | for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do | ||
2137 | 1323 | # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... | ||
2138 | 1324 | if { echo_test_string=`eval $cmd`; } 2>/dev/null && | ||
2139 | 1325 | { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null | ||
2140 | 1326 | then | ||
2141 | 1327 | break | ||
2142 | 1328 | fi | ||
2143 | 1329 | done | ||
2144 | 1330 | fi | ||
2145 | 1331 | |||
2146 | 1332 | if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && | ||
2147 | 1333 | echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && | ||
2148 | 1334 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
2149 | 1335 | : | ||
2150 | 1336 | else | ||
2151 | 1337 | # The Solaris, AIX, and Digital Unix default echo programs unquote | ||
2152 | 1338 | # backslashes. This makes it impossible to quote backslashes using | ||
2153 | 1339 | # echo "$something" | sed 's/\\/\\\\/g' | ||
2154 | 1340 | # | ||
2155 | 1341 | # So, first we look for a working echo in the user's PATH. | ||
2156 | 1342 | |||
2157 | 1343 | lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR | ||
2158 | 1344 | for dir in $PATH /usr/ucb; do | ||
2159 | 1345 | IFS="$lt_save_ifs" | ||
2160 | 1346 | if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && | ||
2161 | 1347 | test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && | ||
2162 | 1348 | echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && | ||
2163 | 1349 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
2164 | 1350 | ECHO="$dir/echo" | ||
2165 | 1351 | break | ||
2166 | 1352 | fi | ||
2167 | 1353 | done | ||
2168 | 1354 | IFS="$lt_save_ifs" | ||
2169 | 1355 | |||
2170 | 1356 | if test "X$ECHO" = Xecho; then | ||
2171 | 1357 | # We didn't find a better echo, so look for alternatives. | ||
2172 | 1358 | if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && | ||
2173 | 1359 | echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && | ||
2174 | 1360 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
2175 | 1361 | # This shell has a builtin print -r that does the trick. | ||
2176 | 1362 | ECHO='print -r' | ||
2177 | 1363 | elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && | ||
2178 | 1364 | test "X$CONFIG_SHELL" != X/bin/ksh; then | ||
2179 | 1365 | # If we have ksh, try running configure again with it. | ||
2180 | 1366 | ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} | ||
2181 | 1367 | export ORIGINAL_CONFIG_SHELL | ||
2182 | 1368 | CONFIG_SHELL=/bin/ksh | ||
2183 | 1369 | export CONFIG_SHELL | ||
2184 | 1370 | exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} | ||
2185 | 1371 | else | ||
2186 | 1372 | # Try using printf. | ||
2187 | 1373 | ECHO='printf %s\n' | ||
2188 | 1374 | if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && | ||
2189 | 1375 | echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && | ||
2190 | 1376 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
2191 | 1377 | # Cool, printf works | ||
2192 | 1378 | : | ||
2193 | 1379 | elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && | ||
2194 | 1380 | test "X$echo_testing_string" = 'X\t' && | ||
2195 | 1381 | echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && | ||
2196 | 1382 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
2197 | 1383 | CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL | ||
2198 | 1384 | export CONFIG_SHELL | ||
2199 | 1385 | SHELL="$CONFIG_SHELL" | ||
2200 | 1386 | export SHELL | ||
2201 | 1387 | ECHO="$CONFIG_SHELL [$]0 --fallback-echo" | ||
2202 | 1388 | elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && | ||
2203 | 1389 | test "X$echo_testing_string" = 'X\t' && | ||
2204 | 1390 | echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && | ||
2205 | 1391 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
2206 | 1392 | ECHO="$CONFIG_SHELL [$]0 --fallback-echo" | ||
2207 | 1393 | else | ||
2208 | 1394 | # maybe with a smaller string... | ||
2209 | 1395 | prev=: | ||
2210 | 1396 | |||
2211 | 1397 | for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do | ||
2212 | 1398 | if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null | ||
2213 | 1399 | then | ||
2214 | 1400 | break | ||
2215 | 1401 | fi | ||
2216 | 1402 | prev="$cmd" | ||
2217 | 1403 | done | ||
2218 | 1404 | |||
2219 | 1405 | if test "$prev" != 'sed 50q "[$]0"'; then | ||
2220 | 1406 | echo_test_string=`eval $prev` | ||
2221 | 1407 | export echo_test_string | ||
2222 | 1408 | exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} | ||
2223 | 1409 | else | ||
2224 | 1410 | # Oops. We lost completely, so just stick with echo. | ||
2225 | 1411 | ECHO=echo | ||
2226 | 1412 | fi | ||
2227 | 1413 | fi | ||
2228 | 1414 | fi | ||
2229 | 1415 | fi | ||
2230 | 1416 | fi | ||
2231 | 1417 | fi | ||
2232 | 1418 | |||
2233 | 1419 | # Copy echo and quote the copy suitably for passing to libtool from | ||
2234 | 1420 | # the Makefile, instead of quoting the original, which is used later. | ||
2235 | 1421 | lt_ECHO=$ECHO | ||
2236 | 1422 | if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then | ||
2237 | 1423 | lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" | ||
2238 | 1424 | fi | ||
2239 | 1425 | |||
2240 | 1426 | AC_SUBST(lt_ECHO) | ||
2241 | 1427 | ]) | ||
2252 | 1428 | _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) | 2017 | _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) |
2255 | 1429 | _LT_DECL([], [ECHO], [1], | 2018 | _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) |
2254 | 1430 | [An echo program that does not interpret backslashes]) | ||
2256 | 1431 | ])# _LT_PROG_ECHO_BACKSLASH | 2019 | ])# _LT_PROG_ECHO_BACKSLASH |
2257 | 1432 | 2020 | ||
2258 | 1433 | 2021 | ||
2259 | @@ -1459,7 +2047,7 @@ | |||
2260 | 1459 | ;; | 2047 | ;; |
2261 | 1460 | *-*-irix6*) | 2048 | *-*-irix6*) |
2262 | 1461 | # Find out which ABI we are using. | 2049 | # Find out which ABI we are using. |
2264 | 1462 | echo '[#]line __oline__ "configure"' > conftest.$ac_ext | 2050 | echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext |
2265 | 1463 | if AC_TRY_EVAL(ac_compile); then | 2051 | if AC_TRY_EVAL(ac_compile); then |
2266 | 1464 | if test "$lt_cv_prog_gnu_ld" = yes; then | 2052 | if test "$lt_cv_prog_gnu_ld" = yes; then |
2267 | 1465 | case `/usr/bin/file conftest.$ac_objext` in | 2053 | case `/usr/bin/file conftest.$ac_objext` in |
2268 | @@ -1611,10 +2199,19 @@ | |||
2269 | 1611 | esac | 2199 | esac |
2270 | 1612 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" | 2200 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
2271 | 1613 | fi | 2201 | fi |
2272 | 2202 | |||
2273 | 2203 | case $host_os in | ||
2274 | 2204 | darwin*) | ||
2275 | 2205 | lock_old_archive_extraction=yes ;; | ||
2276 | 2206 | *) | ||
2277 | 2207 | lock_old_archive_extraction=no ;; | ||
2278 | 2208 | esac | ||
2279 | 1614 | _LT_DECL([], [old_postinstall_cmds], [2]) | 2209 | _LT_DECL([], [old_postinstall_cmds], [2]) |
2280 | 1615 | _LT_DECL([], [old_postuninstall_cmds], [2]) | 2210 | _LT_DECL([], [old_postuninstall_cmds], [2]) |
2281 | 1616 | _LT_TAGDECL([], [old_archive_cmds], [2], | 2211 | _LT_TAGDECL([], [old_archive_cmds], [2], |
2282 | 1617 | [Commands used to build an old-style archive]) | 2212 | [Commands used to build an old-style archive]) |
2283 | 2213 | _LT_DECL([], [lock_old_archive_extraction], [0], | ||
2284 | 2214 | [Whether to use a lock for old archive extraction]) | ||
2285 | 1618 | ])# _LT_CMD_OLD_ARCHIVE | 2215 | ])# _LT_CMD_OLD_ARCHIVE |
2286 | 1619 | 2216 | ||
2287 | 1620 | 2217 | ||
2288 | @@ -1639,15 +2236,15 @@ | |||
2289 | 1639 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 2236 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
2290 | 1640 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ | 2237 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
2291 | 1641 | -e 's:$: $lt_compiler_flag:'` | 2238 | -e 's:$: $lt_compiler_flag:'` |
2293 | 1642 | (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) | 2239 | (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2294 | 1643 | (eval "$lt_compile" 2>conftest.err) | 2240 | (eval "$lt_compile" 2>conftest.err) |
2295 | 1644 | ac_status=$? | 2241 | ac_status=$? |
2296 | 1645 | cat conftest.err >&AS_MESSAGE_LOG_FD | 2242 | cat conftest.err >&AS_MESSAGE_LOG_FD |
2298 | 1646 | echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD | 2243 | echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2299 | 1647 | if (exit $ac_status) && test -s "$ac_outfile"; then | 2244 | if (exit $ac_status) && test -s "$ac_outfile"; then |
2300 | 1648 | # The compiler can only warn and ignore the option if not recognized | 2245 | # The compiler can only warn and ignore the option if not recognized |
2301 | 1649 | # So say no if there are warnings other than the usual output. | 2246 | # So say no if there are warnings other than the usual output. |
2303 | 1650 | $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp | 2247 | $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
2304 | 1651 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | 2248 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2305 | 1652 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then | 2249 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
2306 | 1653 | $2=yes | 2250 | $2=yes |
2307 | @@ -1687,7 +2284,7 @@ | |||
2308 | 1687 | if test -s conftest.err; then | 2284 | if test -s conftest.err; then |
2309 | 1688 | # Append any errors to the config.log. | 2285 | # Append any errors to the config.log. |
2310 | 1689 | cat conftest.err 1>&AS_MESSAGE_LOG_FD | 2286 | cat conftest.err 1>&AS_MESSAGE_LOG_FD |
2312 | 1690 | $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp | 2287 | $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp |
2313 | 1691 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | 2288 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2314 | 1692 | if diff conftest.exp conftest.er2 >/dev/null; then | 2289 | if diff conftest.exp conftest.er2 >/dev/null; then |
2315 | 1693 | $2=yes | 2290 | $2=yes |
2316 | @@ -1739,7 +2336,7 @@ | |||
2317 | 1739 | lt_cv_sys_max_cmd_len=-1; | 2336 | lt_cv_sys_max_cmd_len=-1; |
2318 | 1740 | ;; | 2337 | ;; |
2319 | 1741 | 2338 | ||
2321 | 1742 | cygwin* | mingw*) | 2339 | cygwin* | mingw* | cegcc*) |
2322 | 1743 | # On Win9x/ME, this test blows up -- it succeeds, but takes | 2340 | # On Win9x/ME, this test blows up -- it succeeds, but takes |
2323 | 1744 | # about 5 minutes as the teststring grows exponentially. | 2341 | # about 5 minutes as the teststring grows exponentially. |
2324 | 1745 | # Worse, since 9x/ME are not pre-emptively multitasking, | 2342 | # Worse, since 9x/ME are not pre-emptively multitasking, |
2325 | @@ -1750,6 +2347,11 @@ | |||
2326 | 1750 | lt_cv_sys_max_cmd_len=8192; | 2347 | lt_cv_sys_max_cmd_len=8192; |
2327 | 1751 | ;; | 2348 | ;; |
2328 | 1752 | 2349 | ||
2329 | 2350 | mint*) | ||
2330 | 2351 | # On MiNT this can take a long time and run out of memory. | ||
2331 | 2352 | lt_cv_sys_max_cmd_len=8192; | ||
2332 | 2353 | ;; | ||
2333 | 2354 | |||
2334 | 1753 | amigaos*) | 2355 | amigaos*) |
2335 | 1754 | # On AmigaOS with pdksh, this test takes hours, literally. | 2356 | # On AmigaOS with pdksh, this test takes hours, literally. |
2336 | 1755 | # So we just punt and use a minimum line length of 8192. | 2357 | # So we just punt and use a minimum line length of 8192. |
2337 | @@ -1814,8 +2416,8 @@ | |||
2338 | 1814 | # If test is not a shell built-in, we'll probably end up computing a | 2416 | # If test is not a shell built-in, we'll probably end up computing a |
2339 | 1815 | # maximum length that is only half of the actual maximum length, but | 2417 | # maximum length that is only half of the actual maximum length, but |
2340 | 1816 | # we can't tell. | 2418 | # we can't tell. |
2343 | 1817 | while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ | 2419 | while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
2344 | 1818 | = "XX$teststring$teststring"; } >/dev/null 2>&1 && | 2420 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
2345 | 1819 | test $i != 17 # 1/2 MB should be enough | 2421 | test $i != 17 # 1/2 MB should be enough |
2346 | 1820 | do | 2422 | do |
2347 | 1821 | i=`expr $i + 1` | 2423 | i=`expr $i + 1` |
2348 | @@ -1866,7 +2468,7 @@ | |||
2349 | 1866 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 2468 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
2350 | 1867 | lt_status=$lt_dlunknown | 2469 | lt_status=$lt_dlunknown |
2351 | 1868 | cat > conftest.$ac_ext <<_LT_EOF | 2470 | cat > conftest.$ac_ext <<_LT_EOF |
2353 | 1869 | [#line __oline__ "configure" | 2471 | [#line $LINENO "configure" |
2354 | 1870 | #include "confdefs.h" | 2472 | #include "confdefs.h" |
2355 | 1871 | 2473 | ||
2356 | 1872 | #if HAVE_DLFCN_H | 2474 | #if HAVE_DLFCN_H |
2357 | @@ -1907,11 +2509,13 @@ | |||
2358 | 1907 | # endif | 2509 | # endif |
2359 | 1908 | #endif | 2510 | #endif |
2360 | 1909 | 2511 | ||
2363 | 1910 | #ifdef __cplusplus | 2512 | /* When -fvisbility=hidden is used, assume the code has been annotated |
2364 | 1911 | extern "C" void exit (int); | 2513 | correspondingly for the symbols needed. */ |
2365 | 2514 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
2366 | 2515 | void fnord () __attribute__((visibility("default"))); | ||
2367 | 1912 | #endif | 2516 | #endif |
2368 | 1913 | 2517 | ||
2370 | 1914 | void fnord() { int i=42;} | 2518 | void fnord () { int i=42; } |
2371 | 1915 | int main () | 2519 | int main () |
2372 | 1916 | { | 2520 | { |
2373 | 1917 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 2521 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
2374 | @@ -1920,13 +2524,17 @@ | |||
2375 | 1920 | if (self) | 2524 | if (self) |
2376 | 1921 | { | 2525 | { |
2377 | 1922 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; | 2526 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
2379 | 1923 | else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; | 2527 | else |
2380 | 2528 | { | ||
2381 | 2529 | if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; | ||
2382 | 2530 | else puts (dlerror ()); | ||
2383 | 2531 | } | ||
2384 | 1924 | /* dlclose (self); */ | 2532 | /* dlclose (self); */ |
2385 | 1925 | } | 2533 | } |
2386 | 1926 | else | 2534 | else |
2387 | 1927 | puts (dlerror ()); | 2535 | puts (dlerror ()); |
2388 | 1928 | 2536 | ||
2390 | 1929 | exit (status); | 2537 | return status; |
2391 | 1930 | }] | 2538 | }] |
2392 | 1931 | _LT_EOF | 2539 | _LT_EOF |
2393 | 1932 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then | 2540 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then |
2394 | @@ -1965,7 +2573,7 @@ | |||
2395 | 1965 | lt_cv_dlopen_self=yes | 2573 | lt_cv_dlopen_self=yes |
2396 | 1966 | ;; | 2574 | ;; |
2397 | 1967 | 2575 | ||
2399 | 1968 | mingw* | pw32*) | 2576 | mingw* | pw32* | cegcc*) |
2400 | 1969 | lt_cv_dlopen="LoadLibrary" | 2577 | lt_cv_dlopen="LoadLibrary" |
2401 | 1970 | lt_cv_dlopen_libs= | 2578 | lt_cv_dlopen_libs= |
2402 | 1971 | ;; | 2579 | ;; |
2403 | @@ -2096,16 +2704,16 @@ | |||
2404 | 2096 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 2704 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
2405 | 2097 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ | 2705 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
2406 | 2098 | -e 's:$: $lt_compiler_flag:'` | 2706 | -e 's:$: $lt_compiler_flag:'` |
2408 | 2099 | (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) | 2707 | (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
2409 | 2100 | (eval "$lt_compile" 2>out/conftest.err) | 2708 | (eval "$lt_compile" 2>out/conftest.err) |
2410 | 2101 | ac_status=$? | 2709 | ac_status=$? |
2411 | 2102 | cat out/conftest.err >&AS_MESSAGE_LOG_FD | 2710 | cat out/conftest.err >&AS_MESSAGE_LOG_FD |
2413 | 2103 | echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD | 2711 | echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
2414 | 2104 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 2712 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
2415 | 2105 | then | 2713 | then |
2416 | 2106 | # The compiler can only warn and ignore the option if not recognized | 2714 | # The compiler can only warn and ignore the option if not recognized |
2417 | 2107 | # So say no if there are warnings | 2715 | # So say no if there are warnings |
2419 | 2108 | $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp | 2716 | $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp |
2420 | 2109 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 | 2717 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
2421 | 2110 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then | 2718 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
2422 | 2111 | _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes | 2719 | _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes |
2423 | @@ -2262,7 +2870,9 @@ | |||
2424 | 2262 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl | 2870 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
2425 | 2263 | m4_require([_LT_DECL_EGREP])dnl | 2871 | m4_require([_LT_DECL_EGREP])dnl |
2426 | 2264 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 2872 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2427 | 2873 | m4_require([_LT_DECL_OBJDUMP])dnl | ||
2428 | 2265 | m4_require([_LT_DECL_SED])dnl | 2874 | m4_require([_LT_DECL_SED])dnl |
2429 | 2875 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl | ||
2430 | 2266 | AC_MSG_CHECKING([dynamic linker characteristics]) | 2876 | AC_MSG_CHECKING([dynamic linker characteristics]) |
2431 | 2267 | m4_if([$1], | 2877 | m4_if([$1], |
2432 | 2268 | [], [ | 2878 | [], [ |
2433 | @@ -2271,16 +2881,23 @@ | |||
2434 | 2271 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; | 2881 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; |
2435 | 2272 | *) lt_awk_arg="/^libraries:/" ;; | 2882 | *) lt_awk_arg="/^libraries:/" ;; |
2436 | 2273 | esac | 2883 | esac |
2439 | 2274 | lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` | 2884 | case $host_os in |
2440 | 2275 | if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then | 2885 | mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; |
2441 | 2886 | *) lt_sed_strip_eq="s,=/,/,g" ;; | ||
2442 | 2887 | esac | ||
2443 | 2888 | lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` | ||
2444 | 2889 | case $lt_search_path_spec in | ||
2445 | 2890 | *\;*) | ||
2446 | 2276 | # if the path contains ";" then we assume it to be the separator | 2891 | # if the path contains ";" then we assume it to be the separator |
2447 | 2277 | # otherwise default to the standard path separator (i.e. ":") - it is | 2892 | # otherwise default to the standard path separator (i.e. ":") - it is |
2448 | 2278 | # assumed that no part of a normal pathname contains ";" but that should | 2893 | # assumed that no part of a normal pathname contains ";" but that should |
2449 | 2279 | # okay in the real world where ";" in dirpaths is itself problematic. | 2894 | # okay in the real world where ";" in dirpaths is itself problematic. |
2454 | 2280 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` | 2895 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` |
2455 | 2281 | else | 2896 | ;; |
2456 | 2282 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | 2897 | *) |
2457 | 2283 | fi | 2898 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` |
2458 | 2899 | ;; | ||
2459 | 2900 | esac | ||
2460 | 2284 | # Ok, now we have the path, separated by spaces, we can step through it | 2901 | # Ok, now we have the path, separated by spaces, we can step through it |
2461 | 2285 | # and add multilib dir if necessary. | 2902 | # and add multilib dir if necessary. |
2462 | 2286 | lt_tmp_lt_search_path_spec= | 2903 | lt_tmp_lt_search_path_spec= |
2463 | @@ -2293,7 +2910,7 @@ | |||
2464 | 2293 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" | 2910 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" |
2465 | 2294 | fi | 2911 | fi |
2466 | 2295 | done | 2912 | done |
2468 | 2296 | lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' | 2913 | lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' |
2469 | 2297 | BEGIN {RS=" "; FS="/|\n";} { | 2914 | BEGIN {RS=" "; FS="/|\n";} { |
2470 | 2298 | lt_foo=""; | 2915 | lt_foo=""; |
2471 | 2299 | lt_count=0; | 2916 | lt_count=0; |
2472 | @@ -2313,7 +2930,13 @@ | |||
2473 | 2313 | if (lt_foo != "") { lt_freq[[lt_foo]]++; } | 2930 | if (lt_foo != "") { lt_freq[[lt_foo]]++; } |
2474 | 2314 | if (lt_freq[[lt_foo]] == 1) { print lt_foo; } | 2931 | if (lt_freq[[lt_foo]] == 1) { print lt_foo; } |
2475 | 2315 | }'` | 2932 | }'` |
2477 | 2316 | sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` | 2933 | # AWK program above erroneously prepends '/' to C:/dos/paths |
2478 | 2934 | # for these hosts. | ||
2479 | 2935 | case $host_os in | ||
2480 | 2936 | mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ | ||
2481 | 2937 | $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; | ||
2482 | 2938 | esac | ||
2483 | 2939 | sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` | ||
2484 | 2317 | else | 2940 | else |
2485 | 2318 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" | 2941 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" |
2486 | 2319 | fi]) | 2942 | fi]) |
2487 | @@ -2401,7 +3024,7 @@ | |||
2488 | 2401 | m68k) | 3024 | m68k) |
2489 | 2402 | library_names_spec='$libname.ixlibrary $libname.a' | 3025 | library_names_spec='$libname.ixlibrary $libname.a' |
2490 | 2403 | # Create ${libname}_ixlibrary.a entries in /sys/libs. | 3026 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
2492 | 2404 | 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' | 3027 | 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 | 2405 | ;; | 3028 | ;; |
2494 | 2406 | esac | 3029 | esac |
2495 | 2407 | ;; | 3030 | ;; |
2496 | @@ -2426,14 +3049,14 @@ | |||
2497 | 2426 | # libtool to hard-code these into programs | 3049 | # libtool to hard-code these into programs |
2498 | 2427 | ;; | 3050 | ;; |
2499 | 2428 | 3051 | ||
2501 | 2429 | cygwin* | mingw* | pw32*) | 3052 | cygwin* | mingw* | pw32* | cegcc*) |
2502 | 2430 | version_type=windows | 3053 | version_type=windows |
2503 | 2431 | shrext_cmds=".dll" | 3054 | shrext_cmds=".dll" |
2504 | 2432 | need_version=no | 3055 | need_version=no |
2505 | 2433 | need_lib_prefix=no | 3056 | need_lib_prefix=no |
2506 | 2434 | 3057 | ||
2507 | 2435 | case $GCC,$host_os in | 3058 | case $GCC,$host_os in |
2509 | 2436 | yes,cygwin* | yes,mingw* | yes,pw32*) | 3059 | yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
2510 | 2437 | library_names_spec='$libname.dll.a' | 3060 | library_names_spec='$libname.dll.a' |
2511 | 2438 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 3061 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
2512 | 2439 | postinstall_cmds='base_file=`basename \${file}`~ | 3062 | postinstall_cmds='base_file=`basename \${file}`~ |
2513 | @@ -2454,23 +3077,12 @@ | |||
2514 | 2454 | cygwin*) | 3077 | cygwin*) |
2515 | 2455 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' | 3078 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
2516 | 2456 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | 3079 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
2518 | 2457 | sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" | 3080 | m4_if([$1], [],[ |
2519 | 3081 | sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) | ||
2520 | 2458 | ;; | 3082 | ;; |
2522 | 2459 | mingw*) | 3083 | mingw* | cegcc*) |
2523 | 2460 | # MinGW DLLs use traditional 'lib' prefix | 3084 | # MinGW DLLs use traditional 'lib' prefix |
2524 | 2461 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | 3085 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
2525 | 2462 | sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` | ||
2526 | 2463 | if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then | ||
2527 | 2464 | # It is most probably a Windows format PATH printed by | ||
2528 | 2465 | # mingw gcc, but we are running on Cygwin. Gcc prints its search | ||
2529 | 2466 | # path with ; separators, and with drive letters. We can handle the | ||
2530 | 2467 | # drive letters (cygwin fileutils understands them), so leave them, | ||
2531 | 2468 | # especially as we might pass files found there to a mingw objdump, | ||
2532 | 2469 | # which wouldn't understand a cygwinified path. Ahh. | ||
2533 | 2470 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
2534 | 2471 | else | ||
2535 | 2472 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
2536 | 2473 | fi | ||
2537 | 2474 | ;; | 3086 | ;; |
2538 | 2475 | pw32*) | 3087 | pw32*) |
2539 | 2476 | # pw32 DLLs use 'pw' prefix rather than 'lib' | 3088 | # pw32 DLLs use 'pw' prefix rather than 'lib' |
2540 | @@ -2527,7 +3139,14 @@ | |||
2541 | 2527 | *) objformat=elf ;; | 3139 | *) objformat=elf ;; |
2542 | 2528 | esac | 3140 | esac |
2543 | 2529 | fi | 3141 | fi |
2545 | 2530 | version_type=freebsd-$objformat | 3142 | # Handle Gentoo/FreeBSD as it was Linux |
2546 | 3143 | case $host_vendor in | ||
2547 | 3144 | gentoo) | ||
2548 | 3145 | version_type=linux ;; | ||
2549 | 3146 | *) | ||
2550 | 3147 | version_type=freebsd-$objformat ;; | ||
2551 | 3148 | esac | ||
2552 | 3149 | |||
2553 | 2531 | case $version_type in | 3150 | case $version_type in |
2554 | 2532 | freebsd-elf*) | 3151 | freebsd-elf*) |
2555 | 2533 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' | 3152 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
2556 | @@ -2538,6 +3157,12 @@ | |||
2557 | 2538 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' | 3157 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
2558 | 2539 | need_version=yes | 3158 | need_version=yes |
2559 | 2540 | ;; | 3159 | ;; |
2560 | 3160 | linux) | ||
2561 | 3161 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
2562 | 3162 | soname_spec='${libname}${release}${shared_ext}$major' | ||
2563 | 3163 | need_lib_prefix=no | ||
2564 | 3164 | need_version=no | ||
2565 | 3165 | ;; | ||
2566 | 2541 | esac | 3166 | esac |
2567 | 2542 | shlibpath_var=LD_LIBRARY_PATH | 3167 | shlibpath_var=LD_LIBRARY_PATH |
2568 | 2543 | case $host_os in | 3168 | case $host_os in |
2569 | @@ -2570,6 +3195,19 @@ | |||
2570 | 2570 | hardcode_into_libs=yes | 3195 | hardcode_into_libs=yes |
2571 | 2571 | ;; | 3196 | ;; |
2572 | 2572 | 3197 | ||
2573 | 3198 | haiku*) | ||
2574 | 3199 | version_type=linux | ||
2575 | 3200 | need_lib_prefix=no | ||
2576 | 3201 | need_version=no | ||
2577 | 3202 | dynamic_linker="$host_os runtime_loader" | ||
2578 | 3203 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | ||
2579 | 3204 | soname_spec='${libname}${release}${shared_ext}$major' | ||
2580 | 3205 | shlibpath_var=LIBRARY_PATH | ||
2581 | 3206 | shlibpath_overrides_runpath=yes | ||
2582 | 3207 | sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | ||
2583 | 3208 | hardcode_into_libs=yes | ||
2584 | 3209 | ;; | ||
2585 | 3210 | |||
2586 | 2573 | hpux9* | hpux10* | hpux11*) | 3211 | hpux9* | hpux10* | hpux11*) |
2587 | 2574 | # Give a soname corresponding to the major version so that dld.sl refuses to | 3212 | # Give a soname corresponding to the major version so that dld.sl refuses to |
2588 | 2575 | # link against other versions. | 3213 | # link against other versions. |
2589 | @@ -2612,8 +3250,10 @@ | |||
2590 | 2612 | soname_spec='${libname}${release}${shared_ext}$major' | 3250 | soname_spec='${libname}${release}${shared_ext}$major' |
2591 | 2613 | ;; | 3251 | ;; |
2592 | 2614 | esac | 3252 | esac |
2594 | 2615 | # HP-UX runs *really* slowly unless shared libraries are mode 555. | 3253 | # HP-UX runs *really* slowly unless shared libraries are mode 555, ... |
2595 | 2616 | postinstall_cmds='chmod 555 $lib' | 3254 | postinstall_cmds='chmod 555 $lib' |
2596 | 3255 | # or fails outright, so override atomically: | ||
2597 | 3256 | install_override_mode=555 | ||
2598 | 2617 | ;; | 3257 | ;; |
2599 | 2618 | 3258 | ||
2600 | 2619 | interix[[3-9]]*) | 3259 | interix[[3-9]]*) |
2601 | @@ -2671,7 +3311,7 @@ | |||
2602 | 2671 | ;; | 3311 | ;; |
2603 | 2672 | 3312 | ||
2604 | 2673 | # This must be Linux ELF. | 3313 | # This must be Linux ELF. |
2606 | 2674 | linux* | k*bsd*-gnu) | 3314 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2607 | 2675 | version_type=linux | 3315 | version_type=linux |
2608 | 2676 | need_lib_prefix=no | 3316 | need_lib_prefix=no |
2609 | 2677 | need_version=no | 3317 | need_version=no |
2610 | @@ -2680,16 +3320,21 @@ | |||
2611 | 2680 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' | 3320 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
2612 | 2681 | shlibpath_var=LD_LIBRARY_PATH | 3321 | shlibpath_var=LD_LIBRARY_PATH |
2613 | 2682 | shlibpath_overrides_runpath=no | 3322 | shlibpath_overrides_runpath=no |
2614 | 3323 | |||
2615 | 2683 | # Some binutils ld are patched to set DT_RUNPATH | 3324 | # Some binutils ld are patched to set DT_RUNPATH |
2625 | 2684 | save_LDFLAGS=$LDFLAGS | 3325 | AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], |
2626 | 2685 | save_libdir=$libdir | 3326 | [lt_cv_shlibpath_overrides_runpath=no |
2627 | 2686 | eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ | 3327 | save_LDFLAGS=$LDFLAGS |
2628 | 2687 | LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" | 3328 | save_libdir=$libdir |
2629 | 2688 | AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], | 3329 | eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ |
2630 | 2689 | [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], | 3330 | LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" |
2631 | 2690 | [shlibpath_overrides_runpath=yes])]) | 3331 | AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
2632 | 2691 | LDFLAGS=$save_LDFLAGS | 3332 | [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], |
2633 | 2692 | libdir=$save_libdir | 3333 | [lt_cv_shlibpath_overrides_runpath=yes])]) |
2634 | 3334 | LDFLAGS=$save_LDFLAGS | ||
2635 | 3335 | libdir=$save_libdir | ||
2636 | 3336 | ]) | ||
2637 | 3337 | shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath | ||
2638 | 2693 | 3338 | ||
2639 | 2694 | # This implies no fast_install, which is unacceptable. | 3339 | # This implies no fast_install, which is unacceptable. |
2640 | 2695 | # Some rework will be needed to allow for fast_install | 3340 | # Some rework will be needed to allow for fast_install |
2641 | @@ -2698,7 +3343,7 @@ | |||
2642 | 2698 | 3343 | ||
2643 | 2699 | # Append ld.so.conf contents to the search path | 3344 | # Append ld.so.conf contents to the search path |
2644 | 2700 | if test -f /etc/ld.so.conf; then | 3345 | if test -f /etc/ld.so.conf; then |
2646 | 2701 | 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' ' '` | 3346 | 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 | 2702 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | 3347 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
2648 | 2703 | fi | 3348 | fi |
2649 | 2704 | 3349 | ||
2650 | @@ -2711,18 +3356,6 @@ | |||
2651 | 2711 | dynamic_linker='GNU/Linux ld.so' | 3356 | dynamic_linker='GNU/Linux ld.so' |
2652 | 2712 | ;; | 3357 | ;; |
2653 | 2713 | 3358 | ||
2654 | 2714 | netbsdelf*-gnu) | ||
2655 | 2715 | version_type=linux | ||
2656 | 2716 | need_lib_prefix=no | ||
2657 | 2717 | need_version=no | ||
2658 | 2718 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | ||
2659 | 2719 | soname_spec='${libname}${release}${shared_ext}$major' | ||
2660 | 2720 | shlibpath_var=LD_LIBRARY_PATH | ||
2661 | 2721 | shlibpath_overrides_runpath=no | ||
2662 | 2722 | hardcode_into_libs=yes | ||
2663 | 2723 | dynamic_linker='NetBSD ld.elf_so' | ||
2664 | 2724 | ;; | ||
2665 | 2725 | |||
2666 | 2726 | netbsd*) | 3359 | netbsd*) |
2667 | 2727 | version_type=sunos | 3360 | version_type=sunos |
2668 | 2728 | need_lib_prefix=no | 3361 | need_lib_prefix=no |
2669 | @@ -2894,7 +3527,7 @@ | |||
2670 | 2894 | version_type=linux | 3527 | version_type=linux |
2671 | 2895 | need_lib_prefix=no | 3528 | need_lib_prefix=no |
2672 | 2896 | need_version=no | 3529 | need_version=no |
2674 | 2897 | library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 3530 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2675 | 2898 | shlibpath_var=LD_LIBRARY_PATH | 3531 | shlibpath_var=LD_LIBRARY_PATH |
2676 | 2899 | shlibpath_overrides_runpath=no | 3532 | shlibpath_overrides_runpath=no |
2677 | 2900 | hardcode_into_libs=yes | 3533 | hardcode_into_libs=yes |
2678 | @@ -2918,7 +3551,7 @@ | |||
2679 | 2918 | if test "$GCC" = yes; then | 3551 | if test "$GCC" = yes; then |
2680 | 2919 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | 3552 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
2681 | 2920 | fi | 3553 | fi |
2683 | 2921 | 3554 | ||
2684 | 2922 | if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then | 3555 | if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then |
2685 | 2923 | sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" | 3556 | sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" |
2686 | 2924 | fi | 3557 | fi |
2687 | @@ -2943,6 +3576,8 @@ | |||
2688 | 2943 | The last name is the one that the linker finds with -lNAME]]) | 3576 | The last name is the one that the linker finds with -lNAME]]) |
2689 | 2944 | _LT_DECL([], [soname_spec], [1], | 3577 | _LT_DECL([], [soname_spec], [1], |
2690 | 2945 | [[The coded name of the library, if different from the real name]]) | 3578 | [[The coded name of the library, if different from the real name]]) |
2691 | 3579 | _LT_DECL([], [install_override_mode], [1], | ||
2692 | 3580 | [Permission mode override for installation of shared libraries]) | ||
2693 | 2946 | _LT_DECL([], [postinstall_cmds], [2], | 3581 | _LT_DECL([], [postinstall_cmds], [2], |
2694 | 2947 | [Command to use after installation of a shared archive]) | 3582 | [Command to use after installation of a shared archive]) |
2695 | 2948 | _LT_DECL([], [postuninstall_cmds], [2], | 3583 | _LT_DECL([], [postuninstall_cmds], [2], |
2696 | @@ -3055,6 +3690,7 @@ | |||
2697 | 3055 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl | 3690 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
2698 | 3056 | m4_require([_LT_DECL_SED])dnl | 3691 | m4_require([_LT_DECL_SED])dnl |
2699 | 3057 | m4_require([_LT_DECL_EGREP])dnl | 3692 | m4_require([_LT_DECL_EGREP])dnl |
2700 | 3693 | m4_require([_LT_PROG_ECHO_BACKSLASH])dnl | ||
2701 | 3058 | 3694 | ||
2702 | 3059 | AC_ARG_WITH([gnu-ld], | 3695 | AC_ARG_WITH([gnu-ld], |
2703 | 3060 | [AS_HELP_STRING([--with-gnu-ld], | 3696 | [AS_HELP_STRING([--with-gnu-ld], |
2704 | @@ -3184,8 +3820,8 @@ | |||
2705 | 3184 | fi | 3820 | fi |
2706 | 3185 | ;; | 3821 | ;; |
2707 | 3186 | esac | 3822 | esac |
2710 | 3187 | _LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl | 3823 | _LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl |
2711 | 3188 | _LT_DECL([], [reload_cmds], [2])dnl | 3824 | _LT_TAGDECL([], [reload_cmds], [2])dnl |
2712 | 3189 | ])# _LT_CMD_RELOAD | 3825 | ])# _LT_CMD_RELOAD |
2713 | 3190 | 3826 | ||
2714 | 3191 | 3827 | ||
2715 | @@ -3195,6 +3831,7 @@ | |||
2716 | 3195 | # -- PORTME fill in with the dynamic library characteristics | 3831 | # -- PORTME fill in with the dynamic library characteristics |
2717 | 3196 | m4_defun([_LT_CHECK_MAGIC_METHOD], | 3832 | m4_defun([_LT_CHECK_MAGIC_METHOD], |
2718 | 3197 | [m4_require([_LT_DECL_EGREP]) | 3833 | [m4_require([_LT_DECL_EGREP]) |
2719 | 3834 | m4_require([_LT_DECL_OBJDUMP]) | ||
2720 | 3198 | AC_CACHE_CHECK([how to recognize dependent libraries], | 3835 | AC_CACHE_CHECK([how to recognize dependent libraries], |
2721 | 3199 | lt_cv_deplibs_check_method, | 3836 | lt_cv_deplibs_check_method, |
2722 | 3200 | [lt_cv_file_magic_cmd='$MAGIC_CMD' | 3837 | [lt_cv_file_magic_cmd='$MAGIC_CMD' |
2723 | @@ -3236,15 +3873,23 @@ | |||
2724 | 3236 | # Base MSYS/MinGW do not provide the 'file' command needed by | 3873 | # Base MSYS/MinGW do not provide the 'file' command needed by |
2725 | 3237 | # func_win32_libid shell function, so use a weaker test based on 'objdump', | 3874 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
2726 | 3238 | # unless we find 'file', for example because we are cross-compiling. | 3875 | # unless we find 'file', for example because we are cross-compiling. |
2728 | 3239 | if ( file / ) >/dev/null 2>&1; then | 3876 | # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. |
2729 | 3877 | if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then | ||
2730 | 3240 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 3878 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
2731 | 3241 | lt_cv_file_magic_cmd='func_win32_libid' | 3879 | lt_cv_file_magic_cmd='func_win32_libid' |
2732 | 3242 | else | 3880 | else |
2734 | 3243 | lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | 3881 | # Keep this pattern in sync with the one in func_win32_libid. |
2735 | 3882 | lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
2736 | 3244 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 3883 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
2737 | 3245 | fi | 3884 | fi |
2738 | 3246 | ;; | 3885 | ;; |
2739 | 3247 | 3886 | ||
2740 | 3887 | cegcc*) | ||
2741 | 3888 | # use the weaker test based on 'objdump'. See mingw*. | ||
2742 | 3889 | lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' | ||
2743 | 3890 | lt_cv_file_magic_cmd='$OBJDUMP -f' | ||
2744 | 3891 | ;; | ||
2745 | 3892 | |||
2746 | 3248 | darwin* | rhapsody*) | 3893 | darwin* | rhapsody*) |
2747 | 3249 | lt_cv_deplibs_check_method=pass_all | 3894 | lt_cv_deplibs_check_method=pass_all |
2748 | 3250 | ;; | 3895 | ;; |
2749 | @@ -3269,6 +3914,10 @@ | |||
2750 | 3269 | lt_cv_deplibs_check_method=pass_all | 3914 | lt_cv_deplibs_check_method=pass_all |
2751 | 3270 | ;; | 3915 | ;; |
2752 | 3271 | 3916 | ||
2753 | 3917 | haiku*) | ||
2754 | 3918 | lt_cv_deplibs_check_method=pass_all | ||
2755 | 3919 | ;; | ||
2756 | 3920 | |||
2757 | 3272 | hpux10.20* | hpux11*) | 3921 | hpux10.20* | hpux11*) |
2758 | 3273 | lt_cv_file_magic_cmd=/usr/bin/file | 3922 | lt_cv_file_magic_cmd=/usr/bin/file |
2759 | 3274 | case $host_cpu in | 3923 | case $host_cpu in |
2760 | @@ -3277,11 +3926,11 @@ | |||
2761 | 3277 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so | 3926 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
2762 | 3278 | ;; | 3927 | ;; |
2763 | 3279 | hppa*64*) | 3928 | hppa*64*) |
2765 | 3280 | [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]'] | 3929 | [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 | 3281 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl | 3930 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl |
2767 | 3282 | ;; | 3931 | ;; |
2768 | 3283 | *) | 3932 | *) |
2770 | 3284 | lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' | 3933 | lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' |
2771 | 3285 | lt_cv_file_magic_test_file=/usr/lib/libc.sl | 3934 | lt_cv_file_magic_test_file=/usr/lib/libc.sl |
2772 | 3286 | ;; | 3935 | ;; |
2773 | 3287 | esac | 3936 | esac |
2774 | @@ -3303,11 +3952,11 @@ | |||
2775 | 3303 | ;; | 3952 | ;; |
2776 | 3304 | 3953 | ||
2777 | 3305 | # This must be Linux ELF. | 3954 | # This must be Linux ELF. |
2779 | 3306 | linux* | k*bsd*-gnu) | 3955 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2780 | 3307 | lt_cv_deplibs_check_method=pass_all | 3956 | lt_cv_deplibs_check_method=pass_all |
2781 | 3308 | ;; | 3957 | ;; |
2782 | 3309 | 3958 | ||
2784 | 3310 | netbsd* | netbsdelf*-gnu) | 3959 | netbsd*) |
2785 | 3311 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then | 3960 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
2786 | 3312 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' | 3961 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' |
2787 | 3313 | else | 3962 | else |
2788 | @@ -3445,7 +4094,19 @@ | |||
2789 | 3445 | NM="$lt_cv_path_NM" | 4094 | NM="$lt_cv_path_NM" |
2790 | 3446 | else | 4095 | else |
2791 | 3447 | # Didn't find any BSD compatible name lister, look for dumpbin. | 4096 | # Didn't find any BSD compatible name lister, look for dumpbin. |
2793 | 3448 | AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) | 4097 | if test -n "$DUMPBIN"; then : |
2794 | 4098 | # Let the user override the test. | ||
2795 | 4099 | else | ||
2796 | 4100 | AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) | ||
2797 | 4101 | case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in | ||
2798 | 4102 | *COFF*) | ||
2799 | 4103 | DUMPBIN="$DUMPBIN -symbols" | ||
2800 | 4104 | ;; | ||
2801 | 4105 | *) | ||
2802 | 4106 | DUMPBIN=: | ||
2803 | 4107 | ;; | ||
2804 | 4108 | esac | ||
2805 | 4109 | fi | ||
2806 | 3449 | AC_SUBST([DUMPBIN]) | 4110 | AC_SUBST([DUMPBIN]) |
2807 | 3450 | if test "$DUMPBIN" != ":"; then | 4111 | if test "$DUMPBIN" != ":"; then |
2808 | 3451 | NM="$DUMPBIN" | 4112 | NM="$DUMPBIN" |
2809 | @@ -3458,13 +4119,13 @@ | |||
2810 | 3458 | AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], | 4119 | AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], |
2811 | 3459 | [lt_cv_nm_interface="BSD nm" | 4120 | [lt_cv_nm_interface="BSD nm" |
2812 | 3460 | echo "int some_variable = 0;" > conftest.$ac_ext | 4121 | echo "int some_variable = 0;" > conftest.$ac_ext |
2814 | 3461 | (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) | 4122 | (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
2815 | 3462 | (eval "$ac_compile" 2>conftest.err) | 4123 | (eval "$ac_compile" 2>conftest.err) |
2816 | 3463 | cat conftest.err >&AS_MESSAGE_LOG_FD | 4124 | cat conftest.err >&AS_MESSAGE_LOG_FD |
2818 | 3464 | (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) | 4125 | (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
2819 | 3465 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) | 4126 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
2820 | 3466 | cat conftest.err >&AS_MESSAGE_LOG_FD | 4127 | cat conftest.err >&AS_MESSAGE_LOG_FD |
2822 | 3467 | (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) | 4128 | (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) |
2823 | 3468 | cat conftest.out >&AS_MESSAGE_LOG_FD | 4129 | cat conftest.out >&AS_MESSAGE_LOG_FD |
2824 | 3469 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then | 4130 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
2825 | 3470 | lt_cv_nm_interface="MS dumpbin" | 4131 | lt_cv_nm_interface="MS dumpbin" |
2826 | @@ -3487,7 +4148,7 @@ | |||
2827 | 3487 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl | 4148 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
2828 | 3488 | LIBM= | 4149 | LIBM= |
2829 | 3489 | case $host in | 4150 | case $host in |
2831 | 3490 | *-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) | 4151 | *-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) |
2832 | 3491 | # These system don't have libm, or don't need it | 4152 | # These system don't have libm, or don't need it |
2833 | 3492 | ;; | 4153 | ;; |
2834 | 3493 | *-ncr-sysv4.3*) | 4154 | *-ncr-sysv4.3*) |
2835 | @@ -3515,7 +4176,12 @@ | |||
2836 | 3515 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= | 4176 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= |
2837 | 3516 | 4177 | ||
2838 | 3517 | if test "$GCC" = yes; then | 4178 | if test "$GCC" = yes; then |
2840 | 3518 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' | 4179 | case $cc_basename in |
2841 | 4180 | nvcc*) | ||
2842 | 4181 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; | ||
2843 | 4182 | *) | ||
2844 | 4183 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; | ||
2845 | 4184 | esac | ||
2846 | 3519 | 4185 | ||
2847 | 3520 | _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], | 4186 | _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], |
2848 | 3521 | lt_cv_prog_compiler_rtti_exceptions, | 4187 | lt_cv_prog_compiler_rtti_exceptions, |
2849 | @@ -3532,6 +4198,7 @@ | |||
2850 | 3532 | m4_defun([_LT_CMD_GLOBAL_SYMBOLS], | 4198 | m4_defun([_LT_CMD_GLOBAL_SYMBOLS], |
2851 | 3533 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl | 4199 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
2852 | 3534 | AC_REQUIRE([AC_PROG_CC])dnl | 4200 | AC_REQUIRE([AC_PROG_CC])dnl |
2853 | 4201 | AC_REQUIRE([AC_PROG_AWK])dnl | ||
2854 | 3535 | AC_REQUIRE([LT_PATH_NM])dnl | 4202 | AC_REQUIRE([LT_PATH_NM])dnl |
2855 | 3536 | AC_REQUIRE([LT_PATH_LD])dnl | 4203 | AC_REQUIRE([LT_PATH_LD])dnl |
2856 | 3537 | m4_require([_LT_DECL_SED])dnl | 4204 | m4_require([_LT_DECL_SED])dnl |
2857 | @@ -3556,7 +4223,7 @@ | |||
2858 | 3556 | aix*) | 4223 | aix*) |
2859 | 3557 | symcode='[[BCDT]]' | 4224 | symcode='[[BCDT]]' |
2860 | 3558 | ;; | 4225 | ;; |
2862 | 3559 | cygwin* | mingw* | pw32*) | 4226 | cygwin* | mingw* | pw32* | cegcc*) |
2863 | 3560 | symcode='[[ABCDGISTW]]' | 4227 | symcode='[[ABCDGISTW]]' |
2864 | 3561 | ;; | 4228 | ;; |
2865 | 3562 | hpux*) | 4229 | hpux*) |
2866 | @@ -3657,7 +4324,7 @@ | |||
2867 | 3657 | if AC_TRY_EVAL(ac_compile); then | 4324 | if AC_TRY_EVAL(ac_compile); then |
2868 | 3658 | # Now try to grab the symbols. | 4325 | # Now try to grab the symbols. |
2869 | 3659 | nlist=conftest.nm | 4326 | nlist=conftest.nm |
2871 | 3660 | if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then | 4327 | if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then |
2872 | 3661 | # Try sorting and uniquifying the output. | 4328 | # Try sorting and uniquifying the output. |
2873 | 3662 | if sort "$nlist" | uniq > "$nlist"T; then | 4329 | if sort "$nlist" | uniq > "$nlist"T; then |
2874 | 3663 | mv -f "$nlist"T "$nlist" | 4330 | mv -f "$nlist"T "$nlist" |
2875 | @@ -3802,7 +4469,7 @@ | |||
2876 | 3802 | beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) | 4469 | beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) |
2877 | 3803 | # PIC is the default for these OSes. | 4470 | # PIC is the default for these OSes. |
2878 | 3804 | ;; | 4471 | ;; |
2880 | 3805 | mingw* | cygwin* | os2* | pw32*) | 4472 | mingw* | cygwin* | os2* | pw32* | cegcc*) |
2881 | 3806 | # This hack is so that the source file can tell whether it is being | 4473 | # This hack is so that the source file can tell whether it is being |
2882 | 3807 | # built for inclusion in a dll (and should export symbols for example). | 4474 | # built for inclusion in a dll (and should export symbols for example). |
2883 | 3808 | # Although the cygwin gcc ignores -fPIC, still need this for old-style | 4475 | # Although the cygwin gcc ignores -fPIC, still need this for old-style |
2884 | @@ -3819,6 +4486,11 @@ | |||
2885 | 3819 | # DJGPP does not support shared libraries at all | 4486 | # DJGPP does not support shared libraries at all |
2886 | 3820 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= | 4487 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
2887 | 3821 | ;; | 4488 | ;; |
2888 | 4489 | haiku*) | ||
2889 | 4490 | # PIC is the default for Haiku. | ||
2890 | 4491 | # The "-static" flag exists, but is broken. | ||
2891 | 4492 | _LT_TAGVAR(lt_prog_compiler_static, $1)= | ||
2892 | 4493 | ;; | ||
2893 | 3822 | interix[[3-9]]*) | 4494 | interix[[3-9]]*) |
2894 | 3823 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. | 4495 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
2895 | 3824 | # Instead, we relocate shared libraries at runtime. | 4496 | # Instead, we relocate shared libraries at runtime. |
2896 | @@ -3829,10 +4501,11 @@ | |||
2897 | 3829 | fi | 4501 | fi |
2898 | 3830 | ;; | 4502 | ;; |
2899 | 3831 | hpux*) | 4503 | hpux*) |
2902 | 3832 | # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but | 4504 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
2903 | 3833 | # not for PA HP-UX. | 4505 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
2904 | 4506 | # sets the default TLS model and affects inlining. | ||
2905 | 3834 | case $host_cpu in | 4507 | case $host_cpu in |
2907 | 3835 | hppa*64*|ia64*) | 4508 | hppa*64*) |
2908 | 3836 | ;; | 4509 | ;; |
2909 | 3837 | *) | 4510 | *) |
2910 | 3838 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' | 4511 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
2911 | @@ -3923,19 +4596,26 @@ | |||
2912 | 3923 | ;; | 4596 | ;; |
2913 | 3924 | esac | 4597 | esac |
2914 | 3925 | ;; | 4598 | ;; |
2916 | 3926 | linux* | k*bsd*-gnu) | 4599 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2917 | 3927 | case $cc_basename in | 4600 | case $cc_basename in |
2918 | 3928 | KCC*) | 4601 | KCC*) |
2919 | 3929 | # KAI C++ Compiler | 4602 | # KAI C++ Compiler |
2920 | 3930 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' | 4603 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' |
2921 | 3931 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' | 4604 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
2922 | 3932 | ;; | 4605 | ;; |
2925 | 3933 | icpc* | ecpc* ) | 4606 | ecpc* ) |
2926 | 3934 | # Intel C++ | 4607 | # old Intel C++ for x86_64 which still supported -KPIC. |
2927 | 3935 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4608 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
2928 | 3936 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4609 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
2929 | 3937 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' | 4610 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' |
2930 | 3938 | ;; | 4611 | ;; |
2931 | 4612 | icpc* ) | ||
2932 | 4613 | # Intel C++, used to be incompatible with GCC. | ||
2933 | 4614 | # ICC 10 doesn't accept -KPIC any more. | ||
2934 | 4615 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | ||
2935 | 4616 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' | ||
2936 | 4617 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' | ||
2937 | 4618 | ;; | ||
2938 | 3939 | pgCC* | pgcpp*) | 4619 | pgCC* | pgcpp*) |
2939 | 3940 | # Portland Group C++ compiler | 4620 | # Portland Group C++ compiler |
2940 | 3941 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4621 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
2941 | @@ -3949,8 +4629,8 @@ | |||
2942 | 3949 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= | 4629 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
2943 | 3950 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | 4630 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
2944 | 3951 | ;; | 4631 | ;; |
2947 | 3952 | xlc* | xlC*) | 4632 | xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) |
2948 | 3953 | # IBM XL 8.0 on PPC | 4633 | # IBM XL 8.0, 9.0 on PPC and BlueGene |
2949 | 3954 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4634 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
2950 | 3955 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' | 4635 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
2951 | 3956 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' | 4636 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
2952 | @@ -3980,7 +4660,7 @@ | |||
2953 | 3980 | ;; | 4660 | ;; |
2954 | 3981 | esac | 4661 | esac |
2955 | 3982 | ;; | 4662 | ;; |
2957 | 3983 | netbsd* | netbsdelf*-gnu) | 4663 | netbsd*) |
2958 | 3984 | ;; | 4664 | ;; |
2959 | 3985 | *qnx* | *nto*) | 4665 | *qnx* | *nto*) |
2960 | 3986 | # QNX uses GNU C++, but need to define -shared option too, otherwise | 4666 | # QNX uses GNU C++, but need to define -shared option too, otherwise |
2961 | @@ -4012,7 +4692,7 @@ | |||
2962 | 4012 | ;; | 4692 | ;; |
2963 | 4013 | solaris*) | 4693 | solaris*) |
2964 | 4014 | case $cc_basename in | 4694 | case $cc_basename in |
2966 | 4015 | CC*) | 4695 | CC* | sunCC*) |
2967 | 4016 | # Sun C++ 4.2, 5.x and Centerline C++ | 4696 | # Sun C++ 4.2, 5.x and Centerline C++ |
2968 | 4017 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4697 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
2969 | 4018 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4698 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
2970 | @@ -4101,7 +4781,7 @@ | |||
2971 | 4101 | # PIC is the default for these OSes. | 4781 | # PIC is the default for these OSes. |
2972 | 4102 | ;; | 4782 | ;; |
2973 | 4103 | 4783 | ||
2975 | 4104 | mingw* | cygwin* | pw32* | os2*) | 4784 | mingw* | cygwin* | pw32* | os2* | cegcc*) |
2976 | 4105 | # This hack is so that the source file can tell whether it is being | 4785 | # This hack is so that the source file can tell whether it is being |
2977 | 4106 | # built for inclusion in a dll (and should export symbols for example). | 4786 | # built for inclusion in a dll (and should export symbols for example). |
2978 | 4107 | # Although the cygwin gcc ignores -fPIC, still need this for old-style | 4787 | # Although the cygwin gcc ignores -fPIC, still need this for old-style |
2979 | @@ -4116,11 +4796,18 @@ | |||
2980 | 4116 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' | 4796 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' |
2981 | 4117 | ;; | 4797 | ;; |
2982 | 4118 | 4798 | ||
2983 | 4799 | haiku*) | ||
2984 | 4800 | # PIC is the default for Haiku. | ||
2985 | 4801 | # The "-static" flag exists, but is broken. | ||
2986 | 4802 | _LT_TAGVAR(lt_prog_compiler_static, $1)= | ||
2987 | 4803 | ;; | ||
2988 | 4804 | |||
2989 | 4119 | hpux*) | 4805 | hpux*) |
2992 | 4120 | # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but | 4806 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
2993 | 4121 | # not for PA HP-UX. | 4807 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
2994 | 4808 | # sets the default TLS model and affects inlining. | ||
2995 | 4122 | case $host_cpu in | 4809 | case $host_cpu in |
2997 | 4123 | hppa*64*|ia64*) | 4810 | hppa*64*) |
2998 | 4124 | # +Z the default | 4811 | # +Z the default |
2999 | 4125 | ;; | 4812 | ;; |
3000 | 4126 | *) | 4813 | *) |
3001 | @@ -4157,6 +4844,13 @@ | |||
3002 | 4157 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' | 4844 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
3003 | 4158 | ;; | 4845 | ;; |
3004 | 4159 | esac | 4846 | esac |
3005 | 4847 | |||
3006 | 4848 | case $cc_basename in | ||
3007 | 4849 | nvcc*) # Cuda Compiler Driver 2.2 | ||
3008 | 4850 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' | ||
3009 | 4851 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' | ||
3010 | 4852 | ;; | ||
3011 | 4853 | esac | ||
3012 | 4160 | else | 4854 | else |
3013 | 4161 | # PORTME Check for flag to pass linker flags through the system compiler. | 4855 | # PORTME Check for flag to pass linker flags through the system compiler. |
3014 | 4162 | case $host_os in | 4856 | case $host_os in |
3015 | @@ -4170,7 +4864,7 @@ | |||
3016 | 4170 | fi | 4864 | fi |
3017 | 4171 | ;; | 4865 | ;; |
3018 | 4172 | 4866 | ||
3020 | 4173 | mingw* | cygwin* | pw32* | os2*) | 4867 | mingw* | cygwin* | pw32* | os2* | cegcc*) |
3021 | 4174 | # This hack is so that the source file can tell whether it is being | 4868 | # This hack is so that the source file can tell whether it is being |
3022 | 4175 | # built for inclusion in a dll (and should export symbols for example). | 4869 | # built for inclusion in a dll (and should export symbols for example). |
3023 | 4176 | m4_if([$1], [GCJ], [], | 4870 | m4_if([$1], [GCJ], [], |
3024 | @@ -4199,14 +4893,28 @@ | |||
3025 | 4199 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | 4893 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
3026 | 4200 | ;; | 4894 | ;; |
3027 | 4201 | 4895 | ||
3029 | 4202 | linux* | k*bsd*-gnu) | 4896 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3030 | 4203 | case $cc_basename in | 4897 | case $cc_basename in |
3032 | 4204 | icc* | ecc* | ifort*) | 4898 | # old Intel for x86_64 which still supported -KPIC. |
3033 | 4899 | ecc*) | ||
3034 | 4205 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4900 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3035 | 4206 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4901 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3036 | 4207 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' | 4902 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' |
3037 | 4208 | ;; | 4903 | ;; |
3039 | 4209 | pgcc* | pgf77* | pgf90* | pgf95*) | 4904 | # icc used to be incompatible with GCC. |
3040 | 4905 | # ICC 10 doesn't accept -KPIC any more. | ||
3041 | 4906 | icc* | ifort*) | ||
3042 | 4907 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | ||
3043 | 4908 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' | ||
3044 | 4909 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' | ||
3045 | 4910 | ;; | ||
3046 | 4911 | # Lahey Fortran 8.1. | ||
3047 | 4912 | lf95*) | ||
3048 | 4913 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | ||
3049 | 4914 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' | ||
3050 | 4915 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' | ||
3051 | 4916 | ;; | ||
3052 | 4917 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
3053 | 4210 | # Portland Group compilers (*not* the Pentium gcc compiler, | 4918 | # Portland Group compilers (*not* the Pentium gcc compiler, |
3054 | 4211 | # which looks to be a dead project) | 4919 | # which looks to be a dead project) |
3055 | 4212 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4920 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3056 | @@ -4218,26 +4926,26 @@ | |||
3057 | 4218 | # All Alpha code is PIC. | 4926 | # All Alpha code is PIC. |
3058 | 4219 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | 4927 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
3059 | 4220 | ;; | 4928 | ;; |
3062 | 4221 | xl*) | 4929 | xl* | bgxl* | bgf* | mpixl*) |
3063 | 4222 | # IBM XL C 8.0/Fortran 10.1 on PPC | 4930 | # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene |
3064 | 4223 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4931 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3065 | 4224 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' | 4932 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
3066 | 4225 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' | 4933 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
3067 | 4226 | ;; | 4934 | ;; |
3068 | 4227 | *) | 4935 | *) |
3069 | 4228 | case `$CC -V 2>&1 | sed 5q` in | 4936 | case `$CC -V 2>&1 | sed 5q` in |
3070 | 4937 | *Sun\ F* | *Sun*Fortran*) | ||
3071 | 4938 | # Sun Fortran 8.3 passes all unrecognized flags to the linker | ||
3072 | 4939 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
3073 | 4940 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
3074 | 4941 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' | ||
3075 | 4942 | ;; | ||
3076 | 4229 | *Sun\ C*) | 4943 | *Sun\ C*) |
3077 | 4230 | # Sun C 5.9 | 4944 | # Sun C 5.9 |
3078 | 4231 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4945 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3079 | 4232 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4946 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3080 | 4233 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4947 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3081 | 4234 | ;; | 4948 | ;; |
3082 | 4235 | *Sun\ F*) | ||
3083 | 4236 | # Sun Fortran 8.3 passes all unrecognized flags to the linker | ||
3084 | 4237 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
3085 | 4238 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
3086 | 4239 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' | ||
3087 | 4240 | ;; | ||
3088 | 4241 | esac | 4949 | esac |
3089 | 4242 | ;; | 4950 | ;; |
3090 | 4243 | esac | 4951 | esac |
3091 | @@ -4268,7 +4976,7 @@ | |||
3092 | 4268 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4976 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3093 | 4269 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4977 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
3094 | 4270 | case $cc_basename in | 4978 | case $cc_basename in |
3096 | 4271 | f77* | f90* | f95*) | 4979 | f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
3097 | 4272 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; | 4980 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
3098 | 4273 | *) | 4981 | *) |
3099 | 4274 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; | 4982 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
3100 | @@ -4378,8 +5086,10 @@ | |||
3101 | 4378 | aix[[4-9]]*) | 5086 | aix[[4-9]]*) |
3102 | 4379 | # If we're using GNU nm, then we don't want the "-C" option. | 5087 | # If we're using GNU nm, then we don't want the "-C" option. |
3103 | 4380 | # -C means demangle to AIX nm, but means don't demangle with GNU nm | 5088 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
3104 | 5089 | # Also, AIX nm treats weak defined symbols like other global defined | ||
3105 | 5090 | # symbols, whereas GNU nm marks them as "W". | ||
3106 | 4381 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then | 5091 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
3108 | 4382 | _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' | 5092 | _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 | 4383 | else | 5093 | else |
3110 | 4384 | _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' | 5094 | _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 | 4385 | fi | 5095 | fi |
3112 | @@ -4387,12 +5097,9 @@ | |||
3113 | 4387 | pw32*) | 5097 | pw32*) |
3114 | 4388 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" | 5098 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
3115 | 4389 | ;; | 5099 | ;; |
3117 | 4390 | cygwin* | mingw*) | 5100 | cygwin* | mingw* | cegcc*) |
3118 | 4391 | _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' | 5101 | _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 | 4392 | ;; | 5102 | ;; |
3120 | 4393 | linux* | k*bsd*-gnu) | ||
3121 | 4394 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
3122 | 4395 | ;; | ||
3123 | 4396 | *) | 5103 | *) |
3124 | 4397 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 5104 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
3125 | 4398 | ;; | 5105 | ;; |
3126 | @@ -4442,7 +5149,7 @@ | |||
3127 | 4442 | extract_expsyms_cmds= | 5149 | extract_expsyms_cmds= |
3128 | 4443 | 5150 | ||
3129 | 4444 | case $host_os in | 5151 | case $host_os in |
3131 | 4445 | cygwin* | mingw* | pw32*) | 5152 | cygwin* | mingw* | pw32* | cegcc*) |
3132 | 4446 | # FIXME: the MSVC++ port hasn't been tested in a loooong time | 5153 | # FIXME: the MSVC++ port hasn't been tested in a loooong time |
3133 | 4447 | # When not using gcc, we currently assume that we are using | 5154 | # When not using gcc, we currently assume that we are using |
3134 | 4448 | # Microsoft Visual C++. | 5155 | # Microsoft Visual C++. |
3135 | @@ -4460,7 +5167,33 @@ | |||
3136 | 4460 | esac | 5167 | esac |
3137 | 4461 | 5168 | ||
3138 | 4462 | _LT_TAGVAR(ld_shlibs, $1)=yes | 5169 | _LT_TAGVAR(ld_shlibs, $1)=yes |
3139 | 5170 | |||
3140 | 5171 | # On some targets, GNU ld is compatible enough with the native linker | ||
3141 | 5172 | # that we're better off using the native interface for both. | ||
3142 | 5173 | lt_use_gnu_ld_interface=no | ||
3143 | 4463 | if test "$with_gnu_ld" = yes; then | 5174 | if test "$with_gnu_ld" = yes; then |
3144 | 5175 | case $host_os in | ||
3145 | 5176 | aix*) | ||
3146 | 5177 | # The AIX port of GNU ld has always aspired to compatibility | ||
3147 | 5178 | # with the native linker. However, as the warning in the GNU ld | ||
3148 | 5179 | # block says, versions before 2.19.5* couldn't really create working | ||
3149 | 5180 | # shared libraries, regardless of the interface used. | ||
3150 | 5181 | case `$LD -v 2>&1` in | ||
3151 | 5182 | *\ \(GNU\ Binutils\)\ 2.19.5*) ;; | ||
3152 | 5183 | *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; | ||
3153 | 5184 | *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; | ||
3154 | 5185 | *) | ||
3155 | 5186 | lt_use_gnu_ld_interface=yes | ||
3156 | 5187 | ;; | ||
3157 | 5188 | esac | ||
3158 | 5189 | ;; | ||
3159 | 5190 | *) | ||
3160 | 5191 | lt_use_gnu_ld_interface=yes | ||
3161 | 5192 | ;; | ||
3162 | 5193 | esac | ||
3163 | 5194 | fi | ||
3164 | 5195 | |||
3165 | 5196 | if test "$lt_use_gnu_ld_interface" = yes; then | ||
3166 | 4464 | # If archive_cmds runs LD, not CC, wlarc should be empty | 5197 | # If archive_cmds runs LD, not CC, wlarc should be empty |
3167 | 4465 | wlarc='${wl}' | 5198 | wlarc='${wl}' |
3168 | 4466 | 5199 | ||
3169 | @@ -4478,6 +5211,7 @@ | |||
3170 | 4478 | fi | 5211 | fi |
3171 | 4479 | supports_anon_versioning=no | 5212 | supports_anon_versioning=no |
3172 | 4480 | case `$LD -v 2>&1` in | 5213 | case `$LD -v 2>&1` in |
3173 | 5214 | *GNU\ gold*) supports_anon_versioning=yes ;; | ||
3174 | 4481 | *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 | 5215 | *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 |
3175 | 4482 | *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... | 5216 | *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... |
3176 | 4483 | *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... | 5217 | *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |
3177 | @@ -4493,11 +5227,12 @@ | |||
3178 | 4493 | _LT_TAGVAR(ld_shlibs, $1)=no | 5227 | _LT_TAGVAR(ld_shlibs, $1)=no |
3179 | 4494 | cat <<_LT_EOF 1>&2 | 5228 | cat <<_LT_EOF 1>&2 |
3180 | 4495 | 5229 | ||
3182 | 4496 | *** Warning: the GNU linker, at least up to release 2.9.1, is reported | 5230 | *** Warning: the GNU linker, at least up to release 2.19, is reported |
3183 | 4497 | *** to be unable to reliably create shared libraries on AIX. | 5231 | *** to be unable to reliably create shared libraries on AIX. |
3184 | 4498 | *** Therefore, libtool is disabling shared libraries support. If you | 5232 | *** Therefore, libtool is disabling shared libraries support. If you |
3187 | 4499 | *** really care for shared libraries, you may want to modify your PATH | 5233 | *** really care for shared libraries, you may want to install binutils |
3188 | 4500 | *** so that a non-GNU linker is found, and then restart. | 5234 | *** 2.20 or above, or modify your PATH so that a non-GNU linker is found. |
3189 | 5235 | *** You will then need to restart the configuration process. | ||
3190 | 4501 | 5236 | ||
3191 | 4502 | _LT_EOF | 5237 | _LT_EOF |
3192 | 4503 | fi | 5238 | fi |
3193 | @@ -4529,10 +5264,11 @@ | |||
3194 | 4529 | fi | 5264 | fi |
3195 | 4530 | ;; | 5265 | ;; |
3196 | 4531 | 5266 | ||
3198 | 4532 | cygwin* | mingw* | pw32*) | 5267 | cygwin* | mingw* | pw32* | cegcc*) |
3199 | 4533 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, | 5268 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
3200 | 4534 | # as there is no search path for DLLs. | 5269 | # as there is no search path for DLLs. |
3201 | 4535 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | 5270 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
3202 | 5271 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' | ||
3203 | 4536 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 5272 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
3204 | 4537 | _LT_TAGVAR(always_export_symbols, $1)=no | 5273 | _LT_TAGVAR(always_export_symbols, $1)=no |
3205 | 4538 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 5274 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
3206 | @@ -4554,6 +5290,11 @@ | |||
3207 | 4554 | fi | 5290 | fi |
3208 | 4555 | ;; | 5291 | ;; |
3209 | 4556 | 5292 | ||
3210 | 5293 | haiku*) | ||
3211 | 5294 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
3212 | 5295 | _LT_TAGVAR(link_all_deplibs, $1)=yes | ||
3213 | 5296 | ;; | ||
3214 | 5297 | |||
3215 | 4557 | interix[[3-9]]*) | 5298 | interix[[3-9]]*) |
3216 | 4558 | _LT_TAGVAR(hardcode_direct, $1)=no | 5299 | _LT_TAGVAR(hardcode_direct, $1)=no |
3217 | 4559 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | 5300 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
3218 | @@ -4569,7 +5310,7 @@ | |||
3219 | 4569 | _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' | 5310 | _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 | 4570 | ;; | 5311 | ;; |
3221 | 4571 | 5312 | ||
3223 | 4572 | gnu* | linux* | tpf* | k*bsd*-gnu) | 5313 | gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) |
3224 | 4573 | tmp_diet=no | 5314 | tmp_diet=no |
3225 | 4574 | if test "$host_os" = linux-dietlibc; then | 5315 | if test "$host_os" = linux-dietlibc; then |
3226 | 4575 | case $cc_basename in | 5316 | case $cc_basename in |
3227 | @@ -4583,11 +5324,12 @@ | |||
3228 | 4583 | tmp_sharedflag='-shared' | 5324 | tmp_sharedflag='-shared' |
3229 | 4584 | case $cc_basename,$host_cpu in | 5325 | case $cc_basename,$host_cpu in |
3230 | 4585 | pgcc*) # Portland Group C compiler | 5326 | pgcc*) # Portland Group C compiler |
3232 | 4586 | _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' | 5327 | _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 | 4587 | tmp_addflag=' $pic_flag' | 5328 | tmp_addflag=' $pic_flag' |
3234 | 4588 | ;; | 5329 | ;; |
3237 | 4589 | pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers | 5330 | pgf77* | pgf90* | pgf95* | pgfortran*) |
3238 | 4590 | _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' | 5331 | # Portland Group f77 and f90 compilers |
3239 | 5332 | _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 | 4591 | tmp_addflag=' $pic_flag -Mnomain' ;; | 5333 | tmp_addflag=' $pic_flag -Mnomain' ;; |
3241 | 4592 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 | 5334 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
3242 | 4593 | tmp_addflag=' -i_dynamic' ;; | 5335 | tmp_addflag=' -i_dynamic' ;; |
3243 | @@ -4595,13 +5337,20 @@ | |||
3244 | 4595 | tmp_addflag=' -i_dynamic -nofor_main' ;; | 5337 | tmp_addflag=' -i_dynamic -nofor_main' ;; |
3245 | 4596 | ifc* | ifort*) # Intel Fortran compiler | 5338 | ifc* | ifort*) # Intel Fortran compiler |
3246 | 4597 | tmp_addflag=' -nofor_main' ;; | 5339 | tmp_addflag=' -nofor_main' ;; |
3248 | 4598 | xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) | 5340 | lf95*) # Lahey Fortran 8.1 |
3249 | 5341 | _LT_TAGVAR(whole_archive_flag_spec, $1)= | ||
3250 | 5342 | tmp_sharedflag='--shared' ;; | ||
3251 | 5343 | xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) | ||
3252 | 4599 | tmp_sharedflag='-qmkshrobj' | 5344 | tmp_sharedflag='-qmkshrobj' |
3253 | 4600 | tmp_addflag= ;; | 5345 | tmp_addflag= ;; |
3254 | 5346 | nvcc*) # Cuda Compiler Driver 2.2 | ||
3255 | 5347 | _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 | 5348 | _LT_TAGVAR(compiler_needs_object, $1)=yes | ||
3257 | 5349 | ;; | ||
3258 | 4601 | esac | 5350 | esac |
3259 | 4602 | case `$CC -V 2>&1 | sed 5q` in | 5351 | case `$CC -V 2>&1 | sed 5q` in |
3260 | 4603 | *Sun\ C*) # Sun C 5.9 | 5352 | *Sun\ C*) # Sun C 5.9 |
3262 | 4604 | _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' | 5353 | _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 | 4605 | _LT_TAGVAR(compiler_needs_object, $1)=yes | 5354 | _LT_TAGVAR(compiler_needs_object, $1)=yes |
3264 | 4606 | tmp_sharedflag='-G' ;; | 5355 | tmp_sharedflag='-G' ;; |
3265 | 4607 | *Sun\ F*) # Sun Fortran 8.3 | 5356 | *Sun\ F*) # Sun Fortran 8.3 |
3266 | @@ -4617,17 +5366,17 @@ | |||
3267 | 4617 | fi | 5366 | fi |
3268 | 4618 | 5367 | ||
3269 | 4619 | case $cc_basename in | 5368 | case $cc_basename in |
3271 | 4620 | xlf*) | 5369 | xlf* | bgf* | bgxlf* | mpixlf*) |
3272 | 4621 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself | 5370 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
3273 | 4622 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' | 5371 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
3274 | 4623 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 5372 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
3275 | 4624 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' | 5373 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' |
3277 | 4625 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | 5374 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
3278 | 4626 | if test "x$supports_anon_versioning" = xyes; then | 5375 | if test "x$supports_anon_versioning" = xyes; then |
3279 | 4627 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ | 5376 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
3280 | 4628 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | 5377 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
3281 | 4629 | echo "local: *; };" >> $output_objdir/$libname.ver~ | 5378 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
3283 | 4630 | $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | 5379 | $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
3284 | 4631 | fi | 5380 | fi |
3285 | 4632 | ;; | 5381 | ;; |
3286 | 4633 | esac | 5382 | esac |
3287 | @@ -4636,7 +5385,7 @@ | |||
3288 | 4636 | fi | 5385 | fi |
3289 | 4637 | ;; | 5386 | ;; |
3290 | 4638 | 5387 | ||
3292 | 4639 | netbsd* | netbsdelf*-gnu) | 5388 | netbsd*) |
3293 | 4640 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 5389 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
3294 | 4641 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 5390 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
3295 | 4642 | wlarc= | 5391 | wlarc= |
3296 | @@ -4748,8 +5497,10 @@ | |||
3297 | 4748 | else | 5497 | else |
3298 | 4749 | # If we're using GNU nm, then we don't want the "-C" option. | 5498 | # If we're using GNU nm, then we don't want the "-C" option. |
3299 | 4750 | # -C means demangle to AIX nm, but means don't demangle with GNU nm | 5499 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
3300 | 5500 | # Also, AIX nm treats weak defined symbols like other global | ||
3301 | 5501 | # defined symbols, whereas GNU nm marks them as "W". | ||
3302 | 4751 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then | 5502 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
3304 | 4752 | _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' | 5503 | _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 | 4753 | else | 5504 | else |
3306 | 4754 | _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' | 5505 | _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 | 4755 | fi | 5506 | fi |
3308 | @@ -4811,7 +5562,6 @@ | |||
3309 | 4811 | if test "$aix_use_runtimelinking" = yes; then | 5562 | if test "$aix_use_runtimelinking" = yes; then |
3310 | 4812 | shared_flag="$shared_flag "'${wl}-G' | 5563 | shared_flag="$shared_flag "'${wl}-G' |
3311 | 4813 | fi | 5564 | fi |
3312 | 4814 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
3313 | 4815 | else | 5565 | else |
3314 | 4816 | # not using gcc | 5566 | # not using gcc |
3315 | 4817 | if test "$host_cpu" = ia64; then | 5567 | if test "$host_cpu" = ia64; then |
3316 | @@ -4827,6 +5577,7 @@ | |||
3317 | 4827 | fi | 5577 | fi |
3318 | 4828 | fi | 5578 | fi |
3319 | 4829 | 5579 | ||
3320 | 5580 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' | ||
3321 | 4830 | # It seems that -bexpall does not export symbols beginning with | 5581 | # It seems that -bexpall does not export symbols beginning with |
3322 | 4831 | # underscore (_), so it is better to generate a list of symbols to export. | 5582 | # underscore (_), so it is better to generate a list of symbols to export. |
3323 | 4832 | _LT_TAGVAR(always_export_symbols, $1)=yes | 5583 | _LT_TAGVAR(always_export_symbols, $1)=yes |
3324 | @@ -4838,7 +5589,7 @@ | |||
3325 | 4838 | # empty executable. | 5589 | # empty executable. |
3326 | 4839 | _LT_SYS_MODULE_PATH_AIX | 5590 | _LT_SYS_MODULE_PATH_AIX |
3327 | 4840 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 5591 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
3329 | 4841 | _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" | 5592 | _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 | 4842 | else | 5593 | else |
3331 | 4843 | if test "$host_cpu" = ia64; then | 5594 | if test "$host_cpu" = ia64; then |
3332 | 4844 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' | 5595 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
3333 | @@ -4853,8 +5604,13 @@ | |||
3334 | 4853 | # -berok will link without error, but may produce a broken library. | 5604 | # -berok will link without error, but may produce a broken library. |
3335 | 4854 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' | 5605 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
3336 | 4855 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' | 5606 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
3339 | 4856 | # Exported symbols can be pulled into shared objects from archives | 5607 | if test "$with_gnu_ld" = yes; then |
3340 | 4857 | _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' | 5608 | # We only use this code for GNU lds that support --whole-archive. |
3341 | 5609 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' | ||
3342 | 5610 | else | ||
3343 | 5611 | # Exported symbols can be pulled into shared objects from archives | ||
3344 | 5612 | _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' | ||
3345 | 5613 | fi | ||
3346 | 4858 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes | 5614 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
3347 | 4859 | # This is similar to how AIX traditionally builds its shared libraries. | 5615 | # This is similar to how AIX traditionally builds its shared libraries. |
3348 | 4860 | _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' | 5616 | _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 | 4881 | _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic | 5637 | _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic |
3351 | 4882 | ;; | 5638 | ;; |
3352 | 4883 | 5639 | ||
3354 | 4884 | cygwin* | mingw* | pw32*) | 5640 | cygwin* | mingw* | pw32* | cegcc*) |
3355 | 4885 | # When not using gcc, we currently assume that we are using | 5641 | # When not using gcc, we currently assume that we are using |
3356 | 4886 | # Microsoft Visual C++. | 5642 | # Microsoft Visual C++. |
3357 | 4887 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 5643 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
3358 | @@ -4893,7 +5649,7 @@ | |||
3359 | 4893 | # Tell ltmain to make .dll files, not .so files. | 5649 | # Tell ltmain to make .dll files, not .so files. |
3360 | 4894 | shrext_cmds=".dll" | 5650 | shrext_cmds=".dll" |
3361 | 4895 | # FIXME: Setting linknames here is a bad hack. | 5651 | # FIXME: Setting linknames here is a bad hack. |
3363 | 4896 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' | 5652 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
3364 | 4897 | # The linker will automatically build a .lib file if we build a DLL. | 5653 | # The linker will automatically build a .lib file if we build a DLL. |
3365 | 4898 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | 5654 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
3366 | 4899 | # FIXME: Should let the user specify the lib program. | 5655 | # FIXME: Should let the user specify the lib program. |
3367 | @@ -4960,7 +5716,7 @@ | |||
3368 | 4960 | ;; | 5716 | ;; |
3369 | 4961 | 5717 | ||
3370 | 4962 | hpux10*) | 5718 | hpux10*) |
3372 | 4963 | if test "$GCC" = yes -a "$with_gnu_ld" = no; then | 5719 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
3373 | 4964 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 5720 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3374 | 4965 | else | 5721 | else |
3375 | 4966 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 5722 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
3376 | @@ -4979,13 +5735,13 @@ | |||
3377 | 4979 | ;; | 5735 | ;; |
3378 | 4980 | 5736 | ||
3379 | 4981 | hpux11*) | 5737 | hpux11*) |
3381 | 4982 | if test "$GCC" = yes -a "$with_gnu_ld" = no; then | 5738 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
3382 | 4983 | case $host_cpu in | 5739 | case $host_cpu in |
3383 | 4984 | hppa*64*) | 5740 | hppa*64*) |
3384 | 4985 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 5741 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
3385 | 4986 | ;; | 5742 | ;; |
3386 | 4987 | ia64*) | 5743 | ia64*) |
3388 | 4988 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 5744 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3389 | 4989 | ;; | 5745 | ;; |
3390 | 4990 | *) | 5746 | *) |
3391 | 4991 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 5747 | _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 | 5000 | _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 5756 | _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3394 | 5001 | ;; | 5757 | ;; |
3395 | 5002 | *) | 5758 | *) |
3397 | 5003 | _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 5759 | m4_if($1, [], [ |
3398 | 5760 | # Older versions of the 11.00 compiler do not understand -b yet | ||
3399 | 5761 | # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) | ||
3400 | 5762 | _LT_LINKER_OPTION([if $CC understands -b], | ||
3401 | 5763 | _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], | ||
3402 | 5764 | [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], | ||
3403 | 5765 | [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], | ||
3404 | 5766 | [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) | ||
3405 | 5004 | ;; | 5767 | ;; |
3406 | 5005 | esac | 5768 | esac |
3407 | 5006 | fi | 5769 | fi |
3408 | @@ -5028,19 +5791,19 @@ | |||
3409 | 5028 | 5791 | ||
3410 | 5029 | irix5* | irix6* | nonstopux*) | 5792 | irix5* | irix6* | nonstopux*) |
3411 | 5030 | if test "$GCC" = yes; then | 5793 | if test "$GCC" = yes; then |
3413 | 5031 | _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' | 5794 | _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 | 5032 | # Try to use the -exported_symbol ld option, if it does not | 5795 | # Try to use the -exported_symbol ld option, if it does not |
3415 | 5033 | # work, assume that -exports_file does not work either and | 5796 | # work, assume that -exports_file does not work either and |
3416 | 5034 | # implicitly export all symbols. | 5797 | # implicitly export all symbols. |
3417 | 5035 | save_LDFLAGS="$LDFLAGS" | 5798 | save_LDFLAGS="$LDFLAGS" |
3418 | 5036 | LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | 5799 | LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
3419 | 5037 | AC_LINK_IFELSE(int foo(void) {}, | 5800 | AC_LINK_IFELSE(int foo(void) {}, |
3421 | 5038 | _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' | 5801 | _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 | 5039 | ) | 5802 | ) |
3423 | 5040 | LDFLAGS="$save_LDFLAGS" | 5803 | LDFLAGS="$save_LDFLAGS" |
3424 | 5041 | else | 5804 | else |
3427 | 5042 | _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' | 5805 | _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 | 5043 | _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' | 5806 | _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 | 5044 | fi | 5807 | fi |
3430 | 5045 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' | 5808 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
3431 | 5046 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 5809 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3432 | @@ -5049,7 +5812,7 @@ | |||
3433 | 5049 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 5812 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
3434 | 5050 | ;; | 5813 | ;; |
3435 | 5051 | 5814 | ||
3437 | 5052 | netbsd* | netbsdelf*-gnu) | 5815 | netbsd*) |
3438 | 5053 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then | 5816 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
3439 | 5054 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | 5817 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
3440 | 5055 | else | 5818 | else |
3441 | @@ -5102,17 +5865,17 @@ | |||
3442 | 5102 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | 5865 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
3443 | 5103 | _LT_TAGVAR(hardcode_minus_L, $1)=yes | 5866 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
3444 | 5104 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 5867 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
3446 | 5105 | _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' | 5868 | _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 | 5106 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' | 5869 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' |
3448 | 5107 | ;; | 5870 | ;; |
3449 | 5108 | 5871 | ||
3450 | 5109 | osf3*) | 5872 | osf3*) |
3451 | 5110 | if test "$GCC" = yes; then | 5873 | if test "$GCC" = yes; then |
3452 | 5111 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 5874 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
3454 | 5112 | _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' | 5875 | _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 | 5113 | else | 5876 | else |
3456 | 5114 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' | 5877 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
3458 | 5115 | _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' | 5878 | _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 | 5116 | fi | 5879 | fi |
3460 | 5117 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' | 5880 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
3461 | 5118 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 5881 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3462 | @@ -5122,13 +5885,13 @@ | |||
3463 | 5122 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 5885 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
3464 | 5123 | if test "$GCC" = yes; then | 5886 | if test "$GCC" = yes; then |
3465 | 5124 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 5887 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
3467 | 5125 | _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' | 5888 | _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 | 5126 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 5889 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3469 | 5127 | else | 5890 | else |
3470 | 5128 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' | 5891 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
3472 | 5129 | _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' | 5892 | _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 | 5130 | _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~ | 5893 | _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~ |
3475 | 5131 | $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' | 5894 | $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 | 5132 | 5895 | ||
3477 | 5133 | # Both c and cxx compiler support -rpath directly | 5896 | # Both c and cxx compiler support -rpath directly |
3478 | 5134 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' | 5897 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
3479 | @@ -5319,36 +6082,38 @@ | |||
3480 | 5319 | # Test whether the compiler implicitly links with -lc since on some | 6082 | # Test whether the compiler implicitly links with -lc since on some |
3481 | 5320 | # systems, -lgcc has to come before -lc. If gcc already passes -lc | 6083 | # systems, -lgcc has to come before -lc. If gcc already passes -lc |
3482 | 5321 | # to ld, don't add -lc before -lgcc. | 6084 | # to ld, don't add -lc before -lgcc. |
3486 | 5322 | AC_MSG_CHECKING([whether -lc should be explicitly linked in]) | 6085 | AC_CACHE_CHECK([whether -lc should be explicitly linked in], |
3487 | 5323 | $RM conftest* | 6086 | [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), |
3488 | 5324 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext | 6087 | [$RM conftest* |
3489 | 6088 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext | ||
3490 | 5325 | 6089 | ||
3517 | 5326 | if AC_TRY_EVAL(ac_compile) 2>conftest.err; then | 6090 | if AC_TRY_EVAL(ac_compile) 2>conftest.err; then |
3518 | 5327 | soname=conftest | 6091 | soname=conftest |
3519 | 5328 | lib=conftest | 6092 | lib=conftest |
3520 | 5329 | libobjs=conftest.$ac_objext | 6093 | libobjs=conftest.$ac_objext |
3521 | 5330 | deplibs= | 6094 | deplibs= |
3522 | 5331 | wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) | 6095 | wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) |
3523 | 5332 | pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) | 6096 | pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) |
3524 | 5333 | compiler_flags=-v | 6097 | compiler_flags=-v |
3525 | 5334 | linker_flags=-v | 6098 | linker_flags=-v |
3526 | 5335 | verstring= | 6099 | verstring= |
3527 | 5336 | output_objdir=. | 6100 | output_objdir=. |
3528 | 5337 | libname=conftest | 6101 | libname=conftest |
3529 | 5338 | lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) | 6102 | lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) |
3530 | 5339 | _LT_TAGVAR(allow_undefined_flag, $1)= | 6103 | _LT_TAGVAR(allow_undefined_flag, $1)= |
3531 | 5340 | if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) | 6104 | if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) |
3532 | 5341 | then | 6105 | then |
3533 | 5342 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 6106 | lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3534 | 5343 | else | 6107 | else |
3535 | 5344 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes | 6108 | lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
3536 | 5345 | fi | 6109 | fi |
3537 | 5346 | _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag | 6110 | _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag |
3538 | 5347 | else | 6111 | else |
3539 | 5348 | cat conftest.err 1>&5 | 6112 | cat conftest.err 1>&5 |
3540 | 5349 | fi | 6113 | fi |
3541 | 5350 | $RM conftest* | 6114 | $RM conftest* |
3542 | 5351 | AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) | 6115 | ]) |
3543 | 6116 | _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) | ||
3544 | 5352 | ;; | 6117 | ;; |
3545 | 5353 | esac | 6118 | esac |
3546 | 5354 | fi | 6119 | fi |
3547 | @@ -5514,14 +6279,14 @@ | |||
3548 | 5514 | ])# _LT_LANG_C_CONFIG | 6279 | ])# _LT_LANG_C_CONFIG |
3549 | 5515 | 6280 | ||
3550 | 5516 | 6281 | ||
3559 | 5517 | # _LT_PROG_CXX | 6282 | # _LT_LANG_CXX_CONFIG([TAG]) |
3560 | 5518 | # ------------ | 6283 | # -------------------------- |
3561 | 5519 | # Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ | 6284 | # Ensure that the configuration variables for a C++ compiler are suitably |
3562 | 5520 | # compiler, we have our own version here. | 6285 | # defined. These variables are subsequently used by _LT_CONFIG to write |
3563 | 5521 | m4_defun([_LT_PROG_CXX], | 6286 | # the compiler configuration to `libtool'. |
3564 | 5522 | [ | 6287 | m4_defun([_LT_LANG_CXX_CONFIG], |
3565 | 5523 | pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) | 6288 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
3566 | 5524 | AC_PROG_CXX | 6289 | m4_require([_LT_DECL_EGREP])dnl |
3567 | 5525 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && | 6290 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
3568 | 5526 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || | 6291 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
3569 | 5527 | (test "X$CXX" != "Xg++"))) ; then | 6292 | (test "X$CXX" != "Xg++"))) ; then |
3570 | @@ -5529,22 +6294,6 @@ | |||
3571 | 5529 | else | 6294 | else |
3572 | 5530 | _lt_caught_CXX_error=yes | 6295 | _lt_caught_CXX_error=yes |
3573 | 5531 | fi | 6296 | fi |
3574 | 5532 | popdef([AC_MSG_ERROR]) | ||
3575 | 5533 | ])# _LT_PROG_CXX | ||
3576 | 5534 | |||
3577 | 5535 | dnl aclocal-1.4 backwards compatibility: | ||
3578 | 5536 | dnl AC_DEFUN([_LT_PROG_CXX], []) | ||
3579 | 5537 | |||
3580 | 5538 | |||
3581 | 5539 | # _LT_LANG_CXX_CONFIG([TAG]) | ||
3582 | 5540 | # -------------------------- | ||
3583 | 5541 | # Ensure that the configuration variables for a C++ compiler are suitably | ||
3584 | 5542 | # defined. These variables are subsequently used by _LT_CONFIG to write | ||
3585 | 5543 | # the compiler configuration to `libtool'. | ||
3586 | 5544 | m4_defun([_LT_LANG_CXX_CONFIG], | ||
3587 | 5545 | [AC_REQUIRE([_LT_PROG_CXX])dnl | ||
3588 | 5546 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | ||
3589 | 5547 | m4_require([_LT_DECL_EGREP])dnl | ||
3590 | 5548 | 6297 | ||
3591 | 5549 | AC_LANG_PUSH(C++) | 6298 | AC_LANG_PUSH(C++) |
3592 | 5550 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 6299 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3593 | @@ -5566,6 +6315,8 @@ | |||
3594 | 5566 | _LT_TAGVAR(module_expsym_cmds, $1)= | 6315 | _LT_TAGVAR(module_expsym_cmds, $1)= |
3595 | 5567 | _LT_TAGVAR(link_all_deplibs, $1)=unknown | 6316 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
3596 | 5568 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | 6317 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
3597 | 6318 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
3598 | 6319 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
3599 | 5569 | _LT_TAGVAR(no_undefined_flag, $1)= | 6320 | _LT_TAGVAR(no_undefined_flag, $1)= |
3600 | 5570 | _LT_TAGVAR(whole_archive_flag_spec, $1)= | 6321 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
3601 | 5571 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no | 6322 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
3602 | @@ -5668,7 +6419,7 @@ | |||
3603 | 5668 | # Commands to make compiler produce verbose output that lists | 6419 | # Commands to make compiler produce verbose output that lists |
3604 | 5669 | # what "hidden" libraries, object files and flags are used when | 6420 | # what "hidden" libraries, object files and flags are used when |
3605 | 5670 | # linking a shared library. | 6421 | # linking a shared library. |
3607 | 5671 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' | 6422 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
3608 | 5672 | 6423 | ||
3609 | 5673 | else | 6424 | else |
3610 | 5674 | GXX=no | 6425 | GXX=no |
3611 | @@ -5766,6 +6517,7 @@ | |||
3612 | 5766 | fi | 6517 | fi |
3613 | 5767 | fi | 6518 | fi |
3614 | 5768 | 6519 | ||
3615 | 6520 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' | ||
3616 | 5769 | # It seems that -bexpall does not export symbols beginning with | 6521 | # It seems that -bexpall does not export symbols beginning with |
3617 | 5770 | # underscore (_), so it is better to generate a list of symbols to | 6522 | # underscore (_), so it is better to generate a list of symbols to |
3618 | 5771 | # export. | 6523 | # export. |
3619 | @@ -5779,7 +6531,7 @@ | |||
3620 | 5779 | _LT_SYS_MODULE_PATH_AIX | 6531 | _LT_SYS_MODULE_PATH_AIX |
3621 | 5780 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 6532 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
3622 | 5781 | 6533 | ||
3624 | 5782 | _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" | 6534 | _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 | 5783 | else | 6535 | else |
3626 | 5784 | if test "$host_cpu" = ia64; then | 6536 | if test "$host_cpu" = ia64; then |
3627 | 5785 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' | 6537 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
3628 | @@ -5794,8 +6546,13 @@ | |||
3629 | 5794 | # -berok will link without error, but may produce a broken library. | 6546 | # -berok will link without error, but may produce a broken library. |
3630 | 5795 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' | 6547 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
3631 | 5796 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' | 6548 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
3634 | 5797 | # Exported symbols can be pulled into shared objects from archives | 6549 | if test "$with_gnu_ld" = yes; then |
3635 | 5798 | _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' | 6550 | # We only use this code for GNU lds that support --whole-archive. |
3636 | 6551 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' | ||
3637 | 6552 | else | ||
3638 | 6553 | # Exported symbols can be pulled into shared objects from archives | ||
3639 | 6554 | _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' | ||
3640 | 6555 | fi | ||
3641 | 5799 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes | 6556 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
3642 | 5800 | # This is similar to how AIX traditionally builds its shared | 6557 | # This is similar to how AIX traditionally builds its shared |
3643 | 5801 | # libraries. | 6558 | # libraries. |
3644 | @@ -5824,10 +6581,11 @@ | |||
3645 | 5824 | esac | 6581 | esac |
3646 | 5825 | ;; | 6582 | ;; |
3647 | 5826 | 6583 | ||
3649 | 5827 | cygwin* | mingw* | pw32*) | 6584 | cygwin* | mingw* | pw32* | cegcc*) |
3650 | 5828 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, | 6585 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
3651 | 5829 | # as there is no search path for DLLs. | 6586 | # as there is no search path for DLLs. |
3652 | 5830 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | 6587 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
3653 | 6588 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' | ||
3654 | 5831 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 6589 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
3655 | 5832 | _LT_TAGVAR(always_export_symbols, $1)=no | 6590 | _LT_TAGVAR(always_export_symbols, $1)=no |
3656 | 5833 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 6591 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
3657 | @@ -5888,6 +6646,11 @@ | |||
3658 | 5888 | gnu*) | 6646 | gnu*) |
3659 | 5889 | ;; | 6647 | ;; |
3660 | 5890 | 6648 | ||
3661 | 6649 | haiku*) | ||
3662 | 6650 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
3663 | 6651 | _LT_TAGVAR(link_all_deplibs, $1)=yes | ||
3664 | 6652 | ;; | ||
3665 | 6653 | |||
3666 | 5891 | hpux9*) | 6654 | hpux9*) |
3667 | 5892 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' | 6655 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
3668 | 5893 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: | 6656 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
3669 | @@ -5912,7 +6675,7 @@ | |||
3670 | 5912 | # explicitly linking system object files so we need to strip them | 6675 | # explicitly linking system object files so we need to strip them |
3671 | 5913 | # from the output so that they don't get included in the library | 6676 | # from the output so that they don't get included in the library |
3672 | 5914 | # dependencies. | 6677 | # dependencies. |
3674 | 5915 | 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' | 6678 | 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 | 5916 | ;; | 6679 | ;; |
3676 | 5917 | *) | 6680 | *) |
3677 | 5918 | if test "$GXX" = yes; then | 6681 | if test "$GXX" = yes; then |
3678 | @@ -5977,7 +6740,7 @@ | |||
3679 | 5977 | # explicitly linking system object files so we need to strip them | 6740 | # explicitly linking system object files so we need to strip them |
3680 | 5978 | # from the output so that they don't get included in the library | 6741 | # from the output so that they don't get included in the library |
3681 | 5979 | # dependencies. | 6742 | # dependencies. |
3683 | 5980 | 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' | 6743 | 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 | 5981 | ;; | 6744 | ;; |
3685 | 5982 | *) | 6745 | *) |
3686 | 5983 | if test "$GXX" = yes; then | 6746 | if test "$GXX" = yes; then |
3687 | @@ -6020,7 +6783,7 @@ | |||
3688 | 6020 | case $cc_basename in | 6783 | case $cc_basename in |
3689 | 6021 | CC*) | 6784 | CC*) |
3690 | 6022 | # SGI C++ | 6785 | # SGI C++ |
3692 | 6023 | _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' | 6786 | _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 | 6024 | 6787 | ||
3694 | 6025 | # Archives containing C++ object files must be created using | 6788 | # Archives containing C++ object files must be created using |
3695 | 6026 | # "CC -ar", where "CC" is the IRIX C++ compiler. This is | 6789 | # "CC -ar", where "CC" is the IRIX C++ compiler. This is |
3696 | @@ -6031,9 +6794,9 @@ | |||
3697 | 6031 | *) | 6794 | *) |
3698 | 6032 | if test "$GXX" = yes; then | 6795 | if test "$GXX" = yes; then |
3699 | 6033 | if test "$with_gnu_ld" = no; then | 6796 | if test "$with_gnu_ld" = no; then |
3701 | 6034 | _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' | 6797 | _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 | 6035 | else | 6798 | else |
3704 | 6036 | _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' | 6799 | _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 | 6037 | fi | 6800 | fi |
3706 | 6038 | fi | 6801 | fi |
3707 | 6039 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 6802 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
3708 | @@ -6044,7 +6807,7 @@ | |||
3709 | 6044 | _LT_TAGVAR(inherit_rpath, $1)=yes | 6807 | _LT_TAGVAR(inherit_rpath, $1)=yes |
3710 | 6045 | ;; | 6808 | ;; |
3711 | 6046 | 6809 | ||
3713 | 6047 | linux* | k*bsd*-gnu) | 6810 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3714 | 6048 | case $cc_basename in | 6811 | case $cc_basename in |
3715 | 6049 | KCC*) | 6812 | KCC*) |
3716 | 6050 | # Kuck and Associates, Inc. (KAI) C++ Compiler | 6813 | # Kuck and Associates, Inc. (KAI) C++ Compiler |
3717 | @@ -6062,7 +6825,7 @@ | |||
3718 | 6062 | # explicitly linking system object files so we need to strip them | 6825 | # explicitly linking system object files so we need to strip them |
3719 | 6063 | # from the output so that they don't get included in the library | 6826 | # from the output so that they don't get included in the library |
3720 | 6064 | # dependencies. | 6827 | # dependencies. |
3722 | 6065 | 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' | 6828 | 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 | 6066 | 6829 | ||
3724 | 6067 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | 6830 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
3725 | 6068 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 6831 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
3726 | @@ -6099,26 +6862,26 @@ | |||
3727 | 6099 | pgCC* | pgcpp*) | 6862 | pgCC* | pgcpp*) |
3728 | 6100 | # Portland Group C++ compiler | 6863 | # Portland Group C++ compiler |
3729 | 6101 | case `$CC -V` in | 6864 | case `$CC -V` in |
3731 | 6102 | *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) | 6865 | *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) |
3732 | 6103 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ | 6866 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ |
3733 | 6104 | rm -rf $tpldir~ | 6867 | rm -rf $tpldir~ |
3734 | 6105 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ | 6868 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
3736 | 6106 | compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' | 6869 | compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' |
3737 | 6107 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ | 6870 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ |
3738 | 6108 | rm -rf $tpldir~ | 6871 | rm -rf $tpldir~ |
3739 | 6109 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ | 6872 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
3741 | 6110 | $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ | 6873 | $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ |
3742 | 6111 | $RANLIB $oldlib' | 6874 | $RANLIB $oldlib' |
3743 | 6112 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ | 6875 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ |
3744 | 6113 | rm -rf $tpldir~ | 6876 | rm -rf $tpldir~ |
3745 | 6114 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ | 6877 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
3747 | 6115 | $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | 6878 | $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 | 6116 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ | 6879 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ |
3749 | 6117 | rm -rf $tpldir~ | 6880 | rm -rf $tpldir~ |
3750 | 6118 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ | 6881 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
3752 | 6119 | $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' | 6882 | $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 | 6120 | ;; | 6883 | ;; |
3755 | 6121 | *) # Version 6 will use weak symbols | 6884 | *) # Version 6 and above use weak symbols |
3756 | 6122 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | 6885 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
3757 | 6123 | _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' | 6886 | _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 | 6124 | ;; | 6887 | ;; |
3759 | @@ -6126,7 +6889,7 @@ | |||
3760 | 6126 | 6889 | ||
3761 | 6127 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' | 6890 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' |
3762 | 6128 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 6891 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
3764 | 6129 | _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' | 6892 | _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 | 6130 | ;; | 6893 | ;; |
3766 | 6131 | cxx*) | 6894 | cxx*) |
3767 | 6132 | # Compaq C++ | 6895 | # Compaq C++ |
3768 | @@ -6145,9 +6908,9 @@ | |||
3769 | 6145 | # explicitly linking system object files so we need to strip them | 6908 | # explicitly linking system object files so we need to strip them |
3770 | 6146 | # from the output so that they don't get included in the library | 6909 | # from the output so that they don't get included in the library |
3771 | 6147 | # dependencies. | 6910 | # dependencies. |
3773 | 6148 | 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' | 6911 | 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 | 6149 | ;; | 6912 | ;; |
3776 | 6150 | xl*) | 6913 | xl* | mpixl* | bgxl*) |
3777 | 6151 | # IBM XL 8.0 on PPC, with GNU ld | 6914 | # IBM XL 8.0 on PPC, with GNU ld |
3778 | 6152 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 6915 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3779 | 6153 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 6916 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
3780 | @@ -6167,13 +6930,13 @@ | |||
3781 | 6167 | _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 6930 | _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
3782 | 6168 | _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' | 6931 | _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 | 6169 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | 6932 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
3785 | 6170 | _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' | 6933 | _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 | 6171 | _LT_TAGVAR(compiler_needs_object, $1)=yes | 6934 | _LT_TAGVAR(compiler_needs_object, $1)=yes |
3787 | 6172 | 6935 | ||
3788 | 6173 | # Not sure whether something based on | 6936 | # Not sure whether something based on |
3789 | 6174 | # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | 6937 | # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 |
3790 | 6175 | # would be better. | 6938 | # would be better. |
3792 | 6176 | output_verbose_link_cmd='echo' | 6939 | output_verbose_link_cmd='func_echo_all' |
3793 | 6177 | 6940 | ||
3794 | 6178 | # Archives containing C++ object files must be created using | 6941 | # Archives containing C++ object files must be created using |
3795 | 6179 | # "CC -xar", where "CC" is the Sun C++ compiler. This is | 6942 | # "CC -xar", where "CC" is the Sun C++ compiler. This is |
3796 | @@ -6242,7 +7005,7 @@ | |||
3797 | 6242 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' | 7005 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
3798 | 6243 | _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' | 7006 | _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
3799 | 6244 | fi | 7007 | fi |
3801 | 6245 | output_verbose_link_cmd=echo | 7008 | output_verbose_link_cmd=func_echo_all |
3802 | 6246 | else | 7009 | else |
3803 | 6247 | _LT_TAGVAR(ld_shlibs, $1)=no | 7010 | _LT_TAGVAR(ld_shlibs, $1)=no |
3804 | 6248 | fi | 7011 | fi |
3805 | @@ -6277,15 +7040,15 @@ | |||
3806 | 6277 | case $host in | 7040 | case $host in |
3807 | 6278 | osf3*) | 7041 | osf3*) |
3808 | 6279 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 7042 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
3810 | 6280 | _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' | 7043 | _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 | 6281 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 7044 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
3812 | 6282 | ;; | 7045 | ;; |
3813 | 6283 | *) | 7046 | *) |
3814 | 6284 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' | 7047 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
3816 | 6285 | _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' | 7048 | _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 | 6286 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ | 7049 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ |
3818 | 6287 | echo "-hidden">> $lib.exp~ | 7050 | echo "-hidden">> $lib.exp~ |
3820 | 6288 | $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~ | 7051 | $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 | 6289 | $RM $lib.exp' | 7052 | $RM $lib.exp' |
3822 | 6290 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' | 7053 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
3823 | 6291 | ;; | 7054 | ;; |
3824 | @@ -6301,17 +7064,17 @@ | |||
3825 | 6301 | # explicitly linking system object files so we need to strip them | 7064 | # explicitly linking system object files so we need to strip them |
3826 | 6302 | # from the output so that they don't get included in the library | 7065 | # from the output so that they don't get included in the library |
3827 | 6303 | # dependencies. | 7066 | # dependencies. |
3829 | 6304 | 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' | 7067 | 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 | 6305 | ;; | 7068 | ;; |
3831 | 6306 | *) | 7069 | *) |
3832 | 6307 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | 7070 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
3833 | 6308 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 7071 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
3834 | 6309 | case $host in | 7072 | case $host in |
3835 | 6310 | osf3*) | 7073 | osf3*) |
3837 | 6311 | _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' | 7074 | _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 | 6312 | ;; | 7075 | ;; |
3839 | 6313 | *) | 7076 | *) |
3841 | 6314 | _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' | 7077 | _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 | 6315 | ;; | 7078 | ;; |
3843 | 6316 | esac | 7079 | esac |
3844 | 6317 | 7080 | ||
3845 | @@ -6321,7 +7084,7 @@ | |||
3846 | 6321 | # Commands to make compiler produce verbose output that lists | 7084 | # Commands to make compiler produce verbose output that lists |
3847 | 6322 | # what "hidden" libraries, object files and flags are used when | 7085 | # what "hidden" libraries, object files and flags are used when |
3848 | 6323 | # linking a shared library. | 7086 | # linking a shared library. |
3850 | 6324 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' | 7087 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
3851 | 6325 | 7088 | ||
3852 | 6326 | else | 7089 | else |
3853 | 6327 | # FIXME: insert proper C++ library support | 7090 | # FIXME: insert proper C++ library support |
3854 | @@ -6357,7 +7120,7 @@ | |||
3855 | 6357 | 7120 | ||
3856 | 6358 | solaris*) | 7121 | solaris*) |
3857 | 6359 | case $cc_basename in | 7122 | case $cc_basename in |
3859 | 6360 | CC*) | 7123 | CC* | sunCC*) |
3860 | 6361 | # Sun C++ 4.2, 5.x and Centerline C++ | 7124 | # Sun C++ 4.2, 5.x and Centerline C++ |
3861 | 6362 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes | 7125 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes |
3862 | 6363 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' | 7126 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
3863 | @@ -6378,7 +7141,7 @@ | |||
3864 | 6378 | esac | 7141 | esac |
3865 | 6379 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 7142 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
3866 | 6380 | 7143 | ||
3868 | 6381 | output_verbose_link_cmd='echo' | 7144 | output_verbose_link_cmd='func_echo_all' |
3869 | 6382 | 7145 | ||
3870 | 6383 | # Archives containing C++ object files must be created using | 7146 | # Archives containing C++ object files must be created using |
3871 | 6384 | # "CC -xar", where "CC" is the Sun C++ compiler. This is | 7147 | # "CC -xar", where "CC" is the Sun C++ compiler. This is |
3872 | @@ -6405,7 +7168,7 @@ | |||
3873 | 6405 | # Commands to make compiler produce verbose output that lists | 7168 | # Commands to make compiler produce verbose output that lists |
3874 | 6406 | # what "hidden" libraries, object files and flags are used when | 7169 | # what "hidden" libraries, object files and flags are used when |
3875 | 6407 | # linking a shared library. | 7170 | # linking a shared library. |
3877 | 6408 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' | 7171 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
3878 | 6409 | else | 7172 | else |
3879 | 6410 | # g++ 2.7 appears to require `-G' NOT `-shared' on this | 7173 | # g++ 2.7 appears to require `-G' NOT `-shared' on this |
3880 | 6411 | # platform. | 7174 | # platform. |
3881 | @@ -6416,7 +7179,7 @@ | |||
3882 | 6416 | # Commands to make compiler produce verbose output that lists | 7179 | # Commands to make compiler produce verbose output that lists |
3883 | 6417 | # what "hidden" libraries, object files and flags are used when | 7180 | # what "hidden" libraries, object files and flags are used when |
3884 | 6418 | # linking a shared library. | 7181 | # linking a shared library. |
3886 | 6419 | output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' | 7182 | output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
3887 | 6420 | fi | 7183 | fi |
3888 | 6421 | 7184 | ||
3889 | 6422 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' | 7185 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' |
3890 | @@ -6470,6 +7233,10 @@ | |||
3891 | 6470 | CC*) | 7233 | CC*) |
3892 | 6471 | _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 7234 | _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3893 | 6472 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 7235 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3894 | 7236 | _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ | ||
3895 | 7237 | '"$_LT_TAGVAR(old_archive_cmds, $1)" | ||
3896 | 7238 | _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ | ||
3897 | 7239 | '"$_LT_TAGVAR(reload_cmds, $1)" | ||
3898 | 6473 | ;; | 7240 | ;; |
3899 | 6474 | *) | 7241 | *) |
3900 | 6475 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 7242 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
3901 | @@ -6716,7 +7483,7 @@ | |||
3902 | 6716 | 7483 | ||
3903 | 6717 | solaris*) | 7484 | solaris*) |
3904 | 6718 | case $cc_basename in | 7485 | case $cc_basename in |
3906 | 6719 | CC*) | 7486 | CC* | sunCC*) |
3907 | 6720 | # The more standards-conforming stlport4 library is | 7487 | # The more standards-conforming stlport4 library is |
3908 | 6721 | # incompatible with the Cstd library. Avoid specifying | 7488 | # incompatible with the Cstd library. Avoid specifying |
3909 | 6722 | # it if it's in CXXFLAGS. Ignore libCrun as | 7489 | # it if it's in CXXFLAGS. Ignore libCrun as |
3910 | @@ -6760,32 +7527,16 @@ | |||
3911 | 6760 | ])# _LT_SYS_HIDDEN_LIBDEPS | 7527 | ])# _LT_SYS_HIDDEN_LIBDEPS |
3912 | 6761 | 7528 | ||
3913 | 6762 | 7529 | ||
3914 | 6763 | # _LT_PROG_F77 | ||
3915 | 6764 | # ------------ | ||
3916 | 6765 | # Since AC_PROG_F77 is broken, in that it returns the empty string | ||
3917 | 6766 | # if there is no fortran compiler, we have our own version here. | ||
3918 | 6767 | m4_defun([_LT_PROG_F77], | ||
3919 | 6768 | [ | ||
3920 | 6769 | pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) | ||
3921 | 6770 | AC_PROG_F77 | ||
3922 | 6771 | if test -z "$F77" || test "X$F77" = "Xno"; then | ||
3923 | 6772 | _lt_disable_F77=yes | ||
3924 | 6773 | fi | ||
3925 | 6774 | popdef([AC_MSG_ERROR]) | ||
3926 | 6775 | ])# _LT_PROG_F77 | ||
3927 | 6776 | |||
3928 | 6777 | dnl aclocal-1.4 backwards compatibility: | ||
3929 | 6778 | dnl AC_DEFUN([_LT_PROG_F77], []) | ||
3930 | 6779 | |||
3931 | 6780 | |||
3932 | 6781 | # _LT_LANG_F77_CONFIG([TAG]) | 7530 | # _LT_LANG_F77_CONFIG([TAG]) |
3933 | 6782 | # -------------------------- | 7531 | # -------------------------- |
3934 | 6783 | # Ensure that the configuration variables for a Fortran 77 compiler are | 7532 | # Ensure that the configuration variables for a Fortran 77 compiler are |
3935 | 6784 | # suitably defined. These variables are subsequently used by _LT_CONFIG | 7533 | # suitably defined. These variables are subsequently used by _LT_CONFIG |
3936 | 6785 | # to write the compiler configuration to `libtool'. | 7534 | # to write the compiler configuration to `libtool'. |
3937 | 6786 | m4_defun([_LT_LANG_F77_CONFIG], | 7535 | m4_defun([_LT_LANG_F77_CONFIG], |
3940 | 6787 | [AC_REQUIRE([_LT_PROG_F77])dnl | 7536 | [AC_LANG_PUSH(Fortran 77) |
3941 | 6788 | AC_LANG_PUSH(Fortran 77) | 7537 | if test -z "$F77" || test "X$F77" = "Xno"; then |
3942 | 7538 | _lt_disable_F77=yes | ||
3943 | 7539 | fi | ||
3944 | 6789 | 7540 | ||
3945 | 6790 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 7541 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3946 | 6791 | _LT_TAGVAR(allow_undefined_flag, $1)= | 7542 | _LT_TAGVAR(allow_undefined_flag, $1)= |
3947 | @@ -6804,6 +7555,8 @@ | |||
3948 | 6804 | _LT_TAGVAR(module_expsym_cmds, $1)= | 7555 | _LT_TAGVAR(module_expsym_cmds, $1)= |
3949 | 6805 | _LT_TAGVAR(link_all_deplibs, $1)=unknown | 7556 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
3950 | 6806 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | 7557 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
3951 | 7558 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
3952 | 7559 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
3953 | 6807 | _LT_TAGVAR(no_undefined_flag, $1)= | 7560 | _LT_TAGVAR(no_undefined_flag, $1)= |
3954 | 6808 | _LT_TAGVAR(whole_archive_flag_spec, $1)= | 7561 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
3955 | 6809 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no | 7562 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
3956 | @@ -6903,32 +7656,17 @@ | |||
3957 | 6903 | ])# _LT_LANG_F77_CONFIG | 7656 | ])# _LT_LANG_F77_CONFIG |
3958 | 6904 | 7657 | ||
3959 | 6905 | 7658 | ||
3960 | 6906 | # _LT_PROG_FC | ||
3961 | 6907 | # ----------- | ||
3962 | 6908 | # Since AC_PROG_FC is broken, in that it returns the empty string | ||
3963 | 6909 | # if there is no fortran compiler, we have our own version here. | ||
3964 | 6910 | m4_defun([_LT_PROG_FC], | ||
3965 | 6911 | [ | ||
3966 | 6912 | pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) | ||
3967 | 6913 | AC_PROG_FC | ||
3968 | 6914 | if test -z "$FC" || test "X$FC" = "Xno"; then | ||
3969 | 6915 | _lt_disable_FC=yes | ||
3970 | 6916 | fi | ||
3971 | 6917 | popdef([AC_MSG_ERROR]) | ||
3972 | 6918 | ])# _LT_PROG_FC | ||
3973 | 6919 | |||
3974 | 6920 | dnl aclocal-1.4 backwards compatibility: | ||
3975 | 6921 | dnl AC_DEFUN([_LT_PROG_FC], []) | ||
3976 | 6922 | |||
3977 | 6923 | |||
3978 | 6924 | # _LT_LANG_FC_CONFIG([TAG]) | 7659 | # _LT_LANG_FC_CONFIG([TAG]) |
3979 | 6925 | # ------------------------- | 7660 | # ------------------------- |
3980 | 6926 | # Ensure that the configuration variables for a Fortran compiler are | 7661 | # Ensure that the configuration variables for a Fortran compiler are |
3981 | 6927 | # suitably defined. These variables are subsequently used by _LT_CONFIG | 7662 | # suitably defined. These variables are subsequently used by _LT_CONFIG |
3982 | 6928 | # to write the compiler configuration to `libtool'. | 7663 | # to write the compiler configuration to `libtool'. |
3983 | 6929 | m4_defun([_LT_LANG_FC_CONFIG], | 7664 | m4_defun([_LT_LANG_FC_CONFIG], |
3986 | 6930 | [AC_REQUIRE([_LT_PROG_FC])dnl | 7665 | [AC_LANG_PUSH(Fortran) |
3987 | 6931 | AC_LANG_PUSH(Fortran) | 7666 | |
3988 | 7667 | if test -z "$FC" || test "X$FC" = "Xno"; then | ||
3989 | 7668 | _lt_disable_FC=yes | ||
3990 | 7669 | fi | ||
3991 | 6932 | 7670 | ||
3992 | 6933 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 7671 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
3993 | 6934 | _LT_TAGVAR(allow_undefined_flag, $1)= | 7672 | _LT_TAGVAR(allow_undefined_flag, $1)= |
3994 | @@ -6947,6 +7685,8 @@ | |||
3995 | 6947 | _LT_TAGVAR(module_expsym_cmds, $1)= | 7685 | _LT_TAGVAR(module_expsym_cmds, $1)= |
3996 | 6948 | _LT_TAGVAR(link_all_deplibs, $1)=unknown | 7686 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
3997 | 6949 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | 7687 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
3998 | 7688 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
3999 | 7689 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
4000 | 6950 | _LT_TAGVAR(no_undefined_flag, $1)= | 7690 | _LT_TAGVAR(no_undefined_flag, $1)= |
4001 | 6951 | _LT_TAGVAR(whole_archive_flag_spec, $1)= | 7691 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
4002 | 6952 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no | 7692 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
4003 | @@ -7092,6 +7832,8 @@ | |||
4004 | 7092 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 7832 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
4005 | 7093 | 7833 | ||
4006 | 7094 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | 7834 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
4007 | 7835 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
4008 | 7836 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
4009 | 7095 | 7837 | ||
4010 | 7096 | if test -n "$compiler"; then | 7838 | if test -n "$compiler"; then |
4011 | 7097 | _LT_COMPILER_NO_RTTI($1) | 7839 | _LT_COMPILER_NO_RTTI($1) |
4012 | @@ -7205,6 +7947,18 @@ | |||
4013 | 7205 | ]) | 7947 | ]) |
4014 | 7206 | 7948 | ||
4015 | 7207 | 7949 | ||
4016 | 7950 | # _LT_DECL_OBJDUMP | ||
4017 | 7951 | # -------------- | ||
4018 | 7952 | # If we don't have a new enough Autoconf to choose the best objdump | ||
4019 | 7953 | # available, choose the one first in the user's PATH. | ||
4020 | 7954 | m4_defun([_LT_DECL_OBJDUMP], | ||
4021 | 7955 | [AC_CHECK_TOOL(OBJDUMP, objdump, false) | ||
4022 | 7956 | test -z "$OBJDUMP" && OBJDUMP=objdump | ||
4023 | 7957 | _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) | ||
4024 | 7958 | AC_SUBST([OBJDUMP]) | ||
4025 | 7959 | ]) | ||
4026 | 7960 | |||
4027 | 7961 | |||
4028 | 7208 | # _LT_DECL_SED | 7962 | # _LT_DECL_SED |
4029 | 7209 | # ------------ | 7963 | # ------------ |
4030 | 7210 | # Check for a fully-functional sed program, that truncates | 7964 | # Check for a fully-functional sed program, that truncates |
4031 | @@ -7441,7 +8195,7 @@ | |||
4032 | 7441 | func_dirname () | 8195 | func_dirname () |
4033 | 7442 | { | 8196 | { |
4034 | 7443 | # Extract subdirectory from the argument. | 8197 | # Extract subdirectory from the argument. |
4036 | 7444 | func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` | 8198 | func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` |
4037 | 7445 | if test "X$func_dirname_result" = "X${1}"; then | 8199 | if test "X$func_dirname_result" = "X${1}"; then |
4038 | 7446 | func_dirname_result="${3}" | 8200 | func_dirname_result="${3}" |
4039 | 7447 | else | 8201 | else |
4040 | @@ -7452,7 +8206,7 @@ | |||
4041 | 7452 | # func_basename file | 8206 | # func_basename file |
4042 | 7453 | func_basename () | 8207 | func_basename () |
4043 | 7454 | { | 8208 | { |
4045 | 7455 | func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` | 8209 | func_basename_result=`$ECHO "${1}" | $SED "$basename"` |
4046 | 7456 | } | 8210 | } |
4047 | 7457 | 8211 | ||
4048 | 7458 | dnl func_dirname_and_basename | 8212 | dnl func_dirname_and_basename |
4049 | @@ -7468,10 +8222,8 @@ | |||
4050 | 7468 | func_stripname () | 8222 | func_stripname () |
4051 | 7469 | { | 8223 | { |
4052 | 7470 | case ${2} in | 8224 | case ${2} in |
4057 | 7471 | .*) func_stripname_result=`$ECHO "X${3}" \ | 8225 | .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
4058 | 7472 | | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; | 8226 | *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
4055 | 7473 | *) func_stripname_result=`$ECHO "X${3}" \ | ||
4056 | 7474 | | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; | ||
4059 | 7475 | esac | 8227 | esac |
4060 | 7476 | } | 8228 | } |
4061 | 7477 | 8229 | ||
4062 | @@ -7482,20 +8234,20 @@ | |||
4063 | 7482 | # func_opt_split | 8234 | # func_opt_split |
4064 | 7483 | func_opt_split () | 8235 | func_opt_split () |
4065 | 7484 | { | 8236 | { |
4068 | 7485 | func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` | 8237 | func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` |
4069 | 7486 | func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` | 8238 | func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` |
4070 | 7487 | } | 8239 | } |
4071 | 7488 | 8240 | ||
4072 | 7489 | # func_lo2o object | 8241 | # func_lo2o object |
4073 | 7490 | func_lo2o () | 8242 | func_lo2o () |
4074 | 7491 | { | 8243 | { |
4076 | 7492 | func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` | 8244 | func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` |
4077 | 7493 | } | 8245 | } |
4078 | 7494 | 8246 | ||
4079 | 7495 | # func_xform libobj-or-source | 8247 | # func_xform libobj-or-source |
4080 | 7496 | func_xform () | 8248 | func_xform () |
4081 | 7497 | { | 8249 | { |
4083 | 7498 | func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` | 8250 | func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` |
4084 | 7499 | } | 8251 | } |
4085 | 7500 | 8252 | ||
4086 | 7501 | # func_arith arithmetic-term... | 8253 | # func_arith arithmetic-term... |
4087 | @@ -7543,14 +8295,15 @@ | |||
4088 | 7543 | 8295 | ||
4089 | 7544 | # Helper functions for option handling. -*- Autoconf -*- | 8296 | # Helper functions for option handling. -*- Autoconf -*- |
4090 | 7545 | # | 8297 | # |
4092 | 7546 | # Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. | 8298 | # Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, |
4093 | 8299 | # Inc. | ||
4094 | 7547 | # Written by Gary V. Vaughan, 2004 | 8300 | # Written by Gary V. Vaughan, 2004 |
4095 | 7548 | # | 8301 | # |
4096 | 7549 | # This file is free software; the Free Software Foundation gives | 8302 | # This file is free software; the Free Software Foundation gives |
4097 | 7550 | # unlimited permission to copy and/or distribute it, with or without | 8303 | # unlimited permission to copy and/or distribute it, with or without |
4098 | 7551 | # modifications, as long as this notice is preserved. | 8304 | # modifications, as long as this notice is preserved. |
4099 | 7552 | 8305 | ||
4101 | 7553 | # serial 6 ltoptions.m4 | 8306 | # serial 7 ltoptions.m4 |
4102 | 7554 | 8307 | ||
4103 | 7555 | # This is to help aclocal find these macros, as it can't see m4_define. | 8308 | # This is to help aclocal find these macros, as it can't see m4_define. |
4104 | 7556 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) | 8309 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) |
4105 | @@ -7665,7 +8418,7 @@ | |||
4106 | 7665 | [enable_win32_dll=yes | 8418 | [enable_win32_dll=yes |
4107 | 7666 | 8419 | ||
4108 | 7667 | case $host in | 8420 | case $host in |
4110 | 7668 | *-*-cygwin* | *-*-mingw* | *-*-pw32*) | 8421 | *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) |
4111 | 7669 | AC_CHECK_TOOL(AS, as, false) | 8422 | AC_CHECK_TOOL(AS, as, false) |
4112 | 7670 | AC_CHECK_TOOL(DLLTOOL, dlltool, false) | 8423 | AC_CHECK_TOOL(DLLTOOL, dlltool, false) |
4113 | 7671 | AC_CHECK_TOOL(OBJDUMP, objdump, false) | 8424 | AC_CHECK_TOOL(OBJDUMP, objdump, false) |
4114 | @@ -7673,13 +8426,13 @@ | |||
4115 | 7673 | esac | 8426 | esac |
4116 | 7674 | 8427 | ||
4117 | 7675 | test -z "$AS" && AS=as | 8428 | test -z "$AS" && AS=as |
4119 | 7676 | _LT_DECL([], [AS], [0], [Assembler program])dnl | 8429 | _LT_DECL([], [AS], [1], [Assembler program])dnl |
4120 | 7677 | 8430 | ||
4121 | 7678 | test -z "$DLLTOOL" && DLLTOOL=dlltool | 8431 | test -z "$DLLTOOL" && DLLTOOL=dlltool |
4123 | 7679 | _LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl | 8432 | _LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl |
4124 | 7680 | 8433 | ||
4125 | 7681 | test -z "$OBJDUMP" && OBJDUMP=objdump | 8434 | test -z "$OBJDUMP" && OBJDUMP=objdump |
4127 | 7682 | _LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl | 8435 | _LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl |
4128 | 7683 | ])# win32-dll | 8436 | ])# win32-dll |
4129 | 7684 | 8437 | ||
4130 | 7685 | AU_DEFUN([AC_LIBTOOL_WIN32_DLL], | 8438 | AU_DEFUN([AC_LIBTOOL_WIN32_DLL], |
4131 | @@ -7906,14 +8659,14 @@ | |||
4132 | 7906 | 8659 | ||
4133 | 7907 | # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- | 8660 | # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- |
4134 | 7908 | # | 8661 | # |
4137 | 7909 | # Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. | 8662 | # Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. |
4138 | 7910 | # Written by Gary V. Vaughan, 2004 | 8663 | # Written by Gary V. Vaughan, 2004 |
4139 | 7911 | # | 8664 | # |
4140 | 7912 | # This file is free software; the Free Software Foundation gives | 8665 | # This file is free software; the Free Software Foundation gives |
4141 | 7913 | # unlimited permission to copy and/or distribute it, with or without | 8666 | # unlimited permission to copy and/or distribute it, with or without |
4142 | 7914 | # modifications, as long as this notice is preserved. | 8667 | # modifications, as long as this notice is preserved. |
4143 | 7915 | 8668 | ||
4145 | 7916 | # serial 5 ltsugar.m4 | 8669 | # serial 6 ltsugar.m4 |
4146 | 7917 | 8670 | ||
4147 | 7918 | # This is to help aclocal find these macros, as it can't see m4_define. | 8671 | # This is to help aclocal find these macros, as it can't see m4_define. |
4148 | 7919 | AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) | 8672 | AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) |
4149 | @@ -7969,14 +8722,14 @@ | |||
4150 | 7969 | # Produce a SEP delimited list of all paired combinations of elements of | 8722 | # Produce a SEP delimited list of all paired combinations of elements of |
4151 | 7970 | # PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list | 8723 | # PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list |
4152 | 7971 | # has the form PREFIXmINFIXSUFFIXn. | 8724 | # has the form PREFIXmINFIXSUFFIXn. |
4153 | 8725 | # Needed until we can rely on m4_combine added in Autoconf 2.62. | ||
4154 | 7972 | m4_define([lt_combine], | 8726 | m4_define([lt_combine], |
4162 | 7973 | [m4_if([$2], [], [], | 8727 | [m4_if(m4_eval([$# > 3]), [1], |
4163 | 7974 | [m4_if([$4], [], [], | 8728 | [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl |
4164 | 7975 | [lt_join(m4_quote(m4_default([$1], [[, ]])), | 8729 | [[m4_foreach([_Lt_prefix], [$2], |
4165 | 7976 | lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2], | 8730 | [m4_foreach([_Lt_suffix], |
4166 | 7977 | [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]), | 8731 | ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, |
4167 | 7978 | [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl | 8732 | [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) |
4161 | 7979 | ]) | ||
4168 | 7980 | 8733 | ||
4169 | 7981 | 8734 | ||
4170 | 7982 | # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) | 8735 | # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) |
4171 | @@ -8039,29 +8792,29 @@ | |||
4172 | 8039 | 8792 | ||
4173 | 8040 | # Generated from ltversion.in. | 8793 | # Generated from ltversion.in. |
4174 | 8041 | 8794 | ||
4176 | 8042 | # serial 2976 ltversion.m4 | 8795 | # serial 3175 ltversion.m4 |
4177 | 8043 | # This file is part of GNU Libtool | 8796 | # This file is part of GNU Libtool |
4178 | 8044 | 8797 | ||
4181 | 8045 | m4_define([LT_PACKAGE_VERSION], [2.2.4]) | 8798 | m4_define([LT_PACKAGE_VERSION], [2.2.10]) |
4182 | 8046 | m4_define([LT_PACKAGE_REVISION], [1.2976]) | 8799 | m4_define([LT_PACKAGE_REVISION], [1.3175]) |
4183 | 8047 | 8800 | ||
4184 | 8048 | AC_DEFUN([LTVERSION_VERSION], | 8801 | AC_DEFUN([LTVERSION_VERSION], |
4187 | 8049 | [macro_version='2.2.4' | 8802 | [macro_version='2.2.10' |
4188 | 8050 | macro_revision='1.2976' | 8803 | macro_revision='1.3175' |
4189 | 8051 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) | 8804 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) |
4190 | 8052 | _LT_DECL(, macro_revision, 0) | 8805 | _LT_DECL(, macro_revision, 0) |
4191 | 8053 | ]) | 8806 | ]) |
4192 | 8054 | 8807 | ||
4193 | 8055 | # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- | 8808 | # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- |
4194 | 8056 | # | 8809 | # |
4196 | 8057 | # Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. | 8810 | # Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. |
4197 | 8058 | # Written by Scott James Remnant, 2004. | 8811 | # Written by Scott James Remnant, 2004. |
4198 | 8059 | # | 8812 | # |
4199 | 8060 | # This file is free software; the Free Software Foundation gives | 8813 | # This file is free software; the Free Software Foundation gives |
4200 | 8061 | # unlimited permission to copy and/or distribute it, with or without | 8814 | # unlimited permission to copy and/or distribute it, with or without |
4201 | 8062 | # modifications, as long as this notice is preserved. | 8815 | # modifications, as long as this notice is preserved. |
4202 | 8063 | 8816 | ||
4204 | 8064 | # serial 4 lt~obsolete.m4 | 8817 | # serial 5 lt~obsolete.m4 |
4205 | 8065 | 8818 | ||
4206 | 8066 | # These exist entirely to fool aclocal when bootstrapping libtool. | 8819 | # These exist entirely to fool aclocal when bootstrapping libtool. |
4207 | 8067 | # | 8820 | # |
4208 | @@ -8131,7 +8884,6 @@ | |||
4209 | 8131 | m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) | 8884 | m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) |
4210 | 8132 | m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) | 8885 | m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) |
4211 | 8133 | m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) | 8886 | m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) |
4212 | 8134 | m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) | ||
4213 | 8135 | m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) | 8887 | m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) |
4214 | 8136 | m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) | 8888 | m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) |
4215 | 8137 | m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) | 8889 | m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) |
4216 | @@ -8144,8 +8896,49 @@ | |||
4217 | 8144 | m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) | 8896 | m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) |
4218 | 8145 | m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) | 8897 | m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) |
4219 | 8146 | m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) | 8898 | m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) |
4220 | 8899 | m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) | ||
4221 | 8900 | m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) | ||
4222 | 8901 | m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) | ||
4223 | 8902 | m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) | ||
4224 | 8903 | m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) | ||
4225 | 8904 | m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) | ||
4226 | 8905 | m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) | ||
4227 | 8906 | |||
4228 | 8907 | # nls.m4 serial 5 (gettext-0.18) | ||
4229 | 8908 | dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, | ||
4230 | 8909 | dnl Inc. | ||
4231 | 8910 | dnl This file is free software; the Free Software Foundation | ||
4232 | 8911 | dnl gives unlimited permission to copy and/or distribute it, | ||
4233 | 8912 | dnl with or without modifications, as long as this notice is preserved. | ||
4234 | 8913 | dnl | ||
4235 | 8914 | dnl This file can can be used in projects which are not available under | ||
4236 | 8915 | dnl the GNU General Public License or the GNU Library General Public | ||
4237 | 8916 | dnl License but which still want to provide support for the GNU gettext | ||
4238 | 8917 | dnl functionality. | ||
4239 | 8918 | dnl Please note that the actual code of the GNU gettext library is covered | ||
4240 | 8919 | dnl by the GNU Library General Public License, and the rest of the GNU | ||
4241 | 8920 | dnl gettext package package is covered by the GNU General Public License. | ||
4242 | 8921 | dnl They are *not* in the public domain. | ||
4243 | 8922 | |||
4244 | 8923 | dnl Authors: | ||
4245 | 8924 | dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. | ||
4246 | 8925 | dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. | ||
4247 | 8926 | |||
4248 | 8927 | AC_PREREQ([2.50]) | ||
4249 | 8928 | |||
4250 | 8929 | AC_DEFUN([AM_NLS], | ||
4251 | 8930 | [ | ||
4252 | 8931 | AC_MSG_CHECKING([whether NLS is requested]) | ||
4253 | 8932 | dnl Default is enabled NLS | ||
4254 | 8933 | AC_ARG_ENABLE([nls], | ||
4255 | 8934 | [ --disable-nls do not use Native Language Support], | ||
4256 | 8935 | USE_NLS=$enableval, USE_NLS=yes) | ||
4257 | 8936 | AC_MSG_RESULT([$USE_NLS]) | ||
4258 | 8937 | AC_SUBST([USE_NLS]) | ||
4259 | 8938 | ]) | ||
4260 | 8147 | 8939 | ||
4261 | 8148 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | 8940 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
4262 | 8941 | # serial 1 (pkg-config-0.24) | ||
4263 | 8149 | # | 8942 | # |
4264 | 8150 | # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. | 8943 | # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
4265 | 8151 | # | 8944 | # |
4266 | @@ -8173,7 +8966,10 @@ | |||
4267 | 8173 | AC_DEFUN([PKG_PROG_PKG_CONFIG], | 8966 | AC_DEFUN([PKG_PROG_PKG_CONFIG], |
4268 | 8174 | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) | 8967 | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
4269 | 8175 | m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) | 8968 | m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) |
4271 | 8176 | AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl | 8969 | AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) |
4272 | 8970 | AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) | ||
4273 | 8971 | AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) | ||
4274 | 8972 | |||
4275 | 8177 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | 8973 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
4276 | 8178 | AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) | 8974 | AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
4277 | 8179 | fi | 8975 | fi |
4278 | @@ -8186,7 +8982,6 @@ | |||
4279 | 8186 | AC_MSG_RESULT([no]) | 8982 | AC_MSG_RESULT([no]) |
4280 | 8187 | PKG_CONFIG="" | 8983 | PKG_CONFIG="" |
4281 | 8188 | fi | 8984 | fi |
4282 | 8189 | |||
4283 | 8190 | fi[]dnl | 8985 | fi[]dnl |
4284 | 8191 | ])# PKG_PROG_PKG_CONFIG | 8986 | ])# PKG_PROG_PKG_CONFIG |
4285 | 8192 | 8987 | ||
4286 | @@ -8195,34 +8990,31 @@ | |||
4287 | 8195 | # Check to see whether a particular set of modules exists. Similar | 8990 | # Check to see whether a particular set of modules exists. Similar |
4288 | 8196 | # to PKG_CHECK_MODULES(), but does not set variables or print errors. | 8991 | # to PKG_CHECK_MODULES(), but does not set variables or print errors. |
4289 | 8197 | # | 8992 | # |
4294 | 8198 | # | 8993 | # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
4295 | 8199 | # Similar to PKG_CHECK_MODULES, make sure that the first instance of | 8994 | # only at the first occurence in configure.ac, so if the first place |
4296 | 8200 | # this or PKG_CHECK_MODULES is called, or make sure to call | 8995 | # it's called might be skipped (such as if it is within an "if", you |
4297 | 8201 | # PKG_CHECK_EXISTS manually | 8996 | # have to call PKG_CHECK_EXISTS manually |
4298 | 8202 | # -------------------------------------------------------------- | 8997 | # -------------------------------------------------------------- |
4299 | 8203 | AC_DEFUN([PKG_CHECK_EXISTS], | 8998 | AC_DEFUN([PKG_CHECK_EXISTS], |
4300 | 8204 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | 8999 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
4301 | 8205 | if test -n "$PKG_CONFIG" && \ | 9000 | if test -n "$PKG_CONFIG" && \ |
4302 | 8206 | AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then | 9001 | AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then |
4304 | 8207 | m4_ifval([$2], [$2], [:]) | 9002 | m4_default([$2], [:]) |
4305 | 8208 | m4_ifvaln([$3], [else | 9003 | m4_ifvaln([$3], [else |
4306 | 8209 | $3])dnl | 9004 | $3])dnl |
4307 | 8210 | fi]) | 9005 | fi]) |
4308 | 8211 | 9006 | ||
4309 | 8212 | |||
4310 | 8213 | # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) | 9007 | # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) |
4311 | 8214 | # --------------------------------------------- | 9008 | # --------------------------------------------- |
4312 | 8215 | m4_define([_PKG_CONFIG], | 9009 | m4_define([_PKG_CONFIG], |
4323 | 8216 | [if test -n "$PKG_CONFIG"; then | 9010 | [if test -n "$$1"; then |
4324 | 8217 | if test -n "$$1"; then | 9011 | pkg_cv_[]$1="$$1" |
4325 | 8218 | pkg_cv_[]$1="$$1" | 9012 | elif test -n "$PKG_CONFIG"; then |
4326 | 8219 | else | 9013 | PKG_CHECK_EXISTS([$3], |
4327 | 8220 | PKG_CHECK_EXISTS([$3], | 9014 | [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], |
4328 | 8221 | [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], | 9015 | [pkg_failed=yes]) |
4329 | 8222 | [pkg_failed=yes]) | 9016 | else |
4330 | 8223 | fi | 9017 | pkg_failed=untried |
4321 | 8224 | else | ||
4322 | 8225 | pkg_failed=untried | ||
4331 | 8226 | fi[]dnl | 9018 | fi[]dnl |
4332 | 8227 | ])# _PKG_CONFIG | 9019 | ])# _PKG_CONFIG |
4333 | 8228 | 9020 | ||
4334 | @@ -8264,16 +9056,17 @@ | |||
4335 | 8264 | See the pkg-config man page for more details.]) | 9056 | See the pkg-config man page for more details.]) |
4336 | 8265 | 9057 | ||
4337 | 8266 | if test $pkg_failed = yes; then | 9058 | if test $pkg_failed = yes; then |
4338 | 9059 | AC_MSG_RESULT([no]) | ||
4339 | 8267 | _PKG_SHORT_ERRORS_SUPPORTED | 9060 | _PKG_SHORT_ERRORS_SUPPORTED |
4340 | 8268 | if test $_pkg_short_errors_supported = yes; then | 9061 | if test $_pkg_short_errors_supported = yes; then |
4342 | 8269 | $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` | 9062 | $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` |
4343 | 8270 | else | 9063 | else |
4345 | 8271 | $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` | 9064 | $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` |
4346 | 8272 | fi | 9065 | fi |
4347 | 8273 | # Put the nasty error message in config.log where it belongs | 9066 | # Put the nasty error message in config.log where it belongs |
4348 | 8274 | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD | 9067 | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
4349 | 8275 | 9068 | ||
4351 | 8276 | ifelse([$4], , [AC_MSG_ERROR(dnl | 9069 | m4_default([$4], [AC_MSG_ERROR( |
4352 | 8277 | [Package requirements ($2) were not met: | 9070 | [Package requirements ($2) were not met: |
4353 | 8278 | 9071 | ||
4354 | 8279 | $$1_PKG_ERRORS | 9072 | $$1_PKG_ERRORS |
4355 | @@ -8281,29 +9074,28 @@ | |||
4356 | 8281 | Consider adjusting the PKG_CONFIG_PATH environment variable if you | 9074 | Consider adjusting the PKG_CONFIG_PATH environment variable if you |
4357 | 8282 | installed software in a non-standard prefix. | 9075 | installed software in a non-standard prefix. |
4358 | 8283 | 9076 | ||
4363 | 8284 | _PKG_TEXT | 9077 | _PKG_TEXT])[]dnl |
4364 | 8285 | ])], | 9078 | ]) |
4361 | 8286 | [AC_MSG_RESULT([no]) | ||
4362 | 8287 | $4]) | ||
4365 | 8288 | elif test $pkg_failed = untried; then | 9079 | elif test $pkg_failed = untried; then |
4367 | 8289 | ifelse([$4], , [AC_MSG_FAILURE(dnl | 9080 | AC_MSG_RESULT([no]) |
4368 | 9081 | m4_default([$4], [AC_MSG_FAILURE( | ||
4369 | 8290 | [The pkg-config script could not be found or is too old. Make sure it | 9082 | [The pkg-config script could not be found or is too old. Make sure it |
4370 | 8291 | is in your PATH or set the PKG_CONFIG environment variable to the full | 9083 | is in your PATH or set the PKG_CONFIG environment variable to the full |
4371 | 8292 | path to pkg-config. | 9084 | path to pkg-config. |
4372 | 8293 | 9085 | ||
4373 | 8294 | _PKG_TEXT | 9086 | _PKG_TEXT |
4374 | 8295 | 9087 | ||
4377 | 8296 | To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], | 9088 | To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl |
4378 | 8297 | [$4]) | 9089 | ]) |
4379 | 8298 | else | 9090 | else |
4380 | 8299 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS | 9091 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
4381 | 8300 | $1[]_LIBS=$pkg_cv_[]$1[]_LIBS | 9092 | $1[]_LIBS=$pkg_cv_[]$1[]_LIBS |
4382 | 8301 | AC_MSG_RESULT([yes]) | 9093 | AC_MSG_RESULT([yes]) |
4384 | 8302 | ifelse([$3], , :, [$3]) | 9094 | $3 |
4385 | 8303 | fi[]dnl | 9095 | fi[]dnl |
4386 | 8304 | ])# PKG_CHECK_MODULES | 9096 | ])# PKG_CHECK_MODULES |
4387 | 8305 | 9097 | ||
4389 | 8306 | # Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. | 9098 | # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
4390 | 8307 | # | 9099 | # |
4391 | 8308 | # This file is free software; the Free Software Foundation | 9100 | # This file is free software; the Free Software Foundation |
4392 | 8309 | # gives unlimited permission to copy and/or distribute it, | 9101 | # gives unlimited permission to copy and/or distribute it, |
4393 | @@ -8315,10 +9107,10 @@ | |||
4394 | 8315 | # generated from the m4 files accompanying Automake X.Y. | 9107 | # generated from the m4 files accompanying Automake X.Y. |
4395 | 8316 | # (This private macro should not be called outside this file.) | 9108 | # (This private macro should not be called outside this file.) |
4396 | 8317 | AC_DEFUN([AM_AUTOMAKE_VERSION], | 9109 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
4398 | 8318 | [am__api_version='1.10' | 9110 | [am__api_version='1.11' |
4399 | 8319 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | 9111 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
4400 | 8320 | dnl require some minimum version. Point them to the right macro. | 9112 | dnl require some minimum version. Point them to the right macro. |
4402 | 8321 | m4_if([$1], [1.10.1], [], | 9113 | m4_if([$1], [1.11.1], [], |
4403 | 8322 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | 9114 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
4404 | 8323 | ]) | 9115 | ]) |
4405 | 8324 | 9116 | ||
4406 | @@ -8332,12 +9124,12 @@ | |||
4407 | 8332 | # AM_SET_CURRENT_AUTOMAKE_VERSION | 9124 | # AM_SET_CURRENT_AUTOMAKE_VERSION |
4408 | 8333 | # ------------------------------- | 9125 | # ------------------------------- |
4409 | 8334 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | 9126 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
4411 | 8335 | # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. | 9127 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
4412 | 8336 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | 9128 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
4414 | 8337 | [AM_AUTOMAKE_VERSION([1.10.1])dnl | 9129 | [AM_AUTOMAKE_VERSION([1.11.1])dnl |
4415 | 8338 | m4_ifndef([AC_AUTOCONF_VERSION], | 9130 | m4_ifndef([AC_AUTOCONF_VERSION], |
4416 | 8339 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | 9131 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
4418 | 8340 | _AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) | 9132 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
4419 | 8341 | 9133 | ||
4420 | 8342 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- | 9134 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
4421 | 8343 | 9135 | ||
4422 | @@ -8394,14 +9186,14 @@ | |||
4423 | 8394 | 9186 | ||
4424 | 8395 | # AM_CONDITIONAL -*- Autoconf -*- | 9187 | # AM_CONDITIONAL -*- Autoconf -*- |
4425 | 8396 | 9188 | ||
4427 | 8397 | # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 | 9189 | # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 |
4428 | 8398 | # Free Software Foundation, Inc. | 9190 | # Free Software Foundation, Inc. |
4429 | 8399 | # | 9191 | # |
4430 | 8400 | # This file is free software; the Free Software Foundation | 9192 | # This file is free software; the Free Software Foundation |
4431 | 8401 | # gives unlimited permission to copy and/or distribute it, | 9193 | # gives unlimited permission to copy and/or distribute it, |
4432 | 8402 | # with or without modifications, as long as this notice is preserved. | 9194 | # with or without modifications, as long as this notice is preserved. |
4433 | 8403 | 9195 | ||
4435 | 8404 | # serial 8 | 9196 | # serial 9 |
4436 | 8405 | 9197 | ||
4437 | 8406 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) | 9198 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) |
4438 | 8407 | # ------------------------------------- | 9199 | # ------------------------------------- |
4439 | @@ -8414,6 +9206,7 @@ | |||
4440 | 8414 | AC_SUBST([$1_FALSE])dnl | 9206 | AC_SUBST([$1_FALSE])dnl |
4441 | 8415 | _AM_SUBST_NOTMAKE([$1_TRUE])dnl | 9207 | _AM_SUBST_NOTMAKE([$1_TRUE])dnl |
4442 | 8416 | _AM_SUBST_NOTMAKE([$1_FALSE])dnl | 9208 | _AM_SUBST_NOTMAKE([$1_FALSE])dnl |
4443 | 9209 | m4_define([_AM_COND_VALUE_$1], [$2])dnl | ||
4444 | 8417 | if $2; then | 9210 | if $2; then |
4445 | 8418 | $1_TRUE= | 9211 | $1_TRUE= |
4446 | 8419 | $1_FALSE='#' | 9212 | $1_FALSE='#' |
4447 | @@ -8427,14 +9220,14 @@ | |||
4448 | 8427 | Usually this means the macro was only invoked conditionally.]]) | 9220 | Usually this means the macro was only invoked conditionally.]]) |
4449 | 8428 | fi])]) | 9221 | fi])]) |
4450 | 8429 | 9222 | ||
4452 | 8430 | # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 | 9223 | # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 |
4453 | 8431 | # Free Software Foundation, Inc. | 9224 | # Free Software Foundation, Inc. |
4454 | 8432 | # | 9225 | # |
4455 | 8433 | # This file is free software; the Free Software Foundation | 9226 | # This file is free software; the Free Software Foundation |
4456 | 8434 | # gives unlimited permission to copy and/or distribute it, | 9227 | # gives unlimited permission to copy and/or distribute it, |
4457 | 8435 | # with or without modifications, as long as this notice is preserved. | 9228 | # with or without modifications, as long as this notice is preserved. |
4458 | 8436 | 9229 | ||
4460 | 8437 | # serial 9 | 9230 | # serial 10 |
4461 | 8438 | 9231 | ||
4462 | 8439 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be | 9232 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
4463 | 8440 | # written in clear, in which case automake, when reading aclocal.m4, | 9233 | # written in clear, in which case automake, when reading aclocal.m4, |
4464 | @@ -8491,6 +9284,16 @@ | |||
4465 | 8491 | if test "$am_compiler_list" = ""; then | 9284 | if test "$am_compiler_list" = ""; then |
4466 | 8492 | am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` | 9285 | am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` |
4467 | 8493 | fi | 9286 | fi |
4468 | 9287 | am__universal=false | ||
4469 | 9288 | m4_case([$1], [CC], | ||
4470 | 9289 | [case " $depcc " in #( | ||
4471 | 9290 | *\ -arch\ *\ -arch\ *) am__universal=true ;; | ||
4472 | 9291 | esac], | ||
4473 | 9292 | [CXX], | ||
4474 | 9293 | [case " $depcc " in #( | ||
4475 | 9294 | *\ -arch\ *\ -arch\ *) am__universal=true ;; | ||
4476 | 9295 | esac]) | ||
4477 | 9296 | |||
4478 | 8494 | for depmode in $am_compiler_list; do | 9297 | for depmode in $am_compiler_list; do |
4479 | 8495 | # Setup a source with many dependencies, because some compilers | 9298 | # Setup a source with many dependencies, because some compilers |
4480 | 8496 | # like to wrap large dependency lists on column 80 (with \), and | 9299 | # like to wrap large dependency lists on column 80 (with \), and |
4481 | @@ -8508,7 +9311,17 @@ | |||
4482 | 8508 | done | 9311 | done |
4483 | 8509 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf | 9312 | echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
4484 | 8510 | 9313 | ||
4485 | 9314 | # We check with `-c' and `-o' for the sake of the "dashmstdout" | ||
4486 | 9315 | # mode. It turns out that the SunPro C++ compiler does not properly | ||
4487 | 9316 | # handle `-M -o', and we need to detect this. Also, some Intel | ||
4488 | 9317 | # versions had trouble with output in subdirs | ||
4489 | 9318 | am__obj=sub/conftest.${OBJEXT-o} | ||
4490 | 9319 | am__minus_obj="-o $am__obj" | ||
4491 | 8511 | case $depmode in | 9320 | case $depmode in |
4492 | 9321 | gcc) | ||
4493 | 9322 | # This depmode causes a compiler race in universal mode. | ||
4494 | 9323 | test "$am__universal" = false || continue | ||
4495 | 9324 | ;; | ||
4496 | 8512 | nosideeffect) | 9325 | nosideeffect) |
4497 | 8513 | # after this tag, mechanisms are not by side-effect, so they'll | 9326 | # after this tag, mechanisms are not by side-effect, so they'll |
4498 | 8514 | # only be used when explicitly requested | 9327 | # only be used when explicitly requested |
4499 | @@ -8518,19 +9331,23 @@ | |||
4500 | 8518 | break | 9331 | break |
4501 | 8519 | fi | 9332 | fi |
4502 | 8520 | ;; | 9333 | ;; |
4503 | 9334 | msvisualcpp | msvcmsys) | ||
4504 | 9335 | # This compiler won't grok `-c -o', but also, the minuso test has | ||
4505 | 9336 | # not run yet. These depmodes are late enough in the game, and | ||
4506 | 9337 | # so weak that their functioning should not be impacted. | ||
4507 | 9338 | am__obj=conftest.${OBJEXT-o} | ||
4508 | 9339 | am__minus_obj= | ||
4509 | 9340 | ;; | ||
4510 | 8521 | none) break ;; | 9341 | none) break ;; |
4511 | 8522 | esac | 9342 | esac |
4512 | 8523 | # We check with `-c' and `-o' for the sake of the "dashmstdout" | ||
4513 | 8524 | # mode. It turns out that the SunPro C++ compiler does not properly | ||
4514 | 8525 | # handle `-M -o', and we need to detect this. | ||
4515 | 8526 | if depmode=$depmode \ | 9343 | if depmode=$depmode \ |
4517 | 8527 | source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ | 9344 | source=sub/conftest.c object=$am__obj \ |
4518 | 8528 | depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ | 9345 | depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ |
4520 | 8529 | $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ | 9346 | $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ |
4521 | 8530 | >/dev/null 2>conftest.err && | 9347 | >/dev/null 2>conftest.err && |
4522 | 8531 | grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && | 9348 | grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && |
4523 | 8532 | grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && | 9349 | grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && |
4525 | 8533 | grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && | 9350 | grep $am__obj sub/conftest.Po > /dev/null 2>&1 && |
4526 | 8534 | ${MAKE-make} -s -f confmf > /dev/null 2>&1; then | 9351 | ${MAKE-make} -s -f confmf > /dev/null 2>&1; then |
4527 | 8535 | # icc doesn't choke on unknown options, it will just issue warnings | 9352 | # icc doesn't choke on unknown options, it will just issue warnings |
4528 | 8536 | # or remarks (even with -Werror). So we grep stderr for any message | 9353 | # or remarks (even with -Werror). So we grep stderr for any message |
4529 | @@ -8587,57 +9404,68 @@ | |||
4530 | 8587 | 9404 | ||
4531 | 8588 | # Generate code to set up dependency tracking. -*- Autoconf -*- | 9405 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
4532 | 8589 | 9406 | ||
4534 | 8590 | # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 | 9407 | # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 |
4535 | 8591 | # Free Software Foundation, Inc. | 9408 | # Free Software Foundation, Inc. |
4536 | 8592 | # | 9409 | # |
4537 | 8593 | # This file is free software; the Free Software Foundation | 9410 | # This file is free software; the Free Software Foundation |
4538 | 8594 | # gives unlimited permission to copy and/or distribute it, | 9411 | # gives unlimited permission to copy and/or distribute it, |
4539 | 8595 | # with or without modifications, as long as this notice is preserved. | 9412 | # with or without modifications, as long as this notice is preserved. |
4540 | 8596 | 9413 | ||
4542 | 8597 | #serial 3 | 9414 | #serial 5 |
4543 | 8598 | 9415 | ||
4544 | 8599 | # _AM_OUTPUT_DEPENDENCY_COMMANDS | 9416 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
4545 | 8600 | # ------------------------------ | 9417 | # ------------------------------ |
4546 | 8601 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | 9418 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
4584 | 8602 | [for mf in $CONFIG_FILES; do | 9419 | [{ |
4585 | 8603 | # Strip MF so we end up with the name of the file. | 9420 | # Autoconf 2.62 quotes --file arguments for eval, but not when files |
4586 | 8604 | mf=`echo "$mf" | sed -e 's/:.*$//'` | 9421 | # are listed without --file. Let's play safe and only enable the eval |
4587 | 8605 | # Check whether this is an Automake generated Makefile or not. | 9422 | # if we detect the quoting. |
4588 | 8606 | # We used to match only the files named `Makefile.in', but | 9423 | case $CONFIG_FILES in |
4589 | 8607 | # some people rename them; so instead we look at the file content. | 9424 | *\'*) eval set x "$CONFIG_FILES" ;; |
4590 | 8608 | # Grep'ing the first line is not enough: some people post-process | 9425 | *) set x $CONFIG_FILES ;; |
4591 | 8609 | # each Makefile.in and add a new line on top of each file to say so. | 9426 | esac |
4592 | 8610 | # Grep'ing the whole file is not good either: AIX grep has a line | 9427 | shift |
4593 | 8611 | # limit of 2048, but all sed's we know have understand at least 4000. | 9428 | for mf |
4594 | 8612 | if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | 9429 | do |
4595 | 8613 | dirpart=`AS_DIRNAME("$mf")` | 9430 | # Strip MF so we end up with the name of the file. |
4596 | 8614 | else | 9431 | mf=`echo "$mf" | sed -e 's/:.*$//'` |
4597 | 8615 | continue | 9432 | # Check whether this is an Automake generated Makefile or not. |
4598 | 8616 | fi | 9433 | # We used to match only the files named `Makefile.in', but |
4599 | 8617 | # Extract the definition of DEPDIR, am__include, and am__quote | 9434 | # some people rename them; so instead we look at the file content. |
4600 | 8618 | # from the Makefile without running `make'. | 9435 | # Grep'ing the first line is not enough: some people post-process |
4601 | 8619 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | 9436 | # each Makefile.in and add a new line on top of each file to say so. |
4602 | 8620 | test -z "$DEPDIR" && continue | 9437 | # Grep'ing the whole file is not good either: AIX grep has a line |
4603 | 8621 | am__include=`sed -n 's/^am__include = //p' < "$mf"` | 9438 | # limit of 2048, but all sed's we know have understand at least 4000. |
4604 | 8622 | test -z "am__include" && continue | 9439 | if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then |
4605 | 8623 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | 9440 | dirpart=`AS_DIRNAME("$mf")` |
4606 | 8624 | # When using ansi2knr, U may be empty or an underscore; expand it | 9441 | else |
4607 | 8625 | U=`sed -n 's/^U = //p' < "$mf"` | 9442 | continue |
4608 | 8626 | # Find all dependency output files, they are included files with | 9443 | fi |
4609 | 8627 | # $(DEPDIR) in their names. We invoke sed twice because it is the | 9444 | # Extract the definition of DEPDIR, am__include, and am__quote |
4610 | 8628 | # simplest approach to changing $(DEPDIR) to its actual value in the | 9445 | # from the Makefile without running `make'. |
4611 | 8629 | # expansion. | 9446 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
4612 | 8630 | for file in `sed -n " | 9447 | test -z "$DEPDIR" && continue |
4613 | 8631 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | 9448 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
4614 | 8632 | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | 9449 | test -z "am__include" && continue |
4615 | 8633 | # Make sure the directory exists. | 9450 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
4616 | 8634 | test -f "$dirpart/$file" && continue | 9451 | # When using ansi2knr, U may be empty or an underscore; expand it |
4617 | 8635 | fdir=`AS_DIRNAME(["$file"])` | 9452 | U=`sed -n 's/^U = //p' < "$mf"` |
4618 | 8636 | AS_MKDIR_P([$dirpart/$fdir]) | 9453 | # Find all dependency output files, they are included files with |
4619 | 8637 | # echo "creating $dirpart/$file" | 9454 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
4620 | 8638 | echo '# dummy' > "$dirpart/$file" | 9455 | # simplest approach to changing $(DEPDIR) to its actual value in the |
4621 | 9456 | # expansion. | ||
4622 | 9457 | for file in `sed -n " | ||
4623 | 9458 | s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ | ||
4624 | 9459 | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | ||
4625 | 9460 | # Make sure the directory exists. | ||
4626 | 9461 | test -f "$dirpart/$file" && continue | ||
4627 | 9462 | fdir=`AS_DIRNAME(["$file"])` | ||
4628 | 9463 | AS_MKDIR_P([$dirpart/$fdir]) | ||
4629 | 9464 | # echo "creating $dirpart/$file" | ||
4630 | 9465 | echo '# dummy' > "$dirpart/$file" | ||
4631 | 9466 | done | ||
4632 | 8639 | done | 9467 | done |
4634 | 8640 | done | 9468 | } |
4635 | 8641 | ])# _AM_OUTPUT_DEPENDENCY_COMMANDS | 9469 | ])# _AM_OUTPUT_DEPENDENCY_COMMANDS |
4636 | 8642 | 9470 | ||
4637 | 8643 | 9471 | ||
4638 | @@ -8669,13 +9497,13 @@ | |||
4639 | 8669 | # Do all the work for Automake. -*- Autoconf -*- | 9497 | # Do all the work for Automake. -*- Autoconf -*- |
4640 | 8670 | 9498 | ||
4641 | 8671 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 9499 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
4643 | 8672 | # 2005, 2006, 2008 Free Software Foundation, Inc. | 9500 | # 2005, 2006, 2008, 2009 Free Software Foundation, Inc. |
4644 | 8673 | # | 9501 | # |
4645 | 8674 | # This file is free software; the Free Software Foundation | 9502 | # This file is free software; the Free Software Foundation |
4646 | 8675 | # gives unlimited permission to copy and/or distribute it, | 9503 | # gives unlimited permission to copy and/or distribute it, |
4647 | 8676 | # with or without modifications, as long as this notice is preserved. | 9504 | # with or without modifications, as long as this notice is preserved. |
4648 | 8677 | 9505 | ||
4650 | 8678 | # serial 13 | 9506 | # serial 16 |
4651 | 8679 | 9507 | ||
4652 | 8680 | # This macro actually does too much. Some checks are only needed if | 9508 | # This macro actually does too much. Some checks are only needed if |
4653 | 8681 | # your package does certain things. But this isn't really a big deal. | 9509 | # your package does certain things. But this isn't really a big deal. |
4654 | @@ -8692,7 +9520,7 @@ | |||
4655 | 8692 | # arguments mandatory, and then we can depend on a new Autoconf | 9520 | # arguments mandatory, and then we can depend on a new Autoconf |
4656 | 8693 | # release and drop the old call support. | 9521 | # release and drop the old call support. |
4657 | 8694 | AC_DEFUN([AM_INIT_AUTOMAKE], | 9522 | AC_DEFUN([AM_INIT_AUTOMAKE], |
4659 | 8695 | [AC_PREREQ([2.60])dnl | 9523 | [AC_PREREQ([2.62])dnl |
4660 | 8696 | dnl Autoconf wants to disallow AM_ names. We explicitly allow | 9524 | dnl Autoconf wants to disallow AM_ names. We explicitly allow |
4661 | 8697 | dnl the ones we care about. | 9525 | dnl the ones we care about. |
4662 | 8698 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl | 9526 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl |
4663 | @@ -8743,8 +9571,8 @@ | |||
4664 | 8743 | AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) | 9571 | AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) |
4665 | 8744 | AM_MISSING_PROG(AUTOHEADER, autoheader) | 9572 | AM_MISSING_PROG(AUTOHEADER, autoheader) |
4666 | 8745 | AM_MISSING_PROG(MAKEINFO, makeinfo) | 9573 | AM_MISSING_PROG(MAKEINFO, makeinfo) |
4669 | 8746 | AM_PROG_INSTALL_SH | 9574 | AC_REQUIRE([AM_PROG_INSTALL_SH])dnl |
4670 | 8747 | AM_PROG_INSTALL_STRIP | 9575 | AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl |
4671 | 8748 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl | 9576 | AC_REQUIRE([AM_PROG_MKDIR_P])dnl |
4672 | 8749 | # We need awk for the "check" target. The system "awk" is bad on | 9577 | # We need awk for the "check" target. The system "awk" is bad on |
4673 | 8750 | # some platforms. | 9578 | # some platforms. |
4674 | @@ -8752,23 +9580,36 @@ | |||
4675 | 8752 | AC_REQUIRE([AC_PROG_MAKE_SET])dnl | 9580 | AC_REQUIRE([AC_PROG_MAKE_SET])dnl |
4676 | 8753 | AC_REQUIRE([AM_SET_LEADING_DOT])dnl | 9581 | AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
4677 | 8754 | _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], | 9582 | _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], |
4680 | 8755 | [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], | 9583 | [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], |
4681 | 8756 | [_AM_PROG_TAR([v7])])]) | 9584 | [_AM_PROG_TAR([v7])])]) |
4682 | 8757 | _AM_IF_OPTION([no-dependencies],, | 9585 | _AM_IF_OPTION([no-dependencies],, |
4683 | 8758 | [AC_PROVIDE_IFELSE([AC_PROG_CC], | 9586 | [AC_PROVIDE_IFELSE([AC_PROG_CC], |
4687 | 8759 | [_AM_DEPENDENCIES(CC)], | 9587 | [_AM_DEPENDENCIES(CC)], |
4688 | 8760 | [define([AC_PROG_CC], | 9588 | [define([AC_PROG_CC], |
4689 | 8761 | defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl | 9589 | defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl |
4690 | 8762 | AC_PROVIDE_IFELSE([AC_PROG_CXX], | 9590 | AC_PROVIDE_IFELSE([AC_PROG_CXX], |
4694 | 8763 | [_AM_DEPENDENCIES(CXX)], | 9591 | [_AM_DEPENDENCIES(CXX)], |
4695 | 8764 | [define([AC_PROG_CXX], | 9592 | [define([AC_PROG_CXX], |
4696 | 8765 | defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl | 9593 | defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl |
4697 | 8766 | AC_PROVIDE_IFELSE([AC_PROG_OBJC], | 9594 | AC_PROVIDE_IFELSE([AC_PROG_OBJC], |
4703 | 8767 | [_AM_DEPENDENCIES(OBJC)], | 9595 | [_AM_DEPENDENCIES(OBJC)], |
4704 | 8768 | [define([AC_PROG_OBJC], | 9596 | [define([AC_PROG_OBJC], |
4705 | 8769 | defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl | 9597 | defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl |
4706 | 8770 | ]) | 9598 | ]) |
4707 | 8771 | ]) | 9599 | _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl |
4708 | 9600 | dnl The `parallel-tests' driver may need to know about EXEEXT, so add the | ||
4709 | 9601 | dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro | ||
4710 | 9602 | dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. | ||
4711 | 9603 | AC_CONFIG_COMMANDS_PRE(dnl | ||
4712 | 9604 | [m4_provide_if([_AM_COMPILER_EXEEXT], | ||
4713 | 9605 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl | ||
4714 | 9606 | ]) | ||
4715 | 9607 | |||
4716 | 9608 | dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not | ||
4717 | 9609 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further | ||
4718 | 9610 | dnl mangled by Autoconf and run in a shell conditional statement. | ||
4719 | 9611 | m4_define([_AC_COMPILER_EXEEXT], | ||
4720 | 9612 | m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) | ||
4721 | 8772 | 9613 | ||
4722 | 8773 | 9614 | ||
4723 | 8774 | # When config.status generates a header, we must update the stamp-h file. | 9615 | # When config.status generates a header, we must update the stamp-h file. |
4724 | @@ -8792,7 +9633,7 @@ | |||
4725 | 8792 | done | 9633 | done |
4726 | 8793 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | 9634 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
4727 | 8794 | 9635 | ||
4729 | 8795 | # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. | 9636 | # Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. |
4730 | 8796 | # | 9637 | # |
4731 | 8797 | # This file is free software; the Free Software Foundation | 9638 | # This file is free software; the Free Software Foundation |
4732 | 8798 | # gives unlimited permission to copy and/or distribute it, | 9639 | # gives unlimited permission to copy and/or distribute it, |
4733 | @@ -8803,7 +9644,14 @@ | |||
4734 | 8803 | # Define $install_sh. | 9644 | # Define $install_sh. |
4735 | 8804 | AC_DEFUN([AM_PROG_INSTALL_SH], | 9645 | AC_DEFUN([AM_PROG_INSTALL_SH], |
4736 | 8805 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | 9646 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
4738 | 8806 | install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} | 9647 | if test x"${install_sh}" != xset; then |
4739 | 9648 | case $am_aux_dir in | ||
4740 | 9649 | *\ * | *\ *) | ||
4741 | 9650 | install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; | ||
4742 | 9651 | *) | ||
4743 | 9652 | install_sh="\${SHELL} $am_aux_dir/install-sh" | ||
4744 | 9653 | esac | ||
4745 | 9654 | fi | ||
4746 | 8807 | AC_SUBST(install_sh)]) | 9655 | AC_SUBST(install_sh)]) |
4747 | 8808 | 9656 | ||
4748 | 8809 | # Copyright (C) 2003, 2005 Free Software Foundation, Inc. | 9657 | # Copyright (C) 2003, 2005 Free Software Foundation, Inc. |
4749 | @@ -8829,13 +9677,13 @@ | |||
4750 | 8829 | 9677 | ||
4751 | 8830 | # Check to see how 'make' treats includes. -*- Autoconf -*- | 9678 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
4752 | 8831 | 9679 | ||
4754 | 8832 | # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. | 9680 | # Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. |
4755 | 8833 | # | 9681 | # |
4756 | 8834 | # This file is free software; the Free Software Foundation | 9682 | # This file is free software; the Free Software Foundation |
4757 | 8835 | # gives unlimited permission to copy and/or distribute it, | 9683 | # gives unlimited permission to copy and/or distribute it, |
4758 | 8836 | # with or without modifications, as long as this notice is preserved. | 9684 | # with or without modifications, as long as this notice is preserved. |
4759 | 8837 | 9685 | ||
4761 | 8838 | # serial 3 | 9686 | # serial 4 |
4762 | 8839 | 9687 | ||
4763 | 8840 | # AM_MAKE_INCLUDE() | 9688 | # AM_MAKE_INCLUDE() |
4764 | 8841 | # ----------------- | 9689 | # ----------------- |
4765 | @@ -8844,7 +9692,7 @@ | |||
4766 | 8844 | [am_make=${MAKE-make} | 9692 | [am_make=${MAKE-make} |
4767 | 8845 | cat > confinc << 'END' | 9693 | cat > confinc << 'END' |
4768 | 8846 | am__doit: | 9694 | am__doit: |
4770 | 8847 | @echo done | 9695 | @echo this is the am__doit target |
4771 | 8848 | .PHONY: am__doit | 9696 | .PHONY: am__doit |
4772 | 8849 | END | 9697 | END |
4773 | 8850 | # If we don't find an include directive, just comment out the code. | 9698 | # If we don't find an include directive, just comment out the code. |
4774 | @@ -8854,24 +9702,24 @@ | |||
4775 | 8854 | _am_result=none | 9702 | _am_result=none |
4776 | 8855 | # First try GNU make style include. | 9703 | # First try GNU make style include. |
4777 | 8856 | echo "include confinc" > confmf | 9704 | echo "include confinc" > confmf |
4788 | 8857 | # We grep out `Entering directory' and `Leaving directory' | 9705 | # Ignore all kinds of additional output from `make'. |
4789 | 8858 | # messages which can occur if `w' ends up in MAKEFLAGS. | 9706 | case `$am_make -s -f confmf 2> /dev/null` in #( |
4790 | 8859 | # In particular we don't look at `^make:' because GNU make might | 9707 | *the\ am__doit\ target*) |
4791 | 8860 | # be invoked under some other name (usually "gmake"), in which | 9708 | am__include=include |
4792 | 8861 | # case it prints its new name instead of `make'. | 9709 | am__quote= |
4793 | 8862 | if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then | 9710 | _am_result=GNU |
4794 | 8863 | am__include=include | 9711 | ;; |
4795 | 8864 | am__quote= | 9712 | esac |
4786 | 8865 | _am_result=GNU | ||
4787 | 8866 | fi | ||
4796 | 8867 | # Now try BSD make style include. | 9713 | # Now try BSD make style include. |
4797 | 8868 | if test "$am__include" = "#"; then | 9714 | if test "$am__include" = "#"; then |
4798 | 8869 | echo '.include "confinc"' > confmf | 9715 | echo '.include "confinc"' > confmf |
4804 | 8870 | if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then | 9716 | case `$am_make -s -f confmf 2> /dev/null` in #( |
4805 | 8871 | am__include=.include | 9717 | *the\ am__doit\ target*) |
4806 | 8872 | am__quote="\"" | 9718 | am__include=.include |
4807 | 8873 | _am_result=BSD | 9719 | am__quote="\"" |
4808 | 8874 | fi | 9720 | _am_result=BSD |
4809 | 9721 | ;; | ||
4810 | 9722 | esac | ||
4811 | 8875 | fi | 9723 | fi |
4812 | 8876 | AC_SUBST([am__include]) | 9724 | AC_SUBST([am__include]) |
4813 | 8877 | AC_SUBST([am__quote]) | 9725 | AC_SUBST([am__quote]) |
4814 | @@ -8881,14 +9729,14 @@ | |||
4815 | 8881 | 9729 | ||
4816 | 8882 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | 9730 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
4817 | 8883 | 9731 | ||
4819 | 8884 | # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 | 9732 | # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 |
4820 | 8885 | # Free Software Foundation, Inc. | 9733 | # Free Software Foundation, Inc. |
4821 | 8886 | # | 9734 | # |
4822 | 8887 | # This file is free software; the Free Software Foundation | 9735 | # This file is free software; the Free Software Foundation |
4823 | 8888 | # gives unlimited permission to copy and/or distribute it, | 9736 | # gives unlimited permission to copy and/or distribute it, |
4824 | 8889 | # with or without modifications, as long as this notice is preserved. | 9737 | # with or without modifications, as long as this notice is preserved. |
4825 | 8890 | 9738 | ||
4827 | 8891 | # serial 5 | 9739 | # serial 6 |
4828 | 8892 | 9740 | ||
4829 | 8893 | # AM_MISSING_PROG(NAME, PROGRAM) | 9741 | # AM_MISSING_PROG(NAME, PROGRAM) |
4830 | 8894 | # ------------------------------ | 9742 | # ------------------------------ |
4831 | @@ -8905,7 +9753,14 @@ | |||
4832 | 8905 | AC_DEFUN([AM_MISSING_HAS_RUN], | 9753 | AC_DEFUN([AM_MISSING_HAS_RUN], |
4833 | 8906 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | 9754 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
4834 | 8907 | AC_REQUIRE_AUX_FILE([missing])dnl | 9755 | AC_REQUIRE_AUX_FILE([missing])dnl |
4836 | 8908 | test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" | 9756 | if test x"${MISSING+set}" != xset; then |
4837 | 9757 | case $am_aux_dir in | ||
4838 | 9758 | *\ * | *\ *) | ||
4839 | 9759 | MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; | ||
4840 | 9760 | *) | ||
4841 | 9761 | MISSING="\${SHELL} $am_aux_dir/missing" ;; | ||
4842 | 9762 | esac | ||
4843 | 9763 | fi | ||
4844 | 8909 | # Use eval to expand $SHELL | 9764 | # Use eval to expand $SHELL |
4845 | 8910 | if eval "$MISSING --run true"; then | 9765 | if eval "$MISSING --run true"; then |
4846 | 8911 | am_missing_run="$MISSING --run " | 9766 | am_missing_run="$MISSING --run " |
4847 | @@ -8943,13 +9798,13 @@ | |||
4848 | 8943 | 9798 | ||
4849 | 8944 | # Helper functions for option handling. -*- Autoconf -*- | 9799 | # Helper functions for option handling. -*- Autoconf -*- |
4850 | 8945 | 9800 | ||
4852 | 8946 | # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. | 9801 | # Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. |
4853 | 8947 | # | 9802 | # |
4854 | 8948 | # This file is free software; the Free Software Foundation | 9803 | # This file is free software; the Free Software Foundation |
4855 | 8949 | # gives unlimited permission to copy and/or distribute it, | 9804 | # gives unlimited permission to copy and/or distribute it, |
4856 | 8950 | # with or without modifications, as long as this notice is preserved. | 9805 | # with or without modifications, as long as this notice is preserved. |
4857 | 8951 | 9806 | ||
4859 | 8952 | # serial 3 | 9807 | # serial 4 |
4860 | 8953 | 9808 | ||
4861 | 8954 | # _AM_MANGLE_OPTION(NAME) | 9809 | # _AM_MANGLE_OPTION(NAME) |
4862 | 8955 | # ----------------------- | 9810 | # ----------------------- |
4863 | @@ -8966,7 +9821,7 @@ | |||
4864 | 8966 | # ---------------------------------- | 9821 | # ---------------------------------- |
4865 | 8967 | # OPTIONS is a space-separated list of Automake options. | 9822 | # OPTIONS is a space-separated list of Automake options. |
4866 | 8968 | AC_DEFUN([_AM_SET_OPTIONS], | 9823 | AC_DEFUN([_AM_SET_OPTIONS], |
4868 | 8969 | [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) | 9824 | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
4869 | 8970 | 9825 | ||
4870 | 8971 | # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) | 9826 | # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) |
4871 | 8972 | # ------------------------------------------- | 9827 | # ------------------------------------------- |
4872 | @@ -8976,14 +9831,14 @@ | |||
4873 | 8976 | 9831 | ||
4874 | 8977 | # Check to make sure that the build environment is sane. -*- Autoconf -*- | 9832 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
4875 | 8978 | 9833 | ||
4877 | 8979 | # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 | 9834 | # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 |
4878 | 8980 | # Free Software Foundation, Inc. | 9835 | # Free Software Foundation, Inc. |
4879 | 8981 | # | 9836 | # |
4880 | 8982 | # This file is free software; the Free Software Foundation | 9837 | # This file is free software; the Free Software Foundation |
4881 | 8983 | # gives unlimited permission to copy and/or distribute it, | 9838 | # gives unlimited permission to copy and/or distribute it, |
4882 | 8984 | # with or without modifications, as long as this notice is preserved. | 9839 | # with or without modifications, as long as this notice is preserved. |
4883 | 8985 | 9840 | ||
4885 | 8986 | # serial 4 | 9841 | # serial 5 |
4886 | 8987 | 9842 | ||
4887 | 8988 | # AM_SANITY_CHECK | 9843 | # AM_SANITY_CHECK |
4888 | 8989 | # --------------- | 9844 | # --------------- |
4889 | @@ -8992,16 +9847,29 @@ | |||
4890 | 8992 | # Just in case | 9847 | # Just in case |
4891 | 8993 | sleep 1 | 9848 | sleep 1 |
4892 | 8994 | echo timestamp > conftest.file | 9849 | echo timestamp > conftest.file |
4893 | 9850 | # Reject unsafe characters in $srcdir or the absolute working directory | ||
4894 | 9851 | # name. Accept space and tab only in the latter. | ||
4895 | 9852 | am_lf=' | ||
4896 | 9853 | ' | ||
4897 | 9854 | case `pwd` in | ||
4898 | 9855 | *[[\\\"\#\$\&\'\`$am_lf]]*) | ||
4899 | 9856 | AC_MSG_ERROR([unsafe absolute working directory name]);; | ||
4900 | 9857 | esac | ||
4901 | 9858 | case $srcdir in | ||
4902 | 9859 | *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) | ||
4903 | 9860 | AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; | ||
4904 | 9861 | esac | ||
4905 | 9862 | |||
4906 | 8995 | # Do `set' in a subshell so we don't clobber the current shell's | 9863 | # Do `set' in a subshell so we don't clobber the current shell's |
4907 | 8996 | # arguments. Must try -L first in case configure is actually a | 9864 | # arguments. Must try -L first in case configure is actually a |
4908 | 8997 | # symlink; some systems play weird games with the mod time of symlinks | 9865 | # symlink; some systems play weird games with the mod time of symlinks |
4909 | 8998 | # (eg FreeBSD returns the mod time of the symlink's containing | 9866 | # (eg FreeBSD returns the mod time of the symlink's containing |
4910 | 8999 | # directory). | 9867 | # directory). |
4911 | 9000 | if ( | 9868 | if ( |
4913 | 9001 | set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` | 9869 | set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` |
4914 | 9002 | if test "$[*]" = "X"; then | 9870 | if test "$[*]" = "X"; then |
4915 | 9003 | # -L didn't work. | 9871 | # -L didn't work. |
4917 | 9004 | set X `ls -t $srcdir/configure conftest.file` | 9872 | set X `ls -t "$srcdir/configure" conftest.file` |
4918 | 9005 | fi | 9873 | fi |
4919 | 9006 | rm -f conftest.file | 9874 | rm -f conftest.file |
4920 | 9007 | if test "$[*]" != "X $srcdir/configure conftest.file" \ | 9875 | if test "$[*]" != "X $srcdir/configure conftest.file" \ |
4921 | @@ -9026,6 +9894,33 @@ | |||
4922 | 9026 | fi | 9894 | fi |
4923 | 9027 | AC_MSG_RESULT(yes)]) | 9895 | AC_MSG_RESULT(yes)]) |
4924 | 9028 | 9896 | ||
4925 | 9897 | # Copyright (C) 2009 Free Software Foundation, Inc. | ||
4926 | 9898 | # | ||
4927 | 9899 | # This file is free software; the Free Software Foundation | ||
4928 | 9900 | # gives unlimited permission to copy and/or distribute it, | ||
4929 | 9901 | # with or without modifications, as long as this notice is preserved. | ||
4930 | 9902 | |||
4931 | 9903 | # serial 1 | ||
4932 | 9904 | |||
4933 | 9905 | # AM_SILENT_RULES([DEFAULT]) | ||
4934 | 9906 | # -------------------------- | ||
4935 | 9907 | # Enable less verbose build rules; with the default set to DEFAULT | ||
4936 | 9908 | # (`yes' being less verbose, `no' or empty being verbose). | ||
4937 | 9909 | AC_DEFUN([AM_SILENT_RULES], | ||
4938 | 9910 | [AC_ARG_ENABLE([silent-rules], | ||
4939 | 9911 | [ --enable-silent-rules less verbose build output (undo: `make V=1') | ||
4940 | 9912 | --disable-silent-rules verbose build output (undo: `make V=0')]) | ||
4941 | 9913 | case $enable_silent_rules in | ||
4942 | 9914 | yes) AM_DEFAULT_VERBOSITY=0;; | ||
4943 | 9915 | no) AM_DEFAULT_VERBOSITY=1;; | ||
4944 | 9916 | *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; | ||
4945 | 9917 | esac | ||
4946 | 9918 | AC_SUBST([AM_DEFAULT_VERBOSITY])dnl | ||
4947 | 9919 | AM_BACKSLASH='\' | ||
4948 | 9920 | AC_SUBST([AM_BACKSLASH])dnl | ||
4949 | 9921 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl | ||
4950 | 9922 | ]) | ||
4951 | 9923 | |||
4952 | 9029 | # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. | 9924 | # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
4953 | 9030 | # | 9925 | # |
4954 | 9031 | # This file is free software; the Free Software Foundation | 9926 | # This file is free software; the Free Software Foundation |
4955 | @@ -9054,18 +9949,25 @@ | |||
4956 | 9054 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | 9949 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
4957 | 9055 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) | 9950 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
4958 | 9056 | 9951 | ||
4960 | 9057 | # Copyright (C) 2006 Free Software Foundation, Inc. | 9952 | # Copyright (C) 2006, 2008 Free Software Foundation, Inc. |
4961 | 9058 | # | 9953 | # |
4962 | 9059 | # This file is free software; the Free Software Foundation | 9954 | # This file is free software; the Free Software Foundation |
4963 | 9060 | # gives unlimited permission to copy and/or distribute it, | 9955 | # gives unlimited permission to copy and/or distribute it, |
4964 | 9061 | # with or without modifications, as long as this notice is preserved. | 9956 | # with or without modifications, as long as this notice is preserved. |
4965 | 9062 | 9957 | ||
4966 | 9958 | # serial 2 | ||
4967 | 9959 | |||
4968 | 9063 | # _AM_SUBST_NOTMAKE(VARIABLE) | 9960 | # _AM_SUBST_NOTMAKE(VARIABLE) |
4969 | 9064 | # --------------------------- | 9961 | # --------------------------- |
4970 | 9065 | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. | 9962 | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
4971 | 9066 | # This macro is traced by Automake. | 9963 | # This macro is traced by Automake. |
4972 | 9067 | AC_DEFUN([_AM_SUBST_NOTMAKE]) | 9964 | AC_DEFUN([_AM_SUBST_NOTMAKE]) |
4973 | 9068 | 9965 | ||
4974 | 9966 | # AM_SUBST_NOTMAKE(VARIABLE) | ||
4975 | 9967 | # --------------------------- | ||
4976 | 9968 | # Public sister of _AM_SUBST_NOTMAKE. | ||
4977 | 9969 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) | ||
4978 | 9970 | |||
4979 | 9069 | # Check how to create a tarball. -*- Autoconf -*- | 9971 | # Check how to create a tarball. -*- Autoconf -*- |
4980 | 9070 | 9972 | ||
4981 | 9071 | # Copyright (C) 2004, 2005 Free Software Foundation, Inc. | 9973 | # Copyright (C) 2004, 2005 Free Software Foundation, Inc. |
4982 | 9072 | 9974 | ||
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 | 11 | autoconf || exit; | 11 | autoconf || exit; |
4988 | 12 | automake || exit; | 12 | automake || exit; |
4989 | 13 | 13 | ||
4990 | 14 | intltoolize --copy --force --automake || exit; | ||
4991 | 15 | |||
4992 | 14 | echo; | 16 | echo; |
4993 | 15 | echo "Done." | 17 | echo "Done." |
4994 | 16 | 18 | ||
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 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
5000 | 5 | # Free Software Foundation, Inc. | 5 | # Free Software Foundation, Inc. |
The diff has been truncated for viewing.
approved in bug 845552, please upload