Merge lp:~jamesodhunt/ubuntu/precise/upstart/1.4 into lp:ubuntu/precise/upstart
- Precise (12.04)
- 1.4
- Merge into precise
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 1348 | ||||||||
Proposed branch: | lp:~jamesodhunt/ubuntu/precise/upstart/1.4 | ||||||||
Merge into: | lp:ubuntu/precise/upstart | ||||||||
Diff against target: |
28731 lines (+13104/-4330) 61 files modified
ChangeLog (+224/-0) Makefile.am (+1/-1) Makefile.in (+4/-2) NEWS (+13/-1) aclocal.m4 (+2/-2) conf/Makefile.in (+3/-1) config.guess (+120/-105) config.sub (+101/-55) configure (+1878/-1044) configure.ac (+1/-1) contrib/Makefile.in (+3/-1) contrib/vim/syntax/upstart.vim (+16/-5) dbus/Makefile.in (+3/-1) debian/changelog (+20/-0) debian/manpages/upstart-events.7 (+9/-2) debian/upstart.dirs (+1/-0) debian/upstart.logrotate (+7/-0) doc/Makefile.in (+3/-1) extra/Makefile.in (+3/-1) extra/man/upstart-udev-bridge.8 (+37/-1) extra/upstart-udev-bridge.c (+142/-29) init/Makefile.am (+26/-11) init/Makefile.in (+79/-32) init/errors.h (+4/-0) init/job.c (+2/-0) init/job.h (+4/-1) init/job_class.c (+37/-46) init/job_class.h (+72/-5) init/job_process.c (+393/-22) init/job_process.h (+37/-3) init/log.c (+506/-0) init/log.h (+72/-0) init/main.c (+133/-10) init/man/init.5 (+170/-15) init/man/init.8 (+25/-0) init/parse_job.c (+88/-8) init/paths.h (+23/-0) init/session.c (+26/-0) init/system.c (+2/-0) init/tests/test_conf.c (+7/-5) init/tests/test_event.c (+25/-0) init/tests/test_job.c (+3/-0) init/tests/test_job_class.c (+56/-1) init/tests/test_job_process.c (+2675/-28) init/tests/test_log.c (+1119/-0) init/tests/test_parse_job.c (+266/-0) ltmain.sh (+2619/-1390) m4/libtool.m4 (+1256/-782) m4/ltoptions.m4 (+7/-6) m4/ltversion.m4 (+6/-6) m4/lt~obsolete.m4 (+9/-3) m4/pkg.m4 (+8/-6) po/POTFILES.in (+3/-0) po/en@boldquot.po (+253/-119) po/en@quot.po (+253/-119) po/upstart.pot (+243/-111) scripts/Makefile.am (+0/-25) scripts/Makefile.in (+3/-1) scripts/init-checkconf.sh (+0/-248) scripts/man/init-checkconf.8 (+0/-73) util/Makefile.in (+3/-1) |
||||||||
To merge this branch: | bzr merge lp:~jamesodhunt/ubuntu/precise/upstart/1.4 | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson | Approve | ||
Review via email: mp+85826@code.launchpad.net |
Commit message
Description of the change
- Update to Upstart 1.4 which introduces system job logging to /var/log/upstart/. Includes logrotate script.
This release also includes the fix for bug 829980.
- upstart-events(7) man page fixes: bug 889047, bug 904175.
Notes:
- code merged into lp:ubuntu/upstart using 'bzr merge-upstream' so includes tags for '1.4' and 'upstart-1.4'
which should (?) resolve the long outstanding broken importer issue:
http://
- Original code for Upstart 1.4 is here: http://
- Tested on precise in physical + virtual environments.
Colin Watson (cjwatson) wrote : | # |
Colin Watson (cjwatson) wrote : | # |
+ /* Save old handler as grantpt disallows child handler
+ * to be in effect
+ */
+ if (sigaction (SIGCHLD, NULL, &act) < 0) {
+ close (pty_master);
+ job_process_
+ }
You can probably make this code (and similar following) easier to read by dropping the explicit close; after all, you're about to exit via job_process_
This code only queries the current setting of the SIGCHLD handler, but doesn't actually uninstall the handler; judging from your comment and the documentation of grantpt(3), this isn't what you meant. The reason for the restriction on grantpt is that it forks a helper process and waits for it. I think, therefore, that you should call 'sigaction (SIGCHLD, SIG_IGN, &act)'.
+ errno = 0;
+ struct passwd *pwd = getpwnam (class->setuid);
I think it's standard in Upstart to have declarations at the top of a block (although it's true that C99 allows this). So local style would probably be:
struct passwd *pwd;
errno = 0;
pwd = getpwnam (class->setuid);
... and likewise for the group name.
The log file writing code looks like it has the right kind of structure, although I must admit I haven't sat down to exhaustively verify it. As a minor point, I did notice that you aren't consistently casting wlen to (size_t) when passing it to nih_io_
+/**
+ * NihOption setter function to handle selection of default console
+ * type.
+ *
+ * Returns 1 on success, -1 on invalid console type.
+ **/
+static int
+console_
Aren't NihOptionSetter functions supposed to return 0 on success rather than 1? nih_option_handle and nih_option_
.SH SYNOPSIS
+.TP
.B /etc/init/
-
+Default location of system job configuration files.
+.\"
+.TP
.B $HOME/.init/
+Default location of user job configuration files.
+.RE
.\"
.SH DESCRIPTION
I feel a bit uncomfortable at seeing .RE without a preceding .RS. I'd just omit that macro; the following .SH should restore the left margin for you.
+If this stanza is unspecified, the job will run as root in the case of
+system jobs, and as the user in the case of User Jobs.
+
+Note that System jobs using the setuid stanza are still system jobs,
+and can not be controlled by an unprivileged user, even if the setuid
+stanza specifies that user.
This description and the description of setgid both seem to have Random capitalisation Syndrome. :-)
Colin Watson (cjwatson) wrote : | # |
TESTING.sessions doesn't seem to be in the upstream tarball, so it shows up in the packaging diff. For the next upstream release, I would suggest adding it to EXTRA_DIST in Makefile.am.
init/tests/
Finally, a thought on log rotation: there appears to be nothing in place for logrotate to tell the init daemon that it's rotated a given log file. I appreciate that it may be tricky to set this up. Would it be worth at least using the delaycompress directive, which is documented as being useful in this kind of situation?
In general, this looks very good, thank you. Most of my comments are nits which you can address at your leisure, although it would be good to make sure they get cleaned up. The only ones that I think need to be either fixed or explained before upload are:
* uninstall SIGCHLD properly before grantpt
* console_type_setter return value
* possibly the memory leak in upstart-udev-bridge
Colin Watson (cjwatson) wrote : | # |
Incidentally, I should confess that I didn't review the test code very closely, as I hit branch fatigue somewhat before that. From the sheer volume I'm happy to trust that you've been unit-testing diligently! :-)
James Hunt (jamesodhunt) wrote : | # |
Hi Colin,
Thanks for the ace review! I've made all the changes upstream and am about to re-push lp:~jamesodhunt/ubuntu/precise/upstart/1.4.
*HOWEVER*: Can I ask that you hold off re-reviewing/
Thanks very much. Cheers,
James.
- 1346. By James Hunt
-
* debian/changelog: reformat
- 1347. By James Hunt
-
releasing version 1.4-0ubuntu1
- 1348. By James Hunt
-
Merge of upstream fix for running tests in environment not
supporting full POSIX SIGCHLD semantics.
Colin Watson (cjwatson) : | # |
Preview Diff
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2011-07-26 01:09:47 +0000 |
3 | +++ ChangeLog 2011-12-22 16:57:26 +0000 |
4 | @@ -1,3 +1,227 @@ |
5 | +2011-12-22 James Hunt <james.hunt@ubuntu.com> |
6 | + |
7 | + * init/job_process.c: job_process_spawn(): |
8 | + - Set child handler to default rather than explicit ignore |
9 | + to avoid test failures in environments that disallow |
10 | + ignoring SIGCHLD. |
11 | + * init/tests/test_job_process.c: test_run(): |
12 | + - Changed timeout for test feature "ensure that no log |
13 | + file written for CONSOLE_NONE". |
14 | + |
15 | +2011-12-15 James Hunt <james.hunt@ubuntu.com> |
16 | + |
17 | + * Makefile.am: Add missing TESTING.sessions to distribution. |
18 | + * contrib/vim/syntax/upstart.vim: Meta-data update and addition |
19 | + of more standard (Ubuntu Upstart) events. |
20 | + * extra/man/upstart-udev-bridge.8: Ensure literal dashes used |
21 | + for all command-line options. |
22 | + * extra/upstart-udev-bridge.c: |
23 | + - udev_monitor_watcher(): Fix leak when obtaining udev value. |
24 | + - make_safe_string(): Don't realloc since overhead too high |
25 | + considering size of strings. |
26 | + * init/job_class.c: Typo. |
27 | + * init/job_process.c: job_process_spawn(): |
28 | + - Correct ignoring of SIGCHLD prior to grantpt(3) call. |
29 | + - Removed redundant close(2) calls. |
30 | + - Move declarations to top of block for |
31 | + getpwnam(3)/getgrnam(3). |
32 | + * init/log.c: |
33 | + - log_file_open(): Comments. |
34 | + - log_file_write(): Added missing cast on |
35 | + nih_io_buffer_shrink() call. |
36 | + * init/main.c: console_type_setter(): NihOptionSetter's should |
37 | + return 0 on success. |
38 | + * init/man/init.5: lower-case all references to system jobs |
39 | + and user jobs. |
40 | + * init/tests/test_job_process.c: Add missing include for |
41 | + fnmatch.h. |
42 | + |
43 | +2011-12-15 James Hunt <james.hunt@ubuntu.com> |
44 | + |
45 | + * init/tests/test_job_process.c: test_run(): |
46 | + - Ensure process group killed for multi-process shell scripts. |
47 | + - Change 'command-not-found' tests to use regex matching rather |
48 | + than literal to allow for minor differences in /bin/sh variants |
49 | + error output. |
50 | + |
51 | +2011-12-13 James Hunt <james.hunt@ubuntu.com> |
52 | + |
53 | + * NEWS: Release 1.4 |
54 | + * configure.ac (NIH_COPYRIGHT): Update |
55 | + |
56 | +2011-12-12 James Hunt <james.hunt@ubuntu.com> |
57 | + |
58 | + Simplify logfile name encoding. |
59 | + |
60 | + * init/job_process.c: job_process_log_path(): Ditch D-Bus job name |
61 | + encoding in path names for saner approach that simply remaps slash |
62 | + characters (minimal surprises for users). |
63 | + * init/job_process.h: Addition of macros: |
64 | + - JOB_PROCESS_LOG_FILE_EXT |
65 | + - JOB_PROCESS_LOG_REMAP_FROM_CHAR |
66 | + - JOB_PROCESS_LOG_REMAP_TO_CHAR |
67 | + * init/man/init.5: Update console section for simplified log filename |
68 | + encoding approach. |
69 | + * init/test_job_process.c: test_log_path(): Updates for simplified |
70 | + logfile name encoding. |
71 | + * util/tests/test_user_sessions.sh: Updates for simplified |
72 | + logfile name encoding: removed dbus_encode() and replaced with |
73 | + upstart_encode(). |
74 | + |
75 | +2011-12-12 James Hunt <james.hunt@ubuntu.com> |
76 | + |
77 | + * extra/man/upstart-udev-bridge.8: |
78 | + - Added new '--no-strip' option. |
79 | + - Added missing '--daemon', '--debug' and '--help' options. |
80 | + * extra/upstart-udev-bridge.c: |
81 | + XXX: Behavioural change: non-printable bytes are now removed |
82 | + by default from all udev message data to handle buggy |
83 | + hardware devices which expose this data to userland (the |
84 | + kernel simply passes it through verbatim). To revert to old |
85 | + behaviour (where no udev message data is modified), specify |
86 | + the new '--no-strip' option (LP: #829980). |
87 | + - make_safe_string(): New function to cleanse udev data. |
88 | + - udev_monitor_watcher(): |
89 | + - Cleanse udev data unless '--no-strip' specified. |
90 | + - Fixed possible crash should 'action' not be set. |
91 | + - Fixed possible crash should 'devname' not be set |
92 | + and '--debug' specified. |
93 | + |
94 | +2011-12-09 James Hunt <james.hunt@ubuntu.com> |
95 | + |
96 | + * Merge of 'setuid' + 'setgid' stanzas from |
97 | + Evan Broder (lp:~broder/upstart/drop-privileges). |
98 | + |
99 | +2011-12-09 James Hunt <james.hunt@ubuntu.com> |
100 | + |
101 | + Introduction of 'log' argument to 'console' stanza allowing |
102 | + system job output only to be captured. |
103 | + |
104 | + * contrib/vim/syntax/upstart.vim: Added 'log' and missing |
105 | + 'none'. |
106 | + * init/Makefile.am: Update for log.c, log.h and test_log.c. |
107 | + * init/job.c: job_new(): Initialize log. |
108 | + * init/job.h: Add Log pointer to Job. |
109 | + * init/job_class.c: |
110 | + - XXX: behaviour change: Default for 'console' |
111 | + is now CONSOLE_LOG rather than CONSOLE_NONE. |
112 | + Rationale is that if a job does produce output, you want to see |
113 | + it since the chances are it will contain useful error details. |
114 | + - Added default_console variable. |
115 | + - job_class_console_type(): New function to parse console type |
116 | + string. |
117 | + * init/job_class.h: |
118 | + - Added CONSOLE_LOG to ConsoleType and updated documentation |
119 | + for ConsoleType. |
120 | + - Added prototype for job_class_console_type(). |
121 | + * init/job_process.c: |
122 | + - New log_dir and disable_job_logging variables. |
123 | + - job_process_run(): Updated to reflect new parameter for |
124 | + job_process_spawn(). |
125 | + - job_process_spawn(): Now accepts a Job rather than a |
126 | + JobClass to allow job->log and class->console to be handled |
127 | + appropriately. Now creates pty master and slave fds for |
128 | + console logging. Simplified code for file descriptor |
129 | + switching by using new job_process_remap_fd(). |
130 | + - job_process_error_read(): Added entries for: |
131 | + - JOB_PROCESS_ERROR_OPENPT_MASTER |
132 | + - JOB_PROCESS_ERROR_OPENPT_UNLOCKPT |
133 | + - JOB_PROCESS_ERROR_PTSNAME |
134 | + - JOB_PROCESS_ERROR_OPENPT_SLAVE |
135 | + - job_process_log_path(): New function that returns full path to log |
136 | + file for specified Job. |
137 | + - job_process_remap_fd(): New function to ensure file |
138 | + descriptors do not collide. |
139 | + * init/job_process.h: |
140 | + - Updated JobProcessErrorType with new entries: |
141 | + - JOB_PROCESS_ERROR_OPENPT_MASTER |
142 | + - JOB_PROCESS_ERROR_OPENPT_UNLOCKPT |
143 | + - JOB_PROCESS_ERROR_PTSNAME |
144 | + - JOB_PROCESS_ERROR_OPENPT_SLAVE |
145 | + - job_process_spawn(): Updated prototype. |
146 | + - job_process_log_path(): Added prototype. |
147 | + * init/main.c: |
148 | + - handle_logdir(): New function for overriding log directory. |
149 | + - console_type_setter(): New Function to handle selection of |
150 | + default console value. |
151 | + - Added following command-line options: |
152 | + - '--default-console' |
153 | + - '--logdir' |
154 | + - '--no-log' |
155 | + * init/man/init.5: |
156 | + - Update and restructure of section on 'console' stanza. |
157 | + - Added a FILES section. |
158 | + * init/man/init.8: Updated with details of new options: |
159 | + - '--default-console' |
160 | + - '--logdir' |
161 | + - '--no-log' |
162 | + * init/parse_job.c: stanza_console(): Updated for "log". |
163 | + * init/paths.h: Added defines for JOB_LOGDIR and LOGDIR_ENV. |
164 | + * init/session.c: |
165 | + - Added missing function headers. |
166 | + * init/system.c: system_setup_console(): Update for CONSOLE_LOG. |
167 | + * init/test_conf.c: |
168 | + - TEST_FORCE_WATCH_UPDATE(): Removed debug. |
169 | + - test_override(): Removed erroneous comment. |
170 | + - test_select_job(): Added variable attributes to keep gcc 4.6 happy. |
171 | + * init/test_event.c: Explicitly set console type to CONSOLE_NONE to |
172 | + retain behaviour of existing tests. |
173 | + * init/test_job.c: |
174 | + - test_job_new(): Ensure log object not created on Job instantiation. |
175 | + - test_change_state(): Explicitly set console type to CONSOLE_NONE to |
176 | + retain behaviour of existing tests. |
177 | + * init/test_job_class.c: |
178 | + - test_new(): Ensure console type now defaults to CONSOLE_LOG. |
179 | + - Explicitly set console type to CONSOLE_NONE to retain behaviour of |
180 | + existing tests. |
181 | + * init/test_job_process.c: |
182 | + - Added various new macros to simplify test code. |
183 | + - child(): New child_tests added for TEST_OUTPUT and TEST_SIGNALS. |
184 | + - get_available_pty_count(): New function. |
185 | + - Explicitly set console type to CONSOLE_NONE to retain behaviour of |
186 | + existing tests. |
187 | + - test_run(): Added new tests for CONSOLE_LOG. |
188 | + - test_spawn(): Added new tests for CONSOLE_LOG. |
189 | + - test_log_path(): New function. |
190 | + - test_handler(): Added UPSTART_LOGDIR support to |
191 | + - main(): |
192 | + - Update to allow number of forks to be specified when run as a child |
193 | + process. |
194 | + - Added call to test_log_path(). |
195 | + - initialize various subsystems since before, functions run from |
196 | + main() had to be run in the order specified and exactly as listed |
197 | + (certain tests relied on previous tests initializing a subsystem |
198 | + which gives unexpected results and thus confusing behaviour |
199 | + if the order of tests is changed). |
200 | + * init/test_parse_job.c: Added new test to test_stanza_console() for |
201 | + "console log". |
202 | + * util/tests/test_user_sessions.sh: Added tests for job logging |
203 | + to ensure no unexpected output recorded for user jobs. |
204 | + |
205 | +2011-08-11 Scott James Remnant <keybuk@google.com> |
206 | + |
207 | + * init/job_process.c (job_process_spawn): Can't return on |
208 | + dup2() error, we're in the child. Return an error back to |
209 | + the child properly. |
210 | + |
211 | + * init/job_process.c (job_process_spawn), init/main.c: error |
212 | + should be ENOENT |
213 | + |
214 | + * init/job_class.c, init/job_class.h: Move constants into the |
215 | + header file so they can be found from other source files. |
216 | + * init/job_process.c (job_process_spawn): Only adjust the OOM |
217 | + score if it isn't the default |
218 | + * init/main.c: Apply the default OOM score to the init process |
219 | + itself. |
220 | + |
221 | + * init/main.c: Deal with failure to setup the system console by |
222 | + falling back to /dev/null, so we don't end up without default fds |
223 | + and castrate the process. |
224 | + |
225 | +2011-08-10 Scott James Remnant <keybuk@google.com> |
226 | + |
227 | + * init/job_class.c (job_class_new): nit, use #defines for the default |
228 | + nice level and oom score adjustment. |
229 | 2011-07-25 James Hunt <james.hunt@ubuntu.com> |
230 | |
231 | * init/job_process.c: job_process_spawn(): |
232 | |
233 | === modified file 'Makefile.am' |
234 | --- Makefile.am 2011-06-16 14:39:55 +0000 |
235 | +++ Makefile.am 2011-12-22 16:57:26 +0000 |
236 | @@ -2,6 +2,6 @@ |
237 | |
238 | SUBDIRS = intl dbus init util extra conf doc contrib po scripts |
239 | |
240 | -EXTRA_DIST = HACKING |
241 | +EXTRA_DIST = HACKING TESTING.sessions |
242 | |
243 | ACLOCAL_AMFLAGS = --install -I m4 |
244 | |
245 | === modified file 'Makefile.in' |
246 | --- Makefile.in 2011-05-25 19:25:11 +0000 |
247 | +++ Makefile.in 2011-12-22 16:57:26 +0000 |
248 | @@ -150,6 +150,7 @@ |
249 | DBUS_LIBS = @DBUS_LIBS@ |
250 | DEFS = @DEFS@ |
251 | DEPDIR = @DEPDIR@ |
252 | +DLLTOOL = @DLLTOOL@ |
253 | DSYMUTIL = @DSYMUTIL@ |
254 | DUMPBIN = @DUMPBIN@ |
255 | ECHO_C = @ECHO_C@ |
256 | @@ -203,6 +204,7 @@ |
257 | LTLIBTHREAD = @LTLIBTHREAD@ |
258 | MAINT = @MAINT@ |
259 | MAKEINFO = @MAKEINFO@ |
260 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
261 | MKDIR_P = @MKDIR_P@ |
262 | MSGFMT = @MSGFMT@ |
263 | MSGFMT_015 = @MSGFMT_015@ |
264 | @@ -252,6 +254,7 @@ |
265 | abs_srcdir = @abs_srcdir@ |
266 | abs_top_builddir = @abs_top_builddir@ |
267 | abs_top_srcdir = @abs_top_srcdir@ |
268 | +ac_ct_AR = @ac_ct_AR@ |
269 | ac_ct_CC = @ac_ct_CC@ |
270 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
271 | am__include = @am__include@ |
272 | @@ -284,7 +287,6 @@ |
273 | libexecdir = @libexecdir@ |
274 | localedir = @localedir@ |
275 | localstatedir = @localstatedir@ |
276 | -lt_ECHO = @lt_ECHO@ |
277 | mandir = @mandir@ |
278 | mkdir_p = @mkdir_p@ |
279 | oldincludedir = @oldincludedir@ |
280 | @@ -301,7 +303,7 @@ |
281 | top_builddir = @top_builddir@ |
282 | top_srcdir = @top_srcdir@ |
283 | SUBDIRS = intl dbus init util extra conf doc contrib po scripts |
284 | -EXTRA_DIST = HACKING |
285 | +EXTRA_DIST = HACKING TESTING.sessions |
286 | ACLOCAL_AMFLAGS = --install -I m4 |
287 | all: config.h |
288 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
289 | |
290 | === modified file 'NEWS' |
291 | --- NEWS 2011-08-10 21:47:03 +0000 |
292 | +++ NEWS 2011-12-22 16:57:26 +0000 |
293 | @@ -1,4 +1,16 @@ |
294 | -1.4 xxxx-xx-xx |
295 | +1.4 2011-12-13 "Let them speak" |
296 | + |
297 | + * Improved console setting. |
298 | + * New "log" argument to console stanza allowing a system jobs |
299 | + stdout/stderr to be captured to a file. New options added to |
300 | + support this feature: '--default-console', '--logdir', |
301 | + '--no-log'. This feature only currently applies to system jobs: |
302 | + user jobs which specify "console log" will be treated as if they |
303 | + had specified "console none". |
304 | + * New "setuid" and "setgid" stanzas to allow system jobs to be run |
305 | + under the specified uid/gid corresponding to the given name/group. |
306 | + * Improvements to upstart-udev-bridge to handle problematic hardware |
307 | + (such as some batteries) which pass non-printable bytes to userspace. |
308 | |
309 | 1.3 2011-06-14 "Concordia" |
310 | |
311 | |
312 | === modified file 'aclocal.m4' |
313 | --- aclocal.m4 2010-12-14 17:15:57 +0000 |
314 | +++ aclocal.m4 2011-12-22 16:57:26 +0000 |
315 | @@ -13,8 +13,8 @@ |
316 | |
317 | m4_ifndef([AC_AUTOCONF_VERSION], |
318 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
319 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, |
320 | -[m4_warning([this file was generated for autoconf 2.67. |
321 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, |
322 | +[m4_warning([this file was generated for autoconf 2.68. |
323 | You have another version of autoconf. It may work, but is not guaranteed to. |
324 | If you have problems, you may need to regenerate the build system entirely. |
325 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
326 | |
327 | === modified file 'conf/Makefile.in' |
328 | --- conf/Makefile.in 2011-05-25 19:25:11 +0000 |
329 | +++ conf/Makefile.in 2011-12-22 16:57:26 +0000 |
330 | @@ -118,6 +118,7 @@ |
331 | DBUS_LIBS = @DBUS_LIBS@ |
332 | DEFS = @DEFS@ |
333 | DEPDIR = @DEPDIR@ |
334 | +DLLTOOL = @DLLTOOL@ |
335 | DSYMUTIL = @DSYMUTIL@ |
336 | DUMPBIN = @DUMPBIN@ |
337 | ECHO_C = @ECHO_C@ |
338 | @@ -171,6 +172,7 @@ |
339 | LTLIBTHREAD = @LTLIBTHREAD@ |
340 | MAINT = @MAINT@ |
341 | MAKEINFO = @MAKEINFO@ |
342 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
343 | MKDIR_P = @MKDIR_P@ |
344 | MSGFMT = @MSGFMT@ |
345 | MSGFMT_015 = @MSGFMT_015@ |
346 | @@ -220,6 +222,7 @@ |
347 | abs_srcdir = @abs_srcdir@ |
348 | abs_top_builddir = @abs_top_builddir@ |
349 | abs_top_srcdir = @abs_top_srcdir@ |
350 | +ac_ct_AR = @ac_ct_AR@ |
351 | ac_ct_CC = @ac_ct_CC@ |
352 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
353 | am__include = @am__include@ |
354 | @@ -252,7 +255,6 @@ |
355 | libexecdir = @libexecdir@ |
356 | localedir = @localedir@ |
357 | localstatedir = @localstatedir@ |
358 | -lt_ECHO = @lt_ECHO@ |
359 | mandir = @mandir@ |
360 | mkdir_p = @mkdir_p@ |
361 | oldincludedir = @oldincludedir@ |
362 | |
363 | === modified file 'config.guess' |
364 | --- config.guess 2010-12-14 17:02:22 +0000 |
365 | +++ config.guess 2011-12-22 16:57:26 +0000 |
366 | @@ -1,10 +1,10 @@ |
367 | #! /bin/sh |
368 | # Attempt to guess a canonical system name. |
369 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
370 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
371 | -# Free Software Foundation, Inc. |
372 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
373 | +# 2011 Free Software Foundation, Inc. |
374 | |
375 | -timestamp='2009-12-30' |
376 | +timestamp='2011-05-11' |
377 | |
378 | # This file is free software; you can redistribute it and/or modify it |
379 | # under the terms of the GNU General Public License as published by |
380 | @@ -57,7 +57,7 @@ |
381 | |
382 | Originally written by Per Bothner. |
383 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
384 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free |
385 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free |
386 | Software Foundation, Inc. |
387 | |
388 | This is free software; see the source for copying conditions. There is NO |
389 | @@ -181,7 +181,7 @@ |
390 | fi |
391 | ;; |
392 | *) |
393 | - os=netbsd |
394 | + os=netbsd |
395 | ;; |
396 | esac |
397 | # The OS release |
398 | @@ -224,7 +224,7 @@ |
399 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
400 | ;; |
401 | *5.*) |
402 | - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
403 | + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
404 | ;; |
405 | esac |
406 | # According to Compaq, /usr/sbin/psrinfo has been available on |
407 | @@ -270,7 +270,10 @@ |
408 | # A Xn.n version is an unreleased experimental baselevel. |
409 | # 1.2 uses "1.2" for uname -r. |
410 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
411 | - exit ;; |
412 | + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
413 | + exitcode=$? |
414 | + trap '' 0 |
415 | + exit $exitcode ;; |
416 | Alpha\ *:Windows_NT*:*) |
417 | # How do we know it's Interix rather than the generic POSIX subsystem? |
418 | # Should we change UNAME_MACHINE based on the output of uname instead |
419 | @@ -296,7 +299,7 @@ |
420 | echo s390-ibm-zvmoe |
421 | exit ;; |
422 | *:OS400:*:*) |
423 | - echo powerpc-ibm-os400 |
424 | + echo powerpc-ibm-os400 |
425 | exit ;; |
426 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
427 | echo arm-acorn-riscix${UNAME_RELEASE} |
428 | @@ -395,23 +398,23 @@ |
429 | # MiNT. But MiNT is downward compatible to TOS, so this should |
430 | # be no problem. |
431 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
432 | - echo m68k-atari-mint${UNAME_RELEASE} |
433 | + echo m68k-atari-mint${UNAME_RELEASE} |
434 | exit ;; |
435 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
436 | echo m68k-atari-mint${UNAME_RELEASE} |
437 | - exit ;; |
438 | + exit ;; |
439 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
440 | - echo m68k-atari-mint${UNAME_RELEASE} |
441 | + echo m68k-atari-mint${UNAME_RELEASE} |
442 | exit ;; |
443 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
444 | - echo m68k-milan-mint${UNAME_RELEASE} |
445 | - exit ;; |
446 | + echo m68k-milan-mint${UNAME_RELEASE} |
447 | + exit ;; |
448 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
449 | - echo m68k-hades-mint${UNAME_RELEASE} |
450 | - exit ;; |
451 | + echo m68k-hades-mint${UNAME_RELEASE} |
452 | + exit ;; |
453 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
454 | - echo m68k-unknown-mint${UNAME_RELEASE} |
455 | - exit ;; |
456 | + echo m68k-unknown-mint${UNAME_RELEASE} |
457 | + exit ;; |
458 | m68k:machten:*:*) |
459 | echo m68k-apple-machten${UNAME_RELEASE} |
460 | exit ;; |
461 | @@ -481,8 +484,8 @@ |
462 | echo m88k-motorola-sysv3 |
463 | exit ;; |
464 | AViiON:dgux:*:*) |
465 | - # DG/UX returns AViiON for all architectures |
466 | - UNAME_PROCESSOR=`/usr/bin/uname -p` |
467 | + # DG/UX returns AViiON for all architectures |
468 | + UNAME_PROCESSOR=`/usr/bin/uname -p` |
469 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
470 | then |
471 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
472 | @@ -495,7 +498,7 @@ |
473 | else |
474 | echo i586-dg-dgux${UNAME_RELEASE} |
475 | fi |
476 | - exit ;; |
477 | + exit ;; |
478 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
479 | echo m88k-dolphin-sysv3 |
480 | exit ;; |
481 | @@ -552,7 +555,7 @@ |
482 | echo rs6000-ibm-aix3.2 |
483 | fi |
484 | exit ;; |
485 | - *:AIX:*:[456]) |
486 | + *:AIX:*:[4567]) |
487 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
488 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
489 | IBM_ARCH=rs6000 |
490 | @@ -595,52 +598,52 @@ |
491 | 9000/[678][0-9][0-9]) |
492 | if [ -x /usr/bin/getconf ]; then |
493 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
494 | - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
495 | - case "${sc_cpu_version}" in |
496 | - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
497 | - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
498 | - 532) # CPU_PA_RISC2_0 |
499 | - case "${sc_kernel_bits}" in |
500 | - 32) HP_ARCH="hppa2.0n" ;; |
501 | - 64) HP_ARCH="hppa2.0w" ;; |
502 | + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
503 | + case "${sc_cpu_version}" in |
504 | + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
505 | + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
506 | + 532) # CPU_PA_RISC2_0 |
507 | + case "${sc_kernel_bits}" in |
508 | + 32) HP_ARCH="hppa2.0n" ;; |
509 | + 64) HP_ARCH="hppa2.0w" ;; |
510 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
511 | - esac ;; |
512 | - esac |
513 | + esac ;; |
514 | + esac |
515 | fi |
516 | if [ "${HP_ARCH}" = "" ]; then |
517 | eval $set_cc_for_build |
518 | - sed 's/^ //' << EOF >$dummy.c |
519 | - |
520 | - #define _HPUX_SOURCE |
521 | - #include <stdlib.h> |
522 | - #include <unistd.h> |
523 | - |
524 | - int main () |
525 | - { |
526 | - #if defined(_SC_KERNEL_BITS) |
527 | - long bits = sysconf(_SC_KERNEL_BITS); |
528 | - #endif |
529 | - long cpu = sysconf (_SC_CPU_VERSION); |
530 | - |
531 | - switch (cpu) |
532 | - { |
533 | - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
534 | - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
535 | - case CPU_PA_RISC2_0: |
536 | - #if defined(_SC_KERNEL_BITS) |
537 | - switch (bits) |
538 | - { |
539 | - case 64: puts ("hppa2.0w"); break; |
540 | - case 32: puts ("hppa2.0n"); break; |
541 | - default: puts ("hppa2.0"); break; |
542 | - } break; |
543 | - #else /* !defined(_SC_KERNEL_BITS) */ |
544 | - puts ("hppa2.0"); break; |
545 | - #endif |
546 | - default: puts ("hppa1.0"); break; |
547 | - } |
548 | - exit (0); |
549 | - } |
550 | + sed 's/^ //' << EOF >$dummy.c |
551 | + |
552 | + #define _HPUX_SOURCE |
553 | + #include <stdlib.h> |
554 | + #include <unistd.h> |
555 | + |
556 | + int main () |
557 | + { |
558 | + #if defined(_SC_KERNEL_BITS) |
559 | + long bits = sysconf(_SC_KERNEL_BITS); |
560 | + #endif |
561 | + long cpu = sysconf (_SC_CPU_VERSION); |
562 | + |
563 | + switch (cpu) |
564 | + { |
565 | + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
566 | + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
567 | + case CPU_PA_RISC2_0: |
568 | + #if defined(_SC_KERNEL_BITS) |
569 | + switch (bits) |
570 | + { |
571 | + case 64: puts ("hppa2.0w"); break; |
572 | + case 32: puts ("hppa2.0n"); break; |
573 | + default: puts ("hppa2.0"); break; |
574 | + } break; |
575 | + #else /* !defined(_SC_KERNEL_BITS) */ |
576 | + puts ("hppa2.0"); break; |
577 | + #endif |
578 | + default: puts ("hppa1.0"); break; |
579 | + } |
580 | + exit (0); |
581 | + } |
582 | EOF |
583 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
584 | test -z "$HP_ARCH" && HP_ARCH=hppa |
585 | @@ -731,22 +734,22 @@ |
586 | exit ;; |
587 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
588 | echo c1-convex-bsd |
589 | - exit ;; |
590 | + exit ;; |
591 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
592 | if getsysinfo -f scalar_acc |
593 | then echo c32-convex-bsd |
594 | else echo c2-convex-bsd |
595 | fi |
596 | - exit ;; |
597 | + exit ;; |
598 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
599 | echo c34-convex-bsd |
600 | - exit ;; |
601 | + exit ;; |
602 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
603 | echo c38-convex-bsd |
604 | - exit ;; |
605 | + exit ;; |
606 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
607 | echo c4-convex-bsd |
608 | - exit ;; |
609 | + exit ;; |
610 | CRAY*Y-MP:*:*:*) |
611 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
612 | exit ;; |
613 | @@ -770,14 +773,14 @@ |
614 | exit ;; |
615 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
616 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
617 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
618 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
619 | - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
620 | - exit ;; |
621 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
622 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
623 | + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
624 | + exit ;; |
625 | 5000:UNIX_System_V:4.*:*) |
626 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
627 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
628 | - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
629 | + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
630 | + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
631 | + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
632 | exit ;; |
633 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
634 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
635 | @@ -805,14 +808,14 @@ |
636 | echo ${UNAME_MACHINE}-pc-mingw32 |
637 | exit ;; |
638 | i*:windows32*:*) |
639 | - # uname -m includes "-pc" on this system. |
640 | - echo ${UNAME_MACHINE}-mingw32 |
641 | + # uname -m includes "-pc" on this system. |
642 | + echo ${UNAME_MACHINE}-mingw32 |
643 | exit ;; |
644 | i*:PW*:*) |
645 | echo ${UNAME_MACHINE}-pc-pw32 |
646 | exit ;; |
647 | *:Interix*:*) |
648 | - case ${UNAME_MACHINE} in |
649 | + case ${UNAME_MACHINE} in |
650 | x86) |
651 | echo i586-pc-interix${UNAME_RELEASE} |
652 | exit ;; |
653 | @@ -867,7 +870,7 @@ |
654 | EV6) UNAME_MACHINE=alphaev6 ;; |
655 | EV67) UNAME_MACHINE=alphaev67 ;; |
656 | EV68*) UNAME_MACHINE=alphaev68 ;; |
657 | - esac |
658 | + esac |
659 | objdump --private-headers /bin/sh | grep -q ld.so.1 |
660 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
661 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
662 | @@ -879,7 +882,13 @@ |
663 | then |
664 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
665 | else |
666 | - echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
667 | + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
668 | + | grep -q __ARM_PCS_VFP |
669 | + then |
670 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
671 | + else |
672 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf |
673 | + fi |
674 | fi |
675 | exit ;; |
676 | avr32*:Linux:*:*) |
677 | @@ -892,7 +901,7 @@ |
678 | echo crisv32-axis-linux-gnu |
679 | exit ;; |
680 | frv:Linux:*:*) |
681 | - echo frv-unknown-linux-gnu |
682 | + echo frv-unknown-linux-gnu |
683 | exit ;; |
684 | i*86:Linux:*:*) |
685 | LIBC=gnu |
686 | @@ -960,7 +969,7 @@ |
687 | echo ${UNAME_MACHINE}-ibm-linux |
688 | exit ;; |
689 | sh64*:Linux:*:*) |
690 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
691 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
692 | exit ;; |
693 | sh*:Linux:*:*) |
694 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
695 | @@ -968,6 +977,9 @@ |
696 | sparc:Linux:*:* | sparc64:Linux:*:*) |
697 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
698 | exit ;; |
699 | + tile*:Linux:*:*) |
700 | + echo ${UNAME_MACHINE}-tilera-linux-gnu |
701 | + exit ;; |
702 | vax:Linux:*:*) |
703 | echo ${UNAME_MACHINE}-dec-linux-gnu |
704 | exit ;; |
705 | @@ -975,7 +987,7 @@ |
706 | echo x86_64-unknown-linux-gnu |
707 | exit ;; |
708 | xtensa*:Linux:*:*) |
709 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
710 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
711 | exit ;; |
712 | i*86:DYNIX/ptx:4*:*) |
713 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
714 | @@ -984,11 +996,11 @@ |
715 | echo i386-sequent-sysv4 |
716 | exit ;; |
717 | i*86:UNIX_SV:4.2MP:2.*) |
718 | - # Unixware is an offshoot of SVR4, but it has its own version |
719 | - # number series starting with 2... |
720 | - # I am not positive that other SVR4 systems won't match this, |
721 | + # Unixware is an offshoot of SVR4, but it has its own version |
722 | + # number series starting with 2... |
723 | + # I am not positive that other SVR4 systems won't match this, |
724 | # I just have to hope. -- rms. |
725 | - # Use sysv4.2uw... so that sysv4* matches it. |
726 | + # Use sysv4.2uw... so that sysv4* matches it. |
727 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
728 | exit ;; |
729 | i*86:OS/2:*:*) |
730 | @@ -1020,7 +1032,7 @@ |
731 | fi |
732 | exit ;; |
733 | i*86:*:5:[678]*) |
734 | - # UnixWare 7.x, OpenUNIX and OpenServer 6. |
735 | + # UnixWare 7.x, OpenUNIX and OpenServer 6. |
736 | case `/bin/uname -X | grep "^Machine"` in |
737 | *486*) UNAME_MACHINE=i486 ;; |
738 | *Pentium) UNAME_MACHINE=i586 ;; |
739 | @@ -1048,13 +1060,13 @@ |
740 | exit ;; |
741 | pc:*:*:*) |
742 | # Left here for compatibility: |
743 | - # uname -m prints for DJGPP always 'pc', but it prints nothing about |
744 | - # the processor, so we play safe by assuming i586. |
745 | + # uname -m prints for DJGPP always 'pc', but it prints nothing about |
746 | + # the processor, so we play safe by assuming i586. |
747 | # Note: whatever this is, it MUST be the same as what config.sub |
748 | # prints for the "djgpp" host, or else GDB configury will decide that |
749 | # this is a cross-build. |
750 | echo i586-pc-msdosdjgpp |
751 | - exit ;; |
752 | + exit ;; |
753 | Intel:Mach:3*:*) |
754 | echo i386-pc-mach3 |
755 | exit ;; |
756 | @@ -1089,8 +1101,8 @@ |
757 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
758 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
759 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
760 | - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
761 | - && { echo i486-ncr-sysv4; exit; } ;; |
762 | + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
763 | + && { echo i486-ncr-sysv4; exit; } ;; |
764 | NCR*:*:4.2:* | MPRAS*:*:4.2:*) |
765 | OS_REL='.3' |
766 | test -r /etc/.relid \ |
767 | @@ -1133,10 +1145,10 @@ |
768 | echo ns32k-sni-sysv |
769 | fi |
770 | exit ;; |
771 | - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
772 | - # says <Richard.M.Bartel@ccMail.Census.GOV> |
773 | - echo i586-unisys-sysv4 |
774 | - exit ;; |
775 | + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
776 | + # says <Richard.M.Bartel@ccMail.Census.GOV> |
777 | + echo i586-unisys-sysv4 |
778 | + exit ;; |
779 | *:UNIX_System_V:4*:FTX*) |
780 | # From Gerald Hewes <hewes@openmarket.com>. |
781 | # How about differentiating between stratus architectures? -djm |
782 | @@ -1162,11 +1174,11 @@ |
783 | exit ;; |
784 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
785 | if [ -d /usr/nec ]; then |
786 | - echo mips-nec-sysv${UNAME_RELEASE} |
787 | + echo mips-nec-sysv${UNAME_RELEASE} |
788 | else |
789 | - echo mips-unknown-sysv${UNAME_RELEASE} |
790 | + echo mips-unknown-sysv${UNAME_RELEASE} |
791 | fi |
792 | - exit ;; |
793 | + exit ;; |
794 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
795 | echo powerpc-be-beos |
796 | exit ;; |
797 | @@ -1231,6 +1243,9 @@ |
798 | *:QNX:*:4*) |
799 | echo i386-pc-qnx |
800 | exit ;; |
801 | + NEO-?:NONSTOP_KERNEL:*:*) |
802 | + echo neo-tandem-nsk${UNAME_RELEASE} |
803 | + exit ;; |
804 | NSE-?:NONSTOP_KERNEL:*:*) |
805 | echo nse-tandem-nsk${UNAME_RELEASE} |
806 | exit ;; |
807 | @@ -1276,13 +1291,13 @@ |
808 | echo pdp10-unknown-its |
809 | exit ;; |
810 | SEI:*:*:SEIUX) |
811 | - echo mips-sei-seiux${UNAME_RELEASE} |
812 | + echo mips-sei-seiux${UNAME_RELEASE} |
813 | exit ;; |
814 | *:DragonFly:*:*) |
815 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
816 | exit ;; |
817 | *:*VMS:*:*) |
818 | - UNAME_MACHINE=`(uname -p) 2>/dev/null` |
819 | + UNAME_MACHINE=`(uname -p) 2>/dev/null` |
820 | case "${UNAME_MACHINE}" in |
821 | A*) echo alpha-dec-vms ; exit ;; |
822 | I*) echo ia64-dec-vms ; exit ;; |
823 | @@ -1322,11 +1337,11 @@ |
824 | #include <sys/param.h> |
825 | printf ("m68k-sony-newsos%s\n", |
826 | #ifdef NEWSOS4 |
827 | - "4" |
828 | + "4" |
829 | #else |
830 | - "" |
831 | + "" |
832 | #endif |
833 | - ); exit (0); |
834 | + ); exit (0); |
835 | #endif |
836 | #endif |
837 | |
838 | |
839 | === modified file 'config.sub' |
840 | --- config.sub 2010-12-14 17:02:22 +0000 |
841 | +++ config.sub 2011-12-22 16:57:26 +0000 |
842 | @@ -1,10 +1,10 @@ |
843 | #! /bin/sh |
844 | # Configuration validation subroutine script. |
845 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
846 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
847 | -# Free Software Foundation, Inc. |
848 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
849 | +# 2011 Free Software Foundation, Inc. |
850 | |
851 | -timestamp='2010-01-22' |
852 | +timestamp='2011-03-23' |
853 | |
854 | # This file is (in principle) common to ALL GNU software. |
855 | # The presence of a machine in this file suggests that SOME GNU software |
856 | @@ -76,7 +76,7 @@ |
857 | GNU config.sub ($timestamp) |
858 | |
859 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
860 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free |
861 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free |
862 | Software Foundation, Inc. |
863 | |
864 | This is free software; see the source for copying conditions. There is NO |
865 | @@ -124,8 +124,9 @@ |
866 | # Here we must recognize all the valid KERNEL-OS combinations. |
867 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
868 | case $maybe_os in |
869 | - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ |
870 | - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ |
871 | + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
872 | + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
873 | + knetbsd*-gnu* | netbsd*-gnu* | \ |
874 | kopensolaris*-gnu* | \ |
875 | storm-chaos* | os2-emx* | rtmk-nova*) |
876 | os=-$maybe_os |
877 | @@ -157,8 +158,8 @@ |
878 | os= |
879 | basic_machine=$1 |
880 | ;; |
881 | - -bluegene*) |
882 | - os=-cnk |
883 | + -bluegene*) |
884 | + os=-cnk |
885 | ;; |
886 | -sim | -cisco | -oki | -wec | -winbond) |
887 | os= |
888 | @@ -174,10 +175,10 @@ |
889 | os=-chorusos |
890 | basic_machine=$1 |
891 | ;; |
892 | - -chorusrdb) |
893 | - os=-chorusrdb |
894 | + -chorusrdb) |
895 | + os=-chorusrdb |
896 | basic_machine=$1 |
897 | - ;; |
898 | + ;; |
899 | -hiux*) |
900 | os=-hiuxwe2 |
901 | ;; |
902 | @@ -282,11 +283,13 @@ |
903 | | moxie \ |
904 | | mt \ |
905 | | msp430 \ |
906 | + | nds32 | nds32le | nds32be \ |
907 | | nios | nios2 \ |
908 | | ns16k | ns32k \ |
909 | + | open8 \ |
910 | | or32 \ |
911 | | pdp10 | pdp11 | pj | pjl \ |
912 | - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
913 | + | powerpc | powerpc64 | powerpc64le | powerpcle \ |
914 | | pyramid \ |
915 | | rx \ |
916 | | score \ |
917 | @@ -294,15 +297,24 @@ |
918 | | sh64 | sh64le \ |
919 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
920 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
921 | - | spu | strongarm \ |
922 | - | tahoe | thumb | tic4x | tic80 | tron \ |
923 | + | spu \ |
924 | + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
925 | | ubicom32 \ |
926 | | v850 | v850e \ |
927 | | we32k \ |
928 | - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
929 | + | x86 | xc16x | xstormy16 | xtensa \ |
930 | | z8k | z80) |
931 | basic_machine=$basic_machine-unknown |
932 | ;; |
933 | + c54x) |
934 | + basic_machine=tic54x-unknown |
935 | + ;; |
936 | + c55x) |
937 | + basic_machine=tic55x-unknown |
938 | + ;; |
939 | + c6x) |
940 | + basic_machine=tic6x-unknown |
941 | + ;; |
942 | m6811 | m68hc11 | m6812 | m68hc12 | picochip) |
943 | # Motorola 68HC11/12. |
944 | basic_machine=$basic_machine-unknown |
945 | @@ -314,6 +326,18 @@ |
946 | basic_machine=mt-unknown |
947 | ;; |
948 | |
949 | + strongarm | thumb | xscale) |
950 | + basic_machine=arm-unknown |
951 | + ;; |
952 | + |
953 | + xscaleeb) |
954 | + basic_machine=armeb-unknown |
955 | + ;; |
956 | + |
957 | + xscaleel) |
958 | + basic_machine=armel-unknown |
959 | + ;; |
960 | + |
961 | # We use `pc' rather than `unknown' |
962 | # because (1) that's what they normally are, and |
963 | # (2) the word "unknown" tends to confuse beginning users. |
964 | @@ -334,7 +358,7 @@ |
965 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
966 | | avr-* | avr32-* \ |
967 | | bfin-* | bs2000-* \ |
968 | - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ |
969 | + | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
970 | | clipper-* | craynv-* | cydra-* \ |
971 | | d10v-* | d30v-* | dlx-* \ |
972 | | elxsi-* \ |
973 | @@ -368,26 +392,28 @@ |
974 | | mmix-* \ |
975 | | mt-* \ |
976 | | msp430-* \ |
977 | + | nds32-* | nds32le-* | nds32be-* \ |
978 | | nios-* | nios2-* \ |
979 | | none-* | np1-* | ns16k-* | ns32k-* \ |
980 | + | open8-* \ |
981 | | orion-* \ |
982 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
983 | - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
984 | + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
985 | | pyramid-* \ |
986 | | romp-* | rs6000-* | rx-* \ |
987 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
988 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
989 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
990 | | sparclite-* \ |
991 | - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ |
992 | - | tahoe-* | thumb-* \ |
993 | + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
994 | + | tahoe-* \ |
995 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
996 | | tile-* | tilegx-* \ |
997 | | tron-* \ |
998 | | ubicom32-* \ |
999 | | v850-* | v850e-* | vax-* \ |
1000 | | we32k-* \ |
1001 | - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
1002 | + | x86-* | x86_64-* | xc16x-* | xps100-* \ |
1003 | | xstormy16-* | xtensa*-* \ |
1004 | | ymp-* \ |
1005 | | z8k-* | z80-*) |
1006 | @@ -412,7 +438,7 @@ |
1007 | basic_machine=a29k-amd |
1008 | os=-udi |
1009 | ;; |
1010 | - abacus) |
1011 | + abacus) |
1012 | basic_machine=abacus-unknown |
1013 | ;; |
1014 | adobe68k) |
1015 | @@ -482,11 +508,20 @@ |
1016 | basic_machine=powerpc-ibm |
1017 | os=-cnk |
1018 | ;; |
1019 | + c54x-*) |
1020 | + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` |
1021 | + ;; |
1022 | + c55x-*) |
1023 | + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` |
1024 | + ;; |
1025 | + c6x-*) |
1026 | + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` |
1027 | + ;; |
1028 | c90) |
1029 | basic_machine=c90-cray |
1030 | os=-unicos |
1031 | ;; |
1032 | - cegcc) |
1033 | + cegcc) |
1034 | basic_machine=arm-unknown |
1035 | os=-cegcc |
1036 | ;; |
1037 | @@ -518,7 +553,7 @@ |
1038 | basic_machine=craynv-cray |
1039 | os=-unicosmp |
1040 | ;; |
1041 | - cr16) |
1042 | + cr16 | cr16-*) |
1043 | basic_machine=cr16-unknown |
1044 | os=-elf |
1045 | ;; |
1046 | @@ -734,7 +769,7 @@ |
1047 | basic_machine=ns32k-utek |
1048 | os=-sysv |
1049 | ;; |
1050 | - microblaze) |
1051 | + microblaze) |
1052 | basic_machine=microblaze-xilinx |
1053 | ;; |
1054 | mingw32) |
1055 | @@ -841,6 +876,12 @@ |
1056 | np1) |
1057 | basic_machine=np1-gould |
1058 | ;; |
1059 | + neo-tandem) |
1060 | + basic_machine=neo-tandem |
1061 | + ;; |
1062 | + nse-tandem) |
1063 | + basic_machine=nse-tandem |
1064 | + ;; |
1065 | nsr-tandem) |
1066 | basic_machine=nsr-tandem |
1067 | ;; |
1068 | @@ -923,9 +964,10 @@ |
1069 | ;; |
1070 | power) basic_machine=power-ibm |
1071 | ;; |
1072 | - ppc) basic_machine=powerpc-unknown |
1073 | + ppc | ppcbe) basic_machine=powerpc-unknown |
1074 | ;; |
1075 | - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
1076 | + ppc-* | ppcbe-*) |
1077 | + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
1078 | ;; |
1079 | ppcle | powerpclittle | ppc-le | powerpc-little) |
1080 | basic_machine=powerpcle-unknown |
1081 | @@ -1019,6 +1061,9 @@ |
1082 | basic_machine=i860-stratus |
1083 | os=-sysv4 |
1084 | ;; |
1085 | + strongarm-* | thumb-*) |
1086 | + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` |
1087 | + ;; |
1088 | sun2) |
1089 | basic_machine=m68000-sun |
1090 | ;; |
1091 | @@ -1075,20 +1120,8 @@ |
1092 | basic_machine=t90-cray |
1093 | os=-unicos |
1094 | ;; |
1095 | - tic54x | c54x*) |
1096 | - basic_machine=tic54x-unknown |
1097 | - os=-coff |
1098 | - ;; |
1099 | - tic55x | c55x*) |
1100 | - basic_machine=tic55x-unknown |
1101 | - os=-coff |
1102 | - ;; |
1103 | - tic6x | c6x*) |
1104 | - basic_machine=tic6x-unknown |
1105 | - os=-coff |
1106 | - ;; |
1107 | - # This must be matched before tile*. |
1108 | - tilegx*) |
1109 | + # This must be matched before tile*. |
1110 | + tilegx*) |
1111 | basic_machine=tilegx-unknown |
1112 | os=-linux-gnu |
1113 | ;; |
1114 | @@ -1163,6 +1196,9 @@ |
1115 | xps | xps100) |
1116 | basic_machine=xps100-honeywell |
1117 | ;; |
1118 | + xscale-* | xscalee[bl]-*) |
1119 | + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` |
1120 | + ;; |
1121 | ymp) |
1122 | basic_machine=ymp-cray |
1123 | os=-unicos |
1124 | @@ -1260,11 +1296,11 @@ |
1125 | if [ x"$os" != x"" ] |
1126 | then |
1127 | case $os in |
1128 | - # First match some system type aliases |
1129 | - # that might get confused with valid system types. |
1130 | + # First match some system type aliases |
1131 | + # that might get confused with valid system types. |
1132 | # -solaris* is a basic system type, with this one exception. |
1133 | - -auroraux) |
1134 | - os=-auroraux |
1135 | + -auroraux) |
1136 | + os=-auroraux |
1137 | ;; |
1138 | -solaris1 | -solaris1.*) |
1139 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
1140 | @@ -1301,7 +1337,8 @@ |
1141 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
1142 | | -chorusos* | -chorusrdb* | -cegcc* \ |
1143 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
1144 | - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ |
1145 | + | -mingw32* | -linux-gnu* | -linux-android* \ |
1146 | + | -linux-newlib* | -linux-uclibc* \ |
1147 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
1148 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
1149 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
1150 | @@ -1348,7 +1385,7 @@ |
1151 | -opened*) |
1152 | os=-openedition |
1153 | ;; |
1154 | - -os400*) |
1155 | + -os400*) |
1156 | os=-os400 |
1157 | ;; |
1158 | -wince*) |
1159 | @@ -1397,7 +1434,7 @@ |
1160 | -sinix*) |
1161 | os=-sysv4 |
1162 | ;; |
1163 | - -tpf*) |
1164 | + -tpf*) |
1165 | os=-tpf |
1166 | ;; |
1167 | -triton*) |
1168 | @@ -1442,8 +1479,8 @@ |
1169 | -dicos*) |
1170 | os=-dicos |
1171 | ;; |
1172 | - -nacl*) |
1173 | - ;; |
1174 | + -nacl*) |
1175 | + ;; |
1176 | -none) |
1177 | ;; |
1178 | *) |
1179 | @@ -1466,10 +1503,10 @@ |
1180 | # system, and we'll never get to this point. |
1181 | |
1182 | case $basic_machine in |
1183 | - score-*) |
1184 | + score-*) |
1185 | os=-elf |
1186 | ;; |
1187 | - spu-*) |
1188 | + spu-*) |
1189 | os=-elf |
1190 | ;; |
1191 | *-acorn) |
1192 | @@ -1481,8 +1518,17 @@ |
1193 | arm*-semi) |
1194 | os=-aout |
1195 | ;; |
1196 | - c4x-* | tic4x-*) |
1197 | - os=-coff |
1198 | + c4x-* | tic4x-*) |
1199 | + os=-coff |
1200 | + ;; |
1201 | + tic54x-*) |
1202 | + os=-coff |
1203 | + ;; |
1204 | + tic55x-*) |
1205 | + os=-coff |
1206 | + ;; |
1207 | + tic6x-*) |
1208 | + os=-coff |
1209 | ;; |
1210 | # This must come before the *-dec entry. |
1211 | pdp10-*) |
1212 | @@ -1509,7 +1555,7 @@ |
1213 | m68*-cisco) |
1214 | os=-aout |
1215 | ;; |
1216 | - mep-*) |
1217 | + mep-*) |
1218 | os=-elf |
1219 | ;; |
1220 | mips*-cisco) |
1221 | @@ -1536,7 +1582,7 @@ |
1222 | *-ibm) |
1223 | os=-aix |
1224 | ;; |
1225 | - *-knuth) |
1226 | + *-knuth) |
1227 | os=-mmixware |
1228 | ;; |
1229 | *-wec) |
1230 | |
1231 | === modified file 'configure' |
1232 | --- configure 2011-08-10 21:47:03 +0000 |
1233 | +++ configure 2011-12-22 16:57:26 +0000 |
1234 | @@ -1,6 +1,6 @@ |
1235 | #! /bin/sh |
1236 | # Guess values for system-dependent variables and create Makefiles. |
1237 | -# Generated by GNU Autoconf 2.67 for upstart 1.3. |
1238 | +# Generated by GNU Autoconf 2.68 for upstart 1.4. |
1239 | # |
1240 | # Report bugs to <upstart-devel@lists.ubuntu.com>. |
1241 | # |
1242 | @@ -93,6 +93,7 @@ |
1243 | IFS=" "" $as_nl" |
1244 | |
1245 | # Find who we are. Look in the path if we contain no directory separator. |
1246 | +as_myself= |
1247 | case $0 in #(( |
1248 | *[\\/]* ) as_myself=$0 ;; |
1249 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1250 | @@ -175,7 +176,15 @@ |
1251 | as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
1252 | eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
1253 | test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 |
1254 | -test \$(( 1 + 1 )) = 2 || exit 1" |
1255 | +test \$(( 1 + 1 )) = 2 || exit 1 |
1256 | + |
1257 | + test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( |
1258 | + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
1259 | + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO |
1260 | + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO |
1261 | + PATH=/empty FPATH=/empty; export PATH FPATH |
1262 | + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ |
1263 | + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" |
1264 | if (eval "$as_required") 2>/dev/null; then : |
1265 | as_have_required=yes |
1266 | else |
1267 | @@ -218,11 +227,18 @@ |
1268 | # We cannot yet assume a decent shell, so we have to provide a |
1269 | # neutralization value for shells without unset; and this also |
1270 | # works around shells that cannot unset nonexistent variables. |
1271 | + # Preserve -v and -x to the replacement shell. |
1272 | BASH_ENV=/dev/null |
1273 | ENV=/dev/null |
1274 | (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
1275 | export CONFIG_SHELL |
1276 | - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} |
1277 | + case $- in # (((( |
1278 | + *v*x* | *x*v* ) as_opts=-vx ;; |
1279 | + *v* ) as_opts=-v ;; |
1280 | + *x* ) as_opts=-x ;; |
1281 | + * ) as_opts= ;; |
1282 | + esac |
1283 | + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} |
1284 | fi |
1285 | |
1286 | if test x$as_have_required = xno; then : |
1287 | @@ -530,155 +546,8 @@ |
1288 | # Sed expression to map a string onto a valid variable name. |
1289 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" |
1290 | |
1291 | - |
1292 | - |
1293 | -# Check that we are running under the correct shell. |
1294 | SHELL=${CONFIG_SHELL-/bin/sh} |
1295 | |
1296 | -case X$lt_ECHO in |
1297 | -X*--fallback-echo) |
1298 | - # Remove one level of quotation (which was required for Make). |
1299 | - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` |
1300 | - ;; |
1301 | -esac |
1302 | - |
1303 | -ECHO=${lt_ECHO-echo} |
1304 | -if test "X$1" = X--no-reexec; then |
1305 | - # Discard the --no-reexec flag, and continue. |
1306 | - shift |
1307 | -elif test "X$1" = X--fallback-echo; then |
1308 | - # Avoid inline document here, it may be left over |
1309 | - : |
1310 | -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then |
1311 | - # Yippee, $ECHO works! |
1312 | - : |
1313 | -else |
1314 | - # Restart under the correct shell. |
1315 | - exec $SHELL "$0" --no-reexec ${1+"$@"} |
1316 | -fi |
1317 | - |
1318 | -if test "X$1" = X--fallback-echo; then |
1319 | - # used as fallback echo |
1320 | - shift |
1321 | - cat <<_LT_EOF |
1322 | -$* |
1323 | -_LT_EOF |
1324 | - exit 0 |
1325 | -fi |
1326 | - |
1327 | -# The HP-UX ksh and POSIX shell print the target directory to stdout |
1328 | -# if CDPATH is set. |
1329 | -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
1330 | - |
1331 | -if test -z "$lt_ECHO"; then |
1332 | - if test "X${echo_test_string+set}" != Xset; then |
1333 | - # find a string as large as possible, as long as the shell can cope with it |
1334 | - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do |
1335 | - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... |
1336 | - if { echo_test_string=`eval $cmd`; } 2>/dev/null && |
1337 | - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null |
1338 | - then |
1339 | - break |
1340 | - fi |
1341 | - done |
1342 | - fi |
1343 | - |
1344 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
1345 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
1346 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1347 | - : |
1348 | - else |
1349 | - # The Solaris, AIX, and Digital Unix default echo programs unquote |
1350 | - # backslashes. This makes it impossible to quote backslashes using |
1351 | - # echo "$something" | sed 's/\\/\\\\/g' |
1352 | - # |
1353 | - # So, first we look for a working echo in the user's PATH. |
1354 | - |
1355 | - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
1356 | - for dir in $PATH /usr/ucb; do |
1357 | - IFS="$lt_save_ifs" |
1358 | - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && |
1359 | - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && |
1360 | - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && |
1361 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1362 | - ECHO="$dir/echo" |
1363 | - break |
1364 | - fi |
1365 | - done |
1366 | - IFS="$lt_save_ifs" |
1367 | - |
1368 | - if test "X$ECHO" = Xecho; then |
1369 | - # We didn't find a better echo, so look for alternatives. |
1370 | - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && |
1371 | - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && |
1372 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1373 | - # This shell has a builtin print -r that does the trick. |
1374 | - ECHO='print -r' |
1375 | - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && |
1376 | - test "X$CONFIG_SHELL" != X/bin/ksh; then |
1377 | - # If we have ksh, try running configure again with it. |
1378 | - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
1379 | - export ORIGINAL_CONFIG_SHELL |
1380 | - CONFIG_SHELL=/bin/ksh |
1381 | - export CONFIG_SHELL |
1382 | - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} |
1383 | - else |
1384 | - # Try using printf. |
1385 | - ECHO='printf %s\n' |
1386 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
1387 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
1388 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1389 | - # Cool, printf works |
1390 | - : |
1391 | - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && |
1392 | - test "X$echo_testing_string" = 'X\t' && |
1393 | - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
1394 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1395 | - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL |
1396 | - export CONFIG_SHELL |
1397 | - SHELL="$CONFIG_SHELL" |
1398 | - export SHELL |
1399 | - ECHO="$CONFIG_SHELL $0 --fallback-echo" |
1400 | - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && |
1401 | - test "X$echo_testing_string" = 'X\t' && |
1402 | - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
1403 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1404 | - ECHO="$CONFIG_SHELL $0 --fallback-echo" |
1405 | - else |
1406 | - # maybe with a smaller string... |
1407 | - prev=: |
1408 | - |
1409 | - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do |
1410 | - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null |
1411 | - then |
1412 | - break |
1413 | - fi |
1414 | - prev="$cmd" |
1415 | - done |
1416 | - |
1417 | - if test "$prev" != 'sed 50q "$0"'; then |
1418 | - echo_test_string=`eval $prev` |
1419 | - export echo_test_string |
1420 | - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} |
1421 | - else |
1422 | - # Oops. We lost completely, so just stick with echo. |
1423 | - ECHO=echo |
1424 | - fi |
1425 | - fi |
1426 | - fi |
1427 | - fi |
1428 | - fi |
1429 | -fi |
1430 | - |
1431 | -# Copy echo and quote the copy suitably for passing to libtool from |
1432 | -# the Makefile, instead of quoting the original, which is used later. |
1433 | -lt_ECHO=$ECHO |
1434 | -if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then |
1435 | - lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" |
1436 | -fi |
1437 | - |
1438 | - |
1439 | - |
1440 | |
1441 | test -n "$DJDIR" || exec 7<&0 </dev/null |
1442 | exec 6>&1 |
1443 | @@ -703,8 +572,8 @@ |
1444 | # Identity of this package. |
1445 | PACKAGE_NAME='upstart' |
1446 | PACKAGE_TARNAME='upstart' |
1447 | -PACKAGE_VERSION='1.3' |
1448 | -PACKAGE_STRING='upstart 1.3' |
1449 | +PACKAGE_VERSION='1.4' |
1450 | +PACKAGE_STRING='upstart 1.4' |
1451 | PACKAGE_BUGREPORT='upstart-devel@lists.ubuntu.com' |
1452 | PACKAGE_URL='' |
1453 | |
1454 | @@ -817,9 +686,11 @@ |
1455 | LIPO |
1456 | NMEDIT |
1457 | DSYMUTIL |
1458 | -lt_ECHO |
1459 | +MANIFEST_TOOL |
1460 | RANLIB |
1461 | +ac_ct_AR |
1462 | AR |
1463 | +DLLTOOL |
1464 | OBJDUMP |
1465 | LN_S |
1466 | NM |
1467 | @@ -934,6 +805,7 @@ |
1468 | with_pic |
1469 | enable_fast_install |
1470 | with_gnu_ld |
1471 | +with_sysroot |
1472 | enable_libtool_lock |
1473 | enable_nls |
1474 | enable_threads |
1475 | @@ -1373,7 +1245,7 @@ |
1476 | $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 |
1477 | expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && |
1478 | $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 |
1479 | - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} |
1480 | + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" |
1481 | ;; |
1482 | |
1483 | esac |
1484 | @@ -1511,7 +1383,7 @@ |
1485 | # Omit some internal or obsolete options to make the list less imposing. |
1486 | # This message is too long to be a string in the A/UX 3.1 sh. |
1487 | cat <<_ACEOF |
1488 | -\`configure' configures upstart 1.3 to adapt to many kinds of systems. |
1489 | +\`configure' configures upstart 1.4 to adapt to many kinds of systems. |
1490 | |
1491 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1492 | |
1493 | @@ -1581,7 +1453,7 @@ |
1494 | |
1495 | if test -n "$ac_init_help"; then |
1496 | case $ac_init_help in |
1497 | - short | recursive ) echo "Configuration of upstart 1.3:";; |
1498 | + short | recursive ) echo "Configuration of upstart 1.4:";; |
1499 | esac |
1500 | cat <<\_ACEOF |
1501 | |
1502 | @@ -1621,6 +1493,8 @@ |
1503 | --with-pic try to use only PIC/non-PIC objects [default=use |
1504 | both] |
1505 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
1506 | + --with-sysroot=DIR Search for dependent libraries within DIR |
1507 | + (or the compiler's sysroot if not specified). |
1508 | --with-gnu-ld assume the C compiler uses GNU ld default=no |
1509 | --with-libpth-prefix[=DIR] search for libpth in DIR/include and DIR/lib |
1510 | --without-libpth-prefix don't search for libpth in includedir and libdir |
1511 | @@ -1723,8 +1597,8 @@ |
1512 | test -n "$ac_init_help" && exit $ac_status |
1513 | if $ac_init_version; then |
1514 | cat <<\_ACEOF |
1515 | -upstart configure 1.3 |
1516 | -generated by GNU Autoconf 2.67 |
1517 | +upstart configure 1.4 |
1518 | +generated by GNU Autoconf 2.68 |
1519 | |
1520 | Copyright (C) 2010 Free Software Foundation, Inc. |
1521 | This configure script is free software; the Free Software Foundation |
1522 | @@ -1772,7 +1646,7 @@ |
1523 | |
1524 | ac_retval=1 |
1525 | fi |
1526 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1527 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1528 | as_fn_set_status $ac_retval |
1529 | |
1530 | } # ac_fn_c_try_compile |
1531 | @@ -1809,7 +1683,7 @@ |
1532 | |
1533 | ac_retval=1 |
1534 | fi |
1535 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1536 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1537 | as_fn_set_status $ac_retval |
1538 | |
1539 | } # ac_fn_c_try_cpp |
1540 | @@ -1822,10 +1696,10 @@ |
1541 | ac_fn_c_check_header_mongrel () |
1542 | { |
1543 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1544 | - if eval "test \"\${$3+set}\"" = set; then : |
1545 | + if eval \${$3+:} false; then : |
1546 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1547 | $as_echo_n "checking for $2... " >&6; } |
1548 | -if eval "test \"\${$3+set}\"" = set; then : |
1549 | +if eval \${$3+:} false; then : |
1550 | $as_echo_n "(cached) " >&6 |
1551 | fi |
1552 | eval ac_res=\$$3 |
1553 | @@ -1892,7 +1766,7 @@ |
1554 | esac |
1555 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1556 | $as_echo_n "checking for $2... " >&6; } |
1557 | -if eval "test \"\${$3+set}\"" = set; then : |
1558 | +if eval \${$3+:} false; then : |
1559 | $as_echo_n "(cached) " >&6 |
1560 | else |
1561 | eval "$3=\$ac_header_compiler" |
1562 | @@ -1901,7 +1775,7 @@ |
1563 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1564 | $as_echo "$ac_res" >&6; } |
1565 | fi |
1566 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1567 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1568 | |
1569 | } # ac_fn_c_check_header_mongrel |
1570 | |
1571 | @@ -1942,7 +1816,7 @@ |
1572 | ac_retval=$ac_status |
1573 | fi |
1574 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
1575 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1576 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1577 | as_fn_set_status $ac_retval |
1578 | |
1579 | } # ac_fn_c_try_run |
1580 | @@ -1956,7 +1830,7 @@ |
1581 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1582 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1583 | $as_echo_n "checking for $2... " >&6; } |
1584 | -if eval "test \"\${$3+set}\"" = set; then : |
1585 | +if eval \${$3+:} false; then : |
1586 | $as_echo_n "(cached) " >&6 |
1587 | else |
1588 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1589 | @@ -1974,7 +1848,7 @@ |
1590 | eval ac_res=\$$3 |
1591 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1592 | $as_echo "$ac_res" >&6; } |
1593 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1594 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1595 | |
1596 | } # ac_fn_c_check_header_compile |
1597 | |
1598 | @@ -2019,7 +1893,7 @@ |
1599 | # interfere with the next link command; also delete a directory that is |
1600 | # left behind by Apple's compiler. We do this before executing the actions. |
1601 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
1602 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1603 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1604 | as_fn_set_status $ac_retval |
1605 | |
1606 | } # ac_fn_c_try_link |
1607 | @@ -2032,7 +1906,7 @@ |
1608 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1609 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1610 | $as_echo_n "checking for $2... " >&6; } |
1611 | -if eval "test \"\${$3+set}\"" = set; then : |
1612 | +if eval \${$3+:} false; then : |
1613 | $as_echo_n "(cached) " >&6 |
1614 | else |
1615 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1616 | @@ -2087,7 +1961,7 @@ |
1617 | eval ac_res=\$$3 |
1618 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1619 | $as_echo "$ac_res" >&6; } |
1620 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1621 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1622 | |
1623 | } # ac_fn_c_check_func |
1624 | |
1625 | @@ -2100,7 +1974,7 @@ |
1626 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1627 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1628 | $as_echo_n "checking for $2... " >&6; } |
1629 | -if eval "test \"\${$3+set}\"" = set; then : |
1630 | +if eval \${$3+:} false; then : |
1631 | $as_echo_n "(cached) " >&6 |
1632 | else |
1633 | eval "$3=no" |
1634 | @@ -2141,7 +2015,7 @@ |
1635 | eval ac_res=\$$3 |
1636 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1637 | $as_echo "$ac_res" >&6; } |
1638 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1639 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1640 | |
1641 | } # ac_fn_c_check_type |
1642 | |
1643 | @@ -2318,7 +2192,7 @@ |
1644 | rm -f conftest.val |
1645 | |
1646 | fi |
1647 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1648 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1649 | as_fn_set_status $ac_retval |
1650 | |
1651 | } # ac_fn_c_compute_int |
1652 | @@ -2326,8 +2200,8 @@ |
1653 | This file contains any messages produced by compilers while |
1654 | running configure, to aid debugging if configure makes a mistake. |
1655 | |
1656 | -It was created by upstart $as_me 1.3, which was |
1657 | -generated by GNU Autoconf 2.67. Invocation command line was |
1658 | +It was created by upstart $as_me 1.4, which was |
1659 | +generated by GNU Autoconf 2.68. Invocation command line was |
1660 | |
1661 | $ $0 $@ |
1662 | |
1663 | @@ -2585,7 +2459,7 @@ |
1664 | || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1665 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1666 | as_fn_error $? "failed to load site script $ac_site_file |
1667 | -See \`config.log' for more details" "$LINENO" 5 ; } |
1668 | +See \`config.log' for more details" "$LINENO" 5; } |
1669 | fi |
1670 | done |
1671 | |
1672 | @@ -2699,7 +2573,7 @@ |
1673 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
1674 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1675 | $as_echo_n "checking for $ac_word... " >&6; } |
1676 | -if test "${ac_cv_prog_CC+set}" = set; then : |
1677 | +if ${ac_cv_prog_CC+:} false; then : |
1678 | $as_echo_n "(cached) " >&6 |
1679 | else |
1680 | if test -n "$CC"; then |
1681 | @@ -2739,7 +2613,7 @@ |
1682 | set dummy gcc; ac_word=$2 |
1683 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1684 | $as_echo_n "checking for $ac_word... " >&6; } |
1685 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
1686 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
1687 | $as_echo_n "(cached) " >&6 |
1688 | else |
1689 | if test -n "$ac_ct_CC"; then |
1690 | @@ -2792,7 +2666,7 @@ |
1691 | set dummy ${ac_tool_prefix}cc; ac_word=$2 |
1692 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1693 | $as_echo_n "checking for $ac_word... " >&6; } |
1694 | -if test "${ac_cv_prog_CC+set}" = set; then : |
1695 | +if ${ac_cv_prog_CC+:} false; then : |
1696 | $as_echo_n "(cached) " >&6 |
1697 | else |
1698 | if test -n "$CC"; then |
1699 | @@ -2832,7 +2706,7 @@ |
1700 | set dummy cc; ac_word=$2 |
1701 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1702 | $as_echo_n "checking for $ac_word... " >&6; } |
1703 | -if test "${ac_cv_prog_CC+set}" = set; then : |
1704 | +if ${ac_cv_prog_CC+:} false; then : |
1705 | $as_echo_n "(cached) " >&6 |
1706 | else |
1707 | if test -n "$CC"; then |
1708 | @@ -2891,7 +2765,7 @@ |
1709 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
1710 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1711 | $as_echo_n "checking for $ac_word... " >&6; } |
1712 | -if test "${ac_cv_prog_CC+set}" = set; then : |
1713 | +if ${ac_cv_prog_CC+:} false; then : |
1714 | $as_echo_n "(cached) " >&6 |
1715 | else |
1716 | if test -n "$CC"; then |
1717 | @@ -2935,7 +2809,7 @@ |
1718 | set dummy $ac_prog; ac_word=$2 |
1719 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1720 | $as_echo_n "checking for $ac_word... " >&6; } |
1721 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
1722 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
1723 | $as_echo_n "(cached) " >&6 |
1724 | else |
1725 | if test -n "$ac_ct_CC"; then |
1726 | @@ -2990,7 +2864,7 @@ |
1727 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1728 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1729 | as_fn_error $? "no acceptable C compiler found in \$PATH |
1730 | -See \`config.log' for more details" "$LINENO" 5 ; } |
1731 | +See \`config.log' for more details" "$LINENO" 5; } |
1732 | |
1733 | # Provide some information about the compiler. |
1734 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
1735 | @@ -3105,7 +2979,7 @@ |
1736 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1737 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1738 | as_fn_error 77 "C compiler cannot create executables |
1739 | -See \`config.log' for more details" "$LINENO" 5 ; } |
1740 | +See \`config.log' for more details" "$LINENO" 5; } |
1741 | else |
1742 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1743 | $as_echo "yes" >&6; } |
1744 | @@ -3148,7 +3022,7 @@ |
1745 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1746 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1747 | as_fn_error $? "cannot compute suffix of executables: cannot compile and link |
1748 | -See \`config.log' for more details" "$LINENO" 5 ; } |
1749 | +See \`config.log' for more details" "$LINENO" 5; } |
1750 | fi |
1751 | rm -f conftest conftest$ac_cv_exeext |
1752 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
1753 | @@ -3207,7 +3081,7 @@ |
1754 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1755 | as_fn_error $? "cannot run C compiled programs. |
1756 | If you meant to cross compile, use \`--host'. |
1757 | -See \`config.log' for more details" "$LINENO" 5 ; } |
1758 | +See \`config.log' for more details" "$LINENO" 5; } |
1759 | fi |
1760 | fi |
1761 | fi |
1762 | @@ -3218,7 +3092,7 @@ |
1763 | ac_clean_files=$ac_clean_files_save |
1764 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 |
1765 | $as_echo_n "checking for suffix of object files... " >&6; } |
1766 | -if test "${ac_cv_objext+set}" = set; then : |
1767 | +if ${ac_cv_objext+:} false; then : |
1768 | $as_echo_n "(cached) " >&6 |
1769 | else |
1770 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1771 | @@ -3259,7 +3133,7 @@ |
1772 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1773 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1774 | as_fn_error $? "cannot compute suffix of object files: cannot compile |
1775 | -See \`config.log' for more details" "$LINENO" 5 ; } |
1776 | +See \`config.log' for more details" "$LINENO" 5; } |
1777 | fi |
1778 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
1779 | fi |
1780 | @@ -3269,7 +3143,7 @@ |
1781 | ac_objext=$OBJEXT |
1782 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 |
1783 | $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } |
1784 | -if test "${ac_cv_c_compiler_gnu+set}" = set; then : |
1785 | +if ${ac_cv_c_compiler_gnu+:} false; then : |
1786 | $as_echo_n "(cached) " >&6 |
1787 | else |
1788 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1789 | @@ -3306,7 +3180,7 @@ |
1790 | ac_save_CFLAGS=$CFLAGS |
1791 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 |
1792 | $as_echo_n "checking whether $CC accepts -g... " >&6; } |
1793 | -if test "${ac_cv_prog_cc_g+set}" = set; then : |
1794 | +if ${ac_cv_prog_cc_g+:} false; then : |
1795 | $as_echo_n "(cached) " >&6 |
1796 | else |
1797 | ac_save_c_werror_flag=$ac_c_werror_flag |
1798 | @@ -3384,7 +3258,7 @@ |
1799 | fi |
1800 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 |
1801 | $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } |
1802 | -if test "${ac_cv_prog_cc_c89+set}" = set; then : |
1803 | +if ${ac_cv_prog_cc_c89+:} false; then : |
1804 | $as_echo_n "(cached) " >&6 |
1805 | else |
1806 | ac_cv_prog_cc_c89=no |
1807 | @@ -3492,7 +3366,7 @@ |
1808 | CPP= |
1809 | fi |
1810 | if test -z "$CPP"; then |
1811 | - if test "${ac_cv_prog_CPP+set}" = set; then : |
1812 | + if ${ac_cv_prog_CPP+:} false; then : |
1813 | $as_echo_n "(cached) " >&6 |
1814 | else |
1815 | # Double quotes because CPP needs to be expanded |
1816 | @@ -3608,7 +3482,7 @@ |
1817 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1818 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1819 | as_fn_error $? "C preprocessor \"$CPP\" fails sanity check |
1820 | -See \`config.log' for more details" "$LINENO" 5 ; } |
1821 | +See \`config.log' for more details" "$LINENO" 5; } |
1822 | fi |
1823 | |
1824 | ac_ext=c |
1825 | @@ -3620,7 +3494,7 @@ |
1826 | |
1827 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 |
1828 | $as_echo_n "checking for grep that handles long lines and -e... " >&6; } |
1829 | -if test "${ac_cv_path_GREP+set}" = set; then : |
1830 | +if ${ac_cv_path_GREP+:} false; then : |
1831 | $as_echo_n "(cached) " >&6 |
1832 | else |
1833 | if test -z "$GREP"; then |
1834 | @@ -3683,7 +3557,7 @@ |
1835 | |
1836 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 |
1837 | $as_echo_n "checking for egrep... " >&6; } |
1838 | -if test "${ac_cv_path_EGREP+set}" = set; then : |
1839 | +if ${ac_cv_path_EGREP+:} false; then : |
1840 | $as_echo_n "(cached) " >&6 |
1841 | else |
1842 | if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 |
1843 | @@ -3750,7 +3624,7 @@ |
1844 | |
1845 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 |
1846 | $as_echo_n "checking for ANSI C header files... " >&6; } |
1847 | -if test "${ac_cv_header_stdc+set}" = set; then : |
1848 | +if ${ac_cv_header_stdc+:} false; then : |
1849 | $as_echo_n "(cached) " >&6 |
1850 | else |
1851 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1852 | @@ -3879,7 +3753,7 @@ |
1853 | |
1854 | |
1855 | ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" |
1856 | -if test "x$ac_cv_header_minix_config_h" = x""yes; then : |
1857 | +if test "x$ac_cv_header_minix_config_h" = xyes; then : |
1858 | MINIX=yes |
1859 | else |
1860 | MINIX= |
1861 | @@ -3901,7 +3775,7 @@ |
1862 | |
1863 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 |
1864 | $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } |
1865 | -if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : |
1866 | +if ${ac_cv_safe_to_define___extensions__+:} false; then : |
1867 | $as_echo_n "(cached) " >&6 |
1868 | else |
1869 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1870 | @@ -3988,7 +3862,7 @@ |
1871 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 |
1872 | $as_echo_n "checking for a BSD-compatible install... " >&6; } |
1873 | if test -z "$INSTALL"; then |
1874 | -if test "${ac_cv_path_install+set}" = set; then : |
1875 | +if ${ac_cv_path_install+:} false; then : |
1876 | $as_echo_n "(cached) " >&6 |
1877 | else |
1878 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1879 | @@ -4075,11 +3949,11 @@ |
1880 | ' |
1881 | case `pwd` in |
1882 | *[\\\"\#\$\&\'\`$am_lf]*) |
1883 | - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; |
1884 | + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; |
1885 | esac |
1886 | case $srcdir in |
1887 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) |
1888 | - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; |
1889 | + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; |
1890 | esac |
1891 | |
1892 | # Do `set' in a subshell so we don't clobber the current shell's |
1893 | @@ -4165,7 +4039,7 @@ |
1894 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
1895 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1896 | $as_echo_n "checking for $ac_word... " >&6; } |
1897 | -if test "${ac_cv_prog_STRIP+set}" = set; then : |
1898 | +if ${ac_cv_prog_STRIP+:} false; then : |
1899 | $as_echo_n "(cached) " >&6 |
1900 | else |
1901 | if test -n "$STRIP"; then |
1902 | @@ -4205,7 +4079,7 @@ |
1903 | set dummy strip; ac_word=$2 |
1904 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1905 | $as_echo_n "checking for $ac_word... " >&6; } |
1906 | -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : |
1907 | +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : |
1908 | $as_echo_n "(cached) " >&6 |
1909 | else |
1910 | if test -n "$ac_ct_STRIP"; then |
1911 | @@ -4258,7 +4132,7 @@ |
1912 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 |
1913 | $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } |
1914 | if test -z "$MKDIR_P"; then |
1915 | - if test "${ac_cv_path_mkdir+set}" = set; then : |
1916 | + if ${ac_cv_path_mkdir+:} false; then : |
1917 | $as_echo_n "(cached) " >&6 |
1918 | else |
1919 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1920 | @@ -4309,7 +4183,7 @@ |
1921 | set dummy $ac_prog; ac_word=$2 |
1922 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1923 | $as_echo_n "checking for $ac_word... " >&6; } |
1924 | -if test "${ac_cv_prog_AWK+set}" = set; then : |
1925 | +if ${ac_cv_prog_AWK+:} false; then : |
1926 | $as_echo_n "(cached) " >&6 |
1927 | else |
1928 | if test -n "$AWK"; then |
1929 | @@ -4349,7 +4223,7 @@ |
1930 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } |
1931 | set x ${MAKE-make} |
1932 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
1933 | -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : |
1934 | +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : |
1935 | $as_echo_n "(cached) " >&6 |
1936 | else |
1937 | cat >conftest.make <<\_ACEOF |
1938 | @@ -4481,7 +4355,7 @@ |
1939 | |
1940 | # Define the identity of the package. |
1941 | PACKAGE='upstart' |
1942 | - VERSION='1.3' |
1943 | + VERSION='1.4' |
1944 | |
1945 | |
1946 | cat >>confdefs.h <<_ACEOF |
1947 | @@ -4524,7 +4398,7 @@ |
1948 | |
1949 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
1950 | $as_echo_n "checking dependency style of $depcc... " >&6; } |
1951 | -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : |
1952 | +if ${am_cv_CC_dependencies_compiler_type+:} false; then : |
1953 | $as_echo_n "(cached) " >&6 |
1954 | else |
1955 | if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
1956 | @@ -4693,8 +4567,8 @@ |
1957 | |
1958 | |
1959 | |
1960 | -macro_version='2.2.6b' |
1961 | -macro_revision='1.3017' |
1962 | +macro_version='2.4' |
1963 | +macro_revision='1.3293' |
1964 | |
1965 | |
1966 | |
1967 | @@ -4716,7 +4590,7 @@ |
1968 | |
1969 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 |
1970 | $as_echo_n "checking build system type... " >&6; } |
1971 | -if test "${ac_cv_build+set}" = set; then : |
1972 | +if ${ac_cv_build+:} false; then : |
1973 | $as_echo_n "(cached) " >&6 |
1974 | else |
1975 | ac_build_alias=$build_alias |
1976 | @@ -4732,7 +4606,7 @@ |
1977 | $as_echo "$ac_cv_build" >&6; } |
1978 | case $ac_cv_build in |
1979 | *-*-*) ;; |
1980 | -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; |
1981 | +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; |
1982 | esac |
1983 | build=$ac_cv_build |
1984 | ac_save_IFS=$IFS; IFS='-' |
1985 | @@ -4750,7 +4624,7 @@ |
1986 | |
1987 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 |
1988 | $as_echo_n "checking host system type... " >&6; } |
1989 | -if test "${ac_cv_host+set}" = set; then : |
1990 | +if ${ac_cv_host+:} false; then : |
1991 | $as_echo_n "(cached) " >&6 |
1992 | else |
1993 | if test "x$host_alias" = x; then |
1994 | @@ -4765,7 +4639,7 @@ |
1995 | $as_echo "$ac_cv_host" >&6; } |
1996 | case $ac_cv_host in |
1997 | *-*-*) ;; |
1998 | -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; |
1999 | +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; |
2000 | esac |
2001 | host=$ac_cv_host |
2002 | ac_save_IFS=$IFS; IFS='-' |
2003 | @@ -4781,9 +4655,78 @@ |
2004 | case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac |
2005 | |
2006 | |
2007 | +# Backslashify metacharacters that are still active within |
2008 | +# double-quoted strings. |
2009 | +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' |
2010 | + |
2011 | +# Same as above, but do not quote variable references. |
2012 | +double_quote_subst='s/\(["`\\]\)/\\\1/g' |
2013 | + |
2014 | +# Sed substitution to delay expansion of an escaped shell variable in a |
2015 | +# double_quote_subst'ed string. |
2016 | +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
2017 | + |
2018 | +# Sed substitution to delay expansion of an escaped single quote. |
2019 | +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
2020 | + |
2021 | +# Sed substitution to avoid accidental globbing in evaled expressions |
2022 | +no_glob_subst='s/\*/\\\*/g' |
2023 | + |
2024 | +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
2025 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
2026 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
2027 | + |
2028 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
2029 | +$as_echo_n "checking how to print strings... " >&6; } |
2030 | +# Test print first, because it will be a builtin if present. |
2031 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
2032 | + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
2033 | + ECHO='print -r --' |
2034 | +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
2035 | + ECHO='printf %s\n' |
2036 | +else |
2037 | + # Use this function as a fallback that always works. |
2038 | + func_fallback_echo () |
2039 | + { |
2040 | + eval 'cat <<_LTECHO_EOF |
2041 | +$1 |
2042 | +_LTECHO_EOF' |
2043 | + } |
2044 | + ECHO='func_fallback_echo' |
2045 | +fi |
2046 | + |
2047 | +# func_echo_all arg... |
2048 | +# Invoke $ECHO with all args, space-separated. |
2049 | +func_echo_all () |
2050 | +{ |
2051 | + $ECHO "" |
2052 | +} |
2053 | + |
2054 | +case "$ECHO" in |
2055 | + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 |
2056 | +$as_echo "printf" >&6; } ;; |
2057 | + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 |
2058 | +$as_echo "print -r" >&6; } ;; |
2059 | + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 |
2060 | +$as_echo "cat" >&6; } ;; |
2061 | +esac |
2062 | + |
2063 | + |
2064 | + |
2065 | + |
2066 | + |
2067 | + |
2068 | + |
2069 | + |
2070 | + |
2071 | + |
2072 | + |
2073 | + |
2074 | + |
2075 | + |
2076 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 |
2077 | $as_echo_n "checking for a sed that does not truncate output... " >&6; } |
2078 | -if test "${ac_cv_path_SED+set}" = set; then : |
2079 | +if ${ac_cv_path_SED+:} false; then : |
2080 | $as_echo_n "(cached) " >&6 |
2081 | else |
2082 | ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ |
2083 | @@ -4865,7 +4808,7 @@ |
2084 | |
2085 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 |
2086 | $as_echo_n "checking for fgrep... " >&6; } |
2087 | -if test "${ac_cv_path_FGREP+set}" = set; then : |
2088 | +if ${ac_cv_path_FGREP+:} false; then : |
2089 | $as_echo_n "(cached) " >&6 |
2090 | else |
2091 | if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 |
2092 | @@ -4996,7 +4939,7 @@ |
2093 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 |
2094 | $as_echo_n "checking for non-GNU ld... " >&6; } |
2095 | fi |
2096 | -if test "${lt_cv_path_LD+set}" = set; then : |
2097 | +if ${lt_cv_path_LD+:} false; then : |
2098 | $as_echo_n "(cached) " >&6 |
2099 | else |
2100 | if test -z "$LD"; then |
2101 | @@ -5036,7 +4979,7 @@ |
2102 | test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 |
2103 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 |
2104 | $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } |
2105 | -if test "${lt_cv_prog_gnu_ld+set}" = set; then : |
2106 | +if ${lt_cv_prog_gnu_ld+:} false; then : |
2107 | $as_echo_n "(cached) " >&6 |
2108 | else |
2109 | # I'd rather use --version here, but apparently some GNU lds only accept -v. |
2110 | @@ -5063,7 +5006,7 @@ |
2111 | |
2112 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 |
2113 | $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } |
2114 | -if test "${lt_cv_path_NM+set}" = set; then : |
2115 | +if ${lt_cv_path_NM+:} false; then : |
2116 | $as_echo_n "(cached) " >&6 |
2117 | else |
2118 | if test -n "$NM"; then |
2119 | @@ -5116,14 +5059,17 @@ |
2120 | NM="$lt_cv_path_NM" |
2121 | else |
2122 | # Didn't find any BSD compatible name lister, look for dumpbin. |
2123 | - if test -n "$ac_tool_prefix"; then |
2124 | - for ac_prog in "dumpbin -symbols" "link -dump -symbols" |
2125 | + if test -n "$DUMPBIN"; then : |
2126 | + # Let the user override the test. |
2127 | + else |
2128 | + if test -n "$ac_tool_prefix"; then |
2129 | + for ac_prog in dumpbin "link -dump" |
2130 | do |
2131 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
2132 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
2133 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2134 | $as_echo_n "checking for $ac_word... " >&6; } |
2135 | -if test "${ac_cv_prog_DUMPBIN+set}" = set; then : |
2136 | +if ${ac_cv_prog_DUMPBIN+:} false; then : |
2137 | $as_echo_n "(cached) " >&6 |
2138 | else |
2139 | if test -n "$DUMPBIN"; then |
2140 | @@ -5161,13 +5107,13 @@ |
2141 | fi |
2142 | if test -z "$DUMPBIN"; then |
2143 | ac_ct_DUMPBIN=$DUMPBIN |
2144 | - for ac_prog in "dumpbin -symbols" "link -dump -symbols" |
2145 | + for ac_prog in dumpbin "link -dump" |
2146 | do |
2147 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
2148 | set dummy $ac_prog; ac_word=$2 |
2149 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2150 | $as_echo_n "checking for $ac_word... " >&6; } |
2151 | -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : |
2152 | +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : |
2153 | $as_echo_n "(cached) " >&6 |
2154 | else |
2155 | if test -n "$ac_ct_DUMPBIN"; then |
2156 | @@ -5216,6 +5162,15 @@ |
2157 | fi |
2158 | fi |
2159 | |
2160 | + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in |
2161 | + *COFF*) |
2162 | + DUMPBIN="$DUMPBIN -symbols" |
2163 | + ;; |
2164 | + *) |
2165 | + DUMPBIN=: |
2166 | + ;; |
2167 | + esac |
2168 | + fi |
2169 | |
2170 | if test "$DUMPBIN" != ":"; then |
2171 | NM="$DUMPBIN" |
2172 | @@ -5230,18 +5185,18 @@ |
2173 | |
2174 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 |
2175 | $as_echo_n "checking the name lister ($NM) interface... " >&6; } |
2176 | -if test "${lt_cv_nm_interface+set}" = set; then : |
2177 | +if ${lt_cv_nm_interface+:} false; then : |
2178 | $as_echo_n "(cached) " >&6 |
2179 | else |
2180 | lt_cv_nm_interface="BSD nm" |
2181 | echo "int some_variable = 0;" > conftest.$ac_ext |
2182 | - (eval echo "\"\$as_me:5238: $ac_compile\"" >&5) |
2183 | + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) |
2184 | (eval "$ac_compile" 2>conftest.err) |
2185 | cat conftest.err >&5 |
2186 | - (eval echo "\"\$as_me:5241: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
2187 | + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
2188 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
2189 | cat conftest.err >&5 |
2190 | - (eval echo "\"\$as_me:5244: output\"" >&5) |
2191 | + (eval echo "\"\$as_me:$LINENO: output\"" >&5) |
2192 | cat conftest.out >&5 |
2193 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
2194 | lt_cv_nm_interface="MS dumpbin" |
2195 | @@ -5265,7 +5220,7 @@ |
2196 | # find the maximum length of command line arguments |
2197 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 |
2198 | $as_echo_n "checking the maximum length of command line arguments... " >&6; } |
2199 | -if test "${lt_cv_sys_max_cmd_len+set}" = set; then : |
2200 | +if ${lt_cv_sys_max_cmd_len+:} false; then : |
2201 | $as_echo_n "(cached) " >&6 |
2202 | else |
2203 | i=0 |
2204 | @@ -5298,6 +5253,11 @@ |
2205 | lt_cv_sys_max_cmd_len=8192; |
2206 | ;; |
2207 | |
2208 | + mint*) |
2209 | + # On MiNT this can take a long time and run out of memory. |
2210 | + lt_cv_sys_max_cmd_len=8192; |
2211 | + ;; |
2212 | + |
2213 | amigaos*) |
2214 | # On AmigaOS with pdksh, this test takes hours, literally. |
2215 | # So we just punt and use a minimum line length of 8192. |
2216 | @@ -5362,8 +5322,8 @@ |
2217 | # If test is not a shell built-in, we'll probably end up computing a |
2218 | # maximum length that is only half of the actual maximum length, but |
2219 | # we can't tell. |
2220 | - while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ |
2221 | - = "XX$teststring$teststring"; } >/dev/null 2>&1 && |
2222 | + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
2223 | + = "X$teststring$teststring"; } >/dev/null 2>&1 && |
2224 | test $i != 17 # 1/2 MB should be enough |
2225 | do |
2226 | i=`expr $i + 1` |
2227 | @@ -5405,8 +5365,8 @@ |
2228 | # Try some XSI features |
2229 | xsi_shell=no |
2230 | ( _lt_dummy="a/b/c" |
2231 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
2232 | - = c,a/b,, \ |
2233 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
2234 | + = c,a/b,b/c, \ |
2235 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
2236 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
2237 | && xsi_shell=yes |
2238 | @@ -5455,9 +5415,83 @@ |
2239 | |
2240 | |
2241 | |
2242 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
2243 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
2244 | +if ${lt_cv_to_host_file_cmd+:} false; then : |
2245 | + $as_echo_n "(cached) " >&6 |
2246 | +else |
2247 | + case $host in |
2248 | + *-*-mingw* ) |
2249 | + case $build in |
2250 | + *-*-mingw* ) # actually msys |
2251 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
2252 | + ;; |
2253 | + *-*-cygwin* ) |
2254 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
2255 | + ;; |
2256 | + * ) # otherwise, assume *nix |
2257 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
2258 | + ;; |
2259 | + esac |
2260 | + ;; |
2261 | + *-*-cygwin* ) |
2262 | + case $build in |
2263 | + *-*-mingw* ) # actually msys |
2264 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
2265 | + ;; |
2266 | + *-*-cygwin* ) |
2267 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
2268 | + ;; |
2269 | + * ) # otherwise, assume *nix |
2270 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
2271 | + ;; |
2272 | + esac |
2273 | + ;; |
2274 | + * ) # unhandled hosts (and "normal" native builds) |
2275 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
2276 | + ;; |
2277 | +esac |
2278 | + |
2279 | +fi |
2280 | + |
2281 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
2282 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
2283 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
2284 | + |
2285 | + |
2286 | + |
2287 | + |
2288 | + |
2289 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
2290 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
2291 | +if ${lt_cv_to_tool_file_cmd+:} false; then : |
2292 | + $as_echo_n "(cached) " >&6 |
2293 | +else |
2294 | + #assume ordinary cross tools, or native build. |
2295 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
2296 | +case $host in |
2297 | + *-*-mingw* ) |
2298 | + case $build in |
2299 | + *-*-mingw* ) # actually msys |
2300 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
2301 | + ;; |
2302 | + esac |
2303 | + ;; |
2304 | +esac |
2305 | + |
2306 | +fi |
2307 | + |
2308 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
2309 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
2310 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
2311 | + |
2312 | + |
2313 | + |
2314 | + |
2315 | + |
2316 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
2317 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
2318 | -if test "${lt_cv_ld_reload_flag+set}" = set; then : |
2319 | +if ${lt_cv_ld_reload_flag+:} false; then : |
2320 | $as_echo_n "(cached) " >&6 |
2321 | else |
2322 | lt_cv_ld_reload_flag='-r' |
2323 | @@ -5471,6 +5505,11 @@ |
2324 | esac |
2325 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
2326 | case $host_os in |
2327 | + cygwin* | mingw* | pw32* | cegcc*) |
2328 | + if test "$GCC" != yes; then |
2329 | + reload_cmds=false |
2330 | + fi |
2331 | + ;; |
2332 | darwin*) |
2333 | if test "$GCC" = yes; then |
2334 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
2335 | @@ -5493,7 +5532,7 @@ |
2336 | set dummy ${ac_tool_prefix}objdump; ac_word=$2 |
2337 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2338 | $as_echo_n "checking for $ac_word... " >&6; } |
2339 | -if test "${ac_cv_prog_OBJDUMP+set}" = set; then : |
2340 | +if ${ac_cv_prog_OBJDUMP+:} false; then : |
2341 | $as_echo_n "(cached) " >&6 |
2342 | else |
2343 | if test -n "$OBJDUMP"; then |
2344 | @@ -5533,7 +5572,7 @@ |
2345 | set dummy objdump; ac_word=$2 |
2346 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2347 | $as_echo_n "checking for $ac_word... " >&6; } |
2348 | -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : |
2349 | +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : |
2350 | $as_echo_n "(cached) " >&6 |
2351 | else |
2352 | if test -n "$ac_ct_OBJDUMP"; then |
2353 | @@ -5592,7 +5631,7 @@ |
2354 | |
2355 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 |
2356 | $as_echo_n "checking how to recognize dependent libraries... " >&6; } |
2357 | -if test "${lt_cv_deplibs_check_method+set}" = set; then : |
2358 | +if ${lt_cv_deplibs_check_method+:} false; then : |
2359 | $as_echo_n "(cached) " >&6 |
2360 | else |
2361 | lt_cv_file_magic_cmd='$MAGIC_CMD' |
2362 | @@ -5634,16 +5673,18 @@ |
2363 | # Base MSYS/MinGW do not provide the 'file' command needed by |
2364 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
2365 | # unless we find 'file', for example because we are cross-compiling. |
2366 | - if ( file / ) >/dev/null 2>&1; then |
2367 | + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. |
2368 | + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then |
2369 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
2370 | lt_cv_file_magic_cmd='func_win32_libid' |
2371 | else |
2372 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
2373 | + # Keep this pattern in sync with the one in func_win32_libid. |
2374 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
2375 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
2376 | fi |
2377 | ;; |
2378 | |
2379 | -cegcc) |
2380 | +cegcc*) |
2381 | # use the weaker test based on 'objdump'. See mingw*. |
2382 | lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' |
2383 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
2384 | @@ -5673,6 +5714,10 @@ |
2385 | lt_cv_deplibs_check_method=pass_all |
2386 | ;; |
2387 | |
2388 | +haiku*) |
2389 | + lt_cv_deplibs_check_method=pass_all |
2390 | + ;; |
2391 | + |
2392 | hpux10.20* | hpux11*) |
2393 | lt_cv_file_magic_cmd=/usr/bin/file |
2394 | case $host_cpu in |
2395 | @@ -5681,11 +5726,11 @@ |
2396 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
2397 | ;; |
2398 | hppa*64*) |
2399 | - 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]' |
2400 | + 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]' |
2401 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl |
2402 | ;; |
2403 | *) |
2404 | - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' |
2405 | + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' |
2406 | lt_cv_file_magic_test_file=/usr/lib/libc.sl |
2407 | ;; |
2408 | esac |
2409 | @@ -5788,6 +5833,21 @@ |
2410 | fi |
2411 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
2412 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
2413 | + |
2414 | +file_magic_glob= |
2415 | +want_nocaseglob=no |
2416 | +if test "$build" = "$host"; then |
2417 | + case $host_os in |
2418 | + mingw* | pw32*) |
2419 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
2420 | + want_nocaseglob=yes |
2421 | + else |
2422 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
2423 | + fi |
2424 | + ;; |
2425 | + esac |
2426 | +fi |
2427 | + |
2428 | file_magic_cmd=$lt_cv_file_magic_cmd |
2429 | deplibs_check_method=$lt_cv_deplibs_check_method |
2430 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
2431 | @@ -5803,12 +5863,165 @@ |
2432 | |
2433 | |
2434 | |
2435 | -if test -n "$ac_tool_prefix"; then |
2436 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
2437 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
2438 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2439 | -$as_echo_n "checking for $ac_word... " >&6; } |
2440 | -if test "${ac_cv_prog_AR+set}" = set; then : |
2441 | + |
2442 | + |
2443 | + |
2444 | + |
2445 | + |
2446 | + |
2447 | + |
2448 | + |
2449 | + |
2450 | + |
2451 | +if test -n "$ac_tool_prefix"; then |
2452 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
2453 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
2454 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2455 | +$as_echo_n "checking for $ac_word... " >&6; } |
2456 | +if ${ac_cv_prog_DLLTOOL+:} false; then : |
2457 | + $as_echo_n "(cached) " >&6 |
2458 | +else |
2459 | + if test -n "$DLLTOOL"; then |
2460 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
2461 | +else |
2462 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2463 | +for as_dir in $PATH |
2464 | +do |
2465 | + IFS=$as_save_IFS |
2466 | + test -z "$as_dir" && as_dir=. |
2467 | + for ac_exec_ext in '' $ac_executable_extensions; do |
2468 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2469 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
2470 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2471 | + break 2 |
2472 | + fi |
2473 | +done |
2474 | + done |
2475 | +IFS=$as_save_IFS |
2476 | + |
2477 | +fi |
2478 | +fi |
2479 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
2480 | +if test -n "$DLLTOOL"; then |
2481 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
2482 | +$as_echo "$DLLTOOL" >&6; } |
2483 | +else |
2484 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2485 | +$as_echo "no" >&6; } |
2486 | +fi |
2487 | + |
2488 | + |
2489 | +fi |
2490 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
2491 | + ac_ct_DLLTOOL=$DLLTOOL |
2492 | + # Extract the first word of "dlltool", so it can be a program name with args. |
2493 | +set dummy dlltool; ac_word=$2 |
2494 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2495 | +$as_echo_n "checking for $ac_word... " >&6; } |
2496 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : |
2497 | + $as_echo_n "(cached) " >&6 |
2498 | +else |
2499 | + if test -n "$ac_ct_DLLTOOL"; then |
2500 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
2501 | +else |
2502 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2503 | +for as_dir in $PATH |
2504 | +do |
2505 | + IFS=$as_save_IFS |
2506 | + test -z "$as_dir" && as_dir=. |
2507 | + for ac_exec_ext in '' $ac_executable_extensions; do |
2508 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2509 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
2510 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2511 | + break 2 |
2512 | + fi |
2513 | +done |
2514 | + done |
2515 | +IFS=$as_save_IFS |
2516 | + |
2517 | +fi |
2518 | +fi |
2519 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
2520 | +if test -n "$ac_ct_DLLTOOL"; then |
2521 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
2522 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
2523 | +else |
2524 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2525 | +$as_echo "no" >&6; } |
2526 | +fi |
2527 | + |
2528 | + if test "x$ac_ct_DLLTOOL" = x; then |
2529 | + DLLTOOL="false" |
2530 | + else |
2531 | + case $cross_compiling:$ac_tool_warned in |
2532 | +yes:) |
2533 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
2534 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
2535 | +ac_tool_warned=yes ;; |
2536 | +esac |
2537 | + DLLTOOL=$ac_ct_DLLTOOL |
2538 | + fi |
2539 | +else |
2540 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
2541 | +fi |
2542 | + |
2543 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
2544 | + |
2545 | + |
2546 | + |
2547 | + |
2548 | + |
2549 | + |
2550 | + |
2551 | + |
2552 | + |
2553 | + |
2554 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
2555 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
2556 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : |
2557 | + $as_echo_n "(cached) " >&6 |
2558 | +else |
2559 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
2560 | + |
2561 | +case $host_os in |
2562 | +cygwin* | mingw* | pw32* | cegcc*) |
2563 | + # two different shell functions defined in ltmain.sh |
2564 | + # decide which to use based on capabilities of $DLLTOOL |
2565 | + case `$DLLTOOL --help 2>&1` in |
2566 | + *--identify-strict*) |
2567 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
2568 | + ;; |
2569 | + *) |
2570 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
2571 | + ;; |
2572 | + esac |
2573 | + ;; |
2574 | +*) |
2575 | + # fallback: assume linklib IS sharedlib |
2576 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
2577 | + ;; |
2578 | +esac |
2579 | + |
2580 | +fi |
2581 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
2582 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
2583 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
2584 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
2585 | + |
2586 | + |
2587 | + |
2588 | + |
2589 | + |
2590 | + |
2591 | + |
2592 | +if test -n "$ac_tool_prefix"; then |
2593 | + for ac_prog in ar |
2594 | + do |
2595 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
2596 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
2597 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2598 | +$as_echo_n "checking for $ac_word... " >&6; } |
2599 | +if ${ac_cv_prog_AR+:} false; then : |
2600 | $as_echo_n "(cached) " >&6 |
2601 | else |
2602 | if test -n "$AR"; then |
2603 | @@ -5821,7 +6034,7 @@ |
2604 | test -z "$as_dir" && as_dir=. |
2605 | for ac_exec_ext in '' $ac_executable_extensions; do |
2606 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2607 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
2608 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
2609 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2610 | break 2 |
2611 | fi |
2612 | @@ -5841,14 +6054,18 @@ |
2613 | fi |
2614 | |
2615 | |
2616 | + test -n "$AR" && break |
2617 | + done |
2618 | fi |
2619 | -if test -z "$ac_cv_prog_AR"; then |
2620 | +if test -z "$AR"; then |
2621 | ac_ct_AR=$AR |
2622 | - # Extract the first word of "ar", so it can be a program name with args. |
2623 | -set dummy ar; ac_word=$2 |
2624 | + for ac_prog in ar |
2625 | +do |
2626 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
2627 | +set dummy $ac_prog; ac_word=$2 |
2628 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2629 | $as_echo_n "checking for $ac_word... " >&6; } |
2630 | -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
2631 | +if ${ac_cv_prog_ac_ct_AR+:} false; then : |
2632 | $as_echo_n "(cached) " >&6 |
2633 | else |
2634 | if test -n "$ac_ct_AR"; then |
2635 | @@ -5861,7 +6078,7 @@ |
2636 | test -z "$as_dir" && as_dir=. |
2637 | for ac_exec_ext in '' $ac_executable_extensions; do |
2638 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2639 | - ac_cv_prog_ac_ct_AR="ar" |
2640 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
2641 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2642 | break 2 |
2643 | fi |
2644 | @@ -5880,6 +6097,10 @@ |
2645 | $as_echo "no" >&6; } |
2646 | fi |
2647 | |
2648 | + |
2649 | + test -n "$ac_ct_AR" && break |
2650 | +done |
2651 | + |
2652 | if test "x$ac_ct_AR" = x; then |
2653 | AR="false" |
2654 | else |
2655 | @@ -5891,16 +6112,72 @@ |
2656 | esac |
2657 | AR=$ac_ct_AR |
2658 | fi |
2659 | -else |
2660 | - AR="$ac_cv_prog_AR" |
2661 | -fi |
2662 | - |
2663 | -test -z "$AR" && AR=ar |
2664 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
2665 | - |
2666 | - |
2667 | - |
2668 | - |
2669 | +fi |
2670 | + |
2671 | +: ${AR=ar} |
2672 | +: ${AR_FLAGS=cru} |
2673 | + |
2674 | + |
2675 | + |
2676 | + |
2677 | + |
2678 | + |
2679 | + |
2680 | + |
2681 | + |
2682 | + |
2683 | + |
2684 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
2685 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
2686 | +if ${lt_cv_ar_at_file+:} false; then : |
2687 | + $as_echo_n "(cached) " >&6 |
2688 | +else |
2689 | + lt_cv_ar_at_file=no |
2690 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2691 | +/* end confdefs.h. */ |
2692 | + |
2693 | +int |
2694 | +main () |
2695 | +{ |
2696 | + |
2697 | + ; |
2698 | + return 0; |
2699 | +} |
2700 | +_ACEOF |
2701 | +if ac_fn_c_try_compile "$LINENO"; then : |
2702 | + echo conftest.$ac_objext > conftest.lst |
2703 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
2704 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
2705 | + (eval $lt_ar_try) 2>&5 |
2706 | + ac_status=$? |
2707 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2708 | + test $ac_status = 0; } |
2709 | + if test "$ac_status" -eq 0; then |
2710 | + # Ensure the archiver fails upon bogus file names. |
2711 | + rm -f conftest.$ac_objext libconftest.a |
2712 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
2713 | + (eval $lt_ar_try) 2>&5 |
2714 | + ac_status=$? |
2715 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2716 | + test $ac_status = 0; } |
2717 | + if test "$ac_status" -ne 0; then |
2718 | + lt_cv_ar_at_file=@ |
2719 | + fi |
2720 | + fi |
2721 | + rm -f conftest.* libconftest.a |
2722 | + |
2723 | +fi |
2724 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
2725 | + |
2726 | +fi |
2727 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
2728 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
2729 | + |
2730 | +if test "x$lt_cv_ar_at_file" = xno; then |
2731 | + archiver_list_spec= |
2732 | +else |
2733 | + archiver_list_spec=$lt_cv_ar_at_file |
2734 | +fi |
2735 | |
2736 | |
2737 | |
2738 | @@ -5913,7 +6190,7 @@ |
2739 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
2740 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2741 | $as_echo_n "checking for $ac_word... " >&6; } |
2742 | -if test "${ac_cv_prog_STRIP+set}" = set; then : |
2743 | +if ${ac_cv_prog_STRIP+:} false; then : |
2744 | $as_echo_n "(cached) " >&6 |
2745 | else |
2746 | if test -n "$STRIP"; then |
2747 | @@ -5953,7 +6230,7 @@ |
2748 | set dummy strip; ac_word=$2 |
2749 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2750 | $as_echo_n "checking for $ac_word... " >&6; } |
2751 | -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : |
2752 | +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : |
2753 | $as_echo_n "(cached) " >&6 |
2754 | else |
2755 | if test -n "$ac_ct_STRIP"; then |
2756 | @@ -6012,7 +6289,7 @@ |
2757 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 |
2758 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2759 | $as_echo_n "checking for $ac_word... " >&6; } |
2760 | -if test "${ac_cv_prog_RANLIB+set}" = set; then : |
2761 | +if ${ac_cv_prog_RANLIB+:} false; then : |
2762 | $as_echo_n "(cached) " >&6 |
2763 | else |
2764 | if test -n "$RANLIB"; then |
2765 | @@ -6052,7 +6329,7 @@ |
2766 | set dummy ranlib; ac_word=$2 |
2767 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2768 | $as_echo_n "checking for $ac_word... " >&6; } |
2769 | -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : |
2770 | +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : |
2771 | $as_echo_n "(cached) " >&6 |
2772 | else |
2773 | if test -n "$ac_ct_RANLIB"; then |
2774 | @@ -6123,6 +6400,18 @@ |
2775 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
2776 | fi |
2777 | |
2778 | +case $host_os in |
2779 | + darwin*) |
2780 | + lock_old_archive_extraction=yes ;; |
2781 | + *) |
2782 | + lock_old_archive_extraction=no ;; |
2783 | +esac |
2784 | + |
2785 | + |
2786 | + |
2787 | + |
2788 | + |
2789 | + |
2790 | |
2791 | |
2792 | |
2793 | @@ -6169,7 +6458,7 @@ |
2794 | # Check for command to grab the raw symbol name followed by C symbol from nm. |
2795 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 |
2796 | $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } |
2797 | -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : |
2798 | +if ${lt_cv_sys_global_symbol_pipe+:} false; then : |
2799 | $as_echo_n "(cached) " >&6 |
2800 | else |
2801 | |
2802 | @@ -6230,8 +6519,8 @@ |
2803 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
2804 | |
2805 | # Transform an extracted symbol line into symbol name and symbol address |
2806 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
2807 | -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
2808 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
2809 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
2810 | |
2811 | # Handle CRLF in mingw tool chain |
2812 | opt_cr= |
2813 | @@ -6267,6 +6556,7 @@ |
2814 | else |
2815 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
2816 | fi |
2817 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
2818 | |
2819 | # Check to see that the pipe works correctly. |
2820 | pipe_works=no |
2821 | @@ -6292,8 +6582,8 @@ |
2822 | test $ac_status = 0; }; then |
2823 | # Now try to grab the symbols. |
2824 | nlist=conftest.nm |
2825 | - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 |
2826 | - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 |
2827 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 |
2828 | + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 |
2829 | ac_status=$? |
2830 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2831 | test $ac_status = 0; } && test -s "$nlist"; then |
2832 | @@ -6308,6 +6598,18 @@ |
2833 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
2834 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
2835 | cat <<_LT_EOF > conftest.$ac_ext |
2836 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
2837 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
2838 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
2839 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
2840 | +# define LT_DLSYM_CONST |
2841 | +#elif defined(__osf__) |
2842 | +/* This system does not cope well with relocations in const data. */ |
2843 | +# define LT_DLSYM_CONST |
2844 | +#else |
2845 | +# define LT_DLSYM_CONST const |
2846 | +#endif |
2847 | + |
2848 | #ifdef __cplusplus |
2849 | extern "C" { |
2850 | #endif |
2851 | @@ -6319,7 +6621,7 @@ |
2852 | cat <<_LT_EOF >> conftest.$ac_ext |
2853 | |
2854 | /* The mapping between symbol names and symbols. */ |
2855 | -const struct { |
2856 | +LT_DLSYM_CONST struct { |
2857 | const char *name; |
2858 | void *address; |
2859 | } |
2860 | @@ -6345,8 +6647,8 @@ |
2861 | _LT_EOF |
2862 | # Now try linking the two files. |
2863 | mv conftest.$ac_objext conftstm.$ac_objext |
2864 | - lt_save_LIBS="$LIBS" |
2865 | - lt_save_CFLAGS="$CFLAGS" |
2866 | + lt_globsym_save_LIBS=$LIBS |
2867 | + lt_globsym_save_CFLAGS=$CFLAGS |
2868 | LIBS="conftstm.$ac_objext" |
2869 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
2870 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
2871 | @@ -6356,8 +6658,8 @@ |
2872 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
2873 | pipe_works=yes |
2874 | fi |
2875 | - LIBS="$lt_save_LIBS" |
2876 | - CFLAGS="$lt_save_CFLAGS" |
2877 | + LIBS=$lt_globsym_save_LIBS |
2878 | + CFLAGS=$lt_globsym_save_CFLAGS |
2879 | else |
2880 | echo "cannot find nm_test_func in $nlist" >&5 |
2881 | fi |
2882 | @@ -6394,22 +6696,71 @@ |
2883 | $as_echo "ok" >&6; } |
2884 | fi |
2885 | |
2886 | - |
2887 | - |
2888 | - |
2889 | - |
2890 | - |
2891 | - |
2892 | - |
2893 | - |
2894 | - |
2895 | - |
2896 | - |
2897 | - |
2898 | - |
2899 | - |
2900 | - |
2901 | - |
2902 | +# Response file support. |
2903 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
2904 | + nm_file_list_spec='@' |
2905 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
2906 | + nm_file_list_spec='@' |
2907 | +fi |
2908 | + |
2909 | + |
2910 | + |
2911 | + |
2912 | + |
2913 | + |
2914 | + |
2915 | + |
2916 | + |
2917 | + |
2918 | + |
2919 | + |
2920 | + |
2921 | + |
2922 | + |
2923 | + |
2924 | + |
2925 | + |
2926 | + |
2927 | + |
2928 | + |
2929 | + |
2930 | + |
2931 | + |
2932 | + |
2933 | + |
2934 | + |
2935 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
2936 | +$as_echo_n "checking for sysroot... " >&6; } |
2937 | + |
2938 | +# Check whether --with-sysroot was given. |
2939 | +if test "${with_sysroot+set}" = set; then : |
2940 | + withval=$with_sysroot; |
2941 | +else |
2942 | + with_sysroot=no |
2943 | +fi |
2944 | + |
2945 | + |
2946 | +lt_sysroot= |
2947 | +case ${with_sysroot} in #( |
2948 | + yes) |
2949 | + if test "$GCC" = yes; then |
2950 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
2951 | + fi |
2952 | + ;; #( |
2953 | + /*) |
2954 | + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` |
2955 | + ;; #( |
2956 | + no|'') |
2957 | + ;; #( |
2958 | + *) |
2959 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 |
2960 | +$as_echo "${with_sysroot}" >&6; } |
2961 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
2962 | + ;; |
2963 | +esac |
2964 | + |
2965 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
2966 | +$as_echo "${lt_sysroot:-no}" >&6; } |
2967 | |
2968 | |
2969 | |
2970 | @@ -6446,7 +6797,7 @@ |
2971 | ;; |
2972 | *-*-irix6*) |
2973 | # Find out which ABI we are using. |
2974 | - echo '#line 6449 "configure"' > conftest.$ac_ext |
2975 | + echo '#line '$LINENO' "configure"' > conftest.$ac_ext |
2976 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
2977 | (eval $ac_compile) 2>&5 |
2978 | ac_status=$? |
2979 | @@ -6540,7 +6891,7 @@ |
2980 | CFLAGS="$CFLAGS -belf" |
2981 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 |
2982 | $as_echo_n "checking whether the C compiler needs -belf... " >&6; } |
2983 | -if test "${lt_cv_cc_needs_belf+set}" = set; then : |
2984 | +if ${lt_cv_cc_needs_belf+:} false; then : |
2985 | $as_echo_n "(cached) " >&6 |
2986 | else |
2987 | ac_ext=c |
2988 | @@ -6608,6 +6959,123 @@ |
2989 | |
2990 | need_locks="$enable_libtool_lock" |
2991 | |
2992 | +if test -n "$ac_tool_prefix"; then |
2993 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
2994 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
2995 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2996 | +$as_echo_n "checking for $ac_word... " >&6; } |
2997 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : |
2998 | + $as_echo_n "(cached) " >&6 |
2999 | +else |
3000 | + if test -n "$MANIFEST_TOOL"; then |
3001 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
3002 | +else |
3003 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3004 | +for as_dir in $PATH |
3005 | +do |
3006 | + IFS=$as_save_IFS |
3007 | + test -z "$as_dir" && as_dir=. |
3008 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3009 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3010 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
3011 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3012 | + break 2 |
3013 | + fi |
3014 | +done |
3015 | + done |
3016 | +IFS=$as_save_IFS |
3017 | + |
3018 | +fi |
3019 | +fi |
3020 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
3021 | +if test -n "$MANIFEST_TOOL"; then |
3022 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
3023 | +$as_echo "$MANIFEST_TOOL" >&6; } |
3024 | +else |
3025 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3026 | +$as_echo "no" >&6; } |
3027 | +fi |
3028 | + |
3029 | + |
3030 | +fi |
3031 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
3032 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
3033 | + # Extract the first word of "mt", so it can be a program name with args. |
3034 | +set dummy mt; ac_word=$2 |
3035 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3036 | +$as_echo_n "checking for $ac_word... " >&6; } |
3037 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : |
3038 | + $as_echo_n "(cached) " >&6 |
3039 | +else |
3040 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
3041 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
3042 | +else |
3043 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3044 | +for as_dir in $PATH |
3045 | +do |
3046 | + IFS=$as_save_IFS |
3047 | + test -z "$as_dir" && as_dir=. |
3048 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3049 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3050 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
3051 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3052 | + break 2 |
3053 | + fi |
3054 | +done |
3055 | + done |
3056 | +IFS=$as_save_IFS |
3057 | + |
3058 | +fi |
3059 | +fi |
3060 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
3061 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
3062 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
3063 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
3064 | +else |
3065 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3066 | +$as_echo "no" >&6; } |
3067 | +fi |
3068 | + |
3069 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
3070 | + MANIFEST_TOOL=":" |
3071 | + else |
3072 | + case $cross_compiling:$ac_tool_warned in |
3073 | +yes:) |
3074 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3075 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3076 | +ac_tool_warned=yes ;; |
3077 | +esac |
3078 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
3079 | + fi |
3080 | +else |
3081 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
3082 | +fi |
3083 | + |
3084 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
3085 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
3086 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
3087 | +if ${lt_cv_path_mainfest_tool+:} false; then : |
3088 | + $as_echo_n "(cached) " >&6 |
3089 | +else |
3090 | + lt_cv_path_mainfest_tool=no |
3091 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
3092 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
3093 | + cat conftest.err >&5 |
3094 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
3095 | + lt_cv_path_mainfest_tool=yes |
3096 | + fi |
3097 | + rm -f conftest* |
3098 | +fi |
3099 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
3100 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
3101 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
3102 | + MANIFEST_TOOL=: |
3103 | +fi |
3104 | + |
3105 | + |
3106 | + |
3107 | + |
3108 | + |
3109 | |
3110 | case $host_os in |
3111 | rhapsody* | darwin*) |
3112 | @@ -6616,7 +7084,7 @@ |
3113 | set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 |
3114 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3115 | $as_echo_n "checking for $ac_word... " >&6; } |
3116 | -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : |
3117 | +if ${ac_cv_prog_DSYMUTIL+:} false; then : |
3118 | $as_echo_n "(cached) " >&6 |
3119 | else |
3120 | if test -n "$DSYMUTIL"; then |
3121 | @@ -6656,7 +7124,7 @@ |
3122 | set dummy dsymutil; ac_word=$2 |
3123 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3124 | $as_echo_n "checking for $ac_word... " >&6; } |
3125 | -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : |
3126 | +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : |
3127 | $as_echo_n "(cached) " >&6 |
3128 | else |
3129 | if test -n "$ac_ct_DSYMUTIL"; then |
3130 | @@ -6708,7 +7176,7 @@ |
3131 | set dummy ${ac_tool_prefix}nmedit; ac_word=$2 |
3132 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3133 | $as_echo_n "checking for $ac_word... " >&6; } |
3134 | -if test "${ac_cv_prog_NMEDIT+set}" = set; then : |
3135 | +if ${ac_cv_prog_NMEDIT+:} false; then : |
3136 | $as_echo_n "(cached) " >&6 |
3137 | else |
3138 | if test -n "$NMEDIT"; then |
3139 | @@ -6748,7 +7216,7 @@ |
3140 | set dummy nmedit; ac_word=$2 |
3141 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3142 | $as_echo_n "checking for $ac_word... " >&6; } |
3143 | -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : |
3144 | +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : |
3145 | $as_echo_n "(cached) " >&6 |
3146 | else |
3147 | if test -n "$ac_ct_NMEDIT"; then |
3148 | @@ -6800,7 +7268,7 @@ |
3149 | set dummy ${ac_tool_prefix}lipo; ac_word=$2 |
3150 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3151 | $as_echo_n "checking for $ac_word... " >&6; } |
3152 | -if test "${ac_cv_prog_LIPO+set}" = set; then : |
3153 | +if ${ac_cv_prog_LIPO+:} false; then : |
3154 | $as_echo_n "(cached) " >&6 |
3155 | else |
3156 | if test -n "$LIPO"; then |
3157 | @@ -6840,7 +7308,7 @@ |
3158 | set dummy lipo; ac_word=$2 |
3159 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3160 | $as_echo_n "checking for $ac_word... " >&6; } |
3161 | -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : |
3162 | +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : |
3163 | $as_echo_n "(cached) " >&6 |
3164 | else |
3165 | if test -n "$ac_ct_LIPO"; then |
3166 | @@ -6892,7 +7360,7 @@ |
3167 | set dummy ${ac_tool_prefix}otool; ac_word=$2 |
3168 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3169 | $as_echo_n "checking for $ac_word... " >&6; } |
3170 | -if test "${ac_cv_prog_OTOOL+set}" = set; then : |
3171 | +if ${ac_cv_prog_OTOOL+:} false; then : |
3172 | $as_echo_n "(cached) " >&6 |
3173 | else |
3174 | if test -n "$OTOOL"; then |
3175 | @@ -6932,7 +7400,7 @@ |
3176 | set dummy otool; ac_word=$2 |
3177 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3178 | $as_echo_n "checking for $ac_word... " >&6; } |
3179 | -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : |
3180 | +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : |
3181 | $as_echo_n "(cached) " >&6 |
3182 | else |
3183 | if test -n "$ac_ct_OTOOL"; then |
3184 | @@ -6984,7 +7452,7 @@ |
3185 | set dummy ${ac_tool_prefix}otool64; ac_word=$2 |
3186 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3187 | $as_echo_n "checking for $ac_word... " >&6; } |
3188 | -if test "${ac_cv_prog_OTOOL64+set}" = set; then : |
3189 | +if ${ac_cv_prog_OTOOL64+:} false; then : |
3190 | $as_echo_n "(cached) " >&6 |
3191 | else |
3192 | if test -n "$OTOOL64"; then |
3193 | @@ -7024,7 +7492,7 @@ |
3194 | set dummy otool64; ac_word=$2 |
3195 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3196 | $as_echo_n "checking for $ac_word... " >&6; } |
3197 | -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : |
3198 | +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : |
3199 | $as_echo_n "(cached) " >&6 |
3200 | else |
3201 | if test -n "$ac_ct_OTOOL64"; then |
3202 | @@ -7099,7 +7567,7 @@ |
3203 | |
3204 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 |
3205 | $as_echo_n "checking for -single_module linker flag... " >&6; } |
3206 | -if test "${lt_cv_apple_cc_single_mod+set}" = set; then : |
3207 | +if ${lt_cv_apple_cc_single_mod+:} false; then : |
3208 | $as_echo_n "(cached) " >&6 |
3209 | else |
3210 | lt_cv_apple_cc_single_mod=no |
3211 | @@ -7128,7 +7596,7 @@ |
3212 | $as_echo "$lt_cv_apple_cc_single_mod" >&6; } |
3213 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 |
3214 | $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } |
3215 | -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : |
3216 | +if ${lt_cv_ld_exported_symbols_list+:} false; then : |
3217 | $as_echo_n "(cached) " >&6 |
3218 | else |
3219 | lt_cv_ld_exported_symbols_list=no |
3220 | @@ -7158,6 +7626,38 @@ |
3221 | fi |
3222 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 |
3223 | $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } |
3224 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 |
3225 | +$as_echo_n "checking for -force_load linker flag... " >&6; } |
3226 | +if ${lt_cv_ld_force_load+:} false; then : |
3227 | + $as_echo_n "(cached) " >&6 |
3228 | +else |
3229 | + lt_cv_ld_force_load=no |
3230 | + cat > conftest.c << _LT_EOF |
3231 | +int forced_loaded() { return 2;} |
3232 | +_LT_EOF |
3233 | + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 |
3234 | + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
3235 | + echo "$AR cru libconftest.a conftest.o" >&5 |
3236 | + $AR cru libconftest.a conftest.o 2>&5 |
3237 | + echo "$RANLIB libconftest.a" >&5 |
3238 | + $RANLIB libconftest.a 2>&5 |
3239 | + cat > conftest.c << _LT_EOF |
3240 | +int main() { return 0;} |
3241 | +_LT_EOF |
3242 | + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 |
3243 | + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
3244 | + _lt_result=$? |
3245 | + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then |
3246 | + lt_cv_ld_force_load=yes |
3247 | + else |
3248 | + cat conftest.err >&5 |
3249 | + fi |
3250 | + rm -f conftest.err libconftest.a conftest conftest.c |
3251 | + rm -rf conftest.dSYM |
3252 | + |
3253 | +fi |
3254 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 |
3255 | +$as_echo "$lt_cv_ld_force_load" >&6; } |
3256 | case $host_os in |
3257 | rhapsody* | darwin1.[012]) |
3258 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
3259 | @@ -7185,7 +7685,7 @@ |
3260 | else |
3261 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
3262 | fi |
3263 | - if test "$DSYMUTIL" != ":"; then |
3264 | + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then |
3265 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
3266 | else |
3267 | _lt_dsymutil= |
3268 | @@ -7197,7 +7697,7 @@ |
3269 | do : |
3270 | ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default |
3271 | " |
3272 | -if test "x$ac_cv_header_dlfcn_h" = x""yes; then : |
3273 | +if test "x$ac_cv_header_dlfcn_h" = xyes; then : |
3274 | cat >>confdefs.h <<_ACEOF |
3275 | #define HAVE_DLFCN_H 1 |
3276 | _ACEOF |
3277 | @@ -7208,6 +7708,8 @@ |
3278 | |
3279 | |
3280 | |
3281 | + |
3282 | + |
3283 | # Set options |
3284 | |
3285 | |
3286 | @@ -7360,6 +7862,7 @@ |
3287 | |
3288 | |
3289 | |
3290 | + |
3291 | test -z "$LN_S" && LN_S="ln -s" |
3292 | |
3293 | |
3294 | @@ -7381,7 +7884,7 @@ |
3295 | |
3296 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 |
3297 | $as_echo_n "checking for objdir... " >&6; } |
3298 | -if test "${lt_cv_objdir+set}" = set; then : |
3299 | +if ${lt_cv_objdir+:} false; then : |
3300 | $as_echo_n "(cached) " >&6 |
3301 | else |
3302 | rm -f .libs 2>/dev/null |
3303 | @@ -7409,19 +7912,6 @@ |
3304 | |
3305 | |
3306 | |
3307 | - |
3308 | - |
3309 | - |
3310 | - |
3311 | - |
3312 | - |
3313 | - |
3314 | - |
3315 | - |
3316 | - |
3317 | - |
3318 | - |
3319 | - |
3320 | case $host_os in |
3321 | aix3*) |
3322 | # AIX sometimes has problems with the GCC collect2 program. For some |
3323 | @@ -7434,23 +7924,6 @@ |
3324 | ;; |
3325 | esac |
3326 | |
3327 | -# Sed substitution that helps us do robust quoting. It backslashifies |
3328 | -# metacharacters that are still active within double-quoted strings. |
3329 | -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' |
3330 | - |
3331 | -# Same as above, but do not quote variable references. |
3332 | -double_quote_subst='s/\(["`\\]\)/\\\1/g' |
3333 | - |
3334 | -# Sed substitution to delay expansion of an escaped shell variable in a |
3335 | -# double_quote_subst'ed string. |
3336 | -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
3337 | - |
3338 | -# Sed substitution to delay expansion of an escaped single quote. |
3339 | -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
3340 | - |
3341 | -# Sed substitution to avoid accidental globbing in evaled expressions |
3342 | -no_glob_subst='s/\*/\\\*/g' |
3343 | - |
3344 | # Global variables: |
3345 | ofile=libtool |
3346 | can_build_shared=yes |
3347 | @@ -7479,7 +7952,7 @@ |
3348 | *) break;; |
3349 | esac |
3350 | done |
3351 | -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
3352 | +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` |
3353 | |
3354 | |
3355 | # Only perform the check for file, if the check method requires it |
3356 | @@ -7489,7 +7962,7 @@ |
3357 | if test "$file_magic_cmd" = '$MAGIC_CMD'; then |
3358 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 |
3359 | $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } |
3360 | -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : |
3361 | +if ${lt_cv_path_MAGIC_CMD+:} false; then : |
3362 | $as_echo_n "(cached) " >&6 |
3363 | else |
3364 | case $MAGIC_CMD in |
3365 | @@ -7555,7 +8028,7 @@ |
3366 | if test -n "$ac_tool_prefix"; then |
3367 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 |
3368 | $as_echo_n "checking for file... " >&6; } |
3369 | -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : |
3370 | +if ${lt_cv_path_MAGIC_CMD+:} false; then : |
3371 | $as_echo_n "(cached) " >&6 |
3372 | else |
3373 | case $MAGIC_CMD in |
3374 | @@ -7688,11 +8161,16 @@ |
3375 | lt_prog_compiler_no_builtin_flag= |
3376 | |
3377 | if test "$GCC" = yes; then |
3378 | - lt_prog_compiler_no_builtin_flag=' -fno-builtin' |
3379 | + case $cc_basename in |
3380 | + nvcc*) |
3381 | + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; |
3382 | + *) |
3383 | + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; |
3384 | + esac |
3385 | |
3386 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 |
3387 | $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } |
3388 | -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : |
3389 | +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : |
3390 | $as_echo_n "(cached) " >&6 |
3391 | else |
3392 | lt_cv_prog_compiler_rtti_exceptions=no |
3393 | @@ -7708,15 +8186,15 @@ |
3394 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
3395 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
3396 | -e 's:$: $lt_compiler_flag:'` |
3397 | - (eval echo "\"\$as_me:7711: $lt_compile\"" >&5) |
3398 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
3399 | (eval "$lt_compile" 2>conftest.err) |
3400 | ac_status=$? |
3401 | cat conftest.err >&5 |
3402 | - echo "$as_me:7715: \$? = $ac_status" >&5 |
3403 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3404 | if (exit $ac_status) && test -s "$ac_outfile"; then |
3405 | # The compiler can only warn and ignore the option if not recognized |
3406 | # So say no if there are warnings other than the usual output. |
3407 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
3408 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
3409 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
3410 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
3411 | lt_cv_prog_compiler_rtti_exceptions=yes |
3412 | @@ -7745,8 +8223,6 @@ |
3413 | lt_prog_compiler_pic= |
3414 | lt_prog_compiler_static= |
3415 | |
3416 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
3417 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
3418 | |
3419 | if test "$GCC" = yes; then |
3420 | lt_prog_compiler_wl='-Wl,' |
3421 | @@ -7794,6 +8270,12 @@ |
3422 | lt_prog_compiler_pic='-fno-common' |
3423 | ;; |
3424 | |
3425 | + haiku*) |
3426 | + # PIC is the default for Haiku. |
3427 | + # The "-static" flag exists, but is broken. |
3428 | + lt_prog_compiler_static= |
3429 | + ;; |
3430 | + |
3431 | hpux*) |
3432 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
3433 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
3434 | @@ -7836,6 +8318,13 @@ |
3435 | lt_prog_compiler_pic='-fPIC' |
3436 | ;; |
3437 | esac |
3438 | + |
3439 | + case $cc_basename in |
3440 | + nvcc*) # Cuda Compiler Driver 2.2 |
3441 | + lt_prog_compiler_wl='-Xlinker ' |
3442 | + lt_prog_compiler_pic='-Xcompiler -fPIC' |
3443 | + ;; |
3444 | + esac |
3445 | else |
3446 | # PORTME Check for flag to pass linker flags through the system compiler. |
3447 | case $host_os in |
3448 | @@ -7898,7 +8387,13 @@ |
3449 | lt_prog_compiler_pic='--shared' |
3450 | lt_prog_compiler_static='--static' |
3451 | ;; |
3452 | - pgcc* | pgf77* | pgf90* | pgf95*) |
3453 | + nagfor*) |
3454 | + # NAG Fortran compiler |
3455 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
3456 | + lt_prog_compiler_pic='-PIC' |
3457 | + lt_prog_compiler_static='-Bstatic' |
3458 | + ;; |
3459 | + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
3460 | # Portland Group compilers (*not* the Pentium gcc compiler, |
3461 | # which looks to be a dead project) |
3462 | lt_prog_compiler_wl='-Wl,' |
3463 | @@ -7910,26 +8405,26 @@ |
3464 | # All Alpha code is PIC. |
3465 | lt_prog_compiler_static='-non_shared' |
3466 | ;; |
3467 | - xl*) |
3468 | - # IBM XL C 8.0/Fortran 10.1 on PPC |
3469 | + xl* | bgxl* | bgf* | mpixl*) |
3470 | + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene |
3471 | lt_prog_compiler_wl='-Wl,' |
3472 | lt_prog_compiler_pic='-qpic' |
3473 | lt_prog_compiler_static='-qstaticlink' |
3474 | ;; |
3475 | *) |
3476 | case `$CC -V 2>&1 | sed 5q` in |
3477 | + *Sun\ F* | *Sun*Fortran*) |
3478 | + # Sun Fortran 8.3 passes all unrecognized flags to the linker |
3479 | + lt_prog_compiler_pic='-KPIC' |
3480 | + lt_prog_compiler_static='-Bstatic' |
3481 | + lt_prog_compiler_wl='' |
3482 | + ;; |
3483 | *Sun\ C*) |
3484 | # Sun C 5.9 |
3485 | lt_prog_compiler_pic='-KPIC' |
3486 | lt_prog_compiler_static='-Bstatic' |
3487 | lt_prog_compiler_wl='-Wl,' |
3488 | ;; |
3489 | - *Sun\ F*) |
3490 | - # Sun Fortran 8.3 passes all unrecognized flags to the linker |
3491 | - lt_prog_compiler_pic='-KPIC' |
3492 | - lt_prog_compiler_static='-Bstatic' |
3493 | - lt_prog_compiler_wl='' |
3494 | - ;; |
3495 | esac |
3496 | ;; |
3497 | esac |
3498 | @@ -7960,7 +8455,7 @@ |
3499 | lt_prog_compiler_pic='-KPIC' |
3500 | lt_prog_compiler_static='-Bstatic' |
3501 | case $cc_basename in |
3502 | - f77* | f90* | f95*) |
3503 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
3504 | lt_prog_compiler_wl='-Qoption ld ';; |
3505 | *) |
3506 | lt_prog_compiler_wl='-Wl,';; |
3507 | @@ -8017,13 +8512,17 @@ |
3508 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
3509 | ;; |
3510 | esac |
3511 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
3512 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
3513 | - |
3514 | - |
3515 | - |
3516 | - |
3517 | - |
3518 | + |
3519 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
3520 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
3521 | +if ${lt_cv_prog_compiler_pic+:} false; then : |
3522 | + $as_echo_n "(cached) " >&6 |
3523 | +else |
3524 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
3525 | +fi |
3526 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
3527 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
3528 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
3529 | |
3530 | # |
3531 | # Check to make sure the PIC flag actually works. |
3532 | @@ -8031,7 +8530,7 @@ |
3533 | if test -n "$lt_prog_compiler_pic"; then |
3534 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 |
3535 | $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } |
3536 | -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : |
3537 | +if ${lt_cv_prog_compiler_pic_works+:} false; then : |
3538 | $as_echo_n "(cached) " >&6 |
3539 | else |
3540 | lt_cv_prog_compiler_pic_works=no |
3541 | @@ -8047,15 +8546,15 @@ |
3542 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
3543 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
3544 | -e 's:$: $lt_compiler_flag:'` |
3545 | - (eval echo "\"\$as_me:8050: $lt_compile\"" >&5) |
3546 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
3547 | (eval "$lt_compile" 2>conftest.err) |
3548 | ac_status=$? |
3549 | cat conftest.err >&5 |
3550 | - echo "$as_me:8054: \$? = $ac_status" >&5 |
3551 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3552 | if (exit $ac_status) && test -s "$ac_outfile"; then |
3553 | # The compiler can only warn and ignore the option if not recognized |
3554 | # So say no if there are warnings other than the usual output. |
3555 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
3556 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
3557 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
3558 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
3559 | lt_cv_prog_compiler_pic_works=yes |
3560 | @@ -8084,13 +8583,18 @@ |
3561 | |
3562 | |
3563 | |
3564 | + |
3565 | + |
3566 | + |
3567 | + |
3568 | + |
3569 | # |
3570 | # Check to make sure the static flag actually works. |
3571 | # |
3572 | wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" |
3573 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
3574 | $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } |
3575 | -if test "${lt_cv_prog_compiler_static_works+set}" = set; then : |
3576 | +if ${lt_cv_prog_compiler_static_works+:} false; then : |
3577 | $as_echo_n "(cached) " >&6 |
3578 | else |
3579 | lt_cv_prog_compiler_static_works=no |
3580 | @@ -8103,7 +8607,7 @@ |
3581 | if test -s conftest.err; then |
3582 | # Append any errors to the config.log. |
3583 | cat conftest.err 1>&5 |
3584 | - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
3585 | + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp |
3586 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
3587 | if diff conftest.exp conftest.er2 >/dev/null; then |
3588 | lt_cv_prog_compiler_static_works=yes |
3589 | @@ -8133,7 +8637,7 @@ |
3590 | |
3591 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 |
3592 | $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } |
3593 | -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : |
3594 | +if ${lt_cv_prog_compiler_c_o+:} false; then : |
3595 | $as_echo_n "(cached) " >&6 |
3596 | else |
3597 | lt_cv_prog_compiler_c_o=no |
3598 | @@ -8152,16 +8656,16 @@ |
3599 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
3600 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
3601 | -e 's:$: $lt_compiler_flag:'` |
3602 | - (eval echo "\"\$as_me:8155: $lt_compile\"" >&5) |
3603 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
3604 | (eval "$lt_compile" 2>out/conftest.err) |
3605 | ac_status=$? |
3606 | cat out/conftest.err >&5 |
3607 | - echo "$as_me:8159: \$? = $ac_status" >&5 |
3608 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3609 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
3610 | then |
3611 | # The compiler can only warn and ignore the option if not recognized |
3612 | # So say no if there are warnings |
3613 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
3614 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp |
3615 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
3616 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
3617 | lt_cv_prog_compiler_c_o=yes |
3618 | @@ -8188,7 +8692,7 @@ |
3619 | |
3620 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 |
3621 | $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } |
3622 | -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : |
3623 | +if ${lt_cv_prog_compiler_c_o+:} false; then : |
3624 | $as_echo_n "(cached) " >&6 |
3625 | else |
3626 | lt_cv_prog_compiler_c_o=no |
3627 | @@ -8207,16 +8711,16 @@ |
3628 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
3629 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
3630 | -e 's:$: $lt_compiler_flag:'` |
3631 | - (eval echo "\"\$as_me:8210: $lt_compile\"" >&5) |
3632 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
3633 | (eval "$lt_compile" 2>out/conftest.err) |
3634 | ac_status=$? |
3635 | cat out/conftest.err >&5 |
3636 | - echo "$as_me:8214: \$? = $ac_status" >&5 |
3637 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3638 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
3639 | then |
3640 | # The compiler can only warn and ignore the option if not recognized |
3641 | # So say no if there are warnings |
3642 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
3643 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp |
3644 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
3645 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
3646 | lt_cv_prog_compiler_c_o=yes |
3647 | @@ -8326,13 +8830,39 @@ |
3648 | openbsd*) |
3649 | with_gnu_ld=no |
3650 | ;; |
3651 | - linux* | k*bsd*-gnu) |
3652 | + linux* | k*bsd*-gnu | gnu*) |
3653 | link_all_deplibs=no |
3654 | ;; |
3655 | esac |
3656 | |
3657 | ld_shlibs=yes |
3658 | + |
3659 | + # On some targets, GNU ld is compatible enough with the native linker |
3660 | + # that we're better off using the native interface for both. |
3661 | + lt_use_gnu_ld_interface=no |
3662 | if test "$with_gnu_ld" = yes; then |
3663 | + case $host_os in |
3664 | + aix*) |
3665 | + # The AIX port of GNU ld has always aspired to compatibility |
3666 | + # with the native linker. However, as the warning in the GNU ld |
3667 | + # block says, versions before 2.19.5* couldn't really create working |
3668 | + # shared libraries, regardless of the interface used. |
3669 | + case `$LD -v 2>&1` in |
3670 | + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; |
3671 | + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; |
3672 | + *\ \(GNU\ Binutils\)\ [3-9]*) ;; |
3673 | + *) |
3674 | + lt_use_gnu_ld_interface=yes |
3675 | + ;; |
3676 | + esac |
3677 | + ;; |
3678 | + *) |
3679 | + lt_use_gnu_ld_interface=yes |
3680 | + ;; |
3681 | + esac |
3682 | + fi |
3683 | + |
3684 | + if test "$lt_use_gnu_ld_interface" = yes; then |
3685 | # If archive_cmds runs LD, not CC, wlarc should be empty |
3686 | wlarc='${wl}' |
3687 | |
3688 | @@ -8366,11 +8896,12 @@ |
3689 | ld_shlibs=no |
3690 | cat <<_LT_EOF 1>&2 |
3691 | |
3692 | -*** Warning: the GNU linker, at least up to release 2.9.1, is reported |
3693 | +*** Warning: the GNU linker, at least up to release 2.19, is reported |
3694 | *** to be unable to reliably create shared libraries on AIX. |
3695 | *** Therefore, libtool is disabling shared libraries support. If you |
3696 | -*** really care for shared libraries, you may want to modify your PATH |
3697 | -*** so that a non-GNU linker is found, and then restart. |
3698 | +*** really care for shared libraries, you may want to install binutils |
3699 | +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. |
3700 | +*** You will then need to restart the configuration process. |
3701 | |
3702 | _LT_EOF |
3703 | fi |
3704 | @@ -8406,10 +8937,12 @@ |
3705 | # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, |
3706 | # as there is no search path for DLLs. |
3707 | hardcode_libdir_flag_spec='-L$libdir' |
3708 | + export_dynamic_flag_spec='${wl}--export-all-symbols' |
3709 | allow_undefined_flag=unsupported |
3710 | always_export_symbols=no |
3711 | enable_shared_with_static_runtimes=yes |
3712 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
3713 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' |
3714 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
3715 | |
3716 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
3717 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
3718 | @@ -8427,6 +8960,11 @@ |
3719 | fi |
3720 | ;; |
3721 | |
3722 | + haiku*) |
3723 | + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3724 | + link_all_deplibs=yes |
3725 | + ;; |
3726 | + |
3727 | interix[3-9]*) |
3728 | hardcode_direct=no |
3729 | hardcode_shlibpath_var=no |
3730 | @@ -8452,15 +8990,16 @@ |
3731 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
3732 | && test "$tmp_diet" = no |
3733 | then |
3734 | - tmp_addflag= |
3735 | + tmp_addflag=' $pic_flag' |
3736 | tmp_sharedflag='-shared' |
3737 | case $cc_basename,$host_cpu in |
3738 | pgcc*) # Portland Group C compiler |
3739 | - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
3740 | + whole_archive_flag_spec='${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' |
3741 | tmp_addflag=' $pic_flag' |
3742 | ;; |
3743 | - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers |
3744 | - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
3745 | + pgf77* | pgf90* | pgf95* | pgfortran*) |
3746 | + # Portland Group f77 and f90 compilers |
3747 | + whole_archive_flag_spec='${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' |
3748 | tmp_addflag=' $pic_flag -Mnomain' ;; |
3749 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
3750 | tmp_addflag=' -i_dynamic' ;; |
3751 | @@ -8471,13 +9010,17 @@ |
3752 | lf95*) # Lahey Fortran 8.1 |
3753 | whole_archive_flag_spec= |
3754 | tmp_sharedflag='--shared' ;; |
3755 | - xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
3756 | + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
3757 | tmp_sharedflag='-qmkshrobj' |
3758 | tmp_addflag= ;; |
3759 | + nvcc*) # Cuda Compiler Driver 2.2 |
3760 | + whole_archive_flag_spec='${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' |
3761 | + compiler_needs_object=yes |
3762 | + ;; |
3763 | esac |
3764 | case `$CC -V 2>&1 | sed 5q` in |
3765 | *Sun\ C*) # Sun C 5.9 |
3766 | - whole_archive_flag_spec='${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' |
3767 | + whole_archive_flag_spec='${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' |
3768 | compiler_needs_object=yes |
3769 | tmp_sharedflag='-G' ;; |
3770 | *Sun\ F*) # Sun Fortran 8.3 |
3771 | @@ -8493,17 +9036,17 @@ |
3772 | fi |
3773 | |
3774 | case $cc_basename in |
3775 | - xlf*) |
3776 | + xlf* | bgf* | bgxlf* | mpixlf*) |
3777 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
3778 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
3779 | hardcode_libdir_flag_spec= |
3780 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
3781 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
3782 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
3783 | if test "x$supports_anon_versioning" = xyes; then |
3784 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
3785 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
3786 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
3787 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
3788 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
3789 | fi |
3790 | ;; |
3791 | esac |
3792 | @@ -8517,8 +9060,8 @@ |
3793 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
3794 | wlarc= |
3795 | else |
3796 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3797 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
3798 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3799 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
3800 | fi |
3801 | ;; |
3802 | |
3803 | @@ -8536,8 +9079,8 @@ |
3804 | |
3805 | _LT_EOF |
3806 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
3807 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3808 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
3809 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3810 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
3811 | else |
3812 | ld_shlibs=no |
3813 | fi |
3814 | @@ -8583,8 +9126,8 @@ |
3815 | |
3816 | *) |
3817 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
3818 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3819 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
3820 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3821 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
3822 | else |
3823 | ld_shlibs=no |
3824 | fi |
3825 | @@ -8624,8 +9167,10 @@ |
3826 | else |
3827 | # If we're using GNU nm, then we don't want the "-C" option. |
3828 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
3829 | + # Also, AIX nm treats weak defined symbols like other global |
3830 | + # defined symbols, whereas GNU nm marks them as "W". |
3831 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
3832 | - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3833 | + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3834 | else |
3835 | export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
3836 | fi |
3837 | @@ -8713,7 +9258,13 @@ |
3838 | allow_undefined_flag='-berok' |
3839 | # Determine the default libpath from the value encoded in an |
3840 | # empty executable. |
3841 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3842 | + if test "${lt_cv_aix_libpath+set}" = set; then |
3843 | + aix_libpath=$lt_cv_aix_libpath |
3844 | +else |
3845 | + if ${lt_cv_aix_libpath_+:} false; then : |
3846 | + $as_echo_n "(cached) " >&6 |
3847 | +else |
3848 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3849 | /* end confdefs.h. */ |
3850 | |
3851 | int |
3852 | @@ -8726,25 +9277,32 @@ |
3853 | _ACEOF |
3854 | if ac_fn_c_try_link "$LINENO"; then : |
3855 | |
3856 | -lt_aix_libpath_sed=' |
3857 | - /Import File Strings/,/^$/ { |
3858 | - /^0/ { |
3859 | - s/^0 *\(.*\)$/\1/ |
3860 | - p |
3861 | - } |
3862 | - }' |
3863 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
3864 | -# Check for a 64-bit object if we didn't find anything. |
3865 | -if test -z "$aix_libpath"; then |
3866 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
3867 | -fi |
3868 | + lt_aix_libpath_sed=' |
3869 | + /Import File Strings/,/^$/ { |
3870 | + /^0/ { |
3871 | + s/^0 *\([^ ]*\) *$/\1/ |
3872 | + p |
3873 | + } |
3874 | + }' |
3875 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
3876 | + # Check for a 64-bit object if we didn't find anything. |
3877 | + if test -z "$lt_cv_aix_libpath_"; then |
3878 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
3879 | + fi |
3880 | fi |
3881 | rm -f core conftest.err conftest.$ac_objext \ |
3882 | conftest$ac_exeext conftest.$ac_ext |
3883 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3884 | + if test -z "$lt_cv_aix_libpath_"; then |
3885 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
3886 | + fi |
3887 | + |
3888 | +fi |
3889 | + |
3890 | + aix_libpath=$lt_cv_aix_libpath_ |
3891 | +fi |
3892 | |
3893 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
3894 | - archive_expsym_cmds='$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" |
3895 | + archive_expsym_cmds='$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" |
3896 | else |
3897 | if test "$host_cpu" = ia64; then |
3898 | hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' |
3899 | @@ -8753,7 +9311,13 @@ |
3900 | else |
3901 | # Determine the default libpath from the value encoded in an |
3902 | # empty executable. |
3903 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3904 | + if test "${lt_cv_aix_libpath+set}" = set; then |
3905 | + aix_libpath=$lt_cv_aix_libpath |
3906 | +else |
3907 | + if ${lt_cv_aix_libpath_+:} false; then : |
3908 | + $as_echo_n "(cached) " >&6 |
3909 | +else |
3910 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3911 | /* end confdefs.h. */ |
3912 | |
3913 | int |
3914 | @@ -8766,30 +9330,42 @@ |
3915 | _ACEOF |
3916 | if ac_fn_c_try_link "$LINENO"; then : |
3917 | |
3918 | -lt_aix_libpath_sed=' |
3919 | - /Import File Strings/,/^$/ { |
3920 | - /^0/ { |
3921 | - s/^0 *\(.*\)$/\1/ |
3922 | - p |
3923 | - } |
3924 | - }' |
3925 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
3926 | -# Check for a 64-bit object if we didn't find anything. |
3927 | -if test -z "$aix_libpath"; then |
3928 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
3929 | -fi |
3930 | + lt_aix_libpath_sed=' |
3931 | + /Import File Strings/,/^$/ { |
3932 | + /^0/ { |
3933 | + s/^0 *\([^ ]*\) *$/\1/ |
3934 | + p |
3935 | + } |
3936 | + }' |
3937 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
3938 | + # Check for a 64-bit object if we didn't find anything. |
3939 | + if test -z "$lt_cv_aix_libpath_"; then |
3940 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
3941 | + fi |
3942 | fi |
3943 | rm -f core conftest.err conftest.$ac_objext \ |
3944 | conftest$ac_exeext conftest.$ac_ext |
3945 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
3946 | + if test -z "$lt_cv_aix_libpath_"; then |
3947 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
3948 | + fi |
3949 | + |
3950 | +fi |
3951 | + |
3952 | + aix_libpath=$lt_cv_aix_libpath_ |
3953 | +fi |
3954 | |
3955 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
3956 | # Warning - without using the other run time loading flags, |
3957 | # -berok will link without error, but may produce a broken library. |
3958 | no_undefined_flag=' ${wl}-bernotok' |
3959 | allow_undefined_flag=' ${wl}-berok' |
3960 | - # Exported symbols can be pulled into shared objects from archives |
3961 | - whole_archive_flag_spec='$convenience' |
3962 | + if test "$with_gnu_ld" = yes; then |
3963 | + # We only use this code for GNU lds that support --whole-archive. |
3964 | + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
3965 | + else |
3966 | + # Exported symbols can be pulled into shared objects from archives |
3967 | + whole_archive_flag_spec='$convenience' |
3968 | + fi |
3969 | archive_cmds_need_lc=yes |
3970 | # This is similar to how AIX traditionally builds its shared libraries. |
3971 | archive_expsym_cmds="\$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' |
3972 | @@ -8821,20 +9397,63 @@ |
3973 | # Microsoft Visual C++. |
3974 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
3975 | # no search path for DLLs. |
3976 | - hardcode_libdir_flag_spec=' ' |
3977 | - allow_undefined_flag=unsupported |
3978 | - # Tell ltmain to make .lib files, not .a files. |
3979 | - libext=lib |
3980 | - # Tell ltmain to make .dll files, not .so files. |
3981 | - shrext_cmds=".dll" |
3982 | - # FIXME: Setting linknames here is a bad hack. |
3983 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' |
3984 | - # The linker will automatically build a .lib file if we build a DLL. |
3985 | - old_archive_from_new_cmds='true' |
3986 | - # FIXME: Should let the user specify the lib program. |
3987 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
3988 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
3989 | - enable_shared_with_static_runtimes=yes |
3990 | + case $cc_basename in |
3991 | + cl*) |
3992 | + # Native MSVC |
3993 | + hardcode_libdir_flag_spec=' ' |
3994 | + allow_undefined_flag=unsupported |
3995 | + always_export_symbols=yes |
3996 | + file_list_spec='@' |
3997 | + # Tell ltmain to make .lib files, not .a files. |
3998 | + libext=lib |
3999 | + # Tell ltmain to make .dll files, not .so files. |
4000 | + shrext_cmds=".dll" |
4001 | + # FIXME: Setting linknames here is a bad hack. |
4002 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
4003 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
4004 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
4005 | + else |
4006 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
4007 | + fi~ |
4008 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
4009 | + linknames=' |
4010 | + # The linker will not automatically build a static lib if we build a DLL. |
4011 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
4012 | + enable_shared_with_static_runtimes=yes |
4013 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
4014 | + # Don't use ranlib |
4015 | + old_postinstall_cmds='chmod 644 $oldlib' |
4016 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
4017 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
4018 | + case $lt_outputfile in |
4019 | + *.exe|*.EXE) ;; |
4020 | + *) |
4021 | + lt_outputfile="$lt_outputfile.exe" |
4022 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
4023 | + ;; |
4024 | + esac~ |
4025 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
4026 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
4027 | + $RM "$lt_outputfile.manifest"; |
4028 | + fi' |
4029 | + ;; |
4030 | + *) |
4031 | + # Assume MSVC wrapper |
4032 | + hardcode_libdir_flag_spec=' ' |
4033 | + allow_undefined_flag=unsupported |
4034 | + # Tell ltmain to make .lib files, not .a files. |
4035 | + libext=lib |
4036 | + # Tell ltmain to make .dll files, not .so files. |
4037 | + shrext_cmds=".dll" |
4038 | + # FIXME: Setting linknames here is a bad hack. |
4039 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
4040 | + # The linker will automatically build a .lib file if we build a DLL. |
4041 | + old_archive_from_new_cmds='true' |
4042 | + # FIXME: Should let the user specify the lib program. |
4043 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
4044 | + enable_shared_with_static_runtimes=yes |
4045 | + ;; |
4046 | + esac |
4047 | ;; |
4048 | |
4049 | darwin* | rhapsody*) |
4050 | @@ -8844,7 +9463,11 @@ |
4051 | hardcode_direct=no |
4052 | hardcode_automatic=yes |
4053 | hardcode_shlibpath_var=unsupported |
4054 | - whole_archive_flag_spec='' |
4055 | + if test "$lt_cv_ld_force_load" = "yes"; then |
4056 | + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
4057 | + else |
4058 | + whole_archive_flag_spec='' |
4059 | + fi |
4060 | link_all_deplibs=yes |
4061 | allow_undefined_flag="$_lt_dar_allow_undefined" |
4062 | case $cc_basename in |
4063 | @@ -8852,7 +9475,7 @@ |
4064 | *) _lt_dar_can_shared=$GCC ;; |
4065 | esac |
4066 | if test "$_lt_dar_can_shared" = "yes"; then |
4067 | - output_verbose_link_cmd=echo |
4068 | + output_verbose_link_cmd=func_echo_all |
4069 | archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" |
4070 | module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
4071 | archive_expsym_cmds="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}" |
4072 | @@ -8895,7 +9518,7 @@ |
4073 | |
4074 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
4075 | freebsd* | dragonfly*) |
4076 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
4077 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
4078 | hardcode_libdir_flag_spec='-R$libdir' |
4079 | hardcode_direct=yes |
4080 | hardcode_shlibpath_var=no |
4081 | @@ -8903,7 +9526,7 @@ |
4082 | |
4083 | hpux9*) |
4084 | if test "$GCC" = yes; then |
4085 | - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4086 | + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4087 | else |
4088 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4089 | fi |
4090 | @@ -8918,8 +9541,8 @@ |
4091 | ;; |
4092 | |
4093 | hpux10*) |
4094 | - if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
4095 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4096 | + if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
4097 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4098 | else |
4099 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
4100 | fi |
4101 | @@ -8937,16 +9560,16 @@ |
4102 | ;; |
4103 | |
4104 | hpux11*) |
4105 | - if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
4106 | + if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
4107 | case $host_cpu in |
4108 | hppa*64*) |
4109 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4110 | ;; |
4111 | ia64*) |
4112 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
4113 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
4114 | ;; |
4115 | *) |
4116 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4117 | + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4118 | ;; |
4119 | esac |
4120 | else |
4121 | @@ -8958,7 +9581,46 @@ |
4122 | archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
4123 | ;; |
4124 | *) |
4125 | - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4126 | + |
4127 | + # Older versions of the 11.00 compiler do not understand -b yet |
4128 | + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) |
4129 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 |
4130 | +$as_echo_n "checking if $CC understands -b... " >&6; } |
4131 | +if ${lt_cv_prog_compiler__b+:} false; then : |
4132 | + $as_echo_n "(cached) " >&6 |
4133 | +else |
4134 | + lt_cv_prog_compiler__b=no |
4135 | + save_LDFLAGS="$LDFLAGS" |
4136 | + LDFLAGS="$LDFLAGS -b" |
4137 | + echo "$lt_simple_link_test_code" > conftest.$ac_ext |
4138 | + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then |
4139 | + # The linker can only warn and ignore the option if not recognized |
4140 | + # So say no if there are warnings |
4141 | + if test -s conftest.err; then |
4142 | + # Append any errors to the config.log. |
4143 | + cat conftest.err 1>&5 |
4144 | + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp |
4145 | + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
4146 | + if diff conftest.exp conftest.er2 >/dev/null; then |
4147 | + lt_cv_prog_compiler__b=yes |
4148 | + fi |
4149 | + else |
4150 | + lt_cv_prog_compiler__b=yes |
4151 | + fi |
4152 | + fi |
4153 | + $RM -r conftest* |
4154 | + LDFLAGS="$save_LDFLAGS" |
4155 | + |
4156 | +fi |
4157 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 |
4158 | +$as_echo "$lt_cv_prog_compiler__b" >&6; } |
4159 | + |
4160 | +if test x"$lt_cv_prog_compiler__b" = xyes; then |
4161 | + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
4162 | +else |
4163 | + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
4164 | +fi |
4165 | + |
4166 | ;; |
4167 | esac |
4168 | fi |
4169 | @@ -8986,26 +9648,39 @@ |
4170 | |
4171 | irix5* | irix6* | nonstopux*) |
4172 | if test "$GCC" = yes; then |
4173 | - archive_cmds='$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' |
4174 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4175 | # Try to use the -exported_symbol ld option, if it does not |
4176 | # work, assume that -exports_file does not work either and |
4177 | # implicitly export all symbols. |
4178 | - save_LDFLAGS="$LDFLAGS" |
4179 | - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
4180 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4181 | + # This should be the same for all languages, so no per-tag cache variable. |
4182 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
4183 | +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
4184 | +if ${lt_cv_irix_exported_symbol+:} false; then : |
4185 | + $as_echo_n "(cached) " >&6 |
4186 | +else |
4187 | + save_LDFLAGS="$LDFLAGS" |
4188 | + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
4189 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4190 | /* end confdefs.h. */ |
4191 | -int foo(void) {} |
4192 | +int foo (void) { return 0; } |
4193 | _ACEOF |
4194 | if ac_fn_c_try_link "$LINENO"; then : |
4195 | - archive_expsym_cmds='$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' |
4196 | - |
4197 | + lt_cv_irix_exported_symbol=yes |
4198 | +else |
4199 | + lt_cv_irix_exported_symbol=no |
4200 | fi |
4201 | rm -f core conftest.err conftest.$ac_objext \ |
4202 | conftest$ac_exeext conftest.$ac_ext |
4203 | - LDFLAGS="$save_LDFLAGS" |
4204 | + LDFLAGS="$save_LDFLAGS" |
4205 | +fi |
4206 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 |
4207 | +$as_echo "$lt_cv_irix_exported_symbol" >&6; } |
4208 | + if test "$lt_cv_irix_exported_symbol" = yes; then |
4209 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
4210 | + fi |
4211 | else |
4212 | - archive_cmds='$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' |
4213 | - archive_expsym_cmds='$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' |
4214 | + archive_cmds='$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' |
4215 | + archive_expsym_cmds='$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' |
4216 | fi |
4217 | archive_cmds_need_lc='no' |
4218 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
4219 | @@ -9067,17 +9742,17 @@ |
4220 | hardcode_libdir_flag_spec='-L$libdir' |
4221 | hardcode_minus_L=yes |
4222 | allow_undefined_flag=unsupported |
4223 | - archive_cmds='$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' |
4224 | + archive_cmds='$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' |
4225 | old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' |
4226 | ;; |
4227 | |
4228 | osf3*) |
4229 | if test "$GCC" = yes; then |
4230 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
4231 | - archive_cmds='$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' |
4232 | + archive_cmds='$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' |
4233 | else |
4234 | allow_undefined_flag=' -expect_unresolved \*' |
4235 | - archive_cmds='$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' |
4236 | + archive_cmds='$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' |
4237 | fi |
4238 | archive_cmds_need_lc='no' |
4239 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
4240 | @@ -9087,13 +9762,13 @@ |
4241 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
4242 | if test "$GCC" = yes; then |
4243 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
4244 | - archive_cmds='$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' |
4245 | + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
4246 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
4247 | else |
4248 | allow_undefined_flag=' -expect_unresolved \*' |
4249 | - archive_cmds='$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' |
4250 | + archive_cmds='$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' |
4251 | archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ |
4252 | - $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' |
4253 | + $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' |
4254 | |
4255 | # Both c and cxx compiler support -rpath directly |
4256 | hardcode_libdir_flag_spec='-rpath $libdir' |
4257 | @@ -9106,9 +9781,9 @@ |
4258 | no_undefined_flag=' -z defs' |
4259 | if test "$GCC" = yes; then |
4260 | wlarc='${wl}' |
4261 | - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4262 | + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4263 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
4264 | - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
4265 | + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
4266 | else |
4267 | case `$CC -V 2>&1` in |
4268 | *"Compilers 5.0"*) |
4269 | @@ -9296,44 +9971,50 @@ |
4270 | # to ld, don't add -lc before -lgcc. |
4271 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 |
4272 | $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } |
4273 | - $RM conftest* |
4274 | - echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
4275 | +if ${lt_cv_archive_cmds_need_lc+:} false; then : |
4276 | + $as_echo_n "(cached) " >&6 |
4277 | +else |
4278 | + $RM conftest* |
4279 | + echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
4280 | |
4281 | - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
4282 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
4283 | (eval $ac_compile) 2>&5 |
4284 | ac_status=$? |
4285 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4286 | test $ac_status = 0; } 2>conftest.err; then |
4287 | - soname=conftest |
4288 | - lib=conftest |
4289 | - libobjs=conftest.$ac_objext |
4290 | - deplibs= |
4291 | - wl=$lt_prog_compiler_wl |
4292 | - pic_flag=$lt_prog_compiler_pic |
4293 | - compiler_flags=-v |
4294 | - linker_flags=-v |
4295 | - verstring= |
4296 | - output_objdir=. |
4297 | - libname=conftest |
4298 | - lt_save_allow_undefined_flag=$allow_undefined_flag |
4299 | - allow_undefined_flag= |
4300 | - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 |
4301 | + soname=conftest |
4302 | + lib=conftest |
4303 | + libobjs=conftest.$ac_objext |
4304 | + deplibs= |
4305 | + wl=$lt_prog_compiler_wl |
4306 | + pic_flag=$lt_prog_compiler_pic |
4307 | + compiler_flags=-v |
4308 | + linker_flags=-v |
4309 | + verstring= |
4310 | + output_objdir=. |
4311 | + libname=conftest |
4312 | + lt_save_allow_undefined_flag=$allow_undefined_flag |
4313 | + allow_undefined_flag= |
4314 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 |
4315 | (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 |
4316 | ac_status=$? |
4317 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
4318 | test $ac_status = 0; } |
4319 | - then |
4320 | - archive_cmds_need_lc=no |
4321 | - else |
4322 | - archive_cmds_need_lc=yes |
4323 | - fi |
4324 | - allow_undefined_flag=$lt_save_allow_undefined_flag |
4325 | - else |
4326 | - cat conftest.err 1>&5 |
4327 | - fi |
4328 | - $RM conftest* |
4329 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 |
4330 | -$as_echo "$archive_cmds_need_lc" >&6; } |
4331 | + then |
4332 | + lt_cv_archive_cmds_need_lc=no |
4333 | + else |
4334 | + lt_cv_archive_cmds_need_lc=yes |
4335 | + fi |
4336 | + allow_undefined_flag=$lt_save_allow_undefined_flag |
4337 | + else |
4338 | + cat conftest.err 1>&5 |
4339 | + fi |
4340 | + $RM conftest* |
4341 | + |
4342 | +fi |
4343 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 |
4344 | +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } |
4345 | + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc |
4346 | ;; |
4347 | esac |
4348 | fi |
4349 | @@ -9504,16 +10185,23 @@ |
4350 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; |
4351 | *) lt_awk_arg="/^libraries:/" ;; |
4352 | esac |
4353 | - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
4354 | - if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then |
4355 | + case $host_os in |
4356 | + mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; |
4357 | + *) lt_sed_strip_eq="s,=/,/,g" ;; |
4358 | + esac |
4359 | + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` |
4360 | + case $lt_search_path_spec in |
4361 | + *\;*) |
4362 | # if the path contains ";" then we assume it to be the separator |
4363 | # otherwise default to the standard path separator (i.e. ":") - it is |
4364 | # assumed that no part of a normal pathname contains ";" but that should |
4365 | # okay in the real world where ";" in dirpaths is itself problematic. |
4366 | - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` |
4367 | - else |
4368 | - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
4369 | - fi |
4370 | + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` |
4371 | + ;; |
4372 | + *) |
4373 | + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` |
4374 | + ;; |
4375 | + esac |
4376 | # Ok, now we have the path, separated by spaces, we can step through it |
4377 | # and add multilib dir if necessary. |
4378 | lt_tmp_lt_search_path_spec= |
4379 | @@ -9526,7 +10214,7 @@ |
4380 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" |
4381 | fi |
4382 | done |
4383 | - lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' |
4384 | + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' |
4385 | BEGIN {RS=" "; FS="/|\n";} { |
4386 | lt_foo=""; |
4387 | lt_count=0; |
4388 | @@ -9546,7 +10234,13 @@ |
4389 | if (lt_foo != "") { lt_freq[lt_foo]++; } |
4390 | if (lt_freq[lt_foo] == 1) { print lt_foo; } |
4391 | }'` |
4392 | - sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` |
4393 | + # AWK program above erroneously prepends '/' to C:/dos/paths |
4394 | + # for these hosts. |
4395 | + case $host_os in |
4396 | + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ |
4397 | + $SED 's,/\([A-Za-z]:\),\1,g'` ;; |
4398 | + esac |
4399 | + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` |
4400 | else |
4401 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" |
4402 | fi |
4403 | @@ -9634,7 +10328,7 @@ |
4404 | m68k) |
4405 | library_names_spec='$libname.ixlibrary $libname.a' |
4406 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
4407 | - 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' |
4408 | + 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' |
4409 | ;; |
4410 | esac |
4411 | ;; |
4412 | @@ -9665,8 +10359,9 @@ |
4413 | need_version=no |
4414 | need_lib_prefix=no |
4415 | |
4416 | - case $GCC,$host_os in |
4417 | - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
4418 | + case $GCC,$cc_basename in |
4419 | + yes,*) |
4420 | + # gcc |
4421 | library_names_spec='$libname.dll.a' |
4422 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
4423 | postinstall_cmds='base_file=`basename \${file}`~ |
4424 | @@ -9687,36 +10382,83 @@ |
4425 | cygwin*) |
4426 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
4427 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
4428 | - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" |
4429 | + |
4430 | + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" |
4431 | ;; |
4432 | mingw* | cegcc*) |
4433 | # MinGW DLLs use traditional 'lib' prefix |
4434 | soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
4435 | - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
4436 | - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
4437 | - # It is most probably a Windows format PATH printed by |
4438 | - # mingw gcc, but we are running on Cygwin. Gcc prints its search |
4439 | - # path with ; separators, and with drive letters. We can handle the |
4440 | - # drive letters (cygwin fileutils understands them), so leave them, |
4441 | - # especially as we might pass files found there to a mingw objdump, |
4442 | - # which wouldn't understand a cygwinified path. Ahh. |
4443 | - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
4444 | - else |
4445 | - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
4446 | - fi |
4447 | ;; |
4448 | pw32*) |
4449 | # pw32 DLLs use 'pw' prefix rather than 'lib' |
4450 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
4451 | ;; |
4452 | esac |
4453 | + dynamic_linker='Win32 ld.exe' |
4454 | + ;; |
4455 | + |
4456 | + *,cl*) |
4457 | + # Native MSVC |
4458 | + libname_spec='$name' |
4459 | + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
4460 | + library_names_spec='${libname}.dll.lib' |
4461 | + |
4462 | + case $build_os in |
4463 | + mingw*) |
4464 | + sys_lib_search_path_spec= |
4465 | + lt_save_ifs=$IFS |
4466 | + IFS=';' |
4467 | + for lt_path in $LIB |
4468 | + do |
4469 | + IFS=$lt_save_ifs |
4470 | + # Let DOS variable expansion print the short 8.3 style file name. |
4471 | + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` |
4472 | + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" |
4473 | + done |
4474 | + IFS=$lt_save_ifs |
4475 | + # Convert to MSYS style. |
4476 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` |
4477 | + ;; |
4478 | + cygwin*) |
4479 | + # Convert to unix form, then to dos form, then back to unix form |
4480 | + # but this time dos style (no spaces!) so that the unix form looks |
4481 | + # like /cygdrive/c/PROGRA~1:/cygdr... |
4482 | + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` |
4483 | + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` |
4484 | + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
4485 | + ;; |
4486 | + *) |
4487 | + sys_lib_search_path_spec="$LIB" |
4488 | + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then |
4489 | + # It is most probably a Windows format PATH. |
4490 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
4491 | + else |
4492 | + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
4493 | + fi |
4494 | + # FIXME: find the short name or the path components, as spaces are |
4495 | + # common. (e.g. "Program Files" -> "PROGRA~1") |
4496 | + ;; |
4497 | + esac |
4498 | + |
4499 | + # DLL is installed to $(libdir)/../bin by postinstall_cmds |
4500 | + postinstall_cmds='base_file=`basename \${file}`~ |
4501 | + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ |
4502 | + dldir=$destdir/`dirname \$dlpath`~ |
4503 | + test -d \$dldir || mkdir -p \$dldir~ |
4504 | + $install_prog $dir/$dlname \$dldir/$dlname' |
4505 | + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ |
4506 | + dlpath=$dir/\$dldll~ |
4507 | + $RM \$dlpath' |
4508 | + shlibpath_overrides_runpath=yes |
4509 | + dynamic_linker='Win32 link.exe' |
4510 | ;; |
4511 | |
4512 | *) |
4513 | + # Assume MSVC wrapper |
4514 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
4515 | + dynamic_linker='Win32 ld.exe' |
4516 | ;; |
4517 | esac |
4518 | - dynamic_linker='Win32 ld.exe' |
4519 | # FIXME: first we should search . and the directory the executable is in |
4520 | shlibpath_var=PATH |
4521 | ;; |
4522 | @@ -9800,6 +10542,20 @@ |
4523 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
4524 | soname_spec='${libname}${release}${shared_ext}$major' |
4525 | shlibpath_var=LD_LIBRARY_PATH |
4526 | + shlibpath_overrides_runpath=no |
4527 | + hardcode_into_libs=yes |
4528 | + ;; |
4529 | + |
4530 | +haiku*) |
4531 | + version_type=linux |
4532 | + need_lib_prefix=no |
4533 | + need_version=no |
4534 | + dynamic_linker="$host_os runtime_loader" |
4535 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
4536 | + soname_spec='${libname}${release}${shared_ext}$major' |
4537 | + shlibpath_var=LIBRARY_PATH |
4538 | + shlibpath_overrides_runpath=yes |
4539 | + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' |
4540 | hardcode_into_libs=yes |
4541 | ;; |
4542 | |
4543 | @@ -9845,8 +10601,10 @@ |
4544 | soname_spec='${libname}${release}${shared_ext}$major' |
4545 | ;; |
4546 | esac |
4547 | - # HP-UX runs *really* slowly unless shared libraries are mode 555. |
4548 | + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... |
4549 | postinstall_cmds='chmod 555 $lib' |
4550 | + # or fails outright, so override atomically: |
4551 | + install_override_mode=555 |
4552 | ;; |
4553 | |
4554 | interix[3-9]*) |
4555 | @@ -9913,12 +10671,17 @@ |
4556 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
4557 | shlibpath_var=LD_LIBRARY_PATH |
4558 | shlibpath_overrides_runpath=no |
4559 | + |
4560 | # Some binutils ld are patched to set DT_RUNPATH |
4561 | - save_LDFLAGS=$LDFLAGS |
4562 | - save_libdir=$libdir |
4563 | - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ |
4564 | - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" |
4565 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4566 | + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : |
4567 | + $as_echo_n "(cached) " >&6 |
4568 | +else |
4569 | + lt_cv_shlibpath_overrides_runpath=no |
4570 | + save_LDFLAGS=$LDFLAGS |
4571 | + save_libdir=$libdir |
4572 | + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ |
4573 | + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" |
4574 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4575 | /* end confdefs.h. */ |
4576 | |
4577 | int |
4578 | @@ -9931,13 +10694,17 @@ |
4579 | _ACEOF |
4580 | if ac_fn_c_try_link "$LINENO"; then : |
4581 | if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : |
4582 | - shlibpath_overrides_runpath=yes |
4583 | + lt_cv_shlibpath_overrides_runpath=yes |
4584 | fi |
4585 | fi |
4586 | rm -f core conftest.err conftest.$ac_objext \ |
4587 | conftest$ac_exeext conftest.$ac_ext |
4588 | - LDFLAGS=$save_LDFLAGS |
4589 | - libdir=$save_libdir |
4590 | + LDFLAGS=$save_LDFLAGS |
4591 | + libdir=$save_libdir |
4592 | + |
4593 | +fi |
4594 | + |
4595 | + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath |
4596 | |
4597 | # This implies no fast_install, which is unacceptable. |
4598 | # Some rework will be needed to allow for fast_install |
4599 | @@ -9946,7 +10713,7 @@ |
4600 | |
4601 | # Append ld.so.conf contents to the search path |
4602 | if test -f /etc/ld.so.conf; then |
4603 | - 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' ' '` |
4604 | + 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' ' '` |
4605 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
4606 | fi |
4607 | |
4608 | @@ -10261,6 +11028,11 @@ |
4609 | |
4610 | |
4611 | |
4612 | + |
4613 | + |
4614 | + |
4615 | + |
4616 | + |
4617 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 |
4618 | $as_echo_n "checking how to hardcode library paths into programs... " >&6; } |
4619 | hardcode_action= |
4620 | @@ -10333,7 +11105,7 @@ |
4621 | # if libdl is installed we need to link against it |
4622 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 |
4623 | $as_echo_n "checking for dlopen in -ldl... " >&6; } |
4624 | -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : |
4625 | +if ${ac_cv_lib_dl_dlopen+:} false; then : |
4626 | $as_echo_n "(cached) " >&6 |
4627 | else |
4628 | ac_check_lib_save_LIBS=$LIBS |
4629 | @@ -10367,7 +11139,7 @@ |
4630 | fi |
4631 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 |
4632 | $as_echo "$ac_cv_lib_dl_dlopen" >&6; } |
4633 | -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : |
4634 | +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : |
4635 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" |
4636 | else |
4637 | |
4638 | @@ -10381,12 +11153,12 @@ |
4639 | |
4640 | *) |
4641 | ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" |
4642 | -if test "x$ac_cv_func_shl_load" = x""yes; then : |
4643 | +if test "x$ac_cv_func_shl_load" = xyes; then : |
4644 | lt_cv_dlopen="shl_load" |
4645 | else |
4646 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 |
4647 | $as_echo_n "checking for shl_load in -ldld... " >&6; } |
4648 | -if test "${ac_cv_lib_dld_shl_load+set}" = set; then : |
4649 | +if ${ac_cv_lib_dld_shl_load+:} false; then : |
4650 | $as_echo_n "(cached) " >&6 |
4651 | else |
4652 | ac_check_lib_save_LIBS=$LIBS |
4653 | @@ -10420,16 +11192,16 @@ |
4654 | fi |
4655 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 |
4656 | $as_echo "$ac_cv_lib_dld_shl_load" >&6; } |
4657 | -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : |
4658 | +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : |
4659 | lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" |
4660 | else |
4661 | ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" |
4662 | -if test "x$ac_cv_func_dlopen" = x""yes; then : |
4663 | +if test "x$ac_cv_func_dlopen" = xyes; then : |
4664 | lt_cv_dlopen="dlopen" |
4665 | else |
4666 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 |
4667 | $as_echo_n "checking for dlopen in -ldl... " >&6; } |
4668 | -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : |
4669 | +if ${ac_cv_lib_dl_dlopen+:} false; then : |
4670 | $as_echo_n "(cached) " >&6 |
4671 | else |
4672 | ac_check_lib_save_LIBS=$LIBS |
4673 | @@ -10463,12 +11235,12 @@ |
4674 | fi |
4675 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 |
4676 | $as_echo "$ac_cv_lib_dl_dlopen" >&6; } |
4677 | -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : |
4678 | +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : |
4679 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" |
4680 | else |
4681 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 |
4682 | $as_echo_n "checking for dlopen in -lsvld... " >&6; } |
4683 | -if test "${ac_cv_lib_svld_dlopen+set}" = set; then : |
4684 | +if ${ac_cv_lib_svld_dlopen+:} false; then : |
4685 | $as_echo_n "(cached) " >&6 |
4686 | else |
4687 | ac_check_lib_save_LIBS=$LIBS |
4688 | @@ -10502,12 +11274,12 @@ |
4689 | fi |
4690 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 |
4691 | $as_echo "$ac_cv_lib_svld_dlopen" >&6; } |
4692 | -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : |
4693 | +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : |
4694 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" |
4695 | else |
4696 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 |
4697 | $as_echo_n "checking for dld_link in -ldld... " >&6; } |
4698 | -if test "${ac_cv_lib_dld_dld_link+set}" = set; then : |
4699 | +if ${ac_cv_lib_dld_dld_link+:} false; then : |
4700 | $as_echo_n "(cached) " >&6 |
4701 | else |
4702 | ac_check_lib_save_LIBS=$LIBS |
4703 | @@ -10541,7 +11313,7 @@ |
4704 | fi |
4705 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 |
4706 | $as_echo "$ac_cv_lib_dld_dld_link" >&6; } |
4707 | -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : |
4708 | +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : |
4709 | lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" |
4710 | fi |
4711 | |
4712 | @@ -10582,7 +11354,7 @@ |
4713 | |
4714 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 |
4715 | $as_echo_n "checking whether a program can dlopen itself... " >&6; } |
4716 | -if test "${lt_cv_dlopen_self+set}" = set; then : |
4717 | +if ${lt_cv_dlopen_self+:} false; then : |
4718 | $as_echo_n "(cached) " >&6 |
4719 | else |
4720 | if test "$cross_compiling" = yes; then : |
4721 | @@ -10591,7 +11363,7 @@ |
4722 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
4723 | lt_status=$lt_dlunknown |
4724 | cat > conftest.$ac_ext <<_LT_EOF |
4725 | -#line 10594 "configure" |
4726 | +#line $LINENO "configure" |
4727 | #include "confdefs.h" |
4728 | |
4729 | #if HAVE_DLFCN_H |
4730 | @@ -10632,7 +11404,13 @@ |
4731 | # endif |
4732 | #endif |
4733 | |
4734 | -void fnord() { int i=42;} |
4735 | +/* When -fvisbility=hidden is used, assume the code has been annotated |
4736 | + correspondingly for the symbols needed. */ |
4737 | +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
4738 | +int fnord () __attribute__((visibility("default"))); |
4739 | +#endif |
4740 | + |
4741 | +int fnord () { return 42; } |
4742 | int main () |
4743 | { |
4744 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
4745 | @@ -10641,7 +11419,11 @@ |
4746 | if (self) |
4747 | { |
4748 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
4749 | - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
4750 | + else |
4751 | + { |
4752 | + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
4753 | + else puts (dlerror ()); |
4754 | + } |
4755 | /* dlclose (self); */ |
4756 | } |
4757 | else |
4758 | @@ -10678,7 +11460,7 @@ |
4759 | wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" |
4760 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 |
4761 | $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } |
4762 | -if test "${lt_cv_dlopen_self_static+set}" = set; then : |
4763 | +if ${lt_cv_dlopen_self_static+:} false; then : |
4764 | $as_echo_n "(cached) " >&6 |
4765 | else |
4766 | if test "$cross_compiling" = yes; then : |
4767 | @@ -10687,7 +11469,7 @@ |
4768 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
4769 | lt_status=$lt_dlunknown |
4770 | cat > conftest.$ac_ext <<_LT_EOF |
4771 | -#line 10690 "configure" |
4772 | +#line $LINENO "configure" |
4773 | #include "confdefs.h" |
4774 | |
4775 | #if HAVE_DLFCN_H |
4776 | @@ -10728,7 +11510,13 @@ |
4777 | # endif |
4778 | #endif |
4779 | |
4780 | -void fnord() { int i=42;} |
4781 | +/* When -fvisbility=hidden is used, assume the code has been annotated |
4782 | + correspondingly for the symbols needed. */ |
4783 | +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) |
4784 | +int fnord () __attribute__((visibility("default"))); |
4785 | +#endif |
4786 | + |
4787 | +int fnord () { return 42; } |
4788 | int main () |
4789 | { |
4790 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
4791 | @@ -10737,7 +11525,11 @@ |
4792 | if (self) |
4793 | { |
4794 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
4795 | - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
4796 | + else |
4797 | + { |
4798 | + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
4799 | + else puts (dlerror ()); |
4800 | + } |
4801 | /* dlclose (self); */ |
4802 | } |
4803 | else |
4804 | @@ -10969,7 +11761,7 @@ |
4805 | set dummy msgfmt; ac_word=$2 |
4806 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4807 | $as_echo_n "checking for $ac_word... " >&6; } |
4808 | -if test "${ac_cv_path_MSGFMT+set}" = set; then : |
4809 | +if ${ac_cv_path_MSGFMT+:} false; then : |
4810 | $as_echo_n "(cached) " >&6 |
4811 | else |
4812 | case "$MSGFMT" in |
4813 | @@ -11010,7 +11802,7 @@ |
4814 | set dummy gmsgfmt; ac_word=$2 |
4815 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4816 | $as_echo_n "checking for $ac_word... " >&6; } |
4817 | -if test "${ac_cv_path_GMSGFMT+set}" = set; then : |
4818 | +if ${ac_cv_path_GMSGFMT+:} false; then : |
4819 | $as_echo_n "(cached) " >&6 |
4820 | else |
4821 | case $GMSGFMT in |
4822 | @@ -11092,7 +11884,7 @@ |
4823 | set dummy xgettext; ac_word=$2 |
4824 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4825 | $as_echo_n "checking for $ac_word... " >&6; } |
4826 | -if test "${ac_cv_path_XGETTEXT+set}" = set; then : |
4827 | +if ${ac_cv_path_XGETTEXT+:} false; then : |
4828 | $as_echo_n "(cached) " >&6 |
4829 | else |
4830 | case "$XGETTEXT" in |
4831 | @@ -11170,7 +11962,7 @@ |
4832 | set dummy msgmerge; ac_word=$2 |
4833 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4834 | $as_echo_n "checking for $ac_word... " >&6; } |
4835 | -if test "${ac_cv_path_MSGMERGE+set}" = set; then : |
4836 | +if ${ac_cv_path_MSGMERGE+:} false; then : |
4837 | $as_echo_n "(cached) " >&6 |
4838 | else |
4839 | case "$MSGMERGE" in |
4840 | @@ -11219,7 +12011,7 @@ |
4841 | |
4842 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2 or newer" >&5 |
4843 | $as_echo_n "checking whether we are using the GNU C Library 2 or newer... " >&6; } |
4844 | -if test "${ac_cv_gnu_library_2+set}" = set; then : |
4845 | +if ${ac_cv_gnu_library_2+:} false; then : |
4846 | $as_echo_n "(cached) " >&6 |
4847 | else |
4848 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4849 | @@ -11255,7 +12047,7 @@ |
4850 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 |
4851 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4852 | $as_echo_n "checking for $ac_word... " >&6; } |
4853 | -if test "${ac_cv_prog_RANLIB+set}" = set; then : |
4854 | +if ${ac_cv_prog_RANLIB+:} false; then : |
4855 | $as_echo_n "(cached) " >&6 |
4856 | else |
4857 | if test -n "$RANLIB"; then |
4858 | @@ -11295,7 +12087,7 @@ |
4859 | set dummy ranlib; ac_word=$2 |
4860 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4861 | $as_echo_n "checking for $ac_word... " >&6; } |
4862 | -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : |
4863 | +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : |
4864 | $as_echo_n "(cached) " >&6 |
4865 | else |
4866 | if test -n "$ac_ct_RANLIB"; then |
4867 | @@ -11349,7 +12141,7 @@ |
4868 | if test -n "$GCC"; then |
4869 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5 |
4870 | $as_echo_n "checking for simple visibility declarations... " >&6; } |
4871 | - if test "${gl_cv_cc_visibility+set}" = set; then : |
4872 | + if ${gl_cv_cc_visibility+:} false; then : |
4873 | $as_echo_n "(cached) " >&6 |
4874 | else |
4875 | |
4876 | @@ -11395,7 +12187,7 @@ |
4877 | |
4878 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 |
4879 | $as_echo_n "checking for inline... " >&6; } |
4880 | -if test "${ac_cv_c_inline+set}" = set; then : |
4881 | +if ${ac_cv_c_inline+:} false; then : |
4882 | $as_echo_n "(cached) " >&6 |
4883 | else |
4884 | ac_cv_c_inline=no |
4885 | @@ -11436,7 +12228,7 @@ |
4886 | esac |
4887 | |
4888 | ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" |
4889 | -if test "x$ac_cv_type_size_t" = x""yes; then : |
4890 | +if test "x$ac_cv_type_size_t" = xyes; then : |
4891 | |
4892 | else |
4893 | |
4894 | @@ -11449,7 +12241,7 @@ |
4895 | |
4896 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint.h" >&5 |
4897 | $as_echo_n "checking for stdint.h... " >&6; } |
4898 | -if test "${gl_cv_header_stdint_h+set}" = set; then : |
4899 | +if ${gl_cv_header_stdint_h+:} false; then : |
4900 | $as_echo_n "(cached) " >&6 |
4901 | else |
4902 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4903 | @@ -11485,7 +12277,7 @@ |
4904 | # for constant arguments. Useless! |
4905 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 |
4906 | $as_echo_n "checking for working alloca.h... " >&6; } |
4907 | -if test "${ac_cv_working_alloca_h+set}" = set; then : |
4908 | +if ${ac_cv_working_alloca_h+:} false; then : |
4909 | $as_echo_n "(cached) " >&6 |
4910 | else |
4911 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4912 | @@ -11518,7 +12310,7 @@ |
4913 | |
4914 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 |
4915 | $as_echo_n "checking for alloca... " >&6; } |
4916 | -if test "${ac_cv_func_alloca_works+set}" = set; then : |
4917 | +if ${ac_cv_func_alloca_works+:} false; then : |
4918 | $as_echo_n "(cached) " >&6 |
4919 | else |
4920 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4921 | @@ -11537,7 +12329,7 @@ |
4922 | #pragma alloca |
4923 | # else |
4924 | # ifndef alloca /* predefined by HP cc +Olibcalls */ |
4925 | -char *alloca (); |
4926 | +void *alloca (size_t); |
4927 | # endif |
4928 | # endif |
4929 | # endif |
4930 | @@ -11581,7 +12373,7 @@ |
4931 | |
4932 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 |
4933 | $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } |
4934 | -if test "${ac_cv_os_cray+set}" = set; then : |
4935 | +if ${ac_cv_os_cray+:} false; then : |
4936 | $as_echo_n "(cached) " >&6 |
4937 | else |
4938 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4939 | @@ -11622,7 +12414,7 @@ |
4940 | |
4941 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 |
4942 | $as_echo_n "checking stack direction for C alloca... " >&6; } |
4943 | -if test "${ac_cv_c_stack_direction+set}" = set; then : |
4944 | +if ${ac_cv_c_stack_direction+:} false; then : |
4945 | $as_echo_n "(cached) " >&6 |
4946 | else |
4947 | if test "$cross_compiling" = yes; then : |
4948 | @@ -11697,7 +12489,7 @@ |
4949 | for ac_func in getpagesize |
4950 | do : |
4951 | ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" |
4952 | -if test "x$ac_cv_func_getpagesize" = x""yes; then : |
4953 | +if test "x$ac_cv_func_getpagesize" = xyes; then : |
4954 | cat >>confdefs.h <<_ACEOF |
4955 | #define HAVE_GETPAGESIZE 1 |
4956 | _ACEOF |
4957 | @@ -11707,7 +12499,7 @@ |
4958 | |
4959 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 |
4960 | $as_echo_n "checking for working mmap... " >&6; } |
4961 | -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then : |
4962 | +if ${ac_cv_func_mmap_fixed_mapped+:} false; then : |
4963 | $as_echo_n "(cached) " >&6 |
4964 | else |
4965 | if test "$cross_compiling" = yes; then : |
4966 | @@ -11875,7 +12667,7 @@ |
4967 | |
4968 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether integer division by zero raises SIGFPE" >&5 |
4969 | $as_echo_n "checking whether integer division by zero raises SIGFPE... " >&6; } |
4970 | -if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then : |
4971 | +if ${gt_cv_int_divbyzero_sigfpe+:} false; then : |
4972 | $as_echo_n "(cached) " >&6 |
4973 | else |
4974 | |
4975 | @@ -11966,7 +12758,7 @@ |
4976 | |
4977 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5 |
4978 | $as_echo_n "checking for inttypes.h... " >&6; } |
4979 | -if test "${gl_cv_header_inttypes_h+set}" = set; then : |
4980 | +if ${gl_cv_header_inttypes_h+:} false; then : |
4981 | $as_echo_n "(cached) " >&6 |
4982 | else |
4983 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4984 | @@ -12001,7 +12793,7 @@ |
4985 | |
4986 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 |
4987 | $as_echo_n "checking for unsigned long long int... " >&6; } |
4988 | -if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then : |
4989 | +if ${ac_cv_type_unsigned_long_long_int+:} false; then : |
4990 | $as_echo_n "(cached) " >&6 |
4991 | else |
4992 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4993 | @@ -12078,7 +12870,7 @@ |
4994 | for ac_header in inttypes.h |
4995 | do : |
4996 | ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" |
4997 | -if test "x$ac_cv_header_inttypes_h" = x""yes; then : |
4998 | +if test "x$ac_cv_header_inttypes_h" = xyes; then : |
4999 | cat >>confdefs.h <<_ACEOF |
5000 | #define HAVE_INTTYPES_H 1 |
-syn keyword upstartStatement umask nice oom chroot chdir exec
+syn keyword upstartStatement umask nice oom chroot chdir exec setiud setgid
Typo: setiud -> setuid.
+but with the
+.B --debug
+option.
\-\-debug here (it's correct elsewhere).
var = NIH_MUST (nih_sprintf (NULL, "%s=%s", key, entry_get_ value (list_entry))); entry_get_ value (list_entry))));
- udev_list_
+ copy_string (NULL, udev_list_
Isn't this a memory leak? Since copy_string is called with a NULL parent, it will (as I understand it) need to be freed either by calling nih_free explicitly or by assigning it to something that's nih_local. That doesn't seem to be done in this case. Admittedly, this is a bit less important in the udev bridge than in the init daemon proper.
+ /* If substitutions were necessary, shrink the string */
+ return i == j ? cleaned : nih_realloc (cleaned, parent, j + 1);
I'm surprised that it's worth the effort to realloc, given that the returned string is fairly short-lived.
(I'll continue after lunch.)