Codebase list gnome-panel / e51e4ab
Revert my WTF branch of an already branched package git-svn-id: svn://anonscm.debian.org/pkg-gnome/desktop/experimental/gnome-panel@17995 db0db5de-e4c8-0310-9441-90abf70311f7 Josselin Mouette 15 years ago
36 changed file(s) with 0 addition(s) and 26995 deletion(s). Raw diff Collapse all Expand all
+0
-18
gnome-panel/debian/README.Debian less more
0 gnome-panel for Debian
1 ----------------------
2
3
4 --- vfolder user menu ---
5 (Thanks to Bill Allombert)
6
7 If you want to get a customisable copy of the Debian menu,
8 you just need to to the following :
9 1) apt-get install menu-xdg
10 2) chmod +x /etc/menu-methods/gnome-vfolder-user
11 3) put your custom menu file in ~/.menu/
12 4) run update-menus as user (and rerun it each time you
13 make modifications to your menu files)
14
15
16 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Fri, 11 Mar 2005 02:59:43 +0100
17
+0
-2062
gnome-panel/debian/changelog less more
0 gnome-panel (2.20.3-6) UNRELEASED; urgency=low
1
2 [ Emilio Pozuelo Monfort ]
3 * debian/libpanel-applet2-doc.doc-base: fix section.
4
5 [ Loic Minier ]
6 * Use lt-nl when comparing versions instead of checking $2.
7
8 -- Emilio Pozuelo Monfort <pochu@ubuntu.com> Thu, 25 Sep 2008 00:05:25 +0200
9
10 gnome-panel (2.20.3-5) unstable; urgency=low
11
12 * 06_calendar_crashes.patch: stolen from upstream SVN. Fix several
13 crashes in the calendar applet. Closes: #484323.
14 * Relax the build-dependency on scrollkeeper.
15
16 -- Josselin Mouette <joss@debian.org> Tue, 03 Jun 2008 20:41:36 +0200
17
18 gnome-panel (2.20.3-4) unstable; urgency=low
19
20 * 04_logout-center.patch: stolen from upstream SVN. Center and focus
21 the logout dialog.
22
23 -- Josselin Mouette <joss@debian.org> Sun, 11 May 2008 02:21:54 +0200
24
25 gnome-panel (2.20.3-3) unstable; urgency=low
26
27 * 03_gnome-panel-logout.patch: correctly call gtk_main_quit to avoid
28 leaking processes, d’uh. Closes: #466070.
29
30 -- Josselin Mouette <joss@debian.org> Sat, 16 Feb 2008 17:52:30 +0100
31
32 gnome-panel (2.20.3-2) unstable; urgency=low
33
34 [ Loic Minier ]
35 * Update patch 60_caldav-clock-appointments to not use a colon for now, it
36 seems it's encoded in the URI in some way; closes: #454318, #462026,
37 #463780.
38
39 -- Josselin Mouette <joss@debian.org> Sat, 16 Feb 2008 03:03:36 +0100
40
41 gnome-panel (2.20.3-1) unstable; urgency=low
42
43 [ Loic Minier ]
44 * New patch, 60_caldav-clock-appointments, allows display of caldav://
45 calendars in clock applet; thanks Roland Mas; closes: #454318.
46
47 [ Josselin Mouette ]
48 * Switch to quilt for patch handling; build-depend on quilt.
49 * Refresh patches to apply cleanly.
50 * 03_gnome-panel-logout.patch: new patch; build a gnome-panel-logout
51 binary that can be used to invoke the logout window from other
52 programs.
53 * 70_relibtoolize.patch: relibtoolize the whole.
54 * 99_ltmain_as-needed.patch: updated to match the changes.
55
56 [ Sebastian Dröge ]
57 * New upstream release with translation updates only.
58 * 70_relibtoolize.patch: regenerated.
59 * Update Standards-Version to 3.7.3, no additional changes needed.
60
61 -- Sebastian Dröge <slomo@debian.org> Sat, 12 Jan 2008 06:56:51 +0100
62
63 gnome-panel (2.20.2-2) unstable; urgency=low
64
65 * debian/gnome-panel-data.postinst:
66 + Don't fail if removing a directory fails because it doesn't exist
67 (Closes: #453881).
68
69 -- Sebastian Dröge <slomo@debian.org> Sun, 02 Dec 2007 11:51:41 +0100
70
71 gnome-panel (2.20.2-1) unstable; urgency=low
72
73 [ Josselin Mouette ]
74 * gnome-panel-data.post*: cleanup.
75 * Remove the menu methods and everything related. Closes: #447474.
76 * gnome-panel-data.postinst: remove these files upon upgrade, and
77 purge /var/lib/gnome/Debian as well.
78
79 [ Sebastian Dröge ]
80 * New upstream bugfix release with translation updates.
81
82 -- Sebastian Dröge <slomo@debian.org> Sat, 01 Dec 2007 18:24:51 +0100
83
84 gnome-panel (2.20.1-1) unstable; urgency=low
85
86 * New upstream bugfix release.
87
88 -- Sebastian Dröge <slomo@debian.org> Tue, 30 Oct 2007 15:25:18 +0100
89
90 gnome-panel (2.20.0.1-3) unstable; urgency=low
91
92 * 02_switch-user_lock.patch: don't call gtk_window_get_screen on an
93 already destroyed object.
94
95 -- Josselin Mouette <joss@debian.org> Sat, 13 Oct 2007 00:13:54 +0200
96
97 gnome-panel (2.20.0.1-2) unstable; urgency=low
98
99 * 02_switch-user_lock.patch: new patch; lock screen when switching
100 user. Closes: #433259
101 * Don't run dh_makeshlibs for gnome-panel.
102
103 -- Josselin Mouette <joss@debian.org> Sun, 07 Oct 2007 04:16:59 +0200
104
105 gnome-panel (2.20.0.1-1) unstable; urgency=low
106
107 [ Josselin Mouette ]
108 * gnome-panel recommends alacarte (closes: #437320, #437335).
109
110 [ Sebastian Dröge ]
111 * New upstream release.
112 * Upload to unstable, drop check-dist include.
113 * debian/control.in:
114 + Add libglib2.0-dev (>= 2.13.0) dependency to the -dev package (taken
115 from Ubuntu).
116
117 [ Loic Minier ]
118 * Drop the version in the scrollkeeper dependency.
119
120 -- Loic Minier <lool@dooz.org> Sun, 23 Sep 2007 20:41:59 +0200
121
122 gnome-panel (2.19.5-1) experimental; urgency=low
123
124 * New upstream release series; these are development releases, the API may
125 still change incompatibly; no API change in this release though.
126 - Target at experimental; include check-dist.
127 - Build-dep on libglib2.0-dev (>= 2.13.0), bump up build-dep and dep on
128 libgtk2.0-dev to >= 2.11.3, bump up libwnck-dev build-dep to >= 2.19.5.
129 - Build-dep on evolution-data-server-dev for evolution-data-server-1.2.pc
130 and on libx11-dev for x11.pc.
131 - Drop patch 02_custom-launcher-icon, fixed differently upstream.
132 - Drop patch 06_gksu_time_admin and pass --with-clock-time-utility="gksu
133 time-admin" to configure instead.
134 - Bump shlibs to >= 2.19.3 (from Ubuntu).
135 - Update install files and drop obsolete libpanel-applet2-dbg.install.
136 * Include CDBS' utils.
137
138 -- Loic Minier <lool@dooz.org> Wed, 11 Jul 2007 15:06:37 +0200
139
140 gnome-panel (2.18.3-1) unstable; urgency=low
141
142 * New upstream stable release; no API change; bug fixes and translations.
143 * Don't pass --dbg-package to dh_strip as we build-dep on a cdbs >= 0.4.37.
144
145 -- Loic Minier <lool@dooz.org> Fri, 06 Jul 2007 22:34:43 +0200
146
147 gnome-panel (2.18.2-2) unstable; urgency=low
148
149 [ Josselin Mouette ]
150 * 06_gksu_time_admin.patch: check that the command called by gksu
151 exists (closes: #427714).
152 * 99_ltmain_as-needed.patch: get --as-needed back to work.
153
154 [ Guilherme de S. Pastore ]
155 * debian/control.in: revamp the package descriptions.
156
157 -- Guilherme de S. Pastore <gpastore@debian.org> Mon, 25 Jun 2007 23:00:00 -0300
158
159 gnome-panel (2.18.2-1) unstable; urgency=low
160
161 * New upstream stable release; no API change.
162 * Misc cleanups; drop obsolete snippets in maintainer scripts.
163
164 -- Loic Minier <lool@dooz.org> Mon, 28 May 2007 16:49:33 +0200
165
166 gnome-panel (2.18.1-2) unstable; urgency=low
167
168 [ Loic Minier ]
169 * Fix duplicate build-dep on libgnome-menu-dev.
170
171 [ Josselin Mouette ]
172 * Depend on gnome-icon-theme 2.18 (closes: #420553).
173
174 [ Loic Minier ]
175 * Downgrade the gnome-icon-theme dependency to a Recommends; other icon
176 themes work fine with gnome-panel 2.18.
177
178 [ Sebastian Dröge ]
179 * 01_panel_submenus.patch: Use correct menu file filenames to allow adding
180 submenus as menu to the panel (Closes: #422827). Thanks to Andreas Degert
181 for the patch.
182
183 [ Sven Arvidsson ]
184 * New patch, 06_gksu_time_admin; use gksu to launch time-admin; from Ubuntu
185 (Closes: #412074)
186
187 [ Josselin Mouette ]
188 * 02_custom-launcher-icon.patch: patch from Ubuntu to provide a
189 default icon for custom application launchers (closes: #422401).
190
191 -- Josselin Mouette <joss@debian.org> Sat, 19 May 2007 17:26:11 +0200
192
193 gnome-panel (2.18.1-1) unstable; urgency=low
194
195 [ Riccardo Setti ]
196 * New upstream release; no API change.
197 - Added libpango1.0-dev as build-dep.
198 - Built with --with-in-process-applets=all.
199 - Dropped 01_default-setup_evolution.patch, new version of evolution
200 doesn't ship a versioned .desktop file.
201 - Dropped 02_menu_initial_size.patch, applied upstream.
202
203 [ Loic Minier ]
204 * Add a libedataserver1.2-dev (>= 1.2.0) build-dep.
205 * New upstream stable release; no API change.
206 * Upload to unstable; drop check-dist include.
207 * Wrap build-deps and deps.
208 * Add a ${misc:Depends}.
209 * Only run update-gconf-defaults if it's available.
210 * Use http in copyright.
211 * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on
212 cdbs >= 0.4.41.
213 * Cleanups.
214 * Take advantage of the applets rename to stop shipping *.la files.
215
216 -- Loic Minier <lool@dooz.org> Sun, 22 Apr 2007 18:43:41 +0200
217
218 gnome-panel (2.16.3-1) experimental; urgency=low
219
220 [ Josselin Mouette ]
221 * Remove 04_menus_rename.patch.
222 * Build-depend on libgnome-menus-dev 2.16.1-1.
223 * 01_default-setup_evolution.patch: call evolution-2.8.desktop, as
224 evolution.desktop doesn't exist (closes: #404878).
225 * 02_menu_initial_size.patch: stolen from the SVN. Fix for the arrows
226 appearing in a menu when installing new applications. See Bugzilla
227 #331780.
228
229 [ Loic Minier ]
230 * Add a get-orig-source target to retrieve the upstream tarball.
231 * Include the new check-dist Makefile to prevent accidental uploads to
232 unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
233 * New upstream release; no API change.
234 - Drop patch 10_panel-transparency-after-resolution-change, merged
235 upstream.
236 * Bump up libgnomeui-dev build-dep to >= 2.16.0-2 to make the package
237 autobuildable.
238
239 -- Loic Minier <lool@dooz.org> Mon, 12 Mar 2007 11:42:00 +0100
240
241 gnome-panel (2.16.2-1) experimental; urgency=low
242
243 * New upstream release.
244 * Require intltool 0.35.0.
245 * Update build-dependencies and -dev dependencies.
246 * Build-depend on gtk-doc-tools.
247 * Generate less strict shlibs for the library.
248 * Rename the -dbg package to gnome-panel-dbg and include all debugging
249 symbols in this package.
250 * Switch to debhelper mode 5, build-depend accordingly.
251 * Don't generate cdbs build-depends automatically, thanks.
252 * Use ${gnome:Version} and ${gnome:NextVersion}.
253 * Call clean-la.mk and gnome-version.mk.
254 * Require gnome-pkg-tools 0.7.
255 * Regenerate the Debian manpages to remove French iso-8859-1 text.
256
257 -- Josselin Mouette <joss@debian.org> Sun, 3 Dec 2006 23:25:17 +0100
258
259 gnome-panel (2.14.3-3) unstable; urgency=low
260
261 * Sync with overrides: set libpanel-applet2-dbg's priority to extra.
262 * Fix upstream version computation to allow "-" in upstream versions.
263 * New patch, 10_panel-transparency-after-resolution-change, to fix wrong
264 geometry calculation of the root window after a resolution change which
265 broke gnome-panel transparency; taken from GNOME #353781; patch by
266 bugreports@nn7.de; thanks Soeren Sonnenburg.
267
268 -- Loic Minier <lool@dooz.org> Fri, 24 Nov 2006 14:31:19 +0100
269
270 gnome-panel (2.14.3-2) unstable; urgency=low
271
272 [ Josselin Mouette ]
273 * Move menu-xdg to a Depends: instead of a Recommends:
274 (closes: #322517).
275 Rationale: people who don't want the Debian menu can remove "menu"
276 and the "empty menu" bug has been fixed some time ago.
277
278 [ Loic Minier ]
279 * Only update-gconf-defaults on removal, not on purge. (Closes: #387925)
280 * Cleanup postinst and postrm.
281
282 -- Loic Minier <lool@dooz.org> Sun, 17 Sep 2006 21:11:15 +0200
283
284 gnome-panel (2.14.3-1) unstable; urgency=low
285
286 * New upstream release; no API changes.
287
288 -- Loic Minier <lool@dooz.org> Tue, 8 Aug 2006 11:05:53 +0200
289
290 gnome-panel (2.14.2-2) unstable; urgency=low
291
292 * Install default entries properly (closes: #369858).
293 + rules: move the entries to /usr/share/gconf/defaults.
294 + control.in: depend on gconf2 2.14.0-2 instead of ${misc:Depends}.
295 + Call update-gconf-defaults in postinst and postrm.
296 + gnome-panel-data.postinst: recursively unset the entries in /etc.
297 From now on, the administrator will be able to use this place to
298 customize the default panel layout.
299
300 -- Josselin Mouette <joss@debian.org> Thu, 3 Aug 2006 00:01:42 +0200
301
302 gnome-panel (2.14.2-1) unstable; urgency=low
303
304 [ Josselin Mouette ]
305 * Remove the dependency on this broken gamin package, and remove fam
306 as well as gnome-menus now use gnome-vfs as a backend
307 (closes: #349835, #367094, #351093).
308
309 [ Loic Minier ]
310 * Make gnome-panel Recommend evolution-data-server. (Closes: #372567)
311 * Drop the useless libnspr4-dev build-dep, thanks Steve Langasek.
312 [debian/control, debian/control.in]
313 * New upstream release.
314 - Bump up libgnomevfs2-dev build-dep to >= 2.14.2.
315 [debian/control, debian/control.in]
316 * Use ${binary:Version} instead of ${Source-Version}.
317 * Add ${misc:Depends}.
318 * Update watch file to track stable series.
319
320 -- Loic Minier <lool@dooz.org> Sat, 24 Jun 2006 11:14:15 +0200
321
322 gnome-panel (2.14.1-1) unstable; urgency=low
323
324 [ Guilherme de S. Pastore ]
325 * New upstream release.
326
327 * debian/control.in, debian/control:
328 - updated e-mail address.
329 - updated Standards-Version to 3.7.2.
330 - updated build dependencies according to configure.in.
331 - changed build-dep on libnspr-dev to libnspr4-dev to use xulrunner.
332
333 * debian/patches/06_sync_clear_documents.patch:
334 - dropped; libegg updated upstream.
335
336 * debian/patches/99_reautogenization.patch:
337 - dropped; the gnome-panel maintainer runs a Debian derivative.
338
339 [ Marco Cabizza ]
340 * debian/control.in:
341 - changed build-dep on deprecated libpng3-dev to libpng12-dev.
342
343 [ Ross Burton ]
344 * Build-depend on libecal1.2-dev, not libedata-cal1.2-dev
345
346 [ Josselin Mouette ]
347 * Make the package binNMU-safe.
348 - Build-depend on dpkg-dev 1.13.19.
349 - Use ${source:Version}.
350 * Remove a useless ${Source-Version}.
351
352 -- Guilherme de S. Pastore <gpastore@debian.org> Mon, 8 May 2006 15:54:43 -0300
353
354 gnome-panel (2.12.3-2) unstable; urgency=low
355
356 * Simple rebuild to get rid of references to Xcursor.la and Xrender.la.
357
358 -- Loic Minier <lool@dooz.org> Sun, 23 Apr 2006 21:31:36 +0200
359
360 gnome-panel (2.12.3-1) unstable; urgency=low
361
362 [ Guilherme de S. Pastore ]
363 * debian/control.in:
364 - General cleanups
365 - Added the alternative on x-terminal-emulator back, as gnome-panel
366 obeys the GNOME prefered applications settings.
367
368 [ Loic Minier ]
369 * Depend on gamin | fam since gnome-vfs deps are not enough to ensure it's
370 there. (Closes: #353164)
371 [debian/control, debian/control.in]
372
373 [ Sjoerd Simons ]
374 * New upstream release
375 * Let libpanel-applet2-dev depend on liborbit2-dev >= 2.12.4. It defines the
376 new ORBIT2_MAYBE_CONS macro the code generator uses. (Closes: #350883)
377 * debian/patches/99_reautogenization.patch
378 + Updated.
379
380 -- Sjoerd Simons <sjoerd@debian.org> Mon, 20 Feb 2006 22:56:36 +0100
381
382 gnome-panel (2.12.2-3) unstable; urgency=low
383
384 * Upload to unstable (Closes: #347881)
385
386 [ Josselin Mouette ]
387 * Suggest gnome-terminal only, as x-terminal-emulator won't be used
388 (closes: #291058).
389
390 -- Guilherme de S. Pastore <guilherme.pastore@terra.com.br> Fri, 13 Jan 2006 13:40:37 -0200
391
392 gnome-panel (2.12.2-2) experimental; urgency=low
393
394 * Build-depend on libedataserverui1.2-dev (>= 1.3.0), so control-center and
395 gnome-panel can't be build with conflicting e-d-s libraries.
396
397 -- Sjoerd Simons <sjoerd@debian.org> Tue, 27 Dec 2005 19:54:59 +0100
398
399 gnome-panel (2.12.2-1) experimental; urgency=low
400
401 * New upstream release
402 * debian/patches/02_panel-menu-items.c.patch:
403 - dropped; applied upstream
404 * Don't build on a separate directory, it breaks gnome-doc-utils
405
406 -- Guilherme de S. Pastore <guilherme.pastore@terra.com.br> Wed, 30 Nov 2005 14:30:20 -0200
407
408 gnome-panel (2.12.1-2) experimental; urgency=low
409
410 * New maintainer
411 Thanks for all your work, Marc!
412
413 * debian/patches/06_sync_clear_documents.patch:
414 - patch from upstream CVS to force update when Gamin/FAM
415 notification is not available (Closes: #319800, #330847)
416
417 -- Guilherme de S. Pastore <guilherme.pastore@terra.com.br> Fri, 11 Nov 2005 20:54:11 -0200
418
419 gnome-panel (2.12.1-1) experimental; urgency=low
420
421 [ Gustavo Noronha Silva ]
422 * New upstream release
423 * debian/patches/01_defaults_add_notifarea.patch,
424 debian/patches/02_clockapplet_reload_timezone.patch,
425 debian/patches/03_libpanel-applet_X11_link_missing.patch
426 - removed, applied upstream or fixed otherwise
427 * debian/patches/02_panel-menu-items.c.patch:
428 - added, from Ubuntu's package packaging patch, which added it
429 from GNOME's bugzilla #315322
430 * debian/patches/99_reautogenization.patch:
431 - updated with:
432 libtoolize -c -f --automake && aclocal-1.9 && autoheader && \
433 automake-1.9 -acf && autoconf && rm -rf autom4te.cache
434 * debian/patches/04_menus_rename.patch:
435 - updated
436 * debian/rules:
437 - disable scrollkeeper on build, based on Ubuntu's change
438 * debian/watch:
439 - updated for 2.12 major
440 * debian/control.in:
441 - updated Build-Depends according to Ubuntu's package and on the
442 upstream package's configure.in pkgconfig stuff
443
444 [ Guilherme de S. Pastore ]
445 * debian/control.in:
446 - moved menu-xdg from Suggests to Recommends (Closes: #315782)
447
448 [ Loic Minier ]
449 * Clarify "Copyright" versus "License".
450
451 -- Gustavo Noronha Silva <kov@debian.org> Sat, 29 Oct 2005 19:54:10 -0200
452
453 gnome-panel (2.10.2-2) UNRELEASED; urgency=low
454
455 * Menu transition, part 1 and 2: move from #!/usr/sbin/install-menu to
456 #!/usr/bin/install-menu. [debian/gnome-vfolder-user,
457 debian/gnome-panel-data.menu-method.experimental,
458 debian/gnome-panel-data.menu-method]
459
460 -- Loic Minier <lool@dooz.org> Thu, 20 Oct 2005 16:33:49 +0200
461
462 gnome-panel (2.10.2-1) unstable; urgency=low
463
464 * New upstream release
465 * Removed 06_fr_po_fix.patch now included upstream.
466 * Re-autogen-ized.
467 * Increased Standards-Version (no changes needed).
468
469 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Tue, 28 Jun 2005 23:30:00 +0200
470
471 gnome-panel (2.10.1-5) unstable; urgency=medium
472
473 * Don't overwrite DEB_CONFIGURE_SCRIPT_ENV completely.
474 * Remove most replaces and conflicts fields, they are unused now.
475 * gnome-panel only Recommends: gnome-session.
476 * gnome-panel-data only Recommends: gnome-panel (breaking a dependency
477 cycle).
478
479 -- Josselin Mouette <joss@debian.org> Sat, 25 Jun 2005 19:45:52 +0200
480
481 gnome-panel (2.10.1-4) unstable; urgency=low
482
483 * Replaced Suggests on menu by menu-xdg (Closes: #313011).
484 * Added patch to fix missing includes from Dann Frazier (Closes:
485 #314692).
486 * Fix fr translation s/Environnement de bureau/Bureau/ (from GNOME
487 CVS) (Closes: #313351).
488 * Now building in 'debian/build/' directory (cleaner).
489 * Pass --as-needed to LDFLAGS to reduce dependencies if possible.
490 * Disabled evolution-data-server support on Hurd (thanks to Michael
491 Banck).
492
493 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Sun, 19 Jun 2005 11:51:40 +0200
494
495 gnome-panel (2.10.1-3) unstable; urgency=low
496
497 * Upload to unstable (Closes: #312609).
498 * Added patch to solve menu files conflicts with other desktop
499 environnements (Closes: #307098) (thanks to seb128).
500 * Removed clean rule hack to work around #299010.
501
502 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Tue, 7 Jun 2005 23:44:00 +0200
503
504 gnome-panel (2.10.1-2) experimental; urgency=low
505
506 * Some more build-depends, depends, and suggests update (gnome-about
507 and new gnome-menus are now dependencies).
508 * Fixed in 2.10 branch :
509 + drawer does not open at the right place on dual-screen display
510 (Closes: #260480).
511 + click repeat rate in calendar view for clock applet is too fast
512 (Closes: #272885).
513 + panel won't scale some SVGs properly (Closes: #275215).
514 + translation error in pt-BR (Closes: #293656).
515 * Removed 'gnome-panel-screenshot' man page (command moved to gnome-
516 utils).
517 * Fixed stupid cut-and-paste mistake in 'debian/copyright'.
518
519 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Sun, 17 Apr 2005 02:25:16 +0200
520
521 gnome-panel (2.10.1-1) experimental; urgency=low
522
523 * New upstream release
524 * Removed the following patches now included upstream :
525 + 03_french_typo.patch
526 + 06_translation_silliness.patch
527 + 08_improved_run_in_term_speed.patch
528 * Mass build-depends and depends update.
529 * Patched libpanel-applet to correctly link with X11.
530 * Re-autogen-ized.
531 * Removed '/usr/share/gnome-panel' not used anymore in 'debian/gnome-
532 panel-data.install'.
533 * Updated 'debian/watch'.
534
535 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Sun, 10 Apr 2005 21:06:35 +0200
536
537 gnome-panel (2.8.3-1) unstable; urgency=medium
538
539 * Marc Dequènes:
540 + Rebuilt with fixed libgnomeui without non-free howl stuff
541 (Closes: #298887) (thus urgency).
542 + Used revised timezone patch for clock applet made by Stephen Gildea
543 (Closes: #294591).
544 + Made load of gconf config quiet (Closes: #293204).
545 + Readded 'userprefix' in menu-method as it broke 'favorites://' in
546 nautilus (Closes: #295091).
547 + Added a menu-method to produce a customisable Debian menu made by
548 Bill Allombert (not activated by default, see README.Debian)
549 (Closes: #259400).
550 * Sjoerd Simons:
551 + New upstream release
552 + debian/patches/07_empty_desktop_keys.patch
553 - Removed. Merged upstream.
554
555 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Sun, 13 Mar 2005 11:01:55 +0100
556
557 gnome-panel (2.8.2-2) unstable; urgency=medium
558
559 * urgency high because menu bug is very bad for sarge, and custom
560 lauchers are an important feature which is unfortunatly broken.
561 * menu : (thanks to Bill Allombert)
562 + updated suggests and added conflicts for nice woody transition
563 (Closes: #291085).
564 + removed unuseful 'userprefix' in menu-method.
565 * Added patches :
566 + custom lauchers fix from Sjoerd Simons (Closes: #291185).
567 + run-application typing completion speed improvements (from
568 gnomezilla) (Closes: #287120).
569 * Corrected doc-base index location (Closes: #285650).
570 * Corrected descriptions to please lintian.
571
572 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Fri, 28 Jan 2005 23:58:50 +0100
573
574 gnome-panel (2.8.2-1) unstable; urgency=low
575
576 * New upstream release :
577 + no longer respond to delete event (Closes: #254972).
578 * CDBS Tweaks.
579 * Regenerated '05_clockapplet_reload_timezone.patch'.
580 * Regenerated relibtoolize patch.
581 * Updated policy to 3.6.1.1 (no changes needed).
582 * Patched or and uk translations : some translators should _really_
583 learn how to read english.
584
585 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Fri, 10 Dec 2004 02:31:05 +0100
586
587 gnome-panel (2.8.1-2) unstable; urgency=low
588
589 * Upload to unstable.
590
591 -- Sebastien Bacher <seb128@debian.org> Fri, 19 Nov 2004 13:14:18 +0100
592
593 gnome-panel (2.8.1-1) experimental; urgency=low
594
595 * New upstream release.
596 * Removed '03_define_types.patch' not necessary anymore.
597 * Regenerated relibtoolize patch.
598 * Reintroduced '04_french_typo.patch' removed by mistake.
599
600 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Thu, 14 Oct 2004 01:28:31 +0200
601
602 gnome-panel (2.8.0.1-1) experimental; urgency=low
603
604 * New upstream release :
605 + clock applet : fixed padding on a 24px panel (Closes: #258323).
606 + fix panel orientation badly set/remembered (Closes: #216997).
607 + fix freakiness with autohiding and snap-to-screen-edge
608 (Closes: #255608).
609 * [JHM] Added devhelp doc symlink (Closes: #273491)
610 * Dropped '04_french_typo.patch' now included upstream.
611
612 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Sun, 3 Oct 2004 15:09:48 +0200
613
614 gnome-panel (2.8.0-2) experimental; urgency=low
615
616 * Version 2.8.0 corrects :
617 + run in terminal works again (Closes: #262487).
618 + custom launcher command browser was lacking navigation entries
619 (Closes: #254443).
620 * Enabled evolution-data-server support (Closes: #272061).
621 * Updated versions in 'debian/control'.
622
623 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Wed, 22 Sep 2004 00:50:02 +0200
624
625 gnome-panel (2.8.0-1) experimental; urgency=low
626
627 * New upstream release.
628 * Updated watch file.
629 * Regenerated relibtoolize patch.
630 * Made build idempotent (typo patch for 'po/fr.po' was causing
631 problems)
632 * Added 'autotools-dev' to build dependencies to take advantage of the
633 CDBS automatic 'config.*' management.
634
635 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Tue, 14 Sep 2004 21:16:42 +0200
636
637 gnome-panel (2.7.92-1) experimental; urgency=low
638
639 * New upstream release :
640 + correct pointer detection problem on multiscreen causing several
641 problems like autihiding not always working (Closes: #178710)
642 + new add applet dialog (Closes: #247982) (bug obsoleted)
643 * NOTICE : panel settings dialog was removed upstream, use gconf
644 editor instead.
645 * Build-Depends/Depends versions update (Closes: #261327).
646 * Ported changes from 2.6.2-2 & 2.6.2-3.
647 * Removed 03_po_gu_fix.patch now included upstream.
648 * Patch added to correct a typo in french translation (Closes:
649 #268618).
650 * Corrected quoting problem in description (Closes: #244071).
651 * Patch from gnomezilla to reload timezone in clock applet (Closes:
652 #61611).
653 * Regenerated relibtoolize patch.
654
655 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Sun, 12 Sep 2004 17:57:49 +0200
656
657 gnome-panel (2.7.91.1-1) experimental; urgency=low
658
659 * New upstream development release.
660 * [debian/control.in] Bumped libwnck build dependency as per configure.in.
661 * [debian/patches/02_relibtoolise.patch] Regenerated.
662 * [debian/gnome-panel-data.install] Removed
663 debian/tmp/usr/share/control-center-2.0 .
664 * [debian/rules] Ensure at build time that all symbols are resolvable; make
665 the linker work a bit harder to speed up dynamic loading.
666
667 -- J.H.M. Dassen (Ray) <jdassen@debian.org> Sat, 21 Aug 2004 13:22:47 +0200
668
669 gnome-panel (2.7.4.1-1) experimental; urgency=low
670
671 * New upstream release :
672 + updated translations (Closes: #247982, #247984).
673 * Regenerated relibtoolize patch.
674
675 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Wed, 21 Jul 2004 18:24:00 +0200
676
677 gnome-panel (2.7.3-1) experimental; urgency=low
678
679 * New upstream release
680 * Regenerated relibtoolize patch.
681
682 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Tue, 6 Jul 2004 14:38:10 +0200
683
684 gnome-panel (2.7.1-1) experimental; urgency=low
685
686 * New upstream release
687
688 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Thu, 24 Jun 2004 20:30:55 +0200
689
690 gnome-panel (2.6.2-1) unstable; urgency=low
691
692 * New upstream release.
693 * Updated some Build-Depends versions.
694 * Regenerated '02_relibtoolise.patch'.
695
696 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Sat, 19 Jun 2004 11:14:06 +0200
697
698 gnome-panel (2.6.1-4) unstable; urgency=low
699
700 * GNOME Team Upload.
701 * Upload in unstable.
702 * debian/control.in:
703 + Don't Build-Depends on evolution-data-server since this package is
704 not in unstable
705
706 -- Sebastien Bacher <seb128@debian.org> Wed, 26 May 2004 16:38:41 +0200
707
708 gnome-panel (2.6.1-3) experimental; urgency=low
709
710 * GNOME Team Upload.
711 * Rebuilt with new evolution-data-server (Closes: #250807).
712
713 -- Sebastien Bacher <seb128@debian.org> Tue, 25 May 2004 19:38:22 +0200
714
715 gnome-panel (2.6.1-2) experimental; urgency=low
716
717 * Added missing Build-Depends on 'libxmu-dev' (Closes: #247285).
718
719 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Thu, 20 May 2004 18:39:24 +0200
720
721 gnome-panel (2.6.1-1) experimental; urgency=low
722
723 * New upstream release :
724 - fixed visibility problem with solid-color background
725 (Closes: #179871).
726 * Recreated and split relibtoolize patch.
727 * Improved tight versioning rules.
728 * Deactivated gtk-doc documentation regeneration (see GNOME Policy on
729 Alioth for details).
730 * Removing all remaining 'Makefile' files in clean rule.
731
732 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Wed, 21 Apr 2004 02:47:43 +0200
733
734 gnome-panel (2.6.0-5) experimental; urgency=low
735
736 * Gustavo Noronha Silva:
737 - debian/gnome-panel-data.postinst:
738 + add a call to gconftool-2 to --load the .entries file which
739 contains the default panel configuration
740
741 -- Gustavo Noronha Silva <kov@debian.org> Thu, 15 Apr 2004 22:14:40 -0300
742
743 gnome-panel (2.6.0-4) experimental; urgency=low
744
745 * Added missing Replaces for 'libpanel-applet2-dev' on 'gnome-panel-
746 data' for 2.4->2.6 transition.
747 * J.H.M. Dassen (Ray):
748 - [debian/patches/01_relibtoolise.patch] New. Cut down direct
749 dependencies.
750 * Jordi Mallach:
751 - debian/control.in: build-depend on an epoched libglade2-dev.
752 - debian/rules: don't let clean fail if find returns error.
753
754 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Fri, 9 Apr 2004 04:02:26 +0200
755
756 gnome-panel (2.6.0-3) experimental; urgency=low
757
758 * Rebuilt to use 'evolution-data-server'.
759
760 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Mon, 29 Mar 2004 23:56:27 +0200
761
762 gnome-panel (2.6.0-2) experimental; urgency=low
763
764 * Corrected 'gnome-applet' tight dependency on 'libpanel-applet2-0'.
765 * Corrected missing Build-Depends on 'cdbs'.
766 * Updated Depends & Recommends.
767
768 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Sun, 28 Mar 2004 23:29:52 +0200
769
770 gnome-panel (2.6.0-1) experimental; urgency=low
771
772 * New Maintainer (Closes: 238884).
773 * New upstream release:
774 + fix X resource leak (Closes: #235903).
775 + fix auto-open behaviour for drawers (Closes: #216577).
776 * Switched to CDBS.
777 * Updated Uploaders and using the 'gnome-pkg-tools' pkg.
778 * Added some Replaces/Conflicts for smoother upgrade.
779 * Compatibility level switched to 4, and old patches were deactivated.
780 * Cleaned dirty 'debian/*' made by CM, now using simple and clean CDBS
781 rules and '*.install' files.
782 * Improved 'debian/copyright'.
783 * Removed now unused 'go.uue' to genrate 'go.png'.
784 * 'debian/control', 'debian/changelog' and 'debian/copyright' are now
785 UTF-8 encoded.
786
787 -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Sun, 28 Mar 2004 23:21:32 +0200
788
789 gnome-panel (2.4.2-4) unstable; urgency=low
790
791 * the right
792
793 -- Christian Marillat <marillat@debian.org> Fri, 19 Mar 2004 15:39:39 +0100
794
795 gnome-panel (2.4.2-3) unstable; urgency=low
796
797 * Remove DTD hack and update scrollkeeper dependency to 0.3.14-5
798 * Add outputencoding="UTF-8" in menu-method file (Closes: #230804)
799
800 -- Christian Marillat <marillat@debian.org> Sun, 8 Feb 2004 11:09:26 +0100
801
802 gnome-panel (2.4.2-2) unstable; urgency=low
803
804 * Suggests gnome-system-tools for gnome-panel, needed if you want to set
805 up the system time (Closes: #229043)
806
807 -- Christian Marillat <marillat@debian.org> Fri, 23 Jan 2004 11:52:49 +0100
808
809 gnome-panel (2.4.2-1) unstable; urgency=low
810
811 * New upstream release.
812 * Remove 05_manpage patch, included by upstream
813
814 -- Christian Marillat <marillat@debian.org> Fri, 16 Jan 2004 10:22:17 +0100
815
816 gnome-panel (2.4.1-7) unstable; urgency=low
817
818 * debian/prerm Unregister schemas file from the database.
819
820 -- Christian Marillat <marillat@debian.org> Fri, 9 Jan 2004 15:48:01 +0100
821
822 gnome-panel (2.4.1-6) unstable; urgency=low
823
824 * Add a version (>= 2.4.0) to the gnome-applets recommends (Closes: #223550)
825
826 -- Christian Marillat <marillat@debian.org> Wed, 31 Dec 2003 09:21:18 +0100
827
828 gnome-panel (2.4.1-5) unstable; urgency=low
829
830 * Add a -dbg package for libpanel-applet2 library (Closes: #220734)
831 * Add missing manpages.
832
833 -- Christian Marillat <marillat@debian.org> Sun, 7 Dec 2003 11:05:31 +0100
834
835 gnome-panel (2.4.1-4) unstable; urgency=low
836
837 * Panel should conflicts with metacity <= 2.6.0 (Closes: #217122)
838 * Patch from bugzilla to fix duplicate entries in the help message (Closes: #183130)
839 * debian/control update build-dependecies to GNOME 2.4 packages (Closes: #217497)
840
841 -- Christian Marillat <marillat@debian.org> Sat, 25 Oct 2003 09:54:07 +0200
842
843 gnome-panel (2.4.1-3) unstable; urgency=low
844
845 * Register default panel configuration with gconftool (Closes: #216600)
846
847 -- Christian Marillat <marillat@debian.org> Mon, 20 Oct 2003 01:19:20 +0200
848
849 gnome-panel (2.4.1-2) unstable; urgency=low
850
851 * gnome-panel-data should replaces gnome-desktop-data (Closes: #216458)
852 * Rebuild to remove liblinc dependency in the -dev package
853
854 -- Christian Marillat <marillat@debian.org> Sun, 19 Oct 2003 10:01:36 +0200
855
856 gnome-panel (2.4.1-1) unstable; urgency=low
857
858 * New upstream release.
859 * Should suggest a terminal emulator for the run program dialog (Closes: #214650)
860 * Don't need to depends on xbase-clients
861
862 -- Christian Marillat <marillat@debian.org> Sat, 18 Oct 2003 10:36:24 +0200
863
864 gnome-panel (2.2.2.2-2) unstable; urgency=low
865
866 * Change userprefix in menu-method. You can access user generated Debian
867 menus with favorites:/// in nautilus
868 * Use theme folder icons for Debian menus (Closes: #207494)
869 * New patch to fix manpage entry for gnome-panel (Closes: #212037)
870
871 -- Christian Marillat <marillat@debian.org> Sun, 21 Sep 2003 23:33:11 +0200
872
873 gnome-panel (2.2.2.2-1) unstable; urgency=low
874
875 * New upstream release.
876
877 -- Christian Marillat <marillat@debian.org> Tue, 15 Jul 2003 15:28:51 +0200
878
879 gnome-panel (2.2.2.1-2) unstable; urgency=low
880
881 * Patch 04_drawer.c to fix a panel crash when a new drawer is added
882 (Closes: #198695)
883
884 -- Christian Marillat <marillat@debian.org> Sat, 28 Jun 2003 14:35:49 +0200
885
886 gnome-panel (2.2.2.1-1) unstable; urgency=low
887
888 * New upstream release
889 * Add a gnome-control-center (>= 2.2.2) dependency (Closes: #198371)
890 * New patch (01) to fix broken translation in bn.po (Closes: #193635)
891
892 -- Christian Marillat <marillat@debian.org> Sun, 22 Jun 2003 15:44:58 +0200
893
894 gnome-panel (2.2.2-1) unstable; urgency=low
895
896 * New upstream release.
897
898 -- Christian Marillat <marillat@debian.org> Fri, 16 May 2003 17:45:28 +0200
899
900 gnome-panel (2.2.1-2) unstable; urgency=low
901
902 * Only add longtitle as tooltip in Debian menu (Closes: #186697)
903 * Update section
904 * Add go icon
905
906 -- Christian Marillat <marillat@debian.org> Sun, 13 Apr 2003 08:29:10 +0200
907
908 gnome-panel (2.2.1-1.1) unstable; urgency=low
909
910 * zero source change NMU to resolve problems on ia64 that binary NMU caused
911
912 -- Bdale Garbee <bdale@gag.com> Fri, 11 Apr 2003 02:13:24 -0600
913
914 gnome-panel (2.2.1-1) unstable; urgency=low
915
916 * New upstream release.
917 * Remove notification applet patch
918
919 -- Christian Marillat <marillat@debian.org> Tue, 11 Mar 2003 15:51:00 +0100
920
921 gnome-panel (2.2.0.1-2) unstable; urgency=low
922
923 * Patch to fix the notification applet crash (Closes: #180133)
924
925 -- Christian Marillat <marillat@debian.org> Mon, 17 Feb 2003 16:04:23 +0100
926
927 gnome-panel (2.2.0.1-1) unstable; urgency=low
928
929 * New upstream release.
930 * Remove replaces libpanel-applet-dev in the -dev package.
931
932 -- Christian Marillat <marillat@debian.org> Tue, 4 Feb 2003 14:36:28 +0100
933
934 gnome-panel (2.2.0-2) unstable; urgency=low
935
936 * Conflicts with system-tray-applet (Closes: #178278)
937 * Add versioned conflicts for gnome-core (Closes: #178401)
938
939 -- Christian Marillat <marillat@debian.org> Sat, 25 Jan 2003 23:52:18 +0100
940
941 gnome-panel (2.2.0-1) unstable; urgency=low
942
943 * New upstream release.
944
945 -- Christian Marillat <marillat@debian.org> Tue, 21 Jan 2003 15:33:47 +0100
946
947 gnome-panel (2.1.90.1-1) unstable; urgency=low
948
949 * New upstream release.
950 * Add a quick-lounge-applet (<= 0.98-1) conflicts, this applet crash the panel.
951 * Launcher are restored properly (Closes: #172385)
952 * Menu panel doesn't disappears (Closes: #172848)
953 * Fixes panel hogging the CPU when hide_delay and show_delay are zero (Closes: #174002)
954 * Fix inbox monitor randomly displays wildly inaccurate info (Closes: #168877)
955 * debian/control Add yelp and gnome2-user-guide in Suggests for the panel
956
957 -- Christian Marillat <marillat@debian.org> Sat, 18 Jan 2003 17:12:02 +0100
958
959 gnome-panel (2.0.11-3) unstable; urgency=low
960
961 * Bump Standards-Version to 3.5.8
962
963 -- Christian Marillat <marillat@debian.org> Sat, 28 Dec 2002 17:55:58 +0100
964
965 gnome-panel (2.0.11-2) unstable; urgency=low
966
967 * Move libpanel documentation in a -doc package (Closes: #171007)
968
969 -- Christian Marillat <marillat@debian.org> Fri, 20 Dec 2002 16:18:00 +0100
970
971 gnome-panel (2.0.11-1) unstable; urgency=low
972
973 * New upstream release.
974
975 -- Christian Marillat <marillat@debian.org> Fri, 15 Nov 2002 14:40:58 +0100
976
977 gnome-panel (2.0.10-2) unstable; urgency=low
978
979 * Upload to unstable
980 * Gnome-hints has been removed (Closes: #152335)
981 * Fix in clock update (Closes: #156401)
982 * Applets save their properties (Closes: #135569)
983 * No more buttons in the tasklist applet (Closes: #116205)
984 * Docklet has been removed (Closes: #137450)
985 * Launcher properties are now saved (Closes: #139827)
986 * Now menus are always sorted (Closes: #150649)
987 * kmail doesn't crash the panel (Closes: #146706)
988 * The tasklist isn't dynamic resizable (Closes: #89752)
989 * No more problem with windowmaker and the panel (Closes: #94592)
990 * No more duplicate entrie in the main menu (Closes: #97473)
991 * No more memory leak in the tasklist applet (Closes: #103880)
992 * Tasklist doen't display app titles (Closes: #112059)
993 * Netscape entry menu is fixed (Closes: #135992)
994 * No more "Fill window thumbnails" option in tasklist (Closes: #151134)
995 * Tooltips in the arrows panel are correctly displayed (Closes: #113642)
996 * Completion in run dialog work with ctrl-TAB (Closes: #75665)
997 * gmenu has been removed (Closes: #95014)
998 * menu have a mozilla entry (if mozilla is present) (Closes: #135993)
999 * Xemacs.desktop has been removed (Closes: #148500)
1000
1001 -- Christian Marillat <marillat@debian.org> Mon, 28 Oct 2002 16:08:15 +0100
1002
1003 gnome-panel (2.0.10-1) experimental; urgency=low
1004
1005 * New upstream release.
1006 * gnome-panel should depends on xbase-clients for xrdb
1007 * Add build-dependency for xbase-clients
1008
1009 -- Christian Marillat <marillat@debian.org> Mon, 14 Oct 2002 16:47:55 +0200
1010
1011 gnome-panel (2.0.9-4) experimental; urgency=low
1012
1013 * Upload with original tarball
1014
1015 -- Christian Marillat <marillat@debian.org> Sun, 29 Sep 2002 17:45:08 +0200
1016
1017 gnome-panel2 (2.0.9-3) experimental; urgency=low
1018
1019 * Upload without the 2 suffix
1020
1021 -- Christian Marillat <marillat@debian.org> Sat, 28 Sep 2002 18:46:17 +0200
1022
1023 gnome-panel2 (2.0.9-2) experimental; urgency=low
1024
1025 * Add libmpg3-dev in build-depends (Closes: #160758)
1026 * Update to standards version 3.5.7
1027 * -dev package should depends on the same lib version
1028
1029 -- Christian Marillat <marillat@debian.org> Mon, 16 Sep 2002 11:35:00 +0200
1030
1031 gnome-panel2 (2.0.9-1) experimental; urgency=low
1032
1033 * New upstream release.
1034 * Update lignome-ui-dev dependencies to 2.0.5-2
1035
1036 -- Christian Marillat <marillat@debian.org> Fri, 6 Sep 2002 13:50:51 +0200
1037
1038 gnome-panel2 (2.0.8-1) experimental; urgency=low
1039
1040 * New upstream release.
1041
1042 -- Christian Marillat <marillat@debian.org> Thu, 5 Sep 2002 19:00:46 +0200
1043
1044 gnome-panel2 (2.0.7-1) experimental; urgency=low
1045
1046 * New upstream release.
1047
1048 -- Christian Marillat <marillat@debian.org> Tue, 27 Aug 2002 11:19:52 +0200
1049
1050 gnome-panel2 (2.0.6-2) experimental; urgency=low
1051
1052 * Add scrollkeeper in build-depends
1053 * Build against the latest libgnomevfs2-dev 2.0.2-4
1054
1055 -- Christian Marillat <marillat@debian.org> Fri, 16 Aug 2002 17:36:42 +0200
1056
1057 gnome-panel2 (2.0.6-1) experimental; urgency=low
1058
1059 * New upstream release.
1060
1061 -- Christian Marillat <marillat@debian.org> Mon, 12 Aug 2002 19:44:49 +0200
1062
1063 gnome-panel2 (2.0.5-1) experimental; urgency=low
1064
1065 * New upstream release.
1066
1067 -- Christian Marillat <marillat@debian.org> Thu, 8 Aug 2002 16:46:21 +0200
1068
1069 gnome-panel2 (2.0.4-1) experimental; urgency=low
1070
1071 * New upstream release.
1072
1073 -- Christian Marillat <marillat@debian.org> Mon, 5 Aug 2002 19:35:26 +0200
1074
1075 gnome-panel2 (2.0.3-2) experimental; urgency=low
1076
1077 * Recompiled against the latest lignome-vfs to remove libssl dependency.
1078
1079 -- Christian Marillat <marillat@debian.org> Fri, 2 Aug 2002 17:14:51 +0200
1080
1081 gnome-panel2 (2.0.3-1) experimental; urgency=low
1082
1083 * New upstream release.
1084 * Remove gmenu entry in menu file (Closes: #153213)
1085 * debian/menu s/panel/gnome-panel/
1086
1087 -- Christian Marillat <marillat@debian.org> Tue, 30 Jul 2002 17:08:21 +0200
1088
1089 gnome-panel2 (2.0.2-1) experimental; urgency=low
1090
1091 * New upstream release.
1092
1093 -- Christian Marillat <marillat@debian.org> Mon, 15 Jul 2002 15:31:05 +0200
1094
1095 gnome-panel2 (2.0.1-1) experimental; urgency=low
1096
1097 * New upstream release.
1098
1099 -- Christian Marillat <marillat@debian.org> Mon, 17 Jun 2002 16:07:40 +0200
1100
1101 gnome-panel2 (2.0.0-1) experimental; urgency=low
1102
1103 * New upstream release.
1104 * Replace "Distribution menu" by "Debian menu"
1105
1106 -- Christian Marillat <marillat@debian.org> Mon, 10 Jun 2002 16:51:50 +0200
1107
1108 gnome-panel2 (1.5.24-2) experimental; urgency=low
1109
1110 * Build against the latest libraries.
1111
1112 -- Christian Marillat <marillat@debian.org> Sun, 9 Jun 2002 18:29:23 +0200
1113
1114 gnome-panel2 (1.5.24-1) experimental; urgency=low
1115
1116 * New upstream release.
1117 * Remove call to Internet DTD (Closes: #148899)
1118 * Call scrollkeeper-update in gnome-panel-data2.postrm
1119
1120 -- Christian Marillat <marillat@debian.org> Tue, 4 Jun 2002 17:22:35 +0200
1121
1122 gnome-panel2 (1.5.23-1) experimental; urgency=low
1123
1124 * New upstream release.
1125
1126 -- Christian Marillat <marillat@debian.org> Tue, 28 May 2002 15:51:18 +0200
1127
1128 gnome-panel2 (1.5.22-2) experimental; urgency=low
1129
1130 * debian/rules Add GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 in install target.
1131 * gnome-panel2 should depends on gnome-desktop-data
1132 * debian/gnome-panel-data2.postinst check if schemas files are present
1133 before calling gconftool-2
1134
1135 -- Christian Marillat <marillat@debian.org> Mon, 27 May 2002 16:01:57 +0200
1136
1137 gnome-panel2 (1.5.22-1) experimental; urgency=low
1138
1139 * New upstream release.
1140
1141 -- Christian Marillat <marillat@debian.org> Mon, 20 May 2002 21:58:18 +0200
1142
1143 gnome-panel2 (1.5.21-1) experimental; urgency=low
1144
1145 * New upstream release.
1146 * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and
1147 DEB_BUILD_OPTIONS
1148
1149 -- Christian Marillat <marillat@debian.org> Wed, 15 May 2002 20:39:24 +0200
1150
1151 gnome-panel2 (1.5.20-1) experimental; urgency=low
1152
1153 * New upstream release.
1154
1155 -- Christian Marillat <marillat@debian.org> Sun, 12 May 2002 14:25:08 +0200
1156
1157 gnome-panel2 (1.5.19-1) experimental; urgency=low
1158
1159 * New upstream release.
1160
1161 -- Christian Marillat <marillat@debian.org> Mon, 29 Apr 2002 20:51:20 +0200
1162
1163 gnome-panel2 (1.5.18-1) experimental; urgency=low
1164
1165 * New upstream release.
1166
1167 -- Christian Marillat <marillat@debian.org> Mon, 22 Apr 2002 16:41:41 +0200
1168
1169 gnome-panel2 (1.5.17-1) experimental; urgency=low
1170
1171 * New upstream release.
1172
1173 -- Christian Marillat <marillat@debian.org> Wed, 17 Apr 2002 15:46:23 +0200
1174
1175 gnome-panel2 (1.5.16-1) experimental; urgency=low
1176
1177 * New upstream release.
1178
1179 -- Christian Marillat <marillat@debian.org> Mon, 1 Apr 2002 22:40:37 +0200
1180
1181 gnome-panel2 (1.5.15-1) experimental; urgency=low
1182
1183 * New upstream release.
1184
1185 -- Christian Marillat <marillat@debian.org> Fri, 29 Mar 2002 17:01:04 +0100
1186
1187 gnome-panel2 (1.5.12-2) experimental; urgency=low
1188
1189 * Add libwnck-dev in build-depends (Closes: #137954)
1190
1191 -- Christian Marillat <marillat@debian.org> Wed, 13 Mar 2002 10:51:00 +0100
1192
1193 gnome-panel2 (1.5.12-1) experimental; urgency=low
1194
1195 * New upstream release.
1196
1197 -- Christian Marillat <marillat@debian.org> Tue, 5 Mar 2002 14:47:36 +0100
1198
1199 gnome-panel2 (1.5.11-1) experimental; urgency=low
1200
1201 * New upstream release.
1202
1203 -- Christian Marillat <marillat@debian.org> Tue, 26 Feb 2002 15:37:43 +0100
1204
1205 gnome-panel2 (1.5.10-2) experimental; urgency=low
1206
1207 * Replace gettext by intltoo in build-depends
1208
1209 -- Christian Marillat <marillat@debian.org> Mon, 25 Feb 2002 15:40:43 +0100
1210
1211 gnome-panel2 (1.5.10-1) experimental; urgency=low
1212
1213 * new upstream release.
1214
1215 -- Christian Marillat <marillat@debian.org> Mon, 18 Feb 2002 22:06:48 +0100
1216
1217 gnome-panel2 (1.5.9-1) experimental; urgency=low
1218
1219 * New upstream release.
1220
1221 -- Christian Marillat <marillat@debian.org> Fri, 15 Feb 2002 00:38:51 +0100
1222
1223 gnome-panel2 (1.5.7-1) experimental; urgency=low
1224
1225 * New upstrema release.
1226
1227 -- Christian Marillat <marillat@debian.org> Tue, 5 Feb 2002 14:41:01 +0100
1228
1229 gnome-core2 (1.5.4-1) experimental; urgency=low
1230
1231 * New upstream release.
1232
1233 -- Christian Marillat <marillat@debian.org> Sun, 20 Jan 2002 16:21:40 +0100
1234
1235 gnome-core (1.4.0.4-16) unstable; urgency=low
1236
1237 * Fix typo in gnome-terminal.wrapper (Closes: #127768)
1238 * Remove gnome-hint patche (Closes: #121390, #129184)
1239 * debian/control Replace libpng-dev by libpng2-dev in Build-Depends
1240 (Closes: #128377)
1241
1242 -- Christian Marillat <marillat@debian.org> Mon, 14 Jan 2002 15:04:52 +0100
1243
1244 gnome-core (1.4.0.4-15) unstable; urgency=low
1245
1246 * Build against the latest gnome-libs to update the libzvt2 dependency
1247 (Closes: #127309, #127271)
1248 * debian/control Replace libpng2-dev by libpng-dev in Build-Depends.
1249 * debian/control Build-depends on libzvt-dev (>= 1.4.1.2-9)
1250
1251 -- Christian Marillat <marillat@debian.org> Tue, 1 Jan 2002 15:27:43 +0100
1252
1253 gnome-core (1.4.0.4-14) unstable; urgency=low
1254
1255 * Fix typo in gnome-terminal.1 (Closes: #123073)
1256 * Fix base page for doc-base in libpanel-applet-dev package.
1257 * Fix typo in gnome-help documentation (Closes: #126566)
1258 * Apply patch to allows meta functionnality in gnome-terminal (Closes: #50427)
1259
1260 -- Christian Marillat <marillat@debian.org> Thu, 27 Dec 2001 14:47:36 +0100
1261
1262 gnome-core (1.4.0.4-13) unstable; urgency=low
1263
1264 * Default font for gnome-terminal is "fixed" only (Closes: #117126)
1265 * Patch against gnome-hint.c Don't use gettext for font descriptor
1266 (Closes: #116606)
1267 * Patch against gnome-about/Makefile.am to use new gdk_pixbuf include path
1268 (Closes: #120312)
1269 * Revert my change on logout.c Only root can shutdown/reboot from the
1270 panel (Closes: #119316, #120127)
1271
1272 -- Christian Marillat <marillat@debian.org> Tue, 20 Nov 2001 11:36:05 +0100
1273
1274 gnome-core (1.4.0.4-12) unstable; urgency=low
1275
1276 * gnome-wm honour --default-wm (Closes: #115668)
1277 * Build against the latest gnome-libs
1278
1279 -- Christian Marillat <marillat@debian.org> Sun, 21 Oct 2001 14:11:19 +0200
1280
1281 gnome-core (1.4.0.4-11) unstable; urgency=low
1282
1283 * debian/control lynx comeback in Recommends (Closes: #114142)
1284 * debian/control replaces xml-i18n-tools by intltool (Closes: #115024)
1285 * Fix automake 1.5 errors. Thanks to Denis Barbier (Closes: #114369)
1286 * Build against the latest orbit (Closes: #115309)
1287
1288 -- Christian Marillat <marillat@debian.org> Fri, 12 Oct 2001 10:46:49 +0200
1289
1290 gnome-core (1.4.0.4-10) unstable; urgency=low
1291
1292 * Fix typo in panel/panel.hints (Closes: #113590)
1293 * Replace lynx by w3m (Closes: #113613)
1294 * Move gnome-terminal.desktop in gnome-terminal package (Closes: #113736)
1295 * Move gnome-help.desktop in gnome-help package
1296 * debian:control Add Replaces: gnome-panel-data (<= 1.4.0.4-9) for above
1297 * Patch against gsm/logout.c Now you can reboot/halt your machine from the
1298 panel. This only work for root, because shutdown doesn't understand the
1299 -a option. Read README.debian in gnome-panel package.
1300 * debian/rules Remove less files in clean target (Closes: #114020)
1301
1302 -- Christian Marillat <marillat@debian.org> Mon, 1 Oct 2001 11:34:06 +0200
1303
1304 gnome-core (1.4.0.4-9) unstable; urgency=low
1305
1306 * Add Debian menu for panel and gmenu (Closes: #112176)
1307 * Remove /var/lib/gnome on purge (Closes: #113005)
1308 * Remove /etc/gnome/config on purge (Closes: #112994)
1309 * Remove /etc/gnome on purge (Closes: #112995)
1310 * debian/control replace cygnus-stylesheets by docbook-utils
1311
1312 -- Christian Marillat <marillat@debian.org> Mon, 24 Sep 2001 18:39:19 +0200
1313
1314 gnome-core (1.4.0.4-8) unstable; urgency=high
1315
1316 * High urgency, because the current release in testing has a missing
1317 dependency on libpanel-applet0 and the panel package doesn't work if
1318 libpanel-applet0 isn't installed (Closes: #111517)
1319 * debian/control for gnome-help, move lynx from depends to recommends
1320 (Closes: #109652)
1321 * debian/control gnome-panel suggests fortune-mod (Closes: #110865)
1322 * debian/control gnome-help suggests gnome-users-guide not
1323 gnome-users-guide-en (Closes: #111200)
1324 * Don't change cursor color (Closes: #97697)
1325 * Change default font for gnome-terminal (Closes: #111319)
1326
1327 -- Christian Marillat <marillat@debian.org> Fri, 7 Sep 2001 15:06:07 +0200
1328
1329 gnome-core (1.4.0.4-7) unstable; urgency=low
1330
1331 * Fix path in gnome-session.1 (Closes: #107724)
1332 * debian/*.sgml Use docbook 4.1
1333 * debian/control gnome-help-data Replaces gnome-terminal (<= 1.0.55-2)
1334 (CLoses: #107948)
1335
1336 -- Christian Marillat <marillat@debian.org> Wed, 8 Aug 2001 08:07:56 +0200
1337
1338 gnome-core (1.4.0.4-6) unstable; urgency=low
1339
1340 * debian/rules for dh_makeshlibs replace libcapplet0 by libpanel-applet0
1341 (Closes: #105772)
1342
1343 -- Christian Marillat <marillat@debian.org> Wed, 18 Jul 2001 19:02:59 +0200
1344
1345 gnome-core (1.4.0.4-5) unstable; urgency=low
1346
1347 * Patch against gnome-edit to use EDITOR if the default gnome editor is
1348 unavailable.
1349 * Remove gnome-wm patch, and move the patched file in debian/
1350 * debian/gnome-wm Try to exec $WINDOW_MANAGER before x-window-manager
1351 (Closes: #103430
1352 * New patch from Michael Urman to hide task names in tasklist_applet
1353 (Closes: #104587)
1354
1355 -- Christian Marillat <marillat@debian.org> Sat, 14 Jul 2001 16:58:12 +0200
1356
1357 gnome-core (1.4.0.4-4) unstable; urgency=low
1358
1359 * Gnome-help Provides: man-browser, www-browser, info-browser
1360 * Switch to debhelper V3
1361 * Change libraries versionning to (>= 1.4.0.2-3) instead of the latest
1362 package number.
1363 * Build-depends on groff-base instead of groff
1364
1365 -- Christian Marillat <marillat@debian.org> Fri, 22 Jun 2001 17:02:37 +0200
1366
1367 gnome-core (1.4.0.4-3) unstable; urgency=low
1368
1369 * New patch: Allows to save/load the keyboard secure state (Closes: #83028)
1370 * New patch: Remove a warning in configure
1371 * gnome-help replace gnome-panel-data (Closes: #99499)
1372 * Build-depends on xml-i18n-tools (>= 0.8.4.cvs.20010530-1) (Close: #98784)
1373
1374 -- Christian Marillat <marillat@debian.org> Sat, 2 Jun 2001 14:41:45 +0200
1375
1376 gnome-core (1.4.0.4-2) unstable; urgency=low
1377
1378 * New patch: Replace Distribution by Debian in configuration dialog box.
1379 * New patch: Upstream patch to allow Debian menu in default configuration.
1380 * New patch: Fix some wrong path.
1381 * Move gnome-feedback doc from gnome-help-data to gnome-core.
1382
1383 -- Christian Marillat <marillat@debian.org> Tue, 15 May 2001 15:36:51 +0200
1384
1385 gnome-core (1.4.0.4-1) unstable; urgency=low
1386
1387 * New upstream release.
1388
1389 -- Christian Marillat <marillat@debian.org> Wed, 9 May 2001 23:56:27 +0200
1390
1391 gnome-core (1.4.0.3-2) unstable; urgency=low
1392
1393 * Remove debugging code (/tmp/languages file)
1394
1395 -- Christian Marillat <marillat@debian.org> Mon, 7 May 2001 16:48:18 +0200
1396
1397 gnome-core (1.4.0.3-1) unstable; urgency=low
1398
1399 * New upstream release.
1400 * New: tooltips for long task names in tasklist_applet (Closes: #63898)
1401
1402 -- Christian Marillat <marillat@debian.org> Thu, 3 May 2001 15:51:58 +0200
1403
1404 gnome-core (1.4.0.2-3) unstable; urgency=low
1405
1406 * Fix wrong dif.gz file (Closes: #94499)
1407 * Build against the latest lignome-dev (Closes: #95301, #95691)
1408 * gnome-terminal should depends on gnome-bin (Closes: #95498)
1409 * Doesn't build against gtkhtml this break fonts displaying (Closes: #92187)
1410
1411 -- Christian Marillat <marillat@debian.org> Tue, 1 May 2001 11:03:14 +0200
1412
1413 gnome-core (1.4.0.2-2) unstable; urgency=low
1414
1415 * New/old patch against manpages, never applied by upstream.
1416 * gnome-help depends on lynx.
1417 * Use x-terminal-emulator in gnome-download instead of xterm.
1418 * Move gnome-convert and gnome-download from gnome-core to gnome-help.
1419 * Move gnome-login-check from gnome-core to gnome-session.
1420 * Move gnome-panel-add-launcher from gnome-core to gnome-panel.
1421 * Move sesion-properties* from gnome-core to gnome-session.
1422 * debian/control Add Replaces for the changes above.
1423 * Write manpages (Closes: #87085)
1424
1425 -- Christian Marillat <marillat@debian.org> Tue, 17 Apr 2001 18:54:15 +0200
1426
1427 gnome-core (1.4.0.2-1) unstable; urgency=low
1428
1429 * New upstream release.
1430 * Build-depends on latest gettext (Closes: #93198)
1431 * Icon box in menu editor is back (Closes: #91938)
1432 * Build-depends on latest xml-i18n-tools and libgnome-dev
1433
1434 -- Christian Marillat <marillat@debian.org> Wed, 11 Apr 2001 15:16:20 +0200
1435
1436 gnome-core (1.4.0.1-2) unstable; urgency=low
1437
1438 * Build depends on versionned gettext 0.10.35-17 (Closes: #93198)
1439 * Write manpage for gnome-session and add docbook-to-man in build-depnds
1440 * Write manpages for gnome-help (Closes: #87089)
1441
1442 -- Christian Marillat <marillat@debian.org> Sat, 7 Apr 2001 15:52:40 +0200
1443
1444 gnome-core (1.4.0.1-1) unstable; urgency=low
1445
1446 * New upstream release.
1447 * debian/gnome-terminal.wrapper change -T by -t (Closes: #90847)
1448 * debian/gnome-session.README.debian remove references to .xsession. This
1449 is now obsolete by the new x-session-manager scheme.
1450
1451 -- Christian Marillat <marillat@debian.org> Sun, 1 Apr 2001 15:01:51 +0200
1452
1453 gnome-core (1.4.0-2) unstable; urgency=low
1454
1455 * Build depends on libglade-gnome0-dev (>= 0.16-1) (Closes: #90416)
1456 * debian/control Add Build-Conflicts: libgtkhtml-dev (>= 0.7-1) (Closes: #90700)
1457
1458 -- Christian Marillat <marillat@debian.org> Thu, 22 Mar 2001 16:44:12 +0100
1459
1460 gnome-core (1.4.0-1) unstable; urgency=low
1461
1462 * New upstream release.
1463 * Gnome-core replaces gnome-control-center 1.2.3-1 (Closes: #90124)
1464 * Remove manpages patche included by upstream.
1465 * gnome-session don't always saves session on logout (Closes: #89630)
1466 * Can add a launcher in the panel (Closes: #90018)
1467 * Deskguide don't crashes on Fill with mini-images (Closes: #86952)
1468 * Deskguide don't fail to run (Closes: #89769)
1469 * Pager applet don't fail to run (Closes: #89025)
1470
1471 -- Christian Marillat <marillat@debian.org> Mon, 19 Mar 2001 13:01:26 +0100
1472
1473 gnome-core (1.3.1-2) unstable; urgency=low
1474
1475 * Remove taslisk-applet manpage (Closes: #88994)
1476 * New patch against gnome-terminal.1 (Closes: #89005)
1477 * Move /usr/lib/libtasklist_applet.so in libpanel-applet0
1478 (Closes: #89053, #89008, #89012, #89091, #89003)
1479 * Gnome-terminal replace gnome-help-data (<= 1.0.55-2) (Closes: #87910)
1480
1481 -- Christian Marillat <marillat@debian.org> Sat, 10 Mar 2001 10:45:14 +0100
1482
1483 gnome-core (1.3.1-1) unstable; urgency=low
1484
1485 * New upstream release.
1486 * Removed default.session patch
1487 * debian/control Add Replaces: gnome-control-center (<= 1.2.2-10), because
1488 the session-properties-capplet is now in this package.
1489 * debian/{postinst,prerm} Call scrollkeeper
1490 * debian/control Add scrollkeeper, xml-i18n-tools and libglade-gnome0-dev in
1491 build-depends and scrollkeeper in depends for gnome-core
1492 * Menu and laucnh keys works now (Closes: #86955)
1493 * Dead keys work in gnome-terminal (Closes: #63102)
1494 * Gnome-terminal isn't broken (Closes: #86752)
1495 * New patch htmlurl.h (This file was broken by upstream author)
1496 * XFMail doesn't crash the tasklist applet in this release (Closes: #88515)
1497 * debian/gnome-core.menu New file for the session properties capplet
1498
1499 -- Christian Marillat <marillat@debian.org> Mon, 5 Mar 2001 11:40:15 +0100
1500
1501 gnome-core (1.2.4-11) unstable; urgency=low
1502
1503 * Update (again) the Build-depends field (Closes: #87419)
1504 * Add a debian directory for the gnome-help-browser and add suggest doc-base
1505 for gnome-help. Now we can watch debian documentation registered with doc-base.
1506 * Add a lintian override file for libpanel-applet0
1507
1508 -- Christian Marillat <marillat@debian.org> Sun, 25 Feb 2001 16:14:09 +0100
1509
1510 gnome-core (1.2.4-10) unstable; urgency=low
1511
1512 * Update the Build-depends field (Closes: #86441, #87419)
1513 * Call update-alternatives only in remove (gnome-terminal, gnome-session) (Closes: #87327, #87328)
1514
1515 -- Christian Marillat <marillat@debian.org> Sat, 24 Feb 2001 18:03:20 +0100
1516
1517 gnome-core (1.2.4-9) unstable; urgency=low
1518
1519 * Remove abandonned /etc/CORBA/servers/bad-applet.goad (Closes: #84950)
1520 * Build against the latest gnome-libs (1.2.11) (Close: #85932)
1521
1522 -- Christian Marillat <marillat@debian.org> Wed, 14 Feb 2001 13:49:26 +0100
1523
1524 gnome-core (1.2.4-8) unstable; urgency=low
1525
1526 * debian/control Add Replaces: gnome-help-data (<< 1.0.55-2) for
1527 gnome-help (Closes: #80974)
1528 * debian/gnome-help.mime Rewrote (Closes: #82891)
1529 * debian/control gnome-core depends on gnome-bin (Closes: #82951)
1530 * Wrote gnome-panel.README.Debian (Closes: #82954)
1531
1532 -- Christian Marillat <marillat@debian.org> Mon, 22 Jan 2001 16:04:58 +0100
1533
1534 gnome-core (1.2.4-7) unstable; urgency=low
1535
1536 * Added gnome-bin (>= 1.2.0) in gnome-session Depends field (Closes: #80589, #80595, #80733)
1537
1538 -- Christian Marillat <marillat@debian.org> Wed, 27 Dec 2000 19:24:08 +0100
1539
1540 gnome-core (1.2.4-6) unstable; urgency=low
1541
1542 * Apply patch to gnome-run to call x-terminal-emulator (Closes: #80219)
1543 * debian/gnome-terminal.wrapper This is -t not -T close (Closes: #80405)
1544
1545 -- Christian Marillat <marillat@debian.org> Sun, 24 Dec 2000 03:27:12 +0100
1546
1547 gnome-core (1.2.4-5) unstable; urgency=low
1548
1549 * Install gnome-terminal.wrapper as x-terminal-emulator and remove
1550 debian/patches/gnome-terminal.dpatch (Closes: 64326)
1551 Thanks to Eric Gillespie, Jr. <epg@progenylinux.com>
1552 * Add Recommends: gnome-applets on gnome-panel (Closes: #72208)
1553 * gnome-sesion provides x-session-manager and install alternative (Closes: #60667)
1554 * Added hints=Gnome for all menu files.
1555
1556 -- Christian Marillat <marillat@debian.org> Wed, 20 Dec 2000 23:19:55 +0100
1557
1558 gnome-core (1.2.4-4) unstable; urgency=low
1559
1560 * Call x-terminal-emulator in gnome-wm and add depends on the latest debianutils
1561 for gnome-session. Thanks to Joseph Carter <knghtbrd@progeny.com> for the file
1562 (Closes: #79776)
1563 * Rewrote default.session patch
1564 * Add patch form Doug Larrick <doug@ties.org> for gwmthumbnail.c (Closes: #78550)
1565
1566 -- Christian Marillat <marillat@debian.org> Sun, 17 Dec 2000 12:04:54 +0100
1567
1568 gnome-core (1.2.4-3) unstable; urgency=low
1569
1570 * Change gnome-help.mime to call the right file (Closes: #77986)
1571 Thanks Malcolm Parsons <malcolm@ivywell.screaming.net> for the patch.
1572 * Patch gsm/default.in (two entries with same id) (Closes: #78276)
1573 Thanks to Normal User <gohmandj@mrs.umn.edu> (Nice name)
1574 * Move gnome-control-center from Depends to Suggests.
1575 * Remove libgtkhtml-dev from Build-Depends (Closes: #79527)
1576
1577 -- Christian Marillat <marillat@debian.org> Wed, 13 Dec 2000 18:01:34 +0100
1578
1579 gnome-core (1.2.4-2) unstable; urgency=low
1580
1581 * Remove README and NEWS files (Closes: #77250)
1582 * Disable thumbnails by default in deskguide_applet (Closes: #77205)
1583 * debian/rules --with-window-manager is now sawfish (was x-window-manager)
1584 and rewrote debian/patches/gnome-wm.dpatch to remove x-window-manager (Closes: #77401)
1585 * Should close this old bug (Closes: #51198)
1586 * Patch gnome-edit to use x-terminal-emulator instead of xterm.
1587
1588 -- Christian Marillat <marillat@debian.org> Mon, 20 Nov 2000 11:35:55 +0100
1589
1590 gnome-core (1.2.4-1) unstable; urgency=low
1591
1592 * New upstream release.
1593
1594 -- Christian Marillat <marillat@debian.org> Thu, 16 Nov 2000 00:43:15 +0100
1595
1596 gnome-core (1.2.3.1-1) unstable; urgency=low
1597
1598 * New upstream release.
1599 * Add gnome-help example and manpage in gnome-help package (Closes: #49977)
1600 * This release should close these old bugs (Closes: #60561, #60768, #45053)
1601 * Gnome-panel don't use all CPU time (Closes: #75251, #60209)
1602 * Remove gmenu patch included by upstream.
1603
1604 -- Christian Marillat <marillat@debian.org> Wed, 8 Nov 2000 17:09:42 +0100
1605
1606 gnome-core (1.2.3-1) unstable; urgency=low
1607
1608 * New upstream release.
1609 * Debian menus aren't empty (Closes: #70470)
1610 * Launcher can find icon (Closes: #62502)
1611
1612 -- Christian Marillat <marillat@debian.org> Tue, 24 Oct 2000 15:51:11 +0200
1613
1614 gnome-core (1.2.2.1-3) unstable; urgency=low
1615
1616 * Add gnome-terminal.prerm for update-alternatives --remove (Closes: #74451)
1617 * Patch gnome-terminal to accept -T option (Closes: #74450)
1618 * Move README.debian in gnome-session package (Closes: #60440)
1619 * mesg work in gnome-terminal (Closes: #71728)
1620 * Upstream fix these old bugs in Gnome-terminal
1621 Problem with menubar (Closes: #57516)
1622 Problem with console-apt Closes: #60079)
1623 Problem with screen (Closes: #50156)
1624 * Binaries don't should go in /usr/X11R6/bin (Closes: #24031)
1625 Quoting Debian policy :
1626 "Packages using the X Window System should abide by the FHS standard"
1627 "whenever possible; they should install binaries, libraries, manual"
1628 "pages, and other files in FHS-mandated locations wherever possible."
1629 "This means that files must not be installed into /usr/X11R6/bin/'"
1630 * hostname isn't harcoded (Closes: #72536)
1631 * Error messages mention Lynx (Closes: #62216)
1632 * Display correctly deskuse.html (Closes: #49974)
1633 * Add patch from malcolm <malcolm@ivywell.screaming.net> (Closes: #64820)
1634
1635 -- Christian Marillat <marillat@debian.org> Sat, 14 Oct 2000 23:39:49 +0200
1636
1637 gnome-core (1.2.2.1-2) unstable; urgency=low
1638
1639 * Typo in debian/gnome-terminal.postinst
1640 * Add gnome-terminal manpage (Closes: #69188)
1641 * Closes: #63103 already closed in 1.2.1-0.2 (typo in debian/changelog)
1642 * Gnome-terminal write to /var/run/utmp (Closes: #59053)
1643 * delete/backspace keys works (Closes: #57198)
1644 * Install GnomeHelp file in /etc/gnome/config (Closes: #73012)
1645 * Convert png icons in xpm for Debian menu.
1646 * Rearange documentation for dhelp (Closes: #56672)
1647
1648 -- Christian Marillat <marillat@debian.org> Thu, 5 Oct 2000 00:59:44 +0200
1649
1650 gnome-core (1.2.2.1-1) unstable; urgency=low
1651
1652 * New upstream release.
1653 * Patch all manpages (Closes: #70009)
1654 * gnome-panel 1.0.55-2.0.1 (sparc) is now installable (Closes: #69075, #71570)
1655 * gmenu don't jam up all translations (Closes: #46446)
1656 * panel remember its configuration between session
1657 (Closes: #47734, #54190)
1658 * Icons are now centered (Closes: #63868)
1659 * Bugs closed by previous NMU in gnome-panel (Closes: #40036, #52584, #54755,
1660 #58278, #61083, #69428))
1661 * libgen_util_applet.so installed in 1.2.1-0.2 (Closes: #69463)
1662 * debian/control remove Conflicts: asclock (Closes: #52077)
1663 * gnome-help 1.0.55-2.0.1 (sparc) is now installable (Closes: #69356)
1664 * Bugs closed by previous NMU in gnome-help (Closes: #49734, #56081, #58679, #58973)
1665 * debian/control move gmc from Recommends to Suggests (Closes: #59415)
1666 * The first search in gnome-wm search is x-window-manager
1667 (Closes: #50940, #65969, #62143)
1668 * Bug closed in 1.2.2-1 (README.debian in gnome-session package) (Closes: #66219)
1669 * Bugs closed by previous NMU in gnome-terminal
1670 (Closes: #64579, #63592, #63332, #56584, #55477, #54428)
1671 * gnome-terminal provide x-terminal-emulator (Closes: #61805, #53994, #56225)
1672
1673 -- Christian Marillat <marillat@debian.org> Wed, 27 Sep 2000 16:02:16 +0200
1674
1675 gnome-core (1.2.2-1) unstable; urgency=low
1676
1677 * New maintainer, thanks James.
1678 * New upstream release.
1679 * Switch to debhelper V2
1680 * Move README.debian in gnome-session package (Closes: #65235) and
1681 update this file (Closes: #71339)
1682 * Bug closed in 1.2.1-0.2 (Install missing libraries) (Closes: #69590, #70483)
1683 * Bugs closed in 1.2.1-0.1 (typo close instead closes) (Closes: #53764, #54050)
1684 * Remove gtkhtml patch.
1685 * The desk guide show thumbnail (Closes: #72359)
1686 * Missing package under sparc (Closes: #71438)
1687 * debian/control add Conflicts: libgnome32 (<< 1.2.0-1) for gnome-panel (Closes: #72039)
1688 * Added icons in Debian menu.
1689 * Eject in drivemount check if '-u' is available (Closes: #63954)
1690 * Patch gmenu to find Debian menu.
1691
1692 -- Christian Marillat <marillat@debian.org> Tue, 26 Sep 2000 17:34:23 +0200
1693
1694 gnome-core (1.2.1-0.2) unstable; urgency=low
1695
1696 * NMU.
1697 * Install these libraries libfish_applet.so libgen_util_applet.so
1698 libpanel_status.so (Closes: #69428, #69590)
1699 * Copy latest gnome aclocal in macros/ and run macros/autogen.sh
1700 This is needed to build gnome-help-browser against libgtkhtml4.
1701 * In debian/control
1702 gnome-session depends on gnome-panel (>= ${Source-Version}).
1703 gnome-help depends on gnome-core (>= 1.2.0-0.1) no Source-Version.
1704 gnome-terminal don't depends on gnome-core.
1705 * URL's are clickable in gnome-terminal (Closes: 63103).
1706 * debian/gnome-panel.undocumented removed printer_applet.1
1707 * Cut and paste work in gnome-terminal (Closes: #63592).
1708
1709 -- Christian Marillat <marillat@debian.org> Wed, 23 Aug 2000 21:23:36 +0200
1710
1711 gnome-core (1.2.1-0.1) unstable; urgency=low
1712
1713 * New upstream release (Closes: #58806, #66467)
1714 * NMU.
1715 * Standards-Version to 3.1.1.1 Added Build-depends field.
1716 * Removed patches: dialer, drivemount-floppy, modemlights, term,
1717 help-browser, debian-menu, url-match.
1718 * Added patches: gtkhtml.
1719 * Build against libgtkhtml3. Closes: #58679, #36806, #49734
1720 * Default manpath and infopath are wrong. Closes: #56081
1721 * gmenu segfaults. Close: #53764, #54050
1722 * gnome-panel: panel no longer works. Closes: #58278
1723 * gnome-panel: gnomepager-applet should put braces around. Closes: #52584
1724 * Backspace and delete work correctly. Closes: #54428
1725 * TERM never select xterm-debian. Closes: #56584, #55477, #64579
1726 * Disable arrows option is now saved. Closes: #54755
1727 * No more files in /usr/share. Closes: #61083
1728 * Show debian menus. Closes: #66214
1729 * New help documentation for panel. Closes: #40036
1730 * Gnome-terminal write to /var/run/utmp. Closes: #59053
1731 * gnome-terminal provide x-terminal-emulator. Closes: #61805, #56225
1732 * README.Debian is here. Closes: #65235
1733
1734 -- Christian Marillat <marillat@debian.org> Tue, 25 Jul 2000 19:09:21 +0200
1735
1736 gnome-core (1.0.55-2) frozen unstable; urgency=low
1737
1738 * Make x-window-manager run first by gnome-wm script to conform to
1739 debian policy (Closes: #61617) (This is an important bug)
1740
1741 -- James LewisMoss <dres@debian.org> Sun, 21 May 2000 19:31:19 -0400
1742
1743 gnome-core (1.0.55-1) unstable; urgency=low
1744
1745 * New upstream.
1746
1747 -- James LewisMoss <dres@debian.org> Sun, 2 Jan 2000 07:32:36 -0500
1748
1749 gnome-core (1.0.54-2) unstable; urgency=low
1750
1751 * Fix the gnome-pager forgets size settings bug (was saved to wrong
1752 section). Closes: #49839, #46845.
1753
1754 -- James LewisMoss <dres@debian.org> Fri, 12 Nov 1999 07:54:46 -0500
1755
1756 gnome-core (1.0.54-1) unstable; urgency=low
1757
1758 * New upstream.
1759
1760 -- James LewisMoss <dres@debian.org> Thu, 4 Nov 1999 23:20:14 -0500
1761
1762 gnome-core (1.0.53-4) unstable; urgency=low
1763
1764 * New maintainer.
1765
1766 -- James LewisMoss <dres@debian.org> Mon, 25 Oct 1999 23:17:31 -0400
1767
1768 gnome-core (1.0.53-3) unstable; urgency=low
1769
1770 * Ok, I made a mistake by setgiding gnome-terminal to
1771 utmp. Reverted the change. Closes: #47960
1772
1773 -- Raphael Hertzog <hertzog@debian.org> Mon, 18 Oct 1999 19:17:27 +0200
1774
1775 gnome-core (1.0.53-2) unstable; urgency=low
1776
1777 * gnome-session does launch a default window-manager. It does launch
1778 gnome-wm if no other information has been found. gnome-wm now
1779 reads the list of window managers from /etc/X11/window-managers
1780 once it has tried gnome compliant wm. Closes: #38347, #47370
1781 * Patched gnome-terminal. TERM=xterm-debian again ... actually this
1782 closes: #47552, #44960, #41065
1783 * gnome-terminal is now setgid utmp and can thus register itself
1784 in the UTMP database. Closes: #40507
1785 * The URL match does now accept % characters. Closes: #47281
1786 * libpanel-applet0.postinst check for the changelog.gz mysteriously
1787 staying around. Closes: #45871
1788 * Unreproducable bugs without answer from the submitter.
1789 Closes: #41195, #42865
1790
1791 -- Raphael Hertzog <hertzog@debian.org> Sat, 16 Oct 1999 19:52:38 +0200
1792
1793 gnome-core (1.0.53-1) unstable; urgency=low
1794
1795 * New upstream version.
1796 * gnome-session does now depend on gnome-panel and recommends
1797 gmc (both are needed for a full Gnome desktop).
1798 * gnome-terminal does not have a border. Closes: #38972
1799
1800 -- Raphael Hertzog <hertzog@debian.org> Tue, 12 Oct 1999 21:17:58 +0200
1801
1802 gnome-core (1.0.52-1) unstable; urgency=low
1803
1804 * New maintainer. Steve said that he wanted to give away some of
1805 his packages. I've asked to take gnome-core, he never replied, so
1806 I'm taking it but I will give it back to him if he wanted to
1807 keep it. In the meantime I can better manage bugs with my name
1808 in the Maintainer field.
1809 * New upstream version.
1810
1811 -- Raphael Hertzog <hertzog@debian.org> Mon, 4 Oct 1999 21:28:18 +0200
1812
1813 gnome-core (1.0.50-0.1) unstable; urgency=low
1814
1815 * New upstream version.
1816 * NMU again.
1817
1818 -- Raphael Hertzog <hertzog@debian.org> Thu, 30 Sep 1999 22:10:03 +0200
1819
1820 gnome-core (1.0.41-0.1) unstable; urgency=low
1821
1822 * New upstream version.
1823 * NMU again.
1824
1825 -- Raphael Hertzog <hertzog@debian.org> Mon, 27 Sep 1999 13:10:31 +0200
1826
1827 gnome-core (1.0.9-0.1) unstable; urgency=low
1828
1829 * New upstream version. Closes: #43253, #44098
1830 * Apply patches before configuring (and relaunch automake && autoconf
1831 because one of the patches is applied on Makefile.am).
1832 * NMU. Thanks to Christian Marillat <marillat@alpes-net.fr> for his work.
1833 * Imlib bug corrected: closes: #39085
1834 * X11 binaries don't have to go /usr/X11R6/bin. Closes: #24031
1835 * The panel does start correctly wihout complaining about a
1836 missing name service. Closes: #39380, #39634, #40478
1837 * The panel doesn't consume all CPU resources. Closes: #30654
1838 * The panel launches apps from where it has been launched itself.
1839 Closes: #32319
1840 * The panel keeps the settings. Closes: #37052, #40579, #43496
1841 * Old core dump corrected upstream. Closes: #39400, #40328, #42167
1842 Closes: #44344, #44724, #44732, #44759, #44773
1843 * Bug in menu-method, not in gnome-panel. Already reported against
1844 menu. Closes: #40089
1845 * cdplayer_applet works again. Closes: #42192
1846 * gnome pager works well: Closes: #42499, #42610
1847 * modem_lights draws itself correctly. Closes: #43861, #45055
1848 * The dialer applets doesn't exit when stopping while
1849 not yet connected. Closes: #45287
1850 * No more Debian menu in the panel. Closes: #41040
1851 * GnomeICU works with this panel. Closes: #39626, #39515
1852 * gnome-panel-data conflicts with asclock.
1853 Closes: #40712, #40715, #40808, #41430
1854 A better solution will be needed. Maybe put asclock in his own
1855 package or create a asclock-data package that will be shared.
1856 * Updated the modemlights patch. Closes: #43512
1857 * Added a patch for gnome-wm. Closes: #38366
1858 * Move lib{gkb,fish}_applet.so files to libgnome-applet0 (those are
1859 not libraries to be linked with, just simple modules). Closes: #38596
1860 * Asclock works well without xearth (the code still mentions xearth
1861 however). Closes: #40530
1862 * New patch (help-browser) for changing the default MANPATH and INFOPATH in
1863 gnome-help-browser.c Closes: #41452
1864 * Moved help-browser to the new "Help" menu section.
1865 * Added gnome-help.mime. Closes: #42205
1866 * Gnome-session does launch gnome-panel ! (I suppose that it failed
1867 to launch since panel was broken). Closes: #42937
1868 * gnome-sesion doesn't core dump. Closes: #36640
1869 * The terminal does remember the TERM var. Closes: #43067
1870 * The terminal keeps its size when dragging the manu bar in and out.
1871 Closes: #44762
1872 * The menu section of gnome-terminal corrected. Closes: #37635
1873
1874 -- Raphael Hertzog <hertzog@debian.org> Wed, 22 Sep 1999 13:24:34 +0200
1875
1876 gnome-core (1.0.7-1) unstable; urgency=low
1877
1878 * New upstream version.
1879 * Removed "term" patch
1880
1881 -- Steve Haslam <araqnid@debian.org> Mon, 28 Jun 1999 01:36:31 +0100
1882
1883 gnome-core (1.0.6-2) unstable; urgency=low
1884
1885 * debian-menu.dpatch: created to fix guessing Debian menus
1886 (/etc/menu-methods/gnome-panel now) and to make Debian menus the default
1887 instead of GNOME system menus.
1888 * gnome-help now suggests gnome-users-guide-en (closes: #35724)
1889 * /etc/menu-methods/gnome-panel now creates .directory files and searches
1890 /usr/X11R6/include/X11/pixmaps for menu icons
1891
1892 -- Steve Haslam <araqnid@debian.org> Sun, 13 Jun 1999 15:28:52 +0100
1893
1894 gnome-core (1.0.6-1) unstable; urgency=low
1895
1896 * New upstream version.
1897
1898 -- Steve Haslam <araqnid@debian.org> Sat, 5 Jun 1999 12:57:08 +0100
1899
1900 gnome-core (1.0.5-3) unstable; urgency=low
1901
1902 * debian/gnome-terminal.menu: managed to lose change mentioned in last
1903 revision. Replaced.
1904 * debian/gnome-core.undocumented: removed gnome-wm.1 (it was in
1905 gnome-session.undocumented too).
1906
1907 -- Steve Haslam <araqnid@debian.org> Mon, 31 May 1999 19:15:54 +0100
1908
1909 gnome-core (1.0.5-2) unstable; urgency=low
1910
1911 * debian/gnome-terminal.menu: changed section to XShells (Bug#37635)
1912 * debian/rules: added gnome-wm and gnome-edit to dh_undocumented call
1913 (Bug#37632)
1914 * debian/gnome.menu-method: added patch to honour needs=text (Bug#36928)
1915 from Decklin Foster
1916 * Call dh_strip when making libpanel-applet-dev (Closes: Bug#31244)
1917 * Removed /usr/share/gnome/apps/Debian symlink, (closes: #38100)
1918 * Sanified build system a la gnome-libs
1919 * debian/control: made gnome-help, gnome-help-data and gnome-panel-data
1920 packages.
1921
1922 -- Steve Haslam <araqnid@debian.org> Sun, 23 May 1999 14:35:44 +0100
1923
1924 gnome-core (1.0.5-1) unstable; urgency=low
1925
1926 * New maintainer.
1927
1928 -- Steve Haslam <araqnid@debian.org> Tue, 11 May 1999 01:01:12 +0100
1929
1930 gnome-core (1.0.5-0.2) unstable; urgency=low
1931
1932 * gnome-panel.files.in: added asclock themes, libgkb_applet.a
1933 * gnome-core.files.in: added gnome-wm, gnome-edit
1934 * term.dpatch: gnome-terminal TERM to xterm-debian rather than xterm
1935 * gsm/Makefile.am: put default.session, default.wm in /etc/gnome
1936 * debian/gnome-session.conffiles.in: added above two files
1937 * debian/gnome-session.files.in: updated this too
1938
1939 -- Steve Haslam <araqnid@debian.org> Sun, 18 Apr 1999 16:47:23 +0100
1940
1941 gnome-core (1.0.5-0.1) unstable; urgency=low
1942
1943 * Non-maintainer upload
1944 * New upstream version
1945
1946 -- Steve Haslam <araqnid@debian.org> Thu, 15 Apr 1999 23:22:23 +0100
1947
1948 gnome-core (1.0.1-0.3) unstable; urgency=low
1949
1950 * Weehay! More broken dependencies. This one libghttp -1.1,
1951 a bogus package that only ever existed on my machine.
1952
1953 -- Jules Bean <jules@debian.org> Mon, 8 Mar 1999 08:24:00 +0000
1954
1955 gnome-core (1.0.1-0.2) unstable; urgency=low
1956
1957 * Another NMU, this time to fix bogus dependencies on libgtop0
1958 and libglib1.1
1959
1960 -- Jules Bean <jules@debian.org> Sun, 7 Mar 1999 14:21:12 +0000
1961
1962 gnome-core (1.0.1-0.1) unstable; urgency=low
1963
1964 * NMU for GNOME-1.0
1965 * Hacked to patch SIGPIPE bug
1966 * Don't delete GIFs in rules
1967
1968 -- Jules Bean <jules@debian.org> Fri, 5 Mar 1999 18:36:29 +0100
1969
1970 gnome-core (0.99.99pre1.0.0-1) unstable; urgency=low
1971
1972 * New upstream release.
1973
1974 -- Jim Pick <jim@jimpick.com> Fri, 26 Feb 1999 23:18:10 -0800
1975
1976 gnome-core (0.99.3.2-4) unstable; urgency=low
1977
1978 * Recompiled yet again - dual dependency on libglib.
1979 Fixes: BUG#32510
1980
1981 -- Jim Pick <jim@jimpick.com> Thu, 28 Jan 1999 00:00:22 -0800
1982
1983 gnome-core (0.99.3.2-3) unstable; urgency=low
1984
1985 * Recompiled again to due to dependencies.
1986
1987 -- Jim Pick <jim@jimpick.com> Sun, 24 Jan 1999 01:10:07 -0800
1988
1989 gnome-core (0.99.3.2-2) unstable; urgency=low
1990
1991 * Recompiled with libgnome 0.99.4.
1992
1993 -- Jim Pick <jim@jimpick.com> Fri, 22 Jan 1999 16:44:45 -0800
1994
1995 gnome-core (0.99.3.2-1) unstable; urgency=low
1996
1997 * New upstream release.
1998
1999 -- Jim Pick <jim@jimpick.com> Wed, 20 Jan 1999 11:42:46 -0800
2000
2001 gnome-core (0.30-2) frozen unstable; urgency=low
2002
2003 * Recompiled with new libs.
2004 * Fixed reference to /usr/X11R6 in README.Debian.
2005 * Added warnings (Gnome is ALPHA).
2006 * Patched dialer_applet to use pon/poff.
2007 * Patched drivemount_applet to default to /floppy.
2008
2009 -- Jim Pick <jim@jimpick.com> Tue, 24 Nov 1998 10:56:08 -0800
2010
2011 gnome-core (0.30-1) unstable; urgency=low
2012
2013 * New upstream release.
2014
2015 -- Jim Pick <jim@jimpick.com> Thu, 24 Sep 1998 21:28:02 -0700
2016
2017 gnome-core (0.28.1-1) unstable; urgency=low
2018
2019 * New upstream release.
2020 * Hopefully fixes panel applet bug.
2021
2022 -- Jim Pick <jim@jimpick.com> Wed, 19 Aug 1998 20:12:25 -0700
2023
2024 gnome-core (0.28-1) unstable; urgency=low
2025
2026 * New upstream release.
2027
2028 -- Jim Pick <jim@jimpick.com> Mon, 17 Aug 1998 12:59:26 -0700
2029
2030 gnome-core (0.27-1) unstable; urgency=low
2031
2032 * New upstream release.
2033 * Added /usr/doc/gnome
2034
2035 -- Jim Pick <jim@jimpick.com> Sat, 15 Aug 1998 14:21:06 -0700
2036
2037 gnome-core (0.25-1) unstable; urgency=low
2038
2039 * New upstream release.
2040
2041 -- Jim Pick <jim@jimpick.com> Thu, 6 Aug 1998 22:51:22 -0700
2042
2043 gnome-core (0.20-2) unstable; urgency=low
2044
2045 * Added Debian menu-method for gnome-panel. Fixed Bug #24025
2046 (Thanks to Ray Dassen for reporting the bug, and Riku Voipio
2047 who wrote the menu method for Gnome 0.12)
2048
2049 -- Jim Pick <jim@jimpick.com> Wed, 22 Jul 1998 20:22:00 -0700
2050
2051 gnome-core (0.20-1) unstable; urgency=low
2052
2053 * New upstream release.
2054
2055 -- Jim Pick <jim@jimpick.com> Mon, 8 Jun 1998 12:00:08 -0700
2056
2057 gnome-core (0.13-1) unstable; urgency=low
2058
2059 * Initial Release.
2060
2061 -- Jim Pick <jim@jimpick.com> Mon, 16 Mar 1998 15:27:43 -0800
+0
-1
gnome-panel/debian/compat less more
0 5
+0
-123
gnome-panel/debian/control less more
0 Source: gnome-panel
1 Section: gnome
2 Priority: optional
3 Maintainer: Guilherme de S. Pastore <gpastore@debian.org>
4 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
5 Standards-Version: 3.7.3
6 Build-Depends: cdbs (>= 0.4.41),
7 debhelper (>= 5),
8 quilt,
9 intltool (>= 0.35.0),
10 gnome-pkg-tools (>= 0.10),
11 dpkg-dev (>= 1.13.19),
12 scrollkeeper,
13 libxmu-dev,
14 libxres-dev,
15 gnome-doc-utils,
16 libx11-dev,
17 libxau-dev,
18 libgtk2.0-dev (>= 2.11.3),
19 libgnomeui-dev (>= 2.16.0-2),
20 libgnome-desktop-dev (>= 2.11.1),
21 libglade2-dev (>= 1:2.5.0),
22 libgnome2-dev (>= 2.13.0),
23 libbonoboui2-dev (>= 2.1.1),
24 liborbit2-dev (>= 1:2.12.1-1),
25 libgnomevfs2-dev (>= 2.14.2),
26 libwnck-dev (>= 2.19.5),
27 libgconf2-dev (>= 2.6.1),
28 libecal1.2-dev (>= 1.6.0) [!hurd-i386],
29 libedataserverui1.2-dev (>= 1.2.0) [!hurd-i386],
30 libcairo2-dev (>= 1.0.0),
31 libdbus-glib-1-dev (>= 0.60),
32 gtk-doc-tools,
33 libgnome-menu-dev (>= 2.16.1-1),
34 libpango1.0-dev (>= 1.15.4),
35 libedataserver1.2-dev (>= 1.2.0),
36 libglib2.0-dev (>= 2.13.0),
37 evolution-data-server-dev
38
39 Package: gnome-panel
40 Architecture: any
41 Depends: ${shlibs:Depends},
42 ${misc:Depends},
43 gnome-panel-data (>= ${gnome:Version}),
44 gnome-panel-data (<< ${gnome:NextVersion}),
45 gnome-desktop-data (>= 2.10.0-1),
46 gnome-control-center (>= 1:2.8.2-3),
47 gnome-menus (>= 2.11.1-1),
48 gnome-about (>= 2.10.0-1),
49 menu-xdg (>= 0.2)
50 Recommends: gnome-applets (>= 2.12.1-1),
51 gnome-session,
52 evolution-data-server,
53 gnome-icon-theme (>= 2.18),
54 alacarte
55 Suggests: yelp,
56 gnome2-user-guide,
57 gnome-terminal | x-terminal-emulator,
58 gnome-system-tools,
59 nautilus
60 Description: launcher and docking facility for GNOME
61 The GNOME Panel is an essential part of the GNOME Desktop, providing
62 toolbar-like “panels” which can be attached to the sides of your desktop.
63 They are used to launch applications and embed a number of other
64 functions, such as quick launch icons, the clock, the notification area,
65 volume controls and the battery charge indicator, and utilities ranging
66 from weather forecast to system monitoring.
67
68 Package: libpanel-applet2-0
69 Section: libs
70 Architecture: any
71 Depends: ${misc:Depends},
72 ${shlibs:Depends}
73 Description: library for GNOME Panel applets
74 This library is used by GNOME Panel applets.
75
76 Package: gnome-panel-dbg
77 Section: libdevel
78 Priority: extra
79 Architecture: any
80 Depends: ${misc:Depends},
81 gnome-panel (= ${binary:Version}),
82 libpanel-applet2-0 (= ${binary:Version})
83 Description: GNOME Panel and library for panel applets - debugging symbols
84 This package contains debugging symbols for gnome-panel and the
85 libpanel-applet library. It is provided to help debugging problem in
86 the panel itself or in the library. The debugging symbols are installed
87 in /usr/lib/debug and will automatically be used by gdb.
88
89 Package: libpanel-applet2-dev
90 Section: libdevel
91 Architecture: any
92 Depends: ${misc:Depends},
93 libpanel-applet2-0 (= ${binary:Version}),
94 liborbit2-dev (>= 1:2.12.4-1),
95 libgtk2.0-dev (>= 2.11.3),
96 libgnomeui-dev (>= 2.5.4),
97 libglade2-dev (>= 1:2.5.0),
98 libbonoboui2-dev (>= 2.1.1),
99 libglib2.0-dev (>= 2.13.0)
100 Description: library for GNOME Panel applets - development files
101 This packages provides the include files and static library for the GNOME
102 Panel applet library functions.
103
104 Package: libpanel-applet2-doc
105 Section: doc
106 Architecture: all
107 Depends: ${misc:Depends}
108 Suggests: doc-base
109 Description: library for GNOME Panel applets - documentation files
110 This packages provides the documentation files for the GNOME Panel applet
111 library functions.
112
113 Package: gnome-panel-data
114 Section: gnome
115 Architecture: all
116 Depends: ${misc:Depends},
117 scrollkeeper,
118 gconf2 (>= 2.14.0-2)
119 Recommends: gnome-panel
120 Description: common files for the GNOME Panel
121 This package includes some files that are needed by the GNOME Panel
122 (Pixmaps, .desktop files and internationalization files).
+0
-123
gnome-panel/debian/control.in less more
0 Source: gnome-panel
1 Section: gnome
2 Priority: optional
3 Maintainer: Guilherme de S. Pastore <gpastore@debian.org>
4 Uploaders: @GNOME_TEAM@
5 Standards-Version: 3.7.3
6 Build-Depends: cdbs (>= 0.4.41),
7 debhelper (>= 5),
8 quilt,
9 intltool (>= 0.35.0),
10 gnome-pkg-tools (>= 0.10),
11 dpkg-dev (>= 1.13.19),
12 scrollkeeper,
13 libxmu-dev,
14 libxres-dev,
15 gnome-doc-utils,
16 libx11-dev,
17 libxau-dev,
18 libgtk2.0-dev (>= 2.11.3),
19 libgnomeui-dev (>= 2.16.0-2),
20 libgnome-desktop-dev (>= 2.11.1),
21 libglade2-dev (>= 1:2.5.0),
22 libgnome2-dev (>= 2.13.0),
23 libbonoboui2-dev (>= 2.1.1),
24 liborbit2-dev (>= 1:2.12.1-1),
25 libgnomevfs2-dev (>= 2.14.2),
26 libwnck-dev (>= 2.19.5),
27 libgconf2-dev (>= 2.6.1),
28 libecal1.2-dev (>= 1.6.0) [!hurd-i386],
29 libedataserverui1.2-dev (>= 1.2.0) [!hurd-i386],
30 libcairo2-dev (>= 1.0.0),
31 libdbus-glib-1-dev (>= 0.60),
32 gtk-doc-tools,
33 libgnome-menu-dev (>= 2.16.1-1),
34 libpango1.0-dev (>= 1.15.4),
35 libedataserver1.2-dev (>= 1.2.0),
36 libglib2.0-dev (>= 2.13.0),
37 evolution-data-server-dev
38
39 Package: gnome-panel
40 Architecture: any
41 Depends: ${shlibs:Depends},
42 ${misc:Depends},
43 gnome-panel-data (>= ${gnome:Version}),
44 gnome-panel-data (<< ${gnome:NextVersion}),
45 gnome-desktop-data (>= 2.10.0-1),
46 gnome-control-center (>= 1:2.8.2-3),
47 gnome-menus (>= 2.11.1-1),
48 gnome-about (>= 2.10.0-1),
49 menu-xdg (>= 0.2)
50 Recommends: gnome-applets (>= 2.12.1-1),
51 gnome-session,
52 evolution-data-server,
53 gnome-icon-theme (>= 2.18),
54 alacarte
55 Suggests: yelp,
56 gnome2-user-guide,
57 gnome-terminal | x-terminal-emulator,
58 gnome-system-tools,
59 nautilus
60 Description: launcher and docking facility for GNOME
61 The GNOME Panel is an essential part of the GNOME Desktop, providing
62 toolbar-like “panels” which can be attached to the sides of your desktop.
63 They are used to launch applications and embed a number of other
64 functions, such as quick launch icons, the clock, the notification area,
65 volume controls and the battery charge indicator, and utilities ranging
66 from weather forecast to system monitoring.
67
68 Package: libpanel-applet2-0
69 Section: libs
70 Architecture: any
71 Depends: ${misc:Depends},
72 ${shlibs:Depends}
73 Description: library for GNOME Panel applets
74 This library is used by GNOME Panel applets.
75
76 Package: gnome-panel-dbg
77 Section: libdevel
78 Priority: extra
79 Architecture: any
80 Depends: ${misc:Depends},
81 gnome-panel (= ${binary:Version}),
82 libpanel-applet2-0 (= ${binary:Version})
83 Description: GNOME Panel and library for panel applets - debugging symbols
84 This package contains debugging symbols for gnome-panel and the
85 libpanel-applet library. It is provided to help debugging problem in
86 the panel itself or in the library. The debugging symbols are installed
87 in /usr/lib/debug and will automatically be used by gdb.
88
89 Package: libpanel-applet2-dev
90 Section: libdevel
91 Architecture: any
92 Depends: ${misc:Depends},
93 libpanel-applet2-0 (= ${binary:Version}),
94 liborbit2-dev (>= 1:2.12.4-1),
95 libgtk2.0-dev (>= 2.11.3),
96 libgnomeui-dev (>= 2.5.4),
97 libglade2-dev (>= 1:2.5.0),
98 libbonoboui2-dev (>= 2.1.1),
99 libglib2.0-dev (>= 2.13.0)
100 Description: library for GNOME Panel applets - development files
101 This packages provides the include files and static library for the GNOME
102 Panel applet library functions.
103
104 Package: libpanel-applet2-doc
105 Section: doc
106 Architecture: all
107 Depends: ${misc:Depends}
108 Suggests: doc-base
109 Description: library for GNOME Panel applets - documentation files
110 This packages provides the documentation files for the GNOME Panel applet
111 library functions.
112
113 Package: gnome-panel-data
114 Section: gnome
115 Architecture: all
116 Depends: ${misc:Depends},
117 scrollkeeper,
118 gconf2 (>= 2.14.0-2)
119 Recommends: gnome-panel
120 Description: common files for the GNOME Panel
121 This package includes some files that are needed by the GNOME Panel
122 (Pixmaps, .desktop files and internationalization files).
+0
-31
gnome-panel/debian/copyright less more
0 This package was debianized by Jim Pick jim@jimpick.com on Sat, 14 Mar
1 1998 20:12:23 -0800. Taken over by Raphael Hertzog
2 <hertzog@debian.org> on Wed, 22 Sep 1999 13:24:34 +0200, and taken
3 over again by James LewisMoss on October 26, 1999.
4 and again by Marc Dequènes (Duck) <Duck@DuckCorp.org> on 2003-03-26.
5
6 It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/
7
8 Upstream Authors and Copyright holders:
9 Too many to list here, but the full list is in:
10 /usr/share/doc/gnome-panel/AUTHORS
11
12 License:
13
14 This package is free software; you can redistribute it and/or modify
15 it under the terms of the GNU General Public License as published by
16 the Free Software Foundation; version 2 dated June, 1991.
17
18 This package is distributed in the hope that it will be useful,
19 but WITHOUT ANY WARRANTY; without even the implied warranty of
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 GNU General Public License for more details.
22
23 You should have received a copy of the GNU General Public License
24 along with this package; if not, write to the Free Software
25 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
26 USA.
27
28 On Debian systems, the complete text of the GNU General
29 Public License can be found in `/usr/share/common-licenses/GPL'.
30
+0
-22
gnome-panel/debian/gnome-desktop-item-edit.1 less more
0 .TH "gnome-desktop-item-edit" "1"
1 .SH "NAME"
2 gnome-desktop-item-edit \(em tool to edit .desktop file
3 .SH "SYNOPSIS"
4 .PP
5 \fBgnome-desktop-item-edit\fR [\fB\-\-create-new \fP] [\fB\-\-help \fP]
6 .SH "DESCRIPTION"
7 .PP
8 \fBgnome-desktop-item-edit\fR allows you to edit .desktop file.
9 .SH "OPTIONS"
10 .IP "\fB\-\-create-new\fP" 10
11 Create new file in the given directory.
12 .IP "\fB\-\-help\fP" 10
13 Display help
14 .SH "SEE ALSO"
15 .PP
16 gnome-options(7)
17 .SH "AUTHOR"
18 .PP
19 This manual page was written by Christian Marillat marillat@debian.org for
20 the \fBDebian GNU/Linux\fP system (but may be used by others).
21 .\" created by instant / docbook-to-man, Sun 03 Dec 2006, 23:24
+0
-107
gnome-panel/debian/gnome-desktop-item-edit.sgml less more
0 <!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
1
2 <!ENTITY dhfirstname "<firstname>Christian</firstname>">
3 <!ENTITY dhsurname "<surname>Marillat</surname>">
4 <!ENTITY dhdate "<date>december 7, 2003</date>">
5 <!ENTITY dhsection "<manvolnum>1</manvolnum>">
6 <!ENTITY dhemail "<email>marillat@debian.org</email>">
7 <!ENTITY dhusername "Christian Marillat">
8 <!ENTITY dhucpackage "<refentrytitle>gnome-desktop-item-edit</refentrytitle>">
9 <!ENTITY dhpackage "gnome-desktop-item-edit">
10 <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
11 <!ENTITY gnu "<acronym>GNU</acronym>">
12 ]>
13
14 <refentry>
15 <refentryinfo>
16 <address>
17 &dhemail;
18 </address>
19 <author>
20 &dhfirstname;
21 &dhsurname;
22 </author>
23 <copyright>
24 <year>2001</year>
25 <holder>&dhusername;</holder>
26 </copyright>
27 &dhdate;
28 </refentryinfo>
29 <refmeta>
30 &dhucpackage;
31
32 &dhsection;
33 </refmeta>
34 <refnamediv>
35 <refname>&dhpackage;</refname>
36
37 <refpurpose> tool to edit .desktop file</refpurpose>
38 </refnamediv>
39 <refsynopsisdiv>
40 <cmdsynopsis>
41 <command>&dhpackage;</command>
42
43 <arg><option>--create-new </option></arg>
44 <arg><option>--help </option></arg>
45
46 </cmdsynopsis>
47 </refsynopsisdiv>
48 <refsect1>
49 <title>DESCRIPTION</title>
50
51 <para><command>&dhpackage;</command> allows you to edit .desktop file.</para>
52
53 </refsect1>
54
55 <refsect1>
56 <title>OPTIONS</title>
57
58 <variablelist>
59
60 <varlistentry>
61 <term><option>--create-new</option></term>
62 <listitem>
63 <para>Create new file in the given directory.</para>
64 </listitem>
65 </varlistentry>
66
67 <varlistentry>
68 <term><option>--help</option></term>
69 <listitem>
70 <para>Display help</para>
71 </listitem>
72 </varlistentry>
73 </variablelist>
74 </refsect1>
75
76 <refsect1>
77 <title>SEE ALSO</title>
78
79 <para>gnome-options(7)</para>
80 </refsect1>
81
82 <refsect1>
83 <title>AUTHOR</title>
84
85 <para>This manual page was written by &dhusername; &dhemail; for
86 the &debian; system (but may be used by others).</para>
87
88 </refsect1>
89 </refentry>
90
91 <!-- Keep this comment at the end of the file
92 Local variables:
93 mode: sgml
94 sgml-omittag:t
95 sgml-shorttag:t
96 sgml-minimize-attributes:nil
97 sgml-always-quote-attributes:t
98 sgml-indent-step:2
99 sgml-indent-data:t
100 sgml-parent-document:nil
101 sgml-default-dtd-file:nil
102 sgml-exposed-tags:nil
103 sgml-local-catalogs:nil
104 sgml-local-ecat-files:nil
105 End:
106 -->
+0
-10
gnome-panel/debian/gnome-panel-data.install less more
0 debian/tmp/etc/gconf/ usr/share/
1 debian/tmp/usr/lib/bonobo/ usr/lib/
2 debian/tmp/usr/share/applications
3 debian/tmp/usr/share/gnome-panelrc usr/share/gnome/
4 debian/tmp/usr/share/gnome-panel
5 debian/tmp/usr/share/gnome
6 debian/tmp/usr/share/gnome-2.0
7 debian/tmp/usr/share/icons
8 debian/tmp/usr/share/locale
9 debian/tmp/usr/share/omf
+0
-18
gnome-panel/debian/gnome-panel-data.postinst less more
0 #!/bin/sh
1 set -e
2
3 #DEBHELPER#
4
5 update-gconf-defaults
6
7 if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl "2.20.1-2"; then
8 rm -f /etc/menu-methods/gnome-panel-data /etc/menu-methods/gnome-vfolder-user
9 rm -f /etc/gnome-vfs-2.0/vfolders/applications.template
10 if [ -d /etc/gnome-vfs-2.0/vfolders ]; then
11 rmdir --ignore-fail-on-non-empty /etc/gnome-vfs-2.0/vfolders
12 fi
13 rm -rf /var/lib/gnome/Debian
14 if [ -d /var/lib/gnome ]; then
15 rmdir --ignore-fail-on-non-empty /var/lib/gnome
16 fi
17 fi
+0
-8
gnome-panel/debian/gnome-panel-data.postrm less more
0 #!/bin/sh
1 set -e
2
3 if [ "$1" = remove ] && [ -x /usr/sbin/update-gconf-defaults ]; then
4 update-gconf-defaults
5 fi
6
7 #DEBHELPER#
+0
-2
gnome-panel/debian/gnome-panel.install less more
0 debian/tmp/usr/bin
1 debian/tmp/usr/lib/gnome-panel/*.so
+0
-2
gnome-panel/debian/gnome-panel.manpages less more
0 man/*.1
1 debian/*.1
+0
-1
gnome-panel/debian/libpanel-applet2-0.install less more
0 debian/tmp/usr/lib/libpanel-applet-2.so.* usr/lib/
+0
-6
gnome-panel/debian/libpanel-applet2-dev.install less more
0 debian/tmp/usr/include/ usr/
1 debian/tmp/usr/lib/pkgconfig usr/lib/
2 debian/tmp/usr/lib/libpanel-applet-2.a usr/lib/
3 debian/tmp/usr/lib/libpanel-applet-2.la usr/lib/
4 debian/tmp/usr/lib/libpanel-applet-2.so usr/lib/
5 debian/tmp/usr/share/idl/ usr/share/
+0
-11
gnome-panel/debian/libpanel-applet2-doc.doc-base less more
0 Document: libpanel-applet2-doc
1 Title: Panel Applet Writer's Reference Manual
2 Author: Mark McLoughlin <mark@skynet.ie>
3 Abstract: This manual documents the interfaces of the panel applet writing
4 library for GNOME 2.x and a short guide to porting applets from the GNOME
5 1.x interfaces.
6 Section: Programming
7
8 Format: HTML
9 Index: /usr/share/doc/libpanel-applet2-doc/html/index.html
10 Files: /usr/share/doc/libpanel-applet2-doc/html/*.html
+0
-1
gnome-panel/debian/libpanel-applet2-doc.install less more
0 doc/reference/panel-applet/html usr/share/doc/libpanel-applet2-doc/
+0
-1
gnome-panel/debian/libpanel-applet2-doc.links less more
0 usr/share/doc/libpanel-applet2-doc/html/ usr/share/gtk-doc/html/panel-applet
+0
-17
gnome-panel/debian/maintfiles/09_open_drawers_on_right_screen.patch.NOTWORKING less more
0 diff -p -u -5 -r1.82 panel-toplevel.c
1 --- gnome-panel/gnome-panel/panel-toplevel.c 2004/12/22 18:09:19 1.82
2 +++ gnome-panel/gnome-panel/panel-toplevel.c 2005/01/06 04:12:41
3 @@ -2468,10 +2468,13 @@ panel_toplevel_attach_to_widget (PanelTo
4 panel_toplevel_reverse_arrows (toplevel);
5 panel_toplevel_set_expand (toplevel, FALSE);
6 panel_toplevel_update_attach_orientation (toplevel);
7 panel_toplevel_update_hide_buttons (toplevel);
8
9 + gtk_window_set_screen (GTK_WINDOW (toplevel),
10 + gtk_widget_get_screen (GTK_WIDGET (toplevel->priv->attach_toplevel)));
11 +
12 if (toplevel->priv->state == PANEL_STATE_NORMAL)
13 panel_toplevel_push_autohide_disabler (toplevel->priv->attach_toplevel);
14
15 gtk_widget_queue_resize (GTK_WIDGET (toplevel));
16 }
+0
-2
gnome-panel/debian/maintfiles/changelog_unreleased less more
0 + modified gnomezilla patch to fix opening evolution at the selected
1 date (also partially fix opening tasks) (Closes: #272777).
+0
-200
gnome-panel/debian/maintfiles/clock_applet_evo_open.patch less more
0 diff -u -r1.10 calendar-client.c
1 --- applets/clock/calendar-client.c 31 Aug 2004 08:18:34 -0000 1.10
2 +++ applets/clock/calendar-client.c 27 Dec 2004 09:07:15 -0000
3 @@ -529,18 +529,6 @@
4 return g_strdup (icalproperty_get_description (prop));
5 }
6
7 -static char *
8 -get_ical_url (icalcomponent *ical)
9 -{
10 - icalproperty *prop;
11 -
12 - prop = icalcomponent_get_first_property (ical, ICAL_URL_PROPERTY);
13 - if (!prop)
14 - return NULL;
15 -
16 - return g_strdup (icalproperty_get_url (prop));
17 -}
18 -
19 static inline GTime
20 get_ical_start_time (icalcomponent *ical,
21 icaltimezone *default_zone)
22 @@ -832,7 +820,6 @@
23 null_safe_strcmp (a->summary, b->summary) == 0 &&
24 null_safe_strcmp (a->description, b->description) == 0 &&
25 null_safe_strcmp (a->color_string, b->color_string) == 0 &&
26 - null_safe_strcmp (a->url, b->url) == 0 &&
27 a->start_time == b->start_time &&
28 a->due_time == b->due_time &&
29 a->percent_complete == b->percent_complete &&
30 @@ -850,7 +837,6 @@
31 task_copy->summary = g_strdup (task->summary);
32 task_copy->description = g_strdup (task->description);
33 task_copy->color_string = g_strdup (task->color_string);
34 - task_copy->url = g_strdup (task->url);
35 task_copy->start_time = task->start_time;
36 task_copy->due_time = task->due_time;
37 task_copy->percent_complete = task->percent_complete;
38 @@ -872,9 +858,6 @@
39 g_free (task->color_string);
40 task->color_string = NULL;
41
42 - g_free (task->url);
43 - task->url = NULL;
44 -
45 task->percent_complete = 0;
46 }
47
48 @@ -888,7 +871,6 @@
49 task->summary = get_ical_summary (ical);
50 task->description = get_ical_description (ical);
51 task->color_string = get_source_color (source->source);
52 - task->url = get_ical_url (ical);
53 task->start_time = get_ical_start_time (ical, default_zone);
54 task->due_time = get_ical_due_time (ical, default_zone);
55 task->percent_complete = get_ical_percent_complete (ical);
56 @@ -1980,25 +1962,3 @@
57 e_cal_modify_object (esource, ical, CALOBJ_MOD_ALL, NULL);
58 }
59
60 -gboolean
61 -calendar_client_launch_editor (CalendarClient *client,
62 - CalendarEventType event_type,
63 - GdkScreen *screen,
64 - GError **error)
65 -{
66 - char *command_line;
67 - gboolean retval;
68 -
69 - g_return_val_if_fail (CALENDAR_IS_CLIENT (client), FALSE);
70 - g_return_val_if_fail (event_type == CALENDAR_EVENT_APPOINTMENT ||
71 - event_type == CALENDAR_EVENT_TASK, FALSE);
72 -
73 - command_line = g_strdup_printf ("evolution -c %s",
74 - event_type == CALENDAR_EVENT_APPOINTMENT ? "calendar" : "tasks");
75 -
76 - retval = gdk_spawn_command_line_on_screen (screen, command_line, error);
77 -
78 - g_free (command_line);
79 -
80 - return retval;
81 -}
82 diff -u -r1.4 calendar-client.h
83 --- applets/clock/calendar-client.h 19 Jul 2004 19:11:14 -0000 1.4
84 +++ applets/clock/calendar-client.h 27 Dec 2004 09:07:15 -0000
85 @@ -27,7 +27,6 @@
86 #define __CALENDAR_CLIENT_H__
87
88 #include <glib-object.h>
89 -#include <gdk/gdk.h>
90
91 G_BEGIN_DECLS
92
93 @@ -90,7 +89,6 @@
94 char *summary;
95 char *description;
96 char *color_string;
97 - char *url;
98 GTime start_time;
99 GTime due_time;
100 guint percent_complete;
101 @@ -139,10 +137,6 @@
102 char *task_uid,
103 gboolean task_completed,
104 guint percent_complete);
105 -gboolean calendar_client_launch_editor (CalendarClient *client,
106 - CalendarEventType event_type,
107 - GdkScreen *screen,
108 - GError **error);
109
110 void calendar_event_free (CalendarEvent *event);
111
112 --- applets/clock/clock.c 2005-01-25 01:37:50.000000000 +0100
113 +++ applets/clock/clock.c.mod 2005-01-25 01:42:25.000000000 +0100
114 @@ -545,7 +545,6 @@
115 TASK_COLUMN_COMPLETED_TIME,
116 TASK_COLUMN_OVERDUE_ATTR,
117 TASK_COLUMN_COLOR,
118 - TASK_COLUMN_URL,
119 N_TASK_COLUMNS
120 };
121
122 @@ -625,7 +624,6 @@
123 TASK_COLUMN_COMPLETED, task->percent_complete == 100,
124 TASK_COLUMN_COMPLETED_TIME, task->completed_time,
125 TASK_COLUMN_COLOR, task->color_string,
126 - TASK_COLUMN_URL, task->url,
127 -1);
128
129 g_free (percent_complete_text);
130 @@ -808,17 +806,21 @@
131 GtkTreeViewColumn *column,
132 ClockData *cd)
133 {
134 - GError *err = NULL;
135 GtkTreeIter iter;
136 - char *uri;
137 -
138 + gchar *command_line;
139 + gchar *uid;
140 +
141 gtk_tree_model_get_iter (GTK_TREE_MODEL (cd->tasks_model), &iter, path);
142 gtk_tree_model_get (GTK_TREE_MODEL (cd->tasks_model), &iter,
143 - TASK_COLUMN_URL, &uri, -1);
144 -
145 - if (uri)
146 - gnome_url_show (uri, &err);
147 -
148 + TASK_COLUMN_UID, &uid, -1);
149 +
150 + command_line = g_strdup_printf ("evolution task:%s", uid);
151 +
152 + gdk_spawn_command_line_on_screen (gtk_widget_get_screen (cd->calendar), command_line, NULL);
153 +
154 + g_free (command_line);
155 + g_free (uid);
156 +
157 return TRUE;
158 }
159
160 @@ -909,7 +911,6 @@
161 G_TYPE_LONG, /* completed time */
162 PANGO_TYPE_ATTR_LIST, /* summary text attributes */
163 G_TYPE_STRING, /* color */
164 - G_TYPE_STRING /* url */
165 };
166
167 cd->tasks_model = gtk_list_store_newv (N_TASK_COLUMNS, column_types);
168 @@ -1137,14 +1138,23 @@
169
170 static void
171 calendar_day_activated (ClockData *cd)
172 -{
173 - /* FIXME: should be able to launch the editor for
174 - * the specific day
175 - */
176 - calendar_client_launch_editor (cd->client,
177 - CALENDAR_EVENT_APPOINTMENT,
178 - gtk_widget_get_screen (cd->calendar),
179 - NULL);
180 +{
181 + guint day;
182 + guint year;
183 + guint month;
184 +
185 + GDate *date;
186 + gchar command_line[40];
187 +
188 + gtk_calendar_get_date (GTK_CALENDAR(cd->calendar), &year, &month, &day);
189 + date = g_date_new ();
190 + g_date_set_dmy (date, day, month + 1, year);
191 +
192 + g_date_strftime (command_line, sizeof (command_line), "evolution -c calendar date:%x", date);
193 + gdk_spawn_command_line_on_screen (gtk_widget_get_screen (cd->calendar), command_line, NULL);
194 + g_date_free (date);
195 +
196 + return;
197 }
198
199 static void
+0
-34
gnome-panel/debian/maintfiles/improved_open_recent_doc_in_term.patch.NEEDTESTING less more
0 --- gnome-panel/panel-recent.c.orig 2005-01-26 00:32:36.000000000 +0100
1 +++ gnome-panel/panel-recent.c 2005-01-26 00:39:22.000000000 +0100
2 @@ -49,6 +49,8 @@
3 char *path;
4 char *quoted;
5 gboolean ret = TRUE;
6 + GConfClient *client;
7 + gchar *terminal_exec, *terminal_exec_arg;
8
9 /* Don't allow suspicious looking URIs */
10 if (uri [0] == '-')
11 @@ -62,13 +64,18 @@
12 return FALSE;
13 }
14
15 +
16 str = g_string_new ("");
17
18 if (app->requires_terminal) {
19 - /* FIXME: we should use their preferred terminal
20 - * maybe a multiscreen variant of gnome_execcute_terminal_shell?
21 - */
22 - g_string_append_printf (str, "gnome-terminal -x %s", app->command);
23 + client = panel_gconf_get_client ();
24 + terminal_exec = gconf_client_get_string(client, "/desktop/gnome/applications/terminal/exec", NULL);
25 + terminal_exec_arg = gconf_client_get_string(client, "/desktop/gnome/applications/terminal/exec_arg", NULL);
26 +
27 + g_string_append_printf (str, "%s %s %s", terminal_exec, terminal_exec_arg, app->command);
28 +
29 + g_free(terminal_exec);
30 + g_free(terminal_exec_arg);
31 } else
32 str = g_string_append (str, app->command);
33
+0
-21
gnome-panel/debian/panel-test-applets.1 less more
0 .TH "panel-test-applets" "1"
1 .SH "NAME"
2 panel-test-applets \(em display installed applets
3 .SH "SYNOPSIS"
4 .PP
5 \fBpanel-test-applets\fR [\fB\-\-help \fP]
6 .SH "DESCRIPTION"
7 .PP
8 \fBpanel-test-applets\fR display installed applets in a
9 dialog box and does nothing else.
10 .SH "OPTIONS"
11 .IP "\fB\-\-help\fP" 10
12 Display help
13 .SH "SEE ALSO"
14 .PP
15 gnome-options(7)
16 .SH "AUTHOR"
17 .PP
18 This manual page was written by Christian Marillat marillat@debian.org for
19 the \fBDebian GNU/Linux\fP system (but may be used by others).
20 .\" created by instant / docbook-to-man, Sun 03 Dec 2006, 23:24
+0
-99
gnome-panel/debian/panel-test-applets.sgml less more
0 <!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
1
2 <!ENTITY dhfirstname "<firstname>Christian</firstname>">
3 <!ENTITY dhsurname "<surname>Marillat</surname>">
4 <!ENTITY dhdate "<date>december 7, 2003</date>">
5 <!ENTITY dhsection "<manvolnum>1</manvolnum>">
6 <!ENTITY dhemail "<email>marillat@debian.org</email>">
7 <!ENTITY dhusername "Christian Marillat">
8 <!ENTITY dhucpackage "<refentrytitle>panel-test-applets</refentrytitle>">
9 <!ENTITY dhpackage "panel-test-applets">
10 <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
11 <!ENTITY gnu "<acronym>GNU</acronym>">
12 ]>
13
14 <refentry>
15 <refentryinfo>
16 <address>
17 &dhemail;
18 </address>
19 <author>
20 &dhfirstname;
21 &dhsurname;
22 </author>
23 <copyright>
24 <year>2001</year>
25 <holder>&dhusername;</holder>
26 </copyright>
27 &dhdate;
28 </refentryinfo>
29 <refmeta>
30 &dhucpackage;
31
32 &dhsection;
33 </refmeta>
34 <refnamediv>
35 <refname>&dhpackage;</refname>
36
37 <refpurpose> display installed applets</refpurpose>
38 </refnamediv>
39 <refsynopsisdiv>
40 <cmdsynopsis>
41 <command>&dhpackage;</command>
42
43 <arg><option>--help </option></arg>
44
45 </cmdsynopsis>
46 </refsynopsisdiv>
47 <refsect1>
48 <title>DESCRIPTION</title>
49
50 <para><command>&dhpackage;</command> display installed applets in a
51 dialog box and does nothing else.</para>
52
53 </refsect1>
54
55 <refsect1>
56 <title>OPTIONS</title>
57
58 <variablelist>
59 <varlistentry>
60 <term><option>--help</option></term>
61 <listitem>
62 <para>Display help</para>
63 </listitem>
64 </varlistentry>
65 </variablelist>
66 </refsect1>
67
68 <refsect1>
69 <title>SEE ALSO</title>
70
71 <para>gnome-options(7)</para>
72 </refsect1>
73
74 <refsect1>
75 <title>AUTHOR</title>
76
77 <para>This manual page was written by &dhusername; &dhemail; for
78 the &debian; system (but may be used by others).</para>
79
80 </refsect1>
81 </refentry>
82
83 <!-- Keep this comment at the end of the file
84 Local variables:
85 mode: sgml
86 sgml-omittag:t
87 sgml-shorttag:t
88 sgml-minimize-attributes:nil
89 sgml-always-quote-attributes:t
90 sgml-indent-step:2
91 sgml-indent-data:t
92 sgml-parent-document:nil
93 sgml-default-dtd-file:nil
94 sgml-exposed-tags:nil
95 sgml-local-catalogs:nil
96 sgml-local-ecat-files:nil
97 End:
98 -->
+0
-15
gnome-panel/debian/patches/01_panel_submenus.patch less more
0 Index: gnome-panel-2.20.1/gnome-panel/panel-menu-button.c
1 ===================================================================
2 --- gnome-panel-2.20.1.orig/gnome-panel/panel-menu-button.c 2007-10-15 22:00:47.000000000 +0200
3 +++ gnome-panel-2.20.1/gnome-panel/panel-menu-button.c 2007-12-26 11:46:06.091893336 +0100
4 @@ -70,8 +70,8 @@ typedef struct {
5 } MenuPathRootItem;
6
7 static MenuPathRootItem root_items [] = {
8 - { APPLICATIONS_MENU, "applications", "applications.menu" },
9 - { SETTINGS_MENU, "settings", "settings.menu" }
10 + { APPLICATIONS_MENU, "applications", "gnome-applications.menu" },
11 + { SETTINGS_MENU, "settings", "gnome-settings.menu" }
12 };
13
14 struct _PanelMenuButtonPrivate {
+0
-39
gnome-panel/debian/patches/02_switch-user_lock.patch less more
0 Index: gnome-panel-2.20.1/gnome-panel/panel-logout.c
1 ===================================================================
2 --- gnome-panel-2.20.1.orig/gnome-panel/panel-logout.c 2007-10-15 22:00:47.000000000 +0200
3 +++ gnome-panel-2.20.1/gnome-panel/panel-logout.c 2007-12-26 11:46:19.628664753 +0100
4 @@ -35,6 +35,7 @@
5 #include "panel-power-manager.h"
6 #include "panel-session.h"
7 #include "panel-icon-names.h"
8 +#include "panel-util.h"
9
10 #define PANEL_LOGOUT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_LOGOUT_DIALOG, PanelLogoutDialogPrivate))
11
12 @@ -169,8 +170,10 @@ panel_logout_response (PanelLogoutDialog
13 gpointer data)
14 {
15 PanelPowerManager *power_manager;
16 + GdkScreen *screen;
17
18 power_manager = g_object_ref (logout_dialog->priv->power_manager);
19 + screen = g_object_ref (gtk_window_get_screen (GTK_WINDOW (logout_dialog)));
20 gtk_widget_destroy (GTK_WIDGET (logout_dialog));
21
22 switch (response_id) {
23 @@ -181,6 +184,7 @@ panel_logout_response (PanelLogoutDialog
24 panel_session_request_logout ();
25 break;
26 case PANEL_LOGOUT_RESPONSE_SWITCH_USER:
27 + panel_lock_screen (screen);
28 gdm_new_login ();
29 break;
30 case PANEL_LOGOUT_RESPONSE_SHUTDOWN:
31 @@ -206,6 +210,7 @@ panel_logout_response (PanelLogoutDialog
32 g_assert_not_reached ();
33 }
34 g_object_unref (power_manager);
35 + g_object_unref (screen);
36 }
37
38 static gboolean
+0
-253
gnome-panel/debian/patches/03_gnome-panel-logout.patch less more
0 Bugzilla #507391
1
2 Index: gnome-panel-2.20.3/gnome-panel/gnome-panel-logout.c
3 ===================================================================
4 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
5 +++ gnome-panel-2.20.3/gnome-panel/gnome-panel-logout.c 2008-02-16 17:47:32.099271109 +0100
6 @@ -0,0 +1,49 @@
7 +/* GNOME panel : logout/shutdown request standalone binary
8 + *
9 + * (C) 2007 Josselin Mouette
10 + */
11 +
12 +#include <config.h>
13 +
14 +#include <glib/gi18n.h>
15 +#include <libgnomeui/libgnomeui.h>
16 +
17 +#include "panel-logout.h"
18 +
19 +static gboolean shutdown_requested;
20 +
21 +static const GOptionEntry options[] = {
22 + { "shutdown", 0, 0, G_OPTION_ARG_NONE, &shutdown_requested, "Request a shutdown or reboot", NULL },
23 + { NULL }
24 +};
25 +
26 +int
27 +main (int argc, char **argv)
28 +{
29 + GOptionContext *context;
30 + GnomeProgram *program;
31 +
32 + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
33 + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
34 + textdomain (GETTEXT_PACKAGE);
35 +
36 + context = g_option_context_new ("");
37 +
38 + g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
39 +
40 + program = gnome_program_init ("gnome-panel-logout", VERSION,
41 + LIBGNOMEUI_MODULE,
42 + argc, argv,
43 + GNOME_PARAM_GOPTION_CONTEXT, context,
44 + GNOME_PROGRAM_STANDARD_PROPERTIES,
45 + NULL);
46 + gnome_client_set_restart_style (gnome_master_client (), GNOME_RESTART_NEVER);
47 +
48 + panel_logout_new (shutdown_requested?PANEL_LOGOUT_DIALOG_SHUTDOWN:PANEL_LOGOUT_DIALOG_LOGOUT,
49 + NULL,
50 + GDK_CURRENT_TIME);
51 +
52 + gtk_main ();
53 + g_object_unref (program);
54 + return 0;
55 +}
56 Index: gnome-panel-2.20.3/gnome-panel/panel-session.c
57 ===================================================================
58 --- gnome-panel-2.20.3.orig/gnome-panel/panel-session.c 2008-01-07 23:26:25.000000000 +0100
59 +++ gnome-panel-2.20.3/gnome-panel/panel-session.c 2008-02-16 17:47:32.099271109 +0100
60 @@ -29,8 +29,10 @@
61
62 #include <stdlib.h>
63
64 +#ifndef BUILDING_STANDALONE_LOGOUT
65 #include "panel-profile.h"
66 #include "panel-shell.h"
67 +#endif // BUILDING_STANDALONE_LOGOUT
68
69 void
70 panel_session_request_logout (void)
71 @@ -60,6 +62,7 @@ panel_session_request_logout (void)
72 recursion_guard--;
73 }
74
75 +#ifndef BUILDING_STANDALONE_LOGOUT
76 static void
77 panel_session_handle_die_request (GnomeClient *client)
78 {
79 @@ -107,3 +110,4 @@ panel_session_init (void)
80 g_signal_connect (client, "die",
81 G_CALLBACK (panel_session_handle_die_request), NULL);
82 }
83 +#endif // BUILDING_STANDALONE_LOGOUT
84 Index: gnome-panel-2.20.3/gnome-panel/panel-util.c
85 ===================================================================
86 --- gnome-panel-2.20.3.orig/gnome-panel/panel-util.c 2008-01-07 23:26:25.000000000 +0100
87 +++ gnome-panel-2.20.3/gnome-panel/panel-util.c 2008-02-16 17:47:32.099271109 +0100
88 @@ -31,6 +31,7 @@
89 #include <libgnomevfs/gnome-vfs-uri.h>
90 #include <libgnomevfs/gnome-vfs-ops.h>
91
92 +#ifndef BUILDING_STANDALONE_LOGOUT
93 #include "applet.h"
94 #include "nothing.h"
95 #include "xstuff.h"
96 @@ -468,6 +469,7 @@ panel_pop_window_busy (GtkWidget *window
97 GINT_TO_POINTER (busy));
98 }
99 }
100 +#endif // BUILDING_STANDALONE_LOGOUT
101
102 gboolean
103 panel_is_program_in_path (const char *program)
104 @@ -481,6 +483,7 @@ panel_is_program_in_path (const char *pr
105 }
106 }
107
108 +#ifndef BUILDING_STANDALONE_LOGOUT
109 static gboolean
110 panel_ensure_dir (const char *dirname)
111 {
112 @@ -732,6 +735,7 @@ panel_load_icon (GtkIconTheme *icon_the
113
114 return retval;
115 }
116 +#endif // BUILDING_STANDALONE_LOGOUT
117
118 static char *
119 panel_lock_screen_action_get_command (const char *action)
120 @@ -804,6 +808,7 @@ panel_lock_screen_action (GdkScreen *sc
121 return;
122
123 if (!gdk_spawn_command_line_on_screen (screen, command, &error)) {
124 +#ifndef BUILDING_STANDALONE_LOGOUT
125 char *primary;
126
127 primary = g_strdup_printf (_("Could not execute '%s'"),
128 @@ -812,6 +817,7 @@ panel_lock_screen_action (GdkScreen *sc
129 "cannot_exec_screensaver", TRUE,
130 primary, error->message);
131 g_free (primary);
132 +#endif // BUILDING_STANDALONE_LOGOUT
133 g_error_free (error);
134 }
135
136 @@ -825,6 +831,7 @@ panel_lock_screen (GdkScreen *screen)
137 }
138
139
140 +#ifndef BUILDING_STANDALONE_LOGOUT
141 char *
142 panel_make_full_path (const char *dir,
143 const char *filename)
144 @@ -1579,3 +1586,4 @@ panel_util_set_tooltip_text (GtkWidget
145 G_CALLBACK (panel_util_query_tooltip_cb),
146 g_strdup (text), (GClosureNotify) g_free, 0);
147 }
148 +#endif // BUILDING_STANDALONE_LOGOUT
149 Index: gnome-panel-2.20.3/configure.in
150 ===================================================================
151 --- gnome-panel-2.20.3.orig/configure.in 2008-01-07 23:33:56.000000000 +0100
152 +++ gnome-panel-2.20.3/configure.in 2008-02-16 17:47:32.099271109 +0100
153 @@ -72,6 +72,10 @@ PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $O
154 AC_SUBST(PANEL_CFLAGS)
155 AC_SUBST(PANEL_LIBS)
156
157 +PKG_CHECK_MODULES(LOGOUT, gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
158 +AC_SUBST(LOGOUT_CFLAGS)
159 +AC_SUBST(LOGOUT_LIBS)
160 +
161 PKG_CHECK_MODULES(LIBPANEL_APPLET, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED)
162 AC_SUBST(LIBPANEL_APPLET_CFLAGS)
163 AC_SUBST(LIBPANEL_APPLET_LIBS)
164 Index: gnome-panel-2.20.3/gnome-panel/Makefile.am
165 ===================================================================
166 --- gnome-panel-2.20.3.orig/gnome-panel/Makefile.am 2008-01-07 23:26:25.000000000 +0100
167 +++ gnome-panel-2.20.3/gnome-panel/Makefile.am 2008-02-16 17:47:32.099271109 +0100
168 @@ -29,6 +29,7 @@ STANDARD_PROPERTIES_CFLAGS = \
169
170 bin_PROGRAMS = \
171 gnome-panel \
172 + gnome-panel-logout \
173 gnome-desktop-item-edit
174
175 $(gnome_panel_OBJECTS): $(BUILT_SOURCES)
176 @@ -163,6 +164,22 @@ gnome_panel_LDADD = \
177
178 gnome_panel_LDFLAGS = -export-dynamic
179
180 +gnome_panel_logout_SOURCES = \
181 + gnome-panel-logout.c \
182 + panel-logout.c \
183 + panel-gdm.c \
184 + panel-power-manager.c \
185 + panel-session.c \
186 + panel-util.c
187 +
188 +gnome_panel_logout_CFLAGS = -DBUILDING_STANDALONE_LOGOUT
189 +
190 +gnome_panel_logout_LDADD = \
191 + $(LOGOUT_LIBS) \
192 + $(X_LIBS)
193 +
194 +gnome_panel_logout_LDFLAGS = -export-dynamic
195 +
196 gnome_desktop_item_edit_SOURCES = \
197 gnome-desktop-item-edit.c \
198 panel-ditem-editor.c \
199 Index: gnome-panel-2.20.3/gnome-panel/panel-logout.c
200 ===================================================================
201 --- gnome-panel-2.20.3.orig/gnome-panel/panel-logout.c 2008-02-16 17:47:30.959270722 +0100
202 +++ gnome-panel-2.20.3/gnome-panel/panel-logout.c 2008-02-16 17:50:26.587269360 +0100
203 @@ -177,8 +177,6 @@ panel_logout_response (PanelLogoutDialog
204 gtk_widget_destroy (GTK_WIDGET (logout_dialog));
205
206 switch (response_id) {
207 - case GTK_RESPONSE_CANCEL:
208 - break;
209 case PANEL_LOGOUT_RESPONSE_LOGOUT:
210 gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
211 panel_session_request_logout ();
212 @@ -203,6 +201,7 @@ panel_logout_response (PanelLogoutDialog
213 if (panel_power_manager_can_suspend (power_manager))
214 panel_power_manager_attempt_suspend (power_manager);
215 break;
216 + case GTK_RESPONSE_CANCEL:
217 case GTK_RESPONSE_NONE:
218 case GTK_RESPONSE_DELETE_EVENT:
219 break;
220 @@ -211,6 +210,9 @@ panel_logout_response (PanelLogoutDialog
221 }
222 g_object_unref (power_manager);
223 g_object_unref (screen);
224 +#ifdef BUILDING_STANDALONE_LOGOUT
225 + gtk_main_quit ();
226 +#endif
227 }
228
229 static gboolean
230 @@ -307,8 +309,10 @@ panel_logout_new (PanelLogoutDialogType
231
232 if (current_dialog != NULL) {
233 if (current_dialog->priv->type == type) {
234 - gtk_window_set_screen (GTK_WINDOW (current_dialog),
235 - screen);
236 + if (screen) {
237 + gtk_window_set_screen (GTK_WINDOW (current_dialog),
238 + screen);
239 + }
240 gtk_window_present_with_time (GTK_WINDOW (current_dialog),
241 activate_time);
242 panel_logout_set_timeout (current_dialog);
243 @@ -391,6 +395,8 @@ panel_logout_new (PanelLogoutDialogType
244
245 panel_logout_set_timeout (logout_dialog);
246
247 - gtk_window_set_screen (GTK_WINDOW (logout_dialog), screen);
248 + if (screen) {
249 + gtk_window_set_screen (GTK_WINDOW (logout_dialog), screen);
250 + }
251 gtk_widget_show (GTK_WIDGET (logout_dialog));
252 }
+0
-32
gnome-panel/debian/patches/04_logout-center.patch less more
0 Debian #478318
1 GNOME #514026
2 Upstream commit r10815
3
4 Index: gnome-panel-2.20.3/gnome-panel/panel-logout.c
5 ===================================================================
6 --- gnome-panel-2.20.3.orig/gnome-panel/panel-logout.c 2008-05-11 02:17:51.771422457 +0200
7 +++ gnome-panel-2.20.3/gnome-panel/panel-logout.c 2008-05-11 02:18:09.759921670 +0200
8 @@ -25,6 +25,8 @@
9
10 #include <config.h>
11
12 +#include <string.h>
13 +
14 #include <glib/gi18n.h>
15 #include <gtk/gtkimage.h>
16 #include <gtk/gtklabel.h>
17 @@ -141,6 +143,8 @@ panel_logout_init (PanelLogoutDialog *lo
18 gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE);
19 gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
20 gtk_window_stick (GTK_WINDOW (logout_dialog));
21 + gtk_window_set_position (GTK_WINDOW (logout_dialog),
22 + GTK_WIN_POS_CENTER_ALWAYS);
23
24 logout_dialog->priv->power_manager = panel_get_power_manager ();
25
26 @@ -399,4 +403,5 @@ panel_logout_new (PanelLogoutDialogType
27 gtk_window_set_screen (GTK_WINDOW (logout_dialog), screen);
28 }
29 gtk_widget_show (GTK_WIDGET (logout_dialog));
30 + gdk_window_focus (GTK_WIDGET (current_dialog)->window, activate_time);
31 }
+0
-26
gnome-panel/debian/patches/05_missing_includes.patch less more
0 GNOME #436836; Debian #314692.
1
2 Index: gnome-panel-2.20.1/applets/clock/clock.c
3 ===================================================================
4 --- gnome-panel-2.20.1.orig/applets/clock/clock.c 2007-10-15 22:00:49.000000000 +0200
5 +++ gnome-panel-2.20.1/applets/clock/clock.c 2007-12-26 11:46:28.397164441 +0100
6 @@ -31,6 +31,7 @@
7
8 #include "config.h"
9
10 +#include <stdlib.h>
11 #include <stdio.h>
12 #include <sys/stat.h>
13 #include <unistd.h>
14 Index: gnome-panel-2.20.1/gnome-panel/panel.c
15 ===================================================================
16 --- gnome-panel-2.20.1.orig/gnome-panel/panel.c 2007-10-15 22:00:47.000000000 +0200
17 +++ gnome-panel-2.20.1/gnome-panel/panel.c 2007-12-26 11:46:28.397164441 +0100
18 @@ -24,6 +24,7 @@
19 #include <libgnomevfs/gnome-vfs-ops.h>
20 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
21 #include <libgnomevfs/gnome-vfs-file-info.h>
22 +#include <libgnomevfs/gnome-vfs-utils.h>
23
24 #include "panel.h"
25
+0
-81
gnome-panel/debian/patches/06_calendar_crashes.patch less more
0 Upstream r10989, r10995, r10996.
1 Fixes GNOME #378854, #488819.
2 Debian #484323.
3
4 Index: gnome-panel-2.20.3/applets/clock/calendar-sources.c
5 ===================================================================
6 --- gnome-panel-2.20.3.orig/applets/clock/calendar-sources.c 2008-06-03 20:39:28.929686105 +0200
7 +++ gnome-panel-2.20.3/applets/clock/calendar-sources.c 2008-06-03 20:39:36.485691687 +0200
8 @@ -87,6 +87,10 @@ static void calendar_sources_class_init
9 static void calendar_sources_init (CalendarSources *sources);
10 static void calendar_sources_finalize (GObject *object);
11
12 +static void backend_died_cb (ECal *client, CalendarSourceData *source_data);
13 +static void calendar_sources_esource_list_changed (ESourceList *source_list,
14 + CalendarSourceData *source_data);
15 +
16 enum
17 {
18 APPOINTMENT_SOURCES_CHANGED,
19 @@ -206,11 +210,22 @@ calendar_sources_finalize_source_data (C
20 }
21
22 for (l = source_data->clients; l; l = l->next)
23 - g_object_unref (l->data);
24 + {
25 + g_signal_handlers_disconnect_by_func (G_OBJECT (l->data),
26 + G_CALLBACK (backend_died_cb),
27 + source_data);
28 + g_object_unref (l->data);
29 + }
30 + g_slist_free (source_data->clients);
31 source_data->clients = NULL;
32
33 if (source_data->esource_list)
34 - g_object_unref (source_data->esource_list);
35 + {
36 + g_signal_handlers_disconnect_by_func (source_data->esource_list,
37 + G_CALLBACK (calendar_sources_esource_list_changed),
38 + source_data);
39 + g_object_unref (source_data->esource_list);
40 + }
41 source_data->esource_list = NULL;
42
43 for (l = source_data->selected_sources; l; l = l->next)
44 @@ -483,9 +498,6 @@ calendar_sources_load_esource_list (Cale
45 if (is_source_selected (esource, source_data->selected_sources) &&
46 (client = load_esource (esource, source_data->source_type, source_data->clients)))
47 {
48 - g_signal_connect (G_OBJECT (client), "backend_died",
49 - G_CALLBACK (backend_died_cb), source_data);
50 -
51 loaded_clients = g_slist_prepend (loaded_clients, client);
52 }
53 }
54 @@ -497,10 +509,25 @@ calendar_sources_load_esource_list (Cale
55 emit_signal = TRUE;
56
57 for (l = source_data->clients; l; l = l->next)
58 - g_object_unref (l->data);
59 + {
60 + g_signal_handlers_disconnect_by_func (G_OBJECT (l->data),
61 + G_CALLBACK (backend_died_cb),
62 + source_data);
63 +
64 + g_object_unref (l->data);
65 + }
66 g_slist_free (source_data->clients);
67 source_data->clients = g_slist_reverse (loaded_clients);
68
69 + /* connect to backend_died after we disconnected the previous signal
70 + * handlers. If we do it before, we'll lose some handlers (for clients that
71 + * were already there before) */
72 + for (l = source_data->clients; l; l = l->next)
73 + {
74 + g_signal_connect (G_OBJECT (l->data), "backend_died",
75 + G_CALLBACK (backend_died_cb), source_data);
76 + }
77 +
78 if (emit_signal)
79 {
80 dprintf ("Emitting %s-sources-changed signal\n",
+0
-17
gnome-panel/debian/patches/60_caldav-clock-appointments.patch less more
0 calendar-window.c: (is_appointment): Merge fix by Roland Mas to match "caldav:"
1 as well. GNOME #501569, Debian #454318.
2
3 --- gnome-panel-2.20.2/applets/clock/calendar-window.c 2007-11-27 01:02:56.000000000 +0100
4 +++ gnome-panel-2.20.2.new/applets/clock/calendar-window.c 2007-12-04 18:22:47.000000000 +0100
5 @@ -369,8 +369,9 @@
6
7 gtk_tree_model_get (model, iter, APPOINTMENT_COLUMN_URI, &uri, -1);
8 if (uri)
9 - return (strcmp (uri, "file") == 0 ||
10 - strcmp (uri, "webcal") == 0);
11 + return (strcmp (uri, "file") == 0 ||
12 + strcmp (uri, "webcal") == 0 ||
13 + strcmp (uri, "caldav") == 0);
14 return FALSE;
15 }
16
+0
-23531
gnome-panel/debian/patches/70_relibtoolize.patch less more
0 Generated with:
1 libtoolize --force --copy
2 aclocal-1.9 -I m4
3 autoconf
4 automake-1.9
5 autoheader
6 rm -rf autom4te.cache/
7
8 diff -Naur gnome-panel-2.20.3.old/aclocal.m4 gnome-panel-2.20.3/aclocal.m4
9 --- gnome-panel-2.20.3.old/aclocal.m4 2008-01-07 23:35:01.000000000 +0100
10 +++ gnome-panel-2.20.3/aclocal.m4 2008-01-12 07:11:48.000000000 +0100
11 @@ -11,5272 +11,4767 @@
12 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13 # PARTICULAR PURPOSE.
14
15 -m4_if(m4_PACKAGE_VERSION, [2.60],,
16 -[m4_fatal([this file was generated for autoconf 2.60.
17 +m4_if(m4_PACKAGE_VERSION, [2.61],,
18 +[m4_fatal([this file was generated for autoconf 2.61.
19 You have another version of autoconf. If you want to use that,
20 you should regenerate the build system entirely.], [63])])
21
22 -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
23 -#
24 -# This file is free software; the Free Software Foundation
25 -# gives unlimited permission to copy and/or distribute it,
26 -# with or without modifications, as long as this notice is preserved.
27 +dnl AM_GCONF_SOURCE_2
28 +dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
29 +dnl (i.e. pass to gconftool-2
30 +dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
31 +dnl you should install foo.schemas files
32 +dnl
33
34 -# AM_AUTOMAKE_VERSION(VERSION)
35 -# ----------------------------
36 -# Automake X.Y traces this macro to ensure aclocal.m4 has been
37 -# generated from the m4 files accompanying Automake X.Y.
38 -# (This private macro should not be called outside this file.)
39 -AC_DEFUN([AM_AUTOMAKE_VERSION],
40 -[am__api_version='1.10'
41 -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
42 -dnl require some minimum version. Point them to the right macro.
43 -m4_if([$1], [1.10], [],
44 - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
45 -])
46 +AC_DEFUN([AM_GCONF_SOURCE_2],
47 +[
48 + if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
49 + GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
50 + else
51 + GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
52 + fi
53
54 -# _AM_AUTOCONF_VERSION(VERSION)
55 -# -----------------------------
56 -# aclocal traces this macro to find the Autoconf version.
57 -# This is a private macro too. Using m4_define simplifies
58 -# the logic in aclocal, which can simply ignore this definition.
59 -m4_define([_AM_AUTOCONF_VERSION], [])
60 + AC_ARG_WITH(gconf-source,
61 + [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
62
63 -# AM_SET_CURRENT_AUTOMAKE_VERSION
64 -# -------------------------------
65 -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
66 -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
67 -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
68 -[AM_AUTOMAKE_VERSION([1.10])dnl
69 -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
70 + AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
71 + AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
72
73 -# AM_AUX_DIR_EXPAND -*- Autoconf -*-
74 + if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
75 + GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
76 + fi
77
78 -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
79 -#
80 -# This file is free software; the Free Software Foundation
81 -# gives unlimited permission to copy and/or distribute it,
82 -# with or without modifications, as long as this notice is preserved.
83 + AC_ARG_WITH(gconf-schema-file-dir,
84 + [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
85
86 -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
87 -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
88 -# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
89 + AC_SUBST(GCONF_SCHEMA_FILE_DIR)
90 + AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
91 +
92 + AC_ARG_ENABLE(schemas-install,
93 + [ --disable-schemas-install Disable the schemas installation],
94 + [case ${enableval} in
95 + yes|no) ;;
96 + *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
97 + esac])
98 + AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
99 +])
100 +
101 +# Copyright (C) 1995-2002 Free Software Foundation, Inc.
102 +# Copyright (C) 2001-2003,2004 Red Hat, Inc.
103 #
104 -# Of course, Automake must honor this variable whenever it calls a
105 -# tool from the auxiliary directory. The problem is that $srcdir (and
106 -# therefore $ac_aux_dir as well) can be either absolute or relative,
107 -# depending on how configure is run. This is pretty annoying, since
108 -# it makes $ac_aux_dir quite unusable in subdirectories: in the top
109 -# source directory, any form will work fine, but in subdirectories a
110 -# relative path needs to be adjusted first.
111 +# This file is free software, distributed under the terms of the GNU
112 +# General Public License. As a special exception to the GNU General
113 +# Public License, this file may be distributed as part of a program
114 +# that contains a configuration script generated by Autoconf, under
115 +# the same distribution terms as the rest of that program.
116 #
117 -# $ac_aux_dir/missing
118 -# fails when called from a subdirectory if $ac_aux_dir is relative
119 -# $top_srcdir/$ac_aux_dir/missing
120 -# fails if $ac_aux_dir is absolute,
121 -# fails when called from a subdirectory in a VPATH build with
122 -# a relative $ac_aux_dir
123 +# This file can be copied and used freely without restrictions. It can
124 +# be used in projects which are not available under the GNU Public License
125 +# but which still want to provide support for the GNU gettext functionality.
126 #
127 -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
128 -# are both prefixed by $srcdir. In an in-source build this is usually
129 -# harmless because $srcdir is `.', but things will broke when you
130 -# start a VPATH build or use an absolute $srcdir.
131 +# Macro to add for using GNU gettext.
132 +# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
133 #
134 -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
135 -# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
136 -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
137 -# and then we would define $MISSING as
138 -# MISSING="\${SHELL} $am_aux_dir/missing"
139 -# This will work as long as MISSING is not called from configure, because
140 -# unfortunately $(top_srcdir) has no meaning in configure.
141 -# However there are other variables, like CC, which are often used in
142 -# configure, and could therefore not use this "fixed" $ac_aux_dir.
143 +# Modified to never use included libintl.
144 +# Owen Taylor <otaylor@redhat.com>, 12/15/1998
145 #
146 -# Another solution, used here, is to always expand $ac_aux_dir to an
147 -# absolute PATH. The drawback is that using absolute paths prevent a
148 -# configured tree to be moved without reconfiguration.
149 -
150 -AC_DEFUN([AM_AUX_DIR_EXPAND],
151 -[dnl Rely on autoconf to set up CDPATH properly.
152 -AC_PREREQ([2.50])dnl
153 -# expand $ac_aux_dir to an absolute path
154 -am_aux_dir=`cd $ac_aux_dir && pwd`
155 -])
156 -
157 -# AM_CONDITIONAL -*- Autoconf -*-
158 -
159 -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
160 -# Free Software Foundation, Inc.
161 +# Major rework to remove unused code
162 +# Owen Taylor <otaylor@redhat.com>, 12/11/2002
163 #
164 -# This file is free software; the Free Software Foundation
165 -# gives unlimited permission to copy and/or distribute it,
166 -# with or without modifications, as long as this notice is preserved.
167 +# Added better handling of ALL_LINGUAS from GNU gettext version
168 +# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
169 +#
170 +# Modified to require ngettext
171 +# Matthias Clasen <mclasen@redhat.com> 08/06/2004
172 +#
173 +# We need this here as well, since someone might use autoconf-2.5x
174 +# to configure GLib then an older version to configure a package
175 +# using AM_GLIB_GNU_GETTEXT
176 +AC_PREREQ(2.53)
177
178 -# serial 8
179 +dnl
180 +dnl We go to great lengths to make sure that aclocal won't
181 +dnl try to pull in the installed version of these macros
182 +dnl when running aclocal in the glib directory.
183 +dnl
184 +m4_copy([AC_DEFUN],[glib_DEFUN])
185 +m4_copy([AC_REQUIRE],[glib_REQUIRE])
186 +dnl
187 +dnl At the end, if we're not within glib, we'll define the public
188 +dnl definitions in terms of our private definitions.
189 +dnl
190
191 -# AM_CONDITIONAL(NAME, SHELL-CONDITION)
192 -# -------------------------------------
193 -# Define a conditional.
194 -AC_DEFUN([AM_CONDITIONAL],
195 -[AC_PREREQ(2.52)dnl
196 - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
197 - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
198 -AC_SUBST([$1_TRUE])dnl
199 -AC_SUBST([$1_FALSE])dnl
200 -_AM_SUBST_NOTMAKE([$1_TRUE])dnl
201 -_AM_SUBST_NOTMAKE([$1_FALSE])dnl
202 -if $2; then
203 - $1_TRUE=
204 - $1_FALSE='#'
205 +# GLIB_LC_MESSAGES
206 +#--------------------
207 +glib_DEFUN([GLIB_LC_MESSAGES],
208 + [AC_CHECK_HEADERS([locale.h])
209 + if test $ac_cv_header_locale_h = yes; then
210 + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
211 + [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
212 + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
213 + if test $am_cv_val_LC_MESSAGES = yes; then
214 + AC_DEFINE(HAVE_LC_MESSAGES, 1,
215 + [Define if your <locale.h> file defines LC_MESSAGES.])
216 + fi
217 + fi])
218 +
219 +# GLIB_PATH_PROG_WITH_TEST
220 +#----------------------------
221 +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
222 +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
223 +glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
224 +[# Extract the first word of "$2", so it can be a program name with args.
225 +set dummy $2; ac_word=[$]2
226 +AC_MSG_CHECKING([for $ac_word])
227 +AC_CACHE_VAL(ac_cv_path_$1,
228 +[case "[$]$1" in
229 + /*)
230 + ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
231 + ;;
232 + *)
233 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
234 + for ac_dir in ifelse([$5], , $PATH, [$5]); do
235 + test -z "$ac_dir" && ac_dir=.
236 + if test -f $ac_dir/$ac_word; then
237 + if [$3]; then
238 + ac_cv_path_$1="$ac_dir/$ac_word"
239 + break
240 + fi
241 + fi
242 + done
243 + IFS="$ac_save_ifs"
244 +dnl If no 4th arg is given, leave the cache variable unset,
245 +dnl so AC_PATH_PROGS will keep looking.
246 +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
247 +])dnl
248 + ;;
249 +esac])dnl
250 +$1="$ac_cv_path_$1"
251 +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
252 + AC_MSG_RESULT([$]$1)
253 else
254 - $1_TRUE='#'
255 - $1_FALSE=
256 + AC_MSG_RESULT(no)
257 fi
258 -AC_CONFIG_COMMANDS_PRE(
259 -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
260 - AC_MSG_ERROR([[conditional "$1" was never defined.
261 -Usually this means the macro was only invoked conditionally.]])
262 -fi])])
263 +AC_SUBST($1)dnl
264 +])
265
266 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
267 -# Free Software Foundation, Inc.
268 -#
269 -# This file is free software; the Free Software Foundation
270 -# gives unlimited permission to copy and/or distribute it,
271 -# with or without modifications, as long as this notice is preserved.
272 +# GLIB_WITH_NLS
273 +#-----------------
274 +glib_DEFUN([GLIB_WITH_NLS],
275 + dnl NLS is obligatory
276 + [AC_REQUIRE([AC_CANONICAL_HOST])dnl
277 + USE_NLS=yes
278 + AC_SUBST(USE_NLS)
279
280 -# serial 9
281 + gt_cv_have_gettext=no
282
283 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
284 -# written in clear, in which case automake, when reading aclocal.m4,
285 -# will think it sees a *use*, and therefore will trigger all it's
286 -# C support machinery. Also note that it means that autoscan, seeing
287 -# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
288 + CATOBJEXT=NONE
289 + XGETTEXT=:
290 + INTLLIBS=
291
292 + AC_CHECK_HEADER(libintl.h,
293 + [gt_cv_func_dgettext_libintl="no"
294 + libintl_extra_libs=""
295
296 -# _AM_DEPENDENCIES(NAME)
297 -# ----------------------
298 -# See how the compiler implements dependency checking.
299 -# NAME is "CC", "CXX", "GCJ", or "OBJC".
300 -# We try a few techniques and use that to set a single cache variable.
301 -#
302 -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
303 -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
304 -# dependency, and given that the user is not expected to run this macro,
305 -# just rely on AC_PROG_CC.
306 -AC_DEFUN([_AM_DEPENDENCIES],
307 -[AC_REQUIRE([AM_SET_DEPDIR])dnl
308 -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
309 -AC_REQUIRE([AM_MAKE_INCLUDE])dnl
310 -AC_REQUIRE([AM_DEP_TRACK])dnl
311 + #
312 + # First check in libc
313 + #
314 + AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
315 + [AC_TRY_LINK([
316 +#include <libintl.h>
317 +],
318 + [return !ngettext ("","", 1)],
319 + gt_cv_func_ngettext_libc=yes,
320 + gt_cv_func_ngettext_libc=no)
321 + ])
322 +
323 + if test "$gt_cv_func_ngettext_libc" = "yes" ; then
324 + AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
325 + [AC_TRY_LINK([
326 +#include <libintl.h>
327 +],
328 + [return !dgettext ("","")],
329 + gt_cv_func_dgettext_libc=yes,
330 + gt_cv_func_dgettext_libc=no)
331 + ])
332 + fi
333 +
334 + if test "$gt_cv_func_ngettext_libc" = "yes" ; then
335 + AC_CHECK_FUNCS(bind_textdomain_codeset)
336 + fi
337
338 -ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
339 - [$1], CXX, [depcc="$CXX" am_compiler_list=],
340 - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
341 - [$1], UPC, [depcc="$UPC" am_compiler_list=],
342 - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
343 - [depcc="$$1" am_compiler_list=])
344 + #
345 + # If we don't have everything we want, check in libintl
346 + #
347 + if test "$gt_cv_func_dgettext_libc" != "yes" \
348 + || test "$gt_cv_func_ngettext_libc" != "yes" \
349 + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
350 +
351 + AC_CHECK_LIB(intl, bindtextdomain,
352 + [AC_CHECK_LIB(intl, ngettext,
353 + [AC_CHECK_LIB(intl, dgettext,
354 + gt_cv_func_dgettext_libintl=yes)])])
355
356 -AC_CACHE_CHECK([dependency style of $depcc],
357 - [am_cv_$1_dependencies_compiler_type],
358 -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
359 - # We make a subdir and do the tests there. Otherwise we can end up
360 - # making bogus files that we don't know about and never remove. For
361 - # instance it was reported that on HP-UX the gcc test will end up
362 - # making a dummy file named `D' -- because `-MD' means `put the output
363 - # in D'.
364 - mkdir conftest.dir
365 - # Copy depcomp to subdir because otherwise we won't find it if we're
366 - # using a relative directory.
367 - cp "$am_depcomp" conftest.dir
368 - cd conftest.dir
369 - # We will build objects and dependencies in a subdirectory because
370 - # it helps to detect inapplicable dependency modes. For instance
371 - # both Tru64's cc and ICC support -MD to output dependencies as a
372 - # side effect of compilation, but ICC will put the dependencies in
373 - # the current directory while Tru64 will put them in the object
374 - # directory.
375 - mkdir sub
376 + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
377 + AC_MSG_CHECKING([if -liconv is needed to use gettext])
378 + AC_MSG_RESULT([])
379 + AC_CHECK_LIB(intl, ngettext,
380 + [AC_CHECK_LIB(intl, dcgettext,
381 + [gt_cv_func_dgettext_libintl=yes
382 + libintl_extra_libs=-liconv],
383 + :,-liconv)],
384 + :,-liconv)
385 + fi
386
387 - am_cv_$1_dependencies_compiler_type=none
388 - if test "$am_compiler_list" = ""; then
389 - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
390 - fi
391 - for depmode in $am_compiler_list; do
392 - # Setup a source with many dependencies, because some compilers
393 - # like to wrap large dependency lists on column 80 (with \), and
394 - # we should not choose a depcomp mode which is confused by this.
395 - #
396 - # We need to recreate these files for each test, as the compiler may
397 - # overwrite some of them when testing with obscure command lines.
398 - # This happens at least with the AIX C compiler.
399 - : > sub/conftest.c
400 - for i in 1 2 3 4 5 6; do
401 - echo '#include "conftst'$i'.h"' >> sub/conftest.c
402 - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
403 - # Solaris 8's {/usr,}/bin/sh.
404 - touch sub/conftst$i.h
405 - done
406 - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
407 + #
408 + # If we found libintl, then check in it for bind_textdomain_codeset();
409 + # we'll prefer libc if neither have bind_textdomain_codeset(),
410 + # and both have dgettext and ngettext
411 + #
412 + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
413 + glib_save_LIBS="$LIBS"
414 + LIBS="$LIBS -lintl $libintl_extra_libs"
415 + unset ac_cv_func_bind_textdomain_codeset
416 + AC_CHECK_FUNCS(bind_textdomain_codeset)
417 + LIBS="$glib_save_LIBS"
418
419 - case $depmode in
420 - nosideeffect)
421 - # after this tag, mechanisms are not by side-effect, so they'll
422 - # only be used when explicitly requested
423 - if test "x$enable_dependency_tracking" = xyes; then
424 - continue
425 - else
426 - break
427 + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
428 + gt_cv_func_dgettext_libc=no
429 + else
430 + if test "$gt_cv_func_dgettext_libc" = "yes" \
431 + && test "$gt_cv_func_ngettext_libc" = "yes"; then
432 + gt_cv_func_dgettext_libintl=no
433 + fi
434 + fi
435 + fi
436 fi
437 - ;;
438 - none) break ;;
439 - esac
440 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
441 - # mode. It turns out that the SunPro C++ compiler does not properly
442 - # handle `-M -o', and we need to detect this.
443 - if depmode=$depmode \
444 - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
445 - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
446 - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
447 - >/dev/null 2>conftest.err &&
448 - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
449 - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
450 - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
451 - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
452 - # icc doesn't choke on unknown options, it will just issue warnings
453 - # or remarks (even with -Werror). So we grep stderr for any message
454 - # that says an option was ignored or not supported.
455 - # When given -MP, icc 7.0 and 7.1 complain thusly:
456 - # icc: Command line warning: ignoring option '-M'; no argument required
457 - # The diagnosis changed in icc 8.0:
458 - # icc: Command line remark: option '-MP' not supported
459 - if (grep 'ignoring option' conftest.err ||
460 - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
461 - am_cv_$1_dependencies_compiler_type=$depmode
462 - break
463 +
464 + if test "$gt_cv_func_dgettext_libc" = "yes" \
465 + || test "$gt_cv_func_dgettext_libintl" = "yes"; then
466 + gt_cv_have_gettext=yes
467 + fi
468 +
469 + if test "$gt_cv_func_dgettext_libintl" = "yes"; then
470 + INTLLIBS="-lintl $libintl_extra_libs"
471 + fi
472 +
473 + if test "$gt_cv_have_gettext" = "yes"; then
474 + AC_DEFINE(HAVE_GETTEXT,1,
475 + [Define if the GNU gettext() function is already present or preinstalled.])
476 + GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
477 + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
478 + if test "$MSGFMT" != "no"; then
479 + glib_save_LIBS="$LIBS"
480 + LIBS="$LIBS $INTLLIBS"
481 + AC_CHECK_FUNCS(dcgettext)
482 + MSGFMT_OPTS=
483 + AC_MSG_CHECKING([if msgfmt accepts -c])
484 + GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
485 +msgid ""
486 +msgstr ""
487 +"Content-Type: text/plain; charset=UTF-8\n"
488 +"Project-Id-Version: test 1.0\n"
489 +"PO-Revision-Date: 2007-02-15 12:01+0100\n"
490 +"Last-Translator: test <foo@bar.xx>\n"
491 +"Language-Team: C <LL@li.org>\n"
492 +"MIME-Version: 1.0\n"
493 +"Content-Transfer-Encoding: 8bit\n"
494 +], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
495 + AC_SUBST(MSGFMT_OPTS)
496 + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
497 + GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
498 + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
499 + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
500 + return _nl_msg_cat_cntr],
501 + [CATOBJEXT=.gmo
502 + DATADIRNAME=share],
503 + [case $host in
504 + *-*-solaris*)
505 + dnl On Solaris, if bind_textdomain_codeset is in libc,
506 + dnl GNU format message catalog is always supported,
507 + dnl since both are added to the libc all together.
508 + dnl Hence, we'd like to go with DATADIRNAME=share and
509 + dnl and CATOBJEXT=.gmo in this case.
510 + AC_CHECK_FUNC(bind_textdomain_codeset,
511 + [CATOBJEXT=.gmo
512 + DATADIRNAME=share],
513 + [CATOBJEXT=.mo
514 + DATADIRNAME=lib])
515 + ;;
516 + *)
517 + CATOBJEXT=.mo
518 + DATADIRNAME=lib
519 + ;;
520 + esac])
521 + LIBS="$glib_save_LIBS"
522 + INSTOBJEXT=.mo
523 + else
524 + gt_cv_have_gettext=no
525 + fi
526 fi
527 + ])
528 +
529 + if test "$gt_cv_have_gettext" = "yes" ; then
530 + AC_DEFINE(ENABLE_NLS, 1,
531 + [always defined to indicate that i18n is enabled])
532 fi
533 - done
534
535 - cd ..
536 - rm -rf conftest.dir
537 -else
538 - am_cv_$1_dependencies_compiler_type=none
539 -fi
540 -])
541 -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
542 -AM_CONDITIONAL([am__fastdep$1], [
543 - test "x$enable_dependency_tracking" != xno \
544 - && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
545 -])
546 + dnl Test whether we really found GNU xgettext.
547 + if test "$XGETTEXT" != ":"; then
548 + dnl If it is not GNU xgettext we define it as : so that the
549 + dnl Makefiles still can work.
550 + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
551 + : ;
552 + else
553 + AC_MSG_RESULT(
554 + [found xgettext program is not GNU xgettext; ignore it])
555 + XGETTEXT=":"
556 + fi
557 + fi
558
559 + # We need to process the po/ directory.
560 + POSUB=po
561
562 -# AM_SET_DEPDIR
563 -# -------------
564 -# Choose a directory name for dependency files.
565 -# This macro is AC_REQUIREd in _AM_DEPENDENCIES
566 -AC_DEFUN([AM_SET_DEPDIR],
567 -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
568 -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
569 -])
570 + AC_OUTPUT_COMMANDS(
571 + [case "$CONFIG_FILES" in *po/Makefile.in*)
572 + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
573 + esac])
574
575 + dnl These rules are solely for the distribution goal. While doing this
576 + dnl we only have to keep exactly one list of the available catalogs
577 + dnl in configure.in.
578 + for lang in $ALL_LINGUAS; do
579 + GMOFILES="$GMOFILES $lang.gmo"
580 + POFILES="$POFILES $lang.po"
581 + done
582
583 -# AM_DEP_TRACK
584 -# ------------
585 -AC_DEFUN([AM_DEP_TRACK],
586 -[AC_ARG_ENABLE(dependency-tracking,
587 -[ --disable-dependency-tracking speeds up one-time build
588 - --enable-dependency-tracking do not reject slow dependency extractors])
589 -if test "x$enable_dependency_tracking" != xno; then
590 - am_depcomp="$ac_aux_dir/depcomp"
591 - AMDEPBACKSLASH='\'
592 -fi
593 -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
594 -AC_SUBST([AMDEPBACKSLASH])dnl
595 -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
596 -])
597 + dnl Make all variables we use known to autoconf.
598 + AC_SUBST(CATALOGS)
599 + AC_SUBST(CATOBJEXT)
600 + AC_SUBST(DATADIRNAME)
601 + AC_SUBST(GMOFILES)
602 + AC_SUBST(INSTOBJEXT)
603 + AC_SUBST(INTLLIBS)
604 + AC_SUBST(PO_IN_DATADIR_TRUE)
605 + AC_SUBST(PO_IN_DATADIR_FALSE)
606 + AC_SUBST(POFILES)
607 + AC_SUBST(POSUB)
608 + ])
609
610 -# Generate code to set up dependency tracking. -*- Autoconf -*-
611 +# AM_GLIB_GNU_GETTEXT
612 +# -------------------
613 +# Do checks necessary for use of gettext. If a suitable implementation
614 +# of gettext is found in either in libintl or in the C library,
615 +# it will set INTLLIBS to the libraries needed for use of gettext
616 +# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
617 +# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
618 +# on various variables needed by the Makefile.in.in installed by
619 +# glib-gettextize.
620 +dnl
621 +glib_DEFUN([GLIB_GNU_GETTEXT],
622 + [AC_REQUIRE([AC_PROG_CC])dnl
623 + AC_REQUIRE([AC_HEADER_STDC])dnl
624 +
625 + GLIB_LC_MESSAGES
626 + GLIB_WITH_NLS
627
628 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
629 -# Free Software Foundation, Inc.
630 -#
631 -# This file is free software; the Free Software Foundation
632 -# gives unlimited permission to copy and/or distribute it,
633 -# with or without modifications, as long as this notice is preserved.
634 + if test "$gt_cv_have_gettext" = "yes"; then
635 + if test "x$ALL_LINGUAS" = "x"; then
636 + LINGUAS=
637 + else
638 + AC_MSG_CHECKING(for catalogs to be installed)
639 + NEW_LINGUAS=
640 + for presentlang in $ALL_LINGUAS; do
641 + useit=no
642 + if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
643 + desiredlanguages="$LINGUAS"
644 + else
645 + desiredlanguages="$ALL_LINGUAS"
646 + fi
647 + for desiredlang in $desiredlanguages; do
648 + # Use the presentlang catalog if desiredlang is
649 + # a. equal to presentlang, or
650 + # b. a variant of presentlang (because in this case,
651 + # presentlang can be used as a fallback for messages
652 + # which are not translated in the desiredlang catalog).
653 + case "$desiredlang" in
654 + "$presentlang"*) useit=yes;;
655 + esac
656 + done
657 + if test $useit = yes; then
658 + NEW_LINGUAS="$NEW_LINGUAS $presentlang"
659 + fi
660 + done
661 + LINGUAS=$NEW_LINGUAS
662 + AC_MSG_RESULT($LINGUAS)
663 + fi
664
665 -#serial 3
666 + dnl Construct list of names of catalog files to be constructed.
667 + if test -n "$LINGUAS"; then
668 + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
669 + fi
670 + fi
671
672 -# _AM_OUTPUT_DEPENDENCY_COMMANDS
673 -# ------------------------------
674 -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
675 -[for mf in $CONFIG_FILES; do
676 - # Strip MF so we end up with the name of the file.
677 - mf=`echo "$mf" | sed -e 's/:.*$//'`
678 - # Check whether this is an Automake generated Makefile or not.
679 - # We used to match only the files named `Makefile.in', but
680 - # some people rename them; so instead we look at the file content.
681 - # Grep'ing the first line is not enough: some people post-process
682 - # each Makefile.in and add a new line on top of each file to say so.
683 - # Grep'ing the whole file is not good either: AIX grep has a line
684 - # limit of 2048, but all sed's we know have understand at least 4000.
685 - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
686 - dirpart=`AS_DIRNAME("$mf")`
687 - else
688 - continue
689 - fi
690 - # Extract the definition of DEPDIR, am__include, and am__quote
691 - # from the Makefile without running `make'.
692 - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
693 - test -z "$DEPDIR" && continue
694 - am__include=`sed -n 's/^am__include = //p' < "$mf"`
695 - test -z "am__include" && continue
696 - am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
697 - # When using ansi2knr, U may be empty or an underscore; expand it
698 - U=`sed -n 's/^U = //p' < "$mf"`
699 - # Find all dependency output files, they are included files with
700 - # $(DEPDIR) in their names. We invoke sed twice because it is the
701 - # simplest approach to changing $(DEPDIR) to its actual value in the
702 - # expansion.
703 - for file in `sed -n "
704 - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
705 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
706 - # Make sure the directory exists.
707 - test -f "$dirpart/$file" && continue
708 - fdir=`AS_DIRNAME(["$file"])`
709 - AS_MKDIR_P([$dirpart/$fdir])
710 - # echo "creating $dirpart/$file"
711 - echo '# dummy' > "$dirpart/$file"
712 - done
713 -done
714 -])# _AM_OUTPUT_DEPENDENCY_COMMANDS
715 + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
716 + dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
717 + dnl Try to locate is.
718 + MKINSTALLDIRS=
719 + if test -n "$ac_aux_dir"; then
720 + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
721 + fi
722 + if test -z "$MKINSTALLDIRS"; then
723 + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
724 + fi
725 + AC_SUBST(MKINSTALLDIRS)
726
727 + dnl Generate list of files to be processed by xgettext which will
728 + dnl be included in po/Makefile.
729 + test -d po || mkdir po
730 + if test "x$srcdir" != "x."; then
731 + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
732 + posrcprefix="$srcdir/"
733 + else
734 + posrcprefix="../$srcdir/"
735 + fi
736 + else
737 + posrcprefix="../"
738 + fi
739 + rm -f po/POTFILES
740 + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
741 + < $srcdir/po/POTFILES.in > po/POTFILES
742 + ])
743
744 -# AM_OUTPUT_DEPENDENCY_COMMANDS
745 -# -----------------------------
746 -# This macro should only be invoked once -- use via AC_REQUIRE.
747 -#
748 -# This code is only required when automatic dependency tracking
749 -# is enabled. FIXME. This creates each `.P' file that we will
750 -# need in order to bootstrap the dependency handling code.
751 -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
752 -[AC_CONFIG_COMMANDS([depfiles],
753 - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
754 - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
755 +# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
756 +# -------------------------------
757 +# Define VARIABLE to the location where catalog files will
758 +# be installed by po/Makefile.
759 +glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
760 +[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
761 +glib_save_prefix="$prefix"
762 +glib_save_exec_prefix="$exec_prefix"
763 +glib_save_datarootdir="$datarootdir"
764 +test "x$prefix" = xNONE && prefix=$ac_default_prefix
765 +test "x$exec_prefix" = xNONE && exec_prefix=$prefix
766 +datarootdir=`eval echo "${datarootdir}"`
767 +if test "x$CATOBJEXT" = "x.mo" ; then
768 + localedir=`eval echo "${libdir}/locale"`
769 +else
770 + localedir=`eval echo "${datadir}/locale"`
771 +fi
772 +prefix="$glib_save_prefix"
773 +exec_prefix="$glib_save_exec_prefix"
774 +datarootdir="$glib_save_datarootdir"
775 +AC_DEFINE_UNQUOTED($1, "$localedir",
776 + [Define the location where the catalogs will be installed])
777 ])
778
779 -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
780 -# Free Software Foundation, Inc.
781 -#
782 -# This file is free software; the Free Software Foundation
783 -# gives unlimited permission to copy and/or distribute it,
784 -# with or without modifications, as long as this notice is preserved.
785 -
786 -# serial 8
787 +dnl
788 +dnl Now the definitions that aclocal will find
789 +dnl
790 +ifdef(glib_configure_in,[],[
791 +AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
792 +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
793 +])dnl
794
795 -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
796 -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
797 +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
798 +#
799 +# Create a temporary file with TEST-FILE as its contents and pass the
800 +# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
801 +# 0 and perform ACTION-IF-FAIL for any other exit status.
802 +AC_DEFUN([GLIB_RUN_PROG],
803 +[cat >conftest.foo <<_ACEOF
804 +$2
805 +_ACEOF
806 +if AC_RUN_LOG([$1 conftest.foo]); then
807 + m4_ifval([$3], [$3], [:])
808 +m4_ifvaln([$4], [else $4])dnl
809 +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
810 +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
811 +fi])
812
813 -# Do all the work for Automake. -*- Autoconf -*-
814
815 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
816 -# 2005, 2006 Free Software Foundation, Inc.
817 -#
818 -# This file is free software; the Free Software Foundation
819 -# gives unlimited permission to copy and/or distribute it,
820 -# with or without modifications, as long as this notice is preserved.
821 +# gnome-common.m4
822 +#
823
824 -# serial 12
825 +dnl GNOME_COMMON_INIT
826
827 -# This macro actually does too much. Some checks are only needed if
828 -# your package does certain things. But this isn't really a big deal.
829 +AC_DEFUN([GNOME_COMMON_INIT],
830 +[
831 + dnl this macro should come after AC_CONFIG_MACRO_DIR
832 + AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
833
834 -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
835 -# AM_INIT_AUTOMAKE([OPTIONS])
836 -# -----------------------------------------------
837 -# The call with PACKAGE and VERSION arguments is the old style
838 -# call (pre autoconf-2.50), which is being phased out. PACKAGE
839 -# and VERSION should now be passed to AC_INIT and removed from
840 -# the call to AM_INIT_AUTOMAKE.
841 -# We support both call styles for the transition. After
842 -# the next Automake release, Autoconf can make the AC_INIT
843 -# arguments mandatory, and then we can depend on a new Autoconf
844 -# release and drop the old call support.
845 -AC_DEFUN([AM_INIT_AUTOMAKE],
846 -[AC_PREREQ([2.60])dnl
847 -dnl Autoconf wants to disallow AM_ names. We explicitly allow
848 -dnl the ones we care about.
849 -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
850 -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
851 -AC_REQUIRE([AC_PROG_INSTALL])dnl
852 -if test "`cd $srcdir && pwd`" != "`pwd`"; then
853 - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
854 - # is not polluted with repeated "-I."
855 - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
856 - # test to see if srcdir already configured
857 - if test -f $srcdir/config.status; then
858 - AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
859 - fi
860 -fi
861 -
862 -# test whether we have cygpath
863 -if test -z "$CYGPATH_W"; then
864 - if (cygpath --version) >/dev/null 2>/dev/null; then
865 - CYGPATH_W='cygpath -w'
866 - else
867 - CYGPATH_W=echo
868 + dnl ensure that when the Automake generated makefile calls aclocal,
869 + dnl it honours the $ACLOCAL_FLAGS environment variable
870 + ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
871 + if test -n "$ac_macro_dir"; then
872 + ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
873 fi
874 -fi
875 -AC_SUBST([CYGPATH_W])
876
877 -# Define the identity of the package.
878 -dnl Distinguish between old-style and new-style calls.
879 -m4_ifval([$2],
880 -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
881 - AC_SUBST([PACKAGE], [$1])dnl
882 - AC_SUBST([VERSION], [$2])],
883 -[_AM_SET_OPTIONS([$1])dnl
884 -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
885 -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
886 - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
887 - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
888 - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
889 + AC_SUBST([ACLOCAL_AMFLAGS])
890 +])
891
892 -_AM_IF_OPTION([no-define],,
893 -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
894 - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
895 +AC_DEFUN([GNOME_DEBUG_CHECK],
896 +[
897 + AC_ARG_ENABLE([debug],
898 + AC_HELP_STRING([--enable-debug],
899 + [turn on debugging]),,
900 + [enable_debug=no])
901
902 -# Some tools Automake needs.
903 -AC_REQUIRE([AM_SANITY_CHECK])dnl
904 -AC_REQUIRE([AC_ARG_PROGRAM])dnl
905 -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
906 -AM_MISSING_PROG(AUTOCONF, autoconf)
907 -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
908 -AM_MISSING_PROG(AUTOHEADER, autoheader)
909 -AM_MISSING_PROG(MAKEINFO, makeinfo)
910 -AM_PROG_INSTALL_SH
911 -AM_PROG_INSTALL_STRIP
912 -AC_REQUIRE([AM_PROG_MKDIR_P])dnl
913 -# We need awk for the "check" target. The system "awk" is bad on
914 -# some platforms.
915 -AC_REQUIRE([AC_PROG_AWK])dnl
916 -AC_REQUIRE([AC_PROG_MAKE_SET])dnl
917 -AC_REQUIRE([AM_SET_LEADING_DOT])dnl
918 -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
919 - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
920 - [_AM_PROG_TAR([v7])])])
921 -_AM_IF_OPTION([no-dependencies],,
922 -[AC_PROVIDE_IFELSE([AC_PROG_CC],
923 - [_AM_DEPENDENCIES(CC)],
924 - [define([AC_PROG_CC],
925 - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
926 -AC_PROVIDE_IFELSE([AC_PROG_CXX],
927 - [_AM_DEPENDENCIES(CXX)],
928 - [define([AC_PROG_CXX],
929 - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
930 -AC_PROVIDE_IFELSE([AC_PROG_OBJC],
931 - [_AM_DEPENDENCIES(OBJC)],
932 - [define([AC_PROG_OBJC],
933 - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
934 -])
935 + if test x$enable_debug = xyes ; then
936 + AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
937 + [Enable additional debugging at the expense of performance and size])
938 + fi
939 ])
940
941 +dnl GNOME_MAINTAINER_MODE_DEFINES ()
942 +dnl define DISABLE_DEPRECATED
943 +dnl
944 +AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
945 +[
946 + AC_REQUIRE([AM_MAINTAINER_MODE])
947
948 -# When config.status generates a header, we must update the stamp-h file.
949 -# This file resides in the same directory as the config header
950 -# that is generated. The stamp files are numbered to have different names.
951 + if test $USE_MAINTAINER_MODE = yes; then
952 + DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"
953 + else
954 + DISABLE_DEPRECATED=""
955 + fi
956 + AC_SUBST(DISABLE_DEPRECATED)
957 +])
958
959 -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
960 -# loop where config.status creates the headers, so we can generate
961 -# our stamp files there.
962 -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
963 -[# Compute $1's index in $config_headers.
964 -_am_stamp_count=1
965 -for _am_header in $config_headers :; do
966 - case $_am_header in
967 - $1 | $1:* )
968 - break ;;
969 - * )
970 - _am_stamp_count=`expr $_am_stamp_count + 1` ;;
971 - esac
972 -done
973 -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
974 +dnl GNOME_COMPILE_WARNINGS
975 +dnl Turn on many useful compiler warnings
976 +dnl For now, only works on GCC
977 +AC_DEFUN([GNOME_COMPILE_WARNINGS],[
978 + dnl ******************************
979 + dnl More compiler warnings
980 + dnl ******************************
981
982 -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
983 -#
984 -# This file is free software; the Free Software Foundation
985 -# gives unlimited permission to copy and/or distribute it,
986 -# with or without modifications, as long as this notice is preserved.
987 + AC_ARG_ENABLE(compile-warnings,
988 + AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
989 + [Turn on compiler warnings]),,
990 + [enable_compile_warnings="m4_default([$1],[yes])"])
991
992 -# AM_PROG_INSTALL_SH
993 -# ------------------
994 -# Define $install_sh.
995 -AC_DEFUN([AM_PROG_INSTALL_SH],
996 -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
997 -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
998 -AC_SUBST(install_sh)])
999 + warnCFLAGS=
1000 + if test "x$GCC" != xyes; then
1001 + enable_compile_warnings=no
1002 + fi
1003
1004 -# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
1005 -#
1006 -# This file is free software; the Free Software Foundation
1007 -# gives unlimited permission to copy and/or distribute it,
1008 -# with or without modifications, as long as this notice is preserved.
1009 + warning_flags=
1010 + realsave_CFLAGS="$CFLAGS"
1011
1012 -# serial 2
1013 + case "$enable_compile_warnings" in
1014 + no)
1015 + warning_flags=
1016 + ;;
1017 + minimum)
1018 + warning_flags="-Wall"
1019 + ;;
1020 + yes)
1021 + warning_flags="-Wall -Wmissing-prototypes"
1022 + ;;
1023 + maximum|error)
1024 + warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
1025 + CFLAGS="$warning_flags $CFLAGS"
1026 + for option in -Wno-sign-compare; do
1027 + SAVE_CFLAGS="$CFLAGS"
1028 + CFLAGS="$CFLAGS $option"
1029 + AC_MSG_CHECKING([whether gcc understands $option])
1030 + AC_TRY_COMPILE([], [],
1031 + has_option=yes,
1032 + has_option=no,)
1033 + CFLAGS="$SAVE_CFLAGS"
1034 + AC_MSG_RESULT($has_option)
1035 + if test $has_option = yes; then
1036 + warning_flags="$warning_flags $option"
1037 + fi
1038 + unset has_option
1039 + unset SAVE_CFLAGS
1040 + done
1041 + unset option
1042 + if test "$enable_compile_warnings" = "error" ; then
1043 + warning_flags="$warning_flags -Werror"
1044 + fi
1045 + ;;
1046 + *)
1047 + AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
1048 + ;;
1049 + esac
1050 + CFLAGS="$realsave_CFLAGS"
1051 + AC_MSG_CHECKING(what warning flags to pass to the C compiler)
1052 + AC_MSG_RESULT($warning_flags)
1053
1054 -# Check whether the underlying file-system supports filenames
1055 -# with a leading dot. For instance MS-DOS doesn't.
1056 -AC_DEFUN([AM_SET_LEADING_DOT],
1057 -[rm -rf .tst 2>/dev/null
1058 -mkdir .tst 2>/dev/null
1059 -if test -d .tst; then
1060 - am__leading_dot=.
1061 -else
1062 - am__leading_dot=_
1063 -fi
1064 -rmdir .tst 2>/dev/null
1065 -AC_SUBST([am__leading_dot])])
1066 + AC_ARG_ENABLE(iso-c,
1067 + AC_HELP_STRING([--enable-iso-c],
1068 + [Try to warn if code is not ISO C ]),,
1069 + [enable_iso_c=no])
1070
1071 -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
1072 -# From Jim Meyering
1073 + AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
1074 + complCFLAGS=
1075 + if test "x$enable_iso_c" != "xno"; then
1076 + if test "x$GCC" = "xyes"; then
1077 + case " $CFLAGS " in
1078 + *[\ \ ]-ansi[\ \ ]*) ;;
1079 + *) complCFLAGS="$complCFLAGS -ansi" ;;
1080 + esac
1081 + case " $CFLAGS " in
1082 + *[\ \ ]-pedantic[\ \ ]*) ;;
1083 + *) complCFLAGS="$complCFLAGS -pedantic" ;;
1084 + esac
1085 + fi
1086 + fi
1087 + AC_MSG_RESULT($complCFLAGS)
1088
1089 -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
1090 -# Free Software Foundation, Inc.
1091 -#
1092 -# This file is free software; the Free Software Foundation
1093 -# gives unlimited permission to copy and/or distribute it,
1094 -# with or without modifications, as long as this notice is preserved.
1095 + WARN_CFLAGS="$warning_flags $complCFLAGS"
1096 + AC_SUBST(WARN_CFLAGS)
1097 +])
1098
1099 -# serial 4
1100 +dnl For C++, do basically the same thing.
1101
1102 -AC_DEFUN([AM_MAINTAINER_MODE],
1103 -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
1104 - dnl maintainer-mode is disabled by default
1105 - AC_ARG_ENABLE(maintainer-mode,
1106 -[ --enable-maintainer-mode enable make rules and dependencies not useful
1107 - (and sometimes confusing) to the casual installer],
1108 - USE_MAINTAINER_MODE=$enableval,
1109 - USE_MAINTAINER_MODE=no)
1110 - AC_MSG_RESULT([$USE_MAINTAINER_MODE])
1111 - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
1112 - MAINT=$MAINTAINER_MODE_TRUE
1113 - AC_SUBST(MAINT)dnl
1114 -]
1115 -)
1116 +AC_DEFUN([GNOME_CXX_WARNINGS],[
1117 + AC_ARG_ENABLE(cxx-warnings,
1118 + AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
1119 + [Turn on compiler warnings.]),,
1120 + [enable_cxx_warnings="m4_default([$1],[minimum])"])
1121
1122 -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
1123 + AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
1124 + warnCXXFLAGS=
1125 + if test "x$GXX" != xyes; then
1126 + enable_cxx_warnings=no
1127 + fi
1128 + if test "x$enable_cxx_warnings" != "xno"; then
1129 + if test "x$GXX" = "xyes"; then
1130 + case " $CXXFLAGS " in
1131 + *[\ \ ]-Wall[\ \ ]*) ;;
1132 + *) warnCXXFLAGS="-Wall -Wno-unused" ;;
1133 + esac
1134
1135 -# Check to see how 'make' treats includes. -*- Autoconf -*-
1136 + ## -W is not all that useful. And it cannot be controlled
1137 + ## with individual -Wno-xxx flags, unlike -Wall
1138 + if test "x$enable_cxx_warnings" = "xyes"; then
1139 + warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
1140 + fi
1141 + fi
1142 + fi
1143 + AC_MSG_RESULT($warnCXXFLAGS)
1144
1145 -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
1146 -#
1147 -# This file is free software; the Free Software Foundation
1148 -# gives unlimited permission to copy and/or distribute it,
1149 -# with or without modifications, as long as this notice is preserved.
1150 + AC_ARG_ENABLE(iso-cxx,
1151 + AC_HELP_STRING([--enable-iso-cxx],
1152 + [Try to warn if code is not ISO C++ ]),,
1153 + [enable_iso_cxx=no])
1154
1155 -# serial 3
1156 + AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
1157 + complCXXFLAGS=
1158 + if test "x$enable_iso_cxx" != "xno"; then
1159 + if test "x$GXX" = "xyes"; then
1160 + case " $CXXFLAGS " in
1161 + *[\ \ ]-ansi[\ \ ]*) ;;
1162 + *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
1163 + esac
1164
1165 -# AM_MAKE_INCLUDE()
1166 -# -----------------
1167 -# Check to see how make treats includes.
1168 -AC_DEFUN([AM_MAKE_INCLUDE],
1169 -[am_make=${MAKE-make}
1170 -cat > confinc << 'END'
1171 -am__doit:
1172 - @echo done
1173 -.PHONY: am__doit
1174 -END
1175 -# If we don't find an include directive, just comment out the code.
1176 -AC_MSG_CHECKING([for style of include used by $am_make])
1177 -am__include="#"
1178 -am__quote=
1179 -_am_result=none
1180 -# First try GNU make style include.
1181 -echo "include confinc" > confmf
1182 -# We grep out `Entering directory' and `Leaving directory'
1183 -# messages which can occur if `w' ends up in MAKEFLAGS.
1184 -# In particular we don't look at `^make:' because GNU make might
1185 -# be invoked under some other name (usually "gmake"), in which
1186 -# case it prints its new name instead of `make'.
1187 -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
1188 - am__include=include
1189 - am__quote=
1190 - _am_result=GNU
1191 -fi
1192 -# Now try BSD make style include.
1193 -if test "$am__include" = "#"; then
1194 - echo '.include "confinc"' > confmf
1195 - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
1196 - am__include=.include
1197 - am__quote="\""
1198 - _am_result=BSD
1199 + case " $CXXFLAGS " in
1200 + *[\ \ ]-pedantic[\ \ ]*) ;;
1201 + *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
1202 + esac
1203 + fi
1204 fi
1205 -fi
1206 -AC_SUBST([am__include])
1207 -AC_SUBST([am__quote])
1208 -AC_MSG_RESULT([$_am_result])
1209 -rm -f confinc confmf
1210 -])
1211 -
1212 -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
1213 + AC_MSG_RESULT($complCXXFLAGS)
1214
1215 -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
1216 -# Free Software Foundation, Inc.
1217 -#
1218 -# This file is free software; the Free Software Foundation
1219 -# gives unlimited permission to copy and/or distribute it,
1220 -# with or without modifications, as long as this notice is preserved.
1221 + WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
1222 + AC_SUBST(WARN_CXXFLAGS)
1223 +])
1224
1225 -# serial 5
1226 +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
1227
1228 -# AM_MISSING_PROG(NAME, PROGRAM)
1229 -# ------------------------------
1230 -AC_DEFUN([AM_MISSING_PROG],
1231 -[AC_REQUIRE([AM_MISSING_HAS_RUN])
1232 -$1=${$1-"${am_missing_run}$2"}
1233 -AC_SUBST($1)])
1234 +# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
1235
1236
1237 -# AM_MISSING_HAS_RUN
1238 -# ------------------
1239 -# Define MISSING if not defined so far and test if it supports --run.
1240 -# If it does, set am_missing_run to use it, otherwise, to nothing.
1241 -AC_DEFUN([AM_MISSING_HAS_RUN],
1242 -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1243 -AC_REQUIRE_AUX_FILE([missing])dnl
1244 -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
1245 -# Use eval to expand $SHELL
1246 -if eval "$MISSING --run true"; then
1247 - am_missing_run="$MISSING --run "
1248 -else
1249 - am_missing_run=
1250 - AC_MSG_WARN([`missing' script is too old or missing])
1251 -fi
1252 -])
1253 +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
1254 +# -----------------------------------------------------------
1255 +# If this macro is not defined by Autoconf, define it here.
1256 +m4_ifdef([AC_PROVIDE_IFELSE],
1257 + [],
1258 + [m4_define([AC_PROVIDE_IFELSE],
1259 + [m4_ifdef([AC_PROVIDE_$1],
1260 + [$2], [$3])])])
1261
1262 -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
1263 -#
1264 -# This file is free software; the Free Software Foundation
1265 -# gives unlimited permission to copy and/or distribute it,
1266 -# with or without modifications, as long as this notice is preserved.
1267
1268 -# AM_PROG_MKDIR_P
1269 +# AC_PROG_LIBTOOL
1270 # ---------------
1271 -# Check for `mkdir -p'.
1272 -AC_DEFUN([AM_PROG_MKDIR_P],
1273 -[AC_PREREQ([2.60])dnl
1274 -AC_REQUIRE([AC_PROG_MKDIR_P])dnl
1275 -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
1276 -dnl while keeping a definition of mkdir_p for backward compatibility.
1277 -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
1278 -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
1279 -dnl Makefile.ins that do not define MKDIR_P, so we do our own
1280 -dnl adjustment using top_builddir (which is defined more often than
1281 -dnl MKDIR_P).
1282 -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
1283 -case $mkdir_p in
1284 - [[\\/$]]* | ?:[[\\/]]*) ;;
1285 - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
1286 -esac
1287 -])
1288 -
1289 -# Helper functions for option handling. -*- Autoconf -*-
1290 +AC_DEFUN([AC_PROG_LIBTOOL],
1291 +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
1292 +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
1293 +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
1294 + AC_PROVIDE_IFELSE([AC_PROG_CXX],
1295 + [AC_LIBTOOL_CXX],
1296 + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
1297 + ])])
1298 +dnl And a similar setup for Fortran 77 support
1299 + AC_PROVIDE_IFELSE([AC_PROG_F77],
1300 + [AC_LIBTOOL_F77],
1301 + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
1302 +])])
1303
1304 -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
1305 -#
1306 -# This file is free software; the Free Software Foundation
1307 -# gives unlimited permission to copy and/or distribute it,
1308 -# with or without modifications, as long as this notice is preserved.
1309 +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
1310 +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
1311 +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
1312 + AC_PROVIDE_IFELSE([AC_PROG_GCJ],
1313 + [AC_LIBTOOL_GCJ],
1314 + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
1315 + [AC_LIBTOOL_GCJ],
1316 + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
1317 + [AC_LIBTOOL_GCJ],
1318 + [ifdef([AC_PROG_GCJ],
1319 + [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
1320 + ifdef([A][M_PROG_GCJ],
1321 + [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
1322 + ifdef([LT_AC_PROG_GCJ],
1323 + [define([LT_AC_PROG_GCJ],
1324 + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
1325 +])])# AC_PROG_LIBTOOL
1326
1327 -# serial 3
1328
1329 -# _AM_MANGLE_OPTION(NAME)
1330 -# -----------------------
1331 -AC_DEFUN([_AM_MANGLE_OPTION],
1332 -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
1333 +# _AC_PROG_LIBTOOL
1334 +# ----------------
1335 +AC_DEFUN([_AC_PROG_LIBTOOL],
1336 +[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
1337 +AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
1338 +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
1339 +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
1340
1341 -# _AM_SET_OPTION(NAME)
1342 -# ------------------------------
1343 -# Set option NAME. Presently that only means defining a flag for this option.
1344 -AC_DEFUN([_AM_SET_OPTION],
1345 -[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
1346 +# This can be used to rebuild libtool when needed
1347 +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
1348
1349 -# _AM_SET_OPTIONS(OPTIONS)
1350 -# ----------------------------------
1351 -# OPTIONS is a space-separated list of Automake options.
1352 -AC_DEFUN([_AM_SET_OPTIONS],
1353 -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
1354 +# Always use our own libtool.
1355 +LIBTOOL='$(SHELL) $(top_builddir)/libtool'
1356 +AC_SUBST(LIBTOOL)dnl
1357
1358 -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
1359 -# -------------------------------------------
1360 -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
1361 -AC_DEFUN([_AM_IF_OPTION],
1362 -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
1363 +# Prevent multiple expansion
1364 +define([AC_PROG_LIBTOOL], [])
1365 +])# _AC_PROG_LIBTOOL
1366
1367 -# Check to make sure that the build environment is sane. -*- Autoconf -*-
1368
1369 -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
1370 -# Free Software Foundation, Inc.
1371 -#
1372 -# This file is free software; the Free Software Foundation
1373 -# gives unlimited permission to copy and/or distribute it,
1374 -# with or without modifications, as long as this notice is preserved.
1375 +# AC_LIBTOOL_SETUP
1376 +# ----------------
1377 +AC_DEFUN([AC_LIBTOOL_SETUP],
1378 +[AC_PREREQ(2.50)dnl
1379 +AC_REQUIRE([AC_ENABLE_SHARED])dnl
1380 +AC_REQUIRE([AC_ENABLE_STATIC])dnl
1381 +AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
1382 +AC_REQUIRE([AC_CANONICAL_HOST])dnl
1383 +AC_REQUIRE([AC_CANONICAL_BUILD])dnl
1384 +AC_REQUIRE([AC_PROG_CC])dnl
1385 +AC_REQUIRE([AC_PROG_LD])dnl
1386 +AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
1387 +AC_REQUIRE([AC_PROG_NM])dnl
1388
1389 -# serial 4
1390 +AC_REQUIRE([AC_PROG_LN_S])dnl
1391 +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
1392 +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
1393 +AC_REQUIRE([AC_OBJEXT])dnl
1394 +AC_REQUIRE([AC_EXEEXT])dnl
1395 +dnl
1396
1397 -# AM_SANITY_CHECK
1398 -# ---------------
1399 -AC_DEFUN([AM_SANITY_CHECK],
1400 -[AC_MSG_CHECKING([whether build environment is sane])
1401 -# Just in case
1402 -sleep 1
1403 -echo timestamp > conftest.file
1404 -# Do `set' in a subshell so we don't clobber the current shell's
1405 -# arguments. Must try -L first in case configure is actually a
1406 -# symlink; some systems play weird games with the mod time of symlinks
1407 -# (eg FreeBSD returns the mod time of the symlink's containing
1408 -# directory).
1409 -if (
1410 - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
1411 - if test "$[*]" = "X"; then
1412 - # -L didn't work.
1413 - set X `ls -t $srcdir/configure conftest.file`
1414 - fi
1415 - rm -f conftest.file
1416 - if test "$[*]" != "X $srcdir/configure conftest.file" \
1417 - && test "$[*]" != "X conftest.file $srcdir/configure"; then
1418 +AC_LIBTOOL_SYS_MAX_CMD_LEN
1419 +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
1420 +AC_LIBTOOL_OBJDIR
1421
1422 - # If neither matched, then we have a broken ls. This can happen
1423 - # if, for instance, CONFIG_SHELL is bash and it inherits a
1424 - # broken ls alias from the environment. This has actually
1425 - # happened. Such a system could not be considered "sane".
1426 - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
1427 -alias in your environment])
1428 - fi
1429 +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
1430 +_LT_AC_PROG_ECHO_BACKSLASH
1431
1432 - test "$[2]" = conftest.file
1433 - )
1434 -then
1435 - # Ok.
1436 - :
1437 -else
1438 - AC_MSG_ERROR([newly created file is older than distributed files!
1439 -Check your system clock])
1440 -fi
1441 -AC_MSG_RESULT(yes)])
1442 +case $host_os in
1443 +aix3*)
1444 + # AIX sometimes has problems with the GCC collect2 program. For some
1445 + # reason, if we set the COLLECT_NAMES environment variable, the problems
1446 + # vanish in a puff of smoke.
1447 + if test "X${COLLECT_NAMES+set}" != Xset; then
1448 + COLLECT_NAMES=
1449 + export COLLECT_NAMES
1450 + fi
1451 + ;;
1452 +esac
1453
1454 -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
1455 -#
1456 -# This file is free software; the Free Software Foundation
1457 -# gives unlimited permission to copy and/or distribute it,
1458 -# with or without modifications, as long as this notice is preserved.
1459 +# Sed substitution that helps us do robust quoting. It backslashifies
1460 +# metacharacters that are still active within double-quoted strings.
1461 +Xsed='sed -e 1s/^X//'
1462 +[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
1463
1464 -# AM_PROG_INSTALL_STRIP
1465 -# ---------------------
1466 -# One issue with vendor `install' (even GNU) is that you can't
1467 -# specify the program used to strip binaries. This is especially
1468 -# annoying in cross-compiling environments, where the build's strip
1469 -# is unlikely to handle the host's binaries.
1470 -# Fortunately install-sh will honor a STRIPPROG variable, so we
1471 -# always use install-sh in `make install-strip', and initialize
1472 -# STRIPPROG with the value of the STRIP variable (set by the user).
1473 -AC_DEFUN([AM_PROG_INSTALL_STRIP],
1474 -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1475 -# Installed binaries are usually stripped using `strip' when the user
1476 -# run `make install-strip'. However `strip' might not be the right
1477 -# tool to use in cross-compilation environments, therefore Automake
1478 -# will honor the `STRIP' environment variable to overrule this program.
1479 -dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
1480 -if test "$cross_compiling" != no; then
1481 - AC_CHECK_TOOL([STRIP], [strip], :)
1482 -fi
1483 -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1484 -AC_SUBST([INSTALL_STRIP_PROGRAM])])
1485 +# Same as above, but do not quote variable references.
1486 +[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
1487
1488 -# Copyright (C) 2006 Free Software Foundation, Inc.
1489 -#
1490 -# This file is free software; the Free Software Foundation
1491 -# gives unlimited permission to copy and/or distribute it,
1492 -# with or without modifications, as long as this notice is preserved.
1493 +# Sed substitution to delay expansion of an escaped shell variable in a
1494 +# double_quote_subst'ed string.
1495 +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
1496
1497 -# _AM_SUBST_NOTMAKE(VARIABLE)
1498 -# ---------------------------
1499 -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
1500 -# This macro is traced by Automake.
1501 -AC_DEFUN([_AM_SUBST_NOTMAKE])
1502 +# Sed substitution to avoid accidental globbing in evaled expressions
1503 +no_glob_subst='s/\*/\\\*/g'
1504
1505 -# Check how to create a tarball. -*- Autoconf -*-
1506 +# Constants:
1507 +rm="rm -f"
1508
1509 -# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
1510 -#
1511 -# This file is free software; the Free Software Foundation
1512 -# gives unlimited permission to copy and/or distribute it,
1513 -# with or without modifications, as long as this notice is preserved.
1514 +# Global variables:
1515 +default_ofile=libtool
1516 +can_build_shared=yes
1517
1518 -# serial 2
1519 +# All known linkers require a `.a' archive for static linking (except MSVC,
1520 +# which needs '.lib').
1521 +libext=a
1522 +ltmain="$ac_aux_dir/ltmain.sh"
1523 +ofile="$default_ofile"
1524 +with_gnu_ld="$lt_cv_prog_gnu_ld"
1525
1526 -# _AM_PROG_TAR(FORMAT)
1527 -# --------------------
1528 -# Check how to create a tarball in format FORMAT.
1529 -# FORMAT should be one of `v7', `ustar', or `pax'.
1530 -#
1531 -# Substitute a variable $(am__tar) that is a command
1532 -# writing to stdout a FORMAT-tarball containing the directory
1533 -# $tardir.
1534 -# tardir=directory && $(am__tar) > result.tar
1535 -#
1536 -# Substitute a variable $(am__untar) that extract such
1537 -# a tarball read from stdin.
1538 -# $(am__untar) < result.tar
1539 -AC_DEFUN([_AM_PROG_TAR],
1540 -[# Always define AMTAR for backward compatibility.
1541 -AM_MISSING_PROG([AMTAR], [tar])
1542 -m4_if([$1], [v7],
1543 - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
1544 - [m4_case([$1], [ustar],, [pax],,
1545 - [m4_fatal([Unknown tar format])])
1546 -AC_MSG_CHECKING([how to create a $1 tar archive])
1547 -# Loop over all known methods to create a tar archive until one works.
1548 -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
1549 -_am_tools=${am_cv_prog_tar_$1-$_am_tools}
1550 -# Do not fold the above two line into one, because Tru64 sh and
1551 -# Solaris sh will not grok spaces in the rhs of `-'.
1552 -for _am_tool in $_am_tools
1553 -do
1554 - case $_am_tool in
1555 - gnutar)
1556 - for _am_tar in tar gnutar gtar;
1557 - do
1558 - AM_RUN_LOG([$_am_tar --version]) && break
1559 - done
1560 - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
1561 - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
1562 - am__untar="$_am_tar -xf -"
1563 - ;;
1564 - plaintar)
1565 - # Must skip GNU tar: if it does not support --format= it doesn't create
1566 - # ustar tarball either.
1567 - (tar --version) >/dev/null 2>&1 && continue
1568 - am__tar='tar chf - "$$tardir"'
1569 - am__tar_='tar chf - "$tardir"'
1570 - am__untar='tar xf -'
1571 - ;;
1572 - pax)
1573 - am__tar='pax -L -x $1 -w "$$tardir"'
1574 - am__tar_='pax -L -x $1 -w "$tardir"'
1575 - am__untar='pax -r'
1576 - ;;
1577 - cpio)
1578 - am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
1579 - am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
1580 - am__untar='cpio -i -H $1 -d'
1581 +AC_CHECK_TOOL(AR, ar, false)
1582 +AC_CHECK_TOOL(RANLIB, ranlib, :)
1583 +AC_CHECK_TOOL(STRIP, strip, :)
1584 +
1585 +old_CC="$CC"
1586 +old_CFLAGS="$CFLAGS"
1587 +
1588 +# Set sane defaults for various variables
1589 +test -z "$AR" && AR=ar
1590 +test -z "$AR_FLAGS" && AR_FLAGS=cru
1591 +test -z "$AS" && AS=as
1592 +test -z "$CC" && CC=cc
1593 +test -z "$LTCC" && LTCC=$CC
1594 +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
1595 +test -z "$DLLTOOL" && DLLTOOL=dlltool
1596 +test -z "$LD" && LD=ld
1597 +test -z "$LN_S" && LN_S="ln -s"
1598 +test -z "$MAGIC_CMD" && MAGIC_CMD=file
1599 +test -z "$NM" && NM=nm
1600 +test -z "$SED" && SED=sed
1601 +test -z "$OBJDUMP" && OBJDUMP=objdump
1602 +test -z "$RANLIB" && RANLIB=:
1603 +test -z "$STRIP" && STRIP=:
1604 +test -z "$ac_objext" && ac_objext=o
1605 +
1606 +# Determine commands to create old-style static archives.
1607 +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
1608 +old_postinstall_cmds='chmod 644 $oldlib'
1609 +old_postuninstall_cmds=
1610 +
1611 +if test -n "$RANLIB"; then
1612 + case $host_os in
1613 + openbsd*)
1614 + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
1615 ;;
1616 - none)
1617 - am__tar=false
1618 - am__tar_=false
1619 - am__untar=false
1620 + *)
1621 + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
1622 ;;
1623 esac
1624 + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
1625 +fi
1626
1627 - # If the value was cached, stop now. We just wanted to have am__tar
1628 - # and am__untar set.
1629 - test -n "${am_cv_prog_tar_$1}" && break
1630 +_LT_CC_BASENAME([$compiler])
1631
1632 - # tar/untar a dummy directory, and stop if the command works
1633 - rm -rf conftest.dir
1634 - mkdir conftest.dir
1635 - echo GrepMe > conftest.dir/file
1636 - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
1637 - rm -rf conftest.dir
1638 - if test -s conftest.tar; then
1639 - AM_RUN_LOG([$am__untar <conftest.tar])
1640 - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
1641 +# Only perform the check for file, if the check method requires it
1642 +case $deplibs_check_method in
1643 +file_magic*)
1644 + if test "$file_magic_cmd" = '$MAGIC_CMD'; then
1645 + AC_PATH_MAGIC
1646 fi
1647 -done
1648 -rm -rf conftest.dir
1649 + ;;
1650 +esac
1651
1652 -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
1653 -AC_MSG_RESULT([$am_cv_prog_tar_$1])])
1654 -AC_SUBST([am__tar])
1655 -AC_SUBST([am__untar])
1656 -]) # _AM_PROG_TAR
1657 +AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
1658 +AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
1659 +enable_win32_dll=yes, enable_win32_dll=no)
1660
1661 -dnl AM_GCONF_SOURCE_2
1662 -dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
1663 -dnl (i.e. pass to gconftool-2
1664 -dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
1665 -dnl you should install foo.schemas files
1666 -dnl
1667 -
1668 -AC_DEFUN([AM_GCONF_SOURCE_2],
1669 -[
1670 - if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
1671 - GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
1672 - else
1673 - GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
1674 - fi
1675 -
1676 - AC_ARG_WITH(gconf-source,
1677 - [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
1678 +AC_ARG_ENABLE([libtool-lock],
1679 + [AC_HELP_STRING([--disable-libtool-lock],
1680 + [avoid locking (might break parallel builds)])])
1681 +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
1682
1683 - AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
1684 - AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
1685 +AC_ARG_WITH([pic],
1686 + [AC_HELP_STRING([--with-pic],
1687 + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
1688 + [pic_mode="$withval"],
1689 + [pic_mode=default])
1690 +test -z "$pic_mode" && pic_mode=default
1691
1692 - if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
1693 - GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
1694 - fi
1695 +# Use C for the default configuration in the libtool script
1696 +tagname=
1697 +AC_LIBTOOL_LANG_C_CONFIG
1698 +_LT_AC_TAGCONFIG
1699 +])# AC_LIBTOOL_SETUP
1700
1701 - AC_ARG_WITH(gconf-schema-file-dir,
1702 - [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
1703
1704 - AC_SUBST(GCONF_SCHEMA_FILE_DIR)
1705 - AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
1706 +# _LT_AC_SYS_COMPILER
1707 +# -------------------
1708 +AC_DEFUN([_LT_AC_SYS_COMPILER],
1709 +[AC_REQUIRE([AC_PROG_CC])dnl
1710
1711 - AC_ARG_ENABLE(schemas-install,
1712 - [ --disable-schemas-install Disable the schemas installation],
1713 - [case ${enableval} in
1714 - yes|no) ;;
1715 - *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
1716 - esac])
1717 - AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
1718 -])
1719 +# If no C compiler was specified, use CC.
1720 +LTCC=${LTCC-"$CC"}
1721
1722 -# Copyright (C) 1995-2002 Free Software Foundation, Inc.
1723 -# Copyright (C) 2001-2003,2004 Red Hat, Inc.
1724 -#
1725 -# This file is free software, distributed under the terms of the GNU
1726 -# General Public License. As a special exception to the GNU General
1727 -# Public License, this file may be distributed as part of a program
1728 -# that contains a configuration script generated by Autoconf, under
1729 -# the same distribution terms as the rest of that program.
1730 -#
1731 -# This file can be copied and used freely without restrictions. It can
1732 -# be used in projects which are not available under the GNU Public License
1733 -# but which still want to provide support for the GNU gettext functionality.
1734 -#
1735 -# Macro to add for using GNU gettext.
1736 -# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
1737 -#
1738 -# Modified to never use included libintl.
1739 -# Owen Taylor <otaylor@redhat.com>, 12/15/1998
1740 -#
1741 -# Major rework to remove unused code
1742 -# Owen Taylor <otaylor@redhat.com>, 12/11/2002
1743 -#
1744 -# Added better handling of ALL_LINGUAS from GNU gettext version
1745 -# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
1746 -#
1747 -# Modified to require ngettext
1748 -# Matthias Clasen <mclasen@redhat.com> 08/06/2004
1749 -#
1750 -# We need this here as well, since someone might use autoconf-2.5x
1751 -# to configure GLib then an older version to configure a package
1752 -# using AM_GLIB_GNU_GETTEXT
1753 -AC_PREREQ(2.53)
1754 +# If no C compiler flags were specified, use CFLAGS.
1755 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
1756
1757 -dnl
1758 -dnl We go to great lengths to make sure that aclocal won't
1759 -dnl try to pull in the installed version of these macros
1760 -dnl when running aclocal in the glib directory.
1761 -dnl
1762 -m4_copy([AC_DEFUN],[glib_DEFUN])
1763 -m4_copy([AC_REQUIRE],[glib_REQUIRE])
1764 -dnl
1765 -dnl At the end, if we're not within glib, we'll define the public
1766 -dnl definitions in terms of our private definitions.
1767 -dnl
1768 +# Allow CC to be a program name with arguments.
1769 +compiler=$CC
1770 +])# _LT_AC_SYS_COMPILER
1771
1772 -# GLIB_LC_MESSAGES
1773 -#--------------------
1774 -glib_DEFUN([GLIB_LC_MESSAGES],
1775 - [AC_CHECK_HEADERS([locale.h])
1776 - if test $ac_cv_header_locale_h = yes; then
1777 - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
1778 - [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
1779 - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
1780 - if test $am_cv_val_LC_MESSAGES = yes; then
1781 - AC_DEFINE(HAVE_LC_MESSAGES, 1,
1782 - [Define if your <locale.h> file defines LC_MESSAGES.])
1783 - fi
1784 - fi])
1785
1786 -# GLIB_PATH_PROG_WITH_TEST
1787 -#----------------------------
1788 -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
1789 -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
1790 -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
1791 -[# Extract the first word of "$2", so it can be a program name with args.
1792 -set dummy $2; ac_word=[$]2
1793 -AC_MSG_CHECKING([for $ac_word])
1794 -AC_CACHE_VAL(ac_cv_path_$1,
1795 -[case "[$]$1" in
1796 - /*)
1797 - ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
1798 - ;;
1799 - *)
1800 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
1801 - for ac_dir in ifelse([$5], , $PATH, [$5]); do
1802 - test -z "$ac_dir" && ac_dir=.
1803 - if test -f $ac_dir/$ac_word; then
1804 - if [$3]; then
1805 - ac_cv_path_$1="$ac_dir/$ac_word"
1806 - break
1807 - fi
1808 - fi
1809 - done
1810 - IFS="$ac_save_ifs"
1811 -dnl If no 4th arg is given, leave the cache variable unset,
1812 -dnl so AC_PATH_PROGS will keep looking.
1813 -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
1814 -])dnl
1815 - ;;
1816 -esac])dnl
1817 -$1="$ac_cv_path_$1"
1818 -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
1819 - AC_MSG_RESULT([$]$1)
1820 -else
1821 - AC_MSG_RESULT(no)
1822 -fi
1823 -AC_SUBST($1)dnl
1824 +# _LT_CC_BASENAME(CC)
1825 +# -------------------
1826 +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
1827 +AC_DEFUN([_LT_CC_BASENAME],
1828 +[for cc_temp in $1""; do
1829 + case $cc_temp in
1830 + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
1831 + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
1832 + \-*) ;;
1833 + *) break;;
1834 + esac
1835 +done
1836 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
1837 ])
1838
1839 -# GLIB_WITH_NLS
1840 -#-----------------
1841 -glib_DEFUN([GLIB_WITH_NLS],
1842 - dnl NLS is obligatory
1843 - [AC_REQUIRE([AC_CANONICAL_HOST])dnl
1844 - USE_NLS=yes
1845 - AC_SUBST(USE_NLS)
1846
1847 - gt_cv_have_gettext=no
1848 +# _LT_COMPILER_BOILERPLATE
1849 +# ------------------------
1850 +# Check for compiler boilerplate output or warnings with
1851 +# the simple compiler test code.
1852 +AC_DEFUN([_LT_COMPILER_BOILERPLATE],
1853 +[AC_REQUIRE([LT_AC_PROG_SED])dnl
1854 +ac_outfile=conftest.$ac_objext
1855 +echo "$lt_simple_compile_test_code" >conftest.$ac_ext
1856 +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
1857 +_lt_compiler_boilerplate=`cat conftest.err`
1858 +$rm conftest*
1859 +])# _LT_COMPILER_BOILERPLATE
1860
1861 - CATOBJEXT=NONE
1862 - XGETTEXT=:
1863 - INTLLIBS=
1864
1865 - AC_CHECK_HEADER(libintl.h,
1866 - [gt_cv_func_dgettext_libintl="no"
1867 - libintl_extra_libs=""
1868 +# _LT_LINKER_BOILERPLATE
1869 +# ----------------------
1870 +# Check for linker boilerplate output or warnings with
1871 +# the simple link test code.
1872 +AC_DEFUN([_LT_LINKER_BOILERPLATE],
1873 +[AC_REQUIRE([LT_AC_PROG_SED])dnl
1874 +ac_outfile=conftest.$ac_objext
1875 +echo "$lt_simple_link_test_code" >conftest.$ac_ext
1876 +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
1877 +_lt_linker_boilerplate=`cat conftest.err`
1878 +$rm conftest*
1879 +])# _LT_LINKER_BOILERPLATE
1880
1881 - #
1882 - # First check in libc
1883 - #
1884 - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
1885 - [AC_TRY_LINK([
1886 -#include <libintl.h>
1887 -],
1888 - [return !ngettext ("","", 1)],
1889 - gt_cv_func_ngettext_libc=yes,
1890 - gt_cv_func_ngettext_libc=no)
1891 - ])
1892 -
1893 - if test "$gt_cv_func_ngettext_libc" = "yes" ; then
1894 - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
1895 - [AC_TRY_LINK([
1896 -#include <libintl.h>
1897 -],
1898 - [return !dgettext ("","")],
1899 - gt_cv_func_dgettext_libc=yes,
1900 - gt_cv_func_dgettext_libc=no)
1901 - ])
1902 - fi
1903 -
1904 - if test "$gt_cv_func_ngettext_libc" = "yes" ; then
1905 - AC_CHECK_FUNCS(bind_textdomain_codeset)
1906 - fi
1907
1908 - #
1909 - # If we don't have everything we want, check in libintl
1910 - #
1911 - if test "$gt_cv_func_dgettext_libc" != "yes" \
1912 - || test "$gt_cv_func_ngettext_libc" != "yes" \
1913 - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
1914 -
1915 - AC_CHECK_LIB(intl, bindtextdomain,
1916 - [AC_CHECK_LIB(intl, ngettext,
1917 - [AC_CHECK_LIB(intl, dgettext,
1918 - gt_cv_func_dgettext_libintl=yes)])])
1919 +# _LT_AC_SYS_LIBPATH_AIX
1920 +# ----------------------
1921 +# Links a minimal program and checks the executable
1922 +# for the system default hardcoded library path. In most cases,
1923 +# this is /usr/lib:/lib, but when the MPI compilers are used
1924 +# the location of the communication and MPI libs are included too.
1925 +# If we don't find anything, use the default library path according
1926 +# to the aix ld manual.
1927 +AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
1928 +[AC_REQUIRE([LT_AC_PROG_SED])dnl
1929 +AC_LINK_IFELSE(AC_LANG_PROGRAM,[
1930 +lt_aix_libpath_sed='
1931 + /Import File Strings/,/^$/ {
1932 + /^0/ {
1933 + s/^0 *\(.*\)$/\1/
1934 + p
1935 + }
1936 + }'
1937 +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1938 +# Check for a 64-bit object if we didn't find anything.
1939 +if test -z "$aix_libpath"; then
1940 + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1941 +fi],[])
1942 +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1943 +])# _LT_AC_SYS_LIBPATH_AIX
1944
1945 - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
1946 - AC_MSG_CHECKING([if -liconv is needed to use gettext])
1947 - AC_MSG_RESULT([])
1948 - AC_CHECK_LIB(intl, ngettext,
1949 - [AC_CHECK_LIB(intl, dcgettext,
1950 - [gt_cv_func_dgettext_libintl=yes
1951 - libintl_extra_libs=-liconv],
1952 - :,-liconv)],
1953 - :,-liconv)
1954 - fi
1955
1956 - #
1957 - # If we found libintl, then check in it for bind_textdomain_codeset();
1958 - # we'll prefer libc if neither have bind_textdomain_codeset(),
1959 - # and both have dgettext and ngettext
1960 - #
1961 - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
1962 - glib_save_LIBS="$LIBS"
1963 - LIBS="$LIBS -lintl $libintl_extra_libs"
1964 - unset ac_cv_func_bind_textdomain_codeset
1965 - AC_CHECK_FUNCS(bind_textdomain_codeset)
1966 - LIBS="$glib_save_LIBS"
1967 +# _LT_AC_SHELL_INIT(ARG)
1968 +# ----------------------
1969 +AC_DEFUN([_LT_AC_SHELL_INIT],
1970 +[ifdef([AC_DIVERSION_NOTICE],
1971 + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
1972 + [AC_DIVERT_PUSH(NOTICE)])
1973 +$1
1974 +AC_DIVERT_POP
1975 +])# _LT_AC_SHELL_INIT
1976
1977 - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
1978 - gt_cv_func_dgettext_libc=no
1979 - else
1980 - if test "$gt_cv_func_dgettext_libc" = "yes" \
1981 - && test "$gt_cv_func_ngettext_libc" = "yes"; then
1982 - gt_cv_func_dgettext_libintl=no
1983 - fi
1984 - fi
1985 - fi
1986 - fi
1987
1988 - if test "$gt_cv_func_dgettext_libc" = "yes" \
1989 - || test "$gt_cv_func_dgettext_libintl" = "yes"; then
1990 - gt_cv_have_gettext=yes
1991 - fi
1992 -
1993 - if test "$gt_cv_func_dgettext_libintl" = "yes"; then
1994 - INTLLIBS="-lintl $libintl_extra_libs"
1995 - fi
1996 -
1997 - if test "$gt_cv_have_gettext" = "yes"; then
1998 - AC_DEFINE(HAVE_GETTEXT,1,
1999 - [Define if the GNU gettext() function is already present or preinstalled.])
2000 - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
2001 - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
2002 - if test "$MSGFMT" != "no"; then
2003 - glib_save_LIBS="$LIBS"
2004 - LIBS="$LIBS $INTLLIBS"
2005 - AC_CHECK_FUNCS(dcgettext)
2006 - MSGFMT_OPTS=
2007 - AC_MSG_CHECKING([if msgfmt accepts -c])
2008 - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
2009 -msgid ""
2010 -msgstr ""
2011 -"Content-Type: text/plain; charset=UTF-8\n"
2012 -"Project-Id-Version: test 1.0\n"
2013 -"PO-Revision-Date: 2007-02-15 12:01+0100\n"
2014 -"Last-Translator: test <foo@bar.xx>\n"
2015 -"Language-Team: C <LL@li.org>\n"
2016 -"MIME-Version: 1.0\n"
2017 -"Content-Transfer-Encoding: 8bit\n"
2018 -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
2019 - AC_SUBST(MSGFMT_OPTS)
2020 - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
2021 - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
2022 - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
2023 - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
2024 - return _nl_msg_cat_cntr],
2025 - [CATOBJEXT=.gmo
2026 - DATADIRNAME=share],
2027 - [case $host in
2028 - *-*-solaris*)
2029 - dnl On Solaris, if bind_textdomain_codeset is in libc,
2030 - dnl GNU format message catalog is always supported,
2031 - dnl since both are added to the libc all together.
2032 - dnl Hence, we'd like to go with DATADIRNAME=share and
2033 - dnl and CATOBJEXT=.gmo in this case.
2034 - AC_CHECK_FUNC(bind_textdomain_codeset,
2035 - [CATOBJEXT=.gmo
2036 - DATADIRNAME=share],
2037 - [CATOBJEXT=.mo
2038 - DATADIRNAME=lib])
2039 - ;;
2040 - *)
2041 - CATOBJEXT=.mo
2042 - DATADIRNAME=lib
2043 - ;;
2044 - esac])
2045 - LIBS="$glib_save_LIBS"
2046 - INSTOBJEXT=.mo
2047 - else
2048 - gt_cv_have_gettext=no
2049 - fi
2050 - fi
2051 - ])
2052 +# _LT_AC_PROG_ECHO_BACKSLASH
2053 +# --------------------------
2054 +# Add some code to the start of the generated configure script which
2055 +# will find an echo command which doesn't interpret backslashes.
2056 +AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
2057 +[_LT_AC_SHELL_INIT([
2058 +# Check that we are running under the correct shell.
2059 +SHELL=${CONFIG_SHELL-/bin/sh}
2060
2061 - if test "$gt_cv_have_gettext" = "yes" ; then
2062 - AC_DEFINE(ENABLE_NLS, 1,
2063 - [always defined to indicate that i18n is enabled])
2064 +case X$ECHO in
2065 +X*--fallback-echo)
2066 + # Remove one level of quotation (which was required for Make).
2067 + ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
2068 + ;;
2069 +esac
2070 +
2071 +echo=${ECHO-echo}
2072 +if test "X[$]1" = X--no-reexec; then
2073 + # Discard the --no-reexec flag, and continue.
2074 + shift
2075 +elif test "X[$]1" = X--fallback-echo; then
2076 + # Avoid inline document here, it may be left over
2077 + :
2078 +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
2079 + # Yippee, $echo works!
2080 + :
2081 +else
2082 + # Restart under the correct shell.
2083 + exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
2084 +fi
2085 +
2086 +if test "X[$]1" = X--fallback-echo; then
2087 + # used as fallback echo
2088 + shift
2089 + cat <<EOF
2090 +[$]*
2091 +EOF
2092 + exit 0
2093 +fi
2094 +
2095 +# The HP-UX ksh and POSIX shell print the target directory to stdout
2096 +# if CDPATH is set.
2097 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
2098 +
2099 +if test -z "$ECHO"; then
2100 +if test "X${echo_test_string+set}" != Xset; then
2101 +# find a string as large as possible, as long as the shell can cope with it
2102 + for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
2103 + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
2104 + if (echo_test_string=`eval $cmd`) 2>/dev/null &&
2105 + echo_test_string=`eval $cmd` &&
2106 + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
2107 + then
2108 + break
2109 fi
2110 + done
2111 +fi
2112
2113 - dnl Test whether we really found GNU xgettext.
2114 - if test "$XGETTEXT" != ":"; then
2115 - dnl If it is not GNU xgettext we define it as : so that the
2116 - dnl Makefiles still can work.
2117 - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
2118 - : ;
2119 +if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
2120 + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
2121 + test "X$echo_testing_string" = "X$echo_test_string"; then
2122 + :
2123 +else
2124 + # The Solaris, AIX, and Digital Unix default echo programs unquote
2125 + # backslashes. This makes it impossible to quote backslashes using
2126 + # echo "$something" | sed 's/\\/\\\\/g'
2127 + #
2128 + # So, first we look for a working echo in the user's PATH.
2129 +
2130 + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
2131 + for dir in $PATH /usr/ucb; do
2132 + IFS="$lt_save_ifs"
2133 + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
2134 + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
2135 + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
2136 + test "X$echo_testing_string" = "X$echo_test_string"; then
2137 + echo="$dir/echo"
2138 + break
2139 + fi
2140 + done
2141 + IFS="$lt_save_ifs"
2142 +
2143 + if test "X$echo" = Xecho; then
2144 + # We didn't find a better echo, so look for alternatives.
2145 + if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
2146 + echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
2147 + test "X$echo_testing_string" = "X$echo_test_string"; then
2148 + # This shell has a builtin print -r that does the trick.
2149 + echo='print -r'
2150 + elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
2151 + test "X$CONFIG_SHELL" != X/bin/ksh; then
2152 + # If we have ksh, try running configure again with it.
2153 + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
2154 + export ORIGINAL_CONFIG_SHELL
2155 + CONFIG_SHELL=/bin/ksh
2156 + export CONFIG_SHELL
2157 + exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
2158 + else
2159 + # Try using printf.
2160 + echo='printf %s\n'
2161 + if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
2162 + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
2163 + test "X$echo_testing_string" = "X$echo_test_string"; then
2164 + # Cool, printf works
2165 + :
2166 + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
2167 + test "X$echo_testing_string" = 'X\t' &&
2168 + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
2169 + test "X$echo_testing_string" = "X$echo_test_string"; then
2170 + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
2171 + export CONFIG_SHELL
2172 + SHELL="$CONFIG_SHELL"
2173 + export SHELL
2174 + echo="$CONFIG_SHELL [$]0 --fallback-echo"
2175 + elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
2176 + test "X$echo_testing_string" = 'X\t' &&
2177 + echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
2178 + test "X$echo_testing_string" = "X$echo_test_string"; then
2179 + echo="$CONFIG_SHELL [$]0 --fallback-echo"
2180 else
2181 - AC_MSG_RESULT(
2182 - [found xgettext program is not GNU xgettext; ignore it])
2183 - XGETTEXT=":"
2184 + # maybe with a smaller string...
2185 + prev=:
2186 +
2187 + for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
2188 + if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
2189 + then
2190 + break
2191 + fi
2192 + prev="$cmd"
2193 + done
2194 +
2195 + if test "$prev" != 'sed 50q "[$]0"'; then
2196 + echo_test_string=`eval $prev`
2197 + export echo_test_string
2198 + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
2199 + else
2200 + # Oops. We lost completely, so just stick with echo.
2201 + echo=echo
2202 + fi
2203 fi
2204 fi
2205 + fi
2206 +fi
2207 +fi
2208
2209 - # We need to process the po/ directory.
2210 - POSUB=po
2211 +# Copy echo and quote the copy suitably for passing to libtool from
2212 +# the Makefile, instead of quoting the original, which is used later.
2213 +ECHO=$echo
2214 +if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
2215 + ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
2216 +fi
2217
2218 - AC_OUTPUT_COMMANDS(
2219 - [case "$CONFIG_FILES" in *po/Makefile.in*)
2220 - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
2221 - esac])
2222 +AC_SUBST(ECHO)
2223 +])])# _LT_AC_PROG_ECHO_BACKSLASH
2224
2225 - dnl These rules are solely for the distribution goal. While doing this
2226 - dnl we only have to keep exactly one list of the available catalogs
2227 - dnl in configure.in.
2228 - for lang in $ALL_LINGUAS; do
2229 - GMOFILES="$GMOFILES $lang.gmo"
2230 - POFILES="$POFILES $lang.po"
2231 - done
2232 -
2233 - dnl Make all variables we use known to autoconf.
2234 - AC_SUBST(CATALOGS)
2235 - AC_SUBST(CATOBJEXT)
2236 - AC_SUBST(DATADIRNAME)
2237 - AC_SUBST(GMOFILES)
2238 - AC_SUBST(INSTOBJEXT)
2239 - AC_SUBST(INTLLIBS)
2240 - AC_SUBST(PO_IN_DATADIR_TRUE)
2241 - AC_SUBST(PO_IN_DATADIR_FALSE)
2242 - AC_SUBST(POFILES)
2243 - AC_SUBST(POSUB)
2244 - ])
2245 -
2246 -# AM_GLIB_GNU_GETTEXT
2247 -# -------------------
2248 -# Do checks necessary for use of gettext. If a suitable implementation
2249 -# of gettext is found in either in libintl or in the C library,
2250 -# it will set INTLLIBS to the libraries needed for use of gettext
2251 -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
2252 -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
2253 -# on various variables needed by the Makefile.in.in installed by
2254 -# glib-gettextize.
2255 -dnl
2256 -glib_DEFUN([GLIB_GNU_GETTEXT],
2257 - [AC_REQUIRE([AC_PROG_CC])dnl
2258 - AC_REQUIRE([AC_HEADER_STDC])dnl
2259 -
2260 - GLIB_LC_MESSAGES
2261 - GLIB_WITH_NLS
2262
2263 - if test "$gt_cv_have_gettext" = "yes"; then
2264 - if test "x$ALL_LINGUAS" = "x"; then
2265 - LINGUAS=
2266 - else
2267 - AC_MSG_CHECKING(for catalogs to be installed)
2268 - NEW_LINGUAS=
2269 - for presentlang in $ALL_LINGUAS; do
2270 - useit=no
2271 - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
2272 - desiredlanguages="$LINGUAS"
2273 - else
2274 - desiredlanguages="$ALL_LINGUAS"
2275 - fi
2276 - for desiredlang in $desiredlanguages; do
2277 - # Use the presentlang catalog if desiredlang is
2278 - # a. equal to presentlang, or
2279 - # b. a variant of presentlang (because in this case,
2280 - # presentlang can be used as a fallback for messages
2281 - # which are not translated in the desiredlang catalog).
2282 - case "$desiredlang" in
2283 - "$presentlang"*) useit=yes;;
2284 - esac
2285 - done
2286 - if test $useit = yes; then
2287 - NEW_LINGUAS="$NEW_LINGUAS $presentlang"
2288 - fi
2289 - done
2290 - LINGUAS=$NEW_LINGUAS
2291 - AC_MSG_RESULT($LINGUAS)
2292 - fi
2293 +# _LT_AC_LOCK
2294 +# -----------
2295 +AC_DEFUN([_LT_AC_LOCK],
2296 +[AC_ARG_ENABLE([libtool-lock],
2297 + [AC_HELP_STRING([--disable-libtool-lock],
2298 + [avoid locking (might break parallel builds)])])
2299 +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
2300
2301 - dnl Construct list of names of catalog files to be constructed.
2302 - if test -n "$LINGUAS"; then
2303 - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
2304 - fi
2305 +# Some flags need to be propagated to the compiler or linker for good
2306 +# libtool support.
2307 +case $host in
2308 +ia64-*-hpux*)
2309 + # Find out which ABI we are using.
2310 + echo 'int i;' > conftest.$ac_ext
2311 + if AC_TRY_EVAL(ac_compile); then
2312 + case `/usr/bin/file conftest.$ac_objext` in
2313 + *ELF-32*)
2314 + HPUX_IA64_MODE="32"
2315 + ;;
2316 + *ELF-64*)
2317 + HPUX_IA64_MODE="64"
2318 + ;;
2319 + esac
2320 + fi
2321 + rm -rf conftest*
2322 + ;;
2323 +*-*-irix6*)
2324 + # Find out which ABI we are using.
2325 + echo '[#]line __oline__ "configure"' > conftest.$ac_ext
2326 + if AC_TRY_EVAL(ac_compile); then
2327 + if test "$lt_cv_prog_gnu_ld" = yes; then
2328 + case `/usr/bin/file conftest.$ac_objext` in
2329 + *32-bit*)
2330 + LD="${LD-ld} -melf32bsmip"
2331 + ;;
2332 + *N32*)
2333 + LD="${LD-ld} -melf32bmipn32"
2334 + ;;
2335 + *64-bit*)
2336 + LD="${LD-ld} -melf64bmip"
2337 + ;;
2338 + esac
2339 + else
2340 + case `/usr/bin/file conftest.$ac_objext` in
2341 + *32-bit*)
2342 + LD="${LD-ld} -32"
2343 + ;;
2344 + *N32*)
2345 + LD="${LD-ld} -n32"
2346 + ;;
2347 + *64-bit*)
2348 + LD="${LD-ld} -64"
2349 + ;;
2350 + esac
2351 fi
2352 + fi
2353 + rm -rf conftest*
2354 + ;;
2355
2356 - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
2357 - dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
2358 - dnl Try to locate is.
2359 - MKINSTALLDIRS=
2360 - if test -n "$ac_aux_dir"; then
2361 - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
2362 - fi
2363 - if test -z "$MKINSTALLDIRS"; then
2364 - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
2365 - fi
2366 - AC_SUBST(MKINSTALLDIRS)
2367 +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
2368 +s390*-*linux*|sparc*-*linux*)
2369 + # Find out which ABI we are using.
2370 + echo 'int i;' > conftest.$ac_ext
2371 + if AC_TRY_EVAL(ac_compile); then
2372 + case `/usr/bin/file conftest.o` in
2373 + *32-bit*)
2374 + case $host in
2375 + x86_64-*kfreebsd*-gnu)
2376 + LD="${LD-ld} -m elf_i386_fbsd"
2377 + ;;
2378 + x86_64-*linux*)
2379 + LD="${LD-ld} -m elf_i386"
2380 + ;;
2381 + ppc64-*linux*|powerpc64-*linux*)
2382 + LD="${LD-ld} -m elf32ppclinux"
2383 + ;;
2384 + s390x-*linux*)
2385 + LD="${LD-ld} -m elf_s390"
2386 + ;;
2387 + sparc64-*linux*)
2388 + LD="${LD-ld} -m elf32_sparc"
2389 + ;;
2390 + esac
2391 + ;;
2392 + *64-bit*)
2393 + case $host in
2394 + x86_64-*kfreebsd*-gnu)
2395 + LD="${LD-ld} -m elf_x86_64_fbsd"
2396 + ;;
2397 + x86_64-*linux*)
2398 + LD="${LD-ld} -m elf_x86_64"
2399 + ;;
2400 + ppc*-*linux*|powerpc*-*linux*)
2401 + LD="${LD-ld} -m elf64ppc"
2402 + ;;
2403 + s390*-*linux*)
2404 + LD="${LD-ld} -m elf64_s390"
2405 + ;;
2406 + sparc*-*linux*)
2407 + LD="${LD-ld} -m elf64_sparc"
2408 + ;;
2409 + esac
2410 + ;;
2411 + esac
2412 + fi
2413 + rm -rf conftest*
2414 + ;;
2415
2416 - dnl Generate list of files to be processed by xgettext which will
2417 - dnl be included in po/Makefile.
2418 - test -d po || mkdir po
2419 - if test "x$srcdir" != "x."; then
2420 - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
2421 - posrcprefix="$srcdir/"
2422 - else
2423 - posrcprefix="../$srcdir/"
2424 - fi
2425 - else
2426 - posrcprefix="../"
2427 - fi
2428 - rm -f po/POTFILES
2429 - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
2430 - < $srcdir/po/POTFILES.in > po/POTFILES
2431 +*-*-sco3.2v5*)
2432 + # On SCO OpenServer 5, we need -belf to get full-featured binaries.
2433 + SAVE_CFLAGS="$CFLAGS"
2434 + CFLAGS="$CFLAGS -belf"
2435 + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
2436 + [AC_LANG_PUSH(C)
2437 + AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
2438 + AC_LANG_POP])
2439 + if test x"$lt_cv_cc_needs_belf" != x"yes"; then
2440 + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
2441 + CFLAGS="$SAVE_CFLAGS"
2442 + fi
2443 + ;;
2444 +sparc*-*solaris*)
2445 + # Find out which ABI we are using.
2446 + echo 'int i;' > conftest.$ac_ext
2447 + if AC_TRY_EVAL(ac_compile); then
2448 + case `/usr/bin/file conftest.o` in
2449 + *64-bit*)
2450 + case $lt_cv_prog_gnu_ld in
2451 + yes*) LD="${LD-ld} -m elf64_sparc" ;;
2452 + *) LD="${LD-ld} -64" ;;
2453 + esac
2454 + ;;
2455 + esac
2456 + fi
2457 + rm -rf conftest*
2458 + ;;
2459 +
2460 +AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
2461 +[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
2462 + AC_CHECK_TOOL(DLLTOOL, dlltool, false)
2463 + AC_CHECK_TOOL(AS, as, false)
2464 + AC_CHECK_TOOL(OBJDUMP, objdump, false)
2465 + ;;
2466 ])
2467 +esac
2468
2469 -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
2470 -# -------------------------------
2471 -# Define VARIABLE to the location where catalog files will
2472 -# be installed by po/Makefile.
2473 -glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
2474 -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
2475 -glib_save_prefix="$prefix"
2476 -glib_save_exec_prefix="$exec_prefix"
2477 -glib_save_datarootdir="$datarootdir"
2478 -test "x$prefix" = xNONE && prefix=$ac_default_prefix
2479 -test "x$exec_prefix" = xNONE && exec_prefix=$prefix
2480 -datarootdir=`eval echo "${datarootdir}"`
2481 -if test "x$CATOBJEXT" = "x.mo" ; then
2482 - localedir=`eval echo "${libdir}/locale"`
2483 -else
2484 - localedir=`eval echo "${datadir}/locale"`
2485 -fi
2486 -prefix="$glib_save_prefix"
2487 -exec_prefix="$glib_save_exec_prefix"
2488 -datarootdir="$glib_save_datarootdir"
2489 -AC_DEFINE_UNQUOTED($1, "$localedir",
2490 - [Define the location where the catalogs will be installed])
2491 -])
2492 +need_locks="$enable_libtool_lock"
2493
2494 -dnl
2495 -dnl Now the definitions that aclocal will find
2496 -dnl
2497 -ifdef(glib_configure_in,[],[
2498 -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
2499 -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
2500 -])dnl
2501 +])# _LT_AC_LOCK
2502
2503 -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
2504 -#
2505 -# Create a temporary file with TEST-FILE as its contents and pass the
2506 -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
2507 -# 0 and perform ACTION-IF-FAIL for any other exit status.
2508 -AC_DEFUN([GLIB_RUN_PROG],
2509 -[cat >conftest.foo <<_ACEOF
2510 -$2
2511 -_ACEOF
2512 -if AC_RUN_LOG([$1 conftest.foo]); then
2513 - m4_ifval([$3], [$3], [:])
2514 -m4_ifvaln([$4], [else $4])dnl
2515 -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
2516 -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
2517 -fi])
2518
2519 +# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
2520 +# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
2521 +# ----------------------------------------------------------------
2522 +# Check whether the given compiler option works
2523 +AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
2524 +[AC_REQUIRE([LT_AC_PROG_SED])
2525 +AC_CACHE_CHECK([$1], [$2],
2526 + [$2=no
2527 + ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
2528 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
2529 + lt_compiler_flag="$3"
2530 + # Insert the option either (1) after the last *FLAGS variable, or
2531 + # (2) before a word containing "conftest.", or (3) at the end.
2532 + # Note that $ac_compile itself does not contain backslashes and begins
2533 + # with a dollar sign (not a hyphen), so the echo should work correctly.
2534 + # The option is referenced via a variable to avoid confusing sed.
2535 + lt_compile=`echo "$ac_compile" | $SED \
2536 + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2537 + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
2538 + -e 's:$: $lt_compiler_flag:'`
2539 + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
2540 + (eval "$lt_compile" 2>conftest.err)
2541 + ac_status=$?
2542 + cat conftest.err >&AS_MESSAGE_LOG_FD
2543 + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
2544 + if (exit $ac_status) && test -s "$ac_outfile"; then
2545 + # The compiler can only warn and ignore the option if not recognized
2546 + # So say no if there are warnings other than the usual output.
2547 + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
2548 + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
2549 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
2550 + $2=yes
2551 + fi
2552 + fi
2553 + $rm conftest*
2554 +])
2555
2556 -# gnome-common.m4
2557 -#
2558 +if test x"[$]$2" = xyes; then
2559 + ifelse([$5], , :, [$5])
2560 +else
2561 + ifelse([$6], , :, [$6])
2562 +fi
2563 +])# AC_LIBTOOL_COMPILER_OPTION
2564
2565 -dnl GNOME_COMMON_INIT
2566
2567 -AC_DEFUN([GNOME_COMMON_INIT],
2568 -[
2569 - dnl this macro should come after AC_CONFIG_MACRO_DIR
2570 - AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
2571 +# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
2572 +# [ACTION-SUCCESS], [ACTION-FAILURE])
2573 +# ------------------------------------------------------------
2574 +# Check whether the given compiler option works
2575 +AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
2576 +[AC_REQUIRE([LT_AC_PROG_SED])dnl
2577 +AC_CACHE_CHECK([$1], [$2],
2578 + [$2=no
2579 + save_LDFLAGS="$LDFLAGS"
2580 + LDFLAGS="$LDFLAGS $3"
2581 + echo "$lt_simple_link_test_code" > conftest.$ac_ext
2582 + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
2583 + # The linker can only warn and ignore the option if not recognized
2584 + # So say no if there are warnings
2585 + if test -s conftest.err; then
2586 + # Append any errors to the config.log.
2587 + cat conftest.err 1>&AS_MESSAGE_LOG_FD
2588 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
2589 + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
2590 + if diff conftest.exp conftest.er2 >/dev/null; then
2591 + $2=yes
2592 + fi
2593 + else
2594 + $2=yes
2595 + fi
2596 + fi
2597 + $rm conftest*
2598 + LDFLAGS="$save_LDFLAGS"
2599 +])
2600
2601 - dnl ensure that when the Automake generated makefile calls aclocal,
2602 - dnl it honours the $ACLOCAL_FLAGS environment variable
2603 - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
2604 - if test -n "$ac_macro_dir"; then
2605 - ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
2606 - fi
2607 +if test x"[$]$2" = xyes; then
2608 + ifelse([$4], , :, [$4])
2609 +else
2610 + ifelse([$5], , :, [$5])
2611 +fi
2612 +])# AC_LIBTOOL_LINKER_OPTION
2613
2614 - AC_SUBST([ACLOCAL_AMFLAGS])
2615 -])
2616
2617 -AC_DEFUN([GNOME_DEBUG_CHECK],
2618 -[
2619 - AC_ARG_ENABLE([debug],
2620 - AC_HELP_STRING([--enable-debug],
2621 - [turn on debugging]),,
2622 - [enable_debug=no])
2623 +# AC_LIBTOOL_SYS_MAX_CMD_LEN
2624 +# --------------------------
2625 +AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
2626 +[# find the maximum length of command line arguments
2627 +AC_MSG_CHECKING([the maximum length of command line arguments])
2628 +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
2629 + i=0
2630 + teststring="ABCD"
2631
2632 - if test x$enable_debug = xyes ; then
2633 - AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
2634 - [Enable additional debugging at the expense of performance and size])
2635 - fi
2636 -])
2637 + case $build_os in
2638 + msdosdjgpp*)
2639 + # On DJGPP, this test can blow up pretty badly due to problems in libc
2640 + # (any single argument exceeding 2000 bytes causes a buffer overrun
2641 + # during glob expansion). Even if it were fixed, the result of this
2642 + # check would be larger than it should be.
2643 + lt_cv_sys_max_cmd_len=12288; # 12K is about right
2644 + ;;
2645
2646 -dnl GNOME_MAINTAINER_MODE_DEFINES ()
2647 -dnl define DISABLE_DEPRECATED
2648 -dnl
2649 -AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
2650 -[
2651 - AC_REQUIRE([AM_MAINTAINER_MODE])
2652 + gnu*)
2653 + # Under GNU Hurd, this test is not required because there is
2654 + # no limit to the length of command line arguments.
2655 + # Libtool will interpret -1 as no limit whatsoever
2656 + lt_cv_sys_max_cmd_len=-1;
2657 + ;;
2658
2659 - if test $USE_MAINTAINER_MODE = yes; then
2660 - DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"
2661 - else
2662 - DISABLE_DEPRECATED=""
2663 - fi
2664 - AC_SUBST(DISABLE_DEPRECATED)
2665 -])
2666 + cygwin* | mingw*)
2667 + # On Win9x/ME, this test blows up -- it succeeds, but takes
2668 + # about 5 minutes as the teststring grows exponentially.
2669 + # Worse, since 9x/ME are not pre-emptively multitasking,
2670 + # you end up with a "frozen" computer, even though with patience
2671 + # the test eventually succeeds (with a max line length of 256k).
2672 + # Instead, let's just punt: use the minimum linelength reported by
2673 + # all of the supported platforms: 8192 (on NT/2K/XP).
2674 + lt_cv_sys_max_cmd_len=8192;
2675 + ;;
2676
2677 -dnl GNOME_COMPILE_WARNINGS
2678 -dnl Turn on many useful compiler warnings
2679 -dnl For now, only works on GCC
2680 -AC_DEFUN([GNOME_COMPILE_WARNINGS],[
2681 - dnl ******************************
2682 - dnl More compiler warnings
2683 - dnl ******************************
2684 + amigaos*)
2685 + # On AmigaOS with pdksh, this test takes hours, literally.
2686 + # So we just punt and use a minimum line length of 8192.
2687 + lt_cv_sys_max_cmd_len=8192;
2688 + ;;
2689
2690 - AC_ARG_ENABLE(compile-warnings,
2691 - AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
2692 - [Turn on compiler warnings]),,
2693 - [enable_compile_warnings="m4_default([$1],[yes])"])
2694 + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
2695 + # This has been around since 386BSD, at least. Likely further.
2696 + if test -x /sbin/sysctl; then
2697 + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
2698 + elif test -x /usr/sbin/sysctl; then
2699 + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
2700 + else
2701 + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
2702 + fi
2703 + # And add a safety zone
2704 + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
2705 + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
2706 + ;;
2707
2708 - warnCFLAGS=
2709 - if test "x$GCC" != xyes; then
2710 - enable_compile_warnings=no
2711 + interix*)
2712 + # We know the value 262144 and hardcode it with a safety zone (like BSD)
2713 + lt_cv_sys_max_cmd_len=196608
2714 + ;;
2715 +
2716 + osf*)
2717 + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
2718 + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
2719 + # nice to cause kernel panics so lets avoid the loop below.
2720 + # First set a reasonable default.
2721 + lt_cv_sys_max_cmd_len=16384
2722 + #
2723 + if test -x /sbin/sysconfig; then
2724 + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
2725 + *1*) lt_cv_sys_max_cmd_len=-1 ;;
2726 + esac
2727 + fi
2728 + ;;
2729 + sco3.2v5*)
2730 + lt_cv_sys_max_cmd_len=102400
2731 + ;;
2732 + sysv5* | sco5v6* | sysv4.2uw2*)
2733 + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
2734 + if test -n "$kargmax"; then
2735 + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
2736 + else
2737 + lt_cv_sys_max_cmd_len=32768
2738 + fi
2739 + ;;
2740 + *)
2741 + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
2742 + if test -n "$lt_cv_sys_max_cmd_len"; then
2743 + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
2744 + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
2745 + else
2746 + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
2747 + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
2748 + = "XX$teststring") >/dev/null 2>&1 &&
2749 + new_result=`expr "X$teststring" : ".*" 2>&1` &&
2750 + lt_cv_sys_max_cmd_len=$new_result &&
2751 + test $i != 17 # 1/2 MB should be enough
2752 + do
2753 + i=`expr $i + 1`
2754 + teststring=$teststring$teststring
2755 + done
2756 + teststring=
2757 + # Add a significant safety factor because C++ compilers can tack on massive
2758 + # amounts of additional arguments before passing them to the linker.
2759 + # It appears as though 1/2 is a usable value.
2760 + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
2761 fi
2762 + ;;
2763 + esac
2764 +])
2765 +if test -n $lt_cv_sys_max_cmd_len ; then
2766 + AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
2767 +else
2768 + AC_MSG_RESULT(none)
2769 +fi
2770 +])# AC_LIBTOOL_SYS_MAX_CMD_LEN
2771
2772 - warning_flags=
2773 - realsave_CFLAGS="$CFLAGS"
2774
2775 - case "$enable_compile_warnings" in
2776 - no)
2777 - warning_flags=
2778 - ;;
2779 - minimum)
2780 - warning_flags="-Wall"
2781 - ;;
2782 - yes)
2783 - warning_flags="-Wall -Wmissing-prototypes"
2784 - ;;
2785 - maximum|error)
2786 - warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
2787 - CFLAGS="$warning_flags $CFLAGS"
2788 - for option in -Wno-sign-compare; do
2789 - SAVE_CFLAGS="$CFLAGS"
2790 - CFLAGS="$CFLAGS $option"
2791 - AC_MSG_CHECKING([whether gcc understands $option])
2792 - AC_TRY_COMPILE([], [],
2793 - has_option=yes,
2794 - has_option=no,)
2795 - CFLAGS="$SAVE_CFLAGS"
2796 - AC_MSG_RESULT($has_option)
2797 - if test $has_option = yes; then
2798 - warning_flags="$warning_flags $option"
2799 - fi
2800 - unset has_option
2801 - unset SAVE_CFLAGS
2802 - done
2803 - unset option
2804 - if test "$enable_compile_warnings" = "error" ; then
2805 - warning_flags="$warning_flags -Werror"
2806 - fi
2807 - ;;
2808 - *)
2809 - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
2810 - ;;
2811 - esac
2812 - CFLAGS="$realsave_CFLAGS"
2813 - AC_MSG_CHECKING(what warning flags to pass to the C compiler)
2814 - AC_MSG_RESULT($warning_flags)
2815 +# _LT_AC_CHECK_DLFCN
2816 +# ------------------
2817 +AC_DEFUN([_LT_AC_CHECK_DLFCN],
2818 +[AC_CHECK_HEADERS(dlfcn.h)dnl
2819 +])# _LT_AC_CHECK_DLFCN
2820
2821 - AC_ARG_ENABLE(iso-c,
2822 - AC_HELP_STRING([--enable-iso-c],
2823 - [Try to warn if code is not ISO C ]),,
2824 - [enable_iso_c=no])
2825
2826 - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
2827 - complCFLAGS=
2828 - if test "x$enable_iso_c" != "xno"; then
2829 - if test "x$GCC" = "xyes"; then
2830 - case " $CFLAGS " in
2831 - *[\ \ ]-ansi[\ \ ]*) ;;
2832 - *) complCFLAGS="$complCFLAGS -ansi" ;;
2833 - esac
2834 - case " $CFLAGS " in
2835 - *[\ \ ]-pedantic[\ \ ]*) ;;
2836 - *) complCFLAGS="$complCFLAGS -pedantic" ;;
2837 - esac
2838 - fi
2839 - fi
2840 - AC_MSG_RESULT($complCFLAGS)
2841 +# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
2842 +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
2843 +# ---------------------------------------------------------------------
2844 +AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
2845 +[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
2846 +if test "$cross_compiling" = yes; then :
2847 + [$4]
2848 +else
2849 + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
2850 + lt_status=$lt_dlunknown
2851 + cat > conftest.$ac_ext <<EOF
2852 +[#line __oline__ "configure"
2853 +#include "confdefs.h"
2854
2855 - WARN_CFLAGS="$warning_flags $complCFLAGS"
2856 - AC_SUBST(WARN_CFLAGS)
2857 -])
2858 +#if HAVE_DLFCN_H
2859 +#include <dlfcn.h>
2860 +#endif
2861
2862 -dnl For C++, do basically the same thing.
2863 +#include <stdio.h>
2864
2865 -AC_DEFUN([GNOME_CXX_WARNINGS],[
2866 - AC_ARG_ENABLE(cxx-warnings,
2867 - AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
2868 - [Turn on compiler warnings.]),,
2869 - [enable_cxx_warnings="m4_default([$1],[minimum])"])
2870 +#ifdef RTLD_GLOBAL
2871 +# define LT_DLGLOBAL RTLD_GLOBAL
2872 +#else
2873 +# ifdef DL_GLOBAL
2874 +# define LT_DLGLOBAL DL_GLOBAL
2875 +# else
2876 +# define LT_DLGLOBAL 0
2877 +# endif
2878 +#endif
2879
2880 - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
2881 - warnCXXFLAGS=
2882 - if test "x$GXX" != xyes; then
2883 - enable_cxx_warnings=no
2884 - fi
2885 - if test "x$enable_cxx_warnings" != "xno"; then
2886 - if test "x$GXX" = "xyes"; then
2887 - case " $CXXFLAGS " in
2888 - *[\ \ ]-Wall[\ \ ]*) ;;
2889 - *) warnCXXFLAGS="-Wall -Wno-unused" ;;
2890 - esac
2891 +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
2892 + find out it does not work in some platform. */
2893 +#ifndef LT_DLLAZY_OR_NOW
2894 +# ifdef RTLD_LAZY
2895 +# define LT_DLLAZY_OR_NOW RTLD_LAZY
2896 +# else
2897 +# ifdef DL_LAZY
2898 +# define LT_DLLAZY_OR_NOW DL_LAZY
2899 +# else
2900 +# ifdef RTLD_NOW
2901 +# define LT_DLLAZY_OR_NOW RTLD_NOW
2902 +# else
2903 +# ifdef DL_NOW
2904 +# define LT_DLLAZY_OR_NOW DL_NOW
2905 +# else
2906 +# define LT_DLLAZY_OR_NOW 0
2907 +# endif
2908 +# endif
2909 +# endif
2910 +# endif
2911 +#endif
2912
2913 - ## -W is not all that useful. And it cannot be controlled
2914 - ## with individual -Wno-xxx flags, unlike -Wall
2915 - if test "x$enable_cxx_warnings" = "xyes"; then
2916 - warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
2917 - fi
2918 - fi
2919 +#ifdef __cplusplus
2920 +extern "C" void exit (int);
2921 +#endif
2922 +
2923 +void fnord() { int i=42;}
2924 +int main ()
2925 +{
2926 + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
2927 + int status = $lt_dlunknown;
2928 +
2929 + if (self)
2930 + {
2931 + if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
2932 + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
2933 + /* dlclose (self); */
2934 + }
2935 + else
2936 + puts (dlerror ());
2937 +
2938 + exit (status);
2939 +}]
2940 +EOF
2941 + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
2942 + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
2943 + lt_status=$?
2944 + case x$lt_status in
2945 + x$lt_dlno_uscore) $1 ;;
2946 + x$lt_dlneed_uscore) $2 ;;
2947 + x$lt_dlunknown|x*) $3 ;;
2948 + esac
2949 + else :
2950 + # compilation failed
2951 + $3
2952 fi
2953 - AC_MSG_RESULT($warnCXXFLAGS)
2954 +fi
2955 +rm -fr conftest*
2956 +])# _LT_AC_TRY_DLOPEN_SELF
2957
2958 - AC_ARG_ENABLE(iso-cxx,
2959 - AC_HELP_STRING([--enable-iso-cxx],
2960 - [Try to warn if code is not ISO C++ ]),,
2961 - [enable_iso_cxx=no])
2962
2963 - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
2964 - complCXXFLAGS=
2965 - if test "x$enable_iso_cxx" != "xno"; then
2966 - if test "x$GXX" = "xyes"; then
2967 - case " $CXXFLAGS " in
2968 - *[\ \ ]-ansi[\ \ ]*) ;;
2969 - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
2970 - esac
2971 +# AC_LIBTOOL_DLOPEN_SELF
2972 +# ----------------------
2973 +AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
2974 +[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
2975 +if test "x$enable_dlopen" != xyes; then
2976 + enable_dlopen=unknown
2977 + enable_dlopen_self=unknown
2978 + enable_dlopen_self_static=unknown
2979 +else
2980 + lt_cv_dlopen=no
2981 + lt_cv_dlopen_libs=
2982
2983 - case " $CXXFLAGS " in
2984 - *[\ \ ]-pedantic[\ \ ]*) ;;
2985 - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
2986 - esac
2987 - fi
2988 - fi
2989 - AC_MSG_RESULT($complCXXFLAGS)
2990 + case $host_os in
2991 + beos*)
2992 + lt_cv_dlopen="load_add_on"
2993 + lt_cv_dlopen_libs=
2994 + lt_cv_dlopen_self=yes
2995 + ;;
2996
2997 - WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
2998 - AC_SUBST(WARN_CXXFLAGS)
2999 -])
3000 + mingw* | pw32*)
3001 + lt_cv_dlopen="LoadLibrary"
3002 + lt_cv_dlopen_libs=
3003 + ;;
3004
3005 -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
3006 + cygwin*)
3007 + lt_cv_dlopen="dlopen"
3008 + lt_cv_dlopen_libs=
3009 + ;;
3010
3011 -# serial 48 AC_PROG_LIBTOOL
3012 + darwin*)
3013 + # if libdl is installed we need to link against it
3014 + AC_CHECK_LIB([dl], [dlopen],
3015 + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
3016 + lt_cv_dlopen="dyld"
3017 + lt_cv_dlopen_libs=
3018 + lt_cv_dlopen_self=yes
3019 + ])
3020 + ;;
3021
3022 + *)
3023 + AC_CHECK_FUNC([shl_load],
3024 + [lt_cv_dlopen="shl_load"],
3025 + [AC_CHECK_LIB([dld], [shl_load],
3026 + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
3027 + [AC_CHECK_FUNC([dlopen],
3028 + [lt_cv_dlopen="dlopen"],
3029 + [AC_CHECK_LIB([dl], [dlopen],
3030 + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
3031 + [AC_CHECK_LIB([svld], [dlopen],
3032 + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
3033 + [AC_CHECK_LIB([dld], [dld_link],
3034 + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
3035 + ])
3036 + ])
3037 + ])
3038 + ])
3039 + ])
3040 + ;;
3041 + esac
3042
3043 -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
3044 -# -----------------------------------------------------------
3045 -# If this macro is not defined by Autoconf, define it here.
3046 -m4_ifdef([AC_PROVIDE_IFELSE],
3047 - [],
3048 - [m4_define([AC_PROVIDE_IFELSE],
3049 - [m4_ifdef([AC_PROVIDE_$1],
3050 - [$2], [$3])])])
3051 + if test "x$lt_cv_dlopen" != xno; then
3052 + enable_dlopen=yes
3053 + else
3054 + enable_dlopen=no
3055 + fi
3056
3057 + case $lt_cv_dlopen in
3058 + dlopen)
3059 + save_CPPFLAGS="$CPPFLAGS"
3060 + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
3061
3062 -# AC_PROG_LIBTOOL
3063 -# ---------------
3064 -AC_DEFUN([AC_PROG_LIBTOOL],
3065 -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
3066 -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
3067 -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
3068 - AC_PROVIDE_IFELSE([AC_PROG_CXX],
3069 - [AC_LIBTOOL_CXX],
3070 - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
3071 - ])])
3072 -dnl And a similar setup for Fortran 77 support
3073 - AC_PROVIDE_IFELSE([AC_PROG_F77],
3074 - [AC_LIBTOOL_F77],
3075 - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
3076 -])])
3077 + save_LDFLAGS="$LDFLAGS"
3078 + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
3079
3080 -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
3081 -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
3082 -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
3083 - AC_PROVIDE_IFELSE([AC_PROG_GCJ],
3084 - [AC_LIBTOOL_GCJ],
3085 - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
3086 - [AC_LIBTOOL_GCJ],
3087 - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
3088 - [AC_LIBTOOL_GCJ],
3089 - [ifdef([AC_PROG_GCJ],
3090 - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
3091 - ifdef([A][M_PROG_GCJ],
3092 - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
3093 - ifdef([LT_AC_PROG_GCJ],
3094 - [define([LT_AC_PROG_GCJ],
3095 - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
3096 -])])# AC_PROG_LIBTOOL
3097 + save_LIBS="$LIBS"
3098 + LIBS="$lt_cv_dlopen_libs $LIBS"
3099
3100 + AC_CACHE_CHECK([whether a program can dlopen itself],
3101 + lt_cv_dlopen_self, [dnl
3102 + _LT_AC_TRY_DLOPEN_SELF(
3103 + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
3104 + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
3105 + ])
3106
3107 -# _AC_PROG_LIBTOOL
3108 -# ----------------
3109 -AC_DEFUN([_AC_PROG_LIBTOOL],
3110 -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
3111 -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
3112 -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
3113 -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
3114 + if test "x$lt_cv_dlopen_self" = xyes; then
3115 + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
3116 + AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
3117 + lt_cv_dlopen_self_static, [dnl
3118 + _LT_AC_TRY_DLOPEN_SELF(
3119 + lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
3120 + lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
3121 + ])
3122 + fi
3123
3124 -# This can be used to rebuild libtool when needed
3125 -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
3126 + CPPFLAGS="$save_CPPFLAGS"
3127 + LDFLAGS="$save_LDFLAGS"
3128 + LIBS="$save_LIBS"
3129 + ;;
3130 + esac
3131
3132 -# Always use our own libtool.
3133 -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
3134 -AC_SUBST(LIBTOOL)dnl
3135 + case $lt_cv_dlopen_self in
3136 + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
3137 + *) enable_dlopen_self=unknown ;;
3138 + esac
3139
3140 -# Prevent multiple expansion
3141 -define([AC_PROG_LIBTOOL], [])
3142 -])# _AC_PROG_LIBTOOL
3143 + case $lt_cv_dlopen_self_static in
3144 + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
3145 + *) enable_dlopen_self_static=unknown ;;
3146 + esac
3147 +fi
3148 +])# AC_LIBTOOL_DLOPEN_SELF
3149
3150
3151 -# AC_LIBTOOL_SETUP
3152 -# ----------------
3153 -AC_DEFUN([AC_LIBTOOL_SETUP],
3154 -[AC_PREREQ(2.50)dnl
3155 -AC_REQUIRE([AC_ENABLE_SHARED])dnl
3156 -AC_REQUIRE([AC_ENABLE_STATIC])dnl
3157 -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
3158 -AC_REQUIRE([AC_CANONICAL_HOST])dnl
3159 -AC_REQUIRE([AC_CANONICAL_BUILD])dnl
3160 -AC_REQUIRE([AC_PROG_CC])dnl
3161 -AC_REQUIRE([AC_PROG_LD])dnl
3162 -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
3163 -AC_REQUIRE([AC_PROG_NM])dnl
3164 +# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
3165 +# ---------------------------------
3166 +# Check to see if options -c and -o are simultaneously supported by compiler
3167 +AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
3168 +[AC_REQUIRE([LT_AC_PROG_SED])dnl
3169 +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
3170 +AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
3171 + [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
3172 + [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
3173 + $rm -r conftest 2>/dev/null
3174 + mkdir conftest
3175 + cd conftest
3176 + mkdir out
3177 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
3178
3179 -AC_REQUIRE([AC_PROG_LN_S])dnl
3180 -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
3181 -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
3182 -AC_REQUIRE([AC_OBJEXT])dnl
3183 -AC_REQUIRE([AC_EXEEXT])dnl
3184 -dnl
3185 + lt_compiler_flag="-o out/conftest2.$ac_objext"
3186 + # Insert the option either (1) after the last *FLAGS variable, or
3187 + # (2) before a word containing "conftest.", or (3) at the end.
3188 + # Note that $ac_compile itself does not contain backslashes and begins
3189 + # with a dollar sign (not a hyphen), so the echo should work correctly.
3190 + lt_compile=`echo "$ac_compile" | $SED \
3191 + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
3192 + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
3193 + -e 's:$: $lt_compiler_flag:'`
3194 + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
3195 + (eval "$lt_compile" 2>out/conftest.err)
3196 + ac_status=$?
3197 + cat out/conftest.err >&AS_MESSAGE_LOG_FD
3198 + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
3199 + if (exit $ac_status) && test -s out/conftest2.$ac_objext
3200 + then
3201 + # The compiler can only warn and ignore the option if not recognized
3202 + # So say no if there are warnings
3203 + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
3204 + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
3205 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
3206 + _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
3207 + fi
3208 + fi
3209 + chmod u+w . 2>&AS_MESSAGE_LOG_FD
3210 + $rm conftest*
3211 + # SGI C++ compiler will create directory out/ii_files/ for
3212 + # template instantiation
3213 + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
3214 + $rm out/* && rmdir out
3215 + cd ..
3216 + rmdir conftest
3217 + $rm conftest*
3218 +])
3219 +])# AC_LIBTOOL_PROG_CC_C_O
3220
3221 -AC_LIBTOOL_SYS_MAX_CMD_LEN
3222 -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
3223 -AC_LIBTOOL_OBJDIR
3224
3225 -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
3226 -_LT_AC_PROG_ECHO_BACKSLASH
3227 +# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
3228 +# -----------------------------------------
3229 +# Check to see if we can do hard links to lock some files if needed
3230 +AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
3231 +[AC_REQUIRE([_LT_AC_LOCK])dnl
3232
3233 -case $host_os in
3234 -aix3*)
3235 - # AIX sometimes has problems with the GCC collect2 program. For some
3236 - # reason, if we set the COLLECT_NAMES environment variable, the problems
3237 - # vanish in a puff of smoke.
3238 - if test "X${COLLECT_NAMES+set}" != Xset; then
3239 - COLLECT_NAMES=
3240 - export COLLECT_NAMES
3241 +hard_links="nottested"
3242 +if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
3243 + # do not overwrite the value of need_locks provided by the user
3244 + AC_MSG_CHECKING([if we can lock with hard links])
3245 + hard_links=yes
3246 + $rm conftest*
3247 + ln conftest.a conftest.b 2>/dev/null && hard_links=no
3248 + touch conftest.a
3249 + ln conftest.a conftest.b 2>&5 || hard_links=no
3250 + ln conftest.a conftest.b 2>/dev/null && hard_links=no
3251 + AC_MSG_RESULT([$hard_links])
3252 + if test "$hard_links" = no; then
3253 + AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
3254 + need_locks=warn
3255 fi
3256 - ;;
3257 -esac
3258 +else
3259 + need_locks=no
3260 +fi
3261 +])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
3262
3263 -# Sed substitution that helps us do robust quoting. It backslashifies
3264 -# metacharacters that are still active within double-quoted strings.
3265 -Xsed='sed -e 1s/^X//'
3266 -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
3267
3268 -# Same as above, but do not quote variable references.
3269 -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
3270 +# AC_LIBTOOL_OBJDIR
3271 +# -----------------
3272 +AC_DEFUN([AC_LIBTOOL_OBJDIR],
3273 +[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
3274 +[rm -f .libs 2>/dev/null
3275 +mkdir .libs 2>/dev/null
3276 +if test -d .libs; then
3277 + lt_cv_objdir=.libs
3278 +else
3279 + # MS-DOS does not allow filenames that begin with a dot.
3280 + lt_cv_objdir=_libs
3281 +fi
3282 +rmdir .libs 2>/dev/null])
3283 +objdir=$lt_cv_objdir
3284 +])# AC_LIBTOOL_OBJDIR
3285
3286 -# Sed substitution to delay expansion of an escaped shell variable in a
3287 -# double_quote_subst'ed string.
3288 -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
3289
3290 -# Sed substitution to avoid accidental globbing in evaled expressions
3291 -no_glob_subst='s/\*/\\\*/g'
3292 +# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
3293 +# ----------------------------------------------
3294 +# Check hardcoding attributes.
3295 +AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
3296 +[AC_MSG_CHECKING([how to hardcode library paths into programs])
3297 +_LT_AC_TAGVAR(hardcode_action, $1)=
3298 +if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
3299 + test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
3300 + test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
3301
3302 -# Constants:
3303 -rm="rm -f"
3304 + # We can hardcode non-existant directories.
3305 + if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
3306 + # If the only mechanism to avoid hardcoding is shlibpath_var, we
3307 + # have to relink, otherwise we might link with an installed library
3308 + # when we should be linking with a yet-to-be-installed one
3309 + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
3310 + test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
3311 + # Linking always hardcodes the temporary library directory.
3312 + _LT_AC_TAGVAR(hardcode_action, $1)=relink
3313 + else
3314 + # We can link without hardcoding, and we can hardcode nonexisting dirs.
3315 + _LT_AC_TAGVAR(hardcode_action, $1)=immediate
3316 + fi
3317 +else
3318 + # We cannot hardcode anything, or else we can only hardcode existing
3319 + # directories.
3320 + _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
3321 +fi
3322 +AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
3323
3324 -# Global variables:
3325 -default_ofile=libtool
3326 -can_build_shared=yes
3327 +if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
3328 + # Fast installation is not supported
3329 + enable_fast_install=no
3330 +elif test "$shlibpath_overrides_runpath" = yes ||
3331 + test "$enable_shared" = no; then
3332 + # Fast installation is not necessary
3333 + enable_fast_install=needless
3334 +fi
3335 +])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
3336
3337 -# All known linkers require a `.a' archive for static linking (except MSVC,
3338 -# which needs '.lib').
3339 -libext=a
3340 -ltmain="$ac_aux_dir/ltmain.sh"
3341 -ofile="$default_ofile"
3342 -with_gnu_ld="$lt_cv_prog_gnu_ld"
3343 -
3344 -AC_CHECK_TOOL(AR, ar, false)
3345 -AC_CHECK_TOOL(RANLIB, ranlib, :)
3346 -AC_CHECK_TOOL(STRIP, strip, :)
3347 -
3348 -old_CC="$CC"
3349 -old_CFLAGS="$CFLAGS"
3350 -
3351 -# Set sane defaults for various variables
3352 -test -z "$AR" && AR=ar
3353 -test -z "$AR_FLAGS" && AR_FLAGS=cru
3354 -test -z "$AS" && AS=as
3355 -test -z "$CC" && CC=cc
3356 -test -z "$LTCC" && LTCC=$CC
3357 -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
3358 -test -z "$DLLTOOL" && DLLTOOL=dlltool
3359 -test -z "$LD" && LD=ld
3360 -test -z "$LN_S" && LN_S="ln -s"
3361 -test -z "$MAGIC_CMD" && MAGIC_CMD=file
3362 -test -z "$NM" && NM=nm
3363 -test -z "$SED" && SED=sed
3364 -test -z "$OBJDUMP" && OBJDUMP=objdump
3365 -test -z "$RANLIB" && RANLIB=:
3366 -test -z "$STRIP" && STRIP=:
3367 -test -z "$ac_objext" && ac_objext=o
3368 -
3369 -# Determine commands to create old-style static archives.
3370 -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
3371 -old_postinstall_cmds='chmod 644 $oldlib'
3372 -old_postuninstall_cmds=
3373
3374 -if test -n "$RANLIB"; then
3375 +# AC_LIBTOOL_SYS_LIB_STRIP
3376 +# ------------------------
3377 +AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
3378 +[striplib=
3379 +old_striplib=
3380 +AC_MSG_CHECKING([whether stripping libraries is possible])
3381 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
3382 + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
3383 + test -z "$striplib" && striplib="$STRIP --strip-unneeded"
3384 + AC_MSG_RESULT([yes])
3385 +else
3386 +# FIXME - insert some real tests, host_os isn't really good enough
3387 case $host_os in
3388 - openbsd*)
3389 - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
3390 - ;;
3391 - *)
3392 - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
3393 + darwin*)
3394 + if test -n "$STRIP" ; then
3395 + striplib="$STRIP -x"
3396 + old_striplib="$STRIP -S"
3397 + AC_MSG_RESULT([yes])
3398 + else
3399 + AC_MSG_RESULT([no])
3400 +fi
3401 + ;;
3402 + *)
3403 + AC_MSG_RESULT([no])
3404 ;;
3405 esac
3406 - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
3407 fi
3408 +])# AC_LIBTOOL_SYS_LIB_STRIP
3409
3410 -_LT_CC_BASENAME([$compiler])
3411
3412 -# Only perform the check for file, if the check method requires it
3413 -case $deplibs_check_method in
3414 -file_magic*)
3415 - if test "$file_magic_cmd" = '$MAGIC_CMD'; then
3416 - AC_PATH_MAGIC
3417 +# AC_LIBTOOL_SYS_DYNAMIC_LINKER
3418 +# -----------------------------
3419 +# PORTME Fill in your ld.so characteristics
3420 +AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
3421 +[AC_REQUIRE([LT_AC_PROG_SED])dnl
3422 +AC_MSG_CHECKING([dynamic linker characteristics])
3423 +library_names_spec=
3424 +libname_spec='lib$name'
3425 +soname_spec=
3426 +shrext_cmds=".so"
3427 +postinstall_cmds=
3428 +postuninstall_cmds=
3429 +finish_cmds=
3430 +finish_eval=
3431 +shlibpath_var=
3432 +shlibpath_overrides_runpath=unknown
3433 +version_type=none
3434 +dynamic_linker="$host_os ld.so"
3435 +sys_lib_dlsearch_path_spec="/lib /usr/lib"
3436 +m4_if($1,[],[
3437 +if test "$GCC" = yes; then
3438 + case $host_os in
3439 + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
3440 + *) lt_awk_arg="/^libraries:/" ;;
3441 + esac
3442 + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
3443 + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
3444 + # if the path contains ";" then we assume it to be the separator
3445 + # otherwise default to the standard path separator (i.e. ":") - it is
3446 + # assumed that no part of a normal pathname contains ";" but that should
3447 + # okay in the real world where ";" in dirpaths is itself problematic.
3448 + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
3449 + else
3450 + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3451 fi
3452 - ;;
3453 -esac
3454 -
3455 -AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
3456 -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
3457 -enable_win32_dll=yes, enable_win32_dll=no)
3458 -
3459 -AC_ARG_ENABLE([libtool-lock],
3460 - [AC_HELP_STRING([--disable-libtool-lock],
3461 - [avoid locking (might break parallel builds)])])
3462 -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
3463 -
3464 -AC_ARG_WITH([pic],
3465 - [AC_HELP_STRING([--with-pic],
3466 - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
3467 - [pic_mode="$withval"],
3468 - [pic_mode=default])
3469 -test -z "$pic_mode" && pic_mode=default
3470 -
3471 -# Use C for the default configuration in the libtool script
3472 -tagname=
3473 -AC_LIBTOOL_LANG_C_CONFIG
3474 -_LT_AC_TAGCONFIG
3475 -])# AC_LIBTOOL_SETUP
3476 + # Ok, now we have the path, separated by spaces, we can step through it
3477 + # and add multilib dir if necessary.
3478 + lt_tmp_lt_search_path_spec=
3479 + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
3480 + for lt_sys_path in $lt_search_path_spec; do
3481 + if test -d "$lt_sys_path/$lt_multi_os_dir"; then
3482 + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
3483 + else
3484 + test -d "$lt_sys_path" && \
3485 + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
3486 + fi
3487 + done
3488 + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
3489 +BEGIN {RS=" "; FS="/|\n";} {
3490 + lt_foo="";
3491 + lt_count=0;
3492 + for (lt_i = NF; lt_i > 0; lt_i--) {
3493 + if ($lt_i != "" && $lt_i != ".") {
3494 + if ($lt_i == "..") {
3495 + lt_count++;
3496 + } else {
3497 + if (lt_count == 0) {
3498 + lt_foo="/" $lt_i lt_foo;
3499 + } else {
3500 + lt_count--;
3501 + }
3502 + }
3503 + }
3504 + }
3505 + if (lt_foo != "") { lt_freq[[lt_foo]]++; }
3506 + if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
3507 +}'`
3508 + sys_lib_search_path_spec=`echo $lt_search_path_spec`
3509 +else
3510 + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
3511 +fi])
3512 +need_lib_prefix=unknown
3513 +hardcode_into_libs=no
3514
3515 +# when you set need_version to no, make sure it does not cause -set_version
3516 +# flags to be left without arguments
3517 +need_version=unknown
3518
3519 -# _LT_AC_SYS_COMPILER
3520 -# -------------------
3521 -AC_DEFUN([_LT_AC_SYS_COMPILER],
3522 -[AC_REQUIRE([AC_PROG_CC])dnl
3523 +case $host_os in
3524 +aix3*)
3525 + version_type=linux
3526 + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
3527 + shlibpath_var=LIBPATH
3528
3529 -# If no C compiler was specified, use CC.
3530 -LTCC=${LTCC-"$CC"}
3531 + # AIX 3 has no versioning support, so we append a major version to the name.
3532 + soname_spec='${libname}${release}${shared_ext}$major'
3533 + ;;
3534
3535 -# If no C compiler flags were specified, use CFLAGS.
3536 -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
3537 +aix4* | aix5*)
3538 + version_type=linux
3539 + need_lib_prefix=no
3540 + need_version=no
3541 + hardcode_into_libs=yes
3542 + if test "$host_cpu" = ia64; then
3543 + # AIX 5 supports IA64
3544 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
3545 + shlibpath_var=LD_LIBRARY_PATH
3546 + else
3547 + # With GCC up to 2.95.x, collect2 would create an import file
3548 + # for dependence libraries. The import file would start with
3549 + # the line `#! .'. This would cause the generated library to
3550 + # depend on `.', always an invalid library. This was fixed in
3551 + # development snapshots of GCC prior to 3.0.
3552 + case $host_os in
3553 + aix4 | aix4.[[01]] | aix4.[[01]].*)
3554 + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
3555 + echo ' yes '
3556 + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
3557 + :
3558 + else
3559 + can_build_shared=no
3560 + fi
3561 + ;;
3562 + esac
3563 + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
3564 + # soname into executable. Probably we can add versioning support to
3565 + # collect2, so additional links can be useful in future.
3566 + if test "$aix_use_runtimelinking" = yes; then
3567 + # If using run time linking (on AIX 4.2 or later) use lib<name>.so
3568 + # instead of lib<name>.a to let people know that these are not
3569 + # typical AIX shared libraries.
3570 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
3571 + else
3572 + # We preserve .a as extension for shared libraries through AIX4.2
3573 + # and later when we are not doing run time linking.
3574 + library_names_spec='${libname}${release}.a $libname.a'
3575 + soname_spec='${libname}${release}${shared_ext}$major'
3576 + fi
3577 + shlibpath_var=LIBPATH
3578 + fi
3579 + ;;
3580
3581 -# Allow CC to be a program name with arguments.
3582 -compiler=$CC
3583 -])# _LT_AC_SYS_COMPILER
3584 +amigaos*)
3585 + library_names_spec='$libname.ixlibrary $libname.a'
3586 + # Create ${libname}_ixlibrary.a entries in /sys/libs.
3587 + 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'
3588 + ;;
3589
3590 +beos*)
3591 + library_names_spec='${libname}${shared_ext}'
3592 + dynamic_linker="$host_os ld.so"
3593 + shlibpath_var=LIBRARY_PATH
3594 + ;;
3595
3596 -# _LT_CC_BASENAME(CC)
3597 -# -------------------
3598 -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
3599 -AC_DEFUN([_LT_CC_BASENAME],
3600 -[for cc_temp in $1""; do
3601 - case $cc_temp in
3602 - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
3603 - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
3604 - \-*) ;;
3605 - *) break;;
3606 - esac
3607 -done
3608 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
3609 -])
3610 +bsdi[[45]]*)
3611 + version_type=linux
3612 + need_version=no
3613 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
3614 + soname_spec='${libname}${release}${shared_ext}$major'
3615 + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
3616 + shlibpath_var=LD_LIBRARY_PATH
3617 + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
3618 + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
3619 + # the default ld.so.conf also contains /usr/contrib/lib and
3620 + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
3621 + # libtool to hard-code these into programs
3622 + ;;
3623
3624 +cygwin* | mingw* | pw32*)
3625 + version_type=windows
3626 + shrext_cmds=".dll"
3627 + need_version=no
3628 + need_lib_prefix=no
3629
3630 -# _LT_COMPILER_BOILERPLATE
3631 -# ------------------------
3632 -# Check for compiler boilerplate output or warnings with
3633 -# the simple compiler test code.
3634 -AC_DEFUN([_LT_COMPILER_BOILERPLATE],
3635 -[ac_outfile=conftest.$ac_objext
3636 -printf "$lt_simple_compile_test_code" >conftest.$ac_ext
3637 -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
3638 -_lt_compiler_boilerplate=`cat conftest.err`
3639 -$rm conftest*
3640 -])# _LT_COMPILER_BOILERPLATE
3641 + case $GCC,$host_os in
3642 + yes,cygwin* | yes,mingw* | yes,pw32*)
3643 + library_names_spec='$libname.dll.a'
3644 + # DLL is installed to $(libdir)/../bin by postinstall_cmds
3645 + postinstall_cmds='base_file=`basename \${file}`~
3646 + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
3647 + dldir=$destdir/`dirname \$dlpath`~
3648 + test -d \$dldir || mkdir -p \$dldir~
3649 + $install_prog $dir/$dlname \$dldir/$dlname~
3650 + chmod a+x \$dldir/$dlname'
3651 + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
3652 + dlpath=$dir/\$dldll~
3653 + $rm \$dlpath'
3654 + shlibpath_overrides_runpath=yes
3655
3656 + case $host_os in
3657 + cygwin*)
3658 + # Cygwin DLLs use 'cyg' prefix rather than 'lib'
3659 + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
3660 + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
3661 + ;;
3662 + mingw*)
3663 + # MinGW DLLs use traditional 'lib' prefix
3664 + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
3665 + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
3666 + if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
3667 + # It is most probably a Windows format PATH printed by
3668 + # mingw gcc, but we are running on Cygwin. Gcc prints its search
3669 + # path with ; separators, and with drive letters. We can handle the
3670 + # drive letters (cygwin fileutils understands them), so leave them,
3671 + # especially as we might pass files found there to a mingw objdump,
3672 + # which wouldn't understand a cygwinified path. Ahh.
3673 + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
3674 + else
3675 + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
3676 + fi
3677 + ;;
3678 + pw32*)
3679 + # pw32 DLLs use 'pw' prefix rather than 'lib'
3680 + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
3681 + ;;
3682 + esac
3683 + ;;
3684
3685 -# _LT_LINKER_BOILERPLATE
3686 -# ----------------------
3687 -# Check for linker boilerplate output or warnings with
3688 -# the simple link test code.
3689 -AC_DEFUN([_LT_LINKER_BOILERPLATE],
3690 -[ac_outfile=conftest.$ac_objext
3691 -printf "$lt_simple_link_test_code" >conftest.$ac_ext
3692 -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
3693 -_lt_linker_boilerplate=`cat conftest.err`
3694 -$rm conftest*
3695 -])# _LT_LINKER_BOILERPLATE
3696 -
3697 -
3698 -# _LT_AC_SYS_LIBPATH_AIX
3699 -# ----------------------
3700 -# Links a minimal program and checks the executable
3701 -# for the system default hardcoded library path. In most cases,
3702 -# this is /usr/lib:/lib, but when the MPI compilers are used
3703 -# the location of the communication and MPI libs are included too.
3704 -# If we don't find anything, use the default library path according
3705 -# to the aix ld manual.
3706 -AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
3707 -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
3708 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
3709 -}'`
3710 -# Check for a 64-bit object if we didn't find anything.
3711 -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
3712 -}'`; fi],[])
3713 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
3714 -])# _LT_AC_SYS_LIBPATH_AIX
3715 -
3716 -
3717 -# _LT_AC_SHELL_INIT(ARG)
3718 -# ----------------------
3719 -AC_DEFUN([_LT_AC_SHELL_INIT],
3720 -[ifdef([AC_DIVERSION_NOTICE],
3721 - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
3722 - [AC_DIVERT_PUSH(NOTICE)])
3723 -$1
3724 -AC_DIVERT_POP
3725 -])# _LT_AC_SHELL_INIT
3726 -
3727 + *)
3728 + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
3729 + ;;
3730 + esac
3731 + dynamic_linker='Win32 ld.exe'
3732 + # FIXME: first we should search . and the directory the executable is in
3733 + shlibpath_var=PATH
3734 + ;;
3735
3736 -# _LT_AC_PROG_ECHO_BACKSLASH
3737 -# --------------------------
3738 -# Add some code to the start of the generated configure script which
3739 -# will find an echo command which doesn't interpret backslashes.
3740 -AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
3741 -[_LT_AC_SHELL_INIT([
3742 -# Check that we are running under the correct shell.
3743 -SHELL=${CONFIG_SHELL-/bin/sh}
3744 +darwin* | rhapsody*)
3745 + dynamic_linker="$host_os dyld"
3746 + version_type=darwin
3747 + need_lib_prefix=no
3748 + need_version=no
3749 + library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
3750 + soname_spec='${libname}${release}${major}$shared_ext'
3751 + shlibpath_overrides_runpath=yes
3752 + shlibpath_var=DYLD_LIBRARY_PATH
3753 + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
3754 + m4_if([$1], [],[
3755 + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
3756 + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
3757 + ;;
3758
3759 -case X$ECHO in
3760 -X*--fallback-echo)
3761 - # Remove one level of quotation (which was required for Make).
3762 - ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
3763 +dgux*)
3764 + version_type=linux
3765 + need_lib_prefix=no
3766 + need_version=no
3767 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
3768 + soname_spec='${libname}${release}${shared_ext}$major'
3769 + shlibpath_var=LD_LIBRARY_PATH
3770 ;;
3771 -esac
3772
3773 -echo=${ECHO-echo}
3774 -if test "X[$]1" = X--no-reexec; then
3775 - # Discard the --no-reexec flag, and continue.
3776 - shift
3777 -elif test "X[$]1" = X--fallback-echo; then
3778 - # Avoid inline document here, it may be left over
3779 - :
3780 -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
3781 - # Yippee, $echo works!
3782 - :
3783 -else
3784 - # Restart under the correct shell.
3785 - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
3786 -fi
3787 +freebsd1*)
3788 + dynamic_linker=no
3789 + ;;
3790
3791 -if test "X[$]1" = X--fallback-echo; then
3792 - # used as fallback echo
3793 - shift
3794 - cat <<EOF
3795 -[$]*
3796 -EOF
3797 - exit 0
3798 -fi
3799 +freebsd* | dragonfly*)
3800 + # DragonFly does not have aout. When/if they implement a new
3801 + # versioning mechanism, adjust this.
3802 + if test -x /usr/bin/objformat; then
3803 + objformat=`/usr/bin/objformat`
3804 + else
3805 + case $host_os in
3806 + freebsd[[123]]*) objformat=aout ;;
3807 + *) objformat=elf ;;
3808 + esac
3809 + fi
3810 + version_type=freebsd-$objformat
3811 + case $version_type in
3812 + freebsd-elf*)
3813 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
3814 + need_version=no
3815 + need_lib_prefix=no
3816 + ;;
3817 + freebsd-*)
3818 + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
3819 + need_version=yes
3820 + ;;
3821 + esac
3822 + shlibpath_var=LD_LIBRARY_PATH
3823 + case $host_os in
3824 + freebsd2*)
3825 + shlibpath_overrides_runpath=yes
3826 + ;;
3827 + freebsd3.[[01]]* | freebsdelf3.[[01]]*)
3828 + shlibpath_overrides_runpath=yes
3829 + hardcode_into_libs=yes
3830 + ;;
3831 + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
3832 + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
3833 + shlibpath_overrides_runpath=no
3834 + hardcode_into_libs=yes
3835 + ;;
3836 + *) # from 4.6 on, and DragonFly
3837 + shlibpath_overrides_runpath=yes
3838 + hardcode_into_libs=yes
3839 + ;;
3840 + esac
3841 + ;;
3842
3843 -# The HP-UX ksh and POSIX shell print the target directory to stdout
3844 -# if CDPATH is set.
3845 -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
3846 +gnu*)
3847 + version_type=linux
3848 + need_lib_prefix=no
3849 + need_version=no
3850 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
3851 + soname_spec='${libname}${release}${shared_ext}$major'
3852 + shlibpath_var=LD_LIBRARY_PATH
3853 + hardcode_into_libs=yes
3854 + ;;
3855
3856 -if test -z "$ECHO"; then
3857 -if test "X${echo_test_string+set}" != Xset; then
3858 -# find a string as large as possible, as long as the shell can cope with it
3859 - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
3860 - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
3861 - if (echo_test_string=`eval $cmd`) 2>/dev/null &&
3862 - echo_test_string=`eval $cmd` &&
3863 - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
3864 - then
3865 - break
3866 +hpux9* | hpux10* | hpux11*)
3867 + # Give a soname corresponding to the major version so that dld.sl refuses to
3868 + # link against other versions.
3869 + version_type=sunos
3870 + need_lib_prefix=no
3871 + need_version=no
3872 + case $host_cpu in
3873 + ia64*)
3874 + shrext_cmds='.so'
3875 + hardcode_into_libs=yes
3876 + dynamic_linker="$host_os dld.so"
3877 + shlibpath_var=LD_LIBRARY_PATH
3878 + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
3879 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
3880 + soname_spec='${libname}${release}${shared_ext}$major'
3881 + if test "X$HPUX_IA64_MODE" = X32; then
3882 + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
3883 + else
3884 + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
3885 fi
3886 - done
3887 -fi
3888 -
3889 -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
3890 - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
3891 - test "X$echo_testing_string" = "X$echo_test_string"; then
3892 - :
3893 -else
3894 - # The Solaris, AIX, and Digital Unix default echo programs unquote
3895 - # backslashes. This makes it impossible to quote backslashes using
3896 - # echo "$something" | sed 's/\\/\\\\/g'
3897 - #
3898 - # So, first we look for a working echo in the user's PATH.
3899 + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
3900 + ;;
3901 + hppa*64*)
3902 + shrext_cmds='.sl'
3903 + hardcode_into_libs=yes
3904 + dynamic_linker="$host_os dld.sl"
3905 + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
3906 + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
3907 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
3908 + soname_spec='${libname}${release}${shared_ext}$major'
3909 + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
3910 + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
3911 + ;;
3912 + *)
3913 + shrext_cmds='.sl'
3914 + dynamic_linker="$host_os dld.sl"
3915 + shlibpath_var=SHLIB_PATH
3916 + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
3917 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
3918 + soname_spec='${libname}${release}${shared_ext}$major'
3919 + ;;
3920 + esac
3921 + # HP-UX runs *really* slowly unless shared libraries are mode 555.
3922 + postinstall_cmds='chmod 555 $lib'
3923 + ;;
3924
3925 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
3926 - for dir in $PATH /usr/ucb; do
3927 - IFS="$lt_save_ifs"
3928 - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
3929 - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
3930 - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
3931 - test "X$echo_testing_string" = "X$echo_test_string"; then
3932 - echo="$dir/echo"
3933 - break
3934 - fi
3935 - done
3936 - IFS="$lt_save_ifs"
3937 -
3938 - if test "X$echo" = Xecho; then
3939 - # We didn't find a better echo, so look for alternatives.
3940 - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
3941 - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
3942 - test "X$echo_testing_string" = "X$echo_test_string"; then
3943 - # This shell has a builtin print -r that does the trick.
3944 - echo='print -r'
3945 - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
3946 - test "X$CONFIG_SHELL" != X/bin/ksh; then
3947 - # If we have ksh, try running configure again with it.
3948 - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
3949 - export ORIGINAL_CONFIG_SHELL
3950 - CONFIG_SHELL=/bin/ksh
3951 - export CONFIG_SHELL
3952 - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
3953 - else
3954 - # Try using printf.
3955 - echo='printf %s\n'
3956 - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
3957 - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
3958 - test "X$echo_testing_string" = "X$echo_test_string"; then
3959 - # Cool, printf works
3960 - :
3961 - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
3962 - test "X$echo_testing_string" = 'X\t' &&
3963 - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
3964 - test "X$echo_testing_string" = "X$echo_test_string"; then
3965 - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
3966 - export CONFIG_SHELL
3967 - SHELL="$CONFIG_SHELL"
3968 - export SHELL
3969 - echo="$CONFIG_SHELL [$]0 --fallback-echo"
3970 - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
3971 - test "X$echo_testing_string" = 'X\t' &&
3972 - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
3973 - test "X$echo_testing_string" = "X$echo_test_string"; then
3974 - echo="$CONFIG_SHELL [$]0 --fallback-echo"
3975 - else
3976 - # maybe with a smaller string...
3977 - prev=:
3978 -
3979 - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
3980 - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
3981 - then
3982 - break
3983 - fi
3984 - prev="$cmd"
3985 - done
3986 +interix[[3-9]]*)
3987 + version_type=linux
3988 + need_lib_prefix=no
3989 + need_version=no
3990 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
3991 + soname_spec='${libname}${release}${shared_ext}$major'
3992 + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
3993 + shlibpath_var=LD_LIBRARY_PATH
3994 + shlibpath_overrides_runpath=no
3995 + hardcode_into_libs=yes
3996 + ;;
3997
3998 - if test "$prev" != 'sed 50q "[$]0"'; then
3999 - echo_test_string=`eval $prev`
4000 - export echo_test_string
4001 - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
4002 +irix5* | irix6* | nonstopux*)
4003 + case $host_os in
4004 + nonstopux*) version_type=nonstopux ;;
4005 + *)
4006 + if test "$lt_cv_prog_gnu_ld" = yes; then
4007 + version_type=linux
4008 else
4009 - # Oops. We lost completely, so just stick with echo.
4010 - echo=echo
4011 - fi
4012 - fi
4013 - fi
4014 - fi
4015 -fi
4016 -fi
4017 + version_type=irix
4018 + fi ;;
4019 + esac
4020 + need_lib_prefix=no
4021 + need_version=no
4022 + soname_spec='${libname}${release}${shared_ext}$major'
4023 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
4024 + case $host_os in
4025 + irix5* | nonstopux*)
4026 + libsuff= shlibsuff=
4027 + ;;
4028 + *)
4029 + case $LD in # libtool.m4 will add one of these switches to LD
4030 + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
4031 + libsuff= shlibsuff= libmagic=32-bit;;
4032 + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
4033 + libsuff=32 shlibsuff=N32 libmagic=N32;;
4034 + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
4035 + libsuff=64 shlibsuff=64 libmagic=64-bit;;
4036 + *) libsuff= shlibsuff= libmagic=never-match;;
4037 + esac
4038 + ;;
4039 + esac
4040 + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
4041 + shlibpath_overrides_runpath=no
4042 + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
4043 + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
4044 + hardcode_into_libs=yes
4045 + ;;
4046
4047 -# Copy echo and quote the copy suitably for passing to libtool from
4048 -# the Makefile, instead of quoting the original, which is used later.
4049 -ECHO=$echo
4050 -if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
4051 - ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
4052 -fi
4053 +# No shared lib support for Linux oldld, aout, or coff.
4054 +linux*oldld* | linux*aout* | linux*coff*)
4055 + dynamic_linker=no
4056 + ;;
4057
4058 -AC_SUBST(ECHO)
4059 -])])# _LT_AC_PROG_ECHO_BACKSLASH
4060 +# This must be Linux ELF.
4061 +linux* | k*bsd*-gnu)
4062 + version_type=linux
4063 + need_lib_prefix=no
4064 + need_version=no
4065 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4066 + soname_spec='${libname}${release}${shared_ext}$major'
4067 + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
4068 + shlibpath_var=LD_LIBRARY_PATH
4069 + shlibpath_overrides_runpath=no
4070 + # This implies no fast_install, which is unacceptable.
4071 + # Some rework will be needed to allow for fast_install
4072 + # before this can be enabled.
4073 + hardcode_into_libs=yes
4074
4075 + # Append ld.so.conf contents to the search path
4076 + if test -f /etc/ld.so.conf; then
4077 + 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' ' '`
4078 + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
4079 + fi
4080
4081 -# _LT_AC_LOCK
4082 -# -----------
4083 -AC_DEFUN([_LT_AC_LOCK],
4084 -[AC_ARG_ENABLE([libtool-lock],
4085 - [AC_HELP_STRING([--disable-libtool-lock],
4086 - [avoid locking (might break parallel builds)])])
4087 -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
4088 + # We used to test for /lib/ld.so.1 and disable shared libraries on
4089 + # powerpc, because MkLinux only supported shared libraries with the
4090 + # GNU dynamic linker. Since this was broken with cross compilers,
4091 + # most powerpc-linux boxes support dynamic linking these days and
4092 + # people can always --disable-shared, the test was removed, and we
4093 + # assume the GNU/Linux dynamic linker is in use.
4094 + dynamic_linker='GNU/Linux ld.so'
4095 + ;;
4096
4097 -# Some flags need to be propagated to the compiler or linker for good
4098 -# libtool support.
4099 -case $host in
4100 -ia64-*-hpux*)
4101 - # Find out which ABI we are using.
4102 - echo 'int i;' > conftest.$ac_ext
4103 - if AC_TRY_EVAL(ac_compile); then
4104 - case `/usr/bin/file conftest.$ac_objext` in
4105 - *ELF-32*)
4106 - HPUX_IA64_MODE="32"
4107 - ;;
4108 - *ELF-64*)
4109 - HPUX_IA64_MODE="64"
4110 - ;;
4111 - esac
4112 - fi
4113 - rm -rf conftest*
4114 +netbsdelf*-gnu)
4115 + version_type=linux
4116 + need_lib_prefix=no
4117 + need_version=no
4118 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
4119 + soname_spec='${libname}${release}${shared_ext}$major'
4120 + shlibpath_var=LD_LIBRARY_PATH
4121 + shlibpath_overrides_runpath=no
4122 + hardcode_into_libs=yes
4123 + dynamic_linker='NetBSD ld.elf_so'
4124 ;;
4125 -*-*-irix6*)
4126 - # Find out which ABI we are using.
4127 - echo '[#]line __oline__ "configure"' > conftest.$ac_ext
4128 - if AC_TRY_EVAL(ac_compile); then
4129 - if test "$lt_cv_prog_gnu_ld" = yes; then
4130 - case `/usr/bin/file conftest.$ac_objext` in
4131 - *32-bit*)
4132 - LD="${LD-ld} -melf32bsmip"
4133 - ;;
4134 - *N32*)
4135 - LD="${LD-ld} -melf32bmipn32"
4136 - ;;
4137 - *64-bit*)
4138 - LD="${LD-ld} -melf64bmip"
4139 - ;;
4140 - esac
4141 - else
4142 - case `/usr/bin/file conftest.$ac_objext` in
4143 - *32-bit*)
4144 - LD="${LD-ld} -32"
4145 - ;;
4146 - *N32*)
4147 - LD="${LD-ld} -n32"
4148 - ;;
4149 - *64-bit*)
4150 - LD="${LD-ld} -64"
4151 - ;;
4152 - esac
4153 - fi
4154 +
4155 +netbsd*)
4156 + version_type=sunos
4157 + need_lib_prefix=no
4158 + need_version=no
4159 + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
4160 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
4161 + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
4162 + dynamic_linker='NetBSD (a.out) ld.so'
4163 + else
4164 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
4165 + soname_spec='${libname}${release}${shared_ext}$major'
4166 + dynamic_linker='NetBSD ld.elf_so'
4167 fi
4168 - rm -rf conftest*
4169 + shlibpath_var=LD_LIBRARY_PATH
4170 + shlibpath_overrides_runpath=yes
4171 + hardcode_into_libs=yes
4172 ;;
4173
4174 -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
4175 - # Find out which ABI we are using.
4176 - echo 'int i;' > conftest.$ac_ext
4177 - if AC_TRY_EVAL(ac_compile); then
4178 - case `/usr/bin/file conftest.o` in
4179 - *32-bit*)
4180 - case $host in
4181 - x86_64-*linux*)
4182 - LD="${LD-ld} -m elf_i386"
4183 - ;;
4184 - ppc64-*linux*|powerpc64-*linux*)
4185 - LD="${LD-ld} -m elf32ppclinux"
4186 - ;;
4187 - s390x-*linux*)
4188 - LD="${LD-ld} -m elf_s390"
4189 - ;;
4190 - sparc64-*linux*)
4191 - LD="${LD-ld} -m elf32_sparc"
4192 - ;;
4193 - esac
4194 - ;;
4195 - *64-bit*)
4196 - case $host in
4197 - x86_64-*linux*)
4198 - LD="${LD-ld} -m elf_x86_64"
4199 - ;;
4200 - ppc*-*linux*|powerpc*-*linux*)
4201 - LD="${LD-ld} -m elf64ppc"
4202 - ;;
4203 - s390*-*linux*)
4204 - LD="${LD-ld} -m elf64_s390"
4205 - ;;
4206 - sparc*-*linux*)
4207 - LD="${LD-ld} -m elf64_sparc"
4208 - ;;
4209 +newsos6)
4210 + version_type=linux
4211 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4212 + shlibpath_var=LD_LIBRARY_PATH
4213 + shlibpath_overrides_runpath=yes
4214 + ;;
4215 +
4216 +nto-qnx*)
4217 + version_type=linux
4218 + need_lib_prefix=no
4219 + need_version=no
4220 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4221 + soname_spec='${libname}${release}${shared_ext}$major'
4222 + shlibpath_var=LD_LIBRARY_PATH
4223 + shlibpath_overrides_runpath=yes
4224 + ;;
4225 +
4226 +openbsd*)
4227 + version_type=sunos
4228 + sys_lib_dlsearch_path_spec="/usr/lib"
4229 + need_lib_prefix=no
4230 + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
4231 + case $host_os in
4232 + openbsd3.3 | openbsd3.3.*) need_version=yes ;;
4233 + *) need_version=no ;;
4234 + esac
4235 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
4236 + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
4237 + shlibpath_var=LD_LIBRARY_PATH
4238 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
4239 + case $host_os in
4240 + openbsd2.[[89]] | openbsd2.[[89]].*)
4241 + shlibpath_overrides_runpath=no
4242 + ;;
4243 + *)
4244 + shlibpath_overrides_runpath=yes
4245 + ;;
4246 esac
4247 - ;;
4248 - esac
4249 + else
4250 + shlibpath_overrides_runpath=yes
4251 fi
4252 - rm -rf conftest*
4253 ;;
4254
4255 -*-*-sco3.2v5*)
4256 - # On SCO OpenServer 5, we need -belf to get full-featured binaries.
4257 - SAVE_CFLAGS="$CFLAGS"
4258 - CFLAGS="$CFLAGS -belf"
4259 - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
4260 - [AC_LANG_PUSH(C)
4261 - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
4262 - AC_LANG_POP])
4263 - if test x"$lt_cv_cc_needs_belf" != x"yes"; then
4264 - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
4265 - CFLAGS="$SAVE_CFLAGS"
4266 +os2*)
4267 + libname_spec='$name'
4268 + shrext_cmds=".dll"
4269 + need_lib_prefix=no
4270 + library_names_spec='$libname${shared_ext} $libname.a'
4271 + dynamic_linker='OS/2 ld.exe'
4272 + shlibpath_var=LIBPATH
4273 + ;;
4274 +
4275 +osf3* | osf4* | osf5*)
4276 + version_type=osf
4277 + need_lib_prefix=no
4278 + need_version=no
4279 + soname_spec='${libname}${release}${shared_ext}$major'
4280 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4281 + shlibpath_var=LD_LIBRARY_PATH
4282 + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
4283 + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
4284 + ;;
4285 +
4286 +rdos*)
4287 + dynamic_linker=no
4288 + ;;
4289 +
4290 +solaris*)
4291 + version_type=linux
4292 + need_lib_prefix=no
4293 + need_version=no
4294 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4295 + soname_spec='${libname}${release}${shared_ext}$major'
4296 + shlibpath_var=LD_LIBRARY_PATH
4297 + shlibpath_overrides_runpath=yes
4298 + hardcode_into_libs=yes
4299 + # ldd complains unless libraries are executable
4300 + postinstall_cmds='chmod +x $lib'
4301 + ;;
4302 +
4303 +sunos4*)
4304 + version_type=sunos
4305 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
4306 + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
4307 + shlibpath_var=LD_LIBRARY_PATH
4308 + shlibpath_overrides_runpath=yes
4309 + if test "$with_gnu_ld" = yes; then
4310 + need_lib_prefix=no
4311 fi
4312 + need_version=yes
4313 ;;
4314 -sparc*-*solaris*)
4315 - # Find out which ABI we are using.
4316 - echo 'int i;' > conftest.$ac_ext
4317 - if AC_TRY_EVAL(ac_compile); then
4318 - case `/usr/bin/file conftest.o` in
4319 - *64-bit*)
4320 - case $lt_cv_prog_gnu_ld in
4321 - yes*) LD="${LD-ld} -m elf64_sparc" ;;
4322 - *) LD="${LD-ld} -64" ;;
4323 - esac
4324 +
4325 +sysv4 | sysv4.3*)
4326 + version_type=linux
4327 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4328 + soname_spec='${libname}${release}${shared_ext}$major'
4329 + shlibpath_var=LD_LIBRARY_PATH
4330 + case $host_vendor in
4331 + sni)
4332 + shlibpath_overrides_runpath=no
4333 + need_lib_prefix=no
4334 + export_dynamic_flag_spec='${wl}-Blargedynsym'
4335 + runpath_var=LD_RUN_PATH
4336 + ;;
4337 + siemens)
4338 + need_lib_prefix=no
4339 + ;;
4340 + motorola)
4341 + need_lib_prefix=no
4342 + need_version=no
4343 + shlibpath_overrides_runpath=no
4344 + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
4345 ;;
4346 + esac
4347 + ;;
4348 +
4349 +sysv4*MP*)
4350 + if test -d /usr/nec ;then
4351 + version_type=linux
4352 + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
4353 + soname_spec='$libname${shared_ext}.$major'
4354 + shlibpath_var=LD_LIBRARY_PATH
4355 + fi
4356 + ;;
4357 +
4358 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
4359 + version_type=freebsd-elf
4360 + need_lib_prefix=no
4361 + need_version=no
4362 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
4363 + soname_spec='${libname}${release}${shared_ext}$major'
4364 + shlibpath_var=LD_LIBRARY_PATH
4365 + hardcode_into_libs=yes
4366 + if test "$with_gnu_ld" = yes; then
4367 + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
4368 + shlibpath_overrides_runpath=no
4369 + else
4370 + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
4371 + shlibpath_overrides_runpath=yes
4372 + case $host_os in
4373 + sco3.2v5*)
4374 + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
4375 + ;;
4376 esac
4377 fi
4378 - rm -rf conftest*
4379 + sys_lib_dlsearch_path_spec='/usr/lib'
4380 ;;
4381
4382 -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
4383 -[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
4384 - AC_CHECK_TOOL(DLLTOOL, dlltool, false)
4385 - AC_CHECK_TOOL(AS, as, false)
4386 - AC_CHECK_TOOL(OBJDUMP, objdump, false)
4387 +uts4*)
4388 + version_type=linux
4389 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
4390 + soname_spec='${libname}${release}${shared_ext}$major'
4391 + shlibpath_var=LD_LIBRARY_PATH
4392 + ;;
4393 +
4394 +*)
4395 + dynamic_linker=no
4396 ;;
4397 - ])
4398 esac
4399 +AC_MSG_RESULT([$dynamic_linker])
4400 +test "$dynamic_linker" = no && can_build_shared=no
4401
4402 -need_locks="$enable_libtool_lock"
4403 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
4404 +if test "$GCC" = yes; then
4405 + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
4406 +fi
4407 +])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
4408
4409 -])# _LT_AC_LOCK
4410
4411 +# _LT_AC_TAGCONFIG
4412 +# ----------------
4413 +AC_DEFUN([_LT_AC_TAGCONFIG],
4414 +[AC_REQUIRE([LT_AC_PROG_SED])dnl
4415 +AC_ARG_WITH([tags],
4416 + [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
4417 + [include additional configurations @<:@automatic@:>@])],
4418 + [tagnames="$withval"])
4419
4420 -# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
4421 -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
4422 -# ----------------------------------------------------------------
4423 -# Check whether the given compiler option works
4424 -AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
4425 -[AC_REQUIRE([LT_AC_PROG_SED])
4426 -AC_CACHE_CHECK([$1], [$2],
4427 - [$2=no
4428 - ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
4429 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
4430 - lt_compiler_flag="$3"
4431 - # Insert the option either (1) after the last *FLAGS variable, or
4432 - # (2) before a word containing "conftest.", or (3) at the end.
4433 - # Note that $ac_compile itself does not contain backslashes and begins
4434 - # with a dollar sign (not a hyphen), so the echo should work correctly.
4435 - # The option is referenced via a variable to avoid confusing sed.
4436 - lt_compile=`echo "$ac_compile" | $SED \
4437 - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
4438 - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
4439 - -e 's:$: $lt_compiler_flag:'`
4440 - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
4441 - (eval "$lt_compile" 2>conftest.err)
4442 - ac_status=$?
4443 - cat conftest.err >&AS_MESSAGE_LOG_FD
4444 - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
4445 - if (exit $ac_status) && test -s "$ac_outfile"; then
4446 - # The compiler can only warn and ignore the option if not recognized
4447 - # So say no if there are warnings other than the usual output.
4448 - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
4449 - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
4450 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
4451 - $2=yes
4452 - fi
4453 - fi
4454 - $rm conftest*
4455 -])
4456 +if test -f "$ltmain" && test -n "$tagnames"; then
4457 + if test ! -f "${ofile}"; then
4458 + AC_MSG_WARN([output file `$ofile' does not exist])
4459 + fi
4460
4461 -if test x"[$]$2" = xyes; then
4462 - ifelse([$5], , :, [$5])
4463 -else
4464 - ifelse([$6], , :, [$6])
4465 -fi
4466 -])# AC_LIBTOOL_COMPILER_OPTION
4467 + if test -z "$LTCC"; then
4468 + eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
4469 + if test -z "$LTCC"; then
4470 + AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
4471 + else
4472 + AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
4473 + fi
4474 + fi
4475 + if test -z "$LTCFLAGS"; then
4476 + eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
4477 + fi
4478
4479 + # Extract list of available tagged configurations in $ofile.
4480 + # Note that this assumes the entire list is on one line.
4481 + available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
4482
4483 -# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
4484 -# [ACTION-SUCCESS], [ACTION-FAILURE])
4485 -# ------------------------------------------------------------
4486 -# Check whether the given compiler option works
4487 -AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
4488 -[AC_CACHE_CHECK([$1], [$2],
4489 - [$2=no
4490 - save_LDFLAGS="$LDFLAGS"
4491 - LDFLAGS="$LDFLAGS $3"
4492 - printf "$lt_simple_link_test_code" > conftest.$ac_ext
4493 - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
4494 - # The linker can only warn and ignore the option if not recognized
4495 - # So say no if there are warnings
4496 - if test -s conftest.err; then
4497 - # Append any errors to the config.log.
4498 - cat conftest.err 1>&AS_MESSAGE_LOG_FD
4499 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
4500 - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
4501 - if diff conftest.exp conftest.er2 >/dev/null; then
4502 - $2=yes
4503 - fi
4504 - else
4505 - $2=yes
4506 - fi
4507 - fi
4508 - $rm conftest*
4509 - LDFLAGS="$save_LDFLAGS"
4510 -])
4511 -
4512 -if test x"[$]$2" = xyes; then
4513 - ifelse([$4], , :, [$4])
4514 -else
4515 - ifelse([$5], , :, [$5])
4516 -fi
4517 -])# AC_LIBTOOL_LINKER_OPTION
4518 -
4519 -
4520 -# AC_LIBTOOL_SYS_MAX_CMD_LEN
4521 -# --------------------------
4522 -AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
4523 -[# find the maximum length of command line arguments
4524 -AC_MSG_CHECKING([the maximum length of command line arguments])
4525 -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
4526 - i=0
4527 - teststring="ABCD"
4528 + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
4529 + for tagname in $tagnames; do
4530 + IFS="$lt_save_ifs"
4531 + # Check whether tagname contains only valid characters
4532 + case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
4533 + "") ;;
4534 + *) AC_MSG_ERROR([invalid tag name: $tagname])
4535 + ;;
4536 + esac
4537
4538 - case $build_os in
4539 - msdosdjgpp*)
4540 - # On DJGPP, this test can blow up pretty badly due to problems in libc
4541 - # (any single argument exceeding 2000 bytes causes a buffer overrun
4542 - # during glob expansion). Even if it were fixed, the result of this
4543 - # check would be larger than it should be.
4544 - lt_cv_sys_max_cmd_len=12288; # 12K is about right
4545 - ;;
4546 + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
4547 + then
4548 + AC_MSG_ERROR([tag name \"$tagname\" already exists])
4549 + fi
4550
4551 - gnu*)
4552 - # Under GNU Hurd, this test is not required because there is
4553 - # no limit to the length of command line arguments.
4554 - # Libtool will interpret -1 as no limit whatsoever
4555 - lt_cv_sys_max_cmd_len=-1;
4556 - ;;
4557 + # Update the list of available tags.
4558 + if test -n "$tagname"; then
4559 + echo appending configuration tag \"$tagname\" to $ofile
4560
4561 - cygwin* | mingw*)
4562 - # On Win9x/ME, this test blows up -- it succeeds, but takes
4563 - # about 5 minutes as the teststring grows exponentially.
4564 - # Worse, since 9x/ME are not pre-emptively multitasking,
4565 - # you end up with a "frozen" computer, even though with patience
4566 - # the test eventually succeeds (with a max line length of 256k).
4567 - # Instead, let's just punt: use the minimum linelength reported by
4568 - # all of the supported platforms: 8192 (on NT/2K/XP).
4569 - lt_cv_sys_max_cmd_len=8192;
4570 - ;;
4571 + case $tagname in
4572 + CXX)
4573 + if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
4574 + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
4575 + (test "X$CXX" != "Xg++"))) ; then
4576 + AC_LIBTOOL_LANG_CXX_CONFIG
4577 + else
4578 + tagname=""
4579 + fi
4580 + ;;
4581
4582 - amigaos*)
4583 - # On AmigaOS with pdksh, this test takes hours, literally.
4584 - # So we just punt and use a minimum line length of 8192.
4585 - lt_cv_sys_max_cmd_len=8192;
4586 - ;;
4587 + F77)
4588 + if test -n "$F77" && test "X$F77" != "Xno"; then
4589 + AC_LIBTOOL_LANG_F77_CONFIG
4590 + else
4591 + tagname=""
4592 + fi
4593 + ;;
4594
4595 - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
4596 - # This has been around since 386BSD, at least. Likely further.
4597 - if test -x /sbin/sysctl; then
4598 - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
4599 - elif test -x /usr/sbin/sysctl; then
4600 - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
4601 - else
4602 - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
4603 - fi
4604 - # And add a safety zone
4605 - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
4606 - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
4607 - ;;
4608 + GCJ)
4609 + if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
4610 + AC_LIBTOOL_LANG_GCJ_CONFIG
4611 + else
4612 + tagname=""
4613 + fi
4614 + ;;
4615
4616 - interix*)
4617 - # We know the value 262144 and hardcode it with a safety zone (like BSD)
4618 - lt_cv_sys_max_cmd_len=196608
4619 - ;;
4620 + RC)
4621 + AC_LIBTOOL_LANG_RC_CONFIG
4622 + ;;
4623
4624 - osf*)
4625 - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
4626 - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
4627 - # nice to cause kernel panics so lets avoid the loop below.
4628 - # First set a reasonable default.
4629 - lt_cv_sys_max_cmd_len=16384
4630 - #
4631 - if test -x /sbin/sysconfig; then
4632 - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
4633 - *1*) lt_cv_sys_max_cmd_len=-1 ;;
4634 + *)
4635 + AC_MSG_ERROR([Unsupported tag name: $tagname])
4636 + ;;
4637 esac
4638 +
4639 + # Append the new tag name to the list of available tags.
4640 + if test -n "$tagname" ; then
4641 + available_tags="$available_tags $tagname"
4642 fi
4643 - ;;
4644 - sco3.2v5*)
4645 - lt_cv_sys_max_cmd_len=102400
4646 - ;;
4647 - sysv5* | sco5v6* | sysv4.2uw2*)
4648 - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
4649 - if test -n "$kargmax"; then
4650 - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
4651 - else
4652 - lt_cv_sys_max_cmd_len=32768
4653 fi
4654 - ;;
4655 - *)
4656 - # If test is not a shell built-in, we'll probably end up computing a
4657 - # maximum length that is only half of the actual maximum length, but
4658 - # we can't tell.
4659 - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
4660 - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
4661 - = "XX$teststring") >/dev/null 2>&1 &&
4662 - new_result=`expr "X$teststring" : ".*" 2>&1` &&
4663 - lt_cv_sys_max_cmd_len=$new_result &&
4664 - test $i != 17 # 1/2 MB should be enough
4665 - do
4666 - i=`expr $i + 1`
4667 - teststring=$teststring$teststring
4668 - done
4669 - teststring=
4670 - # Add a significant safety factor because C++ compilers can tack on massive
4671 - # amounts of additional arguments before passing them to the linker.
4672 - # It appears as though 1/2 is a usable value.
4673 - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
4674 - ;;
4675 - esac
4676 -])
4677 -if test -n $lt_cv_sys_max_cmd_len ; then
4678 - AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
4679 -else
4680 - AC_MSG_RESULT(none)
4681 + done
4682 + IFS="$lt_save_ifs"
4683 +
4684 + # Now substitute the updated list of available tags.
4685 + if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
4686 + mv "${ofile}T" "$ofile"
4687 + chmod +x "$ofile"
4688 + else
4689 + rm -f "${ofile}T"
4690 + AC_MSG_ERROR([unable to update list of available tagged configurations.])
4691 + fi
4692 fi
4693 -])# AC_LIBTOOL_SYS_MAX_CMD_LEN
4694 +])# _LT_AC_TAGCONFIG
4695
4696
4697 -# _LT_AC_CHECK_DLFCN
4698 -# ------------------
4699 -AC_DEFUN([_LT_AC_CHECK_DLFCN],
4700 -[AC_CHECK_HEADERS(dlfcn.h)dnl
4701 -])# _LT_AC_CHECK_DLFCN
4702 +# AC_LIBTOOL_DLOPEN
4703 +# -----------------
4704 +# enable checks for dlopen support
4705 +AC_DEFUN([AC_LIBTOOL_DLOPEN],
4706 + [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
4707 +])# AC_LIBTOOL_DLOPEN
4708
4709
4710 -# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
4711 -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
4712 -# ---------------------------------------------------------------------
4713 -AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
4714 -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
4715 -if test "$cross_compiling" = yes; then :
4716 - [$4]
4717 -else
4718 - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
4719 - lt_status=$lt_dlunknown
4720 - cat > conftest.$ac_ext <<EOF
4721 -[#line __oline__ "configure"
4722 -#include "confdefs.h"
4723 +# AC_LIBTOOL_WIN32_DLL
4724 +# --------------------
4725 +# declare package support for building win32 DLLs
4726 +AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
4727 +[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
4728 +])# AC_LIBTOOL_WIN32_DLL
4729
4730 -#if HAVE_DLFCN_H
4731 -#include <dlfcn.h>
4732 -#endif
4733
4734 -#include <stdio.h>
4735 +# AC_ENABLE_SHARED([DEFAULT])
4736 +# ---------------------------
4737 +# implement the --enable-shared flag
4738 +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
4739 +AC_DEFUN([AC_ENABLE_SHARED],
4740 +[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
4741 +AC_ARG_ENABLE([shared],
4742 + [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
4743 + [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
4744 + [p=${PACKAGE-default}
4745 + case $enableval in
4746 + yes) enable_shared=yes ;;
4747 + no) enable_shared=no ;;
4748 + *)
4749 + enable_shared=no
4750 + # Look at the argument we got. We use all the common list separators.
4751 + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
4752 + for pkg in $enableval; do
4753 + IFS="$lt_save_ifs"
4754 + if test "X$pkg" = "X$p"; then
4755 + enable_shared=yes
4756 + fi
4757 + done
4758 + IFS="$lt_save_ifs"
4759 + ;;
4760 + esac],
4761 + [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
4762 +])# AC_ENABLE_SHARED
4763
4764 -#ifdef RTLD_GLOBAL
4765 -# define LT_DLGLOBAL RTLD_GLOBAL
4766 -#else
4767 -# ifdef DL_GLOBAL
4768 -# define LT_DLGLOBAL DL_GLOBAL
4769 -# else
4770 -# define LT_DLGLOBAL 0
4771 -# endif
4772 -#endif
4773
4774 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
4775 - find out it does not work in some platform. */
4776 -#ifndef LT_DLLAZY_OR_NOW
4777 -# ifdef RTLD_LAZY
4778 -# define LT_DLLAZY_OR_NOW RTLD_LAZY
4779 -# else
4780 -# ifdef DL_LAZY
4781 -# define LT_DLLAZY_OR_NOW DL_LAZY
4782 -# else
4783 -# ifdef RTLD_NOW
4784 -# define LT_DLLAZY_OR_NOW RTLD_NOW
4785 -# else
4786 -# ifdef DL_NOW
4787 -# define LT_DLLAZY_OR_NOW DL_NOW
4788 -# else
4789 -# define LT_DLLAZY_OR_NOW 0
4790 -# endif
4791 -# endif
4792 -# endif
4793 -# endif
4794 -#endif
4795 -
4796 -#ifdef __cplusplus
4797 -extern "C" void exit (int);
4798 -#endif
4799 +# AC_DISABLE_SHARED
4800 +# -----------------
4801 +# set the default shared flag to --disable-shared
4802 +AC_DEFUN([AC_DISABLE_SHARED],
4803 +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
4804 +AC_ENABLE_SHARED(no)
4805 +])# AC_DISABLE_SHARED
4806
4807 -void fnord() { int i=42;}
4808 -int main ()
4809 -{
4810 - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
4811 - int status = $lt_dlunknown;
4812
4813 - if (self)
4814 - {
4815 - if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
4816 - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
4817 - /* dlclose (self); */
4818 - }
4819 - else
4820 - puts (dlerror ());
4821 +# AC_ENABLE_STATIC([DEFAULT])
4822 +# ---------------------------
4823 +# implement the --enable-static flag
4824 +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
4825 +AC_DEFUN([AC_ENABLE_STATIC],
4826 +[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
4827 +AC_ARG_ENABLE([static],
4828 + [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
4829 + [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
4830 + [p=${PACKAGE-default}
4831 + case $enableval in
4832 + yes) enable_static=yes ;;
4833 + no) enable_static=no ;;
4834 + *)
4835 + enable_static=no
4836 + # Look at the argument we got. We use all the common list separators.
4837 + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
4838 + for pkg in $enableval; do
4839 + IFS="$lt_save_ifs"
4840 + if test "X$pkg" = "X$p"; then
4841 + enable_static=yes
4842 + fi
4843 + done
4844 + IFS="$lt_save_ifs"
4845 + ;;
4846 + esac],
4847 + [enable_static=]AC_ENABLE_STATIC_DEFAULT)
4848 +])# AC_ENABLE_STATIC
4849
4850 - exit (status);
4851 -}]
4852 -EOF
4853 - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
4854 - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
4855 - lt_status=$?
4856 - case x$lt_status in
4857 - x$lt_dlno_uscore) $1 ;;
4858 - x$lt_dlneed_uscore) $2 ;;
4859 - x$lt_dlunknown|x*) $3 ;;
4860 - esac
4861 - else :
4862 - # compilation failed
4863 - $3
4864 - fi
4865 -fi
4866 -rm -fr conftest*
4867 -])# _LT_AC_TRY_DLOPEN_SELF
4868
4869 +# AC_DISABLE_STATIC
4870 +# -----------------
4871 +# set the default static flag to --disable-static
4872 +AC_DEFUN([AC_DISABLE_STATIC],
4873 +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
4874 +AC_ENABLE_STATIC(no)
4875 +])# AC_DISABLE_STATIC
4876
4877 -# AC_LIBTOOL_DLOPEN_SELF
4878 -# ----------------------
4879 -AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
4880 -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
4881 -if test "x$enable_dlopen" != xyes; then
4882 - enable_dlopen=unknown
4883 - enable_dlopen_self=unknown
4884 - enable_dlopen_self_static=unknown
4885 -else
4886 - lt_cv_dlopen=no
4887 - lt_cv_dlopen_libs=
4888
4889 - case $host_os in
4890 - beos*)
4891 - lt_cv_dlopen="load_add_on"
4892 - lt_cv_dlopen_libs=
4893 - lt_cv_dlopen_self=yes
4894 - ;;
4895 +# AC_ENABLE_FAST_INSTALL([DEFAULT])
4896 +# ---------------------------------
4897 +# implement the --enable-fast-install flag
4898 +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
4899 +AC_DEFUN([AC_ENABLE_FAST_INSTALL],
4900 +[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
4901 +AC_ARG_ENABLE([fast-install],
4902 + [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
4903 + [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
4904 + [p=${PACKAGE-default}
4905 + case $enableval in
4906 + yes) enable_fast_install=yes ;;
4907 + no) enable_fast_install=no ;;
4908 + *)
4909 + enable_fast_install=no
4910 + # Look at the argument we got. We use all the common list separators.
4911 + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
4912 + for pkg in $enableval; do
4913 + IFS="$lt_save_ifs"
4914 + if test "X$pkg" = "X$p"; then
4915 + enable_fast_install=yes
4916 + fi
4917 + done
4918 + IFS="$lt_save_ifs"
4919 + ;;
4920 + esac],
4921 + [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
4922 +])# AC_ENABLE_FAST_INSTALL
4923
4924 - mingw* | pw32*)
4925 - lt_cv_dlopen="LoadLibrary"
4926 - lt_cv_dlopen_libs=
4927 - ;;
4928
4929 - cygwin*)
4930 - lt_cv_dlopen="dlopen"
4931 - lt_cv_dlopen_libs=
4932 - ;;
4933 +# AC_DISABLE_FAST_INSTALL
4934 +# -----------------------
4935 +# set the default to --disable-fast-install
4936 +AC_DEFUN([AC_DISABLE_FAST_INSTALL],
4937 +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
4938 +AC_ENABLE_FAST_INSTALL(no)
4939 +])# AC_DISABLE_FAST_INSTALL
4940
4941 - darwin*)
4942 - # if libdl is installed we need to link against it
4943 - AC_CHECK_LIB([dl], [dlopen],
4944 - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
4945 - lt_cv_dlopen="dyld"
4946 - lt_cv_dlopen_libs=
4947 - lt_cv_dlopen_self=yes
4948 - ])
4949 - ;;
4950
4951 - *)
4952 - AC_CHECK_FUNC([shl_load],
4953 - [lt_cv_dlopen="shl_load"],
4954 - [AC_CHECK_LIB([dld], [shl_load],
4955 - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
4956 - [AC_CHECK_FUNC([dlopen],
4957 - [lt_cv_dlopen="dlopen"],
4958 - [AC_CHECK_LIB([dl], [dlopen],
4959 - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
4960 - [AC_CHECK_LIB([svld], [dlopen],
4961 - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
4962 - [AC_CHECK_LIB([dld], [dld_link],
4963 - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
4964 - ])
4965 - ])
4966 - ])
4967 - ])
4968 - ])
4969 - ;;
4970 - esac
4971 +# AC_LIBTOOL_PICMODE([MODE])
4972 +# --------------------------
4973 +# implement the --with-pic flag
4974 +# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
4975 +AC_DEFUN([AC_LIBTOOL_PICMODE],
4976 +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
4977 +pic_mode=ifelse($#,1,$1,default)
4978 +])# AC_LIBTOOL_PICMODE
4979
4980 - if test "x$lt_cv_dlopen" != xno; then
4981 - enable_dlopen=yes
4982 - else
4983 - enable_dlopen=no
4984 - fi
4985
4986 - case $lt_cv_dlopen in
4987 - dlopen)
4988 - save_CPPFLAGS="$CPPFLAGS"
4989 - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
4990 +# AC_PROG_EGREP
4991 +# -------------
4992 +# This is predefined starting with Autoconf 2.54, so this conditional
4993 +# definition can be removed once we require Autoconf 2.54 or later.
4994 +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
4995 +[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
4996 + [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
4997 + then ac_cv_prog_egrep='grep -E'
4998 + else ac_cv_prog_egrep='egrep'
4999 + fi])
5000 + EGREP=$ac_cv_prog_egrep
5001 + AC_SUBST([EGREP])
5002 +])])
5003
5004 - save_LDFLAGS="$LDFLAGS"
5005 - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
5006
5007 - save_LIBS="$LIBS"
5008 - LIBS="$lt_cv_dlopen_libs $LIBS"
5009 +# AC_PATH_TOOL_PREFIX
5010 +# -------------------
5011 +# find a file program which can recognize shared library
5012 +AC_DEFUN([AC_PATH_TOOL_PREFIX],
5013 +[AC_REQUIRE([AC_PROG_EGREP])dnl
5014 +AC_MSG_CHECKING([for $1])
5015 +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
5016 +[case $MAGIC_CMD in
5017 +[[\\/*] | ?:[\\/]*])
5018 + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
5019 + ;;
5020 +*)
5021 + lt_save_MAGIC_CMD="$MAGIC_CMD"
5022 + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
5023 +dnl $ac_dummy forces splitting on constant user-supplied paths.
5024 +dnl POSIX.2 word splitting is done only on the output of word expansions,
5025 +dnl not every word. This closes a longstanding sh security hole.
5026 + ac_dummy="ifelse([$2], , $PATH, [$2])"
5027 + for ac_dir in $ac_dummy; do
5028 + IFS="$lt_save_ifs"
5029 + test -z "$ac_dir" && ac_dir=.
5030 + if test -f $ac_dir/$1; then
5031 + lt_cv_path_MAGIC_CMD="$ac_dir/$1"
5032 + if test -n "$file_magic_test_file"; then
5033 + case $deplibs_check_method in
5034 + "file_magic "*)
5035 + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
5036 + MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
5037 + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
5038 + $EGREP "$file_magic_regex" > /dev/null; then
5039 + :
5040 + else
5041 + cat <<EOF 1>&2
5042
5043 - AC_CACHE_CHECK([whether a program can dlopen itself],
5044 - lt_cv_dlopen_self, [dnl
5045 - _LT_AC_TRY_DLOPEN_SELF(
5046 - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
5047 - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
5048 - ])
5049 +*** Warning: the command libtool uses to detect shared libraries,
5050 +*** $file_magic_cmd, produces output that libtool cannot recognize.
5051 +*** The result is that libtool may fail to recognize shared libraries
5052 +*** as such. This will affect the creation of libtool libraries that
5053 +*** depend on shared libraries, but programs linked with such libtool
5054 +*** libraries will work regardless of this problem. Nevertheless, you
5055 +*** may want to report the problem to your system manager and/or to
5056 +*** bug-libtool@gnu.org
5057
5058 - if test "x$lt_cv_dlopen_self" = xyes; then
5059 - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
5060 - AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
5061 - lt_cv_dlopen_self_static, [dnl
5062 - _LT_AC_TRY_DLOPEN_SELF(
5063 - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
5064 - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
5065 - ])
5066 +EOF
5067 + fi ;;
5068 + esac
5069 + fi
5070 + break
5071 fi
5072 -
5073 - CPPFLAGS="$save_CPPFLAGS"
5074 - LDFLAGS="$save_LDFLAGS"
5075 - LIBS="$save_LIBS"
5076 - ;;
5077 - esac
5078 -
5079 - case $lt_cv_dlopen_self in
5080 - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
5081 - *) enable_dlopen_self=unknown ;;
5082 - esac
5083 -
5084 - case $lt_cv_dlopen_self_static in
5085 - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
5086 - *) enable_dlopen_self_static=unknown ;;
5087 - esac
5088 -fi
5089 -])# AC_LIBTOOL_DLOPEN_SELF
5090 -
5091 -
5092 -# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
5093 -# ---------------------------------
5094 -# Check to see if options -c and -o are simultaneously supported by compiler
5095 -AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
5096 -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
5097 -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
5098 - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
5099 - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
5100 - $rm -r conftest 2>/dev/null
5101 - mkdir conftest
5102 - cd conftest
5103 - mkdir out
5104 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
5105 -
5106 - lt_compiler_flag="-o out/conftest2.$ac_objext"
5107 - # Insert the option either (1) after the last *FLAGS variable, or
5108 - # (2) before a word containing "conftest.", or (3) at the end.
5109 - # Note that $ac_compile itself does not contain backslashes and begins
5110 - # with a dollar sign (not a hyphen), so the echo should work correctly.
5111 - lt_compile=`echo "$ac_compile" | $SED \
5112 - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
5113 - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
5114 - -e 's:$: $lt_compiler_flag:'`
5115 - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
5116 - (eval "$lt_compile" 2>out/conftest.err)
5117 - ac_status=$?
5118 - cat out/conftest.err >&AS_MESSAGE_LOG_FD
5119 - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
5120 - if (exit $ac_status) && test -s out/conftest2.$ac_objext
5121 - then
5122 - # The compiler can only warn and ignore the option if not recognized
5123 - # So say no if there are warnings
5124 - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
5125 - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
5126 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
5127 - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
5128 - fi
5129 - fi
5130 - chmod u+w . 2>&AS_MESSAGE_LOG_FD
5131 - $rm conftest*
5132 - # SGI C++ compiler will create directory out/ii_files/ for
5133 - # template instantiation
5134 - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
5135 - $rm out/* && rmdir out
5136 - cd ..
5137 - rmdir conftest
5138 - $rm conftest*
5139 -])
5140 -])# AC_LIBTOOL_PROG_CC_C_O
5141 -
5142 -
5143 -# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
5144 -# -----------------------------------------
5145 -# Check to see if we can do hard links to lock some files if needed
5146 -AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
5147 -[AC_REQUIRE([_LT_AC_LOCK])dnl
5148 -
5149 -hard_links="nottested"
5150 -if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
5151 - # do not overwrite the value of need_locks provided by the user
5152 - AC_MSG_CHECKING([if we can lock with hard links])
5153 - hard_links=yes
5154 - $rm conftest*
5155 - ln conftest.a conftest.b 2>/dev/null && hard_links=no
5156 - touch conftest.a
5157 - ln conftest.a conftest.b 2>&5 || hard_links=no
5158 - ln conftest.a conftest.b 2>/dev/null && hard_links=no
5159 - AC_MSG_RESULT([$hard_links])
5160 - if test "$hard_links" = no; then
5161 - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
5162 - need_locks=warn
5163 - fi
5164 -else
5165 - need_locks=no
5166 -fi
5167 -])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
5168 -
5169 -
5170 -# AC_LIBTOOL_OBJDIR
5171 -# -----------------
5172 -AC_DEFUN([AC_LIBTOOL_OBJDIR],
5173 -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
5174 -[rm -f .libs 2>/dev/null
5175 -mkdir .libs 2>/dev/null
5176 -if test -d .libs; then
5177 - lt_cv_objdir=.libs
5178 + done
5179 + IFS="$lt_save_ifs"
5180 + MAGIC_CMD="$lt_save_MAGIC_CMD"
5181 + ;;
5182 +esac])
5183 +MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
5184 +if test -n "$MAGIC_CMD"; then
5185 + AC_MSG_RESULT($MAGIC_CMD)
5186 else
5187 - # MS-DOS does not allow filenames that begin with a dot.
5188 - lt_cv_objdir=_libs
5189 + AC_MSG_RESULT(no)
5190 fi
5191 -rmdir .libs 2>/dev/null])
5192 -objdir=$lt_cv_objdir
5193 -])# AC_LIBTOOL_OBJDIR
5194 -
5195 +])# AC_PATH_TOOL_PREFIX
5196
5197 -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
5198 -# ----------------------------------------------
5199 -# Check hardcoding attributes.
5200 -AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
5201 -[AC_MSG_CHECKING([how to hardcode library paths into programs])
5202 -_LT_AC_TAGVAR(hardcode_action, $1)=
5203 -if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
5204 - test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
5205 - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
5206
5207 - # We can hardcode non-existant directories.
5208 - if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
5209 - # If the only mechanism to avoid hardcoding is shlibpath_var, we
5210 - # have to relink, otherwise we might link with an installed library
5211 - # when we should be linking with a yet-to-be-installed one
5212 - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
5213 - test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
5214 - # Linking always hardcodes the temporary library directory.
5215 - _LT_AC_TAGVAR(hardcode_action, $1)=relink
5216 +# AC_PATH_MAGIC
5217 +# -------------
5218 +# find a file program which can recognize a shared library
5219 +AC_DEFUN([AC_PATH_MAGIC],
5220 +[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
5221 +if test -z "$lt_cv_path_MAGIC_CMD"; then
5222 + if test -n "$ac_tool_prefix"; then
5223 + AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
5224 else
5225 - # We can link without hardcoding, and we can hardcode nonexisting dirs.
5226 - _LT_AC_TAGVAR(hardcode_action, $1)=immediate
5227 + MAGIC_CMD=:
5228 fi
5229 -else
5230 - # We cannot hardcode anything, or else we can only hardcode existing
5231 - # directories.
5232 - _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
5233 -fi
5234 -AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
5235 -
5236 -if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
5237 - # Fast installation is not supported
5238 - enable_fast_install=no
5239 -elif test "$shlibpath_overrides_runpath" = yes ||
5240 - test "$enable_shared" = no; then
5241 - # Fast installation is not necessary
5242 - enable_fast_install=needless
5243 fi
5244 -])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
5245 +])# AC_PATH_MAGIC
5246
5247
5248 -# AC_LIBTOOL_SYS_LIB_STRIP
5249 -# ------------------------
5250 -AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
5251 -[striplib=
5252 -old_striplib=
5253 -AC_MSG_CHECKING([whether stripping libraries is possible])
5254 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
5255 - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
5256 - test -z "$striplib" && striplib="$STRIP --strip-unneeded"
5257 - AC_MSG_RESULT([yes])
5258 -else
5259 -# FIXME - insert some real tests, host_os isn't really good enough
5260 - case $host_os in
5261 - darwin*)
5262 - if test -n "$STRIP" ; then
5263 - striplib="$STRIP -x"
5264 - AC_MSG_RESULT([yes])
5265 - else
5266 - AC_MSG_RESULT([no])
5267 -fi
5268 - ;;
5269 - *)
5270 - AC_MSG_RESULT([no])
5271 +# AC_PROG_LD
5272 +# ----------
5273 +# find the pathname to the GNU or non-GNU linker
5274 +AC_DEFUN([AC_PROG_LD],
5275 +[AC_ARG_WITH([gnu-ld],
5276 + [AC_HELP_STRING([--with-gnu-ld],
5277 + [assume the C compiler uses GNU ld @<:@default=no@:>@])],
5278 + [test "$withval" = no || with_gnu_ld=yes],
5279 + [with_gnu_ld=no])
5280 +AC_REQUIRE([LT_AC_PROG_SED])dnl
5281 +AC_REQUIRE([AC_PROG_CC])dnl
5282 +AC_REQUIRE([AC_CANONICAL_HOST])dnl
5283 +AC_REQUIRE([AC_CANONICAL_BUILD])dnl
5284 +ac_prog=ld
5285 +if test "$GCC" = yes; then
5286 + # Check if gcc -print-prog-name=ld gives a path.
5287 + AC_MSG_CHECKING([for ld used by $CC])
5288 + case $host in
5289 + *-*-mingw*)
5290 + # gcc leaves a trailing carriage return which upsets mingw
5291 + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
5292 + *)
5293 + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
5294 + esac
5295 + case $ac_prog in
5296 + # Accept absolute paths.
5297 + [[\\/]]* | ?:[[\\/]]*)
5298 + re_direlt='/[[^/]][[^/]]*/\.\./'
5299 + # Canonicalize the pathname of ld
5300 + ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
5301 + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
5302 + ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
5303 + done
5304 + test -z "$LD" && LD="$ac_prog"
5305 + ;;
5306 + "")
5307 + # If it fails, then pretend we aren't using GCC.
5308 + ac_prog=ld
5309 + ;;
5310 + *)
5311 + # If it is relative, then search for the first ld in PATH.
5312 + with_gnu_ld=unknown
5313 ;;
5314 esac
5315 +elif test "$with_gnu_ld" = yes; then
5316 + AC_MSG_CHECKING([for GNU ld])
5317 +else
5318 + AC_MSG_CHECKING([for non-GNU ld])
5319 fi
5320 -])# AC_LIBTOOL_SYS_LIB_STRIP
5321 -
5322 -
5323 -# AC_LIBTOOL_SYS_DYNAMIC_LINKER
5324 -# -----------------------------
5325 -# PORTME Fill in your ld.so characteristics
5326 -AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
5327 -[AC_MSG_CHECKING([dynamic linker characteristics])
5328 -library_names_spec=
5329 -libname_spec='lib$name'
5330 -soname_spec=
5331 -shrext_cmds=".so"
5332 -postinstall_cmds=
5333 -postuninstall_cmds=
5334 -finish_cmds=
5335 -finish_eval=
5336 -shlibpath_var=
5337 -shlibpath_overrides_runpath=unknown
5338 -version_type=none
5339 -dynamic_linker="$host_os ld.so"
5340 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
5341 -if test "$GCC" = yes; then
5342 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
5343 - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
5344 - # if the path contains ";" then we assume it to be the separator
5345 - # otherwise default to the standard path separator (i.e. ":") - it is
5346 - # assumed that no part of a normal pathname contains ";" but that should
5347 - # okay in the real world where ";" in dirpaths is itself problematic.
5348 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
5349 - else
5350 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5351 - fi
5352 +AC_CACHE_VAL(lt_cv_path_LD,
5353 +[if test -z "$LD"; then
5354 + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
5355 + for ac_dir in $PATH; do
5356 + IFS="$lt_save_ifs"
5357 + test -z "$ac_dir" && ac_dir=.
5358 + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
5359 + lt_cv_path_LD="$ac_dir/$ac_prog"
5360 + # Check to see if the program is GNU ld. I'd rather use --version,
5361 + # but apparently some variants of GNU ld only accept -v.
5362 + # Break only if it was the GNU/non-GNU ld that we prefer.
5363 + case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
5364 + *GNU* | *'with BFD'*)
5365 + test "$with_gnu_ld" != no && break
5366 + ;;
5367 + *)
5368 + test "$with_gnu_ld" != yes && break
5369 + ;;
5370 + esac
5371 + fi
5372 + done
5373 + IFS="$lt_save_ifs"
5374 else
5375 - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
5376 + lt_cv_path_LD="$LD" # Let the user override the test with a path.
5377 +fi])
5378 +LD="$lt_cv_path_LD"
5379 +if test -n "$LD"; then
5380 + AC_MSG_RESULT($LD)
5381 +else
5382 + AC_MSG_RESULT(no)
5383 fi
5384 -need_lib_prefix=unknown
5385 -hardcode_into_libs=no
5386 -
5387 -# when you set need_version to no, make sure it does not cause -set_version
5388 -# flags to be left without arguments
5389 -need_version=unknown
5390 +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
5391 +AC_PROG_LD_GNU
5392 +])# AC_PROG_LD
5393
5394 -case $host_os in
5395 -aix3*)
5396 - version_type=linux
5397 - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
5398 - shlibpath_var=LIBPATH
5399
5400 - # AIX 3 has no versioning support, so we append a major version to the name.
5401 - soname_spec='${libname}${release}${shared_ext}$major'
5402 +# AC_PROG_LD_GNU
5403 +# --------------
5404 +AC_DEFUN([AC_PROG_LD_GNU],
5405 +[AC_REQUIRE([AC_PROG_EGREP])dnl
5406 +AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
5407 +[# I'd rather use --version here, but apparently some GNU lds only accept -v.
5408 +case `$LD -v 2>&1 </dev/null` in
5409 +*GNU* | *'with BFD'*)
5410 + lt_cv_prog_gnu_ld=yes
5411 + ;;
5412 +*)
5413 + lt_cv_prog_gnu_ld=no
5414 ;;
5415 +esac])
5416 +with_gnu_ld=$lt_cv_prog_gnu_ld
5417 +])# AC_PROG_LD_GNU
5418
5419 -aix4* | aix5*)
5420 - version_type=linux
5421 - need_lib_prefix=no
5422 - need_version=no
5423 - hardcode_into_libs=yes
5424 - if test "$host_cpu" = ia64; then
5425 - # AIX 5 supports IA64
5426 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
5427 - shlibpath_var=LD_LIBRARY_PATH
5428 - else
5429 - # With GCC up to 2.95.x, collect2 would create an import file
5430 - # for dependence libraries. The import file would start with
5431 - # the line `#! .'. This would cause the generated library to
5432 - # depend on `.', always an invalid library. This was fixed in
5433 - # development snapshots of GCC prior to 3.0.
5434 - case $host_os in
5435 - aix4 | aix4.[[01]] | aix4.[[01]].*)
5436 - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
5437 - echo ' yes '
5438 - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
5439 - :
5440 - else
5441 - can_build_shared=no
5442 - fi
5443 - ;;
5444 - esac
5445 - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
5446 - # soname into executable. Probably we can add versioning support to
5447 - # collect2, so additional links can be useful in future.
5448 - if test "$aix_use_runtimelinking" = yes; then
5449 - # If using run time linking (on AIX 4.2 or later) use lib<name>.so
5450 - # instead of lib<name>.a to let people know that these are not
5451 - # typical AIX shared libraries.
5452 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
5453 +
5454 +# AC_PROG_LD_RELOAD_FLAG
5455 +# ----------------------
5456 +# find reload flag for linker
5457 +# -- PORTME Some linkers may need a different reload flag.
5458 +AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
5459 +[AC_CACHE_CHECK([for $LD option to reload object files],
5460 + lt_cv_ld_reload_flag,
5461 + [lt_cv_ld_reload_flag='-r'])
5462 +reload_flag=$lt_cv_ld_reload_flag
5463 +case $reload_flag in
5464 +"" | " "*) ;;
5465 +*) reload_flag=" $reload_flag" ;;
5466 +esac
5467 +reload_cmds='$LD$reload_flag -o $output$reload_objs'
5468 +case $host_os in
5469 + darwin*)
5470 + if test "$GCC" = yes; then
5471 + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
5472 else
5473 - # We preserve .a as extension for shared libraries through AIX4.2
5474 - # and later when we are not doing run time linking.
5475 - library_names_spec='${libname}${release}.a $libname.a'
5476 - soname_spec='${libname}${release}${shared_ext}$major'
5477 + reload_cmds='$LD$reload_flag -o $output$reload_objs'
5478 fi
5479 - shlibpath_var=LIBPATH
5480 - fi
5481 - ;;
5482 + ;;
5483 +esac
5484 +])# AC_PROG_LD_RELOAD_FLAG
5485
5486 -amigaos*)
5487 - library_names_spec='$libname.ixlibrary $libname.a'
5488 - # Create ${libname}_ixlibrary.a entries in /sys/libs.
5489 - 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'
5490 +
5491 +# AC_DEPLIBS_CHECK_METHOD
5492 +# -----------------------
5493 +# how to check for library dependencies
5494 +# -- PORTME fill in with the dynamic library characteristics
5495 +AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
5496 +[AC_CACHE_CHECK([how to recognize dependent libraries],
5497 +lt_cv_deplibs_check_method,
5498 +[lt_cv_file_magic_cmd='$MAGIC_CMD'
5499 +lt_cv_file_magic_test_file=
5500 +lt_cv_deplibs_check_method='unknown'
5501 +# Need to set the preceding variable on all platforms that support
5502 +# interlibrary dependencies.
5503 +# 'none' -- dependencies not supported.
5504 +# `unknown' -- same as none, but documents that we really don't know.
5505 +# 'pass_all' -- all dependencies passed with no checks.
5506 +# 'test_compile' -- check by making test program.
5507 +# 'file_magic [[regex]]' -- check by looking for files in library path
5508 +# which responds to the $file_magic_cmd with a given extended regex.
5509 +# If you have `file' or equivalent on your system and you're not sure
5510 +# whether `pass_all' will *always* work, you probably want this one.
5511 +
5512 +case $host_os in
5513 +aix4* | aix5*)
5514 + lt_cv_deplibs_check_method=pass_all
5515 ;;
5516
5517 beos*)
5518 - library_names_spec='${libname}${shared_ext}'
5519 - dynamic_linker="$host_os ld.so"
5520 - shlibpath_var=LIBRARY_PATH
5521 + lt_cv_deplibs_check_method=pass_all
5522 ;;
5523
5524 bsdi[[45]]*)
5525 - version_type=linux
5526 - need_version=no
5527 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
5528 - soname_spec='${libname}${release}${shared_ext}$major'
5529 - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
5530 - shlibpath_var=LD_LIBRARY_PATH
5531 - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
5532 - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
5533 - # the default ld.so.conf also contains /usr/contrib/lib and
5534 - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
5535 - # libtool to hard-code these into programs
5536 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
5537 + lt_cv_file_magic_cmd='/usr/bin/file -L'
5538 + lt_cv_file_magic_test_file=/shlib/libc.so
5539 ;;
5540
5541 -cygwin* | mingw* | pw32*)
5542 - version_type=windows
5543 - shrext_cmds=".dll"
5544 - need_version=no
5545 - need_lib_prefix=no
5546 +cygwin*)
5547 + # func_win32_libid is a shell function defined in ltmain.sh
5548 + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
5549 + lt_cv_file_magic_cmd='func_win32_libid'
5550 + ;;
5551
5552 - case $GCC,$host_os in
5553 - yes,cygwin* | yes,mingw* | yes,pw32*)
5554 - library_names_spec='$libname.dll.a'
5555 - # DLL is installed to $(libdir)/../bin by postinstall_cmds
5556 - postinstall_cmds='base_file=`basename \${file}`~
5557 - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
5558 - dldir=$destdir/`dirname \$dlpath`~
5559 - test -d \$dldir || mkdir -p \$dldir~
5560 - $install_prog $dir/$dlname \$dldir/$dlname~
5561 - chmod a+x \$dldir/$dlname'
5562 - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
5563 - dlpath=$dir/\$dldll~
5564 - $rm \$dlpath'
5565 - shlibpath_overrides_runpath=yes
5566 +mingw* | pw32*)
5567 + # Base MSYS/MinGW do not provide the 'file' command needed by
5568 + # func_win32_libid shell function, so use a weaker test based on 'objdump',
5569 + # unless we find 'file', for example because we are cross-compiling.
5570 + if ( file / ) >/dev/null 2>&1; then
5571 + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
5572 + lt_cv_file_magic_cmd='func_win32_libid'
5573 + else
5574 + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
5575 + lt_cv_file_magic_cmd='$OBJDUMP -f'
5576 + fi
5577 + ;;
5578
5579 - case $host_os in
5580 - cygwin*)
5581 - # Cygwin DLLs use 'cyg' prefix rather than 'lib'
5582 - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
5583 - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
5584 - ;;
5585 - mingw*)
5586 - # MinGW DLLs use traditional 'lib' prefix
5587 - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
5588 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
5589 - if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
5590 - # It is most probably a Windows format PATH printed by
5591 - # mingw gcc, but we are running on Cygwin. Gcc prints its search
5592 - # path with ; separators, and with drive letters. We can handle the
5593 - # drive letters (cygwin fileutils understands them), so leave them,
5594 - # especially as we might pass files found there to a mingw objdump,
5595 - # which wouldn't understand a cygwinified path. Ahh.
5596 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
5597 - else
5598 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
5599 - fi
5600 - ;;
5601 - pw32*)
5602 - # pw32 DLLs use 'pw' prefix rather than 'lib'
5603 - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
5604 +darwin* | rhapsody*)
5605 + lt_cv_deplibs_check_method=pass_all
5606 + ;;
5607 +
5608 +freebsd* | dragonfly*)
5609 + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
5610 + case $host_cpu in
5611 + i*86 )
5612 + # Not sure whether the presence of OpenBSD here was a mistake.
5613 + # Let's accept both of them until this is cleared up.
5614 + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
5615 + lt_cv_file_magic_cmd=/usr/bin/file
5616 + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
5617 ;;
5618 esac
5619 - ;;
5620 + else
5621 + lt_cv_deplibs_check_method=pass_all
5622 + fi
5623 + ;;
5624 +
5625 +gnu*)
5626 + lt_cv_deplibs_check_method=pass_all
5627 + ;;
5628
5629 +hpux10.20* | hpux11*)
5630 + lt_cv_file_magic_cmd=/usr/bin/file
5631 + case $host_cpu in
5632 + ia64*)
5633 + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
5634 + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
5635 + ;;
5636 + hppa*64*)
5637 + [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]']
5638 + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
5639 + ;;
5640 *)
5641 - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
5642 + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
5643 + lt_cv_file_magic_test_file=/usr/lib/libc.sl
5644 ;;
5645 esac
5646 - dynamic_linker='Win32 ld.exe'
5647 - # FIXME: first we should search . and the directory the executable is in
5648 - shlibpath_var=PATH
5649 ;;
5650
5651 -darwin* | rhapsody*)
5652 - dynamic_linker="$host_os dyld"
5653 - version_type=darwin
5654 - need_lib_prefix=no
5655 - need_version=no
5656 - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
5657 - soname_spec='${libname}${release}${major}$shared_ext'
5658 - shlibpath_overrides_runpath=yes
5659 - shlibpath_var=DYLD_LIBRARY_PATH
5660 - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
5661 - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
5662 - if test "$GCC" = yes; then
5663 - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
5664 - else
5665 - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
5666 - fi
5667 - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
5668 +interix[[3-9]]*)
5669 + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
5670 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
5671 ;;
5672
5673 -dgux*)
5674 - version_type=linux
5675 - need_lib_prefix=no
5676 - need_version=no
5677 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
5678 - soname_spec='${libname}${release}${shared_ext}$major'
5679 - shlibpath_var=LD_LIBRARY_PATH
5680 +irix5* | irix6* | nonstopux*)
5681 + case $LD in
5682 + *-32|*"-32 ") libmagic=32-bit;;
5683 + *-n32|*"-n32 ") libmagic=N32;;
5684 + *-64|*"-64 ") libmagic=64-bit;;
5685 + *) libmagic=never-match;;
5686 + esac
5687 + lt_cv_deplibs_check_method=pass_all
5688 ;;
5689
5690 -freebsd1*)
5691 - dynamic_linker=no
5692 +# This must be Linux ELF.
5693 +linux* | k*bsd*-gnu)
5694 + lt_cv_deplibs_check_method=pass_all
5695 ;;
5696
5697 -kfreebsd*-gnu)
5698 - version_type=linux
5699 - need_lib_prefix=no
5700 - need_version=no
5701 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
5702 - soname_spec='${libname}${release}${shared_ext}$major'
5703 - shlibpath_var=LD_LIBRARY_PATH
5704 - shlibpath_overrides_runpath=no
5705 - hardcode_into_libs=yes
5706 - dynamic_linker='GNU ld.so'
5707 +netbsd* | netbsdelf*-gnu)
5708 + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
5709 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
5710 + else
5711 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
5712 + fi
5713 ;;
5714
5715 -freebsd* | dragonfly*)
5716 - # DragonFly does not have aout. When/if they implement a new
5717 - # versioning mechanism, adjust this.
5718 - if test -x /usr/bin/objformat; then
5719 - objformat=`/usr/bin/objformat`
5720 +newos6*)
5721 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
5722 + lt_cv_file_magic_cmd=/usr/bin/file
5723 + lt_cv_file_magic_test_file=/usr/lib/libnls.so
5724 + ;;
5725 +
5726 +nto-qnx*)
5727 + lt_cv_deplibs_check_method=unknown
5728 + ;;
5729 +
5730 +openbsd*)
5731 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
5732 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
5733 else
5734 - case $host_os in
5735 - freebsd[[123]]*) objformat=aout ;;
5736 - *) objformat=elf ;;
5737 - esac
5738 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
5739 fi
5740 - version_type=freebsd-$objformat
5741 - case $version_type in
5742 - freebsd-elf*)
5743 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
5744 - need_version=no
5745 - need_lib_prefix=no
5746 - ;;
5747 - freebsd-*)
5748 - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
5749 - need_version=yes
5750 - ;;
5751 - esac
5752 - shlibpath_var=LD_LIBRARY_PATH
5753 - case $host_os in
5754 - freebsd2*)
5755 - shlibpath_overrides_runpath=yes
5756 - ;;
5757 - freebsd3.[[01]]* | freebsdelf3.[[01]]*)
5758 - shlibpath_overrides_runpath=yes
5759 - hardcode_into_libs=yes
5760 - ;;
5761 - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
5762 - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
5763 - shlibpath_overrides_runpath=no
5764 - hardcode_into_libs=yes
5765 - ;;
5766 - freebsd*) # from 4.6 on
5767 - shlibpath_overrides_runpath=yes
5768 - hardcode_into_libs=yes
5769 - ;;
5770 - esac
5771 ;;
5772
5773 -gnu*)
5774 - version_type=linux
5775 - need_lib_prefix=no
5776 - need_version=no
5777 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
5778 - soname_spec='${libname}${release}${shared_ext}$major'
5779 - shlibpath_var=LD_LIBRARY_PATH
5780 - hardcode_into_libs=yes
5781 +osf3* | osf4* | osf5*)
5782 + lt_cv_deplibs_check_method=pass_all
5783 ;;
5784
5785 -hpux9* | hpux10* | hpux11*)
5786 - # Give a soname corresponding to the major version so that dld.sl refuses to
5787 - # link against other versions.
5788 - version_type=sunos
5789 - need_lib_prefix=no
5790 - need_version=no
5791 - case $host_cpu in
5792 - ia64*)
5793 - shrext_cmds='.so'
5794 - hardcode_into_libs=yes
5795 - dynamic_linker="$host_os dld.so"
5796 - shlibpath_var=LD_LIBRARY_PATH
5797 - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
5798 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
5799 - soname_spec='${libname}${release}${shared_ext}$major'
5800 - if test "X$HPUX_IA64_MODE" = X32; then
5801 - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
5802 - else
5803 - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
5804 - fi
5805 - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
5806 - ;;
5807 - hppa*64*)
5808 - shrext_cmds='.sl'
5809 - hardcode_into_libs=yes
5810 - dynamic_linker="$host_os dld.sl"
5811 - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
5812 - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
5813 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
5814 - soname_spec='${libname}${release}${shared_ext}$major'
5815 - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
5816 - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
5817 - ;;
5818 - *)
5819 - shrext_cmds='.sl'
5820 - dynamic_linker="$host_os dld.sl"
5821 - shlibpath_var=SHLIB_PATH
5822 - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
5823 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
5824 - soname_spec='${libname}${release}${shared_ext}$major'
5825 - ;;
5826 - esac
5827 - # HP-UX runs *really* slowly unless shared libraries are mode 555.
5828 - postinstall_cmds='chmod 555 $lib'
5829 +rdos*)
5830 + lt_cv_deplibs_check_method=pass_all
5831 ;;
5832
5833 -interix3*)
5834 - version_type=linux
5835 - need_lib_prefix=no
5836 - need_version=no
5837 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
5838 - soname_spec='${libname}${release}${shared_ext}$major'
5839 - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
5840 - shlibpath_var=LD_LIBRARY_PATH
5841 - shlibpath_overrides_runpath=no
5842 - hardcode_into_libs=yes
5843 +solaris*)
5844 + lt_cv_deplibs_check_method=pass_all
5845 ;;
5846
5847 -irix5* | irix6* | nonstopux*)
5848 - case $host_os in
5849 - nonstopux*) version_type=nonstopux ;;
5850 - *)
5851 - if test "$lt_cv_prog_gnu_ld" = yes; then
5852 - version_type=linux
5853 - else
5854 - version_type=irix
5855 - fi ;;
5856 - esac
5857 - need_lib_prefix=no
5858 - need_version=no
5859 - soname_spec='${libname}${release}${shared_ext}$major'
5860 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
5861 - case $host_os in
5862 - irix5* | nonstopux*)
5863 - libsuff= shlibsuff=
5864 +sysv4 | sysv4.3*)
5865 + case $host_vendor in
5866 + motorola)
5867 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
5868 + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
5869 ;;
5870 - *)
5871 - case $LD in # libtool.m4 will add one of these switches to LD
5872 - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
5873 - libsuff= shlibsuff= libmagic=32-bit;;
5874 - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
5875 - libsuff=32 shlibsuff=N32 libmagic=N32;;
5876 - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
5877 - libsuff=64 shlibsuff=64 libmagic=64-bit;;
5878 - *) libsuff= shlibsuff= libmagic=never-match;;
5879 - esac
5880 + ncr)
5881 + lt_cv_deplibs_check_method=pass_all
5882 + ;;
5883 + sequent)
5884 + lt_cv_file_magic_cmd='/bin/file'
5885 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
5886 + ;;
5887 + sni)
5888 + lt_cv_file_magic_cmd='/bin/file'
5889 + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
5890 + lt_cv_file_magic_test_file=/lib/libc.so
5891 + ;;
5892 + siemens)
5893 + lt_cv_deplibs_check_method=pass_all
5894 + ;;
5895 + pc)
5896 + lt_cv_deplibs_check_method=pass_all
5897 ;;
5898 esac
5899 - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
5900 - shlibpath_overrides_runpath=no
5901 - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
5902 - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
5903 - hardcode_into_libs=yes
5904 ;;
5905
5906 -# No shared lib support for Linux oldld, aout, or coff.
5907 -linux*oldld* | linux*aout* | linux*coff*)
5908 - dynamic_linker=no
5909 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
5910 + lt_cv_deplibs_check_method=pass_all
5911 ;;
5912 +esac
5913 +])
5914 +file_magic_cmd=$lt_cv_file_magic_cmd
5915 +deplibs_check_method=$lt_cv_deplibs_check_method
5916 +test -z "$deplibs_check_method" && deplibs_check_method=unknown
5917 +])# AC_DEPLIBS_CHECK_METHOD
5918
5919 -# This must be Linux ELF.
5920 -linux*)
5921 - version_type=linux
5922 - need_lib_prefix=no
5923 - need_version=no
5924 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
5925 - soname_spec='${libname}${release}${shared_ext}$major'
5926 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
5927 - shlibpath_var=LD_LIBRARY_PATH
5928 - shlibpath_overrides_runpath=no
5929 - # This implies no fast_install, which is unacceptable.
5930 - # Some rework will be needed to allow for fast_install
5931 - # before this can be enabled.
5932 - hardcode_into_libs=yes
5933 -
5934 - # find out which ABI we are using
5935 - libsuff=
5936 - case "$host_cpu" in
5937 - x86_64*|s390x*|powerpc64*)
5938 - echo '[#]line __oline__ "configure"' > conftest.$ac_ext
5939 - if AC_TRY_EVAL(ac_compile); then
5940 - case `/usr/bin/file conftest.$ac_objext` in
5941 - *64-bit*)
5942 - libsuff=64
5943 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
5944 - ;;
5945 - esac
5946 - fi
5947 - rm -rf conftest*
5948 - ;;
5949 - esac
5950
5951 - # Append ld.so.conf contents to the search path
5952 - if test -f /etc/ld.so.conf; then
5953 - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
5954 - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
5955 +# AC_PROG_NM
5956 +# ----------
5957 +# find the pathname to a BSD-compatible name lister
5958 +AC_DEFUN([AC_PROG_NM],
5959 +[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
5960 +[if test -n "$NM"; then
5961 + # Let the user override the test.
5962 + lt_cv_path_NM="$NM"
5963 +else
5964 + lt_nm_to_check="${ac_tool_prefix}nm"
5965 + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
5966 + lt_nm_to_check="$lt_nm_to_check nm"
5967 fi
5968 + for lt_tmp_nm in $lt_nm_to_check; do
5969 + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
5970 + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
5971 + IFS="$lt_save_ifs"
5972 + test -z "$ac_dir" && ac_dir=.
5973 + tmp_nm="$ac_dir/$lt_tmp_nm"
5974 + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
5975 + # Check to see if the nm accepts a BSD-compat flag.
5976 + # Adding the `sed 1q' prevents false positives on HP-UX, which says:
5977 + # nm: unknown option "B" ignored
5978 + # Tru64's nm complains that /dev/null is an invalid object file
5979 + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
5980 + */dev/null* | *'Invalid file or object type'*)
5981 + lt_cv_path_NM="$tmp_nm -B"
5982 + break
5983 + ;;
5984 + *)
5985 + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
5986 + */dev/null*)
5987 + lt_cv_path_NM="$tmp_nm -p"
5988 + break
5989 + ;;
5990 + *)
5991 + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
5992 + continue # so that we can try to find one that supports BSD flags
5993 + ;;
5994 + esac
5995 + ;;
5996 + esac
5997 + fi
5998 + done
5999 + IFS="$lt_save_ifs"
6000 + done
6001 + test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
6002 +fi])
6003 +NM="$lt_cv_path_NM"
6004 +])# AC_PROG_NM
6005
6006 - # We used to test for /lib/ld.so.1 and disable shared libraries on
6007 - # powerpc, because MkLinux only supported shared libraries with the
6008 - # GNU dynamic linker. Since this was broken with cross compilers,
6009 - # most powerpc-linux boxes support dynamic linking these days and
6010 - # people can always --disable-shared, the test was removed, and we
6011 - # assume the GNU/Linux dynamic linker is in use.
6012 - dynamic_linker='GNU/Linux ld.so'
6013 - ;;
6014
6015 -knetbsd*-gnu)
6016 - version_type=linux
6017 - need_lib_prefix=no
6018 - need_version=no
6019 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
6020 - soname_spec='${libname}${release}${shared_ext}$major'
6021 - shlibpath_var=LD_LIBRARY_PATH
6022 - shlibpath_overrides_runpath=no
6023 - hardcode_into_libs=yes
6024 - dynamic_linker='GNU ld.so'
6025 +# AC_CHECK_LIBM
6026 +# -------------
6027 +# check for math library
6028 +AC_DEFUN([AC_CHECK_LIBM],
6029 +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
6030 +LIBM=
6031 +case $host in
6032 +*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
6033 + # These system don't have libm, or don't need it
6034 ;;
6035 -
6036 -netbsd*)
6037 - version_type=sunos
6038 - need_lib_prefix=no
6039 - need_version=no
6040 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
6041 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
6042 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
6043 - dynamic_linker='NetBSD (a.out) ld.so'
6044 - else
6045 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
6046 - soname_spec='${libname}${release}${shared_ext}$major'
6047 - dynamic_linker='NetBSD ld.elf_so'
6048 - fi
6049 - shlibpath_var=LD_LIBRARY_PATH
6050 - shlibpath_overrides_runpath=yes
6051 - hardcode_into_libs=yes
6052 +*-ncr-sysv4.3*)
6053 + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
6054 + AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
6055 ;;
6056 -
6057 -newsos6)
6058 - version_type=linux
6059 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6060 - shlibpath_var=LD_LIBRARY_PATH
6061 - shlibpath_overrides_runpath=yes
6062 +*)
6063 + AC_CHECK_LIB(m, cos, LIBM="-lm")
6064 ;;
6065 +esac
6066 +])# AC_CHECK_LIBM
6067
6068 -nto-qnx*)
6069 - version_type=linux
6070 - need_lib_prefix=no
6071 - need_version=no
6072 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6073 - soname_spec='${libname}${release}${shared_ext}$major'
6074 - shlibpath_var=LD_LIBRARY_PATH
6075 - shlibpath_overrides_runpath=yes
6076 - ;;
6077
6078 -openbsd*)
6079 - version_type=sunos
6080 - sys_lib_dlsearch_path_spec="/usr/lib"
6081 - need_lib_prefix=no
6082 - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
6083 - case $host_os in
6084 - openbsd3.3 | openbsd3.3.*) need_version=yes ;;
6085 - *) need_version=no ;;
6086 +# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
6087 +# -----------------------------------
6088 +# sets LIBLTDL to the link flags for the libltdl convenience library and
6089 +# LTDLINCL to the include flags for the libltdl header and adds
6090 +# --enable-ltdl-convenience to the configure arguments. Note that
6091 +# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
6092 +# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
6093 +# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
6094 +# (note the single quotes!). If your package is not flat and you're not
6095 +# using automake, define top_builddir and top_srcdir appropriately in
6096 +# the Makefiles.
6097 +AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
6098 +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
6099 + case $enable_ltdl_convenience in
6100 + no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
6101 + "") enable_ltdl_convenience=yes
6102 + ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
6103 esac
6104 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
6105 - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
6106 - shlibpath_var=LD_LIBRARY_PATH
6107 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
6108 - case $host_os in
6109 - openbsd2.[[89]] | openbsd2.[[89]].*)
6110 - shlibpath_overrides_runpath=no
6111 - ;;
6112 - *)
6113 - shlibpath_overrides_runpath=yes
6114 - ;;
6115 - esac
6116 + LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
6117 + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
6118 + # For backwards non-gettext consistent compatibility...
6119 + INCLTDL="$LTDLINCL"
6120 +])# AC_LIBLTDL_CONVENIENCE
6121 +
6122 +
6123 +# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
6124 +# -----------------------------------
6125 +# sets LIBLTDL to the link flags for the libltdl installable library and
6126 +# LTDLINCL to the include flags for the libltdl header and adds
6127 +# --enable-ltdl-install to the configure arguments. Note that
6128 +# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
6129 +# and an installed libltdl is not found, it is assumed to be `libltdl'.
6130 +# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
6131 +# '${top_srcdir}/' (note the single quotes!). If your package is not
6132 +# flat and you're not using automake, define top_builddir and top_srcdir
6133 +# appropriately in the Makefiles.
6134 +# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
6135 +AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
6136 +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
6137 + AC_CHECK_LIB(ltdl, lt_dlinit,
6138 + [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
6139 + [if test x"$enable_ltdl_install" = xno; then
6140 + AC_MSG_WARN([libltdl not installed, but installation disabled])
6141 + else
6142 + enable_ltdl_install=yes
6143 + fi
6144 + ])
6145 + if test x"$enable_ltdl_install" = x"yes"; then
6146 + ac_configure_args="$ac_configure_args --enable-ltdl-install"
6147 + LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
6148 + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
6149 else
6150 - shlibpath_overrides_runpath=yes
6151 + ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
6152 + LIBLTDL="-lltdl"
6153 + LTDLINCL=
6154 fi
6155 - ;;
6156 + # For backwards non-gettext consistent compatibility...
6157 + INCLTDL="$LTDLINCL"
6158 +])# AC_LIBLTDL_INSTALLABLE
6159
6160 -os2*)
6161 - libname_spec='$name'
6162 - shrext_cmds=".dll"
6163 - need_lib_prefix=no
6164 - library_names_spec='$libname${shared_ext} $libname.a'
6165 - dynamic_linker='OS/2 ld.exe'
6166 - shlibpath_var=LIBPATH
6167 - ;;
6168
6169 -osf3* | osf4* | osf5*)
6170 - version_type=osf
6171 - need_lib_prefix=no
6172 - need_version=no
6173 - soname_spec='${libname}${release}${shared_ext}$major'
6174 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6175 - shlibpath_var=LD_LIBRARY_PATH
6176 - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
6177 - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
6178 - ;;
6179 +# AC_LIBTOOL_CXX
6180 +# --------------
6181 +# enable support for C++ libraries
6182 +AC_DEFUN([AC_LIBTOOL_CXX],
6183 +[AC_REQUIRE([_LT_AC_LANG_CXX])
6184 +])# AC_LIBTOOL_CXX
6185
6186 -solaris*)
6187 - version_type=linux
6188 - need_lib_prefix=no
6189 - need_version=no
6190 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6191 - soname_spec='${libname}${release}${shared_ext}$major'
6192 - shlibpath_var=LD_LIBRARY_PATH
6193 - shlibpath_overrides_runpath=yes
6194 - hardcode_into_libs=yes
6195 - # ldd complains unless libraries are executable
6196 - postinstall_cmds='chmod +x $lib'
6197 - ;;
6198
6199 -sunos4*)
6200 - version_type=sunos
6201 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
6202 - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
6203 - shlibpath_var=LD_LIBRARY_PATH
6204 - shlibpath_overrides_runpath=yes
6205 - if test "$with_gnu_ld" = yes; then
6206 - need_lib_prefix=no
6207 - fi
6208 - need_version=yes
6209 - ;;
6210 +# _LT_AC_LANG_CXX
6211 +# ---------------
6212 +AC_DEFUN([_LT_AC_LANG_CXX],
6213 +[AC_REQUIRE([AC_PROG_CXX])
6214 +AC_REQUIRE([_LT_AC_PROG_CXXCPP])
6215 +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
6216 +])# _LT_AC_LANG_CXX
6217
6218 -sysv4 | sysv4.3*)
6219 - version_type=linux
6220 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6221 - soname_spec='${libname}${release}${shared_ext}$major'
6222 - shlibpath_var=LD_LIBRARY_PATH
6223 - case $host_vendor in
6224 - sni)
6225 - shlibpath_overrides_runpath=no
6226 - need_lib_prefix=no
6227 - export_dynamic_flag_spec='${wl}-Blargedynsym'
6228 - runpath_var=LD_RUN_PATH
6229 - ;;
6230 - siemens)
6231 - need_lib_prefix=no
6232 - ;;
6233 - motorola)
6234 - need_lib_prefix=no
6235 - need_version=no
6236 - shlibpath_overrides_runpath=no
6237 - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
6238 - ;;
6239 - esac
6240 - ;;
6241 +# _LT_AC_PROG_CXXCPP
6242 +# ------------------
6243 +AC_DEFUN([_LT_AC_PROG_CXXCPP],
6244 +[
6245 +AC_REQUIRE([AC_PROG_CXX])
6246 +if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
6247 + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
6248 + (test "X$CXX" != "Xg++"))) ; then
6249 + AC_PROG_CXXCPP
6250 +fi
6251 +])# _LT_AC_PROG_CXXCPP
6252
6253 -sysv4*MP*)
6254 - if test -d /usr/nec ;then
6255 - version_type=linux
6256 - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
6257 - soname_spec='$libname${shared_ext}.$major'
6258 - shlibpath_var=LD_LIBRARY_PATH
6259 - fi
6260 - ;;
6261 +# AC_LIBTOOL_F77
6262 +# --------------
6263 +# enable support for Fortran 77 libraries
6264 +AC_DEFUN([AC_LIBTOOL_F77],
6265 +[AC_REQUIRE([_LT_AC_LANG_F77])
6266 +])# AC_LIBTOOL_F77
6267
6268 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
6269 - version_type=freebsd-elf
6270 - need_lib_prefix=no
6271 - need_version=no
6272 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
6273 - soname_spec='${libname}${release}${shared_ext}$major'
6274 - shlibpath_var=LD_LIBRARY_PATH
6275 - hardcode_into_libs=yes
6276 - if test "$with_gnu_ld" = yes; then
6277 - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
6278 - shlibpath_overrides_runpath=no
6279 - else
6280 - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
6281 - shlibpath_overrides_runpath=yes
6282 - case $host_os in
6283 - sco3.2v5*)
6284 - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
6285 - ;;
6286 - esac
6287 - fi
6288 - sys_lib_dlsearch_path_spec='/usr/lib'
6289 - ;;
6290
6291 -uts4*)
6292 - version_type=linux
6293 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
6294 - soname_spec='${libname}${release}${shared_ext}$major'
6295 - shlibpath_var=LD_LIBRARY_PATH
6296 - ;;
6297 +# _LT_AC_LANG_F77
6298 +# ---------------
6299 +AC_DEFUN([_LT_AC_LANG_F77],
6300 +[AC_REQUIRE([AC_PROG_F77])
6301 +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
6302 +])# _LT_AC_LANG_F77
6303
6304 -*)
6305 - dynamic_linker=no
6306 - ;;
6307 -esac
6308 -AC_MSG_RESULT([$dynamic_linker])
6309 -test "$dynamic_linker" = no && can_build_shared=no
6310
6311 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
6312 -if test "$GCC" = yes; then
6313 - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
6314 -fi
6315 -])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
6316 +# AC_LIBTOOL_GCJ
6317 +# --------------
6318 +# enable support for GCJ libraries
6319 +AC_DEFUN([AC_LIBTOOL_GCJ],
6320 +[AC_REQUIRE([_LT_AC_LANG_GCJ])
6321 +])# AC_LIBTOOL_GCJ
6322
6323
6324 -# _LT_AC_TAGCONFIG
6325 -# ----------------
6326 -AC_DEFUN([_LT_AC_TAGCONFIG],
6327 -[AC_ARG_WITH([tags],
6328 - [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
6329 - [include additional configurations @<:@automatic@:>@])],
6330 - [tagnames="$withval"])
6331 +# _LT_AC_LANG_GCJ
6332 +# ---------------
6333 +AC_DEFUN([_LT_AC_LANG_GCJ],
6334 +[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
6335 + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
6336 + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
6337 + [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
6338 + [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
6339 + [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
6340 +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
6341 +])# _LT_AC_LANG_GCJ
6342
6343 -if test -f "$ltmain" && test -n "$tagnames"; then
6344 - if test ! -f "${ofile}"; then
6345 - AC_MSG_WARN([output file `$ofile' does not exist])
6346 - fi
6347
6348 - if test -z "$LTCC"; then
6349 - eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
6350 - if test -z "$LTCC"; then
6351 - AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
6352 - else
6353 - AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
6354 - fi
6355 - fi
6356 - if test -z "$LTCFLAGS"; then
6357 - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
6358 - fi
6359 +# AC_LIBTOOL_RC
6360 +# -------------
6361 +# enable support for Windows resource files
6362 +AC_DEFUN([AC_LIBTOOL_RC],
6363 +[AC_REQUIRE([LT_AC_PROG_RC])
6364 +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
6365 +])# AC_LIBTOOL_RC
6366
6367 - # Extract list of available tagged configurations in $ofile.
6368 - # Note that this assumes the entire list is on one line.
6369 - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
6370
6371 - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
6372 - for tagname in $tagnames; do
6373 - IFS="$lt_save_ifs"
6374 - # Check whether tagname contains only valid characters
6375 - case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
6376 - "") ;;
6377 - *) AC_MSG_ERROR([invalid tag name: $tagname])
6378 - ;;
6379 - esac
6380 +# AC_LIBTOOL_LANG_C_CONFIG
6381 +# ------------------------
6382 +# Ensure that the configuration vars for the C compiler are
6383 +# suitably defined. Those variables are subsequently used by
6384 +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
6385 +AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
6386 +AC_DEFUN([_LT_AC_LANG_C_CONFIG],
6387 +[lt_save_CC="$CC"
6388 +AC_LANG_PUSH(C)
6389
6390 - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
6391 - then
6392 - AC_MSG_ERROR([tag name \"$tagname\" already exists])
6393 - fi
6394 +# Source file extension for C test sources.
6395 +ac_ext=c
6396
6397 - # Update the list of available tags.
6398 - if test -n "$tagname"; then
6399 - echo appending configuration tag \"$tagname\" to $ofile
6400 +# Object file extension for compiled C test sources.
6401 +objext=o
6402 +_LT_AC_TAGVAR(objext, $1)=$objext
6403
6404 - case $tagname in
6405 - CXX)
6406 - if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
6407 - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
6408 - (test "X$CXX" != "Xg++"))) ; then
6409 - AC_LIBTOOL_LANG_CXX_CONFIG
6410 - else
6411 - tagname=""
6412 - fi
6413 - ;;
6414 +# Code to be used in simple compile tests
6415 +lt_simple_compile_test_code="int some_variable = 0;"
6416
6417 - F77)
6418 - if test -n "$F77" && test "X$F77" != "Xno"; then
6419 - AC_LIBTOOL_LANG_F77_CONFIG
6420 - else
6421 - tagname=""
6422 - fi
6423 - ;;
6424 +# Code to be used in simple link tests
6425 +lt_simple_link_test_code='int main(){return(0);}'
6426
6427 - GCJ)
6428 - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
6429 - AC_LIBTOOL_LANG_GCJ_CONFIG
6430 - else
6431 - tagname=""
6432 - fi
6433 - ;;
6434 +_LT_AC_SYS_COMPILER
6435
6436 - RC)
6437 - AC_LIBTOOL_LANG_RC_CONFIG
6438 - ;;
6439 +# save warnings/boilerplate of simple test code
6440 +_LT_COMPILER_BOILERPLATE
6441 +_LT_LINKER_BOILERPLATE
6442
6443 - *)
6444 - AC_MSG_ERROR([Unsupported tag name: $tagname])
6445 - ;;
6446 - esac
6447 +AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
6448 +AC_LIBTOOL_PROG_COMPILER_PIC($1)
6449 +AC_LIBTOOL_PROG_CC_C_O($1)
6450 +AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
6451 +AC_LIBTOOL_PROG_LD_SHLIBS($1)
6452 +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
6453 +AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
6454 +AC_LIBTOOL_SYS_LIB_STRIP
6455 +AC_LIBTOOL_DLOPEN_SELF
6456
6457 - # Append the new tag name to the list of available tags.
6458 - if test -n "$tagname" ; then
6459 - available_tags="$available_tags $tagname"
6460 - fi
6461 - fi
6462 - done
6463 - IFS="$lt_save_ifs"
6464 +# Report which library types will actually be built
6465 +AC_MSG_CHECKING([if libtool supports shared libraries])
6466 +AC_MSG_RESULT([$can_build_shared])
6467
6468 - # Now substitute the updated list of available tags.
6469 - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
6470 - mv "${ofile}T" "$ofile"
6471 - chmod +x "$ofile"
6472 - else
6473 - rm -f "${ofile}T"
6474 - AC_MSG_ERROR([unable to update list of available tagged configurations.])
6475 - fi
6476 -fi
6477 -])# _LT_AC_TAGCONFIG
6478 +AC_MSG_CHECKING([whether to build shared libraries])
6479 +test "$can_build_shared" = "no" && enable_shared=no
6480
6481 +# On AIX, shared libraries and static libraries use the same namespace, and
6482 +# are all built from PIC.
6483 +case $host_os in
6484 +aix3*)
6485 + test "$enable_shared" = yes && enable_static=no
6486 + if test -n "$RANLIB"; then
6487 + archive_cmds="$archive_cmds~\$RANLIB \$lib"
6488 + postinstall_cmds='$RANLIB $lib'
6489 + fi
6490 + ;;
6491
6492 -# AC_LIBTOOL_DLOPEN
6493 -# -----------------
6494 -# enable checks for dlopen support
6495 -AC_DEFUN([AC_LIBTOOL_DLOPEN],
6496 - [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
6497 -])# AC_LIBTOOL_DLOPEN
6498 +aix4* | aix5*)
6499 + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
6500 + test "$enable_shared" = yes && enable_static=no
6501 + fi
6502 + ;;
6503 +esac
6504 +AC_MSG_RESULT([$enable_shared])
6505
6506 +AC_MSG_CHECKING([whether to build static libraries])
6507 +# Make sure either enable_shared or enable_static is yes.
6508 +test "$enable_shared" = yes || enable_static=yes
6509 +AC_MSG_RESULT([$enable_static])
6510
6511 -# AC_LIBTOOL_WIN32_DLL
6512 -# --------------------
6513 -# declare package support for building win32 DLLs
6514 -AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
6515 -[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
6516 -])# AC_LIBTOOL_WIN32_DLL
6517 +AC_LIBTOOL_CONFIG($1)
6518
6519 +AC_LANG_POP
6520 +CC="$lt_save_CC"
6521 +])# AC_LIBTOOL_LANG_C_CONFIG
6522
6523 -# AC_ENABLE_SHARED([DEFAULT])
6524 -# ---------------------------
6525 -# implement the --enable-shared flag
6526 -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
6527 -AC_DEFUN([AC_ENABLE_SHARED],
6528 -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
6529 -AC_ARG_ENABLE([shared],
6530 - [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
6531 - [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
6532 - [p=${PACKAGE-default}
6533 - case $enableval in
6534 - yes) enable_shared=yes ;;
6535 - no) enable_shared=no ;;
6536 - *)
6537 - enable_shared=no
6538 - # Look at the argument we got. We use all the common list separators.
6539 - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
6540 - for pkg in $enableval; do
6541 - IFS="$lt_save_ifs"
6542 - if test "X$pkg" = "X$p"; then
6543 - enable_shared=yes
6544 - fi
6545 - done
6546 - IFS="$lt_save_ifs"
6547 - ;;
6548 - esac],
6549 - [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
6550 -])# AC_ENABLE_SHARED
6551
6552 +# AC_LIBTOOL_LANG_CXX_CONFIG
6553 +# --------------------------
6554 +# Ensure that the configuration vars for the C compiler are
6555 +# suitably defined. Those variables are subsequently used by
6556 +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
6557 +AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
6558 +AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
6559 +[AC_LANG_PUSH(C++)
6560 +AC_REQUIRE([AC_PROG_CXX])
6561 +AC_REQUIRE([_LT_AC_PROG_CXXCPP])
6562
6563 -# AC_DISABLE_SHARED
6564 -# -----------------
6565 -# set the default shared flag to --disable-shared
6566 -AC_DEFUN([AC_DISABLE_SHARED],
6567 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
6568 -AC_ENABLE_SHARED(no)
6569 -])# AC_DISABLE_SHARED
6570 +_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
6571 +_LT_AC_TAGVAR(allow_undefined_flag, $1)=
6572 +_LT_AC_TAGVAR(always_export_symbols, $1)=no
6573 +_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
6574 +_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
6575 +_LT_AC_TAGVAR(hardcode_direct, $1)=no
6576 +_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
6577 +_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
6578 +_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
6579 +_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
6580 +_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
6581 +_LT_AC_TAGVAR(hardcode_automatic, $1)=no
6582 +_LT_AC_TAGVAR(module_cmds, $1)=
6583 +_LT_AC_TAGVAR(module_expsym_cmds, $1)=
6584 +_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
6585 +_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
6586 +_LT_AC_TAGVAR(no_undefined_flag, $1)=
6587 +_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
6588 +_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
6589
6590 +# Dependencies to place before and after the object being linked:
6591 +_LT_AC_TAGVAR(predep_objects, $1)=
6592 +_LT_AC_TAGVAR(postdep_objects, $1)=
6593 +_LT_AC_TAGVAR(predeps, $1)=
6594 +_LT_AC_TAGVAR(postdeps, $1)=
6595 +_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
6596
6597 -# AC_ENABLE_STATIC([DEFAULT])
6598 -# ---------------------------
6599 -# implement the --enable-static flag
6600 -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
6601 -AC_DEFUN([AC_ENABLE_STATIC],
6602 -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
6603 -AC_ARG_ENABLE([static],
6604 - [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
6605 - [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
6606 - [p=${PACKAGE-default}
6607 - case $enableval in
6608 - yes) enable_static=yes ;;
6609 - no) enable_static=no ;;
6610 - *)
6611 - enable_static=no
6612 - # Look at the argument we got. We use all the common list separators.
6613 - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
6614 - for pkg in $enableval; do
6615 - IFS="$lt_save_ifs"
6616 - if test "X$pkg" = "X$p"; then
6617 - enable_static=yes
6618 - fi
6619 - done
6620 - IFS="$lt_save_ifs"
6621 - ;;
6622 - esac],
6623 - [enable_static=]AC_ENABLE_STATIC_DEFAULT)
6624 -])# AC_ENABLE_STATIC
6625 +# Source file extension for C++ test sources.
6626 +ac_ext=cpp
6627
6628 +# Object file extension for compiled C++ test sources.
6629 +objext=o
6630 +_LT_AC_TAGVAR(objext, $1)=$objext
6631
6632 -# AC_DISABLE_STATIC
6633 -# -----------------
6634 -# set the default static flag to --disable-static
6635 -AC_DEFUN([AC_DISABLE_STATIC],
6636 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
6637 -AC_ENABLE_STATIC(no)
6638 -])# AC_DISABLE_STATIC
6639 +# Code to be used in simple compile tests
6640 +lt_simple_compile_test_code="int some_variable = 0;"
6641
6642 +# Code to be used in simple link tests
6643 +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
6644
6645 -# AC_ENABLE_FAST_INSTALL([DEFAULT])
6646 -# ---------------------------------
6647 -# implement the --enable-fast-install flag
6648 -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
6649 -AC_DEFUN([AC_ENABLE_FAST_INSTALL],
6650 -[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
6651 -AC_ARG_ENABLE([fast-install],
6652 - [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
6653 - [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
6654 - [p=${PACKAGE-default}
6655 - case $enableval in
6656 - yes) enable_fast_install=yes ;;
6657 - no) enable_fast_install=no ;;
6658 - *)
6659 - enable_fast_install=no
6660 - # Look at the argument we got. We use all the common list separators.
6661 - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
6662 - for pkg in $enableval; do
6663 - IFS="$lt_save_ifs"
6664 - if test "X$pkg" = "X$p"; then
6665 - enable_fast_install=yes
6666 - fi
6667 - done
6668 - IFS="$lt_save_ifs"
6669 - ;;
6670 - esac],
6671 - [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
6672 -])# AC_ENABLE_FAST_INSTALL
6673 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
6674 +_LT_AC_SYS_COMPILER
6675
6676 +# save warnings/boilerplate of simple test code
6677 +_LT_COMPILER_BOILERPLATE
6678 +_LT_LINKER_BOILERPLATE
6679
6680 -# AC_DISABLE_FAST_INSTALL
6681 -# -----------------------
6682 -# set the default to --disable-fast-install
6683 -AC_DEFUN([AC_DISABLE_FAST_INSTALL],
6684 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
6685 -AC_ENABLE_FAST_INSTALL(no)
6686 -])# AC_DISABLE_FAST_INSTALL
6687 +# Allow CC to be a program name with arguments.
6688 +lt_save_CC=$CC
6689 +lt_save_LD=$LD
6690 +lt_save_GCC=$GCC
6691 +GCC=$GXX
6692 +lt_save_with_gnu_ld=$with_gnu_ld
6693 +lt_save_path_LD=$lt_cv_path_LD
6694 +if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
6695 + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
6696 +else
6697 + $as_unset lt_cv_prog_gnu_ld
6698 +fi
6699 +if test -n "${lt_cv_path_LDCXX+set}"; then
6700 + lt_cv_path_LD=$lt_cv_path_LDCXX
6701 +else
6702 + $as_unset lt_cv_path_LD
6703 +fi
6704 +test -z "${LDCXX+set}" || LD=$LDCXX
6705 +CC=${CXX-"c++"}
6706 +compiler=$CC
6707 +_LT_AC_TAGVAR(compiler, $1)=$CC
6708 +_LT_CC_BASENAME([$compiler])
6709
6710 +# We don't want -fno-exception wen compiling C++ code, so set the
6711 +# no_builtin_flag separately
6712 +if test "$GXX" = yes; then
6713 + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
6714 +else
6715 + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
6716 +fi
6717
6718 -# AC_LIBTOOL_PICMODE([MODE])
6719 -# --------------------------
6720 -# implement the --with-pic flag
6721 -# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
6722 -AC_DEFUN([AC_LIBTOOL_PICMODE],
6723 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
6724 -pic_mode=ifelse($#,1,$1,default)
6725 -])# AC_LIBTOOL_PICMODE
6726 +if test "$GXX" = yes; then
6727 + # Set up default GNU C++ configuration
6728
6729 + AC_PROG_LD
6730
6731 -# AC_PROG_EGREP
6732 -# -------------
6733 -# This is predefined starting with Autoconf 2.54, so this conditional
6734 -# definition can be removed once we require Autoconf 2.54 or later.
6735 -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
6736 -[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
6737 - [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
6738 - then ac_cv_prog_egrep='grep -E'
6739 - else ac_cv_prog_egrep='egrep'
6740 - fi])
6741 - EGREP=$ac_cv_prog_egrep
6742 - AC_SUBST([EGREP])
6743 -])])
6744 + # Check if GNU C++ uses GNU ld as the underlying linker, since the
6745 + # archiving commands below assume that GNU ld is being used.
6746 + if test "$with_gnu_ld" = yes; then
6747 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
6748 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
6749
6750 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
6751 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
6752
6753 -# AC_PATH_TOOL_PREFIX
6754 -# -------------------
6755 -# find a file program which can recognise shared library
6756 -AC_DEFUN([AC_PATH_TOOL_PREFIX],
6757 -[AC_REQUIRE([AC_PROG_EGREP])dnl
6758 -AC_MSG_CHECKING([for $1])
6759 -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
6760 -[case $MAGIC_CMD in
6761 -[[\\/*] | ?:[\\/]*])
6762 - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
6763 - ;;
6764 -*)
6765 - lt_save_MAGIC_CMD="$MAGIC_CMD"
6766 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
6767 -dnl $ac_dummy forces splitting on constant user-supplied paths.
6768 -dnl POSIX.2 word splitting is done only on the output of word expansions,
6769 -dnl not every word. This closes a longstanding sh security hole.
6770 - ac_dummy="ifelse([$2], , $PATH, [$2])"
6771 - for ac_dir in $ac_dummy; do
6772 - IFS="$lt_save_ifs"
6773 - test -z "$ac_dir" && ac_dir=.
6774 - if test -f $ac_dir/$1; then
6775 - lt_cv_path_MAGIC_CMD="$ac_dir/$1"
6776 - if test -n "$file_magic_test_file"; then
6777 - case $deplibs_check_method in
6778 - "file_magic "*)
6779 - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
6780 - MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
6781 - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
6782 - $EGREP "$file_magic_regex" > /dev/null; then
6783 - :
6784 - else
6785 - cat <<EOF 1>&2
6786 -
6787 -*** Warning: the command libtool uses to detect shared libraries,
6788 -*** $file_magic_cmd, produces output that libtool cannot recognize.
6789 -*** The result is that libtool may fail to recognize shared libraries
6790 -*** as such. This will affect the creation of libtool libraries that
6791 -*** depend on shared libraries, but programs linked with such libtool
6792 -*** libraries will work regardless of this problem. Nevertheless, you
6793 -*** may want to report the problem to your system manager and/or to
6794 -*** bug-libtool@gnu.org
6795 + # If archive_cmds runs LD, not CC, wlarc should be empty
6796 + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
6797 + # investigate it a little bit more. (MM)
6798 + wlarc='${wl}'
6799
6800 -EOF
6801 - fi ;;
6802 - esac
6803 - fi
6804 - break
6805 + # ancient GNU ld didn't support --whole-archive et. al.
6806 + if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
6807 + grep 'no-whole-archive' > /dev/null; then
6808 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
6809 + else
6810 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
6811 fi
6812 - done
6813 - IFS="$lt_save_ifs"
6814 - MAGIC_CMD="$lt_save_MAGIC_CMD"
6815 - ;;
6816 -esac])
6817 -MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
6818 -if test -n "$MAGIC_CMD"; then
6819 - AC_MSG_RESULT($MAGIC_CMD)
6820 -else
6821 - AC_MSG_RESULT(no)
6822 -fi
6823 -])# AC_PATH_TOOL_PREFIX
6824 -
6825 -
6826 -# AC_PATH_MAGIC
6827 -# -------------
6828 -# find a file program which can recognise a shared library
6829 -AC_DEFUN([AC_PATH_MAGIC],
6830 -[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
6831 -if test -z "$lt_cv_path_MAGIC_CMD"; then
6832 - if test -n "$ac_tool_prefix"; then
6833 - AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
6834 else
6835 - MAGIC_CMD=:
6836 + with_gnu_ld=no
6837 + wlarc=
6838 +
6839 + # A generic and very simple default shared library creation
6840 + # command for GNU C++ for the case where it uses the native
6841 + # linker, instead of GNU ld. If possible, this setting should
6842 + # overridden to take advantage of the native linker features on
6843 + # the platform it is being used on.
6844 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
6845 fi
6846 -fi
6847 -])# AC_PATH_MAGIC
6848
6849 + # Commands to make compiler produce verbose output that lists
6850 + # what "hidden" libraries, object files and flags are used when
6851 + # linking a shared library.
6852 + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
6853
6854 -# AC_PROG_LD
6855 -# ----------
6856 -# find the pathname to the GNU or non-GNU linker
6857 -AC_DEFUN([AC_PROG_LD],
6858 -[AC_ARG_WITH([gnu-ld],
6859 - [AC_HELP_STRING([--with-gnu-ld],
6860 - [assume the C compiler uses GNU ld @<:@default=no@:>@])],
6861 - [test "$withval" = no || with_gnu_ld=yes],
6862 - [with_gnu_ld=no])
6863 -AC_REQUIRE([LT_AC_PROG_SED])dnl
6864 -AC_REQUIRE([AC_PROG_CC])dnl
6865 -AC_REQUIRE([AC_CANONICAL_HOST])dnl
6866 -AC_REQUIRE([AC_CANONICAL_BUILD])dnl
6867 -ac_prog=ld
6868 -if test "$GCC" = yes; then
6869 - # Check if gcc -print-prog-name=ld gives a path.
6870 - AC_MSG_CHECKING([for ld used by $CC])
6871 - case $host in
6872 - *-*-mingw*)
6873 - # gcc leaves a trailing carriage return which upsets mingw
6874 - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
6875 - *)
6876 - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
6877 - esac
6878 - case $ac_prog in
6879 - # Accept absolute paths.
6880 - [[\\/]]* | ?:[[\\/]]*)
6881 - re_direlt='/[[^/]][[^/]]*/\.\./'
6882 - # Canonicalize the pathname of ld
6883 - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
6884 - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
6885 - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
6886 - done
6887 - test -z "$LD" && LD="$ac_prog"
6888 - ;;
6889 - "")
6890 - # If it fails, then pretend we aren't using GCC.
6891 - ac_prog=ld
6892 - ;;
6893 - *)
6894 - # If it is relative, then search for the first ld in PATH.
6895 - with_gnu_ld=unknown
6896 - ;;
6897 - esac
6898 -elif test "$with_gnu_ld" = yes; then
6899 - AC_MSG_CHECKING([for GNU ld])
6900 -else
6901 - AC_MSG_CHECKING([for non-GNU ld])
6902 -fi
6903 -AC_CACHE_VAL(lt_cv_path_LD,
6904 -[if test -z "$LD"; then
6905 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
6906 - for ac_dir in $PATH; do
6907 - IFS="$lt_save_ifs"
6908 - test -z "$ac_dir" && ac_dir=.
6909 - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
6910 - lt_cv_path_LD="$ac_dir/$ac_prog"
6911 - # Check to see if the program is GNU ld. I'd rather use --version,
6912 - # but apparently some variants of GNU ld only accept -v.
6913 - # Break only if it was the GNU/non-GNU ld that we prefer.
6914 - case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
6915 - *GNU* | *'with BFD'*)
6916 - test "$with_gnu_ld" != no && break
6917 - ;;
6918 - *)
6919 - test "$with_gnu_ld" != yes && break
6920 - ;;
6921 - esac
6922 - fi
6923 - done
6924 - IFS="$lt_save_ifs"
6925 else
6926 - lt_cv_path_LD="$LD" # Let the user override the test with a path.
6927 -fi])
6928 -LD="$lt_cv_path_LD"
6929 -if test -n "$LD"; then
6930 - AC_MSG_RESULT($LD)
6931 -else
6932 - AC_MSG_RESULT(no)
6933 + GXX=no
6934 + with_gnu_ld=no
6935 + wlarc=
6936 fi
6937 -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
6938 -AC_PROG_LD_GNU
6939 -])# AC_PROG_LD
6940 -
6941 -
6942 -# AC_PROG_LD_GNU
6943 -# --------------
6944 -AC_DEFUN([AC_PROG_LD_GNU],
6945 -[AC_REQUIRE([AC_PROG_EGREP])dnl
6946 -AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
6947 -[# I'd rather use --version here, but apparently some GNU lds only accept -v.
6948 -case `$LD -v 2>&1 </dev/null` in
6949 -*GNU* | *'with BFD'*)
6950 - lt_cv_prog_gnu_ld=yes
6951 - ;;
6952 -*)
6953 - lt_cv_prog_gnu_ld=no
6954 - ;;
6955 -esac])
6956 -with_gnu_ld=$lt_cv_prog_gnu_ld
6957 -])# AC_PROG_LD_GNU
6958 -
6959
6960 -# AC_PROG_LD_RELOAD_FLAG
6961 -# ----------------------
6962 -# find reload flag for linker
6963 -# -- PORTME Some linkers may need a different reload flag.
6964 -AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
6965 -[AC_CACHE_CHECK([for $LD option to reload object files],
6966 - lt_cv_ld_reload_flag,
6967 - [lt_cv_ld_reload_flag='-r'])
6968 -reload_flag=$lt_cv_ld_reload_flag
6969 -case $reload_flag in
6970 -"" | " "*) ;;
6971 -*) reload_flag=" $reload_flag" ;;
6972 -esac
6973 -reload_cmds='$LD$reload_flag -o $output$reload_objs'
6974 +# PORTME: fill in a description of your system's C++ link characteristics
6975 +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
6976 +_LT_AC_TAGVAR(ld_shlibs, $1)=yes
6977 case $host_os in
6978 - darwin*)
6979 - if test "$GCC" = yes; then
6980 - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
6981 + aix3*)
6982 + # FIXME: insert proper C++ library support
6983 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
6984 + ;;
6985 + aix4* | aix5*)
6986 + if test "$host_cpu" = ia64; then
6987 + # On IA64, the linker does run time linking by default, so we don't
6988 + # have to do anything special.
6989 + aix_use_runtimelinking=no
6990 + exp_sym_flag='-Bexport'
6991 + no_entry_flag=""
6992 else
6993 - reload_cmds='$LD$reload_flag -o $output$reload_objs'
6994 + aix_use_runtimelinking=no
6995 +
6996 + # Test if we are trying to use run time linking or normal
6997 + # AIX style linking. If -brtl is somewhere in LDFLAGS, we
6998 + # need to do runtime linking.
6999 + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
7000 + for ld_flag in $LDFLAGS; do
7001 + case $ld_flag in
7002 + *-brtl*)
7003 + aix_use_runtimelinking=yes
7004 + break
7005 + ;;
7006 + esac
7007 + done
7008 + ;;
7009 + esac
7010 +
7011 + exp_sym_flag='-bexport'
7012 + no_entry_flag='-bnoentry'
7013 fi
7014 - ;;
7015 -esac
7016 -])# AC_PROG_LD_RELOAD_FLAG
7017
7018 + # When large executables or shared objects are built, AIX ld can
7019 + # have problems creating the table of contents. If linking a library
7020 + # or program results in "error TOC overflow" add -mminimal-toc to
7021 + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
7022 + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
7023
7024 -# AC_DEPLIBS_CHECK_METHOD
7025 -# -----------------------
7026 -# how to check for library dependencies
7027 -# -- PORTME fill in with the dynamic library characteristics
7028 -AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
7029 -[AC_CACHE_CHECK([how to recognise dependent libraries],
7030 -lt_cv_deplibs_check_method,
7031 -[lt_cv_file_magic_cmd='$MAGIC_CMD'
7032 -lt_cv_file_magic_test_file=
7033 -lt_cv_deplibs_check_method='unknown'
7034 -# Need to set the preceding variable on all platforms that support
7035 -# interlibrary dependencies.
7036 -# 'none' -- dependencies not supported.
7037 -# `unknown' -- same as none, but documents that we really don't know.
7038 -# 'pass_all' -- all dependencies passed with no checks.
7039 -# 'test_compile' -- check by making test program.
7040 -# 'file_magic [[regex]]' -- check by looking for files in library path
7041 -# which responds to the $file_magic_cmd with a given extended regex.
7042 -# If you have `file' or equivalent on your system and you're not sure
7043 -# whether `pass_all' will *always* work, you probably want this one.
7044 + _LT_AC_TAGVAR(archive_cmds, $1)=''
7045 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7046 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
7047 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
7048
7049 -case $host_os in
7050 -aix4* | aix5*)
7051 - lt_cv_deplibs_check_method=pass_all
7052 - ;;
7053 + if test "$GXX" = yes; then
7054 + case $host_os in aix4.[[012]]|aix4.[[012]].*)
7055 + # We only want to do this on AIX 4.2 and lower, the check
7056 + # below for broken collect2 doesn't work under 4.3+
7057 + collect2name=`${CC} -print-prog-name=collect2`
7058 + if test -f "$collect2name" && \
7059 + strings "$collect2name" | grep resolve_lib_name >/dev/null
7060 + then
7061 + # We have reworked collect2
7062 + :
7063 + else
7064 + # We have old collect2
7065 + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
7066 + # It fails to find uninstalled libraries when the uninstalled
7067 + # path is not listed in the libpath. Setting hardcode_minus_L
7068 + # to unsupported forces relinking
7069 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
7070 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
7071 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
7072 + fi
7073 + ;;
7074 + esac
7075 + shared_flag='-shared'
7076 + if test "$aix_use_runtimelinking" = yes; then
7077 + shared_flag="$shared_flag "'${wl}-G'
7078 + fi
7079 + else
7080 + # not using gcc
7081 + if test "$host_cpu" = ia64; then
7082 + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
7083 + # chokes on -Wl,-G. The following line is correct:
7084 + shared_flag='-G'
7085 + else
7086 + if test "$aix_use_runtimelinking" = yes; then
7087 + shared_flag='${wl}-G'
7088 + else
7089 + shared_flag='${wl}-bM:SRE'
7090 + fi
7091 + fi
7092 + fi
7093
7094 -beos*)
7095 - lt_cv_deplibs_check_method=pass_all
7096 - ;;
7097 + # It seems that -bexpall does not export symbols beginning with
7098 + # underscore (_), so it is better to generate a list of symbols to export.
7099 + _LT_AC_TAGVAR(always_export_symbols, $1)=yes
7100 + if test "$aix_use_runtimelinking" = yes; then
7101 + # Warning - without using the other runtime loading flags (-brtl),
7102 + # -berok will link without error, but may produce a broken library.
7103 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
7104 + # Determine the default libpath from the value encoded in an empty executable.
7105 + _LT_AC_SYS_LIBPATH_AIX
7106 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
7107
7108 -bsdi[[45]]*)
7109 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
7110 - lt_cv_file_magic_cmd='/usr/bin/file -L'
7111 - lt_cv_file_magic_test_file=/shlib/libc.so
7112 - ;;
7113 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
7114 + else
7115 + if test "$host_cpu" = ia64; then
7116 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
7117 + _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
7118 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
7119 + else
7120 + # Determine the default libpath from the value encoded in an empty executable.
7121 + _LT_AC_SYS_LIBPATH_AIX
7122 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
7123 + # Warning - without using the other run time loading flags,
7124 + # -berok will link without error, but may produce a broken library.
7125 + _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
7126 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
7127 + # Exported symbols can be pulled into shared objects from archives
7128 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
7129 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
7130 + # This is similar to how AIX traditionally builds its shared libraries.
7131 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
7132 + fi
7133 + fi
7134 + ;;
7135
7136 -cygwin*)
7137 - # func_win32_libid is a shell function defined in ltmain.sh
7138 - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
7139 - lt_cv_file_magic_cmd='func_win32_libid'
7140 - ;;
7141 + beos*)
7142 + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
7143 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
7144 + # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
7145 + # support --undefined. This deserves some investigation. FIXME
7146 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
7147 + else
7148 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7149 + fi
7150 + ;;
7151
7152 -mingw* | pw32*)
7153 - # Base MSYS/MinGW do not provide the 'file' command needed by
7154 - # func_win32_libid shell function, so use a weaker test based on 'objdump'.
7155 - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
7156 - lt_cv_file_magic_cmd='$OBJDUMP -f'
7157 - ;;
7158 + chorus*)
7159 + case $cc_basename in
7160 + *)
7161 + # FIXME: insert proper C++ library support
7162 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7163 + ;;
7164 + esac
7165 + ;;
7166
7167 -darwin* | rhapsody*)
7168 - lt_cv_deplibs_check_method=pass_all
7169 - ;;
7170 + cygwin* | mingw* | pw32*)
7171 + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
7172 + # as there is no search path for DLLs.
7173 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
7174 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
7175 + _LT_AC_TAGVAR(always_export_symbols, $1)=no
7176 + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
7177
7178 -freebsd* | kfreebsd*-gnu | dragonfly*)
7179 - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
7180 - case $host_cpu in
7181 - i*86 )
7182 - # Not sure whether the presence of OpenBSD here was a mistake.
7183 - # Let's accept both of them until this is cleared up.
7184 - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
7185 - lt_cv_file_magic_cmd=/usr/bin/file
7186 - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
7187 - ;;
7188 - esac
7189 - else
7190 - lt_cv_deplibs_check_method=pass_all
7191 - fi
7192 + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
7193 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
7194 + # If the export-symbols file already is a .def file (1st line
7195 + # is EXPORTS), use it as is; otherwise, prepend...
7196 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
7197 + cp $export_symbols $output_objdir/$soname.def;
7198 + else
7199 + echo EXPORTS > $output_objdir/$soname.def;
7200 + cat $export_symbols >> $output_objdir/$soname.def;
7201 + fi~
7202 + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
7203 + else
7204 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7205 + fi
7206 ;;
7207 + darwin* | rhapsody*)
7208 + case $host_os in
7209 + rhapsody* | darwin1.[[012]])
7210 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
7211 + ;;
7212 + *) # Darwin 1.3 on
7213 + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
7214 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
7215 + else
7216 + case ${MACOSX_DEPLOYMENT_TARGET} in
7217 + 10.[[012]])
7218 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
7219 + ;;
7220 + 10.*)
7221 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
7222 + ;;
7223 + esac
7224 + fi
7225 + ;;
7226 + esac
7227 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
7228 + _LT_AC_TAGVAR(hardcode_direct, $1)=no
7229 + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
7230 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
7231 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
7232 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
7233
7234 -gnu*)
7235 - lt_cv_deplibs_check_method=pass_all
7236 - ;;
7237 + if test "$GXX" = yes ; then
7238 + lt_int_apple_cc_single_mod=no
7239 + output_verbose_link_cmd='echo'
7240 + if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
7241 + lt_int_apple_cc_single_mod=yes
7242 + fi
7243 + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
7244 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
7245 + else
7246 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
7247 + fi
7248 + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
7249 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
7250 + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
7251 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
7252 + else
7253 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
7254 + fi
7255 + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
7256 + else
7257 + case $cc_basename in
7258 + xlc*)
7259 + output_verbose_link_cmd='echo'
7260 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
7261 + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
7262 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
7263 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
7264 + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
7265 + ;;
7266 + *)
7267 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7268 + ;;
7269 + esac
7270 + fi
7271 + ;;
7272
7273 -hpux10.20* | hpux11*)
7274 - lt_cv_file_magic_cmd=/usr/bin/file
7275 - case $host_cpu in
7276 - ia64*)
7277 - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
7278 - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
7279 + dgux*)
7280 + case $cc_basename in
7281 + ec++*)
7282 + # FIXME: insert proper C++ library support
7283 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7284 + ;;
7285 + ghcx*)
7286 + # Green Hills C++ Compiler
7287 + # FIXME: insert proper C++ library support
7288 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7289 + ;;
7290 + *)
7291 + # FIXME: insert proper C++ library support
7292 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7293 + ;;
7294 + esac
7295 ;;
7296 - hppa*64*)
7297 - [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]']
7298 - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
7299 + freebsd[[12]]*)
7300 + # C++ shared libraries reported to be fairly broken before switch to ELF
7301 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7302 ;;
7303 - *)
7304 - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
7305 - lt_cv_file_magic_test_file=/usr/lib/libc.sl
7306 - ;;
7307 - esac
7308 - ;;
7309 -
7310 -interix3*)
7311 - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
7312 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
7313 - ;;
7314 -
7315 -irix5* | irix6* | nonstopux*)
7316 - case $LD in
7317 - *-32|*"-32 ") libmagic=32-bit;;
7318 - *-n32|*"-n32 ") libmagic=N32;;
7319 - *-64|*"-64 ") libmagic=64-bit;;
7320 - *) libmagic=never-match;;
7321 - esac
7322 - lt_cv_deplibs_check_method=pass_all
7323 - ;;
7324 -
7325 -# This must be Linux ELF.
7326 -linux*)
7327 - lt_cv_deplibs_check_method=pass_all
7328 - ;;
7329 -
7330 -netbsd*)
7331 - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
7332 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
7333 - else
7334 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
7335 - fi
7336 - ;;
7337 -
7338 -newos6*)
7339 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
7340 - lt_cv_file_magic_cmd=/usr/bin/file
7341 - lt_cv_file_magic_test_file=/usr/lib/libnls.so
7342 - ;;
7343 -
7344 -nto-qnx*)
7345 - lt_cv_deplibs_check_method=unknown
7346 - ;;
7347 -
7348 -openbsd*)
7349 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
7350 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
7351 - else
7352 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
7353 - fi
7354 - ;;
7355 -
7356 -osf3* | osf4* | osf5*)
7357 - lt_cv_deplibs_check_method=pass_all
7358 - ;;
7359 -
7360 -solaris*)
7361 - lt_cv_deplibs_check_method=pass_all
7362 - ;;
7363 -
7364 -sysv4 | sysv4.3*)
7365 - case $host_vendor in
7366 - motorola)
7367 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
7368 - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
7369 - ;;
7370 - ncr)
7371 - lt_cv_deplibs_check_method=pass_all
7372 - ;;
7373 - sequent)
7374 - lt_cv_file_magic_cmd='/bin/file'
7375 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
7376 - ;;
7377 - sni)
7378 - lt_cv_file_magic_cmd='/bin/file'
7379 - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
7380 - lt_cv_file_magic_test_file=/lib/libc.so
7381 + freebsd-elf*)
7382 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
7383 ;;
7384 - siemens)
7385 - lt_cv_deplibs_check_method=pass_all
7386 + freebsd* | dragonfly*)
7387 + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
7388 + # conventions
7389 + _LT_AC_TAGVAR(ld_shlibs, $1)=yes
7390 ;;
7391 - pc)
7392 - lt_cv_deplibs_check_method=pass_all
7393 + gnu*)
7394 ;;
7395 - esac
7396 - ;;
7397 + hpux9*)
7398 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
7399 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
7400 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
7401 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7402 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
7403 + # but as the default
7404 + # location of the library.
7405
7406 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
7407 - lt_cv_deplibs_check_method=pass_all
7408 - ;;
7409 -esac
7410 -])
7411 -file_magic_cmd=$lt_cv_file_magic_cmd
7412 -deplibs_check_method=$lt_cv_deplibs_check_method
7413 -test -z "$deplibs_check_method" && deplibs_check_method=unknown
7414 -])# AC_DEPLIBS_CHECK_METHOD
7415 + case $cc_basename in
7416 + CC*)
7417 + # FIXME: insert proper C++ library support
7418 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7419 + ;;
7420 + aCC*)
7421 + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
7422 + # Commands to make compiler produce verbose output that lists
7423 + # what "hidden" libraries, object files and flags are used when
7424 + # linking a shared library.
7425 + #
7426 + # There doesn't appear to be a way to prevent this compiler from
7427 + # explicitly linking system object files so we need to strip them
7428 + # from the output so that they don't get included in the library
7429 + # dependencies.
7430 + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
7431 + ;;
7432 + *)
7433 + if test "$GXX" = yes; then
7434 + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
7435 + else
7436 + # FIXME: insert proper C++ library support
7437 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7438 + fi
7439 + ;;
7440 + esac
7441 + ;;
7442 + hpux10*|hpux11*)
7443 + if test $with_gnu_ld = no; then
7444 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
7445 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
7446
7447 + case $host_cpu in
7448 + hppa*64*|ia64*) ;;
7449 + *)
7450 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
7451 + ;;
7452 + esac
7453 + fi
7454 + case $host_cpu in
7455 + hppa*64*|ia64*)
7456 + _LT_AC_TAGVAR(hardcode_direct, $1)=no
7457 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7458 + ;;
7459 + *)
7460 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7461 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
7462 + # but as the default
7463 + # location of the library.
7464 + ;;
7465 + esac
7466
7467 -# AC_PROG_NM
7468 -# ----------
7469 -# find the pathname to a BSD-compatible name lister
7470 -AC_DEFUN([AC_PROG_NM],
7471 -[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
7472 -[if test -n "$NM"; then
7473 - # Let the user override the test.
7474 - lt_cv_path_NM="$NM"
7475 -else
7476 - lt_nm_to_check="${ac_tool_prefix}nm"
7477 - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
7478 - lt_nm_to_check="$lt_nm_to_check nm"
7479 - fi
7480 - for lt_tmp_nm in $lt_nm_to_check; do
7481 - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
7482 - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
7483 - IFS="$lt_save_ifs"
7484 - test -z "$ac_dir" && ac_dir=.
7485 - tmp_nm="$ac_dir/$lt_tmp_nm"
7486 - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
7487 - # Check to see if the nm accepts a BSD-compat flag.
7488 - # Adding the `sed 1q' prevents false positives on HP-UX, which says:
7489 - # nm: unknown option "B" ignored
7490 - # Tru64's nm complains that /dev/null is an invalid object file
7491 - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
7492 - */dev/null* | *'Invalid file or object type'*)
7493 - lt_cv_path_NM="$tmp_nm -B"
7494 - break
7495 + case $cc_basename in
7496 + CC*)
7497 + # FIXME: insert proper C++ library support
7498 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7499 + ;;
7500 + aCC*)
7501 + case $host_cpu in
7502 + hppa*64*)
7503 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7504 + ;;
7505 + ia64*)
7506 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7507 ;;
7508 *)
7509 - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
7510 - */dev/null*)
7511 - lt_cv_path_NM="$tmp_nm -p"
7512 - break
7513 - ;;
7514 - *)
7515 - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
7516 - continue # so that we can try to find one that supports BSD flags
7517 - ;;
7518 - esac
7519 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7520 ;;
7521 esac
7522 - fi
7523 - done
7524 - IFS="$lt_save_ifs"
7525 - done
7526 - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
7527 -fi])
7528 -NM="$lt_cv_path_NM"
7529 -])# AC_PROG_NM
7530 -
7531 -
7532 -# AC_CHECK_LIBM
7533 -# -------------
7534 -# check for math library
7535 -AC_DEFUN([AC_CHECK_LIBM],
7536 -[AC_REQUIRE([AC_CANONICAL_HOST])dnl
7537 -LIBM=
7538 -case $host in
7539 -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
7540 - # These system don't have libm, or don't need it
7541 - ;;
7542 -*-ncr-sysv4.3*)
7543 - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
7544 - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
7545 - ;;
7546 -*)
7547 - AC_CHECK_LIB(m, cos, LIBM="-lm")
7548 - ;;
7549 -esac
7550 -])# AC_CHECK_LIBM
7551 -
7552 -
7553 -# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
7554 -# -----------------------------------
7555 -# sets LIBLTDL to the link flags for the libltdl convenience library and
7556 -# LTDLINCL to the include flags for the libltdl header and adds
7557 -# --enable-ltdl-convenience to the configure arguments. Note that
7558 -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
7559 -# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
7560 -# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
7561 -# (note the single quotes!). If your package is not flat and you're not
7562 -# using automake, define top_builddir and top_srcdir appropriately in
7563 -# the Makefiles.
7564 -AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
7565 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
7566 - case $enable_ltdl_convenience in
7567 - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
7568 - "") enable_ltdl_convenience=yes
7569 - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
7570 - esac
7571 - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
7572 - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
7573 - # For backwards non-gettext consistent compatibility...
7574 - INCLTDL="$LTDLINCL"
7575 -])# AC_LIBLTDL_CONVENIENCE
7576 -
7577 -
7578 -# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
7579 -# -----------------------------------
7580 -# sets LIBLTDL to the link flags for the libltdl installable library and
7581 -# LTDLINCL to the include flags for the libltdl header and adds
7582 -# --enable-ltdl-install to the configure arguments. Note that
7583 -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
7584 -# and an installed libltdl is not found, it is assumed to be `libltdl'.
7585 -# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
7586 -# '${top_srcdir}/' (note the single quotes!). If your package is not
7587 -# flat and you're not using automake, define top_builddir and top_srcdir
7588 -# appropriately in the Makefiles.
7589 -# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
7590 -AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
7591 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
7592 - AC_CHECK_LIB(ltdl, lt_dlinit,
7593 - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
7594 - [if test x"$enable_ltdl_install" = xno; then
7595 - AC_MSG_WARN([libltdl not installed, but installation disabled])
7596 - else
7597 - enable_ltdl_install=yes
7598 - fi
7599 - ])
7600 - if test x"$enable_ltdl_install" = x"yes"; then
7601 - ac_configure_args="$ac_configure_args --enable-ltdl-install"
7602 - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
7603 - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
7604 - else
7605 - ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
7606 - LIBLTDL="-lltdl"
7607 - LTDLINCL=
7608 - fi
7609 - # For backwards non-gettext consistent compatibility...
7610 - INCLTDL="$LTDLINCL"
7611 -])# AC_LIBLTDL_INSTALLABLE
7612 -
7613 -
7614 -# AC_LIBTOOL_CXX
7615 -# --------------
7616 -# enable support for C++ libraries
7617 -AC_DEFUN([AC_LIBTOOL_CXX],
7618 -[AC_REQUIRE([_LT_AC_LANG_CXX])
7619 -])# AC_LIBTOOL_CXX
7620 -
7621 -
7622 -# _LT_AC_LANG_CXX
7623 -# ---------------
7624 -AC_DEFUN([_LT_AC_LANG_CXX],
7625 -[AC_REQUIRE([AC_PROG_CXX])
7626 -AC_REQUIRE([_LT_AC_PROG_CXXCPP])
7627 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
7628 -])# _LT_AC_LANG_CXX
7629 -
7630 -# _LT_AC_PROG_CXXCPP
7631 -# ------------------
7632 -AC_DEFUN([_LT_AC_PROG_CXXCPP],
7633 -[
7634 -AC_REQUIRE([AC_PROG_CXX])
7635 -if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
7636 - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
7637 - (test "X$CXX" != "Xg++"))) ; then
7638 - AC_PROG_CXXCPP
7639 -fi
7640 -])# _LT_AC_PROG_CXXCPP
7641 -
7642 -# AC_LIBTOOL_F77
7643 -# --------------
7644 -# enable support for Fortran 77 libraries
7645 -AC_DEFUN([AC_LIBTOOL_F77],
7646 -[AC_REQUIRE([_LT_AC_LANG_F77])
7647 -])# AC_LIBTOOL_F77
7648 -
7649 -
7650 -# _LT_AC_LANG_F77
7651 -# ---------------
7652 -AC_DEFUN([_LT_AC_LANG_F77],
7653 -[AC_REQUIRE([AC_PROG_F77])
7654 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
7655 -])# _LT_AC_LANG_F77
7656 -
7657 -
7658 -# AC_LIBTOOL_GCJ
7659 -# --------------
7660 -# enable support for GCJ libraries
7661 -AC_DEFUN([AC_LIBTOOL_GCJ],
7662 -[AC_REQUIRE([_LT_AC_LANG_GCJ])
7663 -])# AC_LIBTOOL_GCJ
7664 -
7665 -
7666 -# _LT_AC_LANG_GCJ
7667 -# ---------------
7668 -AC_DEFUN([_LT_AC_LANG_GCJ],
7669 -[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
7670 - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
7671 - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
7672 - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
7673 - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
7674 - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
7675 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
7676 -])# _LT_AC_LANG_GCJ
7677 + # Commands to make compiler produce verbose output that lists
7678 + # what "hidden" libraries, object files and flags are used when
7679 + # linking a shared library.
7680 + #
7681 + # There doesn't appear to be a way to prevent this compiler from
7682 + # explicitly linking system object files so we need to strip them
7683 + # from the output so that they don't get included in the library
7684 + # dependencies.
7685 + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
7686 + ;;
7687 + *)
7688 + if test "$GXX" = yes; then
7689 + if test $with_gnu_ld = no; then
7690 + case $host_cpu in
7691 + hppa*64*)
7692 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7693 + ;;
7694 + ia64*)
7695 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7696 + ;;
7697 + *)
7698 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7699 + ;;
7700 + esac
7701 + fi
7702 + else
7703 + # FIXME: insert proper C++ library support
7704 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7705 + fi
7706 + ;;
7707 + esac
7708 + ;;
7709 + interix[[3-9]]*)
7710 + _LT_AC_TAGVAR(hardcode_direct, $1)=no
7711 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7712 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
7713 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
7714 + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
7715 + # Instead, shared libraries are loaded at an image base (0x10000000 by
7716 + # default) and relocated if they conflict, which is a slow very memory
7717 + # consuming and fragmenting process. To avoid this, we pick a random,
7718 + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
7719 + # time. Moving up from 0x10000000 also allows more sbrk(2) space.
7720 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
7721 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
7722 + ;;
7723 + irix5* | irix6*)
7724 + case $cc_basename in
7725 + CC*)
7726 + # SGI C++
7727 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
7728
7729 + # Archives containing C++ object files must be created using
7730 + # "CC -ar", where "CC" is the IRIX C++ compiler. This is
7731 + # necessary to make sure instantiated templates are included
7732 + # in the archive.
7733 + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
7734 + ;;
7735 + *)
7736 + if test "$GXX" = yes; then
7737 + if test "$with_gnu_ld" = no; then
7738 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
7739 + else
7740 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
7741 + fi
7742 + fi
7743 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
7744 + ;;
7745 + esac
7746 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
7747 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
7748 + ;;
7749 + linux* | k*bsd*-gnu)
7750 + case $cc_basename in
7751 + KCC*)
7752 + # Kuck and Associates, Inc. (KAI) C++ Compiler
7753
7754 -# AC_LIBTOOL_RC
7755 -# -------------
7756 -# enable support for Windows resource files
7757 -AC_DEFUN([AC_LIBTOOL_RC],
7758 -[AC_REQUIRE([LT_AC_PROG_RC])
7759 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
7760 -])# AC_LIBTOOL_RC
7761 + # KCC will only create a shared library if the output file
7762 + # ends with ".so" (or ".sl" for HP-UX), so rename the library
7763 + # to its proper name (with version) after linking.
7764 + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
7765 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
7766 + # Commands to make compiler produce verbose output that lists
7767 + # what "hidden" libraries, object files and flags are used when
7768 + # linking a shared library.
7769 + #
7770 + # There doesn't appear to be a way to prevent this compiler from
7771 + # explicitly linking system object files so we need to strip them
7772 + # from the output so that they don't get included in the library
7773 + # dependencies.
7774 + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
7775
7776 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
7777 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
7778
7779 -# AC_LIBTOOL_LANG_C_CONFIG
7780 -# ------------------------
7781 -# Ensure that the configuration vars for the C compiler are
7782 -# suitably defined. Those variables are subsequently used by
7783 -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
7784 -AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
7785 -AC_DEFUN([_LT_AC_LANG_C_CONFIG],
7786 -[lt_save_CC="$CC"
7787 -AC_LANG_PUSH(C)
7788 + # Archives containing C++ object files must be created using
7789 + # "CC -Bstatic", where "CC" is the KAI C++ compiler.
7790 + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
7791 + ;;
7792 + icpc*)
7793 + # Intel C++
7794 + with_gnu_ld=yes
7795 + # version 8.0 and above of icpc choke on multiply defined symbols
7796 + # if we add $predep_objects and $postdep_objects, however 7.1 and
7797 + # earlier do not add the objects themselves.
7798 + case `$CC -V 2>&1` in
7799 + *"Version 7."*)
7800 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
7801 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
7802 + ;;
7803 + *) # Version 8.0 or newer
7804 + tmp_idyn=
7805 + case $host_cpu in
7806 + ia64*) tmp_idyn=' -i_dynamic';;
7807 + esac
7808 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
7809 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
7810 + ;;
7811 + esac
7812 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
7813 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
7814 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
7815 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
7816 + ;;
7817 + pgCC*)
7818 + # Portland Group C++ compiler
7819 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
7820 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
7821
7822 -# Source file extension for C test sources.
7823 -ac_ext=c
7824 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
7825 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
7826 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
7827 + ;;
7828 + cxx*)
7829 + # Compaq C++
7830 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
7831 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
7832
7833 -# Object file extension for compiled C test sources.
7834 -objext=o
7835 -_LT_AC_TAGVAR(objext, $1)=$objext
7836 + runpath_var=LD_RUN_PATH
7837 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
7838 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
7839
7840 -# Code to be used in simple compile tests
7841 -lt_simple_compile_test_code="int some_variable = 0;\n"
7842 -
7843 -# Code to be used in simple link tests
7844 -lt_simple_link_test_code='int main(){return(0);}\n'
7845 -
7846 -_LT_AC_SYS_COMPILER
7847 -
7848 -# save warnings/boilerplate of simple test code
7849 -_LT_COMPILER_BOILERPLATE
7850 -_LT_LINKER_BOILERPLATE
7851 -
7852 -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
7853 -AC_LIBTOOL_PROG_COMPILER_PIC($1)
7854 -AC_LIBTOOL_PROG_CC_C_O($1)
7855 -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
7856 -AC_LIBTOOL_PROG_LD_SHLIBS($1)
7857 -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
7858 -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
7859 -AC_LIBTOOL_SYS_LIB_STRIP
7860 -AC_LIBTOOL_DLOPEN_SELF
7861 + # Commands to make compiler produce verbose output that lists
7862 + # what "hidden" libraries, object files and flags are used when
7863 + # linking a shared library.
7864 + #
7865 + # There doesn't appear to be a way to prevent this compiler from
7866 + # explicitly linking system object files so we need to strip them
7867 + # from the output so that they don't get included in the library
7868 + # dependencies.
7869 + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
7870 + ;;
7871 + *)
7872 + case `$CC -V 2>&1 | sed 5q` in
7873 + *Sun\ C*)
7874 + # Sun C++ 5.9
7875 + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
7876 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
7877 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
7878 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
7879 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
7880 +
7881 + # Not sure whether something based on
7882 + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
7883 + # would be better.
7884 + output_verbose_link_cmd='echo'
7885 +
7886 + # Archives containing C++ object files must be created using
7887 + # "CC -xar", where "CC" is the Sun C++ compiler. This is
7888 + # necessary to make sure instantiated templates are included
7889 + # in the archive.
7890 + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
7891 + ;;
7892 + esac
7893 + ;;
7894 + esac
7895 + ;;
7896 + lynxos*)
7897 + # FIXME: insert proper C++ library support
7898 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7899 + ;;
7900 + m88k*)
7901 + # FIXME: insert proper C++ library support
7902 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7903 + ;;
7904 + mvs*)
7905 + case $cc_basename in
7906 + cxx*)
7907 + # FIXME: insert proper C++ library support
7908 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7909 + ;;
7910 + *)
7911 + # FIXME: insert proper C++ library support
7912 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7913 + ;;
7914 + esac
7915 + ;;
7916 + netbsd* | netbsdelf*-gnu)
7917 + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
7918 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
7919 + wlarc=
7920 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
7921 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7922 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7923 + fi
7924 + # Workaround some broken pre-1.5 toolchains
7925 + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
7926 + ;;
7927 + openbsd2*)
7928 + # C++ shared libraries are fairly broken
7929 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7930 + ;;
7931 + openbsd*)
7932 + if test -f /usr/libexec/ld.so; then
7933 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
7934 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
7935 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
7936 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
7937 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
7938 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
7939 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
7940 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
7941 + fi
7942 + output_verbose_link_cmd='echo'
7943 + else
7944 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7945 + fi
7946 + ;;
7947 + osf3*)
7948 + case $cc_basename in
7949 + KCC*)
7950 + # Kuck and Associates, Inc. (KAI) C++ Compiler
7951
7952 -# Report which library types will actually be built
7953 -AC_MSG_CHECKING([if libtool supports shared libraries])
7954 -AC_MSG_RESULT([$can_build_shared])
7955 + # KCC will only create a shared library if the output file
7956 + # ends with ".so" (or ".sl" for HP-UX), so rename the library
7957 + # to its proper name (with version) after linking.
7958 + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
7959
7960 -AC_MSG_CHECKING([whether to build shared libraries])
7961 -test "$can_build_shared" = "no" && enable_shared=no
7962 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
7963 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
7964
7965 -# On AIX, shared libraries and static libraries use the same namespace, and
7966 -# are all built from PIC.
7967 -case $host_os in
7968 -aix3*)
7969 - test "$enable_shared" = yes && enable_static=no
7970 - if test -n "$RANLIB"; then
7971 - archive_cmds="$archive_cmds~\$RANLIB \$lib"
7972 - postinstall_cmds='$RANLIB $lib'
7973 - fi
7974 - ;;
7975 + # Archives containing C++ object files must be created using
7976 + # "CC -Bstatic", where "CC" is the KAI C++ compiler.
7977 + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
7978
7979 -aix4* | aix5*)
7980 - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
7981 - test "$enable_shared" = yes && enable_static=no
7982 - fi
7983 - ;;
7984 -esac
7985 -AC_MSG_RESULT([$enable_shared])
7986 + ;;
7987 + RCC*)
7988 + # Rational C++ 2.4.1
7989 + # FIXME: insert proper C++ library support
7990 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
7991 + ;;
7992 + cxx*)
7993 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
7994 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
7995
7996 -AC_MSG_CHECKING([whether to build static libraries])
7997 -# Make sure either enable_shared or enable_static is yes.
7998 -test "$enable_shared" = yes || enable_static=yes
7999 -AC_MSG_RESULT([$enable_static])
8000 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
8001 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
8002
8003 -AC_LIBTOOL_CONFIG($1)
8004 + # Commands to make compiler produce verbose output that lists
8005 + # what "hidden" libraries, object files and flags are used when
8006 + # linking a shared library.
8007 + #
8008 + # There doesn't appear to be a way to prevent this compiler from
8009 + # explicitly linking system object files so we need to strip them
8010 + # from the output so that they don't get included in the library
8011 + # dependencies.
8012 + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
8013 + ;;
8014 + *)
8015 + if test "$GXX" = yes && test "$with_gnu_ld" = no; then
8016 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
8017 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
8018
8019 -AC_LANG_POP
8020 -CC="$lt_save_CC"
8021 -])# AC_LIBTOOL_LANG_C_CONFIG
8022 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
8023 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
8024
8025 + # Commands to make compiler produce verbose output that lists
8026 + # what "hidden" libraries, object files and flags are used when
8027 + # linking a shared library.
8028 + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
8029
8030 -# AC_LIBTOOL_LANG_CXX_CONFIG
8031 -# --------------------------
8032 -# Ensure that the configuration vars for the C compiler are
8033 -# suitably defined. Those variables are subsequently used by
8034 -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
8035 -AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
8036 -AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
8037 -[AC_LANG_PUSH(C++)
8038 -AC_REQUIRE([AC_PROG_CXX])
8039 -AC_REQUIRE([_LT_AC_PROG_CXXCPP])
8040 + else
8041 + # FIXME: insert proper C++ library support
8042 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
8043 + fi
8044 + ;;
8045 + esac
8046 + ;;
8047 + osf4* | osf5*)
8048 + case $cc_basename in
8049 + KCC*)
8050 + # Kuck and Associates, Inc. (KAI) C++ Compiler
8051
8052 -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
8053 -_LT_AC_TAGVAR(allow_undefined_flag, $1)=
8054 -_LT_AC_TAGVAR(always_export_symbols, $1)=no
8055 -_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
8056 -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
8057 -_LT_AC_TAGVAR(hardcode_direct, $1)=no
8058 -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
8059 -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
8060 -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
8061 -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
8062 -_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
8063 -_LT_AC_TAGVAR(hardcode_automatic, $1)=no
8064 -_LT_AC_TAGVAR(module_cmds, $1)=
8065 -_LT_AC_TAGVAR(module_expsym_cmds, $1)=
8066 -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
8067 -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
8068 -_LT_AC_TAGVAR(no_undefined_flag, $1)=
8069 -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
8070 -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
8071 + # KCC will only create a shared library if the output file
8072 + # ends with ".so" (or ".sl" for HP-UX), so rename the library
8073 + # to its proper name (with version) after linking.
8074 + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
8075
8076 -# Dependencies to place before and after the object being linked:
8077 -_LT_AC_TAGVAR(predep_objects, $1)=
8078 -_LT_AC_TAGVAR(postdep_objects, $1)=
8079 -_LT_AC_TAGVAR(predeps, $1)=
8080 -_LT_AC_TAGVAR(postdeps, $1)=
8081 -_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
8082 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
8083 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
8084
8085 -# Source file extension for C++ test sources.
8086 -ac_ext=cpp
8087 + # Archives containing C++ object files must be created using
8088 + # the KAI C++ compiler.
8089 + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
8090 + ;;
8091 + RCC*)
8092 + # Rational C++ 2.4.1
8093 + # FIXME: insert proper C++ library support
8094 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
8095 + ;;
8096 + cxx*)
8097 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
8098 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
8099 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
8100 + echo "-hidden">> $lib.exp~
8101 + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
8102 + $rm $lib.exp'
8103
8104 -# Object file extension for compiled C++ test sources.
8105 -objext=o
8106 -_LT_AC_TAGVAR(objext, $1)=$objext
8107 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
8108 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
8109
8110 -# Code to be used in simple compile tests
8111 -lt_simple_compile_test_code="int some_variable = 0;\n"
8112 + # Commands to make compiler produce verbose output that lists
8113 + # what "hidden" libraries, object files and flags are used when
8114 + # linking a shared library.
8115 + #
8116 + # There doesn't appear to be a way to prevent this compiler from
8117 + # explicitly linking system object files so we need to strip them
8118 + # from the output so that they don't get included in the library
8119 + # dependencies.
8120 + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
8121 + ;;
8122 + *)
8123 + if test "$GXX" = yes && test "$with_gnu_ld" = no; then
8124 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
8125 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
8126
8127 -# Code to be used in simple link tests
8128 -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
8129 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
8130 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
8131
8132 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
8133 -_LT_AC_SYS_COMPILER
8134 + # Commands to make compiler produce verbose output that lists
8135 + # what "hidden" libraries, object files and flags are used when
8136 + # linking a shared library.
8137 + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
8138
8139 -# save warnings/boilerplate of simple test code
8140 -_LT_COMPILER_BOILERPLATE
8141 -_LT_LINKER_BOILERPLATE
8142 -
8143 -# Allow CC to be a program name with arguments.
8144 -lt_save_CC=$CC
8145 -lt_save_LD=$LD
8146 -lt_save_GCC=$GCC
8147 -GCC=$GXX
8148 -lt_save_with_gnu_ld=$with_gnu_ld
8149 -lt_save_path_LD=$lt_cv_path_LD
8150 -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
8151 - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
8152 -else
8153 - $as_unset lt_cv_prog_gnu_ld
8154 -fi
8155 -if test -n "${lt_cv_path_LDCXX+set}"; then
8156 - lt_cv_path_LD=$lt_cv_path_LDCXX
8157 -else
8158 - $as_unset lt_cv_path_LD
8159 -fi
8160 -test -z "${LDCXX+set}" || LD=$LDCXX
8161 -CC=${CXX-"c++"}
8162 -compiler=$CC
8163 -_LT_AC_TAGVAR(compiler, $1)=$CC
8164 -_LT_CC_BASENAME([$compiler])
8165 -
8166 -# We don't want -fno-exception wen compiling C++ code, so set the
8167 -# no_builtin_flag separately
8168 -if test "$GXX" = yes; then
8169 - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
8170 -else
8171 - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
8172 -fi
8173 -
8174 -if test "$GXX" = yes; then
8175 - # Set up default GNU C++ configuration
8176 -
8177 - AC_PROG_LD
8178 -
8179 - # Check if GNU C++ uses GNU ld as the underlying linker, since the
8180 - # archiving commands below assume that GNU ld is being used.
8181 - if test "$with_gnu_ld" = yes; then
8182 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
8183 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8184 -
8185 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
8186 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
8187 -
8188 - # If archive_cmds runs LD, not CC, wlarc should be empty
8189 - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
8190 - # investigate it a little bit more. (MM)
8191 - wlarc='${wl}'
8192 -
8193 - # ancient GNU ld didn't support --whole-archive et. al.
8194 - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
8195 - grep 'no-whole-archive' > /dev/null; then
8196 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
8197 - else
8198 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
8199 - fi
8200 - else
8201 - with_gnu_ld=no
8202 - wlarc=
8203 -
8204 - # A generic and very simple default shared library creation
8205 - # command for GNU C++ for the case where it uses the native
8206 - # linker, instead of GNU ld. If possible, this setting should
8207 - # overridden to take advantage of the native linker features on
8208 - # the platform it is being used on.
8209 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
8210 - fi
8211 -
8212 - # Commands to make compiler produce verbose output that lists
8213 - # what "hidden" libraries, object files and flags are used when
8214 - # linking a shared library.
8215 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
8216 -
8217 -else
8218 - GXX=no
8219 - with_gnu_ld=no
8220 - wlarc=
8221 -fi
8222 -
8223 -# PORTME: fill in a description of your system's C++ link characteristics
8224 -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
8225 -_LT_AC_TAGVAR(ld_shlibs, $1)=yes
8226 -case $host_os in
8227 - aix3*)
8228 - # FIXME: insert proper C++ library support
8229 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
8230 - ;;
8231 - aix4* | aix5*)
8232 - if test "$host_cpu" = ia64; then
8233 - # On IA64, the linker does run time linking by default, so we don't
8234 - # have to do anything special.
8235 - aix_use_runtimelinking=no
8236 - exp_sym_flag='-Bexport'
8237 - no_entry_flag=""
8238 - else
8239 - aix_use_runtimelinking=no
8240 -
8241 - # Test if we are trying to use run time linking or normal
8242 - # AIX style linking. If -brtl is somewhere in LDFLAGS, we
8243 - # need to do runtime linking.
8244 - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
8245 - for ld_flag in $LDFLAGS; do
8246 - case $ld_flag in
8247 - *-brtl*)
8248 - aix_use_runtimelinking=yes
8249 - break
8250 - ;;
8251 - esac
8252 - done
8253 - ;;
8254 - esac
8255 -
8256 - exp_sym_flag='-bexport'
8257 - no_entry_flag='-bnoentry'
8258 - fi
8259 -
8260 - # When large executables or shared objects are built, AIX ld can
8261 - # have problems creating the table of contents. If linking a library
8262 - # or program results in "error TOC overflow" add -mminimal-toc to
8263 - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
8264 - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
8265 -
8266 - _LT_AC_TAGVAR(archive_cmds, $1)=''
8267 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
8268 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
8269 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
8270 -
8271 - if test "$GXX" = yes; then
8272 - case $host_os in aix4.[[012]]|aix4.[[012]].*)
8273 - # We only want to do this on AIX 4.2 and lower, the check
8274 - # below for broken collect2 doesn't work under 4.3+
8275 - collect2name=`${CC} -print-prog-name=collect2`
8276 - if test -f "$collect2name" && \
8277 - strings "$collect2name" | grep resolve_lib_name >/dev/null
8278 - then
8279 - # We have reworked collect2
8280 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
8281 else
8282 - # We have old collect2
8283 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
8284 - # It fails to find uninstalled libraries when the uninstalled
8285 - # path is not listed in the libpath. Setting hardcode_minus_L
8286 - # to unsupported forces relinking
8287 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
8288 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
8289 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
8290 + # FIXME: insert proper C++ library support
8291 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
8292 fi
8293 ;;
8294 - esac
8295 - shared_flag='-shared'
8296 - if test "$aix_use_runtimelinking" = yes; then
8297 - shared_flag="$shared_flag "'${wl}-G'
8298 - fi
8299 - else
8300 - # not using gcc
8301 - if test "$host_cpu" = ia64; then
8302 - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
8303 - # chokes on -Wl,-G. The following line is correct:
8304 - shared_flag='-G'
8305 - else
8306 - if test "$aix_use_runtimelinking" = yes; then
8307 - shared_flag='${wl}-G'
8308 - else
8309 - shared_flag='${wl}-bM:SRE'
8310 - fi
8311 - fi
8312 - fi
8313 -
8314 - # It seems that -bexpall does not export symbols beginning with
8315 - # underscore (_), so it is better to generate a list of symbols to export.
8316 - _LT_AC_TAGVAR(always_export_symbols, $1)=yes
8317 - if test "$aix_use_runtimelinking" = yes; then
8318 - # Warning - without using the other runtime loading flags (-brtl),
8319 - # -berok will link without error, but may produce a broken library.
8320 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
8321 - # Determine the default libpath from the value encoded in an empty executable.
8322 - _LT_AC_SYS_LIBPATH_AIX
8323 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
8324 -
8325 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
8326 - else
8327 - if test "$host_cpu" = ia64; then
8328 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
8329 - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
8330 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
8331 - else
8332 - # Determine the default libpath from the value encoded in an empty executable.
8333 - _LT_AC_SYS_LIBPATH_AIX
8334 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
8335 - # Warning - without using the other run time loading flags,
8336 - # -berok will link without error, but may produce a broken library.
8337 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
8338 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
8339 - # Exported symbols can be pulled into shared objects from archives
8340 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
8341 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
8342 - # This is similar to how AIX traditionally builds its shared libraries.
8343 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
8344 - fi
8345 - fi
8346 + esac
8347 ;;
8348 -
8349 - beos*)
8350 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
8351 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
8352 - # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
8353 - # support --undefined. This deserves some investigation. FIXME
8354 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8355 - else
8356 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
8357 - fi
8358 + psos*)
8359 + # FIXME: insert proper C++ library support
8360 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
8361 ;;
8362 -
8363 - chorus*)
8364 + sunos4*)
8365 case $cc_basename in
8366 + CC*)
8367 + # Sun C++ 4.x
8368 + # FIXME: insert proper C++ library support
8369 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
8370 + ;;
8371 + lcc*)
8372 + # Lucid
8373 + # FIXME: insert proper C++ library support
8374 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
8375 + ;;
8376 *)
8377 # FIXME: insert proper C++ library support
8378 _LT_AC_TAGVAR(ld_shlibs, $1)=no
8379 ;;
8380 esac
8381 ;;
8382 + solaris*)
8383 + case $cc_basename in
8384 + CC*)
8385 + # Sun C++ 4.2, 5.x and Centerline C++
8386 + _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
8387 + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
8388 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
8389 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
8390 + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
8391
8392 - cygwin* | mingw* | pw32*)
8393 - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
8394 - # as there is no search path for DLLs.
8395 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
8396 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
8397 - _LT_AC_TAGVAR(always_export_symbols, $1)=no
8398 - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
8399 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
8400 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
8401 + case $host_os in
8402 + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
8403 + *)
8404 + # The compiler driver will combine and reorder linker options,
8405 + # but understands `-z linker_flag'.
8406 + # Supported since Solaris 2.6 (maybe 2.5.1?)
8407 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
8408 + ;;
8409 + esac
8410 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
8411
8412 - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
8413 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8414 - # If the export-symbols file already is a .def file (1st line
8415 - # is EXPORTS), use it as is; otherwise, prepend...
8416 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
8417 - cp $export_symbols $output_objdir/$soname.def;
8418 - else
8419 - echo EXPORTS > $output_objdir/$soname.def;
8420 - cat $export_symbols >> $output_objdir/$soname.def;
8421 - fi~
8422 - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
8423 - else
8424 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
8425 - fi
8426 - ;;
8427 - darwin* | rhapsody*)
8428 - case $host_os in
8429 - rhapsody* | darwin1.[[012]])
8430 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
8431 - ;;
8432 - *) # Darwin 1.3 on
8433 - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
8434 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
8435 - else
8436 - case ${MACOSX_DEPLOYMENT_TARGET} in
8437 - 10.[[012]])
8438 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
8439 - ;;
8440 - 10.*)
8441 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
8442 - ;;
8443 - esac
8444 - fi
8445 - ;;
8446 - esac
8447 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
8448 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
8449 - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
8450 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
8451 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
8452 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
8453 -
8454 - if test "$GXX" = yes ; then
8455 - lt_int_apple_cc_single_mod=no
8456 - output_verbose_link_cmd='echo'
8457 - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
8458 - lt_int_apple_cc_single_mod=yes
8459 - fi
8460 - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
8461 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
8462 - else
8463 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
8464 - fi
8465 - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
8466 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
8467 - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
8468 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
8469 - else
8470 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
8471 - fi
8472 - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
8473 - else
8474 - case $cc_basename in
8475 - xlc*)
8476 - output_verbose_link_cmd='echo'
8477 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
8478 - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
8479 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
8480 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
8481 - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
8482 - ;;
8483 - *)
8484 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
8485 - ;;
8486 - esac
8487 - fi
8488 - ;;
8489 + output_verbose_link_cmd='echo'
8490
8491 - dgux*)
8492 - case $cc_basename in
8493 - ec++*)
8494 - # FIXME: insert proper C++ library support
8495 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
8496 + # Archives containing C++ object files must be created using
8497 + # "CC -xar", where "CC" is the Sun C++ compiler. This is
8498 + # necessary to make sure instantiated templates are included
8499 + # in the archive.
8500 + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
8501 ;;
8502 - ghcx*)
8503 + gcx*)
8504 # Green Hills C++ Compiler
8505 - # FIXME: insert proper C++ library support
8506 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
8507 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
8508 +
8509 + # The C++ compiler must be used to create the archive.
8510 + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
8511 ;;
8512 *)
8513 - # FIXME: insert proper C++ library support
8514 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
8515 + # GNU C++ compiler with Solaris linker
8516 + if test "$GXX" = yes && test "$with_gnu_ld" = no; then
8517 + _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
8518 + if $CC --version | grep -v '^2\.7' > /dev/null; then
8519 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
8520 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
8521 + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
8522 +
8523 + # Commands to make compiler produce verbose output that lists
8524 + # what "hidden" libraries, object files and flags are used when
8525 + # linking a shared library.
8526 + output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
8527 + else
8528 + # g++ 2.7 appears to require `-G' NOT `-shared' on this
8529 + # platform.
8530 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
8531 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
8532 + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
8533 +
8534 + # Commands to make compiler produce verbose output that lists
8535 + # what "hidden" libraries, object files and flags are used when
8536 + # linking a shared library.
8537 + output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
8538 + fi
8539 +
8540 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
8541 + case $host_os in
8542 + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
8543 + *)
8544 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
8545 + ;;
8546 + esac
8547 + fi
8548 ;;
8549 esac
8550 ;;
8551 - freebsd[[12]]*)
8552 - # C++ shared libraries reported to be fairly broken before switch to ELF
8553 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
8554 - ;;
8555 - freebsd-elf*)
8556 + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
8557 + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
8558 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
8559 - ;;
8560 - freebsd* | kfreebsd*-gnu | dragonfly*)
8561 - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
8562 - # conventions
8563 - _LT_AC_TAGVAR(ld_shlibs, $1)=yes
8564 - ;;
8565 - gnu*)
8566 - ;;
8567 - hpux9*)
8568 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
8569 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
8570 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
8571 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
8572 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
8573 - # but as the default
8574 - # location of the library.
8575 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
8576 + runpath_var='LD_RUN_PATH'
8577
8578 case $cc_basename in
8579 - CC*)
8580 - # FIXME: insert proper C++ library support
8581 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
8582 - ;;
8583 - aCC*)
8584 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
8585 - # Commands to make compiler produce verbose output that lists
8586 - # what "hidden" libraries, object files and flags are used when
8587 - # linking a shared library.
8588 - #
8589 - # There doesn't appear to be a way to prevent this compiler from
8590 - # explicitly linking system object files so we need to strip them
8591 - # from the output so that they don't get included in the library
8592 - # dependencies.
8593 - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
8594 - ;;
8595 - *)
8596 - if test "$GXX" = yes; then
8597 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
8598 - else
8599 - # FIXME: insert proper C++ library support
8600 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
8601 - fi
8602 - ;;
8603 + CC*)
8604 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
8605 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
8606 + ;;
8607 + *)
8608 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
8609 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
8610 + ;;
8611 esac
8612 ;;
8613 - hpux10*|hpux11*)
8614 - if test $with_gnu_ld = no; then
8615 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
8616 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
8617 + sysv5* | sco3.2v5* | sco5v6*)
8618 + # Note: We can NOT use -z defs as we might desire, because we do not
8619 + # link with -lc, and that would cause any symbols used from libc to
8620 + # always be unresolved, which means just about no library would
8621 + # ever link correctly. If we're not using GNU ld we use -z text
8622 + # though, which does catch some bad symbols but isn't as heavy-handed
8623 + # as -z defs.
8624 + # For security reasons, it is highly recommended that you always
8625 + # use absolute paths for naming shared libraries, and exclude the
8626 + # DT_RUNPATH tag from executables and libraries. But doing so
8627 + # requires that you compile everything twice, which is a pain.
8628 + # So that behaviour is only enabled if SCOABSPATH is set to a
8629 + # non-empty value in the environment. Most likely only useful for
8630 + # creating official distributions of packages.
8631 + # This is a hack until libtool officially supports absolute path
8632 + # names for shared libraries.
8633 + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
8634 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
8635 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
8636 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
8637 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
8638 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
8639 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
8640 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
8641 + runpath_var='LD_RUN_PATH'
8642
8643 - case $host_cpu in
8644 - hppa*64*|ia64*)
8645 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
8646 - ;;
8647 + case $cc_basename in
8648 + CC*)
8649 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
8650 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
8651 + ;;
8652 *)
8653 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
8654 - ;;
8655 - esac
8656 - fi
8657 - case $host_cpu in
8658 - hppa*64*|ia64*)
8659 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
8660 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
8661 - ;;
8662 - *)
8663 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
8664 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
8665 - # but as the default
8666 - # location of the library.
8667 - ;;
8668 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
8669 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
8670 + ;;
8671 esac
8672 -
8673 + ;;
8674 + tandem*)
8675 case $cc_basename in
8676 - CC*)
8677 + NCC*)
8678 + # NonStop-UX NCC 3.20
8679 # FIXME: insert proper C++ library support
8680 _LT_AC_TAGVAR(ld_shlibs, $1)=no
8681 ;;
8682 - aCC*)
8683 - case $host_cpu in
8684 - hppa*64*)
8685 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
8686 - ;;
8687 - ia64*)
8688 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
8689 - ;;
8690 - *)
8691 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
8692 - ;;
8693 - esac
8694 - # Commands to make compiler produce verbose output that lists
8695 - # what "hidden" libraries, object files and flags are used when
8696 - # linking a shared library.
8697 - #
8698 - # There doesn't appear to be a way to prevent this compiler from
8699 - # explicitly linking system object files so we need to strip them
8700 - # from the output so that they don't get included in the library
8701 - # dependencies.
8702 - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
8703 - ;;
8704 - *)
8705 - if test "$GXX" = yes; then
8706 - if test $with_gnu_ld = no; then
8707 - case $host_cpu in
8708 - hppa*64*)
8709 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
8710 - ;;
8711 - ia64*)
8712 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
8713 - ;;
8714 - *)
8715 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
8716 - ;;
8717 - esac
8718 - fi
8719 - else
8720 - # FIXME: insert proper C++ library support
8721 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
8722 - fi
8723 - ;;
8724 - esac
8725 - ;;
8726 - interix3*)
8727 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
8728 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
8729 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
8730 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
8731 - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
8732 - # Instead, shared libraries are loaded at an image base (0x10000000 by
8733 - # default) and relocated if they conflict, which is a slow very memory
8734 - # consuming and fragmenting process. To avoid this, we pick a random,
8735 - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
8736 - # time. Moving up from 0x10000000 also allows more sbrk(2) space.
8737 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
8738 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
8739 - ;;
8740 - irix5* | irix6*)
8741 - case $cc_basename in
8742 - CC*)
8743 - # SGI C++
8744 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
8745 -
8746 - # Archives containing C++ object files must be created using
8747 - # "CC -ar", where "CC" is the IRIX C++ compiler. This is
8748 - # necessary to make sure instantiated templates are included
8749 - # in the archive.
8750 - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
8751 - ;;
8752 *)
8753 - if test "$GXX" = yes; then
8754 - if test "$with_gnu_ld" = no; then
8755 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
8756 - else
8757 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
8758 - fi
8759 - fi
8760 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
8761 - ;;
8762 - esac
8763 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
8764 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
8765 - ;;
8766 - linux*)
8767 - case $cc_basename in
8768 - KCC*)
8769 - # Kuck and Associates, Inc. (KAI) C++ Compiler
8770 -
8771 - # KCC will only create a shared library if the output file
8772 - # ends with ".so" (or ".sl" for HP-UX), so rename the library
8773 - # to its proper name (with version) after linking.
8774 - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
8775 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
8776 - # Commands to make compiler produce verbose output that lists
8777 - # what "hidden" libraries, object files and flags are used when
8778 - # linking a shared library.
8779 - #
8780 - # There doesn't appear to be a way to prevent this compiler from
8781 - # explicitly linking system object files so we need to strip them
8782 - # from the output so that they don't get included in the library
8783 - # dependencies.
8784 - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
8785 -
8786 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
8787 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
8788 -
8789 - # Archives containing C++ object files must be created using
8790 - # "CC -Bstatic", where "CC" is the KAI C++ compiler.
8791 - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
8792 - ;;
8793 - icpc*)
8794 - # Intel C++
8795 - with_gnu_ld=yes
8796 - # version 8.0 and above of icpc choke on multiply defined symbols
8797 - # if we add $predep_objects and $postdep_objects, however 7.1 and
8798 - # earlier do not add the objects themselves.
8799 - case `$CC -V 2>&1` in
8800 - *"Version 7."*)
8801 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
8802 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8803 - ;;
8804 - *) # Version 8.0 or newer
8805 - tmp_idyn=
8806 - case $host_cpu in
8807 - ia64*) tmp_idyn=' -i_dynamic';;
8808 - esac
8809 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
8810 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
8811 - ;;
8812 - esac
8813 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
8814 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
8815 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
8816 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
8817 - ;;
8818 - pgCC*)
8819 - # Portland Group C++ compiler
8820 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
8821 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
8822 -
8823 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
8824 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
8825 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
8826 - ;;
8827 - cxx*)
8828 - # Compaq C++
8829 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
8830 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
8831 -
8832 - runpath_var=LD_RUN_PATH
8833 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
8834 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
8835 -
8836 - # Commands to make compiler produce verbose output that lists
8837 - # what "hidden" libraries, object files and flags are used when
8838 - # linking a shared library.
8839 - #
8840 - # There doesn't appear to be a way to prevent this compiler from
8841 - # explicitly linking system object files so we need to strip them
8842 - # from the output so that they don't get included in the library
8843 - # dependencies.
8844 - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
8845 + # FIXME: insert proper C++ library support
8846 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
8847 ;;
8848 esac
8849 ;;
8850 - lynxos*)
8851 + vxworks*)
8852 # FIXME: insert proper C++ library support
8853 _LT_AC_TAGVAR(ld_shlibs, $1)=no
8854 ;;
8855 - m88k*)
8856 + *)
8857 # FIXME: insert proper C++ library support
8858 _LT_AC_TAGVAR(ld_shlibs, $1)=no
8859 ;;
8860 - mvs*)
8861 - case $cc_basename in
8862 - cxx*)
8863 - # FIXME: insert proper C++ library support
8864 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
8865 - ;;
8866 - *)
8867 - # FIXME: insert proper C++ library support
8868 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
8869 - ;;
8870 - esac
8871 - ;;
8872 - netbsd*)
8873 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
8874 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
8875 - wlarc=
8876 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
8877 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
8878 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
8879 - fi
8880 - # Workaround some broken pre-1.5 toolchains
8881 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
8882 - ;;
8883 - openbsd2*)
8884 - # C++ shared libraries are fairly broken
8885 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
8886 - ;;
8887 - openbsd*)
8888 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
8889 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
8890 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
8891 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
8892 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
8893 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
8894 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
8895 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
8896 - fi
8897 - output_verbose_link_cmd='echo'
8898 - ;;
8899 - osf3*)
8900 - case $cc_basename in
8901 - KCC*)
8902 - # Kuck and Associates, Inc. (KAI) C++ Compiler
8903 -
8904 - # KCC will only create a shared library if the output file
8905 - # ends with ".so" (or ".sl" for HP-UX), so rename the library
8906 - # to its proper name (with version) after linking.
8907 - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
8908 -
8909 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
8910 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
8911 -
8912 - # Archives containing C++ object files must be created using
8913 - # "CC -Bstatic", where "CC" is the KAI C++ compiler.
8914 - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
8915 +esac
8916 +AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
8917 +test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
8918
8919 - ;;
8920 - RCC*)
8921 - # Rational C++ 2.4.1
8922 - # FIXME: insert proper C++ library support
8923 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
8924 - ;;
8925 - cxx*)
8926 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
8927 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
8928 +_LT_AC_TAGVAR(GCC, $1)="$GXX"
8929 +_LT_AC_TAGVAR(LD, $1)="$LD"
8930
8931 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
8932 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
8933 +AC_LIBTOOL_POSTDEP_PREDEP($1)
8934 +AC_LIBTOOL_PROG_COMPILER_PIC($1)
8935 +AC_LIBTOOL_PROG_CC_C_O($1)
8936 +AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
8937 +AC_LIBTOOL_PROG_LD_SHLIBS($1)
8938 +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
8939 +AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
8940
8941 - # Commands to make compiler produce verbose output that lists
8942 - # what "hidden" libraries, object files and flags are used when
8943 - # linking a shared library.
8944 - #
8945 - # There doesn't appear to be a way to prevent this compiler from
8946 - # explicitly linking system object files so we need to strip them
8947 - # from the output so that they don't get included in the library
8948 - # dependencies.
8949 - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
8950 - ;;
8951 - *)
8952 - if test "$GXX" = yes && test "$with_gnu_ld" = no; then
8953 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
8954 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
8955 +AC_LIBTOOL_CONFIG($1)
8956
8957 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
8958 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
8959 +AC_LANG_POP
8960 +CC=$lt_save_CC
8961 +LDCXX=$LD
8962 +LD=$lt_save_LD
8963 +GCC=$lt_save_GCC
8964 +with_gnu_ldcxx=$with_gnu_ld
8965 +with_gnu_ld=$lt_save_with_gnu_ld
8966 +lt_cv_path_LDCXX=$lt_cv_path_LD
8967 +lt_cv_path_LD=$lt_save_path_LD
8968 +lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
8969 +lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
8970 +])# AC_LIBTOOL_LANG_CXX_CONFIG
8971
8972 - # Commands to make compiler produce verbose output that lists
8973 - # what "hidden" libraries, object files and flags are used when
8974 - # linking a shared library.
8975 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
8976 +# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
8977 +# ------------------------------------
8978 +# Figure out "hidden" library dependencies from verbose
8979 +# compiler output when linking a shared library.
8980 +# Parse the compiler output and extract the necessary
8981 +# objects, libraries and library flags.
8982 +AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
8983 +dnl we can't use the lt_simple_compile_test_code here,
8984 +dnl because it contains code intended for an executable,
8985 +dnl not a library. It's possible we should let each
8986 +dnl tag define a new lt_????_link_test_code variable,
8987 +dnl but it's only used here...
8988 +ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
8989 +int a;
8990 +void foo (void) { a = 0; }
8991 +EOF
8992 +],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
8993 +class Foo
8994 +{
8995 +public:
8996 + Foo (void) { a = 0; }
8997 +private:
8998 + int a;
8999 +};
9000 +EOF
9001 +],[$1],[F77],[cat > conftest.$ac_ext <<EOF
9002 + subroutine foo
9003 + implicit none
9004 + integer*4 a
9005 + a=0
9006 + return
9007 + end
9008 +EOF
9009 +],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
9010 +public class foo {
9011 + private int a;
9012 + public void bar (void) {
9013 + a = 0;
9014 + }
9015 +};
9016 +EOF
9017 +])
9018 +dnl Parse the compiler output and extract the necessary
9019 +dnl objects, libraries and library flags.
9020 +if AC_TRY_EVAL(ac_compile); then
9021 + # Parse the compiler output and extract the necessary
9022 + # objects, libraries and library flags.
9023
9024 - else
9025 - # FIXME: insert proper C++ library support
9026 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
9027 - fi
9028 - ;;
9029 - esac
9030 - ;;
9031 - osf4* | osf5*)
9032 - case $cc_basename in
9033 - KCC*)
9034 - # Kuck and Associates, Inc. (KAI) C++ Compiler
9035 + # Sentinel used to keep track of whether or not we are before
9036 + # the conftest object file.
9037 + pre_test_object_deps_done=no
9038
9039 - # KCC will only create a shared library if the output file
9040 - # ends with ".so" (or ".sl" for HP-UX), so rename the library
9041 - # to its proper name (with version) after linking.
9042 - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
9043 + # The `*' in the case matches for architectures that use `case' in
9044 + # $output_verbose_cmd can trigger glob expansion during the loop
9045 + # eval without this substitution.
9046 + output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
9047
9048 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
9049 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
9050 + for p in `eval $output_verbose_link_cmd`; do
9051 + case $p in
9052
9053 - # Archives containing C++ object files must be created using
9054 - # the KAI C++ compiler.
9055 - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
9056 - ;;
9057 - RCC*)
9058 - # Rational C++ 2.4.1
9059 - # FIXME: insert proper C++ library support
9060 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
9061 - ;;
9062 - cxx*)
9063 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
9064 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
9065 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
9066 - echo "-hidden">> $lib.exp~
9067 - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
9068 - $rm $lib.exp'
9069 + -L* | -R* | -l*)
9070 + # Some compilers place space between "-{L,R}" and the path.
9071 + # Remove the space.
9072 + if test $p = "-L" \
9073 + || test $p = "-R"; then
9074 + prev=$p
9075 + continue
9076 + else
9077 + prev=
9078 + fi
9079
9080 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
9081 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
9082 + if test "$pre_test_object_deps_done" = no; then
9083 + case $p in
9084 + -L* | -R*)
9085 + # Internal compiler library paths should come after those
9086 + # provided the user. The postdeps already come after the
9087 + # user supplied libs so there is no need to process them.
9088 + if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
9089 + _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
9090 + else
9091 + _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
9092 + fi
9093 + ;;
9094 + # The "-l" case would never come before the object being
9095 + # linked, so don't bother handling this case.
9096 + esac
9097 + else
9098 + if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
9099 + _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
9100 + else
9101 + _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
9102 + fi
9103 + fi
9104 + ;;
9105
9106 - # Commands to make compiler produce verbose output that lists
9107 - # what "hidden" libraries, object files and flags are used when
9108 - # linking a shared library.
9109 - #
9110 - # There doesn't appear to be a way to prevent this compiler from
9111 - # explicitly linking system object files so we need to strip them
9112 - # from the output so that they don't get included in the library
9113 - # dependencies.
9114 - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
9115 - ;;
9116 - *)
9117 - if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9118 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
9119 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9120 + *.$objext)
9121 + # This assumes that the test object file only shows up
9122 + # once in the compiler output.
9123 + if test "$p" = "conftest.$objext"; then
9124 + pre_test_object_deps_done=yes
9125 + continue
9126 + fi
9127
9128 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
9129 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
9130 + if test "$pre_test_object_deps_done" = no; then
9131 + if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
9132 + _LT_AC_TAGVAR(predep_objects, $1)="$p"
9133 + else
9134 + _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
9135 + fi
9136 + else
9137 + if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
9138 + _LT_AC_TAGVAR(postdep_objects, $1)="$p"
9139 + else
9140 + _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
9141 + fi
9142 + fi
9143 + ;;
9144
9145 - # Commands to make compiler produce verbose output that lists
9146 - # what "hidden" libraries, object files and flags are used when
9147 - # linking a shared library.
9148 - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
9149 + *) ;; # Ignore the rest.
9150
9151 - else
9152 - # FIXME: insert proper C++ library support
9153 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
9154 - fi
9155 - ;;
9156 esac
9157 - ;;
9158 - psos*)
9159 - # FIXME: insert proper C++ library support
9160 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
9161 - ;;
9162 - sunos4*)
9163 - case $cc_basename in
9164 - CC*)
9165 - # Sun C++ 4.x
9166 - # FIXME: insert proper C++ library support
9167 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
9168 - ;;
9169 - lcc*)
9170 - # Lucid
9171 - # FIXME: insert proper C++ library support
9172 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
9173 - ;;
9174 - *)
9175 - # FIXME: insert proper C++ library support
9176 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
9177 - ;;
9178 + done
9179 +
9180 + # Clean up.
9181 + rm -f a.out a.exe
9182 +else
9183 + echo "libtool.m4: error: problem compiling $1 test program"
9184 +fi
9185 +
9186 +$rm -f confest.$objext
9187 +
9188 +# PORTME: override above test on systems where it is broken
9189 +ifelse([$1],[CXX],
9190 +[case $host_os in
9191 +interix[[3-9]]*)
9192 + # Interix 3.5 installs completely hosed .la files for C++, so rather than
9193 + # hack all around it, let's just trust "g++" to DTRT.
9194 + _LT_AC_TAGVAR(predep_objects,$1)=
9195 + _LT_AC_TAGVAR(postdep_objects,$1)=
9196 + _LT_AC_TAGVAR(postdeps,$1)=
9197 + ;;
9198 +
9199 +linux*)
9200 + case `$CC -V 2>&1 | sed 5q` in
9201 + *Sun\ C*)
9202 + # Sun C++ 5.9
9203 + #
9204 + # The more standards-conforming stlport4 library is
9205 + # incompatible with the Cstd library. Avoid specifying
9206 + # it if it's in CXXFLAGS. Ignore libCrun as
9207 + # -library=stlport4 depends on it.
9208 + case " $CXX $CXXFLAGS " in
9209 + *" -library=stlport4 "*)
9210 + solaris_use_stlport4=yes
9211 + ;;
9212 esac
9213 + if test "$solaris_use_stlport4" != yes; then
9214 + _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
9215 + fi
9216 ;;
9217 - solaris*)
9218 - case $cc_basename in
9219 - CC*)
9220 - # Sun C++ 4.2, 5.x and Centerline C++
9221 - _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
9222 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
9223 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
9224 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
9225 - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
9226 + esac
9227 + ;;
9228
9229 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
9230 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
9231 - case $host_os in
9232 - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
9233 - *)
9234 - # The C++ compiler is used as linker so we must use $wl
9235 - # flag to pass the commands to the underlying system
9236 - # linker. We must also pass each convience library through
9237 - # to the system linker between allextract/defaultextract.
9238 - # The C++ compiler will combine linker options so we
9239 - # cannot just pass the convience library names through
9240 - # without $wl.
9241 - # Supported since Solaris 2.6 (maybe 2.5.1?)
9242 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
9243 - ;;
9244 - esac
9245 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
9246 +solaris*)
9247 + case $cc_basename in
9248 + CC*)
9249 + # The more standards-conforming stlport4 library is
9250 + # incompatible with the Cstd library. Avoid specifying
9251 + # it if it's in CXXFLAGS. Ignore libCrun as
9252 + # -library=stlport4 depends on it.
9253 + case " $CXX $CXXFLAGS " in
9254 + *" -library=stlport4 "*)
9255 + solaris_use_stlport4=yes
9256 + ;;
9257 + esac
9258
9259 - output_verbose_link_cmd='echo'
9260 + # Adding this requires a known-good setup of shared libraries for
9261 + # Sun compiler versions before 5.6, else PIC objects from an old
9262 + # archive will be linked into the output, leading to subtle bugs.
9263 + if test "$solaris_use_stlport4" != yes; then
9264 + _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
9265 + fi
9266 + ;;
9267 + esac
9268 + ;;
9269 +esac
9270 +])
9271
9272 - # Archives containing C++ object files must be created using
9273 - # "CC -xar", where "CC" is the Sun C++ compiler. This is
9274 - # necessary to make sure instantiated templates are included
9275 - # in the archive.
9276 - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
9277 - ;;
9278 - gcx*)
9279 - # Green Hills C++ Compiler
9280 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9281 +case " $_LT_AC_TAGVAR(postdeps, $1) " in
9282 +*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
9283 +esac
9284 +])# AC_LIBTOOL_POSTDEP_PREDEP
9285
9286 - # The C++ compiler must be used to create the archive.
9287 - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
9288 - ;;
9289 - *)
9290 - # GNU C++ compiler with Solaris linker
9291 - if test "$GXX" = yes && test "$with_gnu_ld" = no; then
9292 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
9293 - if $CC --version | grep -v '^2\.7' > /dev/null; then
9294 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9295 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
9296 - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
9297 +# AC_LIBTOOL_LANG_F77_CONFIG
9298 +# --------------------------
9299 +# Ensure that the configuration vars for the C compiler are
9300 +# suitably defined. Those variables are subsequently used by
9301 +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
9302 +AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
9303 +AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
9304 +[AC_REQUIRE([AC_PROG_F77])
9305 +AC_LANG_PUSH(Fortran 77)
9306
9307 - # Commands to make compiler produce verbose output that lists
9308 - # what "hidden" libraries, object files and flags are used when
9309 - # linking a shared library.
9310 - output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
9311 - else
9312 - # g++ 2.7 appears to require `-G' NOT `-shared' on this
9313 - # platform.
9314 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
9315 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
9316 - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
9317 +_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
9318 +_LT_AC_TAGVAR(allow_undefined_flag, $1)=
9319 +_LT_AC_TAGVAR(always_export_symbols, $1)=no
9320 +_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
9321 +_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
9322 +_LT_AC_TAGVAR(hardcode_direct, $1)=no
9323 +_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
9324 +_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
9325 +_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
9326 +_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
9327 +_LT_AC_TAGVAR(hardcode_automatic, $1)=no
9328 +_LT_AC_TAGVAR(module_cmds, $1)=
9329 +_LT_AC_TAGVAR(module_expsym_cmds, $1)=
9330 +_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
9331 +_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
9332 +_LT_AC_TAGVAR(no_undefined_flag, $1)=
9333 +_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
9334 +_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
9335
9336 - # Commands to make compiler produce verbose output that lists
9337 - # what "hidden" libraries, object files and flags are used when
9338 - # linking a shared library.
9339 - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
9340 - fi
9341 +# Source file extension for f77 test sources.
9342 +ac_ext=f
9343
9344 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
9345 - fi
9346 - ;;
9347 - esac
9348 - ;;
9349 - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
9350 - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
9351 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
9352 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
9353 - runpath_var='LD_RUN_PATH'
9354 +# Object file extension for compiled f77 test sources.
9355 +objext=o
9356 +_LT_AC_TAGVAR(objext, $1)=$objext
9357
9358 - case $cc_basename in
9359 - CC*)
9360 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
9361 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
9362 - ;;
9363 - *)
9364 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
9365 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
9366 - ;;
9367 - esac
9368 - ;;
9369 - sysv5* | sco3.2v5* | sco5v6*)
9370 - # Note: We can NOT use -z defs as we might desire, because we do not
9371 - # link with -lc, and that would cause any symbols used from libc to
9372 - # always be unresolved, which means just about no library would
9373 - # ever link correctly. If we're not using GNU ld we use -z text
9374 - # though, which does catch some bad symbols but isn't as heavy-handed
9375 - # as -z defs.
9376 - # For security reasons, it is highly recommended that you always
9377 - # use absolute paths for naming shared libraries, and exclude the
9378 - # DT_RUNPATH tag from executables and libraries. But doing so
9379 - # requires that you compile everything twice, which is a pain.
9380 - # So that behaviour is only enabled if SCOABSPATH is set to a
9381 - # non-empty value in the environment. Most likely only useful for
9382 - # creating official distributions of packages.
9383 - # This is a hack until libtool officially supports absolute path
9384 - # names for shared libraries.
9385 - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
9386 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
9387 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
9388 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
9389 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
9390 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
9391 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
9392 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
9393 - runpath_var='LD_RUN_PATH'
9394 +# Code to be used in simple compile tests
9395 +lt_simple_compile_test_code="\
9396 + subroutine t
9397 + return
9398 + end
9399 +"
9400
9401 - case $cc_basename in
9402 - CC*)
9403 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
9404 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
9405 - ;;
9406 - *)
9407 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
9408 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
9409 - ;;
9410 - esac
9411 - ;;
9412 - tandem*)
9413 - case $cc_basename in
9414 - NCC*)
9415 - # NonStop-UX NCC 3.20
9416 - # FIXME: insert proper C++ library support
9417 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
9418 - ;;
9419 - *)
9420 - # FIXME: insert proper C++ library support
9421 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
9422 - ;;
9423 - esac
9424 - ;;
9425 - vxworks*)
9426 - # FIXME: insert proper C++ library support
9427 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
9428 - ;;
9429 - *)
9430 - # FIXME: insert proper C++ library support
9431 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
9432 - ;;
9433 +# Code to be used in simple link tests
9434 +lt_simple_link_test_code="\
9435 + program t
9436 + end
9437 +"
9438 +
9439 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
9440 +_LT_AC_SYS_COMPILER
9441 +
9442 +# save warnings/boilerplate of simple test code
9443 +_LT_COMPILER_BOILERPLATE
9444 +_LT_LINKER_BOILERPLATE
9445 +
9446 +# Allow CC to be a program name with arguments.
9447 +lt_save_CC="$CC"
9448 +CC=${F77-"f77"}
9449 +compiler=$CC
9450 +_LT_AC_TAGVAR(compiler, $1)=$CC
9451 +_LT_CC_BASENAME([$compiler])
9452 +
9453 +AC_MSG_CHECKING([if libtool supports shared libraries])
9454 +AC_MSG_RESULT([$can_build_shared])
9455 +
9456 +AC_MSG_CHECKING([whether to build shared libraries])
9457 +test "$can_build_shared" = "no" && enable_shared=no
9458 +
9459 +# On AIX, shared libraries and static libraries use the same namespace, and
9460 +# are all built from PIC.
9461 +case $host_os in
9462 +aix3*)
9463 + test "$enable_shared" = yes && enable_static=no
9464 + if test -n "$RANLIB"; then
9465 + archive_cmds="$archive_cmds~\$RANLIB \$lib"
9466 + postinstall_cmds='$RANLIB $lib'
9467 + fi
9468 + ;;
9469 +aix4* | aix5*)
9470 + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
9471 + test "$enable_shared" = yes && enable_static=no
9472 + fi
9473 + ;;
9474 esac
9475 -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
9476 -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
9477 +AC_MSG_RESULT([$enable_shared])
9478
9479 -_LT_AC_TAGVAR(GCC, $1)="$GXX"
9480 +AC_MSG_CHECKING([whether to build static libraries])
9481 +# Make sure either enable_shared or enable_static is yes.
9482 +test "$enable_shared" = yes || enable_static=yes
9483 +AC_MSG_RESULT([$enable_static])
9484 +
9485 +_LT_AC_TAGVAR(GCC, $1)="$G77"
9486 _LT_AC_TAGVAR(LD, $1)="$LD"
9487
9488 -AC_LIBTOOL_POSTDEP_PREDEP($1)
9489 AC_LIBTOOL_PROG_COMPILER_PIC($1)
9490 AC_LIBTOOL_PROG_CC_C_O($1)
9491 AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
9492 @@ -5287,278 +4782,8 @@
9493 AC_LIBTOOL_CONFIG($1)
9494
9495 AC_LANG_POP
9496 -CC=$lt_save_CC
9497 -LDCXX=$LD
9498 -LD=$lt_save_LD
9499 -GCC=$lt_save_GCC
9500 -with_gnu_ldcxx=$with_gnu_ld
9501 -with_gnu_ld=$lt_save_with_gnu_ld
9502 -lt_cv_path_LDCXX=$lt_cv_path_LD
9503 -lt_cv_path_LD=$lt_save_path_LD
9504 -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
9505 -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
9506 -])# AC_LIBTOOL_LANG_CXX_CONFIG
9507 -
9508 -# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
9509 -# ------------------------------------
9510 -# Figure out "hidden" library dependencies from verbose
9511 -# compiler output when linking a shared library.
9512 -# Parse the compiler output and extract the necessary
9513 -# objects, libraries and library flags.
9514 -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
9515 -dnl we can't use the lt_simple_compile_test_code here,
9516 -dnl because it contains code intended for an executable,
9517 -dnl not a library. It's possible we should let each
9518 -dnl tag define a new lt_????_link_test_code variable,
9519 -dnl but it's only used here...
9520 -ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
9521 -int a;
9522 -void foo (void) { a = 0; }
9523 -EOF
9524 -],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
9525 -class Foo
9526 -{
9527 -public:
9528 - Foo (void) { a = 0; }
9529 -private:
9530 - int a;
9531 -};
9532 -EOF
9533 -],[$1],[F77],[cat > conftest.$ac_ext <<EOF
9534 - subroutine foo
9535 - implicit none
9536 - integer*4 a
9537 - a=0
9538 - return
9539 - end
9540 -EOF
9541 -],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
9542 -public class foo {
9543 - private int a;
9544 - public void bar (void) {
9545 - a = 0;
9546 - }
9547 -};
9548 -EOF
9549 -])
9550 -dnl Parse the compiler output and extract the necessary
9551 -dnl objects, libraries and library flags.
9552 -if AC_TRY_EVAL(ac_compile); then
9553 - # Parse the compiler output and extract the necessary
9554 - # objects, libraries and library flags.
9555 -
9556 - # Sentinel used to keep track of whether or not we are before
9557 - # the conftest object file.
9558 - pre_test_object_deps_done=no
9559 -
9560 - # The `*' in the case matches for architectures that use `case' in
9561 - # $output_verbose_cmd can trigger glob expansion during the loop
9562 - # eval without this substitution.
9563 - output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
9564 -
9565 - for p in `eval $output_verbose_link_cmd`; do
9566 - case $p in
9567 -
9568 - -L* | -R* | -l*)
9569 - # Some compilers place space between "-{L,R}" and the path.
9570 - # Remove the space.
9571 - if test $p = "-L" \
9572 - || test $p = "-R"; then
9573 - prev=$p
9574 - continue
9575 - else
9576 - prev=
9577 - fi
9578 -
9579 - if test "$pre_test_object_deps_done" = no; then
9580 - case $p in
9581 - -L* | -R*)
9582 - # Internal compiler library paths should come after those
9583 - # provided the user. The postdeps already come after the
9584 - # user supplied libs so there is no need to process them.
9585 - if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
9586 - _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
9587 - else
9588 - _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
9589 - fi
9590 - ;;
9591 - # The "-l" case would never come before the object being
9592 - # linked, so don't bother handling this case.
9593 - esac
9594 - else
9595 - if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
9596 - _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
9597 - else
9598 - _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
9599 - fi
9600 - fi
9601 - ;;
9602 -
9603 - *.$objext)
9604 - # This assumes that the test object file only shows up
9605 - # once in the compiler output.
9606 - if test "$p" = "conftest.$objext"; then
9607 - pre_test_object_deps_done=yes
9608 - continue
9609 - fi
9610 -
9611 - if test "$pre_test_object_deps_done" = no; then
9612 - if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
9613 - _LT_AC_TAGVAR(predep_objects, $1)="$p"
9614 - else
9615 - _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
9616 - fi
9617 - else
9618 - if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
9619 - _LT_AC_TAGVAR(postdep_objects, $1)="$p"
9620 - else
9621 - _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
9622 - fi
9623 - fi
9624 - ;;
9625 -
9626 - *) ;; # Ignore the rest.
9627 -
9628 - esac
9629 - done
9630 -
9631 - # Clean up.
9632 - rm -f a.out a.exe
9633 -else
9634 - echo "libtool.m4: error: problem compiling $1 test program"
9635 -fi
9636 -
9637 -$rm -f confest.$objext
9638 -
9639 -# PORTME: override above test on systems where it is broken
9640 -ifelse([$1],[CXX],
9641 -[case $host_os in
9642 -interix3*)
9643 - # Interix 3.5 installs completely hosed .la files for C++, so rather than
9644 - # hack all around it, let's just trust "g++" to DTRT.
9645 - _LT_AC_TAGVAR(predep_objects,$1)=
9646 - _LT_AC_TAGVAR(postdep_objects,$1)=
9647 - _LT_AC_TAGVAR(postdeps,$1)=
9648 - ;;
9649 -
9650 -solaris*)
9651 - case $cc_basename in
9652 - CC*)
9653 - # Adding this requires a known-good setup of shared libraries for
9654 - # Sun compiler versions before 5.6, else PIC objects from an old
9655 - # archive will be linked into the output, leading to subtle bugs.
9656 - _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
9657 - ;;
9658 - esac
9659 - ;;
9660 -esac
9661 -])
9662 -
9663 -case " $_LT_AC_TAGVAR(postdeps, $1) " in
9664 -*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
9665 -esac
9666 -])# AC_LIBTOOL_POSTDEP_PREDEP
9667 -
9668 -# AC_LIBTOOL_LANG_F77_CONFIG
9669 -# --------------------------
9670 -# Ensure that the configuration vars for the C compiler are
9671 -# suitably defined. Those variables are subsequently used by
9672 -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
9673 -AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
9674 -AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
9675 -[AC_REQUIRE([AC_PROG_F77])
9676 -AC_LANG_PUSH(Fortran 77)
9677 -
9678 -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
9679 -_LT_AC_TAGVAR(allow_undefined_flag, $1)=
9680 -_LT_AC_TAGVAR(always_export_symbols, $1)=no
9681 -_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
9682 -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
9683 -_LT_AC_TAGVAR(hardcode_direct, $1)=no
9684 -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
9685 -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
9686 -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
9687 -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
9688 -_LT_AC_TAGVAR(hardcode_automatic, $1)=no
9689 -_LT_AC_TAGVAR(module_cmds, $1)=
9690 -_LT_AC_TAGVAR(module_expsym_cmds, $1)=
9691 -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
9692 -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
9693 -_LT_AC_TAGVAR(no_undefined_flag, $1)=
9694 -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
9695 -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
9696 -
9697 -# Source file extension for f77 test sources.
9698 -ac_ext=f
9699 -
9700 -# Object file extension for compiled f77 test sources.
9701 -objext=o
9702 -_LT_AC_TAGVAR(objext, $1)=$objext
9703 -
9704 -# Code to be used in simple compile tests
9705 -lt_simple_compile_test_code=" subroutine t\n return\n end\n"
9706 -
9707 -# Code to be used in simple link tests
9708 -lt_simple_link_test_code=" program t\n end\n"
9709 -
9710 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
9711 -_LT_AC_SYS_COMPILER
9712 -
9713 -# save warnings/boilerplate of simple test code
9714 -_LT_COMPILER_BOILERPLATE
9715 -_LT_LINKER_BOILERPLATE
9716 -
9717 -# Allow CC to be a program name with arguments.
9718 -lt_save_CC="$CC"
9719 -CC=${F77-"f77"}
9720 -compiler=$CC
9721 -_LT_AC_TAGVAR(compiler, $1)=$CC
9722 -_LT_CC_BASENAME([$compiler])
9723 -
9724 -AC_MSG_CHECKING([if libtool supports shared libraries])
9725 -AC_MSG_RESULT([$can_build_shared])
9726 -
9727 -AC_MSG_CHECKING([whether to build shared libraries])
9728 -test "$can_build_shared" = "no" && enable_shared=no
9729 -
9730 -# On AIX, shared libraries and static libraries use the same namespace, and
9731 -# are all built from PIC.
9732 -case $host_os in
9733 -aix3*)
9734 - test "$enable_shared" = yes && enable_static=no
9735 - if test -n "$RANLIB"; then
9736 - archive_cmds="$archive_cmds~\$RANLIB \$lib"
9737 - postinstall_cmds='$RANLIB $lib'
9738 - fi
9739 - ;;
9740 -aix4* | aix5*)
9741 - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
9742 - test "$enable_shared" = yes && enable_static=no
9743 - fi
9744 - ;;
9745 -esac
9746 -AC_MSG_RESULT([$enable_shared])
9747 -
9748 -AC_MSG_CHECKING([whether to build static libraries])
9749 -# Make sure either enable_shared or enable_static is yes.
9750 -test "$enable_shared" = yes || enable_static=yes
9751 -AC_MSG_RESULT([$enable_static])
9752 -
9753 -_LT_AC_TAGVAR(GCC, $1)="$G77"
9754 -_LT_AC_TAGVAR(LD, $1)="$LD"
9755 -
9756 -AC_LIBTOOL_PROG_COMPILER_PIC($1)
9757 -AC_LIBTOOL_PROG_CC_C_O($1)
9758 -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
9759 -AC_LIBTOOL_PROG_LD_SHLIBS($1)
9760 -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
9761 -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
9762 -
9763 -AC_LIBTOOL_CONFIG($1)
9764 -
9765 -AC_LANG_POP
9766 -CC="$lt_save_CC"
9767 -])# AC_LIBTOOL_LANG_F77_CONFIG
9768 +CC="$lt_save_CC"
9769 +])# AC_LIBTOOL_LANG_F77_CONFIG
9770
9771
9772 # AC_LIBTOOL_LANG_GCJ_CONFIG
9773 @@ -5578,10 +4803,10 @@
9774 _LT_AC_TAGVAR(objext, $1)=$objext
9775
9776 # Code to be used in simple compile tests
9777 -lt_simple_compile_test_code="class foo {}\n"
9778 +lt_simple_compile_test_code="class foo {}"
9779
9780 # Code to be used in simple link tests
9781 -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
9782 +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
9783
9784 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
9785 _LT_AC_SYS_COMPILER
9786 @@ -5634,7 +4859,7 @@
9787 _LT_AC_TAGVAR(objext, $1)=$objext
9788
9789 # Code to be used in simple compile tests
9790 -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
9791 +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
9792
9793 # Code to be used in simple link tests
9794 lt_simple_link_test_code="$lt_simple_compile_test_code"
9795 @@ -5723,6 +4948,7 @@
9796 _LT_AC_TAGVAR(module_cmds, $1) \
9797 _LT_AC_TAGVAR(module_expsym_cmds, $1) \
9798 _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
9799 + _LT_AC_TAGVAR(fix_srcfile_path, $1) \
9800 _LT_AC_TAGVAR(exclude_expsyms, $1) \
9801 _LT_AC_TAGVAR(include_expsyms, $1); do
9802
9803 @@ -5769,7 +4995,7 @@
9804 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
9805 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9806 #
9807 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
9808 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
9809 # Free Software Foundation, Inc.
9810 #
9811 # This file is part of GNU Libtool:
9812 @@ -6094,7 +5320,7 @@
9813 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
9814
9815 # Fix the shell variable \$srcfile for the compiler.
9816 -fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
9817 +fix_srcfile_path=$lt_fix_srcfile_path
9818
9819 # Set to yes if exported symbols are required.
9820 always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
9821 @@ -6177,6 +5403,7 @@
9822 # ---------------------------------
9823 AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
9824 [AC_REQUIRE([AC_CANONICAL_HOST])
9825 +AC_REQUIRE([LT_AC_PROG_SED])
9826 AC_REQUIRE([AC_PROG_NM])
9827 AC_REQUIRE([AC_OBJEXT])
9828 # Check for command to grab the raw symbol name followed by C symbol from nm.
9829 @@ -6213,7 +5440,7 @@
9830 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
9831 lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
9832 ;;
9833 -linux*)
9834 +linux* | k*bsd*-gnu)
9835 if test "$host_cpu" = ia64; then
9836 symcode='[[ABCDGIRSTW]]'
9837 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
9838 @@ -6403,12 +5630,14 @@
9839 # like `-m68040'.
9840 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
9841 ;;
9842 - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
9843 + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
9844 # PIC is the default for these OSes.
9845 ;;
9846 - mingw* | os2* | pw32*)
9847 + mingw* | cygwin* | os2* | pw32*)
9848 # This hack is so that the source file can tell whether it is being
9849 # built for inclusion in a dll (and should export symbols for example).
9850 + # Although the cygwin gcc ignores -fPIC, still need this for old-style
9851 + # (--disable-auto-import) libraries
9852 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
9853 ;;
9854 darwin* | rhapsody*)
9855 @@ -6420,7 +5649,7 @@
9856 # DJGPP does not support shared libraries at all
9857 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
9858 ;;
9859 - interix3*)
9860 + interix[[3-9]]*)
9861 # Interix 3.x gcc -fpic/-fPIC options generate broken code.
9862 # Instead, we relocate shared libraries at runtime.
9863 ;;
9864 @@ -6486,7 +5715,7 @@
9865 ;;
9866 esac
9867 ;;
9868 - freebsd* | kfreebsd*-gnu | dragonfly*)
9869 + freebsd* | dragonfly*)
9870 # FreeBSD uses GNU C++
9871 ;;
9872 hpux9* | hpux10* | hpux11*)
9873 @@ -6529,7 +5758,7 @@
9874 ;;
9875 esac
9876 ;;
9877 - linux*)
9878 + linux* | k*bsd*-gnu)
9879 case $cc_basename in
9880 KCC*)
9881 # KAI C++ Compiler
9882 @@ -6556,6 +5785,14 @@
9883 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
9884 ;;
9885 *)
9886 + case `$CC -V 2>&1 | sed 5q` in
9887 + *Sun\ C*)
9888 + # Sun C++ 5.9
9889 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
9890 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
9891 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
9892 + ;;
9893 + esac
9894 ;;
9895 esac
9896 ;;
9897 @@ -6572,7 +5809,7 @@
9898 ;;
9899 esac
9900 ;;
9901 - netbsd*)
9902 + netbsd* | netbsdelf*-gnu)
9903 ;;
9904 osf3* | osf4* | osf5*)
9905 case $cc_basename in
9906 @@ -6669,1452 +5906,2403 @@
9907 fi
9908 ;;
9909
9910 - amigaos*)
9911 - # FIXME: we need at least 68020 code to build shared libraries, but
9912 - # adding the `-m68020' flag to GCC prevents building anything better,
9913 - # like `-m68040'.
9914 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
9915 - ;;
9916 + amigaos*)
9917 + # FIXME: we need at least 68020 code to build shared libraries, but
9918 + # adding the `-m68020' flag to GCC prevents building anything better,
9919 + # like `-m68040'.
9920 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
9921 + ;;
9922 +
9923 + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
9924 + # PIC is the default for these OSes.
9925 + ;;
9926 +
9927 + mingw* | cygwin* | pw32* | os2*)
9928 + # This hack is so that the source file can tell whether it is being
9929 + # built for inclusion in a dll (and should export symbols for example).
9930 + # Although the cygwin gcc ignores -fPIC, still need this for old-style
9931 + # (--disable-auto-import) libraries
9932 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
9933 + ;;
9934 +
9935 + darwin* | rhapsody*)
9936 + # PIC is the default on this platform
9937 + # Common symbols not allowed in MH_DYLIB files
9938 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
9939 + ;;
9940 +
9941 + interix[[3-9]]*)
9942 + # Interix 3.x gcc -fpic/-fPIC options generate broken code.
9943 + # Instead, we relocate shared libraries at runtime.
9944 + ;;
9945 +
9946 + msdosdjgpp*)
9947 + # Just because we use GCC doesn't mean we suddenly get shared libraries
9948 + # on systems that don't support them.
9949 + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
9950 + enable_shared=no
9951 + ;;
9952 +
9953 + sysv4*MP*)
9954 + if test -d /usr/nec; then
9955 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
9956 + fi
9957 + ;;
9958 +
9959 + hpux*)
9960 + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
9961 + # not for PA HP-UX.
9962 + case $host_cpu in
9963 + hppa*64*|ia64*)
9964 + # +Z the default
9965 + ;;
9966 + *)
9967 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
9968 + ;;
9969 + esac
9970 + ;;
9971 +
9972 + *)
9973 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
9974 + ;;
9975 + esac
9976 + else
9977 + # PORTME Check for flag to pass linker flags through the system compiler.
9978 + case $host_os in
9979 + aix*)
9980 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
9981 + if test "$host_cpu" = ia64; then
9982 + # AIX 5 now supports IA64 processor
9983 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
9984 + else
9985 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
9986 + fi
9987 + ;;
9988 + darwin*)
9989 + # PIC is the default on this platform
9990 + # Common symbols not allowed in MH_DYLIB files
9991 + case $cc_basename in
9992 + xlc*)
9993 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
9994 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
9995 + ;;
9996 + esac
9997 + ;;
9998 +
9999 + mingw* | cygwin* | pw32* | os2*)
10000 + # This hack is so that the source file can tell whether it is being
10001 + # built for inclusion in a dll (and should export symbols for example).
10002 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
10003 + ;;
10004 +
10005 + hpux9* | hpux10* | hpux11*)
10006 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
10007 + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
10008 + # not for PA HP-UX.
10009 + case $host_cpu in
10010 + hppa*64*|ia64*)
10011 + # +Z the default
10012 + ;;
10013 + *)
10014 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
10015 + ;;
10016 + esac
10017 + # Is there a better lt_prog_compiler_static that works with the bundled CC?
10018 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
10019 + ;;
10020 +
10021 + irix5* | irix6* | nonstopux*)
10022 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
10023 + # PIC (with -KPIC) is the default.
10024 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
10025 + ;;
10026 +
10027 + newsos6)
10028 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10029 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10030 + ;;
10031 +
10032 + linux* | k*bsd*-gnu)
10033 + case $cc_basename in
10034 + icc* | ecc*)
10035 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
10036 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10037 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
10038 + ;;
10039 + pgcc* | pgf77* | pgf90* | pgf95*)
10040 + # Portland Group compilers (*not* the Pentium gcc compiler,
10041 + # which looks to be a dead project)
10042 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
10043 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
10044 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10045 + ;;
10046 + ccc*)
10047 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
10048 + # All Alpha code is PIC.
10049 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
10050 + ;;
10051 + *)
10052 + case `$CC -V 2>&1 | sed 5q` in
10053 + *Sun\ C*)
10054 + # Sun C 5.9
10055 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10056 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10057 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
10058 + ;;
10059 + *Sun\ F*)
10060 + # Sun Fortran 8.3 passes all unrecognized flags to the linker
10061 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10062 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10063 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
10064 + ;;
10065 + esac
10066 + ;;
10067 + esac
10068 + ;;
10069 +
10070 + osf3* | osf4* | osf5*)
10071 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
10072 + # All OSF/1 code is PIC.
10073 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
10074 + ;;
10075 +
10076 + rdos*)
10077 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
10078 + ;;
10079 +
10080 + solaris*)
10081 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10082 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10083 + case $cc_basename in
10084 + f77* | f90* | f95*)
10085 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
10086 + *)
10087 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
10088 + esac
10089 + ;;
10090 +
10091 + sunos4*)
10092 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
10093 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
10094 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10095 + ;;
10096 +
10097 + sysv4 | sysv4.2uw2* | sysv4.3*)
10098 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
10099 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10100 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10101 + ;;
10102 +
10103 + sysv4*MP*)
10104 + if test -d /usr/nec ;then
10105 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
10106 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10107 + fi
10108 + ;;
10109 +
10110 + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
10111 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
10112 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
10113 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10114 + ;;
10115 +
10116 + unicos*)
10117 + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
10118 + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
10119 + ;;
10120 +
10121 + uts4*)
10122 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
10123 + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10124 + ;;
10125 +
10126 + *)
10127 + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
10128 + ;;
10129 + esac
10130 + fi
10131 +])
10132 +AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
10133 +
10134 +#
10135 +# Check to make sure the PIC flag actually works.
10136 +#
10137 +if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
10138 + AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
10139 + _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
10140 + [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
10141 + [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
10142 + "" | " "*) ;;
10143 + *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
10144 + esac],
10145 + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
10146 + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
10147 +fi
10148 +case $host_os in
10149 + # For platforms which do not support PIC, -DPIC is meaningless:
10150 + *djgpp*)
10151 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
10152 + ;;
10153 + *)
10154 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
10155 + ;;
10156 +esac
10157 +
10158 +#
10159 +# Check to make sure the static flag actually works.
10160 +#
10161 +wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
10162 +AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
10163 + _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
10164 + $lt_tmp_static_flag,
10165 + [],
10166 + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
10167 +])
10168 +
10169 +
10170 +# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
10171 +# ------------------------------------
10172 +# See if the linker supports building shared libraries.
10173 +AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
10174 +[AC_REQUIRE([LT_AC_PROG_SED])dnl
10175 +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
10176 +ifelse([$1],[CXX],[
10177 + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
10178 + case $host_os in
10179 + aix4* | aix5*)
10180 + # If we're using GNU nm, then we don't want the "-C" option.
10181 + # -C means demangle to AIX nm, but means don't demangle with GNU nm
10182 + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
10183 + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
10184 + else
10185 + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
10186 + fi
10187 + ;;
10188 + pw32*)
10189 + _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
10190 + ;;
10191 + cygwin* | mingw*)
10192 + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
10193 + ;;
10194 + linux* | k*bsd*-gnu)
10195 + _LT_AC_TAGVAR(link_all_deplibs, $1)=no
10196 + ;;
10197 + *)
10198 + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
10199 + ;;
10200 + esac
10201 +],[
10202 + runpath_var=
10203 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=
10204 + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
10205 + _LT_AC_TAGVAR(archive_cmds, $1)=
10206 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
10207 + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
10208 + _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
10209 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
10210 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
10211 + _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
10212 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
10213 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
10214 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
10215 + _LT_AC_TAGVAR(hardcode_direct, $1)=no
10216 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
10217 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
10218 + _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
10219 + _LT_AC_TAGVAR(hardcode_automatic, $1)=no
10220 + _LT_AC_TAGVAR(module_cmds, $1)=
10221 + _LT_AC_TAGVAR(module_expsym_cmds, $1)=
10222 + _LT_AC_TAGVAR(always_export_symbols, $1)=no
10223 + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
10224 + # include_expsyms should be a list of space-separated symbols to be *always*
10225 + # included in the symbol list
10226 + _LT_AC_TAGVAR(include_expsyms, $1)=
10227 + # exclude_expsyms can be an extended regexp of symbols to exclude
10228 + # it will be wrapped by ` (' and `)$', so one must not match beginning or
10229 + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
10230 + # as well as any symbol that contains `d'.
10231 + _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
10232 + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
10233 + # platforms (ab)use it in PIC code, but their linkers get confused if
10234 + # the symbol is explicitly referenced. Since portable code cannot
10235 + # rely on this symbol name, it's probably fine to never include it in
10236 + # preloaded symbol tables.
10237 + extract_expsyms_cmds=
10238 + # Just being paranoid about ensuring that cc_basename is set.
10239 + _LT_CC_BASENAME([$compiler])
10240 + case $host_os in
10241 + cygwin* | mingw* | pw32*)
10242 + # FIXME: the MSVC++ port hasn't been tested in a loooong time
10243 + # When not using gcc, we currently assume that we are using
10244 + # Microsoft Visual C++.
10245 + if test "$GCC" != yes; then
10246 + with_gnu_ld=no
10247 + fi
10248 + ;;
10249 + interix*)
10250 + # we just hope/assume this is gcc and not c89 (= MSVC++)
10251 + with_gnu_ld=yes
10252 + ;;
10253 + openbsd*)
10254 + with_gnu_ld=no
10255 + ;;
10256 + esac
10257 +
10258 + _LT_AC_TAGVAR(ld_shlibs, $1)=yes
10259 + if test "$with_gnu_ld" = yes; then
10260 + # If archive_cmds runs LD, not CC, wlarc should be empty
10261 + wlarc='${wl}'
10262 +
10263 + # Set some defaults for GNU ld with shared library support. These
10264 + # are reset later if shared libraries are not supported. Putting them
10265 + # here allows them to be overridden if necessary.
10266 + runpath_var=LD_RUN_PATH
10267 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
10268 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
10269 + # ancient GNU ld didn't support --whole-archive et. al.
10270 + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
10271 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
10272 + else
10273 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
10274 + fi
10275 + supports_anon_versioning=no
10276 + case `$LD -v 2>/dev/null` in
10277 + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
10278 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
10279 + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
10280 + *\ 2.11.*) ;; # other 2.11 versions
10281 + *) supports_anon_versioning=yes ;;
10282 + esac
10283 +
10284 + # See if GNU ld supports shared libraries.
10285 + case $host_os in
10286 + aix3* | aix4* | aix5*)
10287 + # On AIX/PPC, the GNU linker is very broken
10288 + if test "$host_cpu" != ia64; then
10289 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
10290 + cat <<EOF 1>&2
10291 +
10292 +*** Warning: the GNU linker, at least up to release 2.9.1, is reported
10293 +*** to be unable to reliably create shared libraries on AIX.
10294 +*** Therefore, libtool is disabling shared libraries support. If you
10295 +*** really care for shared libraries, you may want to modify your PATH
10296 +*** so that a non-GNU linker is found, and then restart.
10297 +
10298 +EOF
10299 + fi
10300 + ;;
10301 +
10302 + amigaos*)
10303 + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
10304 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
10305 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
10306 +
10307 + # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
10308 + # that the semantics of dynamic libraries on AmigaOS, at least up
10309 + # to version 4, is to share data among multiple programs linked
10310 + # with the same dynamic library. Since this doesn't match the
10311 + # behavior of shared libraries on other platforms, we can't use
10312 + # them.
10313 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
10314 + ;;
10315 +
10316 + beos*)
10317 + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
10318 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
10319 + # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
10320 + # support --undefined. This deserves some investigation. FIXME
10321 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10322 + else
10323 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
10324 + fi
10325 + ;;
10326 +
10327 + cygwin* | mingw* | pw32*)
10328 + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
10329 + # as there is no search path for DLLs.
10330 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
10331 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
10332 + _LT_AC_TAGVAR(always_export_symbols, $1)=no
10333 + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
10334 + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
10335 +
10336 + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
10337 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
10338 + # If the export-symbols file already is a .def file (1st line
10339 + # is EXPORTS), use it as is; otherwise, prepend...
10340 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
10341 + cp $export_symbols $output_objdir/$soname.def;
10342 + else
10343 + echo EXPORTS > $output_objdir/$soname.def;
10344 + cat $export_symbols >> $output_objdir/$soname.def;
10345 + fi~
10346 + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
10347 + else
10348 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
10349 + fi
10350 + ;;
10351 +
10352 + interix[[3-9]]*)
10353 + _LT_AC_TAGVAR(hardcode_direct, $1)=no
10354 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
10355 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
10356 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
10357 + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
10358 + # Instead, shared libraries are loaded at an image base (0x10000000 by
10359 + # default) and relocated if they conflict, which is a slow very memory
10360 + # consuming and fragmenting process. To avoid this, we pick a random,
10361 + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
10362 + # time. Moving up from 0x10000000 also allows more sbrk(2) space.
10363 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
10364 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
10365 + ;;
10366 +
10367 + gnu* | linux* | k*bsd*-gnu)
10368 + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
10369 + tmp_addflag=
10370 + case $cc_basename,$host_cpu in
10371 + pgcc*) # Portland Group C compiler
10372 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
10373 + tmp_addflag=' $pic_flag'
10374 + ;;
10375 + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
10376 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
10377 + tmp_addflag=' $pic_flag -Mnomain' ;;
10378 + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
10379 + tmp_addflag=' -i_dynamic' ;;
10380 + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
10381 + tmp_addflag=' -i_dynamic -nofor_main' ;;
10382 + ifc* | ifort*) # Intel Fortran compiler
10383 + tmp_addflag=' -nofor_main' ;;
10384 + esac
10385 + case `$CC -V 2>&1 | sed 5q` in
10386 + *Sun\ C*) # Sun C 5.9
10387 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
10388 + tmp_sharedflag='-G' ;;
10389 + *Sun\ F*) # Sun Fortran 8.3
10390 + tmp_sharedflag='-G' ;;
10391 + *)
10392 + tmp_sharedflag='-shared' ;;
10393 + esac
10394 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10395 +
10396 + if test $supports_anon_versioning = yes; then
10397 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
10398 + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
10399 + $echo "local: *; };" >> $output_objdir/$libname.ver~
10400 + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
10401 + fi
10402 + _LT_AC_TAGVAR(link_all_deplibs, $1)=no
10403 + else
10404 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
10405 + fi
10406 + ;;
10407 +
10408 + netbsd* | netbsdelf*-gnu)
10409 + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
10410 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
10411 + wlarc=
10412 + else
10413 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10414 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
10415 + fi
10416 + ;;
10417 +
10418 + solaris*)
10419 + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
10420 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
10421 + cat <<EOF 1>&2
10422 +
10423 +*** Warning: The releases 2.8.* of the GNU linker cannot reliably
10424 +*** create shared libraries on Solaris systems. Therefore, libtool
10425 +*** is disabling shared libraries support. We urge you to upgrade GNU
10426 +*** binutils to release 2.9.1 or newer. Another option is to modify
10427 +*** your PATH or compiler configuration so that the native linker is
10428 +*** used, and then restart.
10429 +
10430 +EOF
10431 + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
10432 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10433 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
10434 + else
10435 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
10436 + fi
10437 + ;;
10438 +
10439 + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
10440 + case `$LD -v 2>&1` in
10441 + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
10442 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
10443 + cat <<_LT_EOF 1>&2
10444 +
10445 +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
10446 +*** reliably create shared libraries on SCO systems. Therefore, libtool
10447 +*** is disabling shared libraries support. We urge you to upgrade GNU
10448 +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
10449 +*** your PATH or compiler configuration so that the native linker is
10450 +*** used, and then restart.
10451 +
10452 +_LT_EOF
10453 + ;;
10454 + *)
10455 + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
10456 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
10457 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
10458 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
10459 + else
10460 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
10461 + fi
10462 + ;;
10463 + esac
10464 + ;;
10465 +
10466 + sunos4*)
10467 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
10468 + wlarc=
10469 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
10470 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
10471 + ;;
10472 +
10473 + *)
10474 + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
10475 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
10476 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
10477 + else
10478 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
10479 + fi
10480 + ;;
10481 + esac
10482 +
10483 + if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
10484 + runpath_var=
10485 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
10486 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
10487 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
10488 + fi
10489 + else
10490 + # PORTME fill in a description of your system's linker (not GNU ld)
10491 + case $host_os in
10492 + aix3*)
10493 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
10494 + _LT_AC_TAGVAR(always_export_symbols, $1)=yes
10495 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
10496 + # Note: this linker hardcodes the directories in LIBPATH if there
10497 + # are no directories specified by -L.
10498 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
10499 + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
10500 + # Neither direct hardcoding nor static linking is supported with a
10501 + # broken collect2.
10502 + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
10503 + fi
10504 + ;;
10505 +
10506 + aix4* | aix5*)
10507 + if test "$host_cpu" = ia64; then
10508 + # On IA64, the linker does run time linking by default, so we don't
10509 + # have to do anything special.
10510 + aix_use_runtimelinking=no
10511 + exp_sym_flag='-Bexport'
10512 + no_entry_flag=""
10513 + else
10514 + # If we're using GNU nm, then we don't want the "-C" option.
10515 + # -C means demangle to AIX nm, but means don't demangle with GNU nm
10516 + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
10517 + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
10518 + else
10519 + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
10520 + fi
10521 + aix_use_runtimelinking=no
10522 +
10523 + # Test if we are trying to use run time linking or normal
10524 + # AIX style linking. If -brtl is somewhere in LDFLAGS, we
10525 + # need to do runtime linking.
10526 + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
10527 + for ld_flag in $LDFLAGS; do
10528 + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
10529 + aix_use_runtimelinking=yes
10530 + break
10531 + fi
10532 + done
10533 + ;;
10534 + esac
10535 +
10536 + exp_sym_flag='-bexport'
10537 + no_entry_flag='-bnoentry'
10538 + fi
10539 +
10540 + # When large executables or shared objects are built, AIX ld can
10541 + # have problems creating the table of contents. If linking a library
10542 + # or program results in "error TOC overflow" add -mminimal-toc to
10543 + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
10544 + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
10545 +
10546 + _LT_AC_TAGVAR(archive_cmds, $1)=''
10547 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
10548 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
10549 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
10550 +
10551 + if test "$GCC" = yes; then
10552 + case $host_os in aix4.[[012]]|aix4.[[012]].*)
10553 + # We only want to do this on AIX 4.2 and lower, the check
10554 + # below for broken collect2 doesn't work under 4.3+
10555 + collect2name=`${CC} -print-prog-name=collect2`
10556 + if test -f "$collect2name" && \
10557 + strings "$collect2name" | grep resolve_lib_name >/dev/null
10558 + then
10559 + # We have reworked collect2
10560 + :
10561 + else
10562 + # We have old collect2
10563 + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
10564 + # It fails to find uninstalled libraries when the uninstalled
10565 + # path is not listed in the libpath. Setting hardcode_minus_L
10566 + # to unsupported forces relinking
10567 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
10568 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
10569 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
10570 + fi
10571 + ;;
10572 + esac
10573 + shared_flag='-shared'
10574 + if test "$aix_use_runtimelinking" = yes; then
10575 + shared_flag="$shared_flag "'${wl}-G'
10576 + fi
10577 + else
10578 + # not using gcc
10579 + if test "$host_cpu" = ia64; then
10580 + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
10581 + # chokes on -Wl,-G. The following line is correct:
10582 + shared_flag='-G'
10583 + else
10584 + if test "$aix_use_runtimelinking" = yes; then
10585 + shared_flag='${wl}-G'
10586 + else
10587 + shared_flag='${wl}-bM:SRE'
10588 + fi
10589 + fi
10590 + fi
10591 +
10592 + # It seems that -bexpall does not export symbols beginning with
10593 + # underscore (_), so it is better to generate a list of symbols to export.
10594 + _LT_AC_TAGVAR(always_export_symbols, $1)=yes
10595 + if test "$aix_use_runtimelinking" = yes; then
10596 + # Warning - without using the other runtime loading flags (-brtl),
10597 + # -berok will link without error, but may produce a broken library.
10598 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
10599 + # Determine the default libpath from the value encoded in an empty executable.
10600 + _LT_AC_SYS_LIBPATH_AIX
10601 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
10602 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
10603 + else
10604 + if test "$host_cpu" = ia64; then
10605 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
10606 + _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
10607 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
10608 + else
10609 + # Determine the default libpath from the value encoded in an empty executable.
10610 + _LT_AC_SYS_LIBPATH_AIX
10611 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
10612 + # Warning - without using the other run time loading flags,
10613 + # -berok will link without error, but may produce a broken library.
10614 + _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
10615 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
10616 + # Exported symbols can be pulled into shared objects from archives
10617 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
10618 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
10619 + # This is similar to how AIX traditionally builds its shared libraries.
10620 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
10621 + fi
10622 + fi
10623 + ;;
10624 +
10625 + amigaos*)
10626 + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
10627 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
10628 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
10629 + # see comment about different semantics on the GNU ld section
10630 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
10631 + ;;
10632 +
10633 + bsdi[[45]]*)
10634 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
10635 + ;;
10636 +
10637 + cygwin* | mingw* | pw32*)
10638 + # When not using gcc, we currently assume that we are using
10639 + # Microsoft Visual C++.
10640 + # hardcode_libdir_flag_spec is actually meaningless, as there is
10641 + # no search path for DLLs.
10642 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
10643 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
10644 + # Tell ltmain to make .lib files, not .a files.
10645 + libext=lib
10646 + # Tell ltmain to make .dll files, not .so files.
10647 + shrext_cmds=".dll"
10648 + # FIXME: Setting linknames here is a bad hack.
10649 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
10650 + # The linker will automatically build a .lib file if we build a DLL.
10651 + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
10652 + # FIXME: Should let the user specify the lib program.
10653 + _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
10654 + _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
10655 + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
10656 + ;;
10657 +
10658 + darwin* | rhapsody*)
10659 + case $host_os in
10660 + rhapsody* | darwin1.[[012]])
10661 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
10662 + ;;
10663 + *) # Darwin 1.3 on
10664 + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
10665 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
10666 + else
10667 + case ${MACOSX_DEPLOYMENT_TARGET} in
10668 + 10.[[012]])
10669 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
10670 + ;;
10671 + 10.*)
10672 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
10673 + ;;
10674 + esac
10675 + fi
10676 + ;;
10677 + esac
10678 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
10679 + _LT_AC_TAGVAR(hardcode_direct, $1)=no
10680 + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
10681 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
10682 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
10683 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
10684 + if test "$GCC" = yes ; then
10685 + output_verbose_link_cmd='echo'
10686 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
10687 + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
10688 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
10689 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
10690 + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
10691 + else
10692 + case $cc_basename in
10693 + xlc*)
10694 + output_verbose_link_cmd='echo'
10695 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
10696 + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
10697 + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
10698 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
10699 + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
10700 + ;;
10701 + *)
10702 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
10703 + ;;
10704 + esac
10705 + fi
10706 + ;;
10707 +
10708 + dgux*)
10709 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
10710 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
10711 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
10712 + ;;
10713 +
10714 + freebsd1*)
10715 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
10716 + ;;
10717 +
10718 + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
10719 + # support. Future versions do this automatically, but an explicit c++rt0.o
10720 + # does not break anything, and helps significantly (at the cost of a little
10721 + # extra space).
10722 + freebsd2.2*)
10723 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
10724 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
10725 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
10726 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
10727 + ;;
10728 +
10729 + # Unfortunately, older versions of FreeBSD 2 do not have this feature.
10730 + freebsd2*)
10731 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
10732 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
10733 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
10734 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
10735 + ;;
10736 +
10737 + # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
10738 + freebsd* | dragonfly*)
10739 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
10740 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
10741 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
10742 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
10743 + ;;
10744 +
10745 + hpux9*)
10746 + if test "$GCC" = yes; then
10747 + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
10748 + else
10749 + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
10750 + fi
10751 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
10752 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
10753 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
10754 +
10755 + # hardcode_minus_L: Not really in the search PATH,
10756 + # but as the default location of the library.
10757 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
10758 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
10759 + ;;
10760 +
10761 + hpux10*)
10762 + if test "$GCC" = yes -a "$with_gnu_ld" = no; then
10763 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10764 + else
10765 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
10766 + fi
10767 + if test "$with_gnu_ld" = no; then
10768 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
10769 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
10770 +
10771 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
10772 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
10773 +
10774 + # hardcode_minus_L: Not really in the search PATH,
10775 + # but as the default location of the library.
10776 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
10777 + fi
10778 + ;;
10779 +
10780 + hpux11*)
10781 + if test "$GCC" = yes -a "$with_gnu_ld" = no; then
10782 + case $host_cpu in
10783 + hppa*64*)
10784 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
10785 + ;;
10786 + ia64*)
10787 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
10788 + ;;
10789 + *)
10790 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10791 + ;;
10792 + esac
10793 + else
10794 + case $host_cpu in
10795 + hppa*64*)
10796 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
10797 + ;;
10798 + ia64*)
10799 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
10800 + ;;
10801 + *)
10802 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
10803 + ;;
10804 + esac
10805 + fi
10806 + if test "$with_gnu_ld" = no; then
10807 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
10808 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
10809
10810 - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
10811 - # PIC is the default for these OSes.
10812 - ;;
10813 + case $host_cpu in
10814 + hppa*64*|ia64*)
10815 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
10816 + _LT_AC_TAGVAR(hardcode_direct, $1)=no
10817 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
10818 + ;;
10819 + *)
10820 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
10821 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
10822
10823 - mingw* | pw32* | os2*)
10824 - # This hack is so that the source file can tell whether it is being
10825 - # built for inclusion in a dll (and should export symbols for example).
10826 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
10827 + # hardcode_minus_L: Not really in the search PATH,
10828 + # but as the default location of the library.
10829 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
10830 + ;;
10831 + esac
10832 + fi
10833 ;;
10834
10835 - darwin* | rhapsody*)
10836 - # PIC is the default on this platform
10837 - # Common symbols not allowed in MH_DYLIB files
10838 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
10839 + irix5* | irix6* | nonstopux*)
10840 + if test "$GCC" = yes; then
10841 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
10842 + else
10843 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
10844 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
10845 + fi
10846 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
10847 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
10848 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
10849 ;;
10850
10851 - interix3*)
10852 - # Interix 3.x gcc -fpic/-fPIC options generate broken code.
10853 - # Instead, we relocate shared libraries at runtime.
10854 + netbsd* | netbsdelf*-gnu)
10855 + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
10856 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
10857 + else
10858 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
10859 + fi
10860 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
10861 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
10862 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
10863 ;;
10864
10865 - msdosdjgpp*)
10866 - # Just because we use GCC doesn't mean we suddenly get shared libraries
10867 - # on systems that don't support them.
10868 - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
10869 - enable_shared=no
10870 + newsos6)
10871 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
10872 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
10873 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
10874 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
10875 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
10876 ;;
10877
10878 - sysv4*MP*)
10879 - if test -d /usr/nec; then
10880 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
10881 + openbsd*)
10882 + if test -f /usr/libexec/ld.so; then
10883 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
10884 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
10885 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
10886 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
10887 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
10888 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
10889 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
10890 + else
10891 + case $host_os in
10892 + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
10893 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
10894 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
10895 + ;;
10896 + *)
10897 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
10898 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
10899 + ;;
10900 + esac
10901 + fi
10902 + else
10903 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
10904 fi
10905 ;;
10906
10907 - hpux*)
10908 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
10909 - # not for PA HP-UX.
10910 - case $host_cpu in
10911 - hppa*64*|ia64*)
10912 - # +Z the default
10913 - ;;
10914 - *)
10915 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
10916 - ;;
10917 - esac
10918 + os2*)
10919 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
10920 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
10921 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
10922 + _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
10923 + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
10924 ;;
10925
10926 - *)
10927 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
10928 - ;;
10929 - esac
10930 - else
10931 - # PORTME Check for flag to pass linker flags through the system compiler.
10932 - case $host_os in
10933 - aix*)
10934 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
10935 - if test "$host_cpu" = ia64; then
10936 - # AIX 5 now supports IA64 processor
10937 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
10938 + osf3*)
10939 + if test "$GCC" = yes; then
10940 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
10941 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
10942 else
10943 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
10944 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
10945 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
10946 fi
10947 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
10948 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
10949 ;;
10950 - darwin*)
10951 - # PIC is the default on this platform
10952 - # Common symbols not allowed in MH_DYLIB files
10953 - case $cc_basename in
10954 - xlc*)
10955 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
10956 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
10957 - ;;
10958 - esac
10959 - ;;
10960
10961 - mingw* | pw32* | os2*)
10962 - # This hack is so that the source file can tell whether it is being
10963 - # built for inclusion in a dll (and should export symbols for example).
10964 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
10965 + osf4* | osf5*) # as osf3* with the addition of -msym flag
10966 + if test "$GCC" = yes; then
10967 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
10968 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
10969 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
10970 + else
10971 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
10972 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
10973 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
10974 + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
10975 +
10976 + # Both c and cxx compiler support -rpath directly
10977 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
10978 + fi
10979 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
10980 ;;
10981
10982 - hpux9* | hpux10* | hpux11*)
10983 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
10984 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
10985 - # not for PA HP-UX.
10986 - case $host_cpu in
10987 - hppa*64*|ia64*)
10988 - # +Z the default
10989 - ;;
10990 + solaris*)
10991 + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
10992 + if test "$GCC" = yes; then
10993 + wlarc='${wl}'
10994 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
10995 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
10996 + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
10997 + else
10998 + wlarc=''
10999 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
11000 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
11001 + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
11002 + fi
11003 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
11004 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
11005 + case $host_os in
11006 + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
11007 *)
11008 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
11009 + # The compiler driver will combine and reorder linker options,
11010 + # but understands `-z linker_flag'. GCC discards it without `$wl',
11011 + # but is careful enough not to reorder.
11012 + # Supported since Solaris 2.6 (maybe 2.5.1?)
11013 + if test "$GCC" = yes; then
11014 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
11015 + else
11016 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
11017 + fi
11018 ;;
11019 esac
11020 - # Is there a better lt_prog_compiler_static that works with the bundled CC?
11021 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
11022 - ;;
11023 -
11024 - irix5* | irix6* | nonstopux*)
11025 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11026 - # PIC (with -KPIC) is the default.
11027 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
11028 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
11029 ;;
11030
11031 - newsos6)
11032 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
11033 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11034 + sunos4*)
11035 + if test "x$host_vendor" = xsequent; then
11036 + # Use $CC to link under sequent, because it throws in some extra .o
11037 + # files that make .init and .fini sections work.
11038 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
11039 + else
11040 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
11041 + fi
11042 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
11043 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes
11044 + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
11045 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
11046 ;;
11047
11048 - linux*)
11049 - case $cc_basename in
11050 - icc* | ecc*)
11051 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11052 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
11053 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
11054 - ;;
11055 - pgcc* | pgf77* | pgf90* | pgf95*)
11056 - # Portland Group compilers (*not* the Pentium gcc compiler,
11057 - # which looks to be a dead project)
11058 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11059 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
11060 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11061 - ;;
11062 - ccc*)
11063 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11064 - # All Alpha code is PIC.
11065 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
11066 + sysv4)
11067 + case $host_vendor in
11068 + sni)
11069 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
11070 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
11071 + ;;
11072 + siemens)
11073 + ## LD is ld it makes a PLAMLIB
11074 + ## CC just makes a GrossModule.
11075 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
11076 + _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
11077 + _LT_AC_TAGVAR(hardcode_direct, $1)=no
11078 ;;
11079 + motorola)
11080 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
11081 + _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
11082 + ;;
11083 esac
11084 + runpath_var='LD_RUN_PATH'
11085 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
11086 ;;
11087
11088 - osf3* | osf4* | osf5*)
11089 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11090 - # All OSF/1 code is PIC.
11091 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
11092 + sysv4.3*)
11093 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
11094 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
11095 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
11096 ;;
11097
11098 - solaris*)
11099 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
11100 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11101 - case $cc_basename in
11102 - f77* | f90* | f95*)
11103 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
11104 - *)
11105 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
11106 - esac
11107 + sysv4*MP*)
11108 + if test -d /usr/nec; then
11109 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
11110 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
11111 + runpath_var=LD_RUN_PATH
11112 + hardcode_runpath_var=yes
11113 + _LT_AC_TAGVAR(ld_shlibs, $1)=yes
11114 + fi
11115 ;;
11116
11117 - sunos4*)
11118 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
11119 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
11120 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11121 - ;;
11122 + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
11123 + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
11124 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
11125 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
11126 + runpath_var='LD_RUN_PATH'
11127
11128 - sysv4 | sysv4.2uw2* | sysv4.3*)
11129 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11130 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
11131 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11132 + if test "$GCC" = yes; then
11133 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
11134 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
11135 + else
11136 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
11137 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
11138 + fi
11139 ;;
11140
11141 - sysv4*MP*)
11142 - if test -d /usr/nec ;then
11143 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
11144 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11145 + sysv5* | sco3.2v5* | sco5v6*)
11146 + # Note: We can NOT use -z defs as we might desire, because we do not
11147 + # link with -lc, and that would cause any symbols used from libc to
11148 + # always be unresolved, which means just about no library would
11149 + # ever link correctly. If we're not using GNU ld we use -z text
11150 + # though, which does catch some bad symbols but isn't as heavy-handed
11151 + # as -z defs.
11152 + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
11153 + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
11154 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
11155 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
11156 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
11157 + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
11158 + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
11159 + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
11160 + runpath_var='LD_RUN_PATH'
11161 +
11162 + if test "$GCC" = yes; then
11163 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
11164 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
11165 + else
11166 + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
11167 + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
11168 fi
11169 ;;
11170
11171 - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
11172 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11173 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
11174 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11175 + uts4*)
11176 + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
11177 + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
11178 + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
11179 ;;
11180
11181 - unicos*)
11182 - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
11183 - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
11184 + *)
11185 + _LT_AC_TAGVAR(ld_shlibs, $1)=no
11186 ;;
11187 + esac
11188 + fi
11189 +])
11190 +AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
11191 +test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
11192
11193 - uts4*)
11194 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
11195 - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
11196 +#
11197 +# Do we need to explicitly link libc?
11198 +#
11199 +case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
11200 +x|xyes)
11201 + # Assume -lc should be added
11202 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
11203 +
11204 + if test "$enable_shared" = yes && test "$GCC" = yes; then
11205 + case $_LT_AC_TAGVAR(archive_cmds, $1) in
11206 + *'~'*)
11207 + # FIXME: we may have to deal with multi-command sequences.
11208 ;;
11209 + '$CC '*)
11210 + # Test whether the compiler implicitly links with -lc since on some
11211 + # systems, -lgcc has to come before -lc. If gcc already passes -lc
11212 + # to ld, don't add -lc before -lgcc.
11213 + AC_MSG_CHECKING([whether -lc should be explicitly linked in])
11214 + $rm conftest*
11215 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
11216
11217 - *)
11218 - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
11219 + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
11220 + soname=conftest
11221 + lib=conftest
11222 + libobjs=conftest.$ac_objext
11223 + deplibs=
11224 + wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
11225 + pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
11226 + compiler_flags=-v
11227 + linker_flags=-v
11228 + verstring=
11229 + output_objdir=.
11230 + libname=conftest
11231 + lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
11232 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=
11233 + if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
11234 + then
11235 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
11236 + else
11237 + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
11238 + fi
11239 + _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
11240 + else
11241 + cat conftest.err 1>&5
11242 + fi
11243 + $rm conftest*
11244 + AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
11245 ;;
11246 esac
11247 fi
11248 + ;;
11249 +esac
11250 +])# AC_LIBTOOL_PROG_LD_SHLIBS
11251 +
11252 +
11253 +# _LT_AC_FILE_LTDLL_C
11254 +# -------------------
11255 +# Be careful that the start marker always follows a newline.
11256 +AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
11257 +# /* ltdll.c starts here */
11258 +# #define WIN32_LEAN_AND_MEAN
11259 +# #include <windows.h>
11260 +# #undef WIN32_LEAN_AND_MEAN
11261 +# #include <stdio.h>
11262 +#
11263 +# #ifndef __CYGWIN__
11264 +# # ifdef __CYGWIN32__
11265 +# # define __CYGWIN__ __CYGWIN32__
11266 +# # endif
11267 +# #endif
11268 +#
11269 +# #ifdef __cplusplus
11270 +# extern "C" {
11271 +# #endif
11272 +# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
11273 +# #ifdef __cplusplus
11274 +# }
11275 +# #endif
11276 +#
11277 +# #ifdef __CYGWIN__
11278 +# #include <cygwin/cygwin_dll.h>
11279 +# DECLARE_CYGWIN_DLL( DllMain );
11280 +# #endif
11281 +# HINSTANCE __hDllInstance_base;
11282 +#
11283 +# BOOL APIENTRY
11284 +# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
11285 +# {
11286 +# __hDllInstance_base = hInst;
11287 +# return TRUE;
11288 +# }
11289 +# /* ltdll.c ends here */
11290 +])# _LT_AC_FILE_LTDLL_C
11291 +
11292 +
11293 +# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
11294 +# ---------------------------------
11295 +AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
11296 +
11297 +
11298 +# old names
11299 +AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
11300 +AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
11301 +AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
11302 +AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
11303 +AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
11304 +AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
11305 +AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
11306 +
11307 +# This is just to silence aclocal about the macro not being used
11308 +ifelse([AC_DISABLE_FAST_INSTALL])
11309 +
11310 +AC_DEFUN([LT_AC_PROG_GCJ],
11311 +[AC_CHECK_TOOL(GCJ, gcj, no)
11312 + test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
11313 + AC_SUBST(GCJFLAGS)
11314 +])
11315 +
11316 +AC_DEFUN([LT_AC_PROG_RC],
11317 +[AC_CHECK_TOOL(RC, windres, no)
11318 +])
11319 +
11320 +
11321 +# Cheap backport of AS_EXECUTABLE_P and required macros
11322 +# from Autoconf 2.59; we should not use $as_executable_p directly.
11323 +
11324 +# _AS_TEST_PREPARE
11325 +# ----------------
11326 +m4_ifndef([_AS_TEST_PREPARE],
11327 +[m4_defun([_AS_TEST_PREPARE],
11328 +[if test -x / >/dev/null 2>&1; then
11329 + as_executable_p='test -x'
11330 +else
11331 + as_executable_p='test -f'
11332 +fi
11333 +])])# _AS_TEST_PREPARE
11334 +
11335 +# AS_EXECUTABLE_P
11336 +# ---------------
11337 +# Check whether a file is executable.
11338 +m4_ifndef([AS_EXECUTABLE_P],
11339 +[m4_defun([AS_EXECUTABLE_P],
11340 +[AS_REQUIRE([_AS_TEST_PREPARE])dnl
11341 +$as_executable_p $1[]dnl
11342 +])])# AS_EXECUTABLE_P
11343 +
11344 +# NOTE: This macro has been submitted for inclusion into #
11345 +# GNU Autoconf as AC_PROG_SED. When it is available in #
11346 +# a released version of Autoconf we should remove this #
11347 +# macro and use it instead. #
11348 +# LT_AC_PROG_SED
11349 +# --------------
11350 +# Check for a fully-functional sed program, that truncates
11351 +# as few characters as possible. Prefer GNU sed if found.
11352 +AC_DEFUN([LT_AC_PROG_SED],
11353 +[AC_MSG_CHECKING([for a sed that does not truncate output])
11354 +AC_CACHE_VAL(lt_cv_path_SED,
11355 +[# Loop through the user's path and test for sed and gsed.
11356 +# Then use that list of sed's as ones to test for truncation.
11357 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11358 +for as_dir in $PATH
11359 +do
11360 + IFS=$as_save_IFS
11361 + test -z "$as_dir" && as_dir=.
11362 + for lt_ac_prog in sed gsed; do
11363 + for ac_exec_ext in '' $ac_executable_extensions; do
11364 + if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
11365 + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
11366 + fi
11367 + done
11368 + done
11369 +done
11370 +IFS=$as_save_IFS
11371 +lt_ac_max=0
11372 +lt_ac_count=0
11373 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris
11374 +# along with /bin/sed that truncates output.
11375 +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
11376 + test ! -f $lt_ac_sed && continue
11377 + cat /dev/null > conftest.in
11378 + lt_ac_count=0
11379 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in
11380 + # Check for GNU sed and select it if it is found.
11381 + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
11382 + lt_cv_path_SED=$lt_ac_sed
11383 + break
11384 + fi
11385 + while true; do
11386 + cat conftest.in conftest.in >conftest.tmp
11387 + mv conftest.tmp conftest.in
11388 + cp conftest.in conftest.nl
11389 + echo >>conftest.nl
11390 + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
11391 + cmp -s conftest.out conftest.nl || break
11392 + # 10000 chars as input seems more than enough
11393 + test $lt_ac_count -gt 10 && break
11394 + lt_ac_count=`expr $lt_ac_count + 1`
11395 + if test $lt_ac_count -gt $lt_ac_max; then
11396 + lt_ac_max=$lt_ac_count
11397 + lt_cv_path_SED=$lt_ac_sed
11398 + fi
11399 + done
11400 +done
11401 +])
11402 +SED=$lt_cv_path_SED
11403 +AC_SUBST([SED])
11404 +AC_MSG_RESULT([$SED])
11405 ])
11406 -AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
11407
11408 +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
11409 +#
11410 +# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
11411 #
11412 -# Check to make sure the PIC flag actually works.
11413 +# This program is free software; you can redistribute it and/or modify
11414 +# it under the terms of the GNU General Public License as published by
11415 +# the Free Software Foundation; either version 2 of the License, or
11416 +# (at your option) any later version.
11417 #
11418 -if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
11419 - AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
11420 - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
11421 - [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
11422 - [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
11423 - "" | " "*) ;;
11424 - *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
11425 - esac],
11426 - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
11427 - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
11428 +# This program is distributed in the hope that it will be useful, but
11429 +# WITHOUT ANY WARRANTY; without even the implied warranty of
11430 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11431 +# General Public License for more details.
11432 +#
11433 +# You should have received a copy of the GNU General Public License
11434 +# along with this program; if not, write to the Free Software
11435 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
11436 +#
11437 +# As a special exception to the GNU General Public License, if you
11438 +# distribute this file as part of a program that contains a
11439 +# configuration script generated by Autoconf, you may include it under
11440 +# the same distribution terms that you use for the rest of that program.
11441 +
11442 +# PKG_PROG_PKG_CONFIG([MIN-VERSION])
11443 +# ----------------------------------
11444 +AC_DEFUN([PKG_PROG_PKG_CONFIG],
11445 +[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
11446 +m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
11447 +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
11448 +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
11449 + AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
11450 fi
11451 -case $host_os in
11452 - # For platforms which do not support PIC, -DPIC is meaningless:
11453 - *djgpp*)
11454 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
11455 - ;;
11456 - *)
11457 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
11458 - ;;
11459 -esac
11460 +if test -n "$PKG_CONFIG"; then
11461 + _pkg_min_version=m4_default([$1], [0.9.0])
11462 + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
11463 + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
11464 + AC_MSG_RESULT([yes])
11465 + else
11466 + AC_MSG_RESULT([no])
11467 + PKG_CONFIG=""
11468 + fi
11469 +
11470 +fi[]dnl
11471 +])# PKG_PROG_PKG_CONFIG
11472
11473 +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
11474 #
11475 -# Check to make sure the static flag actually works.
11476 +# Check to see whether a particular set of modules exists. Similar
11477 +# to PKG_CHECK_MODULES(), but does not set variables or print errors.
11478 #
11479 -wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
11480 -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
11481 - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
11482 - $lt_tmp_static_flag,
11483 - [],
11484 - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
11485 -])
11486 +#
11487 +# Similar to PKG_CHECK_MODULES, make sure that the first instance of
11488 +# this or PKG_CHECK_MODULES is called, or make sure to call
11489 +# PKG_CHECK_EXISTS manually
11490 +# --------------------------------------------------------------
11491 +AC_DEFUN([PKG_CHECK_EXISTS],
11492 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
11493 +if test -n "$PKG_CONFIG" && \
11494 + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
11495 + m4_ifval([$2], [$2], [:])
11496 +m4_ifvaln([$3], [else
11497 + $3])dnl
11498 +fi])
11499
11500
11501 -# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
11502 -# ------------------------------------
11503 -# See if the linker supports building shared libraries.
11504 -AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
11505 -[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
11506 -ifelse([$1],[CXX],[
11507 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
11508 - case $host_os in
11509 - aix4* | aix5*)
11510 - # If we're using GNU nm, then we don't want the "-C" option.
11511 - # -C means demangle to AIX nm, but means don't demangle with GNU nm
11512 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
11513 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
11514 +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
11515 +# ---------------------------------------------
11516 +m4_define([_PKG_CONFIG],
11517 +[if test -n "$PKG_CONFIG"; then
11518 + if test -n "$$1"; then
11519 + pkg_cv_[]$1="$$1"
11520 else
11521 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
11522 - fi
11523 - ;;
11524 - pw32*)
11525 - _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
11526 - ;;
11527 - cygwin* | mingw*)
11528 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
11529 - ;;
11530 - *)
11531 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
11532 - ;;
11533 - esac
11534 -],[
11535 - runpath_var=
11536 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=
11537 - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
11538 - _LT_AC_TAGVAR(archive_cmds, $1)=
11539 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
11540 - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
11541 - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
11542 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
11543 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
11544 - _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
11545 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
11546 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
11547 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
11548 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
11549 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
11550 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
11551 - _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
11552 - _LT_AC_TAGVAR(hardcode_automatic, $1)=no
11553 - _LT_AC_TAGVAR(module_cmds, $1)=
11554 - _LT_AC_TAGVAR(module_expsym_cmds, $1)=
11555 - _LT_AC_TAGVAR(always_export_symbols, $1)=no
11556 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
11557 - # include_expsyms should be a list of space-separated symbols to be *always*
11558 - # included in the symbol list
11559 - _LT_AC_TAGVAR(include_expsyms, $1)=
11560 - # exclude_expsyms can be an extended regexp of symbols to exclude
11561 - # it will be wrapped by ` (' and `)$', so one must not match beginning or
11562 - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
11563 - # as well as any symbol that contains `d'.
11564 - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
11565 - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
11566 - # platforms (ab)use it in PIC code, but their linkers get confused if
11567 - # the symbol is explicitly referenced. Since portable code cannot
11568 - # rely on this symbol name, it's probably fine to never include it in
11569 - # preloaded symbol tables.
11570 - extract_expsyms_cmds=
11571 - # Just being paranoid about ensuring that cc_basename is set.
11572 - _LT_CC_BASENAME([$compiler])
11573 - case $host_os in
11574 - cygwin* | mingw* | pw32*)
11575 - # FIXME: the MSVC++ port hasn't been tested in a loooong time
11576 - # When not using gcc, we currently assume that we are using
11577 - # Microsoft Visual C++.
11578 - if test "$GCC" != yes; then
11579 - with_gnu_ld=no
11580 + PKG_CHECK_EXISTS([$3],
11581 + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
11582 + [pkg_failed=yes])
11583 fi
11584 - ;;
11585 - interix*)
11586 - # we just hope/assume this is gcc and not c89 (= MSVC++)
11587 - with_gnu_ld=yes
11588 - ;;
11589 - openbsd*)
11590 - with_gnu_ld=no
11591 - ;;
11592 - esac
11593 +else
11594 + pkg_failed=untried
11595 +fi[]dnl
11596 +])# _PKG_CONFIG
11597
11598 - _LT_AC_TAGVAR(ld_shlibs, $1)=yes
11599 - if test "$with_gnu_ld" = yes; then
11600 - # If archive_cmds runs LD, not CC, wlarc should be empty
11601 - wlarc='${wl}'
11602 +# _PKG_SHORT_ERRORS_SUPPORTED
11603 +# -----------------------------
11604 +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
11605 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
11606 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
11607 + _pkg_short_errors_supported=yes
11608 +else
11609 + _pkg_short_errors_supported=no
11610 +fi[]dnl
11611 +])# _PKG_SHORT_ERRORS_SUPPORTED
11612
11613 - # Set some defaults for GNU ld with shared library support. These
11614 - # are reset later if shared libraries are not supported. Putting them
11615 - # here allows them to be overridden if necessary.
11616 - runpath_var=LD_RUN_PATH
11617 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
11618 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
11619 - # ancient GNU ld didn't support --whole-archive et. al.
11620 - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
11621 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
11622 - else
11623 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
11624 - fi
11625 - supports_anon_versioning=no
11626 - case `$LD -v 2>/dev/null` in
11627 - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
11628 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
11629 - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
11630 - *\ 2.11.*) ;; # other 2.11 versions
11631 - *) supports_anon_versioning=yes ;;
11632 - esac
11633
11634 - # See if GNU ld supports shared libraries.
11635 - case $host_os in
11636 - aix3* | aix4* | aix5*)
11637 - # On AIX/PPC, the GNU linker is very broken
11638 - if test "$host_cpu" != ia64; then
11639 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
11640 - cat <<EOF 1>&2
11641 +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
11642 +# [ACTION-IF-NOT-FOUND])
11643 +#
11644 +#
11645 +# Note that if there is a possibility the first call to
11646 +# PKG_CHECK_MODULES might not happen, you should be sure to include an
11647 +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
11648 +#
11649 +#
11650 +# --------------------------------------------------------------
11651 +AC_DEFUN([PKG_CHECK_MODULES],
11652 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
11653 +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
11654 +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
11655
11656 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported
11657 -*** to be unable to reliably create shared libraries on AIX.
11658 -*** Therefore, libtool is disabling shared libraries support. If you
11659 -*** really care for shared libraries, you may want to modify your PATH
11660 -*** so that a non-GNU linker is found, and then restart.
11661 +pkg_failed=no
11662 +AC_MSG_CHECKING([for $1])
11663
11664 -EOF
11665 - fi
11666 - ;;
11667 +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
11668 +_PKG_CONFIG([$1][_LIBS], [libs], [$2])
11669
11670 - amigaos*)
11671 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
11672 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
11673 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
11674 +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
11675 +and $1[]_LIBS to avoid the need to call pkg-config.
11676 +See the pkg-config man page for more details.])
11677
11678 - # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
11679 - # that the semantics of dynamic libraries on AmigaOS, at least up
11680 - # to version 4, is to share data among multiple programs linked
11681 - # with the same dynamic library. Since this doesn't match the
11682 - # behavior of shared libraries on other platforms, we can't use
11683 - # them.
11684 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
11685 - ;;
11686 +if test $pkg_failed = yes; then
11687 + _PKG_SHORT_ERRORS_SUPPORTED
11688 + if test $_pkg_short_errors_supported = yes; then
11689 + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
11690 + else
11691 + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
11692 + fi
11693 + # Put the nasty error message in config.log where it belongs
11694 + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
11695
11696 - beos*)
11697 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
11698 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
11699 - # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
11700 - # support --undefined. This deserves some investigation. FIXME
11701 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11702 - else
11703 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
11704 - fi
11705 - ;;
11706 + ifelse([$4], , [AC_MSG_ERROR(dnl
11707 +[Package requirements ($2) were not met:
11708
11709 - cygwin* | mingw* | pw32*)
11710 - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
11711 - # as there is no search path for DLLs.
11712 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
11713 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
11714 - _LT_AC_TAGVAR(always_export_symbols, $1)=no
11715 - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
11716 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
11717 +$$1_PKG_ERRORS
11718
11719 - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
11720 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11721 - # If the export-symbols file already is a .def file (1st line
11722 - # is EXPORTS), use it as is; otherwise, prepend...
11723 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
11724 - cp $export_symbols $output_objdir/$soname.def;
11725 - else
11726 - echo EXPORTS > $output_objdir/$soname.def;
11727 - cat $export_symbols >> $output_objdir/$soname.def;
11728 - fi~
11729 - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
11730 - else
11731 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
11732 - fi
11733 - ;;
11734 +Consider adjusting the PKG_CONFIG_PATH environment variable if you
11735 +installed software in a non-standard prefix.
11736
11737 - interix3*)
11738 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
11739 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
11740 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
11741 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
11742 - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
11743 - # Instead, shared libraries are loaded at an image base (0x10000000 by
11744 - # default) and relocated if they conflict, which is a slow very memory
11745 - # consuming and fragmenting process. To avoid this, we pick a random,
11746 - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
11747 - # time. Moving up from 0x10000000 also allows more sbrk(2) space.
11748 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
11749 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
11750 - ;;
11751 +_PKG_TEXT
11752 +])],
11753 + [AC_MSG_RESULT([no])
11754 + $4])
11755 +elif test $pkg_failed = untried; then
11756 + ifelse([$4], , [AC_MSG_FAILURE(dnl
11757 +[The pkg-config script could not be found or is too old. Make sure it
11758 +is in your PATH or set the PKG_CONFIG environment variable to the full
11759 +path to pkg-config.
11760
11761 - linux*)
11762 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
11763 - tmp_addflag=
11764 - case $cc_basename,$host_cpu in
11765 - pgcc*) # Portland Group C compiler
11766 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
11767 - tmp_addflag=' $pic_flag'
11768 - ;;
11769 - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
11770 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
11771 - tmp_addflag=' $pic_flag -Mnomain' ;;
11772 - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
11773 - tmp_addflag=' -i_dynamic' ;;
11774 - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
11775 - tmp_addflag=' -i_dynamic -nofor_main' ;;
11776 - ifc* | ifort*) # Intel Fortran compiler
11777 - tmp_addflag=' -nofor_main' ;;
11778 - esac
11779 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11780 +_PKG_TEXT
11781
11782 - if test $supports_anon_versioning = yes; then
11783 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
11784 - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
11785 - $echo "local: *; };" >> $output_objdir/$libname.ver~
11786 - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
11787 - fi
11788 - else
11789 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
11790 - fi
11791 - ;;
11792 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
11793 + [$4])
11794 +else
11795 + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
11796 + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
11797 + AC_MSG_RESULT([yes])
11798 + ifelse([$3], , :, [$3])
11799 +fi[]dnl
11800 +])# PKG_CHECK_MODULES
11801
11802 - netbsd*)
11803 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
11804 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
11805 - wlarc=
11806 - else
11807 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11808 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11809 - fi
11810 - ;;
11811 +# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
11812 +#
11813 +# This file is free software; the Free Software Foundation
11814 +# gives unlimited permission to copy and/or distribute it,
11815 +# with or without modifications, as long as this notice is preserved.
11816
11817 - solaris*)
11818 - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
11819 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
11820 - cat <<EOF 1>&2
11821 +# AM_AUTOMAKE_VERSION(VERSION)
11822 +# ----------------------------
11823 +# Automake X.Y traces this macro to ensure aclocal.m4 has been
11824 +# generated from the m4 files accompanying Automake X.Y.
11825 +# (This private macro should not be called outside this file.)
11826 +AC_DEFUN([AM_AUTOMAKE_VERSION],
11827 +[am__api_version='1.10'
11828 +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
11829 +dnl require some minimum version. Point them to the right macro.
11830 +m4_if([$1], [1.10], [],
11831 + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
11832 +])
11833
11834 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably
11835 -*** create shared libraries on Solaris systems. Therefore, libtool
11836 -*** is disabling shared libraries support. We urge you to upgrade GNU
11837 -*** binutils to release 2.9.1 or newer. Another option is to modify
11838 -*** your PATH or compiler configuration so that the native linker is
11839 -*** used, and then restart.
11840 +# _AM_AUTOCONF_VERSION(VERSION)
11841 +# -----------------------------
11842 +# aclocal traces this macro to find the Autoconf version.
11843 +# This is a private macro too. Using m4_define simplifies
11844 +# the logic in aclocal, which can simply ignore this definition.
11845 +m4_define([_AM_AUTOCONF_VERSION], [])
11846
11847 -EOF
11848 - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
11849 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11850 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11851 - else
11852 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
11853 - fi
11854 - ;;
11855 +# AM_SET_CURRENT_AUTOMAKE_VERSION
11856 +# -------------------------------
11857 +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
11858 +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
11859 +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
11860 +[AM_AUTOMAKE_VERSION([1.10])dnl
11861 +_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
11862
11863 - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
11864 - case `$LD -v 2>&1` in
11865 - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
11866 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
11867 - cat <<_LT_EOF 1>&2
11868 +# AM_AUX_DIR_EXPAND -*- Autoconf -*-
11869
11870 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
11871 -*** reliably create shared libraries on SCO systems. Therefore, libtool
11872 -*** is disabling shared libraries support. We urge you to upgrade GNU
11873 -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
11874 -*** your PATH or compiler configuration so that the native linker is
11875 -*** used, and then restart.
11876 +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
11877 +#
11878 +# This file is free software; the Free Software Foundation
11879 +# gives unlimited permission to copy and/or distribute it,
11880 +# with or without modifications, as long as this notice is preserved.
11881
11882 -_LT_EOF
11883 - ;;
11884 - *)
11885 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
11886 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
11887 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
11888 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
11889 - else
11890 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
11891 - fi
11892 - ;;
11893 - esac
11894 - ;;
11895 +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
11896 +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
11897 +# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
11898 +#
11899 +# Of course, Automake must honor this variable whenever it calls a
11900 +# tool from the auxiliary directory. The problem is that $srcdir (and
11901 +# therefore $ac_aux_dir as well) can be either absolute or relative,
11902 +# depending on how configure is run. This is pretty annoying, since
11903 +# it makes $ac_aux_dir quite unusable in subdirectories: in the top
11904 +# source directory, any form will work fine, but in subdirectories a
11905 +# relative path needs to be adjusted first.
11906 +#
11907 +# $ac_aux_dir/missing
11908 +# fails when called from a subdirectory if $ac_aux_dir is relative
11909 +# $top_srcdir/$ac_aux_dir/missing
11910 +# fails if $ac_aux_dir is absolute,
11911 +# fails when called from a subdirectory in a VPATH build with
11912 +# a relative $ac_aux_dir
11913 +#
11914 +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
11915 +# are both prefixed by $srcdir. In an in-source build this is usually
11916 +# harmless because $srcdir is `.', but things will broke when you
11917 +# start a VPATH build or use an absolute $srcdir.
11918 +#
11919 +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
11920 +# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
11921 +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
11922 +# and then we would define $MISSING as
11923 +# MISSING="\${SHELL} $am_aux_dir/missing"
11924 +# This will work as long as MISSING is not called from configure, because
11925 +# unfortunately $(top_srcdir) has no meaning in configure.
11926 +# However there are other variables, like CC, which are often used in
11927 +# configure, and could therefore not use this "fixed" $ac_aux_dir.
11928 +#
11929 +# Another solution, used here, is to always expand $ac_aux_dir to an
11930 +# absolute PATH. The drawback is that using absolute paths prevent a
11931 +# configured tree to be moved without reconfiguration.
11932 +
11933 +AC_DEFUN([AM_AUX_DIR_EXPAND],
11934 +[dnl Rely on autoconf to set up CDPATH properly.
11935 +AC_PREREQ([2.50])dnl
11936 +# expand $ac_aux_dir to an absolute path
11937 +am_aux_dir=`cd $ac_aux_dir && pwd`
11938 +])
11939
11940 - sunos4*)
11941 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
11942 - wlarc=
11943 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
11944 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
11945 - ;;
11946 +# AM_CONDITIONAL -*- Autoconf -*-
11947
11948 - *)
11949 - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
11950 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
11951 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11952 - else
11953 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
11954 - fi
11955 - ;;
11956 - esac
11957 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
11958 +# Free Software Foundation, Inc.
11959 +#
11960 +# This file is free software; the Free Software Foundation
11961 +# gives unlimited permission to copy and/or distribute it,
11962 +# with or without modifications, as long as this notice is preserved.
11963
11964 - if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
11965 - runpath_var=
11966 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
11967 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
11968 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
11969 - fi
11970 - else
11971 - # PORTME fill in a description of your system's linker (not GNU ld)
11972 - case $host_os in
11973 - aix3*)
11974 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
11975 - _LT_AC_TAGVAR(always_export_symbols, $1)=yes
11976 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
11977 - # Note: this linker hardcodes the directories in LIBPATH if there
11978 - # are no directories specified by -L.
11979 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
11980 - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
11981 - # Neither direct hardcoding nor static linking is supported with a
11982 - # broken collect2.
11983 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
11984 - fi
11985 - ;;
11986 +# serial 8
11987
11988 - aix4* | aix5*)
11989 - if test "$host_cpu" = ia64; then
11990 - # On IA64, the linker does run time linking by default, so we don't
11991 - # have to do anything special.
11992 - aix_use_runtimelinking=no
11993 - exp_sym_flag='-Bexport'
11994 - no_entry_flag=""
11995 - else
11996 - # If we're using GNU nm, then we don't want the "-C" option.
11997 - # -C means demangle to AIX nm, but means don't demangle with GNU nm
11998 - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
11999 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
12000 - else
12001 - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
12002 - fi
12003 - aix_use_runtimelinking=no
12004 +# AM_CONDITIONAL(NAME, SHELL-CONDITION)
12005 +# -------------------------------------
12006 +# Define a conditional.
12007 +AC_DEFUN([AM_CONDITIONAL],
12008 +[AC_PREREQ(2.52)dnl
12009 + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
12010 + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
12011 +AC_SUBST([$1_TRUE])dnl
12012 +AC_SUBST([$1_FALSE])dnl
12013 +_AM_SUBST_NOTMAKE([$1_TRUE])dnl
12014 +_AM_SUBST_NOTMAKE([$1_FALSE])dnl
12015 +if $2; then
12016 + $1_TRUE=
12017 + $1_FALSE='#'
12018 +else
12019 + $1_TRUE='#'
12020 + $1_FALSE=
12021 +fi
12022 +AC_CONFIG_COMMANDS_PRE(
12023 +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
12024 + AC_MSG_ERROR([[conditional "$1" was never defined.
12025 +Usually this means the macro was only invoked conditionally.]])
12026 +fi])])
12027
12028 - # Test if we are trying to use run time linking or normal
12029 - # AIX style linking. If -brtl is somewhere in LDFLAGS, we
12030 - # need to do runtime linking.
12031 - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
12032 - for ld_flag in $LDFLAGS; do
12033 - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
12034 - aix_use_runtimelinking=yes
12035 - break
12036 - fi
12037 - done
12038 - ;;
12039 - esac
12040 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
12041 +# Free Software Foundation, Inc.
12042 +#
12043 +# This file is free software; the Free Software Foundation
12044 +# gives unlimited permission to copy and/or distribute it,
12045 +# with or without modifications, as long as this notice is preserved.
12046
12047 - exp_sym_flag='-bexport'
12048 - no_entry_flag='-bnoentry'
12049 - fi
12050 +# serial 9
12051
12052 - # When large executables or shared objects are built, AIX ld can
12053 - # have problems creating the table of contents. If linking a library
12054 - # or program results in "error TOC overflow" add -mminimal-toc to
12055 - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
12056 - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
12057 +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
12058 +# written in clear, in which case automake, when reading aclocal.m4,
12059 +# will think it sees a *use*, and therefore will trigger all it's
12060 +# C support machinery. Also note that it means that autoscan, seeing
12061 +# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
12062
12063 - _LT_AC_TAGVAR(archive_cmds, $1)=''
12064 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
12065 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
12066 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
12067
12068 - if test "$GCC" = yes; then
12069 - case $host_os in aix4.[[012]]|aix4.[[012]].*)
12070 - # We only want to do this on AIX 4.2 and lower, the check
12071 - # below for broken collect2 doesn't work under 4.3+
12072 - collect2name=`${CC} -print-prog-name=collect2`
12073 - if test -f "$collect2name" && \
12074 - strings "$collect2name" | grep resolve_lib_name >/dev/null
12075 - then
12076 - # We have reworked collect2
12077 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
12078 - else
12079 - # We have old collect2
12080 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
12081 - # It fails to find uninstalled libraries when the uninstalled
12082 - # path is not listed in the libpath. Setting hardcode_minus_L
12083 - # to unsupported forces relinking
12084 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
12085 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
12086 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
12087 - fi
12088 - ;;
12089 - esac
12090 - shared_flag='-shared'
12091 - if test "$aix_use_runtimelinking" = yes; then
12092 - shared_flag="$shared_flag "'${wl}-G'
12093 - fi
12094 - else
12095 - # not using gcc
12096 - if test "$host_cpu" = ia64; then
12097 - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
12098 - # chokes on -Wl,-G. The following line is correct:
12099 - shared_flag='-G'
12100 - else
12101 - if test "$aix_use_runtimelinking" = yes; then
12102 - shared_flag='${wl}-G'
12103 - else
12104 - shared_flag='${wl}-bM:SRE'
12105 - fi
12106 - fi
12107 - fi
12108 +# _AM_DEPENDENCIES(NAME)
12109 +# ----------------------
12110 +# See how the compiler implements dependency checking.
12111 +# NAME is "CC", "CXX", "GCJ", or "OBJC".
12112 +# We try a few techniques and use that to set a single cache variable.
12113 +#
12114 +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
12115 +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
12116 +# dependency, and given that the user is not expected to run this macro,
12117 +# just rely on AC_PROG_CC.
12118 +AC_DEFUN([_AM_DEPENDENCIES],
12119 +[AC_REQUIRE([AM_SET_DEPDIR])dnl
12120 +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
12121 +AC_REQUIRE([AM_MAKE_INCLUDE])dnl
12122 +AC_REQUIRE([AM_DEP_TRACK])dnl
12123
12124 - # It seems that -bexpall does not export symbols beginning with
12125 - # underscore (_), so it is better to generate a list of symbols to export.
12126 - _LT_AC_TAGVAR(always_export_symbols, $1)=yes
12127 - if test "$aix_use_runtimelinking" = yes; then
12128 - # Warning - without using the other runtime loading flags (-brtl),
12129 - # -berok will link without error, but may produce a broken library.
12130 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
12131 - # Determine the default libpath from the value encoded in an empty executable.
12132 - _LT_AC_SYS_LIBPATH_AIX
12133 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
12134 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
12135 - else
12136 - if test "$host_cpu" = ia64; then
12137 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
12138 - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
12139 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
12140 - else
12141 - # Determine the default libpath from the value encoded in an empty executable.
12142 - _LT_AC_SYS_LIBPATH_AIX
12143 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
12144 - # Warning - without using the other run time loading flags,
12145 - # -berok will link without error, but may produce a broken library.
12146 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
12147 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
12148 - # Exported symbols can be pulled into shared objects from archives
12149 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
12150 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
12151 - # This is similar to how AIX traditionally builds its shared libraries.
12152 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
12153 - fi
12154 - fi
12155 - ;;
12156 +ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
12157 + [$1], CXX, [depcc="$CXX" am_compiler_list=],
12158 + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
12159 + [$1], UPC, [depcc="$UPC" am_compiler_list=],
12160 + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
12161 + [depcc="$$1" am_compiler_list=])
12162
12163 - amigaos*)
12164 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
12165 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
12166 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
12167 - # see comment about different semantics on the GNU ld section
12168 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
12169 - ;;
12170 +AC_CACHE_CHECK([dependency style of $depcc],
12171 + [am_cv_$1_dependencies_compiler_type],
12172 +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
12173 + # We make a subdir and do the tests there. Otherwise we can end up
12174 + # making bogus files that we don't know about and never remove. For
12175 + # instance it was reported that on HP-UX the gcc test will end up
12176 + # making a dummy file named `D' -- because `-MD' means `put the output
12177 + # in D'.
12178 + mkdir conftest.dir
12179 + # Copy depcomp to subdir because otherwise we won't find it if we're
12180 + # using a relative directory.
12181 + cp "$am_depcomp" conftest.dir
12182 + cd conftest.dir
12183 + # We will build objects and dependencies in a subdirectory because
12184 + # it helps to detect inapplicable dependency modes. For instance
12185 + # both Tru64's cc and ICC support -MD to output dependencies as a
12186 + # side effect of compilation, but ICC will put the dependencies in
12187 + # the current directory while Tru64 will put them in the object
12188 + # directory.
12189 + mkdir sub
12190
12191 - bsdi[[45]]*)
12192 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
12193 - ;;
12194 + am_cv_$1_dependencies_compiler_type=none
12195 + if test "$am_compiler_list" = ""; then
12196 + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
12197 + fi
12198 + for depmode in $am_compiler_list; do
12199 + # Setup a source with many dependencies, because some compilers
12200 + # like to wrap large dependency lists on column 80 (with \), and
12201 + # we should not choose a depcomp mode which is confused by this.
12202 + #
12203 + # We need to recreate these files for each test, as the compiler may
12204 + # overwrite some of them when testing with obscure command lines.
12205 + # This happens at least with the AIX C compiler.
12206 + : > sub/conftest.c
12207 + for i in 1 2 3 4 5 6; do
12208 + echo '#include "conftst'$i'.h"' >> sub/conftest.c
12209 + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
12210 + # Solaris 8's {/usr,}/bin/sh.
12211 + touch sub/conftst$i.h
12212 + done
12213 + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
12214
12215 - cygwin* | mingw* | pw32*)
12216 - # When not using gcc, we currently assume that we are using
12217 - # Microsoft Visual C++.
12218 - # hardcode_libdir_flag_spec is actually meaningless, as there is
12219 - # no search path for DLLs.
12220 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
12221 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
12222 - # Tell ltmain to make .lib files, not .a files.
12223 - libext=lib
12224 - # Tell ltmain to make .dll files, not .so files.
12225 - shrext_cmds=".dll"
12226 - # FIXME: Setting linknames here is a bad hack.
12227 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
12228 - # The linker will automatically build a .lib file if we build a DLL.
12229 - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
12230 - # FIXME: Should let the user specify the lib program.
12231 - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
12232 - _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
12233 - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
12234 + case $depmode in
12235 + nosideeffect)
12236 + # after this tag, mechanisms are not by side-effect, so they'll
12237 + # only be used when explicitly requested
12238 + if test "x$enable_dependency_tracking" = xyes; then
12239 + continue
12240 + else
12241 + break
12242 + fi
12243 ;;
12244 -
12245 - darwin* | rhapsody*)
12246 - case $host_os in
12247 - rhapsody* | darwin1.[[012]])
12248 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
12249 - ;;
12250 - *) # Darwin 1.3 on
12251 - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
12252 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
12253 - else
12254 - case ${MACOSX_DEPLOYMENT_TARGET} in
12255 - 10.[[012]])
12256 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
12257 - ;;
12258 - 10.*)
12259 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
12260 - ;;
12261 - esac
12262 - fi
12263 - ;;
12264 - esac
12265 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
12266 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
12267 - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
12268 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
12269 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
12270 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
12271 - if test "$GCC" = yes ; then
12272 - output_verbose_link_cmd='echo'
12273 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
12274 - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
12275 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
12276 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
12277 - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
12278 - else
12279 - case $cc_basename in
12280 - xlc*)
12281 - output_verbose_link_cmd='echo'
12282 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
12283 - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
12284 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
12285 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
12286 - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
12287 - ;;
12288 - *)
12289 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
12290 - ;;
12291 - esac
12292 + none) break ;;
12293 + esac
12294 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
12295 + # mode. It turns out that the SunPro C++ compiler does not properly
12296 + # handle `-M -o', and we need to detect this.
12297 + if depmode=$depmode \
12298 + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
12299 + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
12300 + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
12301 + >/dev/null 2>conftest.err &&
12302 + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
12303 + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
12304 + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
12305 + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
12306 + # icc doesn't choke on unknown options, it will just issue warnings
12307 + # or remarks (even with -Werror). So we grep stderr for any message
12308 + # that says an option was ignored or not supported.
12309 + # When given -MP, icc 7.0 and 7.1 complain thusly:
12310 + # icc: Command line warning: ignoring option '-M'; no argument required
12311 + # The diagnosis changed in icc 8.0:
12312 + # icc: Command line remark: option '-MP' not supported
12313 + if (grep 'ignoring option' conftest.err ||
12314 + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
12315 + am_cv_$1_dependencies_compiler_type=$depmode
12316 + break
12317 + fi
12318 fi
12319 - ;;
12320 + done
12321
12322 - dgux*)
12323 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
12324 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
12325 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12326 - ;;
12327 + cd ..
12328 + rm -rf conftest.dir
12329 +else
12330 + am_cv_$1_dependencies_compiler_type=none
12331 +fi
12332 +])
12333 +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
12334 +AM_CONDITIONAL([am__fastdep$1], [
12335 + test "x$enable_dependency_tracking" != xno \
12336 + && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
12337 +])
12338
12339 - freebsd1*)
12340 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
12341 - ;;
12342
12343 - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
12344 - # support. Future versions do this automatically, but an explicit c++rt0.o
12345 - # does not break anything, and helps significantly (at the cost of a little
12346 - # extra space).
12347 - freebsd2.2*)
12348 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
12349 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
12350 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
12351 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12352 - ;;
12353 +# AM_SET_DEPDIR
12354 +# -------------
12355 +# Choose a directory name for dependency files.
12356 +# This macro is AC_REQUIREd in _AM_DEPENDENCIES
12357 +AC_DEFUN([AM_SET_DEPDIR],
12358 +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
12359 +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
12360 +])
12361
12362 - # Unfortunately, older versions of FreeBSD 2 do not have this feature.
12363 - freebsd2*)
12364 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
12365 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
12366 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
12367 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12368 - ;;
12369
12370 - # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
12371 - freebsd* | kfreebsd*-gnu | dragonfly*)
12372 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
12373 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
12374 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
12375 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12376 - ;;
12377 +# AM_DEP_TRACK
12378 +# ------------
12379 +AC_DEFUN([AM_DEP_TRACK],
12380 +[AC_ARG_ENABLE(dependency-tracking,
12381 +[ --disable-dependency-tracking speeds up one-time build
12382 + --enable-dependency-tracking do not reject slow dependency extractors])
12383 +if test "x$enable_dependency_tracking" != xno; then
12384 + am_depcomp="$ac_aux_dir/depcomp"
12385 + AMDEPBACKSLASH='\'
12386 +fi
12387 +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
12388 +AC_SUBST([AMDEPBACKSLASH])dnl
12389 +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
12390 +])
12391
12392 - hpux9*)
12393 - if test "$GCC" = yes; then
12394 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
12395 - else
12396 - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
12397 - fi
12398 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
12399 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
12400 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
12401 +# Generate code to set up dependency tracking. -*- Autoconf -*-
12402
12403 - # hardcode_minus_L: Not really in the search PATH,
12404 - # but as the default location of the library.
12405 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
12406 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
12407 - ;;
12408 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
12409 +# Free Software Foundation, Inc.
12410 +#
12411 +# This file is free software; the Free Software Foundation
12412 +# gives unlimited permission to copy and/or distribute it,
12413 +# with or without modifications, as long as this notice is preserved.
12414
12415 - hpux10*)
12416 - if test "$GCC" = yes -a "$with_gnu_ld" = no; then
12417 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12418 - else
12419 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
12420 - fi
12421 - if test "$with_gnu_ld" = no; then
12422 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
12423 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
12424 +#serial 3
12425
12426 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
12427 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
12428 +# _AM_OUTPUT_DEPENDENCY_COMMANDS
12429 +# ------------------------------
12430 +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
12431 +[for mf in $CONFIG_FILES; do
12432 + # Strip MF so we end up with the name of the file.
12433 + mf=`echo "$mf" | sed -e 's/:.*$//'`
12434 + # Check whether this is an Automake generated Makefile or not.
12435 + # We used to match only the files named `Makefile.in', but
12436 + # some people rename them; so instead we look at the file content.
12437 + # Grep'ing the first line is not enough: some people post-process
12438 + # each Makefile.in and add a new line on top of each file to say so.
12439 + # Grep'ing the whole file is not good either: AIX grep has a line
12440 + # limit of 2048, but all sed's we know have understand at least 4000.
12441 + if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
12442 + dirpart=`AS_DIRNAME("$mf")`
12443 + else
12444 + continue
12445 + fi
12446 + # Extract the definition of DEPDIR, am__include, and am__quote
12447 + # from the Makefile without running `make'.
12448 + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
12449 + test -z "$DEPDIR" && continue
12450 + am__include=`sed -n 's/^am__include = //p' < "$mf"`
12451 + test -z "am__include" && continue
12452 + am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
12453 + # When using ansi2knr, U may be empty or an underscore; expand it
12454 + U=`sed -n 's/^U = //p' < "$mf"`
12455 + # Find all dependency output files, they are included files with
12456 + # $(DEPDIR) in their names. We invoke sed twice because it is the
12457 + # simplest approach to changing $(DEPDIR) to its actual value in the
12458 + # expansion.
12459 + for file in `sed -n "
12460 + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
12461 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
12462 + # Make sure the directory exists.
12463 + test -f "$dirpart/$file" && continue
12464 + fdir=`AS_DIRNAME(["$file"])`
12465 + AS_MKDIR_P([$dirpart/$fdir])
12466 + # echo "creating $dirpart/$file"
12467 + echo '# dummy' > "$dirpart/$file"
12468 + done
12469 +done
12470 +])# _AM_OUTPUT_DEPENDENCY_COMMANDS
12471
12472 - # hardcode_minus_L: Not really in the search PATH,
12473 - # but as the default location of the library.
12474 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
12475 - fi
12476 - ;;
12477
12478 - hpux11*)
12479 - if test "$GCC" = yes -a "$with_gnu_ld" = no; then
12480 - case $host_cpu in
12481 - hppa*64*)
12482 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
12483 - ;;
12484 - ia64*)
12485 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
12486 - ;;
12487 - *)
12488 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12489 - ;;
12490 - esac
12491 - else
12492 - case $host_cpu in
12493 - hppa*64*)
12494 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
12495 - ;;
12496 - ia64*)
12497 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
12498 - ;;
12499 - *)
12500 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
12501 - ;;
12502 - esac
12503 - fi
12504 - if test "$with_gnu_ld" = no; then
12505 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
12506 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
12507 +# AM_OUTPUT_DEPENDENCY_COMMANDS
12508 +# -----------------------------
12509 +# This macro should only be invoked once -- use via AC_REQUIRE.
12510 +#
12511 +# This code is only required when automatic dependency tracking
12512 +# is enabled. FIXME. This creates each `.P' file that we will
12513 +# need in order to bootstrap the dependency handling code.
12514 +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
12515 +[AC_CONFIG_COMMANDS([depfiles],
12516 + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
12517 + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
12518 +])
12519
12520 - case $host_cpu in
12521 - hppa*64*|ia64*)
12522 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
12523 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
12524 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12525 - ;;
12526 - *)
12527 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
12528 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
12529 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
12530 +# Free Software Foundation, Inc.
12531 +#
12532 +# This file is free software; the Free Software Foundation
12533 +# gives unlimited permission to copy and/or distribute it,
12534 +# with or without modifications, as long as this notice is preserved.
12535
12536 - # hardcode_minus_L: Not really in the search PATH,
12537 - # but as the default location of the library.
12538 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
12539 - ;;
12540 - esac
12541 - fi
12542 - ;;
12543 +# serial 8
12544
12545 - irix5* | irix6* | nonstopux*)
12546 - if test "$GCC" = yes; then
12547 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
12548 - else
12549 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
12550 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
12551 - fi
12552 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
12553 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
12554 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
12555 - ;;
12556 +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
12557 +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
12558
12559 - netbsd*)
12560 - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
12561 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
12562 - else
12563 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
12564 - fi
12565 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
12566 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
12567 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12568 - ;;
12569 +# Do all the work for Automake. -*- Autoconf -*-
12570
12571 - newsos6)
12572 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
12573 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
12574 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
12575 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
12576 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12577 - ;;
12578 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
12579 +# 2005, 2006 Free Software Foundation, Inc.
12580 +#
12581 +# This file is free software; the Free Software Foundation
12582 +# gives unlimited permission to copy and/or distribute it,
12583 +# with or without modifications, as long as this notice is preserved.
12584
12585 - openbsd*)
12586 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
12587 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12588 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
12589 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
12590 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
12591 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
12592 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
12593 - else
12594 - case $host_os in
12595 - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
12596 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
12597 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
12598 - ;;
12599 - *)
12600 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
12601 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
12602 - ;;
12603 - esac
12604 - fi
12605 - ;;
12606 +# serial 12
12607
12608 - os2*)
12609 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
12610 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
12611 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
12612 - _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
12613 - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
12614 - ;;
12615 +# This macro actually does too much. Some checks are only needed if
12616 +# your package does certain things. But this isn't really a big deal.
12617
12618 - osf3*)
12619 - if test "$GCC" = yes; then
12620 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
12621 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
12622 - else
12623 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
12624 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
12625 - fi
12626 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
12627 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
12628 - ;;
12629 +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
12630 +# AM_INIT_AUTOMAKE([OPTIONS])
12631 +# -----------------------------------------------
12632 +# The call with PACKAGE and VERSION arguments is the old style
12633 +# call (pre autoconf-2.50), which is being phased out. PACKAGE
12634 +# and VERSION should now be passed to AC_INIT and removed from
12635 +# the call to AM_INIT_AUTOMAKE.
12636 +# We support both call styles for the transition. After
12637 +# the next Automake release, Autoconf can make the AC_INIT
12638 +# arguments mandatory, and then we can depend on a new Autoconf
12639 +# release and drop the old call support.
12640 +AC_DEFUN([AM_INIT_AUTOMAKE],
12641 +[AC_PREREQ([2.60])dnl
12642 +dnl Autoconf wants to disallow AM_ names. We explicitly allow
12643 +dnl the ones we care about.
12644 +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
12645 +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
12646 +AC_REQUIRE([AC_PROG_INSTALL])dnl
12647 +if test "`cd $srcdir && pwd`" != "`pwd`"; then
12648 + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
12649 + # is not polluted with repeated "-I."
12650 + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
12651 + # test to see if srcdir already configured
12652 + if test -f $srcdir/config.status; then
12653 + AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
12654 + fi
12655 +fi
12656
12657 - osf4* | osf5*) # as osf3* with the addition of -msym flag
12658 - if test "$GCC" = yes; then
12659 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
12660 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
12661 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
12662 - else
12663 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
12664 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
12665 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
12666 - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
12667 +# test whether we have cygpath
12668 +if test -z "$CYGPATH_W"; then
12669 + if (cygpath --version) >/dev/null 2>/dev/null; then
12670 + CYGPATH_W='cygpath -w'
12671 + else
12672 + CYGPATH_W=echo
12673 + fi
12674 +fi
12675 +AC_SUBST([CYGPATH_W])
12676
12677 - # Both c and cxx compiler support -rpath directly
12678 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
12679 - fi
12680 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
12681 - ;;
12682 +# Define the identity of the package.
12683 +dnl Distinguish between old-style and new-style calls.
12684 +m4_ifval([$2],
12685 +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
12686 + AC_SUBST([PACKAGE], [$1])dnl
12687 + AC_SUBST([VERSION], [$2])],
12688 +[_AM_SET_OPTIONS([$1])dnl
12689 +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
12690 +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
12691 + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
12692 + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
12693 + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
12694
12695 - solaris*)
12696 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
12697 - if test "$GCC" = yes; then
12698 - wlarc='${wl}'
12699 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
12700 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
12701 - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
12702 - else
12703 - wlarc=''
12704 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
12705 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
12706 - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
12707 - fi
12708 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
12709 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12710 - case $host_os in
12711 - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
12712 - *)
12713 - # The compiler driver will combine linker options so we
12714 - # cannot just pass the convience library names through
12715 - # without $wl, iff we do not link with $LD.
12716 - # Luckily, gcc supports the same syntax we need for Sun Studio.
12717 - # Supported since Solaris 2.6 (maybe 2.5.1?)
12718 - case $wlarc in
12719 - '')
12720 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
12721 - *)
12722 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
12723 - esac ;;
12724 - esac
12725 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
12726 - ;;
12727 +_AM_IF_OPTION([no-define],,
12728 +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
12729 + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
12730
12731 - sunos4*)
12732 - if test "x$host_vendor" = xsequent; then
12733 - # Use $CC to link under sequent, because it throws in some extra .o
12734 - # files that make .init and .fini sections work.
12735 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
12736 - else
12737 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
12738 - fi
12739 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
12740 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes
12741 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
12742 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12743 - ;;
12744 +# Some tools Automake needs.
12745 +AC_REQUIRE([AM_SANITY_CHECK])dnl
12746 +AC_REQUIRE([AC_ARG_PROGRAM])dnl
12747 +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
12748 +AM_MISSING_PROG(AUTOCONF, autoconf)
12749 +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
12750 +AM_MISSING_PROG(AUTOHEADER, autoheader)
12751 +AM_MISSING_PROG(MAKEINFO, makeinfo)
12752 +AM_PROG_INSTALL_SH
12753 +AM_PROG_INSTALL_STRIP
12754 +AC_REQUIRE([AM_PROG_MKDIR_P])dnl
12755 +# We need awk for the "check" target. The system "awk" is bad on
12756 +# some platforms.
12757 +AC_REQUIRE([AC_PROG_AWK])dnl
12758 +AC_REQUIRE([AC_PROG_MAKE_SET])dnl
12759 +AC_REQUIRE([AM_SET_LEADING_DOT])dnl
12760 +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
12761 + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
12762 + [_AM_PROG_TAR([v7])])])
12763 +_AM_IF_OPTION([no-dependencies],,
12764 +[AC_PROVIDE_IFELSE([AC_PROG_CC],
12765 + [_AM_DEPENDENCIES(CC)],
12766 + [define([AC_PROG_CC],
12767 + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
12768 +AC_PROVIDE_IFELSE([AC_PROG_CXX],
12769 + [_AM_DEPENDENCIES(CXX)],
12770 + [define([AC_PROG_CXX],
12771 + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
12772 +AC_PROVIDE_IFELSE([AC_PROG_OBJC],
12773 + [_AM_DEPENDENCIES(OBJC)],
12774 + [define([AC_PROG_OBJC],
12775 + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
12776 +])
12777 +])
12778
12779 - sysv4)
12780 - case $host_vendor in
12781 - sni)
12782 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
12783 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
12784 - ;;
12785 - siemens)
12786 - ## LD is ld it makes a PLAMLIB
12787 - ## CC just makes a GrossModule.
12788 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
12789 - _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
12790 - _LT_AC_TAGVAR(hardcode_direct, $1)=no
12791 - ;;
12792 - motorola)
12793 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
12794 - _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
12795 - ;;
12796 - esac
12797 - runpath_var='LD_RUN_PATH'
12798 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12799 - ;;
12800
12801 - sysv4.3*)
12802 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
12803 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12804 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
12805 - ;;
12806 +# When config.status generates a header, we must update the stamp-h file.
12807 +# This file resides in the same directory as the config header
12808 +# that is generated. The stamp files are numbered to have different names.
12809
12810 - sysv4*MP*)
12811 - if test -d /usr/nec; then
12812 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
12813 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12814 - runpath_var=LD_RUN_PATH
12815 - hardcode_runpath_var=yes
12816 - _LT_AC_TAGVAR(ld_shlibs, $1)=yes
12817 - fi
12818 - ;;
12819 +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
12820 +# loop where config.status creates the headers, so we can generate
12821 +# our stamp files there.
12822 +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
12823 +[# Compute $1's index in $config_headers.
12824 +_am_stamp_count=1
12825 +for _am_header in $config_headers :; do
12826 + case $_am_header in
12827 + $1 | $1:* )
12828 + break ;;
12829 + * )
12830 + _am_stamp_count=`expr $_am_stamp_count + 1` ;;
12831 + esac
12832 +done
12833 +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
12834
12835 - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
12836 - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
12837 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
12838 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12839 - runpath_var='LD_RUN_PATH'
12840 +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
12841 +#
12842 +# This file is free software; the Free Software Foundation
12843 +# gives unlimited permission to copy and/or distribute it,
12844 +# with or without modifications, as long as this notice is preserved.
12845
12846 - if test "$GCC" = yes; then
12847 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
12848 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
12849 - else
12850 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
12851 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
12852 - fi
12853 - ;;
12854 +# AM_PROG_INSTALL_SH
12855 +# ------------------
12856 +# Define $install_sh.
12857 +AC_DEFUN([AM_PROG_INSTALL_SH],
12858 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
12859 +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
12860 +AC_SUBST(install_sh)])
12861
12862 - sysv5* | sco3.2v5* | sco5v6*)
12863 - # Note: We can NOT use -z defs as we might desire, because we do not
12864 - # link with -lc, and that would cause any symbols used from libc to
12865 - # always be unresolved, which means just about no library would
12866 - # ever link correctly. If we're not using GNU ld we use -z text
12867 - # though, which does catch some bad symbols but isn't as heavy-handed
12868 - # as -z defs.
12869 - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
12870 - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
12871 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
12872 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12873 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
12874 - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
12875 - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
12876 - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
12877 - runpath_var='LD_RUN_PATH'
12878 +# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
12879 +#
12880 +# This file is free software; the Free Software Foundation
12881 +# gives unlimited permission to copy and/or distribute it,
12882 +# with or without modifications, as long as this notice is preserved.
12883
12884 - if test "$GCC" = yes; then
12885 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
12886 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
12887 - else
12888 - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
12889 - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
12890 - fi
12891 - ;;
12892 +# serial 2
12893
12894 - uts4*)
12895 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
12896 - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
12897 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
12898 - ;;
12899 +# Check whether the underlying file-system supports filenames
12900 +# with a leading dot. For instance MS-DOS doesn't.
12901 +AC_DEFUN([AM_SET_LEADING_DOT],
12902 +[rm -rf .tst 2>/dev/null
12903 +mkdir .tst 2>/dev/null
12904 +if test -d .tst; then
12905 + am__leading_dot=.
12906 +else
12907 + am__leading_dot=_
12908 +fi
12909 +rmdir .tst 2>/dev/null
12910 +AC_SUBST([am__leading_dot])])
12911
12912 - *)
12913 - _LT_AC_TAGVAR(ld_shlibs, $1)=no
12914 - ;;
12915 - esac
12916 - fi
12917 -])
12918 -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
12919 -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
12920 +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
12921 +# From Jim Meyering
12922
12923 +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
12924 +# Free Software Foundation, Inc.
12925 #
12926 -# Do we need to explicitly link libc?
12927 +# This file is free software; the Free Software Foundation
12928 +# gives unlimited permission to copy and/or distribute it,
12929 +# with or without modifications, as long as this notice is preserved.
12930 +
12931 +# serial 4
12932 +
12933 +AC_DEFUN([AM_MAINTAINER_MODE],
12934 +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
12935 + dnl maintainer-mode is disabled by default
12936 + AC_ARG_ENABLE(maintainer-mode,
12937 +[ --enable-maintainer-mode enable make rules and dependencies not useful
12938 + (and sometimes confusing) to the casual installer],
12939 + USE_MAINTAINER_MODE=$enableval,
12940 + USE_MAINTAINER_MODE=no)
12941 + AC_MSG_RESULT([$USE_MAINTAINER_MODE])
12942 + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
12943 + MAINT=$MAINTAINER_MODE_TRUE
12944 + AC_SUBST(MAINT)dnl
12945 +]
12946 +)
12947 +
12948 +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
12949 +
12950 +# Check to see how 'make' treats includes. -*- Autoconf -*-
12951 +
12952 +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
12953 #
12954 -case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
12955 -x|xyes)
12956 - # Assume -lc should be added
12957 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
12958 +# This file is free software; the Free Software Foundation
12959 +# gives unlimited permission to copy and/or distribute it,
12960 +# with or without modifications, as long as this notice is preserved.
12961
12962 - if test "$enable_shared" = yes && test "$GCC" = yes; then
12963 - case $_LT_AC_TAGVAR(archive_cmds, $1) in
12964 - *'~'*)
12965 - # FIXME: we may have to deal with multi-command sequences.
12966 - ;;
12967 - '$CC '*)
12968 - # Test whether the compiler implicitly links with -lc since on some
12969 - # systems, -lgcc has to come before -lc. If gcc already passes -lc
12970 - # to ld, don't add -lc before -lgcc.
12971 - AC_MSG_CHECKING([whether -lc should be explicitly linked in])
12972 - $rm conftest*
12973 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
12974 +# serial 3
12975
12976 - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
12977 - soname=conftest
12978 - lib=conftest
12979 - libobjs=conftest.$ac_objext
12980 - deplibs=
12981 - wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
12982 - pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
12983 - compiler_flags=-v
12984 - linker_flags=-v
12985 - verstring=
12986 - output_objdir=.
12987 - libname=conftest
12988 - lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
12989 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=
12990 - if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
12991 - then
12992 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
12993 - else
12994 - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
12995 - fi
12996 - _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
12997 - else
12998 - cat conftest.err 1>&5
12999 - fi
13000 - $rm conftest*
13001 - AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
13002 - ;;
13003 - esac
13004 - fi
13005 - ;;
13006 -esac
13007 -])# AC_LIBTOOL_PROG_LD_SHLIBS
13008 +# AM_MAKE_INCLUDE()
13009 +# -----------------
13010 +# Check to see how make treats includes.
13011 +AC_DEFUN([AM_MAKE_INCLUDE],
13012 +[am_make=${MAKE-make}
13013 +cat > confinc << 'END'
13014 +am__doit:
13015 + @echo done
13016 +.PHONY: am__doit
13017 +END
13018 +# If we don't find an include directive, just comment out the code.
13019 +AC_MSG_CHECKING([for style of include used by $am_make])
13020 +am__include="#"
13021 +am__quote=
13022 +_am_result=none
13023 +# First try GNU make style include.
13024 +echo "include confinc" > confmf
13025 +# We grep out `Entering directory' and `Leaving directory'
13026 +# messages which can occur if `w' ends up in MAKEFLAGS.
13027 +# In particular we don't look at `^make:' because GNU make might
13028 +# be invoked under some other name (usually "gmake"), in which
13029 +# case it prints its new name instead of `make'.
13030 +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
13031 + am__include=include
13032 + am__quote=
13033 + _am_result=GNU
13034 +fi
13035 +# Now try BSD make style include.
13036 +if test "$am__include" = "#"; then
13037 + echo '.include "confinc"' > confmf
13038 + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
13039 + am__include=.include
13040 + am__quote="\""
13041 + _am_result=BSD
13042 + fi
13043 +fi
13044 +AC_SUBST([am__include])
13045 +AC_SUBST([am__quote])
13046 +AC_MSG_RESULT([$_am_result])
13047 +rm -f confinc confmf
13048 +])
13049
13050 +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
13051
13052 -# _LT_AC_FILE_LTDLL_C
13053 -# -------------------
13054 -# Be careful that the start marker always follows a newline.
13055 -AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
13056 -# /* ltdll.c starts here */
13057 -# #define WIN32_LEAN_AND_MEAN
13058 -# #include <windows.h>
13059 -# #undef WIN32_LEAN_AND_MEAN
13060 -# #include <stdio.h>
13061 -#
13062 -# #ifndef __CYGWIN__
13063 -# # ifdef __CYGWIN32__
13064 -# # define __CYGWIN__ __CYGWIN32__
13065 -# # endif
13066 -# #endif
13067 -#
13068 -# #ifdef __cplusplus
13069 -# extern "C" {
13070 -# #endif
13071 -# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
13072 -# #ifdef __cplusplus
13073 -# }
13074 -# #endif
13075 -#
13076 -# #ifdef __CYGWIN__
13077 -# #include <cygwin/cygwin_dll.h>
13078 -# DECLARE_CYGWIN_DLL( DllMain );
13079 -# #endif
13080 -# HINSTANCE __hDllInstance_base;
13081 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
13082 +# Free Software Foundation, Inc.
13083 #
13084 -# BOOL APIENTRY
13085 -# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
13086 -# {
13087 -# __hDllInstance_base = hInst;
13088 -# return TRUE;
13089 -# }
13090 -# /* ltdll.c ends here */
13091 -])# _LT_AC_FILE_LTDLL_C
13092 -
13093 -
13094 -# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
13095 -# ---------------------------------
13096 -AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
13097 +# This file is free software; the Free Software Foundation
13098 +# gives unlimited permission to copy and/or distribute it,
13099 +# with or without modifications, as long as this notice is preserved.
13100
13101 +# serial 5
13102
13103 -# old names
13104 -AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
13105 -AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
13106 -AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
13107 -AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
13108 -AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
13109 -AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
13110 -AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
13111 +# AM_MISSING_PROG(NAME, PROGRAM)
13112 +# ------------------------------
13113 +AC_DEFUN([AM_MISSING_PROG],
13114 +[AC_REQUIRE([AM_MISSING_HAS_RUN])
13115 +$1=${$1-"${am_missing_run}$2"}
13116 +AC_SUBST($1)])
13117
13118 -# This is just to silence aclocal about the macro not being used
13119 -ifelse([AC_DISABLE_FAST_INSTALL])
13120
13121 -AC_DEFUN([LT_AC_PROG_GCJ],
13122 -[AC_CHECK_TOOL(GCJ, gcj, no)
13123 - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
13124 - AC_SUBST(GCJFLAGS)
13125 +# AM_MISSING_HAS_RUN
13126 +# ------------------
13127 +# Define MISSING if not defined so far and test if it supports --run.
13128 +# If it does, set am_missing_run to use it, otherwise, to nothing.
13129 +AC_DEFUN([AM_MISSING_HAS_RUN],
13130 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
13131 +AC_REQUIRE_AUX_FILE([missing])dnl
13132 +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
13133 +# Use eval to expand $SHELL
13134 +if eval "$MISSING --run true"; then
13135 + am_missing_run="$MISSING --run "
13136 +else
13137 + am_missing_run=
13138 + AC_MSG_WARN([`missing' script is too old or missing])
13139 +fi
13140 ])
13141
13142 -AC_DEFUN([LT_AC_PROG_RC],
13143 -[AC_CHECK_TOOL(RC, windres, no)
13144 -])
13145 +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
13146 +#
13147 +# This file is free software; the Free Software Foundation
13148 +# gives unlimited permission to copy and/or distribute it,
13149 +# with or without modifications, as long as this notice is preserved.
13150
13151 -# NOTE: This macro has been submitted for inclusion into #
13152 -# GNU Autoconf as AC_PROG_SED. When it is available in #
13153 -# a released version of Autoconf we should remove this #
13154 -# macro and use it instead. #
13155 -# LT_AC_PROG_SED
13156 -# --------------
13157 -# Check for a fully-functional sed program, that truncates
13158 -# as few characters as possible. Prefer GNU sed if found.
13159 -AC_DEFUN([LT_AC_PROG_SED],
13160 -[AC_MSG_CHECKING([for a sed that does not truncate output])
13161 -AC_CACHE_VAL(lt_cv_path_SED,
13162 -[# Loop through the user's path and test for sed and gsed.
13163 -# Then use that list of sed's as ones to test for truncation.
13164 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13165 -for as_dir in $PATH
13166 -do
13167 - IFS=$as_save_IFS
13168 - test -z "$as_dir" && as_dir=.
13169 - for lt_ac_prog in sed gsed; do
13170 - for ac_exec_ext in '' $ac_executable_extensions; do
13171 - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
13172 - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
13173 - fi
13174 - done
13175 - done
13176 -done
13177 -lt_ac_max=0
13178 -lt_ac_count=0
13179 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris
13180 -# along with /bin/sed that truncates output.
13181 -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
13182 - test ! -f $lt_ac_sed && continue
13183 - cat /dev/null > conftest.in
13184 - lt_ac_count=0
13185 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in
13186 - # Check for GNU sed and select it if it is found.
13187 - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
13188 - lt_cv_path_SED=$lt_ac_sed
13189 - break
13190 - fi
13191 - while true; do
13192 - cat conftest.in conftest.in >conftest.tmp
13193 - mv conftest.tmp conftest.in
13194 - cp conftest.in conftest.nl
13195 - echo >>conftest.nl
13196 - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
13197 - cmp -s conftest.out conftest.nl || break
13198 - # 10000 chars as input seems more than enough
13199 - test $lt_ac_count -gt 10 && break
13200 - lt_ac_count=`expr $lt_ac_count + 1`
13201 - if test $lt_ac_count -gt $lt_ac_max; then
13202 - lt_ac_max=$lt_ac_count
13203 - lt_cv_path_SED=$lt_ac_sed
13204 - fi
13205 - done
13206 -done
13207 -])
13208 -SED=$lt_cv_path_SED
13209 -AC_MSG_RESULT([$SED])
13210 +# AM_PROG_MKDIR_P
13211 +# ---------------
13212 +# Check for `mkdir -p'.
13213 +AC_DEFUN([AM_PROG_MKDIR_P],
13214 +[AC_PREREQ([2.60])dnl
13215 +AC_REQUIRE([AC_PROG_MKDIR_P])dnl
13216 +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
13217 +dnl while keeping a definition of mkdir_p for backward compatibility.
13218 +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
13219 +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
13220 +dnl Makefile.ins that do not define MKDIR_P, so we do our own
13221 +dnl adjustment using top_builddir (which is defined more often than
13222 +dnl MKDIR_P).
13223 +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
13224 +case $mkdir_p in
13225 + [[\\/$]]* | ?:[[\\/]]*) ;;
13226 + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
13227 +esac
13228 ])
13229
13230 -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
13231 -#
13232 -# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
13233 -#
13234 -# This program is free software; you can redistribute it and/or modify
13235 -# it under the terms of the GNU General Public License as published by
13236 -# the Free Software Foundation; either version 2 of the License, or
13237 -# (at your option) any later version.
13238 -#
13239 -# This program is distributed in the hope that it will be useful, but
13240 -# WITHOUT ANY WARRANTY; without even the implied warranty of
13241 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13242 -# General Public License for more details.
13243 -#
13244 -# You should have received a copy of the GNU General Public License
13245 -# along with this program; if not, write to the Free Software
13246 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
13247 +# Helper functions for option handling. -*- Autoconf -*-
13248 +
13249 +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
13250 #
13251 -# As a special exception to the GNU General Public License, if you
13252 -# distribute this file as part of a program that contains a
13253 -# configuration script generated by Autoconf, you may include it under
13254 -# the same distribution terms that you use for the rest of that program.
13255 +# This file is free software; the Free Software Foundation
13256 +# gives unlimited permission to copy and/or distribute it,
13257 +# with or without modifications, as long as this notice is preserved.
13258
13259 -# PKG_PROG_PKG_CONFIG([MIN-VERSION])
13260 +# serial 3
13261 +
13262 +# _AM_MANGLE_OPTION(NAME)
13263 +# -----------------------
13264 +AC_DEFUN([_AM_MANGLE_OPTION],
13265 +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
13266 +
13267 +# _AM_SET_OPTION(NAME)
13268 +# ------------------------------
13269 +# Set option NAME. Presently that only means defining a flag for this option.
13270 +AC_DEFUN([_AM_SET_OPTION],
13271 +[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
13272 +
13273 +# _AM_SET_OPTIONS(OPTIONS)
13274 # ----------------------------------
13275 -AC_DEFUN([PKG_PROG_PKG_CONFIG],
13276 -[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
13277 -m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
13278 -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
13279 -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
13280 - AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
13281 -fi
13282 -if test -n "$PKG_CONFIG"; then
13283 - _pkg_min_version=m4_default([$1], [0.9.0])
13284 - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
13285 - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
13286 - AC_MSG_RESULT([yes])
13287 - else
13288 - AC_MSG_RESULT([no])
13289 - PKG_CONFIG=""
13290 - fi
13291 -
13292 -fi[]dnl
13293 -])# PKG_PROG_PKG_CONFIG
13294 +# OPTIONS is a space-separated list of Automake options.
13295 +AC_DEFUN([_AM_SET_OPTIONS],
13296 +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
13297
13298 -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
13299 -#
13300 -# Check to see whether a particular set of modules exists. Similar
13301 -# to PKG_CHECK_MODULES(), but does not set variables or print errors.
13302 -#
13303 +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
13304 +# -------------------------------------------
13305 +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
13306 +AC_DEFUN([_AM_IF_OPTION],
13307 +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
13308 +
13309 +# Check to make sure that the build environment is sane. -*- Autoconf -*-
13310 +
13311 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
13312 +# Free Software Foundation, Inc.
13313 #
13314 -# Similar to PKG_CHECK_MODULES, make sure that the first instance of
13315 -# this or PKG_CHECK_MODULES is called, or make sure to call
13316 -# PKG_CHECK_EXISTS manually
13317 -# --------------------------------------------------------------
13318 -AC_DEFUN([PKG_CHECK_EXISTS],
13319 -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
13320 -if test -n "$PKG_CONFIG" && \
13321 - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
13322 - m4_ifval([$2], [$2], [:])
13323 -m4_ifvaln([$3], [else
13324 - $3])dnl
13325 -fi])
13326 +# This file is free software; the Free Software Foundation
13327 +# gives unlimited permission to copy and/or distribute it,
13328 +# with or without modifications, as long as this notice is preserved.
13329
13330 +# serial 4
13331
13332 -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
13333 -# ---------------------------------------------
13334 -m4_define([_PKG_CONFIG],
13335 -[if test -n "$PKG_CONFIG"; then
13336 - if test -n "$$1"; then
13337 - pkg_cv_[]$1="$$1"
13338 - else
13339 - PKG_CHECK_EXISTS([$3],
13340 - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
13341 - [pkg_failed=yes])
13342 - fi
13343 -else
13344 - pkg_failed=untried
13345 -fi[]dnl
13346 -])# _PKG_CONFIG
13347 +# AM_SANITY_CHECK
13348 +# ---------------
13349 +AC_DEFUN([AM_SANITY_CHECK],
13350 +[AC_MSG_CHECKING([whether build environment is sane])
13351 +# Just in case
13352 +sleep 1
13353 +echo timestamp > conftest.file
13354 +# Do `set' in a subshell so we don't clobber the current shell's
13355 +# arguments. Must try -L first in case configure is actually a
13356 +# symlink; some systems play weird games with the mod time of symlinks
13357 +# (eg FreeBSD returns the mod time of the symlink's containing
13358 +# directory).
13359 +if (
13360 + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
13361 + if test "$[*]" = "X"; then
13362 + # -L didn't work.
13363 + set X `ls -t $srcdir/configure conftest.file`
13364 + fi
13365 + rm -f conftest.file
13366 + if test "$[*]" != "X $srcdir/configure conftest.file" \
13367 + && test "$[*]" != "X conftest.file $srcdir/configure"; then
13368
13369 -# _PKG_SHORT_ERRORS_SUPPORTED
13370 -# -----------------------------
13371 -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
13372 -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
13373 -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13374 - _pkg_short_errors_supported=yes
13375 -else
13376 - _pkg_short_errors_supported=no
13377 -fi[]dnl
13378 -])# _PKG_SHORT_ERRORS_SUPPORTED
13379 + # If neither matched, then we have a broken ls. This can happen
13380 + # if, for instance, CONFIG_SHELL is bash and it inherits a
13381 + # broken ls alias from the environment. This has actually
13382 + # happened. Such a system could not be considered "sane".
13383 + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
13384 +alias in your environment])
13385 + fi
13386
13387 + test "$[2]" = conftest.file
13388 + )
13389 +then
13390 + # Ok.
13391 + :
13392 +else
13393 + AC_MSG_ERROR([newly created file is older than distributed files!
13394 +Check your system clock])
13395 +fi
13396 +AC_MSG_RESULT(yes)])
13397
13398 -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
13399 -# [ACTION-IF-NOT-FOUND])
13400 -#
13401 -#
13402 -# Note that if there is a possibility the first call to
13403 -# PKG_CHECK_MODULES might not happen, you should be sure to include an
13404 -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
13405 -#
13406 +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
13407 #
13408 -# --------------------------------------------------------------
13409 -AC_DEFUN([PKG_CHECK_MODULES],
13410 -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
13411 -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
13412 -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
13413 +# This file is free software; the Free Software Foundation
13414 +# gives unlimited permission to copy and/or distribute it,
13415 +# with or without modifications, as long as this notice is preserved.
13416
13417 -pkg_failed=no
13418 -AC_MSG_CHECKING([for $1])
13419 +# AM_PROG_INSTALL_STRIP
13420 +# ---------------------
13421 +# One issue with vendor `install' (even GNU) is that you can't
13422 +# specify the program used to strip binaries. This is especially
13423 +# annoying in cross-compiling environments, where the build's strip
13424 +# is unlikely to handle the host's binaries.
13425 +# Fortunately install-sh will honor a STRIPPROG variable, so we
13426 +# always use install-sh in `make install-strip', and initialize
13427 +# STRIPPROG with the value of the STRIP variable (set by the user).
13428 +AC_DEFUN([AM_PROG_INSTALL_STRIP],
13429 +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
13430 +# Installed binaries are usually stripped using `strip' when the user
13431 +# run `make install-strip'. However `strip' might not be the right
13432 +# tool to use in cross-compilation environments, therefore Automake
13433 +# will honor the `STRIP' environment variable to overrule this program.
13434 +dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
13435 +if test "$cross_compiling" != no; then
13436 + AC_CHECK_TOOL([STRIP], [strip], :)
13437 +fi
13438 +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
13439 +AC_SUBST([INSTALL_STRIP_PROGRAM])])
13440
13441 -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
13442 -_PKG_CONFIG([$1][_LIBS], [libs], [$2])
13443 +# Copyright (C) 2006 Free Software Foundation, Inc.
13444 +#
13445 +# This file is free software; the Free Software Foundation
13446 +# gives unlimited permission to copy and/or distribute it,
13447 +# with or without modifications, as long as this notice is preserved.
13448
13449 -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
13450 -and $1[]_LIBS to avoid the need to call pkg-config.
13451 -See the pkg-config man page for more details.])
13452 +# _AM_SUBST_NOTMAKE(VARIABLE)
13453 +# ---------------------------
13454 +# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
13455 +# This macro is traced by Automake.
13456 +AC_DEFUN([_AM_SUBST_NOTMAKE])
13457
13458 -if test $pkg_failed = yes; then
13459 - _PKG_SHORT_ERRORS_SUPPORTED
13460 - if test $_pkg_short_errors_supported = yes; then
13461 - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
13462 - else
13463 - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
13464 - fi
13465 - # Put the nasty error message in config.log where it belongs
13466 - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
13467 +# Check how to create a tarball. -*- Autoconf -*-
13468
13469 - ifelse([$4], , [AC_MSG_ERROR(dnl
13470 -[Package requirements ($2) were not met:
13471 +# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
13472 +#
13473 +# This file is free software; the Free Software Foundation
13474 +# gives unlimited permission to copy and/or distribute it,
13475 +# with or without modifications, as long as this notice is preserved.
13476
13477 -$$1_PKG_ERRORS
13478 +# serial 2
13479
13480 -Consider adjusting the PKG_CONFIG_PATH environment variable if you
13481 -installed software in a non-standard prefix.
13482 +# _AM_PROG_TAR(FORMAT)
13483 +# --------------------
13484 +# Check how to create a tarball in format FORMAT.
13485 +# FORMAT should be one of `v7', `ustar', or `pax'.
13486 +#
13487 +# Substitute a variable $(am__tar) that is a command
13488 +# writing to stdout a FORMAT-tarball containing the directory
13489 +# $tardir.
13490 +# tardir=directory && $(am__tar) > result.tar
13491 +#
13492 +# Substitute a variable $(am__untar) that extract such
13493 +# a tarball read from stdin.
13494 +# $(am__untar) < result.tar
13495 +AC_DEFUN([_AM_PROG_TAR],
13496 +[# Always define AMTAR for backward compatibility.
13497 +AM_MISSING_PROG([AMTAR], [tar])
13498 +m4_if([$1], [v7],
13499 + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
13500 + [m4_case([$1], [ustar],, [pax],,
13501 + [m4_fatal([Unknown tar format])])
13502 +AC_MSG_CHECKING([how to create a $1 tar archive])
13503 +# Loop over all known methods to create a tar archive until one works.
13504 +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
13505 +_am_tools=${am_cv_prog_tar_$1-$_am_tools}
13506 +# Do not fold the above two line into one, because Tru64 sh and
13507 +# Solaris sh will not grok spaces in the rhs of `-'.
13508 +for _am_tool in $_am_tools
13509 +do
13510 + case $_am_tool in
13511 + gnutar)
13512 + for _am_tar in tar gnutar gtar;
13513 + do
13514 + AM_RUN_LOG([$_am_tar --version]) && break
13515 + done
13516 + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
13517 + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
13518 + am__untar="$_am_tar -xf -"
13519 + ;;
13520 + plaintar)
13521 + # Must skip GNU tar: if it does not support --format= it doesn't create
13522 + # ustar tarball either.
13523 + (tar --version) >/dev/null 2>&1 && continue
13524 + am__tar='tar chf - "$$tardir"'
13525 + am__tar_='tar chf - "$tardir"'
13526 + am__untar='tar xf -'
13527 + ;;
13528 + pax)
13529 + am__tar='pax -L -x $1 -w "$$tardir"'
13530 + am__tar_='pax -L -x $1 -w "$tardir"'
13531 + am__untar='pax -r'
13532 + ;;
13533 + cpio)
13534 + am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
13535 + am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
13536 + am__untar='cpio -i -H $1 -d'
13537 + ;;
13538 + none)
13539 + am__tar=false
13540 + am__tar_=false
13541 + am__untar=false
13542 + ;;
13543 + esac
13544
13545 -_PKG_TEXT
13546 -])],
13547 - [$4])
13548 -elif test $pkg_failed = untried; then
13549 - ifelse([$4], , [AC_MSG_FAILURE(dnl
13550 -[The pkg-config script could not be found or is too old. Make sure it
13551 -is in your PATH or set the PKG_CONFIG environment variable to the full
13552 -path to pkg-config.
13553 + # If the value was cached, stop now. We just wanted to have am__tar
13554 + # and am__untar set.
13555 + test -n "${am_cv_prog_tar_$1}" && break
13556
13557 -_PKG_TEXT
13558 + # tar/untar a dummy directory, and stop if the command works
13559 + rm -rf conftest.dir
13560 + mkdir conftest.dir
13561 + echo GrepMe > conftest.dir/file
13562 + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
13563 + rm -rf conftest.dir
13564 + if test -s conftest.tar; then
13565 + AM_RUN_LOG([$am__untar <conftest.tar])
13566 + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
13567 + fi
13568 +done
13569 +rm -rf conftest.dir
13570
13571 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
13572 - [$4])
13573 -else
13574 - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
13575 - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
13576 - AC_MSG_RESULT([yes])
13577 - ifelse([$3], , :, [$3])
13578 -fi[]dnl
13579 -])# PKG_CHECK_MODULES
13580 +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
13581 +AC_MSG_RESULT([$am_cv_prog_tar_$1])])
13582 +AC_SUBST([am__tar])
13583 +AC_SUBST([am__untar])
13584 +]) # _AM_PROG_TAR
13585
13586 m4_include([m4/d-type.m4])
13587 m4_include([m4/gnome-doc-utils.m4])
13588 diff -Naur gnome-panel-2.20.3.old/applets/clock/e-map/Makefile.in gnome-panel-2.20.3/applets/clock/e-map/Makefile.in
13589 --- gnome-panel-2.20.3.old/applets/clock/e-map/Makefile.in 2008-01-07 23:35:47.000000000 +0100
13590 +++ gnome-panel-2.20.3/applets/clock/e-map/Makefile.in 2008-01-12 07:11:55.000000000 +0100
13591 @@ -162,6 +162,8 @@
13592 LIBTOOL = @LIBTOOL@
13593 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
13594 LN_S = @LN_S@
13595 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
13596 +LOGOUT_LIBS = @LOGOUT_LIBS@
13597 LTLIBOBJS = @LTLIBOBJS@
13598 MAINT = @MAINT@
13599 MAKEINFO = @MAKEINFO@
13600 @@ -192,6 +194,7 @@
13601 RANLIB = @RANLIB@
13602 REBUILD = @REBUILD@
13603 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
13604 +SED = @SED@
13605 SET_MAKE = @SET_MAKE@
13606 SHELL = @SHELL@
13607 STRIP = @STRIP@
13608 diff -Naur gnome-panel-2.20.3.old/applets/clock/Makefile.in gnome-panel-2.20.3/applets/clock/Makefile.in
13609 --- gnome-panel-2.20.3.old/applets/clock/Makefile.in 2008-01-07 23:35:46.000000000 +0100
13610 +++ gnome-panel-2.20.3/applets/clock/Makefile.in 2008-01-12 07:11:54.000000000 +0100
13611 @@ -244,6 +244,8 @@
13612 LIBTOOL = @LIBTOOL@
13613 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
13614 LN_S = @LN_S@
13615 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
13616 +LOGOUT_LIBS = @LOGOUT_LIBS@
13617 LTLIBOBJS = @LTLIBOBJS@
13618 MAINT = @MAINT@
13619 MAKEINFO = @MAKEINFO@
13620 @@ -274,6 +276,7 @@
13621 RANLIB = @RANLIB@
13622 REBUILD = @REBUILD@
13623 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
13624 +SED = @SED@
13625 SET_MAKE = @SET_MAKE@
13626 SHELL = @SHELL@
13627 STRIP = @STRIP@
13628 diff -Naur gnome-panel-2.20.3.old/applets/fish/Makefile.in gnome-panel-2.20.3/applets/fish/Makefile.in
13629 --- gnome-panel-2.20.3.old/applets/fish/Makefile.in 2008-01-07 23:35:48.000000000 +0100
13630 +++ gnome-panel-2.20.3/applets/fish/Makefile.in 2008-01-12 07:11:55.000000000 +0100
13631 @@ -205,6 +205,8 @@
13632 LIBTOOL = @LIBTOOL@
13633 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
13634 LN_S = @LN_S@
13635 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
13636 +LOGOUT_LIBS = @LOGOUT_LIBS@
13637 LTLIBOBJS = @LTLIBOBJS@
13638 MAINT = @MAINT@
13639 MAKEINFO = @MAKEINFO@
13640 @@ -235,6 +237,7 @@
13641 RANLIB = @RANLIB@
13642 REBUILD = @REBUILD@
13643 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
13644 +SED = @SED@
13645 SET_MAKE = @SET_MAKE@
13646 SHELL = @SHELL@
13647 STRIP = @STRIP@
13648 diff -Naur gnome-panel-2.20.3.old/applets/Makefile.in gnome-panel-2.20.3/applets/Makefile.in
13649 --- gnome-panel-2.20.3.old/applets/Makefile.in 2008-01-07 23:35:45.000000000 +0100
13650 +++ gnome-panel-2.20.3/applets/Makefile.in 2008-01-12 07:11:54.000000000 +0100
13651 @@ -152,6 +152,8 @@
13652 LIBTOOL = @LIBTOOL@
13653 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
13654 LN_S = @LN_S@
13655 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
13656 +LOGOUT_LIBS = @LOGOUT_LIBS@
13657 LTLIBOBJS = @LTLIBOBJS@
13658 MAINT = @MAINT@
13659 MAKEINFO = @MAKEINFO@
13660 @@ -182,6 +184,7 @@
13661 RANLIB = @RANLIB@
13662 REBUILD = @REBUILD@
13663 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
13664 +SED = @SED@
13665 SET_MAKE = @SET_MAKE@
13666 SHELL = @SHELL@
13667 STRIP = @STRIP@
13668 diff -Naur gnome-panel-2.20.3.old/applets/notification_area/Makefile.in gnome-panel-2.20.3/applets/notification_area/Makefile.in
13669 --- gnome-panel-2.20.3.old/applets/notification_area/Makefile.in 2008-01-07 23:35:49.000000000 +0100
13670 +++ gnome-panel-2.20.3/applets/notification_area/Makefile.in 2008-01-12 07:11:55.000000000 +0100
13671 @@ -227,6 +227,8 @@
13672 LIBTOOL = @LIBTOOL@
13673 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
13674 LN_S = @LN_S@
13675 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
13676 +LOGOUT_LIBS = @LOGOUT_LIBS@
13677 LTLIBOBJS = @LTLIBOBJS@
13678 MAINT = @MAINT@
13679 MAKEINFO = @MAKEINFO@
13680 @@ -257,6 +259,7 @@
13681 RANLIB = @RANLIB@
13682 REBUILD = @REBUILD@
13683 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
13684 +SED = @SED@
13685 SET_MAKE = @SET_MAKE@
13686 SHELL = @SHELL@
13687 STRIP = @STRIP@
13688 diff -Naur gnome-panel-2.20.3.old/applets/wncklet/Makefile.in gnome-panel-2.20.3/applets/wncklet/Makefile.in
13689 --- gnome-panel-2.20.3.old/applets/wncklet/Makefile.in 2008-01-07 23:35:50.000000000 +0100
13690 +++ gnome-panel-2.20.3/applets/wncklet/Makefile.in 2008-01-12 07:11:55.000000000 +0100
13691 @@ -215,6 +215,8 @@
13692 LIBTOOL = @LIBTOOL@
13693 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
13694 LN_S = @LN_S@
13695 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
13696 +LOGOUT_LIBS = @LOGOUT_LIBS@
13697 LTLIBOBJS = @LTLIBOBJS@
13698 MAINT = @MAINT@
13699 MAKEINFO = @MAKEINFO@
13700 @@ -245,6 +247,7 @@
13701 RANLIB = @RANLIB@
13702 REBUILD = @REBUILD@
13703 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
13704 +SED = @SED@
13705 SET_MAKE = @SET_MAKE@
13706 SHELL = @SHELL@
13707 STRIP = @STRIP@
13708 diff -Naur gnome-panel-2.20.3.old/configure gnome-panel-2.20.3/configure
13709 --- gnome-panel-2.20.3.old/configure 2008-01-07 23:35:22.000000000 +0100
13710 +++ gnome-panel-2.20.3/configure 2008-01-12 07:11:53.000000000 +0100
13711 @@ -1,6 +1,6 @@
13712 #! /bin/sh
13713 # Guess values for system-dependent variables and create Makefiles.
13714 -# Generated by GNU Autoconf 2.60 for gnome-panel 2.20.3.
13715 +# Generated by GNU Autoconf 2.61 for gnome-panel 2.20.3.
13716 #
13717 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel>.
13718 #
13719 @@ -12,7 +12,8 @@
13720 ## M4sh Initialization. ##
13721 ## --------------------- ##
13722
13723 -# Be Bourne compatible
13724 +# Be more Bourne compatible
13725 +DUALCASE=1; export DUALCASE # for MKS sh
13726 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
13727 emulate sh
13728 NULLCMD=:
13729 @@ -21,10 +22,13 @@
13730 alias -g '${1+"$@"}'='"$@"'
13731 setopt NO_GLOB_SUBST
13732 else
13733 - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
13734 + case `(set -o) 2>/dev/null` in
13735 + *posix*) set -o posix ;;
13736 +esac
13737 +
13738 fi
13739 -BIN_SH=xpg4; export BIN_SH # for Tru64
13740 -DUALCASE=1; export DUALCASE # for MKS sh
13741 +
13742 +
13743
13744
13745 # PATH needs CR
13746 @@ -217,7 +221,7 @@
13747 else
13748 as_candidate_shells=
13749 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13750 -for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
13751 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
13752 do
13753 IFS=$as_save_IFS
13754 test -z "$as_dir" && as_dir=.
13755 @@ -235,7 +239,6 @@
13756 # Try only shells that exist, to save several forks.
13757 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
13758 { ("$as_shell") 2> /dev/null <<\_ASEOF
13759 -# Be Bourne compatible
13760 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
13761 emulate sh
13762 NULLCMD=:
13763 @@ -244,10 +247,12 @@
13764 alias -g '${1+"$@"}'='"$@"'
13765 setopt NO_GLOB_SUBST
13766 else
13767 - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
13768 + case `(set -o) 2>/dev/null` in
13769 + *posix*) set -o posix ;;
13770 +esac
13771 +
13772 fi
13773 -BIN_SH=xpg4; export BIN_SH # for Tru64
13774 -DUALCASE=1; export DUALCASE # for MKS sh
13775 +
13776
13777 :
13778 _ASEOF
13779 @@ -255,7 +260,6 @@
13780 CONFIG_SHELL=$as_shell
13781 as_have_required=yes
13782 if { "$as_shell" 2> /dev/null <<\_ASEOF
13783 -# Be Bourne compatible
13784 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
13785 emulate sh
13786 NULLCMD=:
13787 @@ -264,10 +268,12 @@
13788 alias -g '${1+"$@"}'='"$@"'
13789 setopt NO_GLOB_SUBST
13790 else
13791 - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
13792 + case `(set -o) 2>/dev/null` in
13793 + *posix*) set -o posix ;;
13794 +esac
13795 +
13796 fi
13797 -BIN_SH=xpg4; export BIN_SH # for Tru64
13798 -DUALCASE=1; export DUALCASE # for MKS sh
13799 +
13800
13801 :
13802 (as_func_return () {
13803 @@ -514,19 +520,28 @@
13804 as_mkdir_p=false
13805 fi
13806
13807 -# Find out whether ``test -x'' works. Don't use a zero-byte file, as
13808 -# systems may use methods other than mode bits to determine executability.
13809 -cat >conf$$.file <<_ASEOF
13810 -#! /bin/sh
13811 -exit 0
13812 -_ASEOF
13813 -chmod +x conf$$.file
13814 -if test -x conf$$.file >/dev/null 2>&1; then
13815 - as_executable_p="test -x"
13816 +if test -x / >/dev/null 2>&1; then
13817 + as_test_x='test -x'
13818 else
13819 - as_executable_p=:
13820 + if ls -dL / >/dev/null 2>&1; then
13821 + as_ls_L_option=L
13822 + else
13823 + as_ls_L_option=
13824 + fi
13825 + as_test_x='
13826 + eval sh -c '\''
13827 + if test -d "$1"; then
13828 + test -d "$1/.";
13829 + else
13830 + case $1 in
13831 + -*)set "./$1";;
13832 + esac;
13833 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
13834 + ???[sx]*):;;*)false;;esac;fi
13835 + '\'' sh
13836 + '
13837 fi
13838 -rm -f conf$$.file
13839 +as_executable_p=$as_test_x
13840
13841 # Sed expression to map a string onto a valid CPP name.
13842 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
13843 @@ -720,36 +735,36 @@
13844 # Factoring default headers for most tests.
13845 ac_includes_default="\
13846 #include <stdio.h>
13847 -#if HAVE_SYS_TYPES_H
13848 +#ifdef HAVE_SYS_TYPES_H
13849 # include <sys/types.h>
13850 #endif
13851 -#if HAVE_SYS_STAT_H
13852 +#ifdef HAVE_SYS_STAT_H
13853 # include <sys/stat.h>
13854 #endif
13855 -#if STDC_HEADERS
13856 +#ifdef STDC_HEADERS
13857 # include <stdlib.h>
13858 # include <stddef.h>
13859 #else
13860 -# if HAVE_STDLIB_H
13861 +# ifdef HAVE_STDLIB_H
13862 # include <stdlib.h>
13863 # endif
13864 #endif
13865 -#if HAVE_STRING_H
13866 -# if !STDC_HEADERS && HAVE_MEMORY_H
13867 +#ifdef HAVE_STRING_H
13868 +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
13869 # include <memory.h>
13870 # endif
13871 # include <string.h>
13872 #endif
13873 -#if HAVE_STRINGS_H
13874 +#ifdef HAVE_STRINGS_H
13875 # include <strings.h>
13876 #endif
13877 -#if HAVE_INTTYPES_H
13878 +#ifdef HAVE_INTTYPES_H
13879 # include <inttypes.h>
13880 #endif
13881 -#if HAVE_STDINT_H
13882 +#ifdef HAVE_STDINT_H
13883 # include <stdint.h>
13884 #endif
13885 -#if HAVE_UNISTD_H
13886 +#ifdef HAVE_UNISTD_H
13887 # include <unistd.h>
13888 #endif"
13889
13890 @@ -873,6 +888,7 @@
13891 host_cpu
13892 host_vendor
13893 host_os
13894 +SED
13895 LN_S
13896 ECHO
13897 AR
13898 @@ -898,6 +914,8 @@
13899 PKG_CONFIG
13900 PANEL_CFLAGS
13901 PANEL_LIBS
13902 +LOGOUT_CFLAGS
13903 +LOGOUT_LIBS
13904 LIBPANEL_APPLET_CFLAGS
13905 LIBPANEL_APPLET_LIBS
13906 WNCKLET_CFLAGS
13907 @@ -969,6 +987,7 @@
13908 CC
13909 CFLAGS
13910 LDFLAGS
13911 +LIBS
13912 CPPFLAGS
13913 CPP
13914 CXX
13915 @@ -980,6 +999,8 @@
13916 PKG_CONFIG
13917 PANEL_CFLAGS
13918 PANEL_LIBS
13919 +LOGOUT_CFLAGS
13920 +LOGOUT_LIBS
13921 LIBPANEL_APPLET_CFLAGS
13922 LIBPANEL_APPLET_LIBS
13923 WNCKLET_CFLAGS
13924 @@ -1096,10 +1117,10 @@
13925 -disable-* | --disable-*)
13926 ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
13927 # Reject names that are not valid shell variable names.
13928 - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
13929 + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
13930 { echo "$as_me: error: invalid feature name: $ac_feature" >&2
13931 { (exit 1); exit 1; }; }
13932 - ac_feature=`echo $ac_feature | sed 's/-/_/g'`
13933 + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
13934 eval enable_$ac_feature=no ;;
13935
13936 -docdir | --docdir | --docdi | --doc | --do)
13937 @@ -1115,10 +1136,10 @@
13938 -enable-* | --enable-*)
13939 ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
13940 # Reject names that are not valid shell variable names.
13941 - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
13942 + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
13943 { echo "$as_me: error: invalid feature name: $ac_feature" >&2
13944 { (exit 1); exit 1; }; }
13945 - ac_feature=`echo $ac_feature | sed 's/-/_/g'`
13946 + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
13947 eval enable_$ac_feature=\$ac_optarg ;;
13948
13949 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
13950 @@ -1312,19 +1333,19 @@
13951 -with-* | --with-*)
13952 ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
13953 # Reject names that are not valid shell variable names.
13954 - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
13955 + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
13956 { echo "$as_me: error: invalid package name: $ac_package" >&2
13957 { (exit 1); exit 1; }; }
13958 - ac_package=`echo $ac_package| sed 's/-/_/g'`
13959 + ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
13960 eval with_$ac_package=\$ac_optarg ;;
13961
13962 -without-* | --without-*)
13963 ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
13964 # Reject names that are not valid shell variable names.
13965 - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
13966 + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
13967 { echo "$as_me: error: invalid package name: $ac_package" >&2
13968 { (exit 1); exit 1; }; }
13969 - ac_package=`echo $ac_package | sed 's/-/_/g'`
13970 + ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
13971 eval with_$ac_package=no ;;
13972
13973 --x)
13974 @@ -1622,6 +1643,7 @@
13975 CFLAGS C compiler flags
13976 LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
13977 nonstandard directory <lib dir>
13978 + LIBS libraries to pass to the linker, e.g. -l<library>
13979 CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
13980 you have headers in a nonstandard directory <include dir>
13981 CPP C preprocessor
13982 @@ -1634,6 +1656,9 @@
13983 PANEL_CFLAGS
13984 C compiler flags for PANEL, overriding pkg-config
13985 PANEL_LIBS linker flags for PANEL, overriding pkg-config
13986 + LOGOUT_CFLAGS
13987 + C compiler flags for LOGOUT, overriding pkg-config
13988 + LOGOUT_LIBS linker flags for LOGOUT, overriding pkg-config
13989 LIBPANEL_APPLET_CFLAGS
13990 C compiler flags for LIBPANEL_APPLET, overriding pkg-config
13991 LIBPANEL_APPLET_LIBS
13992 @@ -1716,7 +1741,7 @@
13993 if $ac_init_version; then
13994 cat <<\_ACEOF
13995 gnome-panel configure 2.20.3
13996 -generated by GNU Autoconf 2.60
13997 +generated by GNU Autoconf 2.61
13998
13999 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
14000 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
14001 @@ -1730,7 +1755,7 @@
14002 running configure, to aid debugging if configure makes a mistake.
14003
14004 It was created by gnome-panel $as_me 2.20.3, which was
14005 -generated by GNU Autoconf 2.60. Invocation command line was
14006 +generated by GNU Autoconf 2.61. Invocation command line was
14007
14008 $ $0 $@
14009
14010 @@ -2153,7 +2178,7 @@
14011 # by default.
14012 for ac_prog in ginstall scoinst install; do
14013 for ac_exec_ext in '' $ac_executable_extensions; do
14014 - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
14015 + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
14016 if test $ac_prog = install &&
14017 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
14018 # AIX install. It has an incompatible calling convention.
14019 @@ -2281,7 +2306,7 @@
14020 test -z "$as_dir" && as_dir=.
14021 for ac_prog in mkdir gmkdir; do
14022 for ac_exec_ext in '' $ac_executable_extensions; do
14023 - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; } || continue
14024 + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
14025 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
14026 'mkdir (GNU coreutils) '* | \
14027 'mkdir (coreutils) '* | \
14028 @@ -2334,7 +2359,7 @@
14029 IFS=$as_save_IFS
14030 test -z "$as_dir" && as_dir=.
14031 for ac_exec_ext in '' $ac_executable_extensions; do
14032 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14033 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14034 ac_cv_prog_AWK="$ac_prog"
14035 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
14036 break 2
14037 @@ -2473,7 +2498,7 @@
14038 IFS=$as_save_IFS
14039 test -z "$as_dir" && as_dir=.
14040 for ac_exec_ext in '' $ac_executable_extensions; do
14041 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14042 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14043 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
14044 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
14045 break 2
14046 @@ -2513,7 +2538,7 @@
14047 IFS=$as_save_IFS
14048 test -z "$as_dir" && as_dir=.
14049 for ac_exec_ext in '' $ac_executable_extensions; do
14050 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14051 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14052 ac_cv_prog_ac_ct_STRIP="strip"
14053 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
14054 break 2
14055 @@ -2568,14 +2593,6 @@
14056
14057
14058
14059 -case m4 in
14060 - [\\/]* | ?:[\\/]* ) ac_macro_dir=m4 ;;
14061 - *) ac_macro_dir=$srcdir/m4 ;;
14062 -esac
14063 -test -d "$ac_macro_dir" ||
14064 - { { echo "$as_me:$LINENO: error: cannot find macro directory \`m4'" >&5
14065 -echo "$as_me: error: cannot find macro directory \`m4'" >&2;}
14066 - { (exit 1); exit 1; }; }
14067
14068
14069
14070 @@ -2716,7 +2733,7 @@
14071 IFS=$as_save_IFS
14072 test -z "$as_dir" && as_dir=.
14073 for ac_exec_ext in '' $ac_executable_extensions; do
14074 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14075 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14076 ac_cv_prog_CC="${ac_tool_prefix}gcc"
14077 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
14078 break 2
14079 @@ -2756,7 +2773,7 @@
14080 IFS=$as_save_IFS
14081 test -z "$as_dir" && as_dir=.
14082 for ac_exec_ext in '' $ac_executable_extensions; do
14083 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14084 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14085 ac_cv_prog_ac_ct_CC="gcc"
14086 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
14087 break 2
14088 @@ -2813,7 +2830,7 @@
14089 IFS=$as_save_IFS
14090 test -z "$as_dir" && as_dir=.
14091 for ac_exec_ext in '' $ac_executable_extensions; do
14092 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14093 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14094 ac_cv_prog_CC="${ac_tool_prefix}cc"
14095 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
14096 break 2
14097 @@ -2854,7 +2871,7 @@
14098 IFS=$as_save_IFS
14099 test -z "$as_dir" && as_dir=.
14100 for ac_exec_ext in '' $ac_executable_extensions; do
14101 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14102 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14103 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
14104 ac_prog_rejected=yes
14105 continue
14106 @@ -2912,7 +2929,7 @@
14107 IFS=$as_save_IFS
14108 test -z "$as_dir" && as_dir=.
14109 for ac_exec_ext in '' $ac_executable_extensions; do
14110 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14111 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14112 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
14113 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
14114 break 2
14115 @@ -2956,7 +2973,7 @@
14116 IFS=$as_save_IFS
14117 test -z "$as_dir" && as_dir=.
14118 for ac_exec_ext in '' $ac_executable_extensions; do
14119 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14120 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14121 ac_cv_prog_ac_ct_CC="$ac_prog"
14122 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
14123 break 2
14124 @@ -3097,7 +3114,7 @@
14125 # in a Makefile. We should not override ac_cv_exeext if it was cached,
14126 # so that the user can short-circuit this test for compilers unknown to
14127 # Autoconf.
14128 -for ac_file in $ac_files
14129 +for ac_file in $ac_files ''
14130 do
14131 test -f "$ac_file" || continue
14132 case $ac_file in
14133 @@ -3125,6 +3142,12 @@
14134 test "$ac_cv_exeext" = no && ac_cv_exeext=
14135
14136 else
14137 + ac_file=''
14138 +fi
14139 +
14140 +{ echo "$as_me:$LINENO: result: $ac_file" >&5
14141 +echo "${ECHO_T}$ac_file" >&6; }
14142 +if test -z "$ac_file"; then
14143 echo "$as_me: failed program was:" >&5
14144 sed 's/^/| /' conftest.$ac_ext >&5
14145
14146 @@ -3136,8 +3159,6 @@
14147 fi
14148
14149 ac_exeext=$ac_cv_exeext
14150 -{ echo "$as_me:$LINENO: result: $ac_file" >&5
14151 -echo "${ECHO_T}$ac_file" >&6; }
14152
14153 # Check that the compiler produces executables we can run. If not, either
14154 # the compiler is broken, or we cross compile.
14155 @@ -3315,27 +3336,10 @@
14156 rm -f conftest.er1
14157 cat conftest.err >&5
14158 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14159 - (exit $ac_status); } &&
14160 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14161 - { (case "(($ac_try" in
14162 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14163 - *) ac_try_echo=$ac_try;;
14164 -esac
14165 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14166 - (eval "$ac_try") 2>&5
14167 - ac_status=$?
14168 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14169 - (exit $ac_status); }; } &&
14170 - { ac_try='test -s conftest.$ac_objext'
14171 - { (case "(($ac_try" in
14172 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14173 - *) ac_try_echo=$ac_try;;
14174 -esac
14175 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14176 - (eval "$ac_try") 2>&5
14177 - ac_status=$?
14178 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14179 - (exit $ac_status); }; }; then
14180 + (exit $ac_status); } && {
14181 + test -z "$ac_c_werror_flag" ||
14182 + test ! -s conftest.err
14183 + } && test -s conftest.$ac_objext; then
14184 ac_compiler_gnu=yes
14185 else
14186 echo "$as_me: failed program was:" >&5
14187 @@ -3390,27 +3394,10 @@
14188 rm -f conftest.er1
14189 cat conftest.err >&5
14190 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14191 - (exit $ac_status); } &&
14192 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14193 - { (case "(($ac_try" in
14194 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14195 - *) ac_try_echo=$ac_try;;
14196 -esac
14197 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14198 - (eval "$ac_try") 2>&5
14199 - ac_status=$?
14200 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14201 - (exit $ac_status); }; } &&
14202 - { ac_try='test -s conftest.$ac_objext'
14203 - { (case "(($ac_try" in
14204 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14205 - *) ac_try_echo=$ac_try;;
14206 -esac
14207 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14208 - (eval "$ac_try") 2>&5
14209 - ac_status=$?
14210 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14211 - (exit $ac_status); }; }; then
14212 + (exit $ac_status); } && {
14213 + test -z "$ac_c_werror_flag" ||
14214 + test ! -s conftest.err
14215 + } && test -s conftest.$ac_objext; then
14216 ac_cv_prog_cc_g=yes
14217 else
14218 echo "$as_me: failed program was:" >&5
14219 @@ -3445,27 +3432,10 @@
14220 rm -f conftest.er1
14221 cat conftest.err >&5
14222 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14223 - (exit $ac_status); } &&
14224 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14225 - { (case "(($ac_try" in
14226 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14227 - *) ac_try_echo=$ac_try;;
14228 -esac
14229 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14230 - (eval "$ac_try") 2>&5
14231 - ac_status=$?
14232 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14233 - (exit $ac_status); }; } &&
14234 - { ac_try='test -s conftest.$ac_objext'
14235 - { (case "(($ac_try" in
14236 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14237 - *) ac_try_echo=$ac_try;;
14238 -esac
14239 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14240 - (eval "$ac_try") 2>&5
14241 - ac_status=$?
14242 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14243 - (exit $ac_status); }; }; then
14244 + (exit $ac_status); } && {
14245 + test -z "$ac_c_werror_flag" ||
14246 + test ! -s conftest.err
14247 + } && test -s conftest.$ac_objext; then
14248 :
14249 else
14250 echo "$as_me: failed program was:" >&5
14251 @@ -3501,27 +3471,10 @@
14252 rm -f conftest.er1
14253 cat conftest.err >&5
14254 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14255 - (exit $ac_status); } &&
14256 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14257 - { (case "(($ac_try" in
14258 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14259 - *) ac_try_echo=$ac_try;;
14260 -esac
14261 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14262 - (eval "$ac_try") 2>&5
14263 - ac_status=$?
14264 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14265 - (exit $ac_status); }; } &&
14266 - { ac_try='test -s conftest.$ac_objext'
14267 - { (case "(($ac_try" in
14268 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14269 - *) ac_try_echo=$ac_try;;
14270 -esac
14271 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14272 - (eval "$ac_try") 2>&5
14273 - ac_status=$?
14274 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14275 - (exit $ac_status); }; }; then
14276 + (exit $ac_status); } && {
14277 + test -z "$ac_c_werror_flag" ||
14278 + test ! -s conftest.err
14279 + } && test -s conftest.$ac_objext; then
14280 ac_cv_prog_cc_g=yes
14281 else
14282 echo "$as_me: failed program was:" >&5
14283 @@ -3637,27 +3590,10 @@
14284 rm -f conftest.er1
14285 cat conftest.err >&5
14286 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14287 - (exit $ac_status); } &&
14288 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14289 - { (case "(($ac_try" in
14290 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14291 - *) ac_try_echo=$ac_try;;
14292 -esac
14293 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14294 - (eval "$ac_try") 2>&5
14295 - ac_status=$?
14296 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14297 - (exit $ac_status); }; } &&
14298 - { ac_try='test -s conftest.$ac_objext'
14299 - { (case "(($ac_try" in
14300 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14301 - *) ac_try_echo=$ac_try;;
14302 -esac
14303 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14304 - (eval "$ac_try") 2>&5
14305 - ac_status=$?
14306 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14307 - (exit $ac_status); }; }; then
14308 + (exit $ac_status); } && {
14309 + test -z "$ac_c_werror_flag" ||
14310 + test ! -s conftest.err
14311 + } && test -s conftest.$ac_objext; then
14312 ac_cv_prog_cc_c89=$ac_arg
14313 else
14314 echo "$as_me: failed program was:" >&5
14315 @@ -3889,7 +3825,7 @@
14316 IFS=$as_save_IFS
14317 test -z "$as_dir" && as_dir=.
14318 for ac_exec_ext in '' $ac_executable_extensions; do
14319 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14320 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14321 ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
14322 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
14323 break 2
14324 @@ -3929,7 +3865,7 @@
14325 IFS=$as_save_IFS
14326 test -z "$as_dir" && as_dir=.
14327 for ac_exec_ext in '' $ac_executable_extensions; do
14328 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14329 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14330 ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
14331 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
14332 break 2
14333 @@ -3969,7 +3905,7 @@
14334 IFS=$as_save_IFS
14335 test -z "$as_dir" && as_dir=.
14336 for ac_exec_ext in '' $ac_executable_extensions; do
14337 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14338 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14339 ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
14340 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
14341 break 2
14342 @@ -4031,7 +3967,7 @@
14343 IFS=$as_save_IFS
14344 test -z "$as_dir" && as_dir=.
14345 for ac_exec_ext in '' $ac_executable_extensions; do
14346 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14347 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14348 ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
14349 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
14350 break 2
14351 @@ -4111,27 +4047,11 @@
14352 rm -f conftest.er1
14353 cat conftest.err >&5
14354 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14355 - (exit $ac_status); } &&
14356 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14357 - { (case "(($ac_try" in
14358 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14359 - *) ac_try_echo=$ac_try;;
14360 -esac
14361 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14362 - (eval "$ac_try") 2>&5
14363 - ac_status=$?
14364 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14365 - (exit $ac_status); }; } &&
14366 - { ac_try='test -s conftest$ac_exeext'
14367 - { (case "(($ac_try" in
14368 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14369 - *) ac_try_echo=$ac_try;;
14370 -esac
14371 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14372 - (eval "$ac_try") 2>&5
14373 - ac_status=$?
14374 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14375 - (exit $ac_status); }; }; then
14376 + (exit $ac_status); } && {
14377 + test -z "$ac_c_werror_flag" ||
14378 + test ! -s conftest.err
14379 + } && test -s conftest$ac_exeext &&
14380 + $as_test_x conftest$ac_exeext; then
14381 DATADIRNAME=share
14382 else
14383 echo "$as_me: failed program was:" >&5
14384 @@ -4202,27 +4122,11 @@
14385 rm -f conftest.er1
14386 cat conftest.err >&5
14387 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14388 - (exit $ac_status); } &&
14389 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14390 - { (case "(($ac_try" in
14391 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14392 - *) ac_try_echo=$ac_try;;
14393 -esac
14394 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14395 - (eval "$ac_try") 2>&5
14396 - ac_status=$?
14397 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14398 - (exit $ac_status); }; } &&
14399 - { ac_try='test -s conftest$ac_exeext'
14400 - { (case "(($ac_try" in
14401 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14402 - *) ac_try_echo=$ac_try;;
14403 -esac
14404 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14405 - (eval "$ac_try") 2>&5
14406 - ac_status=$?
14407 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14408 - (exit $ac_status); }; }; then
14409 + (exit $ac_status); } && {
14410 + test -z "$ac_c_werror_flag" ||
14411 + test ! -s conftest.err
14412 + } && test -s conftest$ac_exeext &&
14413 + $as_test_x conftest$ac_exeext; then
14414 ac_cv_func_bind_textdomain_codeset=yes
14415 else
14416 echo "$as_me: failed program was:" >&5
14417 @@ -4231,7 +4135,7 @@
14418 ac_cv_func_bind_textdomain_codeset=no
14419 fi
14420
14421 -rm -f core conftest.err conftest.$ac_objext \
14422 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14423 conftest$ac_exeext conftest.$ac_ext
14424 fi
14425 { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
14426 @@ -4249,7 +4153,7 @@
14427 esac
14428 fi
14429
14430 -rm -f core conftest.err conftest.$ac_objext \
14431 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14432 conftest$ac_exeext conftest.$ac_ext
14433 fi
14434
14435 @@ -4310,27 +4214,11 @@
14436 rm -f conftest.er1
14437 cat conftest.err >&5
14438 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14439 - (exit $ac_status); } &&
14440 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14441 - { (case "(($ac_try" in
14442 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14443 - *) ac_try_echo=$ac_try;;
14444 -esac
14445 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14446 - (eval "$ac_try") 2>&5
14447 - ac_status=$?
14448 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14449 - (exit $ac_status); }; } &&
14450 - { ac_try='test -s conftest$ac_exeext'
14451 - { (case "(($ac_try" in
14452 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14453 - *) ac_try_echo=$ac_try;;
14454 -esac
14455 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14456 - (eval "$ac_try") 2>&5
14457 - ac_status=$?
14458 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14459 - (exit $ac_status); }; }; then
14460 + (exit $ac_status); } && {
14461 + test -z "$ac_c_werror_flag" ||
14462 + test ! -s conftest.err
14463 + } && test -s conftest$ac_exeext &&
14464 + $as_test_x conftest$ac_exeext; then
14465 ac_cv_search_strerror=$ac_res
14466 else
14467 echo "$as_me: failed program was:" >&5
14468 @@ -4339,7 +4227,7 @@
14469
14470 fi
14471
14472 -rm -f core conftest.err conftest.$ac_objext \
14473 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14474 conftest$ac_exeext
14475 if test "${ac_cv_search_strerror+set}" = set; then
14476 break
14477 @@ -4383,7 +4271,7 @@
14478 IFS=$as_save_IFS
14479 test -z "$as_dir" && as_dir=.
14480 for ac_exec_ext in '' $ac_executable_extensions; do
14481 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14482 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14483 ac_cv_prog_CC="${ac_tool_prefix}gcc"
14484 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
14485 break 2
14486 @@ -4423,7 +4311,7 @@
14487 IFS=$as_save_IFS
14488 test -z "$as_dir" && as_dir=.
14489 for ac_exec_ext in '' $ac_executable_extensions; do
14490 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14491 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14492 ac_cv_prog_ac_ct_CC="gcc"
14493 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
14494 break 2
14495 @@ -4480,7 +4368,7 @@
14496 IFS=$as_save_IFS
14497 test -z "$as_dir" && as_dir=.
14498 for ac_exec_ext in '' $ac_executable_extensions; do
14499 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14500 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14501 ac_cv_prog_CC="${ac_tool_prefix}cc"
14502 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
14503 break 2
14504 @@ -4521,7 +4409,7 @@
14505 IFS=$as_save_IFS
14506 test -z "$as_dir" && as_dir=.
14507 for ac_exec_ext in '' $ac_executable_extensions; do
14508 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14509 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14510 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
14511 ac_prog_rejected=yes
14512 continue
14513 @@ -4579,7 +4467,7 @@
14514 IFS=$as_save_IFS
14515 test -z "$as_dir" && as_dir=.
14516 for ac_exec_ext in '' $ac_executable_extensions; do
14517 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14518 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14519 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
14520 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
14521 break 2
14522 @@ -4623,7 +4511,7 @@
14523 IFS=$as_save_IFS
14524 test -z "$as_dir" && as_dir=.
14525 for ac_exec_ext in '' $ac_executable_extensions; do
14526 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
14527 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14528 ac_cv_prog_ac_ct_CC="$ac_prog"
14529 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
14530 break 2
14531 @@ -4743,27 +4631,10 @@
14532 rm -f conftest.er1
14533 cat conftest.err >&5
14534 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14535 - (exit $ac_status); } &&
14536 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14537 - { (case "(($ac_try" in
14538 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14539 - *) ac_try_echo=$ac_try;;
14540 -esac
14541 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14542 - (eval "$ac_try") 2>&5
14543 - ac_status=$?
14544 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14545 - (exit $ac_status); }; } &&
14546 - { ac_try='test -s conftest.$ac_objext'
14547 - { (case "(($ac_try" in
14548 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14549 - *) ac_try_echo=$ac_try;;
14550 -esac
14551 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14552 - (eval "$ac_try") 2>&5
14553 - ac_status=$?
14554 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14555 - (exit $ac_status); }; }; then
14556 + (exit $ac_status); } && {
14557 + test -z "$ac_c_werror_flag" ||
14558 + test ! -s conftest.err
14559 + } && test -s conftest.$ac_objext; then
14560 ac_compiler_gnu=yes
14561 else
14562 echo "$as_me: failed program was:" >&5
14563 @@ -4818,27 +4689,10 @@
14564 rm -f conftest.er1
14565 cat conftest.err >&5
14566 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14567 - (exit $ac_status); } &&
14568 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14569 - { (case "(($ac_try" in
14570 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14571 - *) ac_try_echo=$ac_try;;
14572 -esac
14573 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14574 - (eval "$ac_try") 2>&5
14575 - ac_status=$?
14576 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14577 - (exit $ac_status); }; } &&
14578 - { ac_try='test -s conftest.$ac_objext'
14579 - { (case "(($ac_try" in
14580 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14581 - *) ac_try_echo=$ac_try;;
14582 -esac
14583 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14584 - (eval "$ac_try") 2>&5
14585 - ac_status=$?
14586 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14587 - (exit $ac_status); }; }; then
14588 + (exit $ac_status); } && {
14589 + test -z "$ac_c_werror_flag" ||
14590 + test ! -s conftest.err
14591 + } && test -s conftest.$ac_objext; then
14592 ac_cv_prog_cc_g=yes
14593 else
14594 echo "$as_me: failed program was:" >&5
14595 @@ -4873,27 +4727,10 @@
14596 rm -f conftest.er1
14597 cat conftest.err >&5
14598 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14599 - (exit $ac_status); } &&
14600 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14601 - { (case "(($ac_try" in
14602 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14603 - *) ac_try_echo=$ac_try;;
14604 -esac
14605 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14606 - (eval "$ac_try") 2>&5
14607 - ac_status=$?
14608 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14609 - (exit $ac_status); }; } &&
14610 - { ac_try='test -s conftest.$ac_objext'
14611 - { (case "(($ac_try" in
14612 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14613 - *) ac_try_echo=$ac_try;;
14614 -esac
14615 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14616 - (eval "$ac_try") 2>&5
14617 - ac_status=$?
14618 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14619 - (exit $ac_status); }; }; then
14620 + (exit $ac_status); } && {
14621 + test -z "$ac_c_werror_flag" ||
14622 + test ! -s conftest.err
14623 + } && test -s conftest.$ac_objext; then
14624 :
14625 else
14626 echo "$as_me: failed program was:" >&5
14627 @@ -4929,27 +4766,10 @@
14628 rm -f conftest.er1
14629 cat conftest.err >&5
14630 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14631 - (exit $ac_status); } &&
14632 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14633 - { (case "(($ac_try" in
14634 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14635 - *) ac_try_echo=$ac_try;;
14636 -esac
14637 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14638 - (eval "$ac_try") 2>&5
14639 - ac_status=$?
14640 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14641 - (exit $ac_status); }; } &&
14642 - { ac_try='test -s conftest.$ac_objext'
14643 - { (case "(($ac_try" in
14644 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14645 - *) ac_try_echo=$ac_try;;
14646 -esac
14647 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14648 - (eval "$ac_try") 2>&5
14649 - ac_status=$?
14650 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14651 - (exit $ac_status); }; }; then
14652 + (exit $ac_status); } && {
14653 + test -z "$ac_c_werror_flag" ||
14654 + test ! -s conftest.err
14655 + } && test -s conftest.$ac_objext; then
14656 ac_cv_prog_cc_g=yes
14657 else
14658 echo "$as_me: failed program was:" >&5
14659 @@ -5065,27 +4885,10 @@
14660 rm -f conftest.er1
14661 cat conftest.err >&5
14662 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14663 - (exit $ac_status); } &&
14664 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14665 - { (case "(($ac_try" in
14666 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14667 - *) ac_try_echo=$ac_try;;
14668 -esac
14669 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14670 - (eval "$ac_try") 2>&5
14671 - ac_status=$?
14672 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14673 - (exit $ac_status); }; } &&
14674 - { ac_try='test -s conftest.$ac_objext'
14675 - { (case "(($ac_try" in
14676 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14677 - *) ac_try_echo=$ac_try;;
14678 -esac
14679 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14680 - (eval "$ac_try") 2>&5
14681 - ac_status=$?
14682 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14683 - (exit $ac_status); }; }; then
14684 + (exit $ac_status); } && {
14685 + test -z "$ac_c_werror_flag" ||
14686 + test ! -s conftest.err
14687 + } && test -s conftest.$ac_objext; then
14688 ac_cv_prog_cc_c89=$ac_arg
14689 else
14690 echo "$as_me: failed program was:" >&5
14691 @@ -5282,17 +5085,10 @@
14692 rm -f conftest.er1
14693 cat conftest.err >&5
14694 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14695 - (exit $ac_status); } >/dev/null; then
14696 - if test -s conftest.err; then
14697 - ac_cpp_err=$ac_c_preproc_warn_flag
14698 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
14699 - else
14700 - ac_cpp_err=
14701 - fi
14702 -else
14703 - ac_cpp_err=yes
14704 -fi
14705 -if test -z "$ac_cpp_err"; then
14706 + (exit $ac_status); } >/dev/null && {
14707 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
14708 + test ! -s conftest.err
14709 + }; then
14710 :
14711 else
14712 echo "$as_me: failed program was:" >&5
14713 @@ -5326,17 +5122,10 @@
14714 rm -f conftest.er1
14715 cat conftest.err >&5
14716 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14717 - (exit $ac_status); } >/dev/null; then
14718 - if test -s conftest.err; then
14719 - ac_cpp_err=$ac_c_preproc_warn_flag
14720 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
14721 - else
14722 - ac_cpp_err=
14723 - fi
14724 -else
14725 - ac_cpp_err=yes
14726 -fi
14727 -if test -z "$ac_cpp_err"; then
14728 + (exit $ac_status); } >/dev/null && {
14729 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
14730 + test ! -s conftest.err
14731 + }; then
14732 # Broken: success on invalid input.
14733 continue
14734 else
14735 @@ -5401,17 +5190,10 @@
14736 rm -f conftest.er1
14737 cat conftest.err >&5
14738 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14739 - (exit $ac_status); } >/dev/null; then
14740 - if test -s conftest.err; then
14741 - ac_cpp_err=$ac_c_preproc_warn_flag
14742 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
14743 - else
14744 - ac_cpp_err=
14745 - fi
14746 -else
14747 - ac_cpp_err=yes
14748 -fi
14749 -if test -z "$ac_cpp_err"; then
14750 + (exit $ac_status); } >/dev/null && {
14751 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
14752 + test ! -s conftest.err
14753 + }; then
14754 :
14755 else
14756 echo "$as_me: failed program was:" >&5
14757 @@ -5445,17 +5227,10 @@
14758 rm -f conftest.er1
14759 cat conftest.err >&5
14760 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14761 - (exit $ac_status); } >/dev/null; then
14762 - if test -s conftest.err; then
14763 - ac_cpp_err=$ac_c_preproc_warn_flag
14764 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
14765 - else
14766 - ac_cpp_err=
14767 - fi
14768 -else
14769 - ac_cpp_err=yes
14770 -fi
14771 -if test -z "$ac_cpp_err"; then
14772 + (exit $ac_status); } >/dev/null && {
14773 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
14774 + test ! -s conftest.err
14775 + }; then
14776 # Broken: success on invalid input.
14777 continue
14778 else
14779 @@ -5510,7 +5285,7 @@
14780 for ac_prog in grep ggrep; do
14781 for ac_exec_ext in '' $ac_executable_extensions; do
14782 ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
14783 - { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
14784 + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
14785 # Check for GNU ac_path_GREP and select it if it is found.
14786 # Check for GNU $ac_path_GREP
14787 case `"$ac_path_GREP" --version 2>&1` in
14788 @@ -5592,7 +5367,7 @@
14789 for ac_prog in egrep; do
14790 for ac_exec_ext in '' $ac_executable_extensions; do
14791 ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
14792 - { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
14793 + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
14794 # Check for GNU ac_path_EGREP and select it if it is found.
14795 # Check for GNU $ac_path_EGREP
14796 case `"$ac_path_EGREP" --version 2>&1` in
14797 @@ -5688,27 +5463,10 @@
14798 rm -f conftest.er1
14799 cat conftest.err >&5
14800 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14801 - (exit $ac_status); } &&
14802 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14803 - { (case "(($ac_try" in
14804 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14805 - *) ac_try_echo=$ac_try;;
14806 -esac
14807 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14808 - (eval "$ac_try") 2>&5
14809 - ac_status=$?
14810 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14811 - (exit $ac_status); }; } &&
14812 - { ac_try='test -s conftest.$ac_objext'
14813 - { (case "(($ac_try" in
14814 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14815 - *) ac_try_echo=$ac_try;;
14816 -esac
14817 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14818 - (eval "$ac_try") 2>&5
14819 - ac_status=$?
14820 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14821 - (exit $ac_status); }; }; then
14822 + (exit $ac_status); } && {
14823 + test -z "$ac_c_werror_flag" ||
14824 + test ! -s conftest.err
14825 + } && test -s conftest.$ac_objext; then
14826 ac_cv_header_stdc=yes
14827 else
14828 echo "$as_me: failed program was:" >&5
14829 @@ -6013,12 +5771,13 @@
14830 test -z "$as_dir" && as_dir=.
14831 for lt_ac_prog in sed gsed; do
14832 for ac_exec_ext in '' $ac_executable_extensions; do
14833 - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
14834 + if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
14835 lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
14836 fi
14837 done
14838 done
14839 done
14840 +IFS=$as_save_IFS
14841 lt_ac_max=0
14842 lt_ac_count=0
14843 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
14844 @@ -6053,6 +5812,7 @@
14845 fi
14846
14847 SED=$lt_cv_path_SED
14848 +
14849 { echo "$as_me:$LINENO: result: $SED" >&5
14850 echo "${ECHO_T}$SED" >&6; }
14851
14852 @@ -6252,8 +6012,8 @@
14853 echo "${ECHO_T}no, using $LN_S" >&6; }
14854 fi
14855
14856 -{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
14857 -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
14858 +{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
14859 +echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
14860 if test "${lt_cv_deplibs_check_method+set}" = set; then
14861 echo $ECHO_N "(cached) $ECHO_C" >&6
14862 else
14863 @@ -6294,16 +6054,22 @@
14864
14865 mingw* | pw32*)
14866 # Base MSYS/MinGW do not provide the 'file' command needed by
14867 - # func_win32_libid shell function, so use a weaker test based on 'objdump'.
14868 - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
14869 - lt_cv_file_magic_cmd='$OBJDUMP -f'
14870 + # func_win32_libid shell function, so use a weaker test based on 'objdump',
14871 + # unless we find 'file', for example because we are cross-compiling.
14872 + if ( file / ) >/dev/null 2>&1; then
14873 + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
14874 + lt_cv_file_magic_cmd='func_win32_libid'
14875 + else
14876 + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
14877 + lt_cv_file_magic_cmd='$OBJDUMP -f'
14878 + fi
14879 ;;
14880
14881 darwin* | rhapsody*)
14882 lt_cv_deplibs_check_method=pass_all
14883 ;;
14884
14885 -freebsd* | kfreebsd*-gnu | dragonfly*)
14886 +freebsd* | dragonfly*)
14887 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
14888 case $host_cpu in
14889 i*86 )
14890 @@ -6341,7 +6107,7 @@
14891 esac
14892 ;;
14893
14894 -interix3*)
14895 +interix[3-9]*)
14896 # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
14897 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
14898 ;;
14899 @@ -6357,11 +6123,11 @@
14900 ;;
14901
14902 # This must be Linux ELF.
14903 -linux*)
14904 +linux* | k*bsd*-gnu)
14905 lt_cv_deplibs_check_method=pass_all
14906 ;;
14907
14908 -netbsd*)
14909 +netbsd* | netbsdelf*-gnu)
14910 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
14911 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
14912 else
14913 @@ -6391,6 +6157,10 @@
14914 lt_cv_deplibs_check_method=pass_all
14915 ;;
14916
14917 +rdos*)
14918 + lt_cv_deplibs_check_method=pass_all
14919 + ;;
14920 +
14921 solaris*)
14922 lt_cv_deplibs_check_method=pass_all
14923 ;;
14924 @@ -6477,7 +6247,7 @@
14925 ;;
14926 *-*-irix6*)
14927 # Find out which ABI we are using.
14928 - echo '#line 6480 "configure"' > conftest.$ac_ext
14929 + echo '#line 6250 "configure"' > conftest.$ac_ext
14930 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14931 (eval $ac_compile) 2>&5
14932 ac_status=$?
14933 @@ -6512,7 +6282,8 @@
14934 rm -rf conftest*
14935 ;;
14936
14937 -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
14938 +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
14939 +s390*-*linux*|sparc*-*linux*)
14940 # Find out which ABI we are using.
14941 echo 'int i;' > conftest.$ac_ext
14942 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14943 @@ -6523,6 +6294,9 @@
14944 case `/usr/bin/file conftest.o` in
14945 *32-bit*)
14946 case $host in
14947 + x86_64-*kfreebsd*-gnu)
14948 + LD="${LD-ld} -m elf_i386_fbsd"
14949 + ;;
14950 x86_64-*linux*)
14951 LD="${LD-ld} -m elf_i386"
14952 ;;
14953 @@ -6539,6 +6313,9 @@
14954 ;;
14955 *64-bit*)
14956 case $host in
14957 + x86_64-*kfreebsd*-gnu)
14958 + LD="${LD-ld} -m elf_x86_64_fbsd"
14959 + ;;
14960 x86_64-*linux*)
14961 LD="${LD-ld} -m elf_x86_64"
14962 ;;
14963 @@ -6601,27 +6378,11 @@
14964 rm -f conftest.er1
14965 cat conftest.err >&5
14966 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14967 - (exit $ac_status); } &&
14968 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14969 - { (case "(($ac_try" in
14970 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14971 - *) ac_try_echo=$ac_try;;
14972 -esac
14973 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14974 - (eval "$ac_try") 2>&5
14975 - ac_status=$?
14976 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14977 - (exit $ac_status); }; } &&
14978 - { ac_try='test -s conftest$ac_exeext'
14979 - { (case "(($ac_try" in
14980 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14981 - *) ac_try_echo=$ac_try;;
14982 -esac
14983 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14984 - (eval "$ac_try") 2>&5
14985 - ac_status=$?
14986 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14987 - (exit $ac_status); }; }; then
14988 + (exit $ac_status); } && {
14989 + test -z "$ac_c_werror_flag" ||
14990 + test ! -s conftest.err
14991 + } && test -s conftest$ac_exeext &&
14992 + $as_test_x conftest$ac_exeext; then
14993 lt_cv_cc_needs_belf=yes
14994 else
14995 echo "$as_me: failed program was:" >&5
14996 @@ -6630,7 +6391,7 @@
14997 lt_cv_cc_needs_belf=no
14998 fi
14999
15000 -rm -f core conftest.err conftest.$ac_objext \
15001 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15002 conftest$ac_exeext conftest.$ac_ext
15003 ac_ext=c
15004 ac_cpp='$CPP $CPPFLAGS'
15005 @@ -6684,7 +6445,7 @@
15006 IFS=$as_save_IFS
15007 test -z "$as_dir" && as_dir=.
15008 for ac_exec_ext in '' $ac_executable_extensions; do
15009 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15010 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15011 ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
15012 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15013 break 2
15014 @@ -6724,7 +6485,7 @@
15015 IFS=$as_save_IFS
15016 test -z "$as_dir" && as_dir=.
15017 for ac_exec_ext in '' $ac_executable_extensions; do
15018 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15019 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15020 ac_cv_prog_ac_ct_DLLTOOL="dlltool"
15021 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15022 break 2
15023 @@ -6780,7 +6541,7 @@
15024 IFS=$as_save_IFS
15025 test -z "$as_dir" && as_dir=.
15026 for ac_exec_ext in '' $ac_executable_extensions; do
15027 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15028 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15029 ac_cv_prog_AS="${ac_tool_prefix}as"
15030 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15031 break 2
15032 @@ -6820,7 +6581,7 @@
15033 IFS=$as_save_IFS
15034 test -z "$as_dir" && as_dir=.
15035 for ac_exec_ext in '' $ac_executable_extensions; do
15036 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15037 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15038 ac_cv_prog_ac_ct_AS="as"
15039 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15040 break 2
15041 @@ -6876,7 +6637,7 @@
15042 IFS=$as_save_IFS
15043 test -z "$as_dir" && as_dir=.
15044 for ac_exec_ext in '' $ac_executable_extensions; do
15045 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15046 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15047 ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
15048 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15049 break 2
15050 @@ -6916,7 +6677,7 @@
15051 IFS=$as_save_IFS
15052 test -z "$as_dir" && as_dir=.
15053 for ac_exec_ext in '' $ac_executable_extensions; do
15054 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15055 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15056 ac_cv_prog_ac_ct_OBJDUMP="objdump"
15057 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15058 break 2
15059 @@ -7004,27 +6765,10 @@
15060 rm -f conftest.er1
15061 cat conftest.err >&5
15062 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15063 - (exit $ac_status); } &&
15064 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15065 - { (case "(($ac_try" in
15066 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15067 - *) ac_try_echo=$ac_try;;
15068 -esac
15069 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15070 - (eval "$ac_try") 2>&5
15071 - ac_status=$?
15072 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15073 - (exit $ac_status); }; } &&
15074 - { ac_try='test -s conftest.$ac_objext'
15075 - { (case "(($ac_try" in
15076 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15077 - *) ac_try_echo=$ac_try;;
15078 -esac
15079 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15080 - (eval "$ac_try") 2>&5
15081 - ac_status=$?
15082 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15083 - (exit $ac_status); }; }; then
15084 + (exit $ac_status); } && {
15085 + test -z "$ac_c_werror_flag" ||
15086 + test ! -s conftest.err
15087 + } && test -s conftest.$ac_objext; then
15088 eval "$as_ac_Header=yes"
15089 else
15090 echo "$as_me: failed program was:" >&5
15091 @@ -7087,27 +6831,10 @@
15092 rm -f conftest.er1
15093 cat conftest.err >&5
15094 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15095 - (exit $ac_status); } &&
15096 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15097 - { (case "(($ac_try" in
15098 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15099 - *) ac_try_echo=$ac_try;;
15100 -esac
15101 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15102 - (eval "$ac_try") 2>&5
15103 - ac_status=$?
15104 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15105 - (exit $ac_status); }; } &&
15106 - { ac_try='test -s conftest.$ac_objext'
15107 - { (case "(($ac_try" in
15108 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15109 - *) ac_try_echo=$ac_try;;
15110 -esac
15111 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15112 - (eval "$ac_try") 2>&5
15113 - ac_status=$?
15114 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15115 - (exit $ac_status); }; }; then
15116 + (exit $ac_status); } && {
15117 + test -z "$ac_c_werror_flag" ||
15118 + test ! -s conftest.err
15119 + } && test -s conftest.$ac_objext; then
15120 ac_header_compiler=yes
15121 else
15122 echo "$as_me: failed program was:" >&5
15123 @@ -7143,17 +6870,10 @@
15124 rm -f conftest.er1
15125 cat conftest.err >&5
15126 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15127 - (exit $ac_status); } >/dev/null; then
15128 - if test -s conftest.err; then
15129 - ac_cpp_err=$ac_c_preproc_warn_flag
15130 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
15131 - else
15132 - ac_cpp_err=
15133 - fi
15134 -else
15135 - ac_cpp_err=yes
15136 -fi
15137 -if test -z "$ac_cpp_err"; then
15138 + (exit $ac_status); } >/dev/null && {
15139 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
15140 + test ! -s conftest.err
15141 + }; then
15142 ac_header_preproc=yes
15143 else
15144 echo "$as_me: failed program was:" >&5
15145 @@ -7245,7 +6965,7 @@
15146 IFS=$as_save_IFS
15147 test -z "$as_dir" && as_dir=.
15148 for ac_exec_ext in '' $ac_executable_extensions; do
15149 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15150 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15151 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
15152 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15153 break 2
15154 @@ -7289,7 +7009,7 @@
15155 IFS=$as_save_IFS
15156 test -z "$as_dir" && as_dir=.
15157 for ac_exec_ext in '' $ac_executable_extensions; do
15158 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15159 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15160 ac_cv_prog_ac_ct_CXX="$ac_prog"
15161 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15162 break 2
15163 @@ -7402,27 +7122,10 @@
15164 rm -f conftest.er1
15165 cat conftest.err >&5
15166 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15167 - (exit $ac_status); } &&
15168 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
15169 - { (case "(($ac_try" in
15170 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15171 - *) ac_try_echo=$ac_try;;
15172 -esac
15173 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15174 - (eval "$ac_try") 2>&5
15175 - ac_status=$?
15176 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15177 - (exit $ac_status); }; } &&
15178 - { ac_try='test -s conftest.$ac_objext'
15179 - { (case "(($ac_try" in
15180 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15181 - *) ac_try_echo=$ac_try;;
15182 -esac
15183 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15184 - (eval "$ac_try") 2>&5
15185 - ac_status=$?
15186 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15187 - (exit $ac_status); }; }; then
15188 + (exit $ac_status); } && {
15189 + test -z "$ac_cxx_werror_flag" ||
15190 + test ! -s conftest.err
15191 + } && test -s conftest.$ac_objext; then
15192 ac_compiler_gnu=yes
15193 else
15194 echo "$as_me: failed program was:" >&5
15195 @@ -7477,27 +7180,10 @@
15196 rm -f conftest.er1
15197 cat conftest.err >&5
15198 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15199 - (exit $ac_status); } &&
15200 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
15201 - { (case "(($ac_try" in
15202 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15203 - *) ac_try_echo=$ac_try;;
15204 -esac
15205 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15206 - (eval "$ac_try") 2>&5
15207 - ac_status=$?
15208 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15209 - (exit $ac_status); }; } &&
15210 - { ac_try='test -s conftest.$ac_objext'
15211 - { (case "(($ac_try" in
15212 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15213 - *) ac_try_echo=$ac_try;;
15214 -esac
15215 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15216 - (eval "$ac_try") 2>&5
15217 - ac_status=$?
15218 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15219 - (exit $ac_status); }; }; then
15220 + (exit $ac_status); } && {
15221 + test -z "$ac_cxx_werror_flag" ||
15222 + test ! -s conftest.err
15223 + } && test -s conftest.$ac_objext; then
15224 ac_cv_prog_cxx_g=yes
15225 else
15226 echo "$as_me: failed program was:" >&5
15227 @@ -7532,27 +7218,10 @@
15228 rm -f conftest.er1
15229 cat conftest.err >&5
15230 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15231 - (exit $ac_status); } &&
15232 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
15233 - { (case "(($ac_try" in
15234 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15235 - *) ac_try_echo=$ac_try;;
15236 -esac
15237 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15238 - (eval "$ac_try") 2>&5
15239 - ac_status=$?
15240 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15241 - (exit $ac_status); }; } &&
15242 - { ac_try='test -s conftest.$ac_objext'
15243 - { (case "(($ac_try" in
15244 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15245 - *) ac_try_echo=$ac_try;;
15246 -esac
15247 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15248 - (eval "$ac_try") 2>&5
15249 - ac_status=$?
15250 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15251 - (exit $ac_status); }; }; then
15252 + (exit $ac_status); } && {
15253 + test -z "$ac_cxx_werror_flag" ||
15254 + test ! -s conftest.err
15255 + } && test -s conftest.$ac_objext; then
15256 :
15257 else
15258 echo "$as_me: failed program was:" >&5
15259 @@ -7588,27 +7257,10 @@
15260 rm -f conftest.er1
15261 cat conftest.err >&5
15262 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15263 - (exit $ac_status); } &&
15264 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
15265 - { (case "(($ac_try" in
15266 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15267 - *) ac_try_echo=$ac_try;;
15268 -esac
15269 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15270 - (eval "$ac_try") 2>&5
15271 - ac_status=$?
15272 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15273 - (exit $ac_status); }; } &&
15274 - { ac_try='test -s conftest.$ac_objext'
15275 - { (case "(($ac_try" in
15276 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15277 - *) ac_try_echo=$ac_try;;
15278 -esac
15279 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15280 - (eval "$ac_try") 2>&5
15281 - ac_status=$?
15282 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15283 - (exit $ac_status); }; }; then
15284 + (exit $ac_status); } && {
15285 + test -z "$ac_cxx_werror_flag" ||
15286 + test ! -s conftest.err
15287 + } && test -s conftest.$ac_objext; then
15288 ac_cv_prog_cxx_g=yes
15289 else
15290 echo "$as_me: failed program was:" >&5
15291 @@ -7810,17 +7462,10 @@
15292 rm -f conftest.er1
15293 cat conftest.err >&5
15294 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15295 - (exit $ac_status); } >/dev/null; then
15296 - if test -s conftest.err; then
15297 - ac_cpp_err=$ac_cxx_preproc_warn_flag
15298 - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
15299 - else
15300 - ac_cpp_err=
15301 - fi
15302 -else
15303 - ac_cpp_err=yes
15304 -fi
15305 -if test -z "$ac_cpp_err"; then
15306 + (exit $ac_status); } >/dev/null && {
15307 + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
15308 + test ! -s conftest.err
15309 + }; then
15310 :
15311 else
15312 echo "$as_me: failed program was:" >&5
15313 @@ -7854,17 +7499,10 @@
15314 rm -f conftest.er1
15315 cat conftest.err >&5
15316 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15317 - (exit $ac_status); } >/dev/null; then
15318 - if test -s conftest.err; then
15319 - ac_cpp_err=$ac_cxx_preproc_warn_flag
15320 - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
15321 - else
15322 - ac_cpp_err=
15323 - fi
15324 -else
15325 - ac_cpp_err=yes
15326 -fi
15327 -if test -z "$ac_cpp_err"; then
15328 + (exit $ac_status); } >/dev/null && {
15329 + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
15330 + test ! -s conftest.err
15331 + }; then
15332 # Broken: success on invalid input.
15333 continue
15334 else
15335 @@ -7929,17 +7567,10 @@
15336 rm -f conftest.er1
15337 cat conftest.err >&5
15338 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15339 - (exit $ac_status); } >/dev/null; then
15340 - if test -s conftest.err; then
15341 - ac_cpp_err=$ac_cxx_preproc_warn_flag
15342 - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
15343 - else
15344 - ac_cpp_err=
15345 - fi
15346 -else
15347 - ac_cpp_err=yes
15348 -fi
15349 -if test -z "$ac_cpp_err"; then
15350 + (exit $ac_status); } >/dev/null && {
15351 + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
15352 + test ! -s conftest.err
15353 + }; then
15354 :
15355 else
15356 echo "$as_me: failed program was:" >&5
15357 @@ -7973,17 +7604,10 @@
15358 rm -f conftest.er1
15359 cat conftest.err >&5
15360 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15361 - (exit $ac_status); } >/dev/null; then
15362 - if test -s conftest.err; then
15363 - ac_cpp_err=$ac_cxx_preproc_warn_flag
15364 - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
15365 - else
15366 - ac_cpp_err=
15367 - fi
15368 -else
15369 - ac_cpp_err=yes
15370 -fi
15371 -if test -z "$ac_cpp_err"; then
15372 + (exit $ac_status); } >/dev/null && {
15373 + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
15374 + test ! -s conftest.err
15375 + }; then
15376 # Broken: success on invalid input.
15377 continue
15378 else
15379 @@ -8024,7 +7648,7 @@
15380 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
15381 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
15382 if test -n "$ac_tool_prefix"; then
15383 - for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
15384 + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
15385 do
15386 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
15387 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
15388 @@ -8042,7 +7666,7 @@
15389 IFS=$as_save_IFS
15390 test -z "$as_dir" && as_dir=.
15391 for ac_exec_ext in '' $ac_executable_extensions; do
15392 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15393 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15394 ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
15395 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15396 break 2
15397 @@ -8068,7 +7692,7 @@
15398 fi
15399 if test -z "$F77"; then
15400 ac_ct_F77=$F77
15401 - for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
15402 + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
15403 do
15404 # Extract the first word of "$ac_prog", so it can be a program name with args.
15405 set dummy $ac_prog; ac_word=$2
15406 @@ -8086,7 +7710,7 @@
15407 IFS=$as_save_IFS
15408 test -z "$as_dir" && as_dir=.
15409 for ac_exec_ext in '' $ac_executable_extensions; do
15410 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15411 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15412 ac_cv_prog_ac_ct_F77="$ac_prog"
15413 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15414 break 2
15415 @@ -8193,27 +7817,10 @@
15416 rm -f conftest.er1
15417 cat conftest.err >&5
15418 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15419 - (exit $ac_status); } &&
15420 - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
15421 - { (case "(($ac_try" in
15422 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15423 - *) ac_try_echo=$ac_try;;
15424 -esac
15425 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15426 - (eval "$ac_try") 2>&5
15427 - ac_status=$?
15428 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15429 - (exit $ac_status); }; } &&
15430 - { ac_try='test -s conftest.$ac_objext'
15431 - { (case "(($ac_try" in
15432 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15433 - *) ac_try_echo=$ac_try;;
15434 -esac
15435 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15436 - (eval "$ac_try") 2>&5
15437 - ac_status=$?
15438 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15439 - (exit $ac_status); }; }; then
15440 + (exit $ac_status); } && {
15441 + test -z "$ac_f77_werror_flag" ||
15442 + test ! -s conftest.err
15443 + } && test -s conftest.$ac_objext; then
15444 ac_compiler_gnu=yes
15445 else
15446 echo "$as_me: failed program was:" >&5
15447 @@ -8256,27 +7863,10 @@
15448 rm -f conftest.er1
15449 cat conftest.err >&5
15450 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15451 - (exit $ac_status); } &&
15452 - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
15453 - { (case "(($ac_try" in
15454 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15455 - *) ac_try_echo=$ac_try;;
15456 -esac
15457 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15458 - (eval "$ac_try") 2>&5
15459 - ac_status=$?
15460 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15461 - (exit $ac_status); }; } &&
15462 - { ac_try='test -s conftest.$ac_objext'
15463 - { (case "(($ac_try" in
15464 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15465 - *) ac_try_echo=$ac_try;;
15466 -esac
15467 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15468 - (eval "$ac_try") 2>&5
15469 - ac_status=$?
15470 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15471 - (exit $ac_status); }; }; then
15472 + (exit $ac_status); } && {
15473 + test -z "$ac_f77_werror_flag" ||
15474 + test ! -s conftest.err
15475 + } && test -s conftest.$ac_objext; then
15476 ac_cv_prog_f77_g=yes
15477 else
15478 echo "$as_me: failed program was:" >&5
15479 @@ -8403,24 +7993,27 @@
15480 fi
15481 ;;
15482 *)
15483 - # If test is not a shell built-in, we'll probably end up computing a
15484 - # maximum length that is only half of the actual maximum length, but
15485 - # we can't tell.
15486 - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
15487 - while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
15488 + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
15489 + if test -n "$lt_cv_sys_max_cmd_len"; then
15490 + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
15491 + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
15492 + else
15493 + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
15494 + while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
15495 = "XX$teststring") >/dev/null 2>&1 &&
15496 - new_result=`expr "X$teststring" : ".*" 2>&1` &&
15497 - lt_cv_sys_max_cmd_len=$new_result &&
15498 - test $i != 17 # 1/2 MB should be enough
15499 - do
15500 - i=`expr $i + 1`
15501 - teststring=$teststring$teststring
15502 - done
15503 - teststring=
15504 - # Add a significant safety factor because C++ compilers can tack on massive
15505 - # amounts of additional arguments before passing them to the linker.
15506 - # It appears as though 1/2 is a usable value.
15507 - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
15508 + new_result=`expr "X$teststring" : ".*" 2>&1` &&
15509 + lt_cv_sys_max_cmd_len=$new_result &&
15510 + test $i != 17 # 1/2 MB should be enough
15511 + do
15512 + i=`expr $i + 1`
15513 + teststring=$teststring$teststring
15514 + done
15515 + teststring=
15516 + # Add a significant safety factor because C++ compilers can tack on massive
15517 + # amounts of additional arguments before passing them to the linker.
15518 + # It appears as though 1/2 is a usable value.
15519 + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
15520 + fi
15521 ;;
15522 esac
15523
15524 @@ -8437,6 +8030,7 @@
15525
15526
15527
15528 +
15529 # Check for command to grab the raw symbol name followed by C symbol from nm.
15530 { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
15531 echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
15532 @@ -8474,7 +8068,7 @@
15533 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
15534 lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
15535 ;;
15536 -linux*)
15537 +linux* | k*bsd*-gnu)
15538 if test "$host_cpu" = ia64; then
15539 symcode='[ABCDGIRSTW]'
15540 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
15541 @@ -8731,7 +8325,7 @@
15542 IFS=$as_save_IFS
15543 test -z "$as_dir" && as_dir=.
15544 for ac_exec_ext in '' $ac_executable_extensions; do
15545 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15546 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15547 ac_cv_prog_AR="${ac_tool_prefix}ar"
15548 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15549 break 2
15550 @@ -8771,7 +8365,7 @@
15551 IFS=$as_save_IFS
15552 test -z "$as_dir" && as_dir=.
15553 for ac_exec_ext in '' $ac_executable_extensions; do
15554 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15555 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15556 ac_cv_prog_ac_ct_AR="ar"
15557 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15558 break 2
15559 @@ -8827,7 +8421,7 @@
15560 IFS=$as_save_IFS
15561 test -z "$as_dir" && as_dir=.
15562 for ac_exec_ext in '' $ac_executable_extensions; do
15563 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15564 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15565 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
15566 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15567 break 2
15568 @@ -8867,7 +8461,7 @@
15569 IFS=$as_save_IFS
15570 test -z "$as_dir" && as_dir=.
15571 for ac_exec_ext in '' $ac_executable_extensions; do
15572 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15573 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15574 ac_cv_prog_ac_ct_RANLIB="ranlib"
15575 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15576 break 2
15577 @@ -8923,7 +8517,7 @@
15578 IFS=$as_save_IFS
15579 test -z "$as_dir" && as_dir=.
15580 for ac_exec_ext in '' $ac_executable_extensions; do
15581 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15582 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15583 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
15584 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15585 break 2
15586 @@ -8963,7 +8557,7 @@
15587 IFS=$as_save_IFS
15588 test -z "$as_dir" && as_dir=.
15589 for ac_exec_ext in '' $ac_executable_extensions; do
15590 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
15591 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15592 ac_cv_prog_ac_ct_STRIP="strip"
15593 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15594 break 2
15595 @@ -9025,7 +8619,7 @@
15596 test -z "$ac_objext" && ac_objext=o
15597
15598 # Determine commands to create old-style static archives.
15599 -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
15600 +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
15601 old_postinstall_cmds='chmod 644 $oldlib'
15602 old_postuninstall_cmds=
15603
15604 @@ -9225,10 +8819,10 @@
15605 objext=$objext
15606
15607 # Code to be used in simple compile tests
15608 -lt_simple_compile_test_code="int some_variable = 0;\n"
15609 +lt_simple_compile_test_code="int some_variable = 0;"
15610
15611 # Code to be used in simple link tests
15612 -lt_simple_link_test_code='int main(){return(0);}\n'
15613 +lt_simple_link_test_code='int main(){return(0);}'
15614
15615
15616 # If no C compiler was specified, use CC.
15617 @@ -9243,13 +8837,13 @@
15618
15619 # save warnings/boilerplate of simple test code
15620 ac_outfile=conftest.$ac_objext
15621 -printf "$lt_simple_compile_test_code" >conftest.$ac_ext
15622 +echo "$lt_simple_compile_test_code" >conftest.$ac_ext
15623 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
15624 _lt_compiler_boilerplate=`cat conftest.err`
15625 $rm conftest*
15626
15627 ac_outfile=conftest.$ac_objext
15628 -printf "$lt_simple_link_test_code" >conftest.$ac_ext
15629 +echo "$lt_simple_link_test_code" >conftest.$ac_ext
15630 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
15631 _lt_linker_boilerplate=`cat conftest.err`
15632 $rm conftest*
15633 @@ -9269,7 +8863,7 @@
15634 else
15635 lt_cv_prog_compiler_rtti_exceptions=no
15636 ac_outfile=conftest.$ac_objext
15637 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
15638 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
15639 lt_compiler_flag="-fno-rtti -fno-exceptions"
15640 # Insert the option either (1) after the last *FLAGS variable, or
15641 # (2) before a word containing "conftest.", or (3) at the end.
15642 @@ -9280,11 +8874,11 @@
15643 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
15644 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
15645 -e 's:$: $lt_compiler_flag:'`
15646 - (eval echo "\"\$as_me:9283: $lt_compile\"" >&5)
15647 + (eval echo "\"\$as_me:8877: $lt_compile\"" >&5)
15648 (eval "$lt_compile" 2>conftest.err)
15649 ac_status=$?
15650 cat conftest.err >&5
15651 - echo "$as_me:9287: \$? = $ac_status" >&5
15652 + echo "$as_me:8881: \$? = $ac_status" >&5
15653 if (exit $ac_status) && test -s "$ac_outfile"; then
15654 # The compiler can only warn and ignore the option if not recognized
15655 # So say no if there are warnings other than the usual output.
15656 @@ -9335,13 +8929,15 @@
15657 lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
15658 ;;
15659
15660 - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
15661 + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
15662 # PIC is the default for these OSes.
15663 ;;
15664
15665 - mingw* | pw32* | os2*)
15666 + mingw* | cygwin* | pw32* | os2*)
15667 # This hack is so that the source file can tell whether it is being
15668 # built for inclusion in a dll (and should export symbols for example).
15669 + # Although the cygwin gcc ignores -fPIC, still need this for old-style
15670 + # (--disable-auto-import) libraries
15671 lt_prog_compiler_pic='-DDLL_EXPORT'
15672 ;;
15673
15674 @@ -9351,7 +8947,7 @@
15675 lt_prog_compiler_pic='-fno-common'
15676 ;;
15677
15678 - interix3*)
15679 + interix[3-9]*)
15680 # Interix 3.x gcc -fpic/-fPIC options generate broken code.
15681 # Instead, we relocate shared libraries at runtime.
15682 ;;
15683 @@ -9409,7 +9005,7 @@
15684 esac
15685 ;;
15686
15687 - mingw* | pw32* | os2*)
15688 + mingw* | cygwin* | pw32* | os2*)
15689 # This hack is so that the source file can tell whether it is being
15690 # built for inclusion in a dll (and should export symbols for example).
15691 lt_prog_compiler_pic='-DDLL_EXPORT'
15692 @@ -9442,7 +9038,7 @@
15693 lt_prog_compiler_static='-Bstatic'
15694 ;;
15695
15696 - linux*)
15697 + linux* | k*bsd*-gnu)
15698 case $cc_basename in
15699 icc* | ecc*)
15700 lt_prog_compiler_wl='-Wl,'
15701 @@ -9461,6 +9057,22 @@
15702 # All Alpha code is PIC.
15703 lt_prog_compiler_static='-non_shared'
15704 ;;
15705 + *)
15706 + case `$CC -V 2>&1 | sed 5q` in
15707 + *Sun\ C*)
15708 + # Sun C 5.9
15709 + lt_prog_compiler_pic='-KPIC'
15710 + lt_prog_compiler_static='-Bstatic'
15711 + lt_prog_compiler_wl='-Wl,'
15712 + ;;
15713 + *Sun\ F*)
15714 + # Sun Fortran 8.3 passes all unrecognized flags to the linker
15715 + lt_prog_compiler_pic='-KPIC'
15716 + lt_prog_compiler_static='-Bstatic'
15717 + lt_prog_compiler_wl=''
15718 + ;;
15719 + esac
15720 + ;;
15721 esac
15722 ;;
15723
15724 @@ -9470,6 +9082,10 @@
15725 lt_prog_compiler_static='-non_shared'
15726 ;;
15727
15728 + rdos*)
15729 + lt_prog_compiler_static='-non_shared'
15730 + ;;
15731 +
15732 solaris*)
15733 lt_prog_compiler_pic='-KPIC'
15734 lt_prog_compiler_static='-Bstatic'
15735 @@ -9537,7 +9153,7 @@
15736 else
15737 lt_prog_compiler_pic_works=no
15738 ac_outfile=conftest.$ac_objext
15739 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
15740 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
15741 lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
15742 # Insert the option either (1) after the last *FLAGS variable, or
15743 # (2) before a word containing "conftest.", or (3) at the end.
15744 @@ -9548,11 +9164,11 @@
15745 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
15746 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
15747 -e 's:$: $lt_compiler_flag:'`
15748 - (eval echo "\"\$as_me:9551: $lt_compile\"" >&5)
15749 + (eval echo "\"\$as_me:9167: $lt_compile\"" >&5)
15750 (eval "$lt_compile" 2>conftest.err)
15751 ac_status=$?
15752 cat conftest.err >&5
15753 - echo "$as_me:9555: \$? = $ac_status" >&5
15754 + echo "$as_me:9171: \$? = $ac_status" >&5
15755 if (exit $ac_status) && test -s "$ac_outfile"; then
15756 # The compiler can only warn and ignore the option if not recognized
15757 # So say no if there are warnings other than the usual output.
15758 @@ -9601,7 +9217,7 @@
15759 lt_prog_compiler_static_works=no
15760 save_LDFLAGS="$LDFLAGS"
15761 LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
15762 - printf "$lt_simple_link_test_code" > conftest.$ac_ext
15763 + echo "$lt_simple_link_test_code" > conftest.$ac_ext
15764 if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
15765 # The linker can only warn and ignore the option if not recognized
15766 # So say no if there are warnings
15767 @@ -9641,7 +9257,7 @@
15768 mkdir conftest
15769 cd conftest
15770 mkdir out
15771 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
15772 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
15773
15774 lt_compiler_flag="-o out/conftest2.$ac_objext"
15775 # Insert the option either (1) after the last *FLAGS variable, or
15776 @@ -9652,11 +9268,11 @@
15777 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
15778 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
15779 -e 's:$: $lt_compiler_flag:'`
15780 - (eval echo "\"\$as_me:9655: $lt_compile\"" >&5)
15781 + (eval echo "\"\$as_me:9271: $lt_compile\"" >&5)
15782 (eval "$lt_compile" 2>out/conftest.err)
15783 ac_status=$?
15784 cat out/conftest.err >&5
15785 - echo "$as_me:9659: \$? = $ac_status" >&5
15786 + echo "$as_me:9275: \$? = $ac_status" >&5
15787 if (exit $ac_status) && test -s out/conftest2.$ac_objext
15788 then
15789 # The compiler can only warn and ignore the option if not recognized
15790 @@ -9848,7 +9464,7 @@
15791 allow_undefined_flag=unsupported
15792 always_export_symbols=no
15793 enable_shared_with_static_runtimes=yes
15794 - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
15795 + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
15796
15797 if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
15798 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
15799 @@ -9866,7 +9482,7 @@
15800 fi
15801 ;;
15802
15803 - interix3*)
15804 + interix[3-9]*)
15805 hardcode_direct=no
15806 hardcode_shlibpath_var=no
15807 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
15808 @@ -9881,7 +9497,7 @@
15809 archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
15810 ;;
15811
15812 - linux*)
15813 + gnu* | linux* | k*bsd*-gnu)
15814 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
15815 tmp_addflag=
15816 case $cc_basename,$host_cpu in
15817 @@ -9899,20 +9515,30 @@
15818 ifc* | ifort*) # Intel Fortran compiler
15819 tmp_addflag=' -nofor_main' ;;
15820 esac
15821 - archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15822 + case `$CC -V 2>&1 | sed 5q` in
15823 + *Sun\ C*) # Sun C 5.9
15824 + 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'
15825 + tmp_sharedflag='-G' ;;
15826 + *Sun\ F*) # Sun Fortran 8.3
15827 + tmp_sharedflag='-G' ;;
15828 + *)
15829 + tmp_sharedflag='-shared' ;;
15830 + esac
15831 + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15832
15833 if test $supports_anon_versioning = yes; then
15834 archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
15835 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
15836 $echo "local: *; };" >> $output_objdir/$libname.ver~
15837 - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
15838 + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
15839 fi
15840 + link_all_deplibs=no
15841 else
15842 ld_shlibs=no
15843 fi
15844 ;;
15845
15846 - netbsd*)
15847 + netbsd* | netbsdelf*-gnu)
15848 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
15849 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
15850 wlarc=
15851 @@ -10064,7 +9690,7 @@
15852 strings "$collect2name" | grep resolve_lib_name >/dev/null
15853 then
15854 # We have reworked collect2
15855 - hardcode_direct=yes
15856 + :
15857 else
15858 # We have old collect2
15859 hardcode_direct=unsupported
15860 @@ -10132,33 +9758,24 @@
15861 rm -f conftest.er1
15862 cat conftest.err >&5
15863 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15864 - (exit $ac_status); } &&
15865 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15866 - { (case "(($ac_try" in
15867 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15868 - *) ac_try_echo=$ac_try;;
15869 -esac
15870 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15871 - (eval "$ac_try") 2>&5
15872 - ac_status=$?
15873 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15874 - (exit $ac_status); }; } &&
15875 - { ac_try='test -s conftest$ac_exeext'
15876 - { (case "(($ac_try" in
15877 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15878 - *) ac_try_echo=$ac_try;;
15879 -esac
15880 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15881 - (eval "$ac_try") 2>&5
15882 - ac_status=$?
15883 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15884 - (exit $ac_status); }; }; then
15885 -
15886 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
15887 -}'`
15888 + (exit $ac_status); } && {
15889 + test -z "$ac_c_werror_flag" ||
15890 + test ! -s conftest.err
15891 + } && test -s conftest$ac_exeext &&
15892 + $as_test_x conftest$ac_exeext; then
15893 +
15894 +lt_aix_libpath_sed='
15895 + /Import File Strings/,/^$/ {
15896 + /^0/ {
15897 + s/^0 *\(.*\)$/\1/
15898 + p
15899 + }
15900 + }'
15901 +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15902 # Check for a 64-bit object if we didn't find anything.
15903 -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
15904 -}'`; fi
15905 +if test -z "$aix_libpath"; then
15906 + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15907 +fi
15908 else
15909 echo "$as_me: failed program was:" >&5
15910 sed 's/^/| /' conftest.$ac_ext >&5
15911 @@ -10166,7 +9783,7 @@
15912
15913 fi
15914
15915 -rm -f core conftest.err conftest.$ac_objext \
15916 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15917 conftest$ac_exeext conftest.$ac_ext
15918 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
15919
15920 @@ -10207,33 +9824,24 @@
15921 rm -f conftest.er1
15922 cat conftest.err >&5
15923 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15924 - (exit $ac_status); } &&
15925 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15926 - { (case "(($ac_try" in
15927 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15928 - *) ac_try_echo=$ac_try;;
15929 -esac
15930 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15931 - (eval "$ac_try") 2>&5
15932 - ac_status=$?
15933 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15934 - (exit $ac_status); }; } &&
15935 - { ac_try='test -s conftest$ac_exeext'
15936 - { (case "(($ac_try" in
15937 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15938 - *) ac_try_echo=$ac_try;;
15939 -esac
15940 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15941 - (eval "$ac_try") 2>&5
15942 - ac_status=$?
15943 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15944 - (exit $ac_status); }; }; then
15945 -
15946 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
15947 -}'`
15948 + (exit $ac_status); } && {
15949 + test -z "$ac_c_werror_flag" ||
15950 + test ! -s conftest.err
15951 + } && test -s conftest$ac_exeext &&
15952 + $as_test_x conftest$ac_exeext; then
15953 +
15954 +lt_aix_libpath_sed='
15955 + /Import File Strings/,/^$/ {
15956 + /^0/ {
15957 + s/^0 *\(.*\)$/\1/
15958 + p
15959 + }
15960 + }'
15961 +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15962 # Check for a 64-bit object if we didn't find anything.
15963 -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
15964 -}'`; fi
15965 +if test -z "$aix_libpath"; then
15966 + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
15967 +fi
15968 else
15969 echo "$as_me: failed program was:" >&5
15970 sed 's/^/| /' conftest.$ac_ext >&5
15971 @@ -10241,7 +9849,7 @@
15972
15973 fi
15974
15975 -rm -f core conftest.err conftest.$ac_objext \
15976 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15977 conftest$ac_exeext conftest.$ac_ext
15978 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
15979
15980 @@ -10287,7 +9895,7 @@
15981 # The linker will automatically build a .lib file if we build a DLL.
15982 old_archive_From_new_cmds='true'
15983 # FIXME: Should let the user specify the lib program.
15984 - old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
15985 + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
15986 fix_srcfile_path='`cygpath -w "$srcfile"`'
15987 enable_shared_with_static_runtimes=yes
15988 ;;
15989 @@ -10329,10 +9937,10 @@
15990 case $cc_basename in
15991 xlc*)
15992 output_verbose_link_cmd='echo'
15993 - archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
15994 + archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
15995 module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
15996 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
15997 - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
15998 + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
15999 module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
16000 ;;
16001 *)
16002 @@ -10372,7 +9980,7 @@
16003 ;;
16004
16005 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
16006 - freebsd* | kfreebsd*-gnu | dragonfly*)
16007 + freebsd* | dragonfly*)
16008 archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
16009 hardcode_libdir_flag_spec='-R$libdir'
16010 hardcode_direct=yes
16011 @@ -10474,7 +10082,7 @@
16012 link_all_deplibs=yes
16013 ;;
16014
16015 - netbsd*)
16016 + netbsd* | netbsdelf*-gnu)
16017 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
16018 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
16019 else
16020 @@ -10494,24 +10102,28 @@
16021 ;;
16022
16023 openbsd*)
16024 - hardcode_direct=yes
16025 - hardcode_shlibpath_var=no
16026 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
16027 - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
16028 - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
16029 - hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
16030 - export_dynamic_flag_spec='${wl}-E'
16031 + if test -f /usr/libexec/ld.so; then
16032 + hardcode_direct=yes
16033 + hardcode_shlibpath_var=no
16034 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
16035 + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
16036 + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
16037 + hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
16038 + export_dynamic_flag_spec='${wl}-E'
16039 + else
16040 + case $host_os in
16041 + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
16042 + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
16043 + hardcode_libdir_flag_spec='-R$libdir'
16044 + ;;
16045 + *)
16046 + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
16047 + hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
16048 + ;;
16049 + esac
16050 + fi
16051 else
16052 - case $host_os in
16053 - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
16054 - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
16055 - hardcode_libdir_flag_spec='-R$libdir'
16056 - ;;
16057 - *)
16058 - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
16059 - hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
16060 - ;;
16061 - esac
16062 + ld_shlibs=no
16063 fi
16064 ;;
16065
16066 @@ -10570,17 +10182,16 @@
16067 case $host_os in
16068 solaris2.[0-5] | solaris2.[0-5].*) ;;
16069 *)
16070 - # The compiler driver will combine linker options so we
16071 - # cannot just pass the convience library names through
16072 - # without $wl, iff we do not link with $LD.
16073 - # Luckily, gcc supports the same syntax we need for Sun Studio.
16074 + # The compiler driver will combine and reorder linker options,
16075 + # but understands `-z linker_flag'. GCC discards it without `$wl',
16076 + # but is careful enough not to reorder.
16077 # Supported since Solaris 2.6 (maybe 2.5.1?)
16078 - case $wlarc in
16079 - '')
16080 - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
16081 - *)
16082 - whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
16083 - esac ;;
16084 + if test "$GCC" = yes; then
16085 + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
16086 + else
16087 + whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
16088 + fi
16089 + ;;
16090 esac
16091 link_all_deplibs=yes
16092 ;;
16093 @@ -10637,7 +10248,7 @@
16094 fi
16095 ;;
16096
16097 - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
16098 + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
16099 no_undefined_flag='${wl}-z,text'
16100 archive_cmds_need_lc=no
16101 hardcode_shlibpath_var=no
16102 @@ -10714,7 +10325,7 @@
16103 { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
16104 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
16105 $rm conftest*
16106 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
16107 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
16108
16109 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16110 (eval $ac_compile) 2>&5
16111 @@ -10772,17 +10383,55 @@
16112 version_type=none
16113 dynamic_linker="$host_os ld.so"
16114 sys_lib_dlsearch_path_spec="/lib /usr/lib"
16115 +
16116 if test "$GCC" = yes; then
16117 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
16118 - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
16119 + case $host_os in
16120 + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
16121 + *) lt_awk_arg="/^libraries:/" ;;
16122 + esac
16123 + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
16124 + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
16125 # if the path contains ";" then we assume it to be the separator
16126 # otherwise default to the standard path separator (i.e. ":") - it is
16127 # assumed that no part of a normal pathname contains ";" but that should
16128 # okay in the real world where ";" in dirpaths is itself problematic.
16129 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
16130 + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
16131 else
16132 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
16133 + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
16134 fi
16135 + # Ok, now we have the path, separated by spaces, we can step through it
16136 + # and add multilib dir if necessary.
16137 + lt_tmp_lt_search_path_spec=
16138 + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
16139 + for lt_sys_path in $lt_search_path_spec; do
16140 + if test -d "$lt_sys_path/$lt_multi_os_dir"; then
16141 + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
16142 + else
16143 + test -d "$lt_sys_path" && \
16144 + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
16145 + fi
16146 + done
16147 + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
16148 +BEGIN {RS=" "; FS="/|\n";} {
16149 + lt_foo="";
16150 + lt_count=0;
16151 + for (lt_i = NF; lt_i > 0; lt_i--) {
16152 + if ($lt_i != "" && $lt_i != ".") {
16153 + if ($lt_i == "..") {
16154 + lt_count++;
16155 + } else {
16156 + if (lt_count == 0) {
16157 + lt_foo="/" $lt_i lt_foo;
16158 + } else {
16159 + lt_count--;
16160 + }
16161 + }
16162 + }
16163 + }
16164 + if (lt_foo != "") { lt_freq[lt_foo]++; }
16165 + if (lt_freq[lt_foo] == 1) { print lt_foo; }
16166 +}'`
16167 + sys_lib_search_path_spec=`echo $lt_search_path_spec`
16168 else
16169 sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
16170 fi
16171 @@ -10942,12 +10591,8 @@
16172 shlibpath_overrides_runpath=yes
16173 shlibpath_var=DYLD_LIBRARY_PATH
16174 shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
16175 - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
16176 - if test "$GCC" = yes; then
16177 - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
16178 - else
16179 - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
16180 - fi
16181 +
16182 + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
16183 sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
16184 ;;
16185
16186 @@ -10964,18 +10609,6 @@
16187 dynamic_linker=no
16188 ;;
16189
16190 -kfreebsd*-gnu)
16191 - version_type=linux
16192 - need_lib_prefix=no
16193 - need_version=no
16194 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
16195 - soname_spec='${libname}${release}${shared_ext}$major'
16196 - shlibpath_var=LD_LIBRARY_PATH
16197 - shlibpath_overrides_runpath=no
16198 - hardcode_into_libs=yes
16199 - dynamic_linker='GNU ld.so'
16200 - ;;
16201 -
16202 freebsd* | dragonfly*)
16203 # DragonFly does not have aout. When/if they implement a new
16204 # versioning mechanism, adjust this.
16205 @@ -11013,7 +10646,7 @@
16206 shlibpath_overrides_runpath=no
16207 hardcode_into_libs=yes
16208 ;;
16209 - freebsd*) # from 4.6 on
16210 + *) # from 4.6 on, and DragonFly
16211 shlibpath_overrides_runpath=yes
16212 hardcode_into_libs=yes
16213 ;;
16214 @@ -11076,7 +10709,7 @@
16215 postinstall_cmds='chmod 555 $lib'
16216 ;;
16217
16218 -interix3*)
16219 +interix[3-9]*)
16220 version_type=linux
16221 need_lib_prefix=no
16222 need_version=no
16223 @@ -11131,7 +10764,7 @@
16224 ;;
16225
16226 # This must be Linux ELF.
16227 -linux*)
16228 +linux* | k*bsd*-gnu)
16229 version_type=linux
16230 need_lib_prefix=no
16231 need_version=no
16232 @@ -11145,31 +10778,10 @@
16233 # before this can be enabled.
16234 hardcode_into_libs=yes
16235
16236 - # find out which ABI we are using
16237 - libsuff=
16238 - case "$host_cpu" in
16239 - x86_64*|s390x*|powerpc64*)
16240 - echo '#line 11152 "configure"' > conftest.$ac_ext
16241 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16242 - (eval $ac_compile) 2>&5
16243 - ac_status=$?
16244 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16245 - (exit $ac_status); }; then
16246 - case `/usr/bin/file conftest.$ac_objext` in
16247 - *64-bit*)
16248 - libsuff=64
16249 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
16250 - ;;
16251 - esac
16252 - fi
16253 - rm -rf conftest*
16254 - ;;
16255 - esac
16256 -
16257 # Append ld.so.conf contents to the search path
16258 if test -f /etc/ld.so.conf; then
16259 - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
16260 - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
16261 + 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' ' '`
16262 + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
16263 fi
16264
16265 # We used to test for /lib/ld.so.1 and disable shared libraries on
16266 @@ -11181,7 +10793,7 @@
16267 dynamic_linker='GNU/Linux ld.so'
16268 ;;
16269
16270 -knetbsd*-gnu)
16271 +netbsdelf*-gnu)
16272 version_type=linux
16273 need_lib_prefix=no
16274 need_version=no
16275 @@ -11190,7 +10802,7 @@
16276 shlibpath_var=LD_LIBRARY_PATH
16277 shlibpath_overrides_runpath=no
16278 hardcode_into_libs=yes
16279 - dynamic_linker='GNU ld.so'
16280 + dynamic_linker='NetBSD ld.elf_so'
16281 ;;
16282
16283 netbsd*)
16284 @@ -11274,6 +10886,10 @@
16285 sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
16286 ;;
16287
16288 +rdos*)
16289 + dynamic_linker=no
16290 + ;;
16291 +
16292 solaris*)
16293 version_type=linux
16294 need_lib_prefix=no
16295 @@ -11427,6 +11043,7 @@
16296 darwin*)
16297 if test -n "$STRIP" ; then
16298 striplib="$STRIP -x"
16299 + old_striplib="$STRIP -S"
16300 { echo "$as_me:$LINENO: result: yes" >&5
16301 echo "${ECHO_T}yes" >&6; }
16302 else
16303 @@ -11510,27 +11127,11 @@
16304 rm -f conftest.er1
16305 cat conftest.err >&5
16306 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16307 - (exit $ac_status); } &&
16308 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16309 - { (case "(($ac_try" in
16310 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16311 - *) ac_try_echo=$ac_try;;
16312 -esac
16313 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16314 - (eval "$ac_try") 2>&5
16315 - ac_status=$?
16316 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16317 - (exit $ac_status); }; } &&
16318 - { ac_try='test -s conftest$ac_exeext'
16319 - { (case "(($ac_try" in
16320 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16321 - *) ac_try_echo=$ac_try;;
16322 -esac
16323 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16324 - (eval "$ac_try") 2>&5
16325 - ac_status=$?
16326 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16327 - (exit $ac_status); }; }; then
16328 + (exit $ac_status); } && {
16329 + test -z "$ac_c_werror_flag" ||
16330 + test ! -s conftest.err
16331 + } && test -s conftest$ac_exeext &&
16332 + $as_test_x conftest$ac_exeext; then
16333 ac_cv_lib_dl_dlopen=yes
16334 else
16335 echo "$as_me: failed program was:" >&5
16336 @@ -11539,7 +11140,7 @@
16337 ac_cv_lib_dl_dlopen=no
16338 fi
16339
16340 -rm -f core conftest.err conftest.$ac_objext \
16341 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16342 conftest$ac_exeext conftest.$ac_ext
16343 LIBS=$ac_check_lib_save_LIBS
16344 fi
16345 @@ -11621,27 +11222,11 @@
16346 rm -f conftest.er1
16347 cat conftest.err >&5
16348 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16349 - (exit $ac_status); } &&
16350 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16351 - { (case "(($ac_try" in
16352 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16353 - *) ac_try_echo=$ac_try;;
16354 -esac
16355 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16356 - (eval "$ac_try") 2>&5
16357 - ac_status=$?
16358 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16359 - (exit $ac_status); }; } &&
16360 - { ac_try='test -s conftest$ac_exeext'
16361 - { (case "(($ac_try" in
16362 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16363 - *) ac_try_echo=$ac_try;;
16364 -esac
16365 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16366 - (eval "$ac_try") 2>&5
16367 - ac_status=$?
16368 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16369 - (exit $ac_status); }; }; then
16370 + (exit $ac_status); } && {
16371 + test -z "$ac_c_werror_flag" ||
16372 + test ! -s conftest.err
16373 + } && test -s conftest$ac_exeext &&
16374 + $as_test_x conftest$ac_exeext; then
16375 ac_cv_func_shl_load=yes
16376 else
16377 echo "$as_me: failed program was:" >&5
16378 @@ -11650,7 +11235,7 @@
16379 ac_cv_func_shl_load=no
16380 fi
16381
16382 -rm -f core conftest.err conftest.$ac_objext \
16383 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16384 conftest$ac_exeext conftest.$ac_ext
16385 fi
16386 { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
16387 @@ -11700,27 +11285,11 @@
16388 rm -f conftest.er1
16389 cat conftest.err >&5
16390 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16391 - (exit $ac_status); } &&
16392 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16393 - { (case "(($ac_try" in
16394 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16395 - *) ac_try_echo=$ac_try;;
16396 -esac
16397 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16398 - (eval "$ac_try") 2>&5
16399 - ac_status=$?
16400 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16401 - (exit $ac_status); }; } &&
16402 - { ac_try='test -s conftest$ac_exeext'
16403 - { (case "(($ac_try" in
16404 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16405 - *) ac_try_echo=$ac_try;;
16406 -esac
16407 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16408 - (eval "$ac_try") 2>&5
16409 - ac_status=$?
16410 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16411 - (exit $ac_status); }; }; then
16412 + (exit $ac_status); } && {
16413 + test -z "$ac_c_werror_flag" ||
16414 + test ! -s conftest.err
16415 + } && test -s conftest$ac_exeext &&
16416 + $as_test_x conftest$ac_exeext; then
16417 ac_cv_lib_dld_shl_load=yes
16418 else
16419 echo "$as_me: failed program was:" >&5
16420 @@ -11729,7 +11298,7 @@
16421 ac_cv_lib_dld_shl_load=no
16422 fi
16423
16424 -rm -f core conftest.err conftest.$ac_objext \
16425 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16426 conftest$ac_exeext conftest.$ac_ext
16427 LIBS=$ac_check_lib_save_LIBS
16428 fi
16429 @@ -11801,27 +11370,11 @@
16430 rm -f conftest.er1
16431 cat conftest.err >&5
16432 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16433 - (exit $ac_status); } &&
16434 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16435 - { (case "(($ac_try" in
16436 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16437 - *) ac_try_echo=$ac_try;;
16438 -esac
16439 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16440 - (eval "$ac_try") 2>&5
16441 - ac_status=$?
16442 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16443 - (exit $ac_status); }; } &&
16444 - { ac_try='test -s conftest$ac_exeext'
16445 - { (case "(($ac_try" in
16446 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16447 - *) ac_try_echo=$ac_try;;
16448 -esac
16449 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16450 - (eval "$ac_try") 2>&5
16451 - ac_status=$?
16452 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16453 - (exit $ac_status); }; }; then
16454 + (exit $ac_status); } && {
16455 + test -z "$ac_c_werror_flag" ||
16456 + test ! -s conftest.err
16457 + } && test -s conftest$ac_exeext &&
16458 + $as_test_x conftest$ac_exeext; then
16459 ac_cv_func_dlopen=yes
16460 else
16461 echo "$as_me: failed program was:" >&5
16462 @@ -11830,7 +11383,7 @@
16463 ac_cv_func_dlopen=no
16464 fi
16465
16466 -rm -f core conftest.err conftest.$ac_objext \
16467 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16468 conftest$ac_exeext conftest.$ac_ext
16469 fi
16470 { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
16471 @@ -11880,27 +11433,11 @@
16472 rm -f conftest.er1
16473 cat conftest.err >&5
16474 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16475 - (exit $ac_status); } &&
16476 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16477 - { (case "(($ac_try" in
16478 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16479 - *) ac_try_echo=$ac_try;;
16480 -esac
16481 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16482 - (eval "$ac_try") 2>&5
16483 - ac_status=$?
16484 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16485 - (exit $ac_status); }; } &&
16486 - { ac_try='test -s conftest$ac_exeext'
16487 - { (case "(($ac_try" in
16488 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16489 - *) ac_try_echo=$ac_try;;
16490 -esac
16491 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16492 - (eval "$ac_try") 2>&5
16493 - ac_status=$?
16494 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16495 - (exit $ac_status); }; }; then
16496 + (exit $ac_status); } && {
16497 + test -z "$ac_c_werror_flag" ||
16498 + test ! -s conftest.err
16499 + } && test -s conftest$ac_exeext &&
16500 + $as_test_x conftest$ac_exeext; then
16501 ac_cv_lib_dl_dlopen=yes
16502 else
16503 echo "$as_me: failed program was:" >&5
16504 @@ -11909,7 +11446,7 @@
16505 ac_cv_lib_dl_dlopen=no
16506 fi
16507
16508 -rm -f core conftest.err conftest.$ac_objext \
16509 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16510 conftest$ac_exeext conftest.$ac_ext
16511 LIBS=$ac_check_lib_save_LIBS
16512 fi
16513 @@ -11960,27 +11497,11 @@
16514 rm -f conftest.er1
16515 cat conftest.err >&5
16516 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16517 - (exit $ac_status); } &&
16518 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16519 - { (case "(($ac_try" in
16520 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16521 - *) ac_try_echo=$ac_try;;
16522 -esac
16523 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16524 - (eval "$ac_try") 2>&5
16525 - ac_status=$?
16526 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16527 - (exit $ac_status); }; } &&
16528 - { ac_try='test -s conftest$ac_exeext'
16529 - { (case "(($ac_try" in
16530 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16531 - *) ac_try_echo=$ac_try;;
16532 -esac
16533 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16534 - (eval "$ac_try") 2>&5
16535 - ac_status=$?
16536 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16537 - (exit $ac_status); }; }; then
16538 + (exit $ac_status); } && {
16539 + test -z "$ac_c_werror_flag" ||
16540 + test ! -s conftest.err
16541 + } && test -s conftest$ac_exeext &&
16542 + $as_test_x conftest$ac_exeext; then
16543 ac_cv_lib_svld_dlopen=yes
16544 else
16545 echo "$as_me: failed program was:" >&5
16546 @@ -11989,7 +11510,7 @@
16547 ac_cv_lib_svld_dlopen=no
16548 fi
16549
16550 -rm -f core conftest.err conftest.$ac_objext \
16551 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16552 conftest$ac_exeext conftest.$ac_ext
16553 LIBS=$ac_check_lib_save_LIBS
16554 fi
16555 @@ -12040,27 +11561,11 @@
16556 rm -f conftest.er1
16557 cat conftest.err >&5
16558 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16559 - (exit $ac_status); } &&
16560 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16561 - { (case "(($ac_try" in
16562 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16563 - *) ac_try_echo=$ac_try;;
16564 -esac
16565 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16566 - (eval "$ac_try") 2>&5
16567 - ac_status=$?
16568 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16569 - (exit $ac_status); }; } &&
16570 - { ac_try='test -s conftest$ac_exeext'
16571 - { (case "(($ac_try" in
16572 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16573 - *) ac_try_echo=$ac_try;;
16574 -esac
16575 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16576 - (eval "$ac_try") 2>&5
16577 - ac_status=$?
16578 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16579 - (exit $ac_status); }; }; then
16580 + (exit $ac_status); } && {
16581 + test -z "$ac_c_werror_flag" ||
16582 + test ! -s conftest.err
16583 + } && test -s conftest$ac_exeext &&
16584 + $as_test_x conftest$ac_exeext; then
16585 ac_cv_lib_dld_dld_link=yes
16586 else
16587 echo "$as_me: failed program was:" >&5
16588 @@ -12069,7 +11574,7 @@
16589 ac_cv_lib_dld_dld_link=no
16590 fi
16591
16592 -rm -f core conftest.err conftest.$ac_objext \
16593 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16594 conftest$ac_exeext conftest.$ac_ext
16595 LIBS=$ac_check_lib_save_LIBS
16596 fi
16597 @@ -12125,7 +11630,7 @@
16598 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
16599 lt_status=$lt_dlunknown
16600 cat > conftest.$ac_ext <<EOF
16601 -#line 12128 "configure"
16602 +#line 11633 "configure"
16603 #include "confdefs.h"
16604
16605 #if HAVE_DLFCN_H
16606 @@ -12225,7 +11730,7 @@
16607 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
16608 lt_status=$lt_dlunknown
16609 cat > conftest.$ac_ext <<EOF
16610 -#line 12228 "configure"
16611 +#line 11733 "configure"
16612 #include "confdefs.h"
16613
16614 #if HAVE_DLFCN_H
16615 @@ -12423,6 +11928,7 @@
16616 module_cmds \
16617 module_expsym_cmds \
16618 lt_cv_prog_compiler_c_o \
16619 + fix_srcfile_path \
16620 exclude_expsyms \
16621 include_expsyms; do
16622
16623 @@ -12467,7 +11973,7 @@
16624 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
16625 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
16626 #
16627 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
16628 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
16629 # Free Software Foundation, Inc.
16630 #
16631 # This file is part of GNU Libtool:
16632 @@ -12791,7 +12297,7 @@
16633 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
16634
16635 # Fix the shell variable \$srcfile for the compiler.
16636 -fix_srcfile_path="$fix_srcfile_path"
16637 +fix_srcfile_path=$lt_fix_srcfile_path
16638
16639 # Set to yes if exported symbols are required.
16640 always_export_symbols=$always_export_symbols
16641 @@ -12960,10 +12466,10 @@
16642 objext_CXX=$objext
16643
16644 # Code to be used in simple compile tests
16645 -lt_simple_compile_test_code="int some_variable = 0;\n"
16646 +lt_simple_compile_test_code="int some_variable = 0;"
16647
16648 # Code to be used in simple link tests
16649 -lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
16650 +lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
16651
16652 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
16653
16654 @@ -12979,13 +12485,13 @@
16655
16656 # save warnings/boilerplate of simple test code
16657 ac_outfile=conftest.$ac_objext
16658 -printf "$lt_simple_compile_test_code" >conftest.$ac_ext
16659 +echo "$lt_simple_compile_test_code" >conftest.$ac_ext
16660 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
16661 _lt_compiler_boilerplate=`cat conftest.err`
16662 $rm conftest*
16663
16664 ac_outfile=conftest.$ac_objext
16665 -printf "$lt_simple_link_test_code" >conftest.$ac_ext
16666 +echo "$lt_simple_link_test_code" >conftest.$ac_ext
16667 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
16668 _lt_linker_boilerplate=`cat conftest.err`
16669 $rm conftest*
16670 @@ -13244,7 +12750,7 @@
16671 strings "$collect2name" | grep resolve_lib_name >/dev/null
16672 then
16673 # We have reworked collect2
16674 - hardcode_direct_CXX=yes
16675 + :
16676 else
16677 # We have old collect2
16678 hardcode_direct_CXX=unsupported
16679 @@ -13312,33 +12818,24 @@
16680 rm -f conftest.er1
16681 cat conftest.err >&5
16682 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16683 - (exit $ac_status); } &&
16684 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
16685 - { (case "(($ac_try" in
16686 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16687 - *) ac_try_echo=$ac_try;;
16688 -esac
16689 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16690 - (eval "$ac_try") 2>&5
16691 - ac_status=$?
16692 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16693 - (exit $ac_status); }; } &&
16694 - { ac_try='test -s conftest$ac_exeext'
16695 - { (case "(($ac_try" in
16696 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16697 - *) ac_try_echo=$ac_try;;
16698 -esac
16699 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16700 - (eval "$ac_try") 2>&5
16701 - ac_status=$?
16702 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16703 - (exit $ac_status); }; }; then
16704 -
16705 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
16706 -}'`
16707 + (exit $ac_status); } && {
16708 + test -z "$ac_cxx_werror_flag" ||
16709 + test ! -s conftest.err
16710 + } && test -s conftest$ac_exeext &&
16711 + $as_test_x conftest$ac_exeext; then
16712 +
16713 +lt_aix_libpath_sed='
16714 + /Import File Strings/,/^$/ {
16715 + /^0/ {
16716 + s/^0 *\(.*\)$/\1/
16717 + p
16718 + }
16719 + }'
16720 +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
16721 # Check for a 64-bit object if we didn't find anything.
16722 -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
16723 -}'`; fi
16724 +if test -z "$aix_libpath"; then
16725 + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
16726 +fi
16727 else
16728 echo "$as_me: failed program was:" >&5
16729 sed 's/^/| /' conftest.$ac_ext >&5
16730 @@ -13346,7 +12843,7 @@
16731
16732 fi
16733
16734 -rm -f core conftest.err conftest.$ac_objext \
16735 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16736 conftest$ac_exeext conftest.$ac_ext
16737 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
16738
16739 @@ -13388,33 +12885,24 @@
16740 rm -f conftest.er1
16741 cat conftest.err >&5
16742 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16743 - (exit $ac_status); } &&
16744 - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
16745 - { (case "(($ac_try" in
16746 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16747 - *) ac_try_echo=$ac_try;;
16748 -esac
16749 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16750 - (eval "$ac_try") 2>&5
16751 - ac_status=$?
16752 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16753 - (exit $ac_status); }; } &&
16754 - { ac_try='test -s conftest$ac_exeext'
16755 - { (case "(($ac_try" in
16756 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
16757 - *) ac_try_echo=$ac_try;;
16758 -esac
16759 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
16760 - (eval "$ac_try") 2>&5
16761 - ac_status=$?
16762 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
16763 - (exit $ac_status); }; }; then
16764 -
16765 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
16766 -}'`
16767 + (exit $ac_status); } && {
16768 + test -z "$ac_cxx_werror_flag" ||
16769 + test ! -s conftest.err
16770 + } && test -s conftest$ac_exeext &&
16771 + $as_test_x conftest$ac_exeext; then
16772 +
16773 +lt_aix_libpath_sed='
16774 + /Import File Strings/,/^$/ {
16775 + /^0/ {
16776 + s/^0 *\(.*\)$/\1/
16777 + p
16778 + }
16779 + }'
16780 +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
16781 # Check for a 64-bit object if we didn't find anything.
16782 -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
16783 -}'`; fi
16784 +if test -z "$aix_libpath"; then
16785 + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
16786 +fi
16787 else
16788 echo "$as_me: failed program was:" >&5
16789 sed 's/^/| /' conftest.$ac_ext >&5
16790 @@ -13422,7 +12910,7 @@
16791
16792 fi
16793
16794 -rm -f core conftest.err conftest.$ac_objext \
16795 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
16796 conftest$ac_exeext conftest.$ac_ext
16797 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
16798
16799 @@ -13533,10 +13021,10 @@
16800 case $cc_basename in
16801 xlc*)
16802 output_verbose_link_cmd='echo'
16803 - archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
16804 + archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
16805 module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
16806 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
16807 - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
16808 + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
16809 module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
16810 ;;
16811 *)
16812 @@ -13570,7 +13058,7 @@
16813 freebsd-elf*)
16814 archive_cmds_need_lc_CXX=no
16815 ;;
16816 - freebsd* | kfreebsd*-gnu | dragonfly*)
16817 + freebsd* | dragonfly*)
16818 # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
16819 # conventions
16820 ld_shlibs_CXX=yes
16821 @@ -13619,9 +13107,7 @@
16822 hardcode_libdir_separator_CXX=:
16823
16824 case $host_cpu in
16825 - hppa*64*|ia64*)
16826 - hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
16827 - ;;
16828 + hppa*64*|ia64*) ;;
16829 *)
16830 export_dynamic_flag_spec_CXX='${wl}-E'
16831 ;;
16832 @@ -13689,7 +13175,7 @@
16833 ;;
16834 esac
16835 ;;
16836 - interix3*)
16837 + interix[3-9]*)
16838 hardcode_direct_CXX=no
16839 hardcode_shlibpath_var_CXX=no
16840 hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
16841 @@ -13729,7 +13215,7 @@
16842 hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
16843 hardcode_libdir_separator_CXX=:
16844 ;;
16845 - linux*)
16846 + linux* | k*bsd*-gnu)
16847 case $cc_basename in
16848 KCC*)
16849 # Kuck and Associates, Inc. (KAI) C++ Compiler
16850 @@ -13809,6 +13295,29 @@
16851 # dependencies.
16852 output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
16853 ;;
16854 + *)
16855 + case `$CC -V 2>&1 | sed 5q` in
16856 + *Sun\ C*)
16857 + # Sun C++ 5.9
16858 + no_undefined_flag_CXX=' -zdefs'
16859 + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
16860 + archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
16861 + hardcode_libdir_flag_spec_CXX='-R$libdir'
16862 + whole_archive_flag_spec_CXX='${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'
16863 +
16864 + # Not sure whether something based on
16865 + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
16866 + # would be better.
16867 + output_verbose_link_cmd='echo'
16868 +
16869 + # Archives containing C++ object files must be created using
16870 + # "CC -xar", where "CC" is the Sun C++ compiler. This is
16871 + # necessary to make sure instantiated templates are included
16872 + # in the archive.
16873 + old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
16874 + ;;
16875 + esac
16876 + ;;
16877 esac
16878 ;;
16879 lynxos*)
16880 @@ -13831,7 +13340,7 @@
16881 ;;
16882 esac
16883 ;;
16884 - netbsd*)
16885 + netbsd* | netbsdelf*-gnu)
16886 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
16887 archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
16888 wlarc=
16889 @@ -13847,16 +13356,20 @@
16890 ld_shlibs_CXX=no
16891 ;;
16892 openbsd*)
16893 - hardcode_direct_CXX=yes
16894 - hardcode_shlibpath_var_CXX=no
16895 - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
16896 - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
16897 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
16898 - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
16899 - export_dynamic_flag_spec_CXX='${wl}-E'
16900 - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
16901 + if test -f /usr/libexec/ld.so; then
16902 + hardcode_direct_CXX=yes
16903 + hardcode_shlibpath_var_CXX=no
16904 + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
16905 + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
16906 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
16907 + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
16908 + export_dynamic_flag_spec_CXX='${wl}-E'
16909 + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
16910 + fi
16911 + output_verbose_link_cmd='echo'
16912 + else
16913 + ld_shlibs_CXX=no
16914 fi
16915 - output_verbose_link_cmd='echo'
16916 ;;
16917 osf3*)
16918 case $cc_basename in
16919 @@ -14018,15 +13531,10 @@
16920 case $host_os in
16921 solaris2.[0-5] | solaris2.[0-5].*) ;;
16922 *)
16923 - # The C++ compiler is used as linker so we must use $wl
16924 - # flag to pass the commands to the underlying system
16925 - # linker. We must also pass each convience library through
16926 - # to the system linker between allextract/defaultextract.
16927 - # The C++ compiler will combine linker options so we
16928 - # cannot just pass the convience library names through
16929 - # without $wl.
16930 + # The compiler driver will combine and reorder linker options,
16931 + # but understands `-z linker_flag'.
16932 # Supported since Solaris 2.6 (maybe 2.5.1?)
16933 - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
16934 + whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
16935 ;;
16936 esac
16937 link_all_deplibs_CXX=yes
16938 @@ -14073,6 +13581,12 @@
16939 fi
16940
16941 hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
16942 + case $host_os in
16943 + solaris2.[0-5] | solaris2.[0-5].*) ;;
16944 + *)
16945 + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
16946 + ;;
16947 + esac
16948 fi
16949 ;;
16950 esac
16951 @@ -14264,7 +13778,7 @@
16952
16953 # PORTME: override above test on systems where it is broken
16954 case $host_os in
16955 -interix3*)
16956 +interix[3-9]*)
16957 # Interix 3.5 installs completely hosed .la files for C++, so rather than
16958 # hack all around it, let's just trust "g++" to DTRT.
16959 predep_objects_CXX=
16960 @@ -14272,13 +13786,46 @@
16961 postdeps_CXX=
16962 ;;
16963
16964 +linux*)
16965 + case `$CC -V 2>&1 | sed 5q` in
16966 + *Sun\ C*)
16967 + # Sun C++ 5.9
16968 + #
16969 + # The more standards-conforming stlport4 library is
16970 + # incompatible with the Cstd library. Avoid specifying
16971 + # it if it's in CXXFLAGS. Ignore libCrun as
16972 + # -library=stlport4 depends on it.
16973 + case " $CXX $CXXFLAGS " in
16974 + *" -library=stlport4 "*)
16975 + solaris_use_stlport4=yes
16976 + ;;
16977 + esac
16978 + if test "$solaris_use_stlport4" != yes; then
16979 + postdeps_CXX='-library=Cstd -library=Crun'
16980 + fi
16981 + ;;
16982 + esac
16983 + ;;
16984 +
16985 solaris*)
16986 case $cc_basename in
16987 CC*)
16988 - # Adding this requires a known-good setup of shared libraries for
16989 + # The more standards-conforming stlport4 library is
16990 + # incompatible with the Cstd library. Avoid specifying
16991 + # it if it's in CXXFLAGS. Ignore libCrun as
16992 + # -library=stlport4 depends on it.
16993 + case " $CXX $CXXFLAGS " in
16994 + *" -library=stlport4 "*)
16995 + solaris_use_stlport4=yes
16996 + ;;
16997 + esac
16998 +
16999 + # Adding this requires a known-good setup of shared libraries for
17000 # Sun compiler versions before 5.6, else PIC objects from an old
17001 # archive will be linked into the output, leading to subtle bugs.
17002 - postdeps_CXX='-lCstd -lCrun'
17003 + if test "$solaris_use_stlport4" != yes; then
17004 + postdeps_CXX='-library=Cstd -library=Crun'
17005 + fi
17006 ;;
17007 esac
17008 ;;
17009 @@ -14315,12 +13862,14 @@
17010 # like `-m68040'.
17011 lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
17012 ;;
17013 - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
17014 + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
17015 # PIC is the default for these OSes.
17016 ;;
17017 - mingw* | os2* | pw32*)
17018 + mingw* | cygwin* | os2* | pw32*)
17019 # This hack is so that the source file can tell whether it is being
17020 # built for inclusion in a dll (and should export symbols for example).
17021 + # Although the cygwin gcc ignores -fPIC, still need this for old-style
17022 + # (--disable-auto-import) libraries
17023 lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
17024 ;;
17025 darwin* | rhapsody*)
17026 @@ -14332,7 +13881,7 @@
17027 # DJGPP does not support shared libraries at all
17028 lt_prog_compiler_pic_CXX=
17029 ;;
17030 - interix3*)
17031 + interix[3-9]*)
17032 # Interix 3.x gcc -fpic/-fPIC options generate broken code.
17033 # Instead, we relocate shared libraries at runtime.
17034 ;;
17035 @@ -14398,7 +13947,7 @@
17036 ;;
17037 esac
17038 ;;
17039 - freebsd* | kfreebsd*-gnu | dragonfly*)
17040 + freebsd* | dragonfly*)
17041 # FreeBSD uses GNU C++
17042 ;;
17043 hpux9* | hpux10* | hpux11*)
17044 @@ -14441,7 +13990,7 @@
17045 ;;
17046 esac
17047 ;;
17048 - linux*)
17049 + linux* | k*bsd*-gnu)
17050 case $cc_basename in
17051 KCC*)
17052 # KAI C++ Compiler
17053 @@ -14468,6 +14017,14 @@
17054 lt_prog_compiler_static_CXX='-non_shared'
17055 ;;
17056 *)
17057 + case `$CC -V 2>&1 | sed 5q` in
17058 + *Sun\ C*)
17059 + # Sun C++ 5.9
17060 + lt_prog_compiler_pic_CXX='-KPIC'
17061 + lt_prog_compiler_static_CXX='-Bstatic'
17062 + lt_prog_compiler_wl_CXX='-Qoption ld '
17063 + ;;
17064 + esac
17065 ;;
17066 esac
17067 ;;
17068 @@ -14484,7 +14041,7 @@
17069 ;;
17070 esac
17071 ;;
17072 - netbsd*)
17073 + netbsd* | netbsdelf*-gnu)
17074 ;;
17075 osf3* | osf4* | osf5*)
17076 case $cc_basename in
17077 @@ -14582,7 +14139,7 @@
17078 else
17079 lt_prog_compiler_pic_works_CXX=no
17080 ac_outfile=conftest.$ac_objext
17081 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
17082 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
17083 lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
17084 # Insert the option either (1) after the last *FLAGS variable, or
17085 # (2) before a word containing "conftest.", or (3) at the end.
17086 @@ -14593,11 +14150,11 @@
17087 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
17088 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
17089 -e 's:$: $lt_compiler_flag:'`
17090 - (eval echo "\"\$as_me:14596: $lt_compile\"" >&5)
17091 + (eval echo "\"\$as_me:14153: $lt_compile\"" >&5)
17092 (eval "$lt_compile" 2>conftest.err)
17093 ac_status=$?
17094 cat conftest.err >&5
17095 - echo "$as_me:14600: \$? = $ac_status" >&5
17096 + echo "$as_me:14157: \$? = $ac_status" >&5
17097 if (exit $ac_status) && test -s "$ac_outfile"; then
17098 # The compiler can only warn and ignore the option if not recognized
17099 # So say no if there are warnings other than the usual output.
17100 @@ -14646,7 +14203,7 @@
17101 lt_prog_compiler_static_works_CXX=no
17102 save_LDFLAGS="$LDFLAGS"
17103 LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
17104 - printf "$lt_simple_link_test_code" > conftest.$ac_ext
17105 + echo "$lt_simple_link_test_code" > conftest.$ac_ext
17106 if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
17107 # The linker can only warn and ignore the option if not recognized
17108 # So say no if there are warnings
17109 @@ -14686,7 +14243,7 @@
17110 mkdir conftest
17111 cd conftest
17112 mkdir out
17113 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
17114 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
17115
17116 lt_compiler_flag="-o out/conftest2.$ac_objext"
17117 # Insert the option either (1) after the last *FLAGS variable, or
17118 @@ -14697,11 +14254,11 @@
17119 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
17120 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
17121 -e 's:$: $lt_compiler_flag:'`
17122 - (eval echo "\"\$as_me:14700: $lt_compile\"" >&5)
17123 + (eval echo "\"\$as_me:14257: $lt_compile\"" >&5)
17124 (eval "$lt_compile" 2>out/conftest.err)
17125 ac_status=$?
17126 cat out/conftest.err >&5
17127 - echo "$as_me:14704: \$? = $ac_status" >&5
17128 + echo "$as_me:14261: \$? = $ac_status" >&5
17129 if (exit $ac_status) && test -s out/conftest2.$ac_objext
17130 then
17131 # The compiler can only warn and ignore the option if not recognized
17132 @@ -14767,7 +14324,10 @@
17133 export_symbols_cmds_CXX="$ltdll_cmds"
17134 ;;
17135 cygwin* | mingw*)
17136 - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
17137 + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
17138 + ;;
17139 + linux* | k*bsd*-gnu)
17140 + link_all_deplibs_CXX=no
17141 ;;
17142 *)
17143 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
17144 @@ -14798,7 +14358,7 @@
17145 { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
17146 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
17147 $rm conftest*
17148 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
17149 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
17150
17151 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17152 (eval $ac_compile) 2>&5
17153 @@ -14856,20 +14416,7 @@
17154 version_type=none
17155 dynamic_linker="$host_os ld.so"
17156 sys_lib_dlsearch_path_spec="/lib /usr/lib"
17157 -if test "$GCC" = yes; then
17158 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
17159 - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
17160 - # if the path contains ";" then we assume it to be the separator
17161 - # otherwise default to the standard path separator (i.e. ":") - it is
17162 - # assumed that no part of a normal pathname contains ";" but that should
17163 - # okay in the real world where ";" in dirpaths is itself problematic.
17164 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
17165 - else
17166 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
17167 - fi
17168 -else
17169 - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
17170 -fi
17171 +
17172 need_lib_prefix=unknown
17173 hardcode_into_libs=no
17174
17175 @@ -15026,12 +14573,7 @@
17176 shlibpath_overrides_runpath=yes
17177 shlibpath_var=DYLD_LIBRARY_PATH
17178 shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
17179 - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
17180 - if test "$GCC" = yes; then
17181 - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
17182 - else
17183 - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
17184 - fi
17185 +
17186 sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
17187 ;;
17188
17189 @@ -15048,18 +14590,6 @@
17190 dynamic_linker=no
17191 ;;
17192
17193 -kfreebsd*-gnu)
17194 - version_type=linux
17195 - need_lib_prefix=no
17196 - need_version=no
17197 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
17198 - soname_spec='${libname}${release}${shared_ext}$major'
17199 - shlibpath_var=LD_LIBRARY_PATH
17200 - shlibpath_overrides_runpath=no
17201 - hardcode_into_libs=yes
17202 - dynamic_linker='GNU ld.so'
17203 - ;;
17204 -
17205 freebsd* | dragonfly*)
17206 # DragonFly does not have aout. When/if they implement a new
17207 # versioning mechanism, adjust this.
17208 @@ -15097,7 +14627,7 @@
17209 shlibpath_overrides_runpath=no
17210 hardcode_into_libs=yes
17211 ;;
17212 - freebsd*) # from 4.6 on
17213 + *) # from 4.6 on, and DragonFly
17214 shlibpath_overrides_runpath=yes
17215 hardcode_into_libs=yes
17216 ;;
17217 @@ -15160,7 +14690,7 @@
17218 postinstall_cmds='chmod 555 $lib'
17219 ;;
17220
17221 -interix3*)
17222 +interix[3-9]*)
17223 version_type=linux
17224 need_lib_prefix=no
17225 need_version=no
17226 @@ -15215,7 +14745,7 @@
17227 ;;
17228
17229 # This must be Linux ELF.
17230 -linux*)
17231 +linux* | k*bsd*-gnu)
17232 version_type=linux
17233 need_lib_prefix=no
17234 need_version=no
17235 @@ -15229,31 +14759,10 @@
17236 # before this can be enabled.
17237 hardcode_into_libs=yes
17238
17239 - # find out which ABI we are using
17240 - libsuff=
17241 - case "$host_cpu" in
17242 - x86_64*|s390x*|powerpc64*)
17243 - echo '#line 15236 "configure"' > conftest.$ac_ext
17244 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17245 - (eval $ac_compile) 2>&5
17246 - ac_status=$?
17247 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17248 - (exit $ac_status); }; then
17249 - case `/usr/bin/file conftest.$ac_objext` in
17250 - *64-bit*)
17251 - libsuff=64
17252 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
17253 - ;;
17254 - esac
17255 - fi
17256 - rm -rf conftest*
17257 - ;;
17258 - esac
17259 -
17260 # Append ld.so.conf contents to the search path
17261 if test -f /etc/ld.so.conf; then
17262 - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
17263 - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
17264 + 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' ' '`
17265 + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
17266 fi
17267
17268 # We used to test for /lib/ld.so.1 and disable shared libraries on
17269 @@ -15265,7 +14774,7 @@
17270 dynamic_linker='GNU/Linux ld.so'
17271 ;;
17272
17273 -knetbsd*-gnu)
17274 +netbsdelf*-gnu)
17275 version_type=linux
17276 need_lib_prefix=no
17277 need_version=no
17278 @@ -15274,7 +14783,7 @@
17279 shlibpath_var=LD_LIBRARY_PATH
17280 shlibpath_overrides_runpath=no
17281 hardcode_into_libs=yes
17282 - dynamic_linker='GNU ld.so'
17283 + dynamic_linker='NetBSD ld.elf_so'
17284 ;;
17285
17286 netbsd*)
17287 @@ -15358,6 +14867,10 @@
17288 sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
17289 ;;
17290
17291 +rdos*)
17292 + dynamic_linker=no
17293 + ;;
17294 +
17295 solaris*)
17296 version_type=linux
17297 need_lib_prefix=no
17298 @@ -15552,6 +15065,7 @@
17299 module_cmds_CXX \
17300 module_expsym_cmds_CXX \
17301 lt_cv_prog_compiler_c_o_CXX \
17302 + fix_srcfile_path_CXX \
17303 exclude_expsyms_CXX \
17304 include_expsyms_CXX; do
17305
17306 @@ -15872,7 +15386,7 @@
17307 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
17308
17309 # Fix the shell variable \$srcfile for the compiler.
17310 -fix_srcfile_path="$fix_srcfile_path_CXX"
17311 +fix_srcfile_path=$lt_fix_srcfile_path
17312
17313 # Set to yes if exported symbols are required.
17314 always_export_symbols=$always_export_symbols_CXX
17315 @@ -15963,10 +15477,17 @@
17316 objext_F77=$objext
17317
17318 # Code to be used in simple compile tests
17319 -lt_simple_compile_test_code=" subroutine t\n return\n end\n"
17320 +lt_simple_compile_test_code="\
17321 + subroutine t
17322 + return
17323 + end
17324 +"
17325
17326 # Code to be used in simple link tests
17327 -lt_simple_link_test_code=" program t\n end\n"
17328 +lt_simple_link_test_code="\
17329 + program t
17330 + end
17331 +"
17332
17333 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
17334
17335 @@ -15982,13 +15503,13 @@
17336
17337 # save warnings/boilerplate of simple test code
17338 ac_outfile=conftest.$ac_objext
17339 -printf "$lt_simple_compile_test_code" >conftest.$ac_ext
17340 +echo "$lt_simple_compile_test_code" >conftest.$ac_ext
17341 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
17342 _lt_compiler_boilerplate=`cat conftest.err`
17343 $rm conftest*
17344
17345 ac_outfile=conftest.$ac_objext
17346 -printf "$lt_simple_link_test_code" >conftest.$ac_ext
17347 +echo "$lt_simple_link_test_code" >conftest.$ac_ext
17348 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
17349 _lt_linker_boilerplate=`cat conftest.err`
17350 $rm conftest*
17351 @@ -16075,13 +15596,15 @@
17352 lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
17353 ;;
17354
17355 - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
17356 + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
17357 # PIC is the default for these OSes.
17358 ;;
17359
17360 - mingw* | pw32* | os2*)
17361 + mingw* | cygwin* | pw32* | os2*)
17362 # This hack is so that the source file can tell whether it is being
17363 # built for inclusion in a dll (and should export symbols for example).
17364 + # Although the cygwin gcc ignores -fPIC, still need this for old-style
17365 + # (--disable-auto-import) libraries
17366 lt_prog_compiler_pic_F77='-DDLL_EXPORT'
17367 ;;
17368
17369 @@ -16091,7 +15614,7 @@
17370 lt_prog_compiler_pic_F77='-fno-common'
17371 ;;
17372
17373 - interix3*)
17374 + interix[3-9]*)
17375 # Interix 3.x gcc -fpic/-fPIC options generate broken code.
17376 # Instead, we relocate shared libraries at runtime.
17377 ;;
17378 @@ -16149,7 +15672,7 @@
17379 esac
17380 ;;
17381
17382 - mingw* | pw32* | os2*)
17383 + mingw* | cygwin* | pw32* | os2*)
17384 # This hack is so that the source file can tell whether it is being
17385 # built for inclusion in a dll (and should export symbols for example).
17386 lt_prog_compiler_pic_F77='-DDLL_EXPORT'
17387 @@ -16182,7 +15705,7 @@
17388 lt_prog_compiler_static_F77='-Bstatic'
17389 ;;
17390
17391 - linux*)
17392 + linux* | k*bsd*-gnu)
17393 case $cc_basename in
17394 icc* | ecc*)
17395 lt_prog_compiler_wl_F77='-Wl,'
17396 @@ -16201,6 +15724,22 @@
17397 # All Alpha code is PIC.
17398 lt_prog_compiler_static_F77='-non_shared'
17399 ;;
17400 + *)
17401 + case `$CC -V 2>&1 | sed 5q` in
17402 + *Sun\ C*)
17403 + # Sun C 5.9
17404 + lt_prog_compiler_pic_F77='-KPIC'
17405 + lt_prog_compiler_static_F77='-Bstatic'
17406 + lt_prog_compiler_wl_F77='-Wl,'
17407 + ;;
17408 + *Sun\ F*)
17409 + # Sun Fortran 8.3 passes all unrecognized flags to the linker
17410 + lt_prog_compiler_pic_F77='-KPIC'
17411 + lt_prog_compiler_static_F77='-Bstatic'
17412 + lt_prog_compiler_wl_F77=''
17413 + ;;
17414 + esac
17415 + ;;
17416 esac
17417 ;;
17418
17419 @@ -16210,6 +15749,10 @@
17420 lt_prog_compiler_static_F77='-non_shared'
17421 ;;
17422
17423 + rdos*)
17424 + lt_prog_compiler_static_F77='-non_shared'
17425 + ;;
17426 +
17427 solaris*)
17428 lt_prog_compiler_pic_F77='-KPIC'
17429 lt_prog_compiler_static_F77='-Bstatic'
17430 @@ -16277,7 +15820,7 @@
17431 else
17432 lt_prog_compiler_pic_works_F77=no
17433 ac_outfile=conftest.$ac_objext
17434 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
17435 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
17436 lt_compiler_flag="$lt_prog_compiler_pic_F77"
17437 # Insert the option either (1) after the last *FLAGS variable, or
17438 # (2) before a word containing "conftest.", or (3) at the end.
17439 @@ -16288,11 +15831,11 @@
17440 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
17441 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
17442 -e 's:$: $lt_compiler_flag:'`
17443 - (eval echo "\"\$as_me:16291: $lt_compile\"" >&5)
17444 + (eval echo "\"\$as_me:15834: $lt_compile\"" >&5)
17445 (eval "$lt_compile" 2>conftest.err)
17446 ac_status=$?
17447 cat conftest.err >&5
17448 - echo "$as_me:16295: \$? = $ac_status" >&5
17449 + echo "$as_me:15838: \$? = $ac_status" >&5
17450 if (exit $ac_status) && test -s "$ac_outfile"; then
17451 # The compiler can only warn and ignore the option if not recognized
17452 # So say no if there are warnings other than the usual output.
17453 @@ -16341,7 +15884,7 @@
17454 lt_prog_compiler_static_works_F77=no
17455 save_LDFLAGS="$LDFLAGS"
17456 LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
17457 - printf "$lt_simple_link_test_code" > conftest.$ac_ext
17458 + echo "$lt_simple_link_test_code" > conftest.$ac_ext
17459 if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
17460 # The linker can only warn and ignore the option if not recognized
17461 # So say no if there are warnings
17462 @@ -16381,7 +15924,7 @@
17463 mkdir conftest
17464 cd conftest
17465 mkdir out
17466 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
17467 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
17468
17469 lt_compiler_flag="-o out/conftest2.$ac_objext"
17470 # Insert the option either (1) after the last *FLAGS variable, or
17471 @@ -16392,11 +15935,11 @@
17472 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
17473 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
17474 -e 's:$: $lt_compiler_flag:'`
17475 - (eval echo "\"\$as_me:16395: $lt_compile\"" >&5)
17476 + (eval echo "\"\$as_me:15938: $lt_compile\"" >&5)
17477 (eval "$lt_compile" 2>out/conftest.err)
17478 ac_status=$?
17479 cat out/conftest.err >&5
17480 - echo "$as_me:16399: \$? = $ac_status" >&5
17481 + echo "$as_me:15942: \$? = $ac_status" >&5
17482 if (exit $ac_status) && test -s out/conftest2.$ac_objext
17483 then
17484 # The compiler can only warn and ignore the option if not recognized
17485 @@ -16588,7 +16131,7 @@
17486 allow_undefined_flag_F77=unsupported
17487 always_export_symbols_F77=no
17488 enable_shared_with_static_runtimes_F77=yes
17489 - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
17490 + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
17491
17492 if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
17493 archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
17494 @@ -16606,7 +16149,7 @@
17495 fi
17496 ;;
17497
17498 - interix3*)
17499 + interix[3-9]*)
17500 hardcode_direct_F77=no
17501 hardcode_shlibpath_var_F77=no
17502 hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
17503 @@ -16621,7 +16164,7 @@
17504 archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
17505 ;;
17506
17507 - linux*)
17508 + gnu* | linux* | k*bsd*-gnu)
17509 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
17510 tmp_addflag=
17511 case $cc_basename,$host_cpu in
17512 @@ -16639,20 +16182,30 @@
17513 ifc* | ifort*) # Intel Fortran compiler
17514 tmp_addflag=' -nofor_main' ;;
17515 esac
17516 - archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17517 + case `$CC -V 2>&1 | sed 5q` in
17518 + *Sun\ C*) # Sun C 5.9
17519 + whole_archive_flag_spec_F77='${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'
17520 + tmp_sharedflag='-G' ;;
17521 + *Sun\ F*) # Sun Fortran 8.3
17522 + tmp_sharedflag='-G' ;;
17523 + *)
17524 + tmp_sharedflag='-shared' ;;
17525 + esac
17526 + archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
17527
17528 if test $supports_anon_versioning = yes; then
17529 archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
17530 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
17531 $echo "local: *; };" >> $output_objdir/$libname.ver~
17532 - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
17533 + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
17534 fi
17535 + link_all_deplibs_F77=no
17536 else
17537 ld_shlibs_F77=no
17538 fi
17539 ;;
17540
17541 - netbsd*)
17542 + netbsd* | netbsdelf*-gnu)
17543 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
17544 archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
17545 wlarc=
17546 @@ -16804,7 +16357,7 @@
17547 strings "$collect2name" | grep resolve_lib_name >/dev/null
17548 then
17549 # We have reworked collect2
17550 - hardcode_direct_F77=yes
17551 + :
17552 else
17553 # We have old collect2
17554 hardcode_direct_F77=unsupported
17555 @@ -16862,33 +16415,24 @@
17556 rm -f conftest.er1
17557 cat conftest.err >&5
17558 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17559 - (exit $ac_status); } &&
17560 - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
17561 - { (case "(($ac_try" in
17562 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17563 - *) ac_try_echo=$ac_try;;
17564 -esac
17565 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17566 - (eval "$ac_try") 2>&5
17567 - ac_status=$?
17568 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17569 - (exit $ac_status); }; } &&
17570 - { ac_try='test -s conftest$ac_exeext'
17571 - { (case "(($ac_try" in
17572 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17573 - *) ac_try_echo=$ac_try;;
17574 -esac
17575 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17576 - (eval "$ac_try") 2>&5
17577 - ac_status=$?
17578 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17579 - (exit $ac_status); }; }; then
17580 -
17581 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
17582 -}'`
17583 + (exit $ac_status); } && {
17584 + test -z "$ac_f77_werror_flag" ||
17585 + test ! -s conftest.err
17586 + } && test -s conftest$ac_exeext &&
17587 + $as_test_x conftest$ac_exeext; then
17588 +
17589 +lt_aix_libpath_sed='
17590 + /Import File Strings/,/^$/ {
17591 + /^0/ {
17592 + s/^0 *\(.*\)$/\1/
17593 + p
17594 + }
17595 + }'
17596 +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17597 # Check for a 64-bit object if we didn't find anything.
17598 -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
17599 -}'`; fi
17600 +if test -z "$aix_libpath"; then
17601 + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17602 +fi
17603 else
17604 echo "$as_me: failed program was:" >&5
17605 sed 's/^/| /' conftest.$ac_ext >&5
17606 @@ -16896,7 +16440,7 @@
17607
17608 fi
17609
17610 -rm -f core conftest.err conftest.$ac_objext \
17611 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17612 conftest$ac_exeext conftest.$ac_ext
17613 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17614
17615 @@ -16927,33 +16471,24 @@
17616 rm -f conftest.er1
17617 cat conftest.err >&5
17618 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17619 - (exit $ac_status); } &&
17620 - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
17621 - { (case "(($ac_try" in
17622 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17623 - *) ac_try_echo=$ac_try;;
17624 -esac
17625 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17626 - (eval "$ac_try") 2>&5
17627 - ac_status=$?
17628 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17629 - (exit $ac_status); }; } &&
17630 - { ac_try='test -s conftest$ac_exeext'
17631 - { (case "(($ac_try" in
17632 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17633 - *) ac_try_echo=$ac_try;;
17634 -esac
17635 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17636 - (eval "$ac_try") 2>&5
17637 - ac_status=$?
17638 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17639 - (exit $ac_status); }; }; then
17640 -
17641 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
17642 -}'`
17643 + (exit $ac_status); } && {
17644 + test -z "$ac_f77_werror_flag" ||
17645 + test ! -s conftest.err
17646 + } && test -s conftest$ac_exeext &&
17647 + $as_test_x conftest$ac_exeext; then
17648 +
17649 +lt_aix_libpath_sed='
17650 + /Import File Strings/,/^$/ {
17651 + /^0/ {
17652 + s/^0 *\(.*\)$/\1/
17653 + p
17654 + }
17655 + }'
17656 +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17657 # Check for a 64-bit object if we didn't find anything.
17658 -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
17659 -}'`; fi
17660 +if test -z "$aix_libpath"; then
17661 + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
17662 +fi
17663 else
17664 echo "$as_me: failed program was:" >&5
17665 sed 's/^/| /' conftest.$ac_ext >&5
17666 @@ -16961,7 +16496,7 @@
17667
17668 fi
17669
17670 -rm -f core conftest.err conftest.$ac_objext \
17671 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
17672 conftest$ac_exeext conftest.$ac_ext
17673 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
17674
17675 @@ -17007,7 +16542,7 @@
17676 # The linker will automatically build a .lib file if we build a DLL.
17677 old_archive_From_new_cmds_F77='true'
17678 # FIXME: Should let the user specify the lib program.
17679 - old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
17680 + old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
17681 fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
17682 enable_shared_with_static_runtimes_F77=yes
17683 ;;
17684 @@ -17049,10 +16584,10 @@
17685 case $cc_basename in
17686 xlc*)
17687 output_verbose_link_cmd='echo'
17688 - archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
17689 + archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
17690 module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
17691 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
17692 - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
17693 + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
17694 module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
17695 ;;
17696 *)
17697 @@ -17092,7 +16627,7 @@
17698 ;;
17699
17700 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
17701 - freebsd* | kfreebsd*-gnu | dragonfly*)
17702 + freebsd* | dragonfly*)
17703 archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
17704 hardcode_libdir_flag_spec_F77='-R$libdir'
17705 hardcode_direct_F77=yes
17706 @@ -17194,7 +16729,7 @@
17707 link_all_deplibs_F77=yes
17708 ;;
17709
17710 - netbsd*)
17711 + netbsd* | netbsdelf*-gnu)
17712 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
17713 archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
17714 else
17715 @@ -17214,24 +16749,28 @@
17716 ;;
17717
17718 openbsd*)
17719 - hardcode_direct_F77=yes
17720 - hardcode_shlibpath_var_F77=no
17721 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
17722 - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
17723 - archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
17724 - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
17725 - export_dynamic_flag_spec_F77='${wl}-E'
17726 + if test -f /usr/libexec/ld.so; then
17727 + hardcode_direct_F77=yes
17728 + hardcode_shlibpath_var_F77=no
17729 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
17730 + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
17731 + archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
17732 + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
17733 + export_dynamic_flag_spec_F77='${wl}-E'
17734 + else
17735 + case $host_os in
17736 + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
17737 + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
17738 + hardcode_libdir_flag_spec_F77='-R$libdir'
17739 + ;;
17740 + *)
17741 + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
17742 + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
17743 + ;;
17744 + esac
17745 + fi
17746 else
17747 - case $host_os in
17748 - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
17749 - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
17750 - hardcode_libdir_flag_spec_F77='-R$libdir'
17751 - ;;
17752 - *)
17753 - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
17754 - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
17755 - ;;
17756 - esac
17757 + ld_shlibs_F77=no
17758 fi
17759 ;;
17760
17761 @@ -17290,17 +16829,16 @@
17762 case $host_os in
17763 solaris2.[0-5] | solaris2.[0-5].*) ;;
17764 *)
17765 - # The compiler driver will combine linker options so we
17766 - # cannot just pass the convience library names through
17767 - # without $wl, iff we do not link with $LD.
17768 - # Luckily, gcc supports the same syntax we need for Sun Studio.
17769 + # The compiler driver will combine and reorder linker options,
17770 + # but understands `-z linker_flag'. GCC discards it without `$wl',
17771 + # but is careful enough not to reorder.
17772 # Supported since Solaris 2.6 (maybe 2.5.1?)
17773 - case $wlarc in
17774 - '')
17775 - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
17776 - *)
17777 - whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
17778 - esac ;;
17779 + if test "$GCC" = yes; then
17780 + whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
17781 + else
17782 + whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
17783 + fi
17784 + ;;
17785 esac
17786 link_all_deplibs_F77=yes
17787 ;;
17788 @@ -17357,7 +16895,7 @@
17789 fi
17790 ;;
17791
17792 - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
17793 + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
17794 no_undefined_flag_F77='${wl}-z,text'
17795 archive_cmds_need_lc_F77=no
17796 hardcode_shlibpath_var_F77=no
17797 @@ -17434,7 +16972,7 @@
17798 { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
17799 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
17800 $rm conftest*
17801 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
17802 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
17803
17804 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17805 (eval $ac_compile) 2>&5
17806 @@ -17492,20 +17030,7 @@
17807 version_type=none
17808 dynamic_linker="$host_os ld.so"
17809 sys_lib_dlsearch_path_spec="/lib /usr/lib"
17810 -if test "$GCC" = yes; then
17811 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
17812 - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
17813 - # if the path contains ";" then we assume it to be the separator
17814 - # otherwise default to the standard path separator (i.e. ":") - it is
17815 - # assumed that no part of a normal pathname contains ";" but that should
17816 - # okay in the real world where ";" in dirpaths is itself problematic.
17817 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
17818 - else
17819 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
17820 - fi
17821 -else
17822 - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
17823 -fi
17824 +
17825 need_lib_prefix=unknown
17826 hardcode_into_libs=no
17827
17828 @@ -17662,12 +17187,7 @@
17829 shlibpath_overrides_runpath=yes
17830 shlibpath_var=DYLD_LIBRARY_PATH
17831 shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
17832 - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
17833 - if test "$GCC" = yes; then
17834 - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
17835 - else
17836 - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
17837 - fi
17838 +
17839 sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
17840 ;;
17841
17842 @@ -17684,18 +17204,6 @@
17843 dynamic_linker=no
17844 ;;
17845
17846 -kfreebsd*-gnu)
17847 - version_type=linux
17848 - need_lib_prefix=no
17849 - need_version=no
17850 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
17851 - soname_spec='${libname}${release}${shared_ext}$major'
17852 - shlibpath_var=LD_LIBRARY_PATH
17853 - shlibpath_overrides_runpath=no
17854 - hardcode_into_libs=yes
17855 - dynamic_linker='GNU ld.so'
17856 - ;;
17857 -
17858 freebsd* | dragonfly*)
17859 # DragonFly does not have aout. When/if they implement a new
17860 # versioning mechanism, adjust this.
17861 @@ -17733,7 +17241,7 @@
17862 shlibpath_overrides_runpath=no
17863 hardcode_into_libs=yes
17864 ;;
17865 - freebsd*) # from 4.6 on
17866 + *) # from 4.6 on, and DragonFly
17867 shlibpath_overrides_runpath=yes
17868 hardcode_into_libs=yes
17869 ;;
17870 @@ -17796,7 +17304,7 @@
17871 postinstall_cmds='chmod 555 $lib'
17872 ;;
17873
17874 -interix3*)
17875 +interix[3-9]*)
17876 version_type=linux
17877 need_lib_prefix=no
17878 need_version=no
17879 @@ -17851,7 +17359,7 @@
17880 ;;
17881
17882 # This must be Linux ELF.
17883 -linux*)
17884 +linux* | k*bsd*-gnu)
17885 version_type=linux
17886 need_lib_prefix=no
17887 need_version=no
17888 @@ -17865,31 +17373,10 @@
17889 # before this can be enabled.
17890 hardcode_into_libs=yes
17891
17892 - # find out which ABI we are using
17893 - libsuff=
17894 - case "$host_cpu" in
17895 - x86_64*|s390x*|powerpc64*)
17896 - echo '#line 17872 "configure"' > conftest.$ac_ext
17897 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17898 - (eval $ac_compile) 2>&5
17899 - ac_status=$?
17900 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
17901 - (exit $ac_status); }; then
17902 - case `/usr/bin/file conftest.$ac_objext` in
17903 - *64-bit*)
17904 - libsuff=64
17905 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
17906 - ;;
17907 - esac
17908 - fi
17909 - rm -rf conftest*
17910 - ;;
17911 - esac
17912 -
17913 # Append ld.so.conf contents to the search path
17914 if test -f /etc/ld.so.conf; then
17915 - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
17916 - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
17917 + 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' ' '`
17918 + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
17919 fi
17920
17921 # We used to test for /lib/ld.so.1 and disable shared libraries on
17922 @@ -17901,7 +17388,7 @@
17923 dynamic_linker='GNU/Linux ld.so'
17924 ;;
17925
17926 -knetbsd*-gnu)
17927 +netbsdelf*-gnu)
17928 version_type=linux
17929 need_lib_prefix=no
17930 need_version=no
17931 @@ -17910,7 +17397,7 @@
17932 shlibpath_var=LD_LIBRARY_PATH
17933 shlibpath_overrides_runpath=no
17934 hardcode_into_libs=yes
17935 - dynamic_linker='GNU ld.so'
17936 + dynamic_linker='NetBSD ld.elf_so'
17937 ;;
17938
17939 netbsd*)
17940 @@ -17994,6 +17481,10 @@
17941 sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
17942 ;;
17943
17944 +rdos*)
17945 + dynamic_linker=no
17946 + ;;
17947 +
17948 solaris*)
17949 version_type=linux
17950 need_lib_prefix=no
17951 @@ -18188,6 +17679,7 @@
17952 module_cmds_F77 \
17953 module_expsym_cmds_F77 \
17954 lt_cv_prog_compiler_c_o_F77 \
17955 + fix_srcfile_path_F77 \
17956 exclude_expsyms_F77 \
17957 include_expsyms_F77; do
17958
17959 @@ -18508,7 +18000,7 @@
17960 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
17961
17962 # Fix the shell variable \$srcfile for the compiler.
17963 -fix_srcfile_path="$fix_srcfile_path_F77"
17964 +fix_srcfile_path=$lt_fix_srcfile_path
17965
17966 # Set to yes if exported symbols are required.
17967 always_export_symbols=$always_export_symbols_F77
17968 @@ -18566,10 +18058,10 @@
17969 objext_GCJ=$objext
17970
17971 # Code to be used in simple compile tests
17972 -lt_simple_compile_test_code="class foo {}\n"
17973 +lt_simple_compile_test_code="class foo {}"
17974
17975 # Code to be used in simple link tests
17976 -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
17977 +lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
17978
17979 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
17980
17981 @@ -18585,13 +18077,13 @@
17982
17983 # save warnings/boilerplate of simple test code
17984 ac_outfile=conftest.$ac_objext
17985 -printf "$lt_simple_compile_test_code" >conftest.$ac_ext
17986 +echo "$lt_simple_compile_test_code" >conftest.$ac_ext
17987 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
17988 _lt_compiler_boilerplate=`cat conftest.err`
17989 $rm conftest*
17990
17991 ac_outfile=conftest.$ac_objext
17992 -printf "$lt_simple_link_test_code" >conftest.$ac_ext
17993 +echo "$lt_simple_link_test_code" >conftest.$ac_ext
17994 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
17995 _lt_linker_boilerplate=`cat conftest.err`
17996 $rm conftest*
17997 @@ -18632,7 +18124,7 @@
17998 else
17999 lt_cv_prog_compiler_rtti_exceptions=no
18000 ac_outfile=conftest.$ac_objext
18001 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
18002 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
18003 lt_compiler_flag="-fno-rtti -fno-exceptions"
18004 # Insert the option either (1) after the last *FLAGS variable, or
18005 # (2) before a word containing "conftest.", or (3) at the end.
18006 @@ -18643,11 +18135,11 @@
18007 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
18008 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
18009 -e 's:$: $lt_compiler_flag:'`
18010 - (eval echo "\"\$as_me:18646: $lt_compile\"" >&5)
18011 + (eval echo "\"\$as_me:18138: $lt_compile\"" >&5)
18012 (eval "$lt_compile" 2>conftest.err)
18013 ac_status=$?
18014 cat conftest.err >&5
18015 - echo "$as_me:18650: \$? = $ac_status" >&5
18016 + echo "$as_me:18142: \$? = $ac_status" >&5
18017 if (exit $ac_status) && test -s "$ac_outfile"; then
18018 # The compiler can only warn and ignore the option if not recognized
18019 # So say no if there are warnings other than the usual output.
18020 @@ -18698,13 +18190,15 @@
18021 lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
18022 ;;
18023
18024 - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
18025 + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
18026 # PIC is the default for these OSes.
18027 ;;
18028
18029 - mingw* | pw32* | os2*)
18030 + mingw* | cygwin* | pw32* | os2*)
18031 # This hack is so that the source file can tell whether it is being
18032 # built for inclusion in a dll (and should export symbols for example).
18033 + # Although the cygwin gcc ignores -fPIC, still need this for old-style
18034 + # (--disable-auto-import) libraries
18035 lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
18036 ;;
18037
18038 @@ -18714,7 +18208,7 @@
18039 lt_prog_compiler_pic_GCJ='-fno-common'
18040 ;;
18041
18042 - interix3*)
18043 + interix[3-9]*)
18044 # Interix 3.x gcc -fpic/-fPIC options generate broken code.
18045 # Instead, we relocate shared libraries at runtime.
18046 ;;
18047 @@ -18772,7 +18266,7 @@
18048 esac
18049 ;;
18050
18051 - mingw* | pw32* | os2*)
18052 + mingw* | cygwin* | pw32* | os2*)
18053 # This hack is so that the source file can tell whether it is being
18054 # built for inclusion in a dll (and should export symbols for example).
18055 lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
18056 @@ -18805,7 +18299,7 @@
18057 lt_prog_compiler_static_GCJ='-Bstatic'
18058 ;;
18059
18060 - linux*)
18061 + linux* | k*bsd*-gnu)
18062 case $cc_basename in
18063 icc* | ecc*)
18064 lt_prog_compiler_wl_GCJ='-Wl,'
18065 @@ -18824,6 +18318,22 @@
18066 # All Alpha code is PIC.
18067 lt_prog_compiler_static_GCJ='-non_shared'
18068 ;;
18069 + *)
18070 + case `$CC -V 2>&1 | sed 5q` in
18071 + *Sun\ C*)
18072 + # Sun C 5.9
18073 + lt_prog_compiler_pic_GCJ='-KPIC'
18074 + lt_prog_compiler_static_GCJ='-Bstatic'
18075 + lt_prog_compiler_wl_GCJ='-Wl,'
18076 + ;;
18077 + *Sun\ F*)
18078 + # Sun Fortran 8.3 passes all unrecognized flags to the linker
18079 + lt_prog_compiler_pic_GCJ='-KPIC'
18080 + lt_prog_compiler_static_GCJ='-Bstatic'
18081 + lt_prog_compiler_wl_GCJ=''
18082 + ;;
18083 + esac
18084 + ;;
18085 esac
18086 ;;
18087
18088 @@ -18833,6 +18343,10 @@
18089 lt_prog_compiler_static_GCJ='-non_shared'
18090 ;;
18091
18092 + rdos*)
18093 + lt_prog_compiler_static_GCJ='-non_shared'
18094 + ;;
18095 +
18096 solaris*)
18097 lt_prog_compiler_pic_GCJ='-KPIC'
18098 lt_prog_compiler_static_GCJ='-Bstatic'
18099 @@ -18900,7 +18414,7 @@
18100 else
18101 lt_prog_compiler_pic_works_GCJ=no
18102 ac_outfile=conftest.$ac_objext
18103 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
18104 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
18105 lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
18106 # Insert the option either (1) after the last *FLAGS variable, or
18107 # (2) before a word containing "conftest.", or (3) at the end.
18108 @@ -18911,11 +18425,11 @@
18109 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
18110 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
18111 -e 's:$: $lt_compiler_flag:'`
18112 - (eval echo "\"\$as_me:18914: $lt_compile\"" >&5)
18113 + (eval echo "\"\$as_me:18428: $lt_compile\"" >&5)
18114 (eval "$lt_compile" 2>conftest.err)
18115 ac_status=$?
18116 cat conftest.err >&5
18117 - echo "$as_me:18918: \$? = $ac_status" >&5
18118 + echo "$as_me:18432: \$? = $ac_status" >&5
18119 if (exit $ac_status) && test -s "$ac_outfile"; then
18120 # The compiler can only warn and ignore the option if not recognized
18121 # So say no if there are warnings other than the usual output.
18122 @@ -18964,7 +18478,7 @@
18123 lt_prog_compiler_static_works_GCJ=no
18124 save_LDFLAGS="$LDFLAGS"
18125 LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
18126 - printf "$lt_simple_link_test_code" > conftest.$ac_ext
18127 + echo "$lt_simple_link_test_code" > conftest.$ac_ext
18128 if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
18129 # The linker can only warn and ignore the option if not recognized
18130 # So say no if there are warnings
18131 @@ -19004,7 +18518,7 @@
18132 mkdir conftest
18133 cd conftest
18134 mkdir out
18135 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
18136 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
18137
18138 lt_compiler_flag="-o out/conftest2.$ac_objext"
18139 # Insert the option either (1) after the last *FLAGS variable, or
18140 @@ -19015,11 +18529,11 @@
18141 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
18142 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
18143 -e 's:$: $lt_compiler_flag:'`
18144 - (eval echo "\"\$as_me:19018: $lt_compile\"" >&5)
18145 + (eval echo "\"\$as_me:18532: $lt_compile\"" >&5)
18146 (eval "$lt_compile" 2>out/conftest.err)
18147 ac_status=$?
18148 cat out/conftest.err >&5
18149 - echo "$as_me:19022: \$? = $ac_status" >&5
18150 + echo "$as_me:18536: \$? = $ac_status" >&5
18151 if (exit $ac_status) && test -s out/conftest2.$ac_objext
18152 then
18153 # The compiler can only warn and ignore the option if not recognized
18154 @@ -19211,7 +18725,7 @@
18155 allow_undefined_flag_GCJ=unsupported
18156 always_export_symbols_GCJ=no
18157 enable_shared_with_static_runtimes_GCJ=yes
18158 - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
18159 + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
18160
18161 if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
18162 archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
18163 @@ -19229,7 +18743,7 @@
18164 fi
18165 ;;
18166
18167 - interix3*)
18168 + interix[3-9]*)
18169 hardcode_direct_GCJ=no
18170 hardcode_shlibpath_var_GCJ=no
18171 hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
18172 @@ -19244,7 +18758,7 @@
18173 archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
18174 ;;
18175
18176 - linux*)
18177 + gnu* | linux* | k*bsd*-gnu)
18178 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
18179 tmp_addflag=
18180 case $cc_basename,$host_cpu in
18181 @@ -19262,20 +18776,30 @@
18182 ifc* | ifort*) # Intel Fortran compiler
18183 tmp_addflag=' -nofor_main' ;;
18184 esac
18185 - archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18186 + case `$CC -V 2>&1 | sed 5q` in
18187 + *Sun\ C*) # Sun C 5.9
18188 + whole_archive_flag_spec_GCJ='${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'
18189 + tmp_sharedflag='-G' ;;
18190 + *Sun\ F*) # Sun Fortran 8.3
18191 + tmp_sharedflag='-G' ;;
18192 + *)
18193 + tmp_sharedflag='-shared' ;;
18194 + esac
18195 + archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
18196
18197 if test $supports_anon_versioning = yes; then
18198 archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
18199 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
18200 $echo "local: *; };" >> $output_objdir/$libname.ver~
18201 - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
18202 + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
18203 fi
18204 + link_all_deplibs_GCJ=no
18205 else
18206 ld_shlibs_GCJ=no
18207 fi
18208 ;;
18209
18210 - netbsd*)
18211 + netbsd* | netbsdelf*-gnu)
18212 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
18213 archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
18214 wlarc=
18215 @@ -19427,7 +18951,7 @@
18216 strings "$collect2name" | grep resolve_lib_name >/dev/null
18217 then
18218 # We have reworked collect2
18219 - hardcode_direct_GCJ=yes
18220 + :
18221 else
18222 # We have old collect2
18223 hardcode_direct_GCJ=unsupported
18224 @@ -19495,33 +19019,24 @@
18225 rm -f conftest.er1
18226 cat conftest.err >&5
18227 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18228 - (exit $ac_status); } &&
18229 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18230 - { (case "(($ac_try" in
18231 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18232 - *) ac_try_echo=$ac_try;;
18233 -esac
18234 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18235 - (eval "$ac_try") 2>&5
18236 - ac_status=$?
18237 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18238 - (exit $ac_status); }; } &&
18239 - { ac_try='test -s conftest$ac_exeext'
18240 - { (case "(($ac_try" in
18241 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18242 - *) ac_try_echo=$ac_try;;
18243 -esac
18244 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18245 - (eval "$ac_try") 2>&5
18246 - ac_status=$?
18247 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18248 - (exit $ac_status); }; }; then
18249 -
18250 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
18251 -}'`
18252 + (exit $ac_status); } && {
18253 + test -z "$ac_c_werror_flag" ||
18254 + test ! -s conftest.err
18255 + } && test -s conftest$ac_exeext &&
18256 + $as_test_x conftest$ac_exeext; then
18257 +
18258 +lt_aix_libpath_sed='
18259 + /Import File Strings/,/^$/ {
18260 + /^0/ {
18261 + s/^0 *\(.*\)$/\1/
18262 + p
18263 + }
18264 + }'
18265 +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18266 # Check for a 64-bit object if we didn't find anything.
18267 -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
18268 -}'`; fi
18269 +if test -z "$aix_libpath"; then
18270 + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18271 +fi
18272 else
18273 echo "$as_me: failed program was:" >&5
18274 sed 's/^/| /' conftest.$ac_ext >&5
18275 @@ -19529,7 +19044,7 @@
18276
18277 fi
18278
18279 -rm -f core conftest.err conftest.$ac_objext \
18280 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18281 conftest$ac_exeext conftest.$ac_ext
18282 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18283
18284 @@ -19570,33 +19085,24 @@
18285 rm -f conftest.er1
18286 cat conftest.err >&5
18287 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18288 - (exit $ac_status); } &&
18289 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18290 - { (case "(($ac_try" in
18291 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18292 - *) ac_try_echo=$ac_try;;
18293 -esac
18294 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18295 - (eval "$ac_try") 2>&5
18296 - ac_status=$?
18297 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18298 - (exit $ac_status); }; } &&
18299 - { ac_try='test -s conftest$ac_exeext'
18300 - { (case "(($ac_try" in
18301 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18302 - *) ac_try_echo=$ac_try;;
18303 -esac
18304 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18305 - (eval "$ac_try") 2>&5
18306 - ac_status=$?
18307 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18308 - (exit $ac_status); }; }; then
18309 -
18310 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
18311 -}'`
18312 + (exit $ac_status); } && {
18313 + test -z "$ac_c_werror_flag" ||
18314 + test ! -s conftest.err
18315 + } && test -s conftest$ac_exeext &&
18316 + $as_test_x conftest$ac_exeext; then
18317 +
18318 +lt_aix_libpath_sed='
18319 + /Import File Strings/,/^$/ {
18320 + /^0/ {
18321 + s/^0 *\(.*\)$/\1/
18322 + p
18323 + }
18324 + }'
18325 +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18326 # Check for a 64-bit object if we didn't find anything.
18327 -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
18328 -}'`; fi
18329 +if test -z "$aix_libpath"; then
18330 + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
18331 +fi
18332 else
18333 echo "$as_me: failed program was:" >&5
18334 sed 's/^/| /' conftest.$ac_ext >&5
18335 @@ -19604,7 +19110,7 @@
18336
18337 fi
18338
18339 -rm -f core conftest.err conftest.$ac_objext \
18340 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18341 conftest$ac_exeext conftest.$ac_ext
18342 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
18343
18344 @@ -19650,7 +19156,7 @@
18345 # The linker will automatically build a .lib file if we build a DLL.
18346 old_archive_From_new_cmds_GCJ='true'
18347 # FIXME: Should let the user specify the lib program.
18348 - old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
18349 + old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
18350 fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
18351 enable_shared_with_static_runtimes_GCJ=yes
18352 ;;
18353 @@ -19692,10 +19198,10 @@
18354 case $cc_basename in
18355 xlc*)
18356 output_verbose_link_cmd='echo'
18357 - archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
18358 + archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
18359 module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
18360 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
18361 - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
18362 + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
18363 module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
18364 ;;
18365 *)
18366 @@ -19735,7 +19241,7 @@
18367 ;;
18368
18369 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
18370 - freebsd* | kfreebsd*-gnu | dragonfly*)
18371 + freebsd* | dragonfly*)
18372 archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
18373 hardcode_libdir_flag_spec_GCJ='-R$libdir'
18374 hardcode_direct_GCJ=yes
18375 @@ -19837,7 +19343,7 @@
18376 link_all_deplibs_GCJ=yes
18377 ;;
18378
18379 - netbsd*)
18380 + netbsd* | netbsdelf*-gnu)
18381 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
18382 archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
18383 else
18384 @@ -19857,24 +19363,28 @@
18385 ;;
18386
18387 openbsd*)
18388 - hardcode_direct_GCJ=yes
18389 - hardcode_shlibpath_var_GCJ=no
18390 - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
18391 - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
18392 - archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
18393 - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
18394 - export_dynamic_flag_spec_GCJ='${wl}-E'
18395 + if test -f /usr/libexec/ld.so; then
18396 + hardcode_direct_GCJ=yes
18397 + hardcode_shlibpath_var_GCJ=no
18398 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
18399 + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
18400 + archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
18401 + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
18402 + export_dynamic_flag_spec_GCJ='${wl}-E'
18403 + else
18404 + case $host_os in
18405 + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
18406 + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
18407 + hardcode_libdir_flag_spec_GCJ='-R$libdir'
18408 + ;;
18409 + *)
18410 + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
18411 + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
18412 + ;;
18413 + esac
18414 + fi
18415 else
18416 - case $host_os in
18417 - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
18418 - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
18419 - hardcode_libdir_flag_spec_GCJ='-R$libdir'
18420 - ;;
18421 - *)
18422 - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
18423 - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
18424 - ;;
18425 - esac
18426 + ld_shlibs_GCJ=no
18427 fi
18428 ;;
18429
18430 @@ -19933,17 +19443,16 @@
18431 case $host_os in
18432 solaris2.[0-5] | solaris2.[0-5].*) ;;
18433 *)
18434 - # The compiler driver will combine linker options so we
18435 - # cannot just pass the convience library names through
18436 - # without $wl, iff we do not link with $LD.
18437 - # Luckily, gcc supports the same syntax we need for Sun Studio.
18438 + # The compiler driver will combine and reorder linker options,
18439 + # but understands `-z linker_flag'. GCC discards it without `$wl',
18440 + # but is careful enough not to reorder.
18441 # Supported since Solaris 2.6 (maybe 2.5.1?)
18442 - case $wlarc in
18443 - '')
18444 - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
18445 - *)
18446 - whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
18447 - esac ;;
18448 + if test "$GCC" = yes; then
18449 + whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
18450 + else
18451 + whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
18452 + fi
18453 + ;;
18454 esac
18455 link_all_deplibs_GCJ=yes
18456 ;;
18457 @@ -20000,7 +19509,7 @@
18458 fi
18459 ;;
18460
18461 - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
18462 + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
18463 no_undefined_flag_GCJ='${wl}-z,text'
18464 archive_cmds_need_lc_GCJ=no
18465 hardcode_shlibpath_var_GCJ=no
18466 @@ -20077,7 +19586,7 @@
18467 { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
18468 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
18469 $rm conftest*
18470 - printf "$lt_simple_compile_test_code" > conftest.$ac_ext
18471 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext
18472
18473 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18474 (eval $ac_compile) 2>&5
18475 @@ -20135,20 +19644,7 @@
18476 version_type=none
18477 dynamic_linker="$host_os ld.so"
18478 sys_lib_dlsearch_path_spec="/lib /usr/lib"
18479 -if test "$GCC" = yes; then
18480 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
18481 - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
18482 - # if the path contains ";" then we assume it to be the separator
18483 - # otherwise default to the standard path separator (i.e. ":") - it is
18484 - # assumed that no part of a normal pathname contains ";" but that should
18485 - # okay in the real world where ";" in dirpaths is itself problematic.
18486 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
18487 - else
18488 - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
18489 - fi
18490 -else
18491 - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
18492 -fi
18493 +
18494 need_lib_prefix=unknown
18495 hardcode_into_libs=no
18496
18497 @@ -20305,12 +19801,7 @@
18498 shlibpath_overrides_runpath=yes
18499 shlibpath_var=DYLD_LIBRARY_PATH
18500 shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
18501 - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
18502 - if test "$GCC" = yes; then
18503 - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
18504 - else
18505 - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
18506 - fi
18507 +
18508 sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
18509 ;;
18510
18511 @@ -20327,18 +19818,6 @@
18512 dynamic_linker=no
18513 ;;
18514
18515 -kfreebsd*-gnu)
18516 - version_type=linux
18517 - need_lib_prefix=no
18518 - need_version=no
18519 - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
18520 - soname_spec='${libname}${release}${shared_ext}$major'
18521 - shlibpath_var=LD_LIBRARY_PATH
18522 - shlibpath_overrides_runpath=no
18523 - hardcode_into_libs=yes
18524 - dynamic_linker='GNU ld.so'
18525 - ;;
18526 -
18527 freebsd* | dragonfly*)
18528 # DragonFly does not have aout. When/if they implement a new
18529 # versioning mechanism, adjust this.
18530 @@ -20376,7 +19855,7 @@
18531 shlibpath_overrides_runpath=no
18532 hardcode_into_libs=yes
18533 ;;
18534 - freebsd*) # from 4.6 on
18535 + *) # from 4.6 on, and DragonFly
18536 shlibpath_overrides_runpath=yes
18537 hardcode_into_libs=yes
18538 ;;
18539 @@ -20439,7 +19918,7 @@
18540 postinstall_cmds='chmod 555 $lib'
18541 ;;
18542
18543 -interix3*)
18544 +interix[3-9]*)
18545 version_type=linux
18546 need_lib_prefix=no
18547 need_version=no
18548 @@ -20494,7 +19973,7 @@
18549 ;;
18550
18551 # This must be Linux ELF.
18552 -linux*)
18553 +linux* | k*bsd*-gnu)
18554 version_type=linux
18555 need_lib_prefix=no
18556 need_version=no
18557 @@ -20508,31 +19987,10 @@
18558 # before this can be enabled.
18559 hardcode_into_libs=yes
18560
18561 - # find out which ABI we are using
18562 - libsuff=
18563 - case "$host_cpu" in
18564 - x86_64*|s390x*|powerpc64*)
18565 - echo '#line 20515 "configure"' > conftest.$ac_ext
18566 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18567 - (eval $ac_compile) 2>&5
18568 - ac_status=$?
18569 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18570 - (exit $ac_status); }; then
18571 - case `/usr/bin/file conftest.$ac_objext` in
18572 - *64-bit*)
18573 - libsuff=64
18574 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
18575 - ;;
18576 - esac
18577 - fi
18578 - rm -rf conftest*
18579 - ;;
18580 - esac
18581 -
18582 # Append ld.so.conf contents to the search path
18583 if test -f /etc/ld.so.conf; then
18584 - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
18585 - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
18586 + 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' ' '`
18587 + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
18588 fi
18589
18590 # We used to test for /lib/ld.so.1 and disable shared libraries on
18591 @@ -20544,7 +20002,7 @@
18592 dynamic_linker='GNU/Linux ld.so'
18593 ;;
18594
18595 -knetbsd*-gnu)
18596 +netbsdelf*-gnu)
18597 version_type=linux
18598 need_lib_prefix=no
18599 need_version=no
18600 @@ -20553,7 +20011,7 @@
18601 shlibpath_var=LD_LIBRARY_PATH
18602 shlibpath_overrides_runpath=no
18603 hardcode_into_libs=yes
18604 - dynamic_linker='GNU ld.so'
18605 + dynamic_linker='NetBSD ld.elf_so'
18606 ;;
18607
18608 netbsd*)
18609 @@ -20637,6 +20095,10 @@
18610 sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
18611 ;;
18612
18613 +rdos*)
18614 + dynamic_linker=no
18615 + ;;
18616 +
18617 solaris*)
18618 version_type=linux
18619 need_lib_prefix=no
18620 @@ -20831,6 +20293,7 @@
18621 module_cmds_GCJ \
18622 module_expsym_cmds_GCJ \
18623 lt_cv_prog_compiler_c_o_GCJ \
18624 + fix_srcfile_path_GCJ \
18625 exclude_expsyms_GCJ \
18626 include_expsyms_GCJ; do
18627
18628 @@ -21151,7 +20614,7 @@
18629 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
18630
18631 # Fix the shell variable \$srcfile for the compiler.
18632 -fix_srcfile_path="$fix_srcfile_path_GCJ"
18633 +fix_srcfile_path=$lt_fix_srcfile_path
18634
18635 # Set to yes if exported symbols are required.
18636 always_export_symbols=$always_export_symbols_GCJ
18637 @@ -21208,7 +20671,7 @@
18638 objext_RC=$objext
18639
18640 # Code to be used in simple compile tests
18641 -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
18642 +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
18643
18644 # Code to be used in simple link tests
18645 lt_simple_link_test_code="$lt_simple_compile_test_code"
18646 @@ -21227,13 +20690,13 @@
18647
18648 # save warnings/boilerplate of simple test code
18649 ac_outfile=conftest.$ac_objext
18650 -printf "$lt_simple_compile_test_code" >conftest.$ac_ext
18651 +echo "$lt_simple_compile_test_code" >conftest.$ac_ext
18652 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
18653 _lt_compiler_boilerplate=`cat conftest.err`
18654 $rm conftest*
18655
18656 ac_outfile=conftest.$ac_objext
18657 -printf "$lt_simple_link_test_code" >conftest.$ac_ext
18658 +echo "$lt_simple_link_test_code" >conftest.$ac_ext
18659 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
18660 _lt_linker_boilerplate=`cat conftest.err`
18661 $rm conftest*
18662 @@ -21311,6 +20774,7 @@
18663 module_cmds_RC \
18664 module_expsym_cmds_RC \
18665 lt_cv_prog_compiler_c_o_RC \
18666 + fix_srcfile_path_RC \
18667 exclude_expsyms_RC \
18668 include_expsyms_RC; do
18669
18670 @@ -21631,7 +21095,7 @@
18671 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
18672
18673 # Fix the shell variable \$srcfile for the compiler.
18674 -fix_srcfile_path="$fix_srcfile_path_RC"
18675 +fix_srcfile_path=$lt_fix_srcfile_path
18676
18677 # Set to yes if exported symbols are required.
18678 always_export_symbols=$always_export_symbols_RC
18679 @@ -21749,7 +21213,7 @@
18680 IFS=$as_save_IFS
18681 test -z "$as_dir" && as_dir=.
18682 for ac_exec_ext in '' $ac_executable_extensions; do
18683 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
18684 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
18685 ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
18686 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
18687 break 2
18688 @@ -21789,7 +21253,7 @@
18689 IFS=$as_save_IFS
18690 test -z "$as_dir" && as_dir=.
18691 for ac_exec_ext in '' $ac_executable_extensions; do
18692 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
18693 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
18694 ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
18695 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
18696 break 2
18697 @@ -21876,27 +21340,10 @@
18698 rm -f conftest.er1
18699 cat conftest.err >&5
18700 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18701 - (exit $ac_status); } &&
18702 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18703 - { (case "(($ac_try" in
18704 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18705 - *) ac_try_echo=$ac_try;;
18706 -esac
18707 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18708 - (eval "$ac_try") 2>&5
18709 - ac_status=$?
18710 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18711 - (exit $ac_status); }; } &&
18712 - { ac_try='test -s conftest.$ac_objext'
18713 - { (case "(($ac_try" in
18714 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18715 - *) ac_try_echo=$ac_try;;
18716 -esac
18717 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18718 - (eval "$ac_try") 2>&5
18719 - ac_status=$?
18720 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18721 - (exit $ac_status); }; }; then
18722 + (exit $ac_status); } && {
18723 + test -z "$ac_c_werror_flag" ||
18724 + test ! -s conftest.err
18725 + } && test -s conftest.$ac_objext; then
18726 has_option=yes
18727 else
18728 echo "$as_me: failed program was:" >&5
18729 @@ -22014,27 +21461,10 @@
18730 rm -f conftest.er1
18731 cat conftest.err >&5
18732 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18733 - (exit $ac_status); } &&
18734 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18735 - { (case "(($ac_try" in
18736 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18737 - *) ac_try_echo=$ac_try;;
18738 -esac
18739 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18740 - (eval "$ac_try") 2>&5
18741 - ac_status=$?
18742 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18743 - (exit $ac_status); }; } &&
18744 - { ac_try='test -s conftest.$ac_objext'
18745 - { (case "(($ac_try" in
18746 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18747 - *) ac_try_echo=$ac_try;;
18748 -esac
18749 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18750 - (eval "$ac_try") 2>&5
18751 - ac_status=$?
18752 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18753 - (exit $ac_status); }; }; then
18754 + (exit $ac_status); } && {
18755 + test -z "$ac_c_werror_flag" ||
18756 + test ! -s conftest.err
18757 + } && test -s conftest.$ac_objext; then
18758 ac_header_compiler=yes
18759 else
18760 echo "$as_me: failed program was:" >&5
18761 @@ -22070,17 +21500,10 @@
18762 rm -f conftest.er1
18763 cat conftest.err >&5
18764 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18765 - (exit $ac_status); } >/dev/null; then
18766 - if test -s conftest.err; then
18767 - ac_cpp_err=$ac_c_preproc_warn_flag
18768 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
18769 - else
18770 - ac_cpp_err=
18771 - fi
18772 -else
18773 - ac_cpp_err=yes
18774 -fi
18775 -if test -z "$ac_cpp_err"; then
18776 + (exit $ac_status); } >/dev/null && {
18777 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
18778 + test ! -s conftest.err
18779 + }; then
18780 ac_header_preproc=yes
18781 else
18782 echo "$as_me: failed program was:" >&5
18783 @@ -22211,27 +21634,11 @@
18784 rm -f conftest.er1
18785 cat conftest.err >&5
18786 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18787 - (exit $ac_status); } &&
18788 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18789 - { (case "(($ac_try" in
18790 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18791 - *) ac_try_echo=$ac_try;;
18792 -esac
18793 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18794 - (eval "$ac_try") 2>&5
18795 - ac_status=$?
18796 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18797 - (exit $ac_status); }; } &&
18798 - { ac_try='test -s conftest$ac_exeext'
18799 - { (case "(($ac_try" in
18800 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
18801 - *) ac_try_echo=$ac_try;;
18802 -esac
18803 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
18804 - (eval "$ac_try") 2>&5
18805 - ac_status=$?
18806 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
18807 - (exit $ac_status); }; }; then
18808 + (exit $ac_status); } && {
18809 + test -z "$ac_c_werror_flag" ||
18810 + test ! -s conftest.err
18811 + } && test -s conftest$ac_exeext &&
18812 + $as_test_x conftest$ac_exeext; then
18813 eval "$as_ac_var=yes"
18814 else
18815 echo "$as_me: failed program was:" >&5
18816 @@ -22240,7 +21647,7 @@
18817 eval "$as_ac_var=no"
18818 fi
18819
18820 -rm -f core conftest.err conftest.$ac_objext \
18821 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18822 conftest$ac_exeext conftest.$ac_ext
18823 fi
18824 ac_res=`eval echo '${'$as_ac_var'}'`
18825 @@ -22298,7 +21705,7 @@
18826 IFS=$as_save_IFS
18827 test -z "$as_dir" && as_dir=.
18828 for ac_exec_ext in '' $ac_executable_extensions; do
18829 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
18830 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
18831 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
18832 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
18833 break 2
18834 @@ -22341,7 +21748,7 @@
18835 IFS=$as_save_IFS
18836 test -z "$as_dir" && as_dir=.
18837 for ac_exec_ext in '' $ac_executable_extensions; do
18838 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
18839 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
18840 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
18841 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
18842 break 2
18843 @@ -22487,7 +21894,7 @@
18844 and PANEL_LIBS to avoid the need to call pkg-config.
18845 See the pkg-config man page for more details.
18846
18847 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
18848 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
18849 See \`config.log' for more details." >&5
18850 echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
18851 is in your PATH or set the PKG_CONFIG environment variable to the full
18852 @@ -22497,7 +21904,7 @@
18853 and PANEL_LIBS to avoid the need to call pkg-config.
18854 See the pkg-config man page for more details.
18855
18856 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
18857 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
18858 See \`config.log' for more details." >&2;}
18859 { (exit 1); exit 1; }; }
18860 else
18861 @@ -22512,6 +21919,120 @@
18862
18863
18864 pkg_failed=no
18865 +{ echo "$as_me:$LINENO: checking for LOGOUT" >&5
18866 +echo $ECHO_N "checking for LOGOUT... $ECHO_C" >&6; }
18867 +
18868 +if test -n "$PKG_CONFIG"; then
18869 + if test -n "$LOGOUT_CFLAGS"; then
18870 + pkg_cv_LOGOUT_CFLAGS="$LOGOUT_CFLAGS"
18871 + else
18872 + if test -n "$PKG_CONFIG" && \
18873 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED gnome-vfs-2.0 >= \$GNOME_VFS_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
18874 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
18875 + ac_status=$?
18876 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
18877 + (exit $ac_status); }; then
18878 + pkg_cv_LOGOUT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
18879 +else
18880 + pkg_failed=yes
18881 +fi
18882 + fi
18883 +else
18884 + pkg_failed=untried
18885 +fi
18886 +if test -n "$PKG_CONFIG"; then
18887 + if test -n "$LOGOUT_LIBS"; then
18888 + pkg_cv_LOGOUT_LIBS="$LOGOUT_LIBS"
18889 + else
18890 + if test -n "$PKG_CONFIG" && \
18891 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED libgnome-2.0 >= \$LIBGNOME_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED gnome-vfs-2.0 >= \$GNOME_VFS_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
18892 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
18893 + ac_status=$?
18894 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
18895 + (exit $ac_status); }; then
18896 + pkg_cv_LOGOUT_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null`
18897 +else
18898 + pkg_failed=yes
18899 +fi
18900 + fi
18901 +else
18902 + pkg_failed=untried
18903 +fi
18904 +
18905 +
18906 +
18907 +if test $pkg_failed = yes; then
18908 +
18909 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
18910 + _pkg_short_errors_supported=yes
18911 +else
18912 + _pkg_short_errors_supported=no
18913 +fi
18914 + if test $_pkg_short_errors_supported = yes; then
18915 + LOGOUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
18916 + else
18917 + LOGOUT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
18918 + fi
18919 + # Put the nasty error message in config.log where it belongs
18920 + echo "$LOGOUT_PKG_ERRORS" >&5
18921 +
18922 + { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
18923 +
18924 +$LOGOUT_PKG_ERRORS
18925 +
18926 +Consider adjusting the PKG_CONFIG_PATH environment variable if you
18927 +installed software in a non-standard prefix.
18928 +
18929 +Alternatively, you may set the environment variables LOGOUT_CFLAGS
18930 +and LOGOUT_LIBS to avoid the need to call pkg-config.
18931 +See the pkg-config man page for more details.
18932 +" >&5
18933 +echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
18934 +
18935 +$LOGOUT_PKG_ERRORS
18936 +
18937 +Consider adjusting the PKG_CONFIG_PATH environment variable if you
18938 +installed software in a non-standard prefix.
18939 +
18940 +Alternatively, you may set the environment variables LOGOUT_CFLAGS
18941 +and LOGOUT_LIBS to avoid the need to call pkg-config.
18942 +See the pkg-config man page for more details.
18943 +" >&2;}
18944 + { (exit 1); exit 1; }; }
18945 +elif test $pkg_failed = untried; then
18946 + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
18947 +is in your PATH or set the PKG_CONFIG environment variable to the full
18948 +path to pkg-config.
18949 +
18950 +Alternatively, you may set the environment variables LOGOUT_CFLAGS
18951 +and LOGOUT_LIBS to avoid the need to call pkg-config.
18952 +See the pkg-config man page for more details.
18953 +
18954 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
18955 +See \`config.log' for more details." >&5
18956 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
18957 +is in your PATH or set the PKG_CONFIG environment variable to the full
18958 +path to pkg-config.
18959 +
18960 +Alternatively, you may set the environment variables LOGOUT_CFLAGS
18961 +and LOGOUT_LIBS to avoid the need to call pkg-config.
18962 +See the pkg-config man page for more details.
18963 +
18964 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
18965 +See \`config.log' for more details." >&2;}
18966 + { (exit 1); exit 1; }; }
18967 +else
18968 + LOGOUT_CFLAGS=$pkg_cv_LOGOUT_CFLAGS
18969 + LOGOUT_LIBS=$pkg_cv_LOGOUT_LIBS
18970 + { echo "$as_me:$LINENO: result: yes" >&5
18971 +echo "${ECHO_T}yes" >&6; }
18972 + :
18973 +fi
18974 +
18975 +
18976 +
18977 +
18978 +pkg_failed=no
18979 { echo "$as_me:$LINENO: checking for LIBPANEL_APPLET" >&5
18980 echo $ECHO_N "checking for LIBPANEL_APPLET... $ECHO_C" >&6; }
18981
18982 @@ -22601,7 +22122,7 @@
18983 and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
18984 See the pkg-config man page for more details.
18985
18986 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
18987 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
18988 See \`config.log' for more details." >&5
18989 echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
18990 is in your PATH or set the PKG_CONFIG environment variable to the full
18991 @@ -22611,7 +22132,7 @@
18992 and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
18993 See the pkg-config man page for more details.
18994
18995 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
18996 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
18997 See \`config.log' for more details." >&2;}
18998 { (exit 1); exit 1; }; }
18999 else
19000 @@ -22715,7 +22236,7 @@
19001 and WNCKLET_LIBS to avoid the need to call pkg-config.
19002 See the pkg-config man page for more details.
19003
19004 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
19005 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
19006 See \`config.log' for more details." >&5
19007 echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
19008 is in your PATH or set the PKG_CONFIG environment variable to the full
19009 @@ -22725,7 +22246,7 @@
19010 and WNCKLET_LIBS to avoid the need to call pkg-config.
19011 See the pkg-config man page for more details.
19012
19013 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
19014 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
19015 See \`config.log' for more details." >&2;}
19016 { (exit 1); exit 1; }; }
19017 else
19018 @@ -22777,27 +22298,10 @@
19019 rm -f conftest.er1
19020 cat conftest.err >&5
19021 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19022 - (exit $ac_status); } &&
19023 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19024 - { (case "(($ac_try" in
19025 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19026 - *) ac_try_echo=$ac_try;;
19027 -esac
19028 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19029 - (eval "$ac_try") 2>&5
19030 - ac_status=$?
19031 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19032 - (exit $ac_status); }; } &&
19033 - { ac_try='test -s conftest.$ac_objext'
19034 - { (case "(($ac_try" in
19035 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19036 - *) ac_try_echo=$ac_try;;
19037 -esac
19038 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19039 - (eval "$ac_try") 2>&5
19040 - ac_status=$?
19041 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19042 - (exit $ac_status); }; }; then
19043 + (exit $ac_status); } && {
19044 + test -z "$ac_c_werror_flag" ||
19045 + test ! -s conftest.err
19046 + } && test -s conftest.$ac_objext; then
19047 ac_header_compiler=yes
19048 else
19049 echo "$as_me: failed program was:" >&5
19050 @@ -22833,17 +22337,10 @@
19051 rm -f conftest.er1
19052 cat conftest.err >&5
19053 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19054 - (exit $ac_status); } >/dev/null; then
19055 - if test -s conftest.err; then
19056 - ac_cpp_err=$ac_c_preproc_warn_flag
19057 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
19058 - else
19059 - ac_cpp_err=
19060 - fi
19061 -else
19062 - ac_cpp_err=yes
19063 -fi
19064 -if test -z "$ac_cpp_err"; then
19065 + (exit $ac_status); } >/dev/null && {
19066 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
19067 + test ! -s conftest.err
19068 + }; then
19069 ac_header_preproc=yes
19070 else
19071 echo "$as_me: failed program was:" >&5
19072 @@ -22974,27 +22471,11 @@
19073 rm -f conftest.er1
19074 cat conftest.err >&5
19075 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19076 - (exit $ac_status); } &&
19077 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19078 - { (case "(($ac_try" in
19079 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19080 - *) ac_try_echo=$ac_try;;
19081 -esac
19082 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19083 - (eval "$ac_try") 2>&5
19084 - ac_status=$?
19085 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19086 - (exit $ac_status); }; } &&
19087 - { ac_try='test -s conftest$ac_exeext'
19088 - { (case "(($ac_try" in
19089 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19090 - *) ac_try_echo=$ac_try;;
19091 -esac
19092 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19093 - (eval "$ac_try") 2>&5
19094 - ac_status=$?
19095 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19096 - (exit $ac_status); }; }; then
19097 + (exit $ac_status); } && {
19098 + test -z "$ac_c_werror_flag" ||
19099 + test ! -s conftest.err
19100 + } && test -s conftest$ac_exeext &&
19101 + $as_test_x conftest$ac_exeext; then
19102 eval "$as_ac_var=yes"
19103 else
19104 echo "$as_me: failed program was:" >&5
19105 @@ -23003,7 +22484,7 @@
19106 eval "$as_ac_var=no"
19107 fi
19108
19109 -rm -f core conftest.err conftest.$ac_objext \
19110 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19111 conftest$ac_exeext conftest.$ac_ext
19112 fi
19113 ac_res=`eval echo '${'$as_ac_var'}'`
19114 @@ -23151,7 +22632,7 @@
19115 and CLOCK_LIBS to avoid the need to call pkg-config.
19116 See the pkg-config man page for more details.
19117
19118 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
19119 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
19120 See \`config.log' for more details." >&5
19121 echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
19122 is in your PATH or set the PKG_CONFIG environment variable to the full
19123 @@ -23161,7 +22642,7 @@
19124 and CLOCK_LIBS to avoid the need to call pkg-config.
19125 See the pkg-config man page for more details.
19126
19127 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
19128 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
19129 See \`config.log' for more details." >&2;}
19130 { (exit 1); exit 1; }; }
19131 else
19132 @@ -23265,7 +22746,7 @@
19133 and FISH_LIBS to avoid the need to call pkg-config.
19134 See the pkg-config man page for more details.
19135
19136 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
19137 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
19138 See \`config.log' for more details." >&5
19139 echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
19140 is in your PATH or set the PKG_CONFIG environment variable to the full
19141 @@ -23275,7 +22756,7 @@
19142 and FISH_LIBS to avoid the need to call pkg-config.
19143 See the pkg-config man page for more details.
19144
19145 -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
19146 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.
19147 See \`config.log' for more details." >&2;}
19148 { (exit 1); exit 1; }; }
19149 else
19150 @@ -23444,27 +22925,10 @@
19151 rm -f conftest.er1
19152 cat conftest.err >&5
19153 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19154 - (exit $ac_status); } &&
19155 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19156 - { (case "(($ac_try" in
19157 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19158 - *) ac_try_echo=$ac_try;;
19159 -esac
19160 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19161 - (eval "$ac_try") 2>&5
19162 - ac_status=$?
19163 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19164 - (exit $ac_status); }; } &&
19165 - { ac_try='test -s conftest.$ac_objext'
19166 - { (case "(($ac_try" in
19167 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19168 - *) ac_try_echo=$ac_try;;
19169 -esac
19170 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19171 - (eval "$ac_try") 2>&5
19172 - ac_status=$?
19173 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19174 - (exit $ac_status); }; }; then
19175 + (exit $ac_status); } && {
19176 + test -z "$ac_c_werror_flag" ||
19177 + test ! -s conftest.err
19178 + } && test -s conftest.$ac_objext; then
19179 eval "$as_ac_Header=yes"
19180 else
19181 echo "$as_me: failed program was:" >&5
19182 @@ -23537,27 +23001,11 @@
19183 rm -f conftest.er1
19184 cat conftest.err >&5
19185 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19186 - (exit $ac_status); } &&
19187 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19188 - { (case "(($ac_try" in
19189 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19190 - *) ac_try_echo=$ac_try;;
19191 -esac
19192 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19193 - (eval "$ac_try") 2>&5
19194 - ac_status=$?
19195 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19196 - (exit $ac_status); }; } &&
19197 - { ac_try='test -s conftest$ac_exeext'
19198 - { (case "(($ac_try" in
19199 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19200 - *) ac_try_echo=$ac_try;;
19201 -esac
19202 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19203 - (eval "$ac_try") 2>&5
19204 - ac_status=$?
19205 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19206 - (exit $ac_status); }; }; then
19207 + (exit $ac_status); } && {
19208 + test -z "$ac_c_werror_flag" ||
19209 + test ! -s conftest.err
19210 + } && test -s conftest$ac_exeext &&
19211 + $as_test_x conftest$ac_exeext; then
19212 ac_cv_search_opendir=$ac_res
19213 else
19214 echo "$as_me: failed program was:" >&5
19215 @@ -23566,7 +23014,7 @@
19216
19217 fi
19218
19219 -rm -f core conftest.err conftest.$ac_objext \
19220 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19221 conftest$ac_exeext
19222 if test "${ac_cv_search_opendir+set}" = set; then
19223 break
19224 @@ -23637,27 +23085,11 @@
19225 rm -f conftest.er1
19226 cat conftest.err >&5
19227 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19228 - (exit $ac_status); } &&
19229 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19230 - { (case "(($ac_try" in
19231 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19232 - *) ac_try_echo=$ac_try;;
19233 -esac
19234 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19235 - (eval "$ac_try") 2>&5
19236 - ac_status=$?
19237 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19238 - (exit $ac_status); }; } &&
19239 - { ac_try='test -s conftest$ac_exeext'
19240 - { (case "(($ac_try" in
19241 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19242 - *) ac_try_echo=$ac_try;;
19243 -esac
19244 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19245 - (eval "$ac_try") 2>&5
19246 - ac_status=$?
19247 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19248 - (exit $ac_status); }; }; then
19249 + (exit $ac_status); } && {
19250 + test -z "$ac_c_werror_flag" ||
19251 + test ! -s conftest.err
19252 + } && test -s conftest$ac_exeext &&
19253 + $as_test_x conftest$ac_exeext; then
19254 ac_cv_search_opendir=$ac_res
19255 else
19256 echo "$as_me: failed program was:" >&5
19257 @@ -23666,7 +23098,7 @@
19258
19259 fi
19260
19261 -rm -f core conftest.err conftest.$ac_objext \
19262 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19263 conftest$ac_exeext
19264 if test "${ac_cv_search_opendir+set}" = set; then
19265 break
19266 @@ -23739,27 +23171,11 @@
19267 rm -f conftest.er1
19268 cat conftest.err >&5
19269 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19270 - (exit $ac_status); } &&
19271 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19272 - { (case "(($ac_try" in
19273 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19274 - *) ac_try_echo=$ac_try;;
19275 -esac
19276 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19277 - (eval "$ac_try") 2>&5
19278 - ac_status=$?
19279 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19280 - (exit $ac_status); }; } &&
19281 - { ac_try='test -s conftest$ac_exeext'
19282 - { (case "(($ac_try" in
19283 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19284 - *) ac_try_echo=$ac_try;;
19285 -esac
19286 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19287 - (eval "$ac_try") 2>&5
19288 - ac_status=$?
19289 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19290 - (exit $ac_status); }; }; then
19291 + (exit $ac_status); } && {
19292 + test -z "$ac_c_werror_flag" ||
19293 + test ! -s conftest.err
19294 + } && test -s conftest$ac_exeext &&
19295 + $as_test_x conftest$ac_exeext; then
19296 jm_cv_struct_dirent_d_type=yes
19297 else
19298 echo "$as_me: failed program was:" >&5
19299 @@ -23768,7 +23184,7 @@
19300 jm_cv_struct_dirent_d_type=no
19301 fi
19302
19303 -rm -f core conftest.err conftest.$ac_objext \
19304 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19305 conftest$ac_exeext conftest.$ac_ext
19306
19307
19308 @@ -23908,17 +23324,10 @@
19309 rm -f conftest.er1
19310 cat conftest.err >&5
19311 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19312 - (exit $ac_status); } >/dev/null; then
19313 - if test -s conftest.err; then
19314 - ac_cpp_err=$ac_c_preproc_warn_flag
19315 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
19316 - else
19317 - ac_cpp_err=
19318 - fi
19319 -else
19320 - ac_cpp_err=yes
19321 -fi
19322 -if test -z "$ac_cpp_err"; then
19323 + (exit $ac_status); } >/dev/null && {
19324 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
19325 + test ! -s conftest.err
19326 + }; then
19327 # We can compile using X headers with no special include directory.
19328 ac_x_includes=
19329 else
19330 @@ -23941,7 +23350,7 @@
19331 # See if we find them without any special options.
19332 # Don't add to $LIBS permanently.
19333 ac_save_LIBS=$LIBS
19334 - LIBS="-lXt $LIBS"
19335 + LIBS="-lX11 $LIBS"
19336 cat >conftest.$ac_ext <<_ACEOF
19337 /* confdefs.h. */
19338 _ACEOF
19339 @@ -23970,27 +23379,11 @@
19340 rm -f conftest.er1
19341 cat conftest.err >&5
19342 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19343 - (exit $ac_status); } &&
19344 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19345 - { (case "(($ac_try" in
19346 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19347 - *) ac_try_echo=$ac_try;;
19348 -esac
19349 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19350 - (eval "$ac_try") 2>&5
19351 - ac_status=$?
19352 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19353 - (exit $ac_status); }; } &&
19354 - { ac_try='test -s conftest$ac_exeext'
19355 - { (case "(($ac_try" in
19356 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19357 - *) ac_try_echo=$ac_try;;
19358 -esac
19359 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19360 - (eval "$ac_try") 2>&5
19361 - ac_status=$?
19362 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19363 - (exit $ac_status); }; }; then
19364 + (exit $ac_status); } && {
19365 + test -z "$ac_c_werror_flag" ||
19366 + test ! -s conftest.err
19367 + } && test -s conftest$ac_exeext &&
19368 + $as_test_x conftest$ac_exeext; then
19369 LIBS=$ac_save_LIBS
19370 # We can link X programs with no special library path.
19371 ac_x_libraries=
19372 @@ -24003,7 +23396,7 @@
19373 do
19374 # Don't even attempt the hair of trying to link an X program!
19375 for ac_extension in a so sl; do
19376 - if test -r "$ac_dir/libXt.$ac_extension"; then
19377 + if test -r "$ac_dir/libX11.$ac_extension"; then
19378 ac_x_libraries=$ac_dir
19379 break 2
19380 fi
19381 @@ -24011,7 +23404,7 @@
19382 done
19383 fi
19384
19385 -rm -f core conftest.err conftest.$ac_objext \
19386 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19387 conftest$ac_exeext conftest.$ac_ext
19388 fi # $ac_x_libraries = no
19389
19390 @@ -24107,6 +23500,8 @@
19391 # Put the nasty error message in config.log where it belongs
19392 echo "$X_PKG_ERRORS" >&5
19393
19394 + { echo "$as_me:$LINENO: result: no" >&5
19395 +echo "${ECHO_T}no" >&6; }
19396
19397 # pkg-config modules not found (only present since X11R7 aka Xorg); use
19398 # old-style detection
19399 @@ -24128,12 +23523,12 @@
19400 X_LIBS="$X_LIBS -L$x_libraries"
19401 # For Solaris; some versions of Sun CC require a space after -R and
19402 # others require no space. Words are not sufficient . . . .
19403 - case `(uname -sr) 2>/dev/null` in
19404 - "SunOS 5"*)
19405 - { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
19406 + { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
19407 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
19408 - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
19409 - cat >conftest.$ac_ext <<_ACEOF
19410 + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
19411 + ac_xsave_c_werror_flag=$ac_c_werror_flag
19412 + ac_c_werror_flag=yes
19413 + cat >conftest.$ac_ext <<_ACEOF
19414 /* confdefs.h. */
19415 _ACEOF
19416 cat confdefs.h >>conftest.$ac_ext
19417 @@ -24161,44 +23556,20 @@
19418 rm -f conftest.er1
19419 cat conftest.err >&5
19420 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19421 - (exit $ac_status); } &&
19422 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19423 - { (case "(($ac_try" in
19424 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19425 - *) ac_try_echo=$ac_try;;
19426 -esac
19427 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19428 - (eval "$ac_try") 2>&5
19429 - ac_status=$?
19430 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19431 - (exit $ac_status); }; } &&
19432 - { ac_try='test -s conftest$ac_exeext'
19433 - { (case "(($ac_try" in
19434 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19435 - *) ac_try_echo=$ac_try;;
19436 -esac
19437 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19438 - (eval "$ac_try") 2>&5
19439 - ac_status=$?
19440 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19441 - (exit $ac_status); }; }; then
19442 - ac_R_nospace=yes
19443 + (exit $ac_status); } && {
19444 + test -z "$ac_c_werror_flag" ||
19445 + test ! -s conftest.err
19446 + } && test -s conftest$ac_exeext &&
19447 + $as_test_x conftest$ac_exeext; then
19448 + { echo "$as_me:$LINENO: result: no" >&5
19449 +echo "${ECHO_T}no" >&6; }
19450 + X_LIBS="$X_LIBS -R$x_libraries"
19451 else
19452 echo "$as_me: failed program was:" >&5
19453 sed 's/^/| /' conftest.$ac_ext >&5
19454
19455 - ac_R_nospace=no
19456 -fi
19457 -
19458 -rm -f core conftest.err conftest.$ac_objext \
19459 - conftest$ac_exeext conftest.$ac_ext
19460 - if test $ac_R_nospace = yes; then
19461 - { echo "$as_me:$LINENO: result: no" >&5
19462 -echo "${ECHO_T}no" >&6; }
19463 - X_LIBS="$X_LIBS -R$x_libraries"
19464 - else
19465 LIBS="$ac_xsave_LIBS -R $x_libraries"
19466 - cat >conftest.$ac_ext <<_ACEOF
19467 + cat >conftest.$ac_ext <<_ACEOF
19468 /* confdefs.h. */
19469 _ACEOF
19470 cat confdefs.h >>conftest.$ac_ext
19471 @@ -24226,48 +23597,30 @@
19472 rm -f conftest.er1
19473 cat conftest.err >&5
19474 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19475 - (exit $ac_status); } &&
19476 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19477 - { (case "(($ac_try" in
19478 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19479 - *) ac_try_echo=$ac_try;;
19480 -esac
19481 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19482 - (eval "$ac_try") 2>&5
19483 - ac_status=$?
19484 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19485 - (exit $ac_status); }; } &&
19486 - { ac_try='test -s conftest$ac_exeext'
19487 - { (case "(($ac_try" in
19488 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19489 - *) ac_try_echo=$ac_try;;
19490 -esac
19491 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19492 - (eval "$ac_try") 2>&5
19493 - ac_status=$?
19494 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19495 - (exit $ac_status); }; }; then
19496 - ac_R_space=yes
19497 + (exit $ac_status); } && {
19498 + test -z "$ac_c_werror_flag" ||
19499 + test ! -s conftest.err
19500 + } && test -s conftest$ac_exeext &&
19501 + $as_test_x conftest$ac_exeext; then
19502 + { echo "$as_me:$LINENO: result: yes" >&5
19503 +echo "${ECHO_T}yes" >&6; }
19504 + X_LIBS="$X_LIBS -R $x_libraries"
19505 else
19506 echo "$as_me: failed program was:" >&5
19507 sed 's/^/| /' conftest.$ac_ext >&5
19508
19509 - ac_R_space=no
19510 + { echo "$as_me:$LINENO: result: neither works" >&5
19511 +echo "${ECHO_T}neither works" >&6; }
19512 fi
19513
19514 -rm -f core conftest.err conftest.$ac_objext \
19515 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19516 conftest$ac_exeext conftest.$ac_ext
19517 - if test $ac_R_space = yes; then
19518 - { echo "$as_me:$LINENO: result: yes" >&5
19519 -echo "${ECHO_T}yes" >&6; }
19520 - X_LIBS="$X_LIBS -R $x_libraries"
19521 - else
19522 - { echo "$as_me:$LINENO: result: neither works" >&5
19523 -echo "${ECHO_T}neither works" >&6; }
19524 - fi
19525 - fi
19526 - LIBS=$ac_xsave_LIBS
19527 - esac
19528 +fi
19529 +
19530 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19531 + conftest$ac_exeext conftest.$ac_ext
19532 + ac_c_werror_flag=$ac_xsave_c_werror_flag
19533 + LIBS=$ac_xsave_LIBS
19534 fi
19535
19536 # Check for system-dependent libraries X programs must link with.
19537 @@ -24316,27 +23669,11 @@
19538 rm -f conftest.er1
19539 cat conftest.err >&5
19540 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19541 - (exit $ac_status); } &&
19542 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19543 - { (case "(($ac_try" in
19544 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19545 - *) ac_try_echo=$ac_try;;
19546 -esac
19547 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19548 - (eval "$ac_try") 2>&5
19549 - ac_status=$?
19550 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19551 - (exit $ac_status); }; } &&
19552 - { ac_try='test -s conftest$ac_exeext'
19553 - { (case "(($ac_try" in
19554 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19555 - *) ac_try_echo=$ac_try;;
19556 -esac
19557 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19558 - (eval "$ac_try") 2>&5
19559 - ac_status=$?
19560 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19561 - (exit $ac_status); }; }; then
19562 + (exit $ac_status); } && {
19563 + test -z "$ac_c_werror_flag" ||
19564 + test ! -s conftest.err
19565 + } && test -s conftest$ac_exeext &&
19566 + $as_test_x conftest$ac_exeext; then
19567 :
19568 else
19569 echo "$as_me: failed program was:" >&5
19570 @@ -24384,27 +23721,11 @@
19571 rm -f conftest.er1
19572 cat conftest.err >&5
19573 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19574 - (exit $ac_status); } &&
19575 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19576 - { (case "(($ac_try" in
19577 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19578 - *) ac_try_echo=$ac_try;;
19579 -esac
19580 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19581 - (eval "$ac_try") 2>&5
19582 - ac_status=$?
19583 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19584 - (exit $ac_status); }; } &&
19585 - { ac_try='test -s conftest$ac_exeext'
19586 - { (case "(($ac_try" in
19587 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19588 - *) ac_try_echo=$ac_try;;
19589 -esac
19590 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19591 - (eval "$ac_try") 2>&5
19592 - ac_status=$?
19593 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19594 - (exit $ac_status); }; }; then
19595 + (exit $ac_status); } && {
19596 + test -z "$ac_c_werror_flag" ||
19597 + test ! -s conftest.err
19598 + } && test -s conftest$ac_exeext &&
19599 + $as_test_x conftest$ac_exeext; then
19600 ac_cv_lib_dnet_dnet_ntoa=yes
19601 else
19602 echo "$as_me: failed program was:" >&5
19603 @@ -24413,7 +23734,7 @@
19604 ac_cv_lib_dnet_dnet_ntoa=no
19605 fi
19606
19607 -rm -f core conftest.err conftest.$ac_objext \
19608 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19609 conftest$ac_exeext conftest.$ac_ext
19610 LIBS=$ac_check_lib_save_LIBS
19611 fi
19612 @@ -24466,27 +23787,11 @@
19613 rm -f conftest.er1
19614 cat conftest.err >&5
19615 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19616 - (exit $ac_status); } &&
19617 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19618 - { (case "(($ac_try" in
19619 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19620 - *) ac_try_echo=$ac_try;;
19621 -esac
19622 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19623 - (eval "$ac_try") 2>&5
19624 - ac_status=$?
19625 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19626 - (exit $ac_status); }; } &&
19627 - { ac_try='test -s conftest$ac_exeext'
19628 - { (case "(($ac_try" in
19629 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19630 - *) ac_try_echo=$ac_try;;
19631 -esac
19632 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19633 - (eval "$ac_try") 2>&5
19634 - ac_status=$?
19635 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19636 - (exit $ac_status); }; }; then
19637 + (exit $ac_status); } && {
19638 + test -z "$ac_c_werror_flag" ||
19639 + test ! -s conftest.err
19640 + } && test -s conftest$ac_exeext &&
19641 + $as_test_x conftest$ac_exeext; then
19642 ac_cv_lib_dnet_stub_dnet_ntoa=yes
19643 else
19644 echo "$as_me: failed program was:" >&5
19645 @@ -24495,7 +23800,7 @@
19646 ac_cv_lib_dnet_stub_dnet_ntoa=no
19647 fi
19648
19649 -rm -f core conftest.err conftest.$ac_objext \
19650 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19651 conftest$ac_exeext conftest.$ac_ext
19652 LIBS=$ac_check_lib_save_LIBS
19653 fi
19654 @@ -24508,7 +23813,7 @@
19655 fi
19656 fi
19657
19658 -rm -f core conftest.err conftest.$ac_objext \
19659 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19660 conftest$ac_exeext conftest.$ac_ext
19661 LIBS="$ac_xsave_LIBS"
19662
19663 @@ -24583,27 +23888,11 @@
19664 rm -f conftest.er1
19665 cat conftest.err >&5
19666 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19667 - (exit $ac_status); } &&
19668 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19669 - { (case "(($ac_try" in
19670 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19671 - *) ac_try_echo=$ac_try;;
19672 -esac
19673 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19674 - (eval "$ac_try") 2>&5
19675 - ac_status=$?
19676 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19677 - (exit $ac_status); }; } &&
19678 - { ac_try='test -s conftest$ac_exeext'
19679 - { (case "(($ac_try" in
19680 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19681 - *) ac_try_echo=$ac_try;;
19682 -esac
19683 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19684 - (eval "$ac_try") 2>&5
19685 - ac_status=$?
19686 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19687 - (exit $ac_status); }; }; then
19688 + (exit $ac_status); } && {
19689 + test -z "$ac_c_werror_flag" ||
19690 + test ! -s conftest.err
19691 + } && test -s conftest$ac_exeext &&
19692 + $as_test_x conftest$ac_exeext; then
19693 ac_cv_func_gethostbyname=yes
19694 else
19695 echo "$as_me: failed program was:" >&5
19696 @@ -24612,7 +23901,7 @@
19697 ac_cv_func_gethostbyname=no
19698 fi
19699
19700 -rm -f core conftest.err conftest.$ac_objext \
19701 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19702 conftest$ac_exeext conftest.$ac_ext
19703 fi
19704 { echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
19705 @@ -24661,27 +23950,11 @@
19706 rm -f conftest.er1
19707 cat conftest.err >&5
19708 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19709 - (exit $ac_status); } &&
19710 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19711 - { (case "(($ac_try" in
19712 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19713 - *) ac_try_echo=$ac_try;;
19714 -esac
19715 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19716 - (eval "$ac_try") 2>&5
19717 - ac_status=$?
19718 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19719 - (exit $ac_status); }; } &&
19720 - { ac_try='test -s conftest$ac_exeext'
19721 - { (case "(($ac_try" in
19722 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19723 - *) ac_try_echo=$ac_try;;
19724 -esac
19725 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19726 - (eval "$ac_try") 2>&5
19727 - ac_status=$?
19728 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19729 - (exit $ac_status); }; }; then
19730 + (exit $ac_status); } && {
19731 + test -z "$ac_c_werror_flag" ||
19732 + test ! -s conftest.err
19733 + } && test -s conftest$ac_exeext &&
19734 + $as_test_x conftest$ac_exeext; then
19735 ac_cv_lib_nsl_gethostbyname=yes
19736 else
19737 echo "$as_me: failed program was:" >&5
19738 @@ -24690,7 +23963,7 @@
19739 ac_cv_lib_nsl_gethostbyname=no
19740 fi
19741
19742 -rm -f core conftest.err conftest.$ac_objext \
19743 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19744 conftest$ac_exeext conftest.$ac_ext
19745 LIBS=$ac_check_lib_save_LIBS
19746 fi
19747 @@ -24743,27 +24016,11 @@
19748 rm -f conftest.er1
19749 cat conftest.err >&5
19750 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19751 - (exit $ac_status); } &&
19752 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19753 - { (case "(($ac_try" in
19754 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19755 - *) ac_try_echo=$ac_try;;
19756 -esac
19757 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19758 - (eval "$ac_try") 2>&5
19759 - ac_status=$?
19760 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19761 - (exit $ac_status); }; } &&
19762 - { ac_try='test -s conftest$ac_exeext'
19763 - { (case "(($ac_try" in
19764 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19765 - *) ac_try_echo=$ac_try;;
19766 -esac
19767 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19768 - (eval "$ac_try") 2>&5
19769 - ac_status=$?
19770 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19771 - (exit $ac_status); }; }; then
19772 + (exit $ac_status); } && {
19773 + test -z "$ac_c_werror_flag" ||
19774 + test ! -s conftest.err
19775 + } && test -s conftest$ac_exeext &&
19776 + $as_test_x conftest$ac_exeext; then
19777 ac_cv_lib_bsd_gethostbyname=yes
19778 else
19779 echo "$as_me: failed program was:" >&5
19780 @@ -24772,7 +24029,7 @@
19781 ac_cv_lib_bsd_gethostbyname=no
19782 fi
19783
19784 -rm -f core conftest.err conftest.$ac_objext \
19785 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19786 conftest$ac_exeext conftest.$ac_ext
19787 LIBS=$ac_check_lib_save_LIBS
19788 fi
19789 @@ -24855,27 +24112,11 @@
19790 rm -f conftest.er1
19791 cat conftest.err >&5
19792 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19793 - (exit $ac_status); } &&
19794 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19795 - { (case "(($ac_try" in
19796 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19797 - *) ac_try_echo=$ac_try;;
19798 -esac
19799 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19800 - (eval "$ac_try") 2>&5
19801 - ac_status=$?
19802 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19803 - (exit $ac_status); }; } &&
19804 - { ac_try='test -s conftest$ac_exeext'
19805 - { (case "(($ac_try" in
19806 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19807 - *) ac_try_echo=$ac_try;;
19808 -esac
19809 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19810 - (eval "$ac_try") 2>&5
19811 - ac_status=$?
19812 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19813 - (exit $ac_status); }; }; then
19814 + (exit $ac_status); } && {
19815 + test -z "$ac_c_werror_flag" ||
19816 + test ! -s conftest.err
19817 + } && test -s conftest$ac_exeext &&
19818 + $as_test_x conftest$ac_exeext; then
19819 ac_cv_func_connect=yes
19820 else
19821 echo "$as_me: failed program was:" >&5
19822 @@ -24884,7 +24125,7 @@
19823 ac_cv_func_connect=no
19824 fi
19825
19826 -rm -f core conftest.err conftest.$ac_objext \
19827 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19828 conftest$ac_exeext conftest.$ac_ext
19829 fi
19830 { echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
19831 @@ -24933,27 +24174,11 @@
19832 rm -f conftest.er1
19833 cat conftest.err >&5
19834 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19835 - (exit $ac_status); } &&
19836 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19837 - { (case "(($ac_try" in
19838 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19839 - *) ac_try_echo=$ac_try;;
19840 -esac
19841 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19842 - (eval "$ac_try") 2>&5
19843 - ac_status=$?
19844 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19845 - (exit $ac_status); }; } &&
19846 - { ac_try='test -s conftest$ac_exeext'
19847 - { (case "(($ac_try" in
19848 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19849 - *) ac_try_echo=$ac_try;;
19850 -esac
19851 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19852 - (eval "$ac_try") 2>&5
19853 - ac_status=$?
19854 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19855 - (exit $ac_status); }; }; then
19856 + (exit $ac_status); } && {
19857 + test -z "$ac_c_werror_flag" ||
19858 + test ! -s conftest.err
19859 + } && test -s conftest$ac_exeext &&
19860 + $as_test_x conftest$ac_exeext; then
19861 ac_cv_lib_socket_connect=yes
19862 else
19863 echo "$as_me: failed program was:" >&5
19864 @@ -24962,7 +24187,7 @@
19865 ac_cv_lib_socket_connect=no
19866 fi
19867
19868 -rm -f core conftest.err conftest.$ac_objext \
19869 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19870 conftest$ac_exeext conftest.$ac_ext
19871 LIBS=$ac_check_lib_save_LIBS
19872 fi
19873 @@ -25038,27 +24263,11 @@
19874 rm -f conftest.er1
19875 cat conftest.err >&5
19876 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19877 - (exit $ac_status); } &&
19878 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19879 - { (case "(($ac_try" in
19880 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19881 - *) ac_try_echo=$ac_try;;
19882 -esac
19883 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19884 - (eval "$ac_try") 2>&5
19885 - ac_status=$?
19886 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19887 - (exit $ac_status); }; } &&
19888 - { ac_try='test -s conftest$ac_exeext'
19889 - { (case "(($ac_try" in
19890 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19891 - *) ac_try_echo=$ac_try;;
19892 -esac
19893 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19894 - (eval "$ac_try") 2>&5
19895 - ac_status=$?
19896 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19897 - (exit $ac_status); }; }; then
19898 + (exit $ac_status); } && {
19899 + test -z "$ac_c_werror_flag" ||
19900 + test ! -s conftest.err
19901 + } && test -s conftest$ac_exeext &&
19902 + $as_test_x conftest$ac_exeext; then
19903 ac_cv_func_remove=yes
19904 else
19905 echo "$as_me: failed program was:" >&5
19906 @@ -25067,7 +24276,7 @@
19907 ac_cv_func_remove=no
19908 fi
19909
19910 -rm -f core conftest.err conftest.$ac_objext \
19911 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19912 conftest$ac_exeext conftest.$ac_ext
19913 fi
19914 { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
19915 @@ -25116,27 +24325,11 @@
19916 rm -f conftest.er1
19917 cat conftest.err >&5
19918 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19919 - (exit $ac_status); } &&
19920 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19921 - { (case "(($ac_try" in
19922 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19923 - *) ac_try_echo=$ac_try;;
19924 -esac
19925 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19926 - (eval "$ac_try") 2>&5
19927 - ac_status=$?
19928 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19929 - (exit $ac_status); }; } &&
19930 - { ac_try='test -s conftest$ac_exeext'
19931 - { (case "(($ac_try" in
19932 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19933 - *) ac_try_echo=$ac_try;;
19934 -esac
19935 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19936 - (eval "$ac_try") 2>&5
19937 - ac_status=$?
19938 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19939 - (exit $ac_status); }; }; then
19940 + (exit $ac_status); } && {
19941 + test -z "$ac_c_werror_flag" ||
19942 + test ! -s conftest.err
19943 + } && test -s conftest$ac_exeext &&
19944 + $as_test_x conftest$ac_exeext; then
19945 ac_cv_lib_posix_remove=yes
19946 else
19947 echo "$as_me: failed program was:" >&5
19948 @@ -25145,7 +24338,7 @@
19949 ac_cv_lib_posix_remove=no
19950 fi
19951
19952 -rm -f core conftest.err conftest.$ac_objext \
19953 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19954 conftest$ac_exeext conftest.$ac_ext
19955 LIBS=$ac_check_lib_save_LIBS
19956 fi
19957 @@ -25221,27 +24414,11 @@
19958 rm -f conftest.er1
19959 cat conftest.err >&5
19960 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19961 - (exit $ac_status); } &&
19962 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19963 - { (case "(($ac_try" in
19964 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19965 - *) ac_try_echo=$ac_try;;
19966 -esac
19967 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19968 - (eval "$ac_try") 2>&5
19969 - ac_status=$?
19970 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19971 - (exit $ac_status); }; } &&
19972 - { ac_try='test -s conftest$ac_exeext'
19973 - { (case "(($ac_try" in
19974 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
19975 - *) ac_try_echo=$ac_try;;
19976 -esac
19977 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
19978 - (eval "$ac_try") 2>&5
19979 - ac_status=$?
19980 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
19981 - (exit $ac_status); }; }; then
19982 + (exit $ac_status); } && {
19983 + test -z "$ac_c_werror_flag" ||
19984 + test ! -s conftest.err
19985 + } && test -s conftest$ac_exeext &&
19986 + $as_test_x conftest$ac_exeext; then
19987 ac_cv_func_shmat=yes
19988 else
19989 echo "$as_me: failed program was:" >&5
19990 @@ -25250,7 +24427,7 @@
19991 ac_cv_func_shmat=no
19992 fi
19993
19994 -rm -f core conftest.err conftest.$ac_objext \
19995 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
19996 conftest$ac_exeext conftest.$ac_ext
19997 fi
19998 { echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
19999 @@ -25299,27 +24476,11 @@
20000 rm -f conftest.er1
20001 cat conftest.err >&5
20002 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20003 - (exit $ac_status); } &&
20004 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20005 - { (case "(($ac_try" in
20006 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20007 - *) ac_try_echo=$ac_try;;
20008 -esac
20009 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20010 - (eval "$ac_try") 2>&5
20011 - ac_status=$?
20012 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20013 - (exit $ac_status); }; } &&
20014 - { ac_try='test -s conftest$ac_exeext'
20015 - { (case "(($ac_try" in
20016 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20017 - *) ac_try_echo=$ac_try;;
20018 -esac
20019 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20020 - (eval "$ac_try") 2>&5
20021 - ac_status=$?
20022 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20023 - (exit $ac_status); }; }; then
20024 + (exit $ac_status); } && {
20025 + test -z "$ac_c_werror_flag" ||
20026 + test ! -s conftest.err
20027 + } && test -s conftest$ac_exeext &&
20028 + $as_test_x conftest$ac_exeext; then
20029 ac_cv_lib_ipc_shmat=yes
20030 else
20031 echo "$as_me: failed program was:" >&5
20032 @@ -25328,7 +24489,7 @@
20033 ac_cv_lib_ipc_shmat=no
20034 fi
20035
20036 -rm -f core conftest.err conftest.$ac_objext \
20037 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20038 conftest$ac_exeext conftest.$ac_ext
20039 LIBS=$ac_check_lib_save_LIBS
20040 fi
20041 @@ -25392,27 +24553,11 @@
20042 rm -f conftest.er1
20043 cat conftest.err >&5
20044 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20045 - (exit $ac_status); } &&
20046 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20047 - { (case "(($ac_try" in
20048 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20049 - *) ac_try_echo=$ac_try;;
20050 -esac
20051 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20052 - (eval "$ac_try") 2>&5
20053 - ac_status=$?
20054 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20055 - (exit $ac_status); }; } &&
20056 - { ac_try='test -s conftest$ac_exeext'
20057 - { (case "(($ac_try" in
20058 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20059 - *) ac_try_echo=$ac_try;;
20060 -esac
20061 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20062 - (eval "$ac_try") 2>&5
20063 - ac_status=$?
20064 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20065 - (exit $ac_status); }; }; then
20066 + (exit $ac_status); } && {
20067 + test -z "$ac_c_werror_flag" ||
20068 + test ! -s conftest.err
20069 + } && test -s conftest$ac_exeext &&
20070 + $as_test_x conftest$ac_exeext; then
20071 ac_cv_lib_ICE_IceConnectionNumber=yes
20072 else
20073 echo "$as_me: failed program was:" >&5
20074 @@ -25421,7 +24566,7 @@
20075 ac_cv_lib_ICE_IceConnectionNumber=no
20076 fi
20077
20078 -rm -f core conftest.err conftest.$ac_objext \
20079 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20080 conftest$ac_exeext conftest.$ac_ext
20081 LIBS=$ac_check_lib_save_LIBS
20082 fi
20083 @@ -25489,27 +24634,11 @@
20084 rm -f conftest.er1
20085 cat conftest.err >&5
20086 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20087 - (exit $ac_status); } &&
20088 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20089 - { (case "(($ac_try" in
20090 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20091 - *) ac_try_echo=$ac_try;;
20092 -esac
20093 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20094 - (eval "$ac_try") 2>&5
20095 - ac_status=$?
20096 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20097 - (exit $ac_status); }; } &&
20098 - { ac_try='test -s conftest$ac_exeext'
20099 - { (case "(($ac_try" in
20100 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20101 - *) ac_try_echo=$ac_try;;
20102 -esac
20103 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20104 - (eval "$ac_try") 2>&5
20105 - ac_status=$?
20106 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20107 - (exit $ac_status); }; }; then
20108 + (exit $ac_status); } && {
20109 + test -z "$ac_c_werror_flag" ||
20110 + test ! -s conftest.err
20111 + } && test -s conftest$ac_exeext &&
20112 + $as_test_x conftest$ac_exeext; then
20113 ac_cv_lib_X11_XFree=yes
20114 else
20115 echo "$as_me: failed program was:" >&5
20116 @@ -25518,7 +24647,7 @@
20117 ac_cv_lib_X11_XFree=no
20118 fi
20119
20120 -rm -f core conftest.err conftest.$ac_objext \
20121 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20122 conftest$ac_exeext conftest.$ac_ext
20123 LIBS=$ac_check_lib_save_LIBS
20124 fi
20125 @@ -25580,27 +24709,11 @@
20126 rm -f conftest.er1
20127 cat conftest.err >&5
20128 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20129 - (exit $ac_status); } &&
20130 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20131 - { (case "(($ac_try" in
20132 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20133 - *) ac_try_echo=$ac_try;;
20134 -esac
20135 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20136 - (eval "$ac_try") 2>&5
20137 - ac_status=$?
20138 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20139 - (exit $ac_status); }; } &&
20140 - { ac_try='test -s conftest$ac_exeext'
20141 - { (case "(($ac_try" in
20142 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20143 - *) ac_try_echo=$ac_try;;
20144 -esac
20145 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20146 - (eval "$ac_try") 2>&5
20147 - ac_status=$?
20148 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20149 - (exit $ac_status); }; }; then
20150 + (exit $ac_status); } && {
20151 + test -z "$ac_c_werror_flag" ||
20152 + test ! -s conftest.err
20153 + } && test -s conftest$ac_exeext &&
20154 + $as_test_x conftest$ac_exeext; then
20155 ac_cv_lib_Xau_XauFileName=yes
20156 else
20157 echo "$as_me: failed program was:" >&5
20158 @@ -25609,7 +24722,7 @@
20159 ac_cv_lib_Xau_XauFileName=no
20160 fi
20161
20162 -rm -f core conftest.err conftest.$ac_objext \
20163 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20164 conftest$ac_exeext conftest.$ac_ext
20165 LIBS=$ac_check_lib_save_LIBS
20166 fi
20167 @@ -25655,12 +24768,12 @@
20168 X_LIBS="$X_LIBS -L$x_libraries"
20169 # For Solaris; some versions of Sun CC require a space after -R and
20170 # others require no space. Words are not sufficient . . . .
20171 - case `(uname -sr) 2>/dev/null` in
20172 - "SunOS 5"*)
20173 - { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
20174 + { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
20175 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
20176 - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
20177 - cat >conftest.$ac_ext <<_ACEOF
20178 + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
20179 + ac_xsave_c_werror_flag=$ac_c_werror_flag
20180 + ac_c_werror_flag=yes
20181 + cat >conftest.$ac_ext <<_ACEOF
20182 /* confdefs.h. */
20183 _ACEOF
20184 cat confdefs.h >>conftest.$ac_ext
20185 @@ -25688,44 +24801,20 @@
20186 rm -f conftest.er1
20187 cat conftest.err >&5
20188 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20189 - (exit $ac_status); } &&
20190 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20191 - { (case "(($ac_try" in
20192 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20193 - *) ac_try_echo=$ac_try;;
20194 -esac
20195 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20196 - (eval "$ac_try") 2>&5
20197 - ac_status=$?
20198 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20199 - (exit $ac_status); }; } &&
20200 - { ac_try='test -s conftest$ac_exeext'
20201 - { (case "(($ac_try" in
20202 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20203 - *) ac_try_echo=$ac_try;;
20204 -esac
20205 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20206 - (eval "$ac_try") 2>&5
20207 - ac_status=$?
20208 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20209 - (exit $ac_status); }; }; then
20210 - ac_R_nospace=yes
20211 + (exit $ac_status); } && {
20212 + test -z "$ac_c_werror_flag" ||
20213 + test ! -s conftest.err
20214 + } && test -s conftest$ac_exeext &&
20215 + $as_test_x conftest$ac_exeext; then
20216 + { echo "$as_me:$LINENO: result: no" >&5
20217 +echo "${ECHO_T}no" >&6; }
20218 + X_LIBS="$X_LIBS -R$x_libraries"
20219 else
20220 echo "$as_me: failed program was:" >&5
20221 sed 's/^/| /' conftest.$ac_ext >&5
20222
20223 - ac_R_nospace=no
20224 -fi
20225 -
20226 -rm -f core conftest.err conftest.$ac_objext \
20227 - conftest$ac_exeext conftest.$ac_ext
20228 - if test $ac_R_nospace = yes; then
20229 - { echo "$as_me:$LINENO: result: no" >&5
20230 -echo "${ECHO_T}no" >&6; }
20231 - X_LIBS="$X_LIBS -R$x_libraries"
20232 - else
20233 LIBS="$ac_xsave_LIBS -R $x_libraries"
20234 - cat >conftest.$ac_ext <<_ACEOF
20235 + cat >conftest.$ac_ext <<_ACEOF
20236 /* confdefs.h. */
20237 _ACEOF
20238 cat confdefs.h >>conftest.$ac_ext
20239 @@ -25753,48 +24842,30 @@
20240 rm -f conftest.er1
20241 cat conftest.err >&5
20242 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20243 - (exit $ac_status); } &&
20244 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20245 - { (case "(($ac_try" in
20246 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20247 - *) ac_try_echo=$ac_try;;
20248 -esac
20249 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20250 - (eval "$ac_try") 2>&5
20251 - ac_status=$?
20252 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20253 - (exit $ac_status); }; } &&
20254 - { ac_try='test -s conftest$ac_exeext'
20255 - { (case "(($ac_try" in
20256 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20257 - *) ac_try_echo=$ac_try;;
20258 -esac
20259 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20260 - (eval "$ac_try") 2>&5
20261 - ac_status=$?
20262 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20263 - (exit $ac_status); }; }; then
20264 - ac_R_space=yes
20265 + (exit $ac_status); } && {
20266 + test -z "$ac_c_werror_flag" ||
20267 + test ! -s conftest.err
20268 + } && test -s conftest$ac_exeext &&
20269 + $as_test_x conftest$ac_exeext; then
20270 + { echo "$as_me:$LINENO: result: yes" >&5
20271 +echo "${ECHO_T}yes" >&6; }
20272 + X_LIBS="$X_LIBS -R $x_libraries"
20273 else
20274 echo "$as_me: failed program was:" >&5
20275 sed 's/^/| /' conftest.$ac_ext >&5
20276
20277 - ac_R_space=no
20278 + { echo "$as_me:$LINENO: result: neither works" >&5
20279 +echo "${ECHO_T}neither works" >&6; }
20280 fi
20281
20282 -rm -f core conftest.err conftest.$ac_objext \
20283 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20284 conftest$ac_exeext conftest.$ac_ext
20285 - if test $ac_R_space = yes; then
20286 - { echo "$as_me:$LINENO: result: yes" >&5
20287 -echo "${ECHO_T}yes" >&6; }
20288 - X_LIBS="$X_LIBS -R $x_libraries"
20289 - else
20290 - { echo "$as_me:$LINENO: result: neither works" >&5
20291 -echo "${ECHO_T}neither works" >&6; }
20292 - fi
20293 - fi
20294 - LIBS=$ac_xsave_LIBS
20295 - esac
20296 +fi
20297 +
20298 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20299 + conftest$ac_exeext conftest.$ac_ext
20300 + ac_c_werror_flag=$ac_xsave_c_werror_flag
20301 + LIBS=$ac_xsave_LIBS
20302 fi
20303
20304 # Check for system-dependent libraries X programs must link with.
20305 @@ -25843,27 +24914,11 @@
20306 rm -f conftest.er1
20307 cat conftest.err >&5
20308 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20309 - (exit $ac_status); } &&
20310 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20311 - { (case "(($ac_try" in
20312 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20313 - *) ac_try_echo=$ac_try;;
20314 -esac
20315 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20316 - (eval "$ac_try") 2>&5
20317 - ac_status=$?
20318 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20319 - (exit $ac_status); }; } &&
20320 - { ac_try='test -s conftest$ac_exeext'
20321 - { (case "(($ac_try" in
20322 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20323 - *) ac_try_echo=$ac_try;;
20324 -esac
20325 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20326 - (eval "$ac_try") 2>&5
20327 - ac_status=$?
20328 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20329 - (exit $ac_status); }; }; then
20330 + (exit $ac_status); } && {
20331 + test -z "$ac_c_werror_flag" ||
20332 + test ! -s conftest.err
20333 + } && test -s conftest$ac_exeext &&
20334 + $as_test_x conftest$ac_exeext; then
20335 :
20336 else
20337 echo "$as_me: failed program was:" >&5
20338 @@ -25911,27 +24966,11 @@
20339 rm -f conftest.er1
20340 cat conftest.err >&5
20341 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20342 - (exit $ac_status); } &&
20343 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20344 - { (case "(($ac_try" in
20345 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20346 - *) ac_try_echo=$ac_try;;
20347 -esac
20348 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20349 - (eval "$ac_try") 2>&5
20350 - ac_status=$?
20351 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20352 - (exit $ac_status); }; } &&
20353 - { ac_try='test -s conftest$ac_exeext'
20354 - { (case "(($ac_try" in
20355 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20356 - *) ac_try_echo=$ac_try;;
20357 -esac
20358 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20359 - (eval "$ac_try") 2>&5
20360 - ac_status=$?
20361 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20362 - (exit $ac_status); }; }; then
20363 + (exit $ac_status); } && {
20364 + test -z "$ac_c_werror_flag" ||
20365 + test ! -s conftest.err
20366 + } && test -s conftest$ac_exeext &&
20367 + $as_test_x conftest$ac_exeext; then
20368 ac_cv_lib_dnet_dnet_ntoa=yes
20369 else
20370 echo "$as_me: failed program was:" >&5
20371 @@ -25940,7 +24979,7 @@
20372 ac_cv_lib_dnet_dnet_ntoa=no
20373 fi
20374
20375 -rm -f core conftest.err conftest.$ac_objext \
20376 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20377 conftest$ac_exeext conftest.$ac_ext
20378 LIBS=$ac_check_lib_save_LIBS
20379 fi
20380 @@ -25990,30 +25029,14 @@
20381 (eval "$ac_link") 2>conftest.er1
20382 ac_status=$?
20383 grep -v '^ *+' conftest.er1 >conftest.err
20384 - rm -f conftest.er1
20385 - cat conftest.err >&5
20386 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20387 - (exit $ac_status); } &&
20388 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20389 - { (case "(($ac_try" in
20390 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20391 - *) ac_try_echo=$ac_try;;
20392 -esac
20393 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20394 - (eval "$ac_try") 2>&5
20395 - ac_status=$?
20396 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20397 - (exit $ac_status); }; } &&
20398 - { ac_try='test -s conftest$ac_exeext'
20399 - { (case "(($ac_try" in
20400 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20401 - *) ac_try_echo=$ac_try;;
20402 -esac
20403 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20404 - (eval "$ac_try") 2>&5
20405 - ac_status=$?
20406 + rm -f conftest.er1
20407 + cat conftest.err >&5
20408 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20409 - (exit $ac_status); }; }; then
20410 + (exit $ac_status); } && {
20411 + test -z "$ac_c_werror_flag" ||
20412 + test ! -s conftest.err
20413 + } && test -s conftest$ac_exeext &&
20414 + $as_test_x conftest$ac_exeext; then
20415 ac_cv_lib_dnet_stub_dnet_ntoa=yes
20416 else
20417 echo "$as_me: failed program was:" >&5
20418 @@ -26022,7 +25045,7 @@
20419 ac_cv_lib_dnet_stub_dnet_ntoa=no
20420 fi
20421
20422 -rm -f core conftest.err conftest.$ac_objext \
20423 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20424 conftest$ac_exeext conftest.$ac_ext
20425 LIBS=$ac_check_lib_save_LIBS
20426 fi
20427 @@ -26035,7 +25058,7 @@
20428 fi
20429 fi
20430
20431 -rm -f core conftest.err conftest.$ac_objext \
20432 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20433 conftest$ac_exeext conftest.$ac_ext
20434 LIBS="$ac_xsave_LIBS"
20435
20436 @@ -26110,27 +25133,11 @@
20437 rm -f conftest.er1
20438 cat conftest.err >&5
20439 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20440 - (exit $ac_status); } &&
20441 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20442 - { (case "(($ac_try" in
20443 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20444 - *) ac_try_echo=$ac_try;;
20445 -esac
20446 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20447 - (eval "$ac_try") 2>&5
20448 - ac_status=$?
20449 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20450 - (exit $ac_status); }; } &&
20451 - { ac_try='test -s conftest$ac_exeext'
20452 - { (case "(($ac_try" in
20453 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20454 - *) ac_try_echo=$ac_try;;
20455 -esac
20456 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20457 - (eval "$ac_try") 2>&5
20458 - ac_status=$?
20459 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20460 - (exit $ac_status); }; }; then
20461 + (exit $ac_status); } && {
20462 + test -z "$ac_c_werror_flag" ||
20463 + test ! -s conftest.err
20464 + } && test -s conftest$ac_exeext &&
20465 + $as_test_x conftest$ac_exeext; then
20466 ac_cv_func_gethostbyname=yes
20467 else
20468 echo "$as_me: failed program was:" >&5
20469 @@ -26139,7 +25146,7 @@
20470 ac_cv_func_gethostbyname=no
20471 fi
20472
20473 -rm -f core conftest.err conftest.$ac_objext \
20474 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20475 conftest$ac_exeext conftest.$ac_ext
20476 fi
20477 { echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
20478 @@ -26188,27 +25195,11 @@
20479 rm -f conftest.er1
20480 cat conftest.err >&5
20481 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20482 - (exit $ac_status); } &&
20483 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20484 - { (case "(($ac_try" in
20485 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20486 - *) ac_try_echo=$ac_try;;
20487 -esac
20488 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20489 - (eval "$ac_try") 2>&5
20490 - ac_status=$?
20491 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20492 - (exit $ac_status); }; } &&
20493 - { ac_try='test -s conftest$ac_exeext'
20494 - { (case "(($ac_try" in
20495 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20496 - *) ac_try_echo=$ac_try;;
20497 -esac
20498 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20499 - (eval "$ac_try") 2>&5
20500 - ac_status=$?
20501 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20502 - (exit $ac_status); }; }; then
20503 + (exit $ac_status); } && {
20504 + test -z "$ac_c_werror_flag" ||
20505 + test ! -s conftest.err
20506 + } && test -s conftest$ac_exeext &&
20507 + $as_test_x conftest$ac_exeext; then
20508 ac_cv_lib_nsl_gethostbyname=yes
20509 else
20510 echo "$as_me: failed program was:" >&5
20511 @@ -26217,7 +25208,7 @@
20512 ac_cv_lib_nsl_gethostbyname=no
20513 fi
20514
20515 -rm -f core conftest.err conftest.$ac_objext \
20516 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20517 conftest$ac_exeext conftest.$ac_ext
20518 LIBS=$ac_check_lib_save_LIBS
20519 fi
20520 @@ -26270,27 +25261,11 @@
20521 rm -f conftest.er1
20522 cat conftest.err >&5
20523 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20524 - (exit $ac_status); } &&
20525 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20526 - { (case "(($ac_try" in
20527 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20528 - *) ac_try_echo=$ac_try;;
20529 -esac
20530 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20531 - (eval "$ac_try") 2>&5
20532 - ac_status=$?
20533 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20534 - (exit $ac_status); }; } &&
20535 - { ac_try='test -s conftest$ac_exeext'
20536 - { (case "(($ac_try" in
20537 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20538 - *) ac_try_echo=$ac_try;;
20539 -esac
20540 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20541 - (eval "$ac_try") 2>&5
20542 - ac_status=$?
20543 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20544 - (exit $ac_status); }; }; then
20545 + (exit $ac_status); } && {
20546 + test -z "$ac_c_werror_flag" ||
20547 + test ! -s conftest.err
20548 + } && test -s conftest$ac_exeext &&
20549 + $as_test_x conftest$ac_exeext; then
20550 ac_cv_lib_bsd_gethostbyname=yes
20551 else
20552 echo "$as_me: failed program was:" >&5
20553 @@ -26299,7 +25274,7 @@
20554 ac_cv_lib_bsd_gethostbyname=no
20555 fi
20556
20557 -rm -f core conftest.err conftest.$ac_objext \
20558 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20559 conftest$ac_exeext conftest.$ac_ext
20560 LIBS=$ac_check_lib_save_LIBS
20561 fi
20562 @@ -26382,27 +25357,11 @@
20563 rm -f conftest.er1
20564 cat conftest.err >&5
20565 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20566 - (exit $ac_status); } &&
20567 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20568 - { (case "(($ac_try" in
20569 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20570 - *) ac_try_echo=$ac_try;;
20571 -esac
20572 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20573 - (eval "$ac_try") 2>&5
20574 - ac_status=$?
20575 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20576 - (exit $ac_status); }; } &&
20577 - { ac_try='test -s conftest$ac_exeext'
20578 - { (case "(($ac_try" in
20579 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20580 - *) ac_try_echo=$ac_try;;
20581 -esac
20582 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20583 - (eval "$ac_try") 2>&5
20584 - ac_status=$?
20585 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20586 - (exit $ac_status); }; }; then
20587 + (exit $ac_status); } && {
20588 + test -z "$ac_c_werror_flag" ||
20589 + test ! -s conftest.err
20590 + } && test -s conftest$ac_exeext &&
20591 + $as_test_x conftest$ac_exeext; then
20592 ac_cv_func_connect=yes
20593 else
20594 echo "$as_me: failed program was:" >&5
20595 @@ -26411,7 +25370,7 @@
20596 ac_cv_func_connect=no
20597 fi
20598
20599 -rm -f core conftest.err conftest.$ac_objext \
20600 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20601 conftest$ac_exeext conftest.$ac_ext
20602 fi
20603 { echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
20604 @@ -26460,27 +25419,11 @@
20605 rm -f conftest.er1
20606 cat conftest.err >&5
20607 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20608 - (exit $ac_status); } &&
20609 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20610 - { (case "(($ac_try" in
20611 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20612 - *) ac_try_echo=$ac_try;;
20613 -esac
20614 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20615 - (eval "$ac_try") 2>&5
20616 - ac_status=$?
20617 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20618 - (exit $ac_status); }; } &&
20619 - { ac_try='test -s conftest$ac_exeext'
20620 - { (case "(($ac_try" in
20621 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20622 - *) ac_try_echo=$ac_try;;
20623 -esac
20624 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20625 - (eval "$ac_try") 2>&5
20626 - ac_status=$?
20627 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20628 - (exit $ac_status); }; }; then
20629 + (exit $ac_status); } && {
20630 + test -z "$ac_c_werror_flag" ||
20631 + test ! -s conftest.err
20632 + } && test -s conftest$ac_exeext &&
20633 + $as_test_x conftest$ac_exeext; then
20634 ac_cv_lib_socket_connect=yes
20635 else
20636 echo "$as_me: failed program was:" >&5
20637 @@ -26489,7 +25432,7 @@
20638 ac_cv_lib_socket_connect=no
20639 fi
20640
20641 -rm -f core conftest.err conftest.$ac_objext \
20642 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20643 conftest$ac_exeext conftest.$ac_ext
20644 LIBS=$ac_check_lib_save_LIBS
20645 fi
20646 @@ -26565,27 +25508,11 @@
20647 rm -f conftest.er1
20648 cat conftest.err >&5
20649 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20650 - (exit $ac_status); } &&
20651 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20652 - { (case "(($ac_try" in
20653 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20654 - *) ac_try_echo=$ac_try;;
20655 -esac
20656 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20657 - (eval "$ac_try") 2>&5
20658 - ac_status=$?
20659 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20660 - (exit $ac_status); }; } &&
20661 - { ac_try='test -s conftest$ac_exeext'
20662 - { (case "(($ac_try" in
20663 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20664 - *) ac_try_echo=$ac_try;;
20665 -esac
20666 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20667 - (eval "$ac_try") 2>&5
20668 - ac_status=$?
20669 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20670 - (exit $ac_status); }; }; then
20671 + (exit $ac_status); } && {
20672 + test -z "$ac_c_werror_flag" ||
20673 + test ! -s conftest.err
20674 + } && test -s conftest$ac_exeext &&
20675 + $as_test_x conftest$ac_exeext; then
20676 ac_cv_func_remove=yes
20677 else
20678 echo "$as_me: failed program was:" >&5
20679 @@ -26594,7 +25521,7 @@
20680 ac_cv_func_remove=no
20681 fi
20682
20683 -rm -f core conftest.err conftest.$ac_objext \
20684 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20685 conftest$ac_exeext conftest.$ac_ext
20686 fi
20687 { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
20688 @@ -26643,27 +25570,11 @@
20689 rm -f conftest.er1
20690 cat conftest.err >&5
20691 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20692 - (exit $ac_status); } &&
20693 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20694 - { (case "(($ac_try" in
20695 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20696 - *) ac_try_echo=$ac_try;;
20697 -esac
20698 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20699 - (eval "$ac_try") 2>&5
20700 - ac_status=$?
20701 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20702 - (exit $ac_status); }; } &&
20703 - { ac_try='test -s conftest$ac_exeext'
20704 - { (case "(($ac_try" in
20705 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20706 - *) ac_try_echo=$ac_try;;
20707 -esac
20708 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20709 - (eval "$ac_try") 2>&5
20710 - ac_status=$?
20711 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20712 - (exit $ac_status); }; }; then
20713 + (exit $ac_status); } && {
20714 + test -z "$ac_c_werror_flag" ||
20715 + test ! -s conftest.err
20716 + } && test -s conftest$ac_exeext &&
20717 + $as_test_x conftest$ac_exeext; then
20718 ac_cv_lib_posix_remove=yes
20719 else
20720 echo "$as_me: failed program was:" >&5
20721 @@ -26672,7 +25583,7 @@
20722 ac_cv_lib_posix_remove=no
20723 fi
20724
20725 -rm -f core conftest.err conftest.$ac_objext \
20726 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20727 conftest$ac_exeext conftest.$ac_ext
20728 LIBS=$ac_check_lib_save_LIBS
20729 fi
20730 @@ -26748,27 +25659,11 @@
20731 rm -f conftest.er1
20732 cat conftest.err >&5
20733 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20734 - (exit $ac_status); } &&
20735 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20736 - { (case "(($ac_try" in
20737 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20738 - *) ac_try_echo=$ac_try;;
20739 -esac
20740 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20741 - (eval "$ac_try") 2>&5
20742 - ac_status=$?
20743 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20744 - (exit $ac_status); }; } &&
20745 - { ac_try='test -s conftest$ac_exeext'
20746 - { (case "(($ac_try" in
20747 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20748 - *) ac_try_echo=$ac_try;;
20749 -esac
20750 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20751 - (eval "$ac_try") 2>&5
20752 - ac_status=$?
20753 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20754 - (exit $ac_status); }; }; then
20755 + (exit $ac_status); } && {
20756 + test -z "$ac_c_werror_flag" ||
20757 + test ! -s conftest.err
20758 + } && test -s conftest$ac_exeext &&
20759 + $as_test_x conftest$ac_exeext; then
20760 ac_cv_func_shmat=yes
20761 else
20762 echo "$as_me: failed program was:" >&5
20763 @@ -26777,7 +25672,7 @@
20764 ac_cv_func_shmat=no
20765 fi
20766
20767 -rm -f core conftest.err conftest.$ac_objext \
20768 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20769 conftest$ac_exeext conftest.$ac_ext
20770 fi
20771 { echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
20772 @@ -26826,27 +25721,11 @@
20773 rm -f conftest.er1
20774 cat conftest.err >&5
20775 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20776 - (exit $ac_status); } &&
20777 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20778 - { (case "(($ac_try" in
20779 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20780 - *) ac_try_echo=$ac_try;;
20781 -esac
20782 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20783 - (eval "$ac_try") 2>&5
20784 - ac_status=$?
20785 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20786 - (exit $ac_status); }; } &&
20787 - { ac_try='test -s conftest$ac_exeext'
20788 - { (case "(($ac_try" in
20789 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20790 - *) ac_try_echo=$ac_try;;
20791 -esac
20792 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20793 - (eval "$ac_try") 2>&5
20794 - ac_status=$?
20795 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20796 - (exit $ac_status); }; }; then
20797 + (exit $ac_status); } && {
20798 + test -z "$ac_c_werror_flag" ||
20799 + test ! -s conftest.err
20800 + } && test -s conftest$ac_exeext &&
20801 + $as_test_x conftest$ac_exeext; then
20802 ac_cv_lib_ipc_shmat=yes
20803 else
20804 echo "$as_me: failed program was:" >&5
20805 @@ -26855,7 +25734,7 @@
20806 ac_cv_lib_ipc_shmat=no
20807 fi
20808
20809 -rm -f core conftest.err conftest.$ac_objext \
20810 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20811 conftest$ac_exeext conftest.$ac_ext
20812 LIBS=$ac_check_lib_save_LIBS
20813 fi
20814 @@ -26919,27 +25798,11 @@
20815 rm -f conftest.er1
20816 cat conftest.err >&5
20817 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20818 - (exit $ac_status); } &&
20819 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20820 - { (case "(($ac_try" in
20821 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20822 - *) ac_try_echo=$ac_try;;
20823 -esac
20824 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20825 - (eval "$ac_try") 2>&5
20826 - ac_status=$?
20827 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20828 - (exit $ac_status); }; } &&
20829 - { ac_try='test -s conftest$ac_exeext'
20830 - { (case "(($ac_try" in
20831 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20832 - *) ac_try_echo=$ac_try;;
20833 -esac
20834 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20835 - (eval "$ac_try") 2>&5
20836 - ac_status=$?
20837 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20838 - (exit $ac_status); }; }; then
20839 + (exit $ac_status); } && {
20840 + test -z "$ac_c_werror_flag" ||
20841 + test ! -s conftest.err
20842 + } && test -s conftest$ac_exeext &&
20843 + $as_test_x conftest$ac_exeext; then
20844 ac_cv_lib_ICE_IceConnectionNumber=yes
20845 else
20846 echo "$as_me: failed program was:" >&5
20847 @@ -26948,7 +25811,7 @@
20848 ac_cv_lib_ICE_IceConnectionNumber=no
20849 fi
20850
20851 -rm -f core conftest.err conftest.$ac_objext \
20852 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20853 conftest$ac_exeext conftest.$ac_ext
20854 LIBS=$ac_check_lib_save_LIBS
20855 fi
20856 @@ -27016,27 +25879,11 @@
20857 rm -f conftest.er1
20858 cat conftest.err >&5
20859 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20860 - (exit $ac_status); } &&
20861 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20862 - { (case "(($ac_try" in
20863 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20864 - *) ac_try_echo=$ac_try;;
20865 -esac
20866 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20867 - (eval "$ac_try") 2>&5
20868 - ac_status=$?
20869 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20870 - (exit $ac_status); }; } &&
20871 - { ac_try='test -s conftest$ac_exeext'
20872 - { (case "(($ac_try" in
20873 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20874 - *) ac_try_echo=$ac_try;;
20875 -esac
20876 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20877 - (eval "$ac_try") 2>&5
20878 - ac_status=$?
20879 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20880 - (exit $ac_status); }; }; then
20881 + (exit $ac_status); } && {
20882 + test -z "$ac_c_werror_flag" ||
20883 + test ! -s conftest.err
20884 + } && test -s conftest$ac_exeext &&
20885 + $as_test_x conftest$ac_exeext; then
20886 ac_cv_lib_X11_XFree=yes
20887 else
20888 echo "$as_me: failed program was:" >&5
20889 @@ -27045,7 +25892,7 @@
20890 ac_cv_lib_X11_XFree=no
20891 fi
20892
20893 -rm -f core conftest.err conftest.$ac_objext \
20894 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20895 conftest$ac_exeext conftest.$ac_ext
20896 LIBS=$ac_check_lib_save_LIBS
20897 fi
20898 @@ -27107,27 +25954,11 @@
20899 rm -f conftest.er1
20900 cat conftest.err >&5
20901 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20902 - (exit $ac_status); } &&
20903 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20904 - { (case "(($ac_try" in
20905 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20906 - *) ac_try_echo=$ac_try;;
20907 -esac
20908 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20909 - (eval "$ac_try") 2>&5
20910 - ac_status=$?
20911 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20912 - (exit $ac_status); }; } &&
20913 - { ac_try='test -s conftest$ac_exeext'
20914 - { (case "(($ac_try" in
20915 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20916 - *) ac_try_echo=$ac_try;;
20917 -esac
20918 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20919 - (eval "$ac_try") 2>&5
20920 - ac_status=$?
20921 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20922 - (exit $ac_status); }; }; then
20923 + (exit $ac_status); } && {
20924 + test -z "$ac_c_werror_flag" ||
20925 + test ! -s conftest.err
20926 + } && test -s conftest$ac_exeext &&
20927 + $as_test_x conftest$ac_exeext; then
20928 ac_cv_lib_Xau_XauFileName=yes
20929 else
20930 echo "$as_me: failed program was:" >&5
20931 @@ -27136,7 +25967,7 @@
20932 ac_cv_lib_Xau_XauFileName=no
20933 fi
20934
20935 -rm -f core conftest.err conftest.$ac_objext \
20936 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
20937 conftest$ac_exeext conftest.$ac_ext
20938 LIBS=$ac_check_lib_save_LIBS
20939 fi
20940 @@ -27229,27 +26060,10 @@
20941 rm -f conftest.er1
20942 cat conftest.err >&5
20943 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20944 - (exit $ac_status); } &&
20945 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20946 - { (case "(($ac_try" in
20947 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20948 - *) ac_try_echo=$ac_try;;
20949 -esac
20950 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20951 - (eval "$ac_try") 2>&5
20952 - ac_status=$?
20953 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20954 - (exit $ac_status); }; } &&
20955 - { ac_try='test -s conftest.$ac_objext'
20956 - { (case "(($ac_try" in
20957 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
20958 - *) ac_try_echo=$ac_try;;
20959 -esac
20960 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
20961 - (eval "$ac_try") 2>&5
20962 - ac_status=$?
20963 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
20964 - (exit $ac_status); }; }; then
20965 + (exit $ac_status); } && {
20966 + test -z "$ac_c_werror_flag" ||
20967 + test ! -s conftest.err
20968 + } && test -s conftest.$ac_objext; then
20969 ac_header_compiler=yes
20970 else
20971 echo "$as_me: failed program was:" >&5
20972 @@ -27285,17 +26099,10 @@
20973 rm -f conftest.er1
20974 cat conftest.err >&5
20975 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20976 - (exit $ac_status); } >/dev/null; then
20977 - if test -s conftest.err; then
20978 - ac_cpp_err=$ac_c_preproc_warn_flag
20979 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
20980 - else
20981 - ac_cpp_err=
20982 - fi
20983 -else
20984 - ac_cpp_err=yes
20985 -fi
20986 -if test -z "$ac_cpp_err"; then
20987 + (exit $ac_status); } >/dev/null && {
20988 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
20989 + test ! -s conftest.err
20990 + }; then
20991 ac_header_preproc=yes
20992 else
20993 echo "$as_me: failed program was:" >&5
20994 @@ -27374,46 +26181,30 @@
20995 #include <locale.h>
20996 int
20997 main ()
20998 -{
20999 -return LC_MESSAGES
21000 - ;
21001 - return 0;
21002 -}
21003 -_ACEOF
21004 -rm -f conftest.$ac_objext conftest$ac_exeext
21005 -if { (ac_try="$ac_link"
21006 -case "(($ac_try" in
21007 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21008 - *) ac_try_echo=$ac_try;;
21009 -esac
21010 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21011 - (eval "$ac_link") 2>conftest.er1
21012 - ac_status=$?
21013 - grep -v '^ *+' conftest.er1 >conftest.err
21014 - rm -f conftest.er1
21015 - cat conftest.err >&5
21016 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21017 - (exit $ac_status); } &&
21018 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21019 - { (case "(($ac_try" in
21020 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21021 - *) ac_try_echo=$ac_try;;
21022 -esac
21023 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21024 - (eval "$ac_try") 2>&5
21025 - ac_status=$?
21026 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21027 - (exit $ac_status); }; } &&
21028 - { ac_try='test -s conftest$ac_exeext'
21029 - { (case "(($ac_try" in
21030 +{
21031 +return LC_MESSAGES
21032 + ;
21033 + return 0;
21034 +}
21035 +_ACEOF
21036 +rm -f conftest.$ac_objext conftest$ac_exeext
21037 +if { (ac_try="$ac_link"
21038 +case "(($ac_try" in
21039 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21040 *) ac_try_echo=$ac_try;;
21041 esac
21042 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21043 - (eval "$ac_try") 2>&5
21044 + (eval "$ac_link") 2>conftest.er1
21045 ac_status=$?
21046 + grep -v '^ *+' conftest.er1 >conftest.err
21047 + rm -f conftest.er1
21048 + cat conftest.err >&5
21049 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21050 - (exit $ac_status); }; }; then
21051 + (exit $ac_status); } && {
21052 + test -z "$ac_c_werror_flag" ||
21053 + test ! -s conftest.err
21054 + } && test -s conftest$ac_exeext &&
21055 + $as_test_x conftest$ac_exeext; then
21056 am_cv_val_LC_MESSAGES=yes
21057 else
21058 echo "$as_me: failed program was:" >&5
21059 @@ -27422,7 +26213,7 @@
21060 am_cv_val_LC_MESSAGES=no
21061 fi
21062
21063 -rm -f core conftest.err conftest.$ac_objext \
21064 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
21065 conftest$ac_exeext conftest.$ac_ext
21066 fi
21067 { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
21068 @@ -27478,27 +26269,10 @@
21069 rm -f conftest.er1
21070 cat conftest.err >&5
21071 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21072 - (exit $ac_status); } &&
21073 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21074 - { (case "(($ac_try" in
21075 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21076 - *) ac_try_echo=$ac_try;;
21077 -esac
21078 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21079 - (eval "$ac_try") 2>&5
21080 - ac_status=$?
21081 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21082 - (exit $ac_status); }; } &&
21083 - { ac_try='test -s conftest.$ac_objext'
21084 - { (case "(($ac_try" in
21085 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21086 - *) ac_try_echo=$ac_try;;
21087 -esac
21088 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21089 - (eval "$ac_try") 2>&5
21090 - ac_status=$?
21091 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21092 - (exit $ac_status); }; }; then
21093 + (exit $ac_status); } && {
21094 + test -z "$ac_c_werror_flag" ||
21095 + test ! -s conftest.err
21096 + } && test -s conftest.$ac_objext; then
21097 ac_header_compiler=yes
21098 else
21099 echo "$as_me: failed program was:" >&5
21100 @@ -27534,17 +26308,10 @@
21101 rm -f conftest.er1
21102 cat conftest.err >&5
21103 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21104 - (exit $ac_status); } >/dev/null; then
21105 - if test -s conftest.err; then
21106 - ac_cpp_err=$ac_c_preproc_warn_flag
21107 - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
21108 - else
21109 - ac_cpp_err=
21110 - fi
21111 -else
21112 - ac_cpp_err=yes
21113 -fi
21114 -if test -z "$ac_cpp_err"; then
21115 + (exit $ac_status); } >/dev/null && {
21116 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
21117 + test ! -s conftest.err
21118 + }; then
21119 ac_header_preproc=yes
21120 else
21121 echo "$as_me: failed program was:" >&5
21122 @@ -27640,27 +26407,11 @@
21123 rm -f conftest.er1
21124 cat conftest.err >&5
21125 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21126 - (exit $ac_status); } &&
21127 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21128 - { (case "(($ac_try" in
21129 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21130 - *) ac_try_echo=$ac_try;;
21131 -esac
21132 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21133 - (eval "$ac_try") 2>&5
21134 - ac_status=$?
21135 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21136 - (exit $ac_status); }; } &&
21137 - { ac_try='test -s conftest$ac_exeext'
21138 - { (case "(($ac_try" in
21139 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21140 - *) ac_try_echo=$ac_try;;
21141 -esac
21142 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21143 - (eval "$ac_try") 2>&5
21144 - ac_status=$?
21145 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21146 - (exit $ac_status); }; }; then
21147 + (exit $ac_status); } && {
21148 + test -z "$ac_c_werror_flag" ||
21149 + test ! -s conftest.err
21150 + } && test -s conftest$ac_exeext &&
21151 + $as_test_x conftest$ac_exeext; then
21152 gt_cv_func_ngettext_libc=yes
21153 else
21154 echo "$as_me: failed program was:" >&5
21155 @@ -27669,7 +26420,7 @@
21156 gt_cv_func_ngettext_libc=no
21157 fi
21158
21159 -rm -f core conftest.err conftest.$ac_objext \
21160 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
21161 conftest$ac_exeext conftest.$ac_ext
21162
21163 fi
21164 @@ -27712,27 +26463,11 @@
21165 rm -f conftest.er1
21166 cat conftest.err >&5
21167 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21168 - (exit $ac_status); } &&
21169 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21170 - { (case "(($ac_try" in
21171 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21172 - *) ac_try_echo=$ac_try;;
21173 -esac
21174 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21175 - (eval "$ac_try") 2>&5
21176 - ac_status=$?
21177 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21178 - (exit $ac_status); }; } &&
21179 - { ac_try='test -s conftest$ac_exeext'
21180 - { (case "(($ac_try" in
21181 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21182 - *) ac_try_echo=$ac_try;;
21183 -esac
21184 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21185 - (eval "$ac_try") 2>&5
21186 - ac_status=$?
21187 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21188 - (exit $ac_status); }; }; then
21189 + (exit $ac_status); } && {
21190 + test -z "$ac_c_werror_flag" ||
21191 + test ! -s conftest.err
21192 + } && test -s conftest$ac_exeext &&
21193 + $as_test_x conftest$ac_exeext; then
21194 gt_cv_func_dgettext_libc=yes
21195 else
21196 echo "$as_me: failed program was:" >&5
21197 @@ -27741,7 +26476,7 @@
21198 gt_cv_func_dgettext_libc=no
21199 fi
21200
21201 -rm -f core conftest.err conftest.$ac_objext \
21202 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
21203 conftest$ac_exeext conftest.$ac_ext
21204
21205 fi
21206 @@ -27817,27 +26552,11 @@
21207 rm -f conftest.er1
21208 cat conftest.err >&5
21209 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21210 - (exit $ac_status); } &&
21211 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21212 - { (case "(($ac_try" in
21213 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21214 - *) ac_try_echo=$ac_try;;
21215 -esac
21216 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21217 - (eval "$ac_try") 2>&5
21218 - ac_status=$?
21219 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21220 - (exit $ac_status); }; } &&
21221 - { ac_try='test -s conftest$ac_exeext'
21222 - { (case "(($ac_try" in
21223 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21224 - *) ac_try_echo=$ac_try;;
21225 -esac
21226 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21227 - (eval "$ac_try") 2>&5
21228 - ac_status=$?
21229 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21230 - (exit $ac_status); }; }; then
21231 + (exit $ac_status); } && {
21232 + test -z "$ac_c_werror_flag" ||
21233 + test ! -s conftest.err
21234 + } && test -s conftest$ac_exeext &&
21235 + $as_test_x conftest$ac_exeext; then
21236 eval "$as_ac_var=yes"
21237 else
21238 echo "$as_me: failed program was:" >&5
21239 @@ -27846,7 +26565,7 @@
21240 eval "$as_ac_var=no"
21241 fi
21242
21243 -rm -f core conftest.err conftest.$ac_objext \
21244 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
21245 conftest$ac_exeext conftest.$ac_ext
21246 fi
21247 ac_res=`eval echo '${'$as_ac_var'}'`
21248 @@ -27911,27 +26630,11 @@
21249 rm -f conftest.er1
21250 cat conftest.err >&5
21251 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21252 - (exit $ac_status); } &&
21253 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21254 - { (case "(($ac_try" in
21255 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21256 - *) ac_try_echo=$ac_try;;
21257 -esac
21258 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21259 - (eval "$ac_try") 2>&5
21260 - ac_status=$?
21261 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21262 - (exit $ac_status); }; } &&
21263 - { ac_try='test -s conftest$ac_exeext'
21264 - { (case "(($ac_try" in
21265 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21266 - *) ac_try_echo=$ac_try;;
21267 -esac
21268 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21269 - (eval "$ac_try") 2>&5
21270 - ac_status=$?
21271 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21272 - (exit $ac_status); }; }; then
21273 + (exit $ac_status); } && {
21274 + test -z "$ac_c_werror_flag" ||
21275 + test ! -s conftest.err
21276 + } && test -s conftest$ac_exeext &&
21277 + $as_test_x conftest$ac_exeext; then
21278 ac_cv_lib_intl_bindtextdomain=yes
21279 else
21280 echo "$as_me: failed program was:" >&5
21281 @@ -27940,7 +26643,7 @@
21282 ac_cv_lib_intl_bindtextdomain=no
21283 fi
21284
21285 -rm -f core conftest.err conftest.$ac_objext \
21286 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
21287 conftest$ac_exeext conftest.$ac_ext
21288 LIBS=$ac_check_lib_save_LIBS
21289 fi
21290 @@ -27989,27 +26692,11 @@
21291 rm -f conftest.er1
21292 cat conftest.err >&5
21293 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21294 - (exit $ac_status); } &&
21295 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21296 - { (case "(($ac_try" in
21297 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21298 - *) ac_try_echo=$ac_try;;
21299 -esac
21300 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21301 - (eval "$ac_try") 2>&5
21302 - ac_status=$?
21303 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21304 - (exit $ac_status); }; } &&
21305 - { ac_try='test -s conftest$ac_exeext'
21306 - { (case "(($ac_try" in
21307 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21308 - *) ac_try_echo=$ac_try;;
21309 -esac
21310 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21311 - (eval "$ac_try") 2>&5
21312 - ac_status=$?
21313 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21314 - (exit $ac_status); }; }; then
21315 + (exit $ac_status); } && {
21316 + test -z "$ac_c_werror_flag" ||
21317 + test ! -s conftest.err
21318 + } && test -s conftest$ac_exeext &&
21319 + $as_test_x conftest$ac_exeext; then
21320 ac_cv_lib_intl_ngettext=yes
21321 else
21322 echo "$as_me: failed program was:" >&5
21323 @@ -28018,7 +26705,7 @@
21324 ac_cv_lib_intl_ngettext=no
21325 fi
21326
21327 -rm -f core conftest.err conftest.$ac_objext \
21328 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
21329 conftest$ac_exeext conftest.$ac_ext
21330 LIBS=$ac_check_lib_save_LIBS
21331 fi
21332 @@ -28067,27 +26754,11 @@
21333 rm -f conftest.er1
21334 cat conftest.err >&5
21335 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21336 - (exit $ac_status); } &&
21337 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21338 - { (case "(($ac_try" in
21339 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21340 - *) ac_try_echo=$ac_try;;
21341 -esac
21342 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21343 - (eval "$ac_try") 2>&5
21344 - ac_status=$?
21345 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21346 - (exit $ac_status); }; } &&
21347 - { ac_try='test -s conftest$ac_exeext'
21348 - { (case "(($ac_try" in
21349 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21350 - *) ac_try_echo=$ac_try;;
21351 -esac
21352 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21353 - (eval "$ac_try") 2>&5
21354 - ac_status=$?
21355 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21356 - (exit $ac_status); }; }; then
21357 + (exit $ac_status); } && {
21358 + test -z "$ac_c_werror_flag" ||
21359 + test ! -s conftest.err
21360 + } && test -s conftest$ac_exeext &&
21361 + $as_test_x conftest$ac_exeext; then
21362 ac_cv_lib_intl_dgettext=yes
21363 else
21364 echo "$as_me: failed program was:" >&5
21365 @@ -28096,7 +26767,7 @@
21366 ac_cv_lib_intl_dgettext=no
21367 fi
21368
21369 -rm -f core conftest.err conftest.$ac_objext \
21370 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
21371 conftest$ac_exeext conftest.$ac_ext
21372 LIBS=$ac_check_lib_save_LIBS
21373 fi
21374 @@ -28158,27 +26829,11 @@
21375 rm -f conftest.er1
21376 cat conftest.err >&5
21377 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21378 - (exit $ac_status); } &&
21379 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21380 - { (case "(($ac_try" in
21381 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21382 - *) ac_try_echo=$ac_try;;
21383 -esac
21384 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21385 - (eval "$ac_try") 2>&5
21386 - ac_status=$?
21387 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21388 - (exit $ac_status); }; } &&
21389 - { ac_try='test -s conftest$ac_exeext'
21390 - { (case "(($ac_try" in
21391 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21392 - *) ac_try_echo=$ac_try;;
21393 -esac
21394 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21395 - (eval "$ac_try") 2>&5
21396 - ac_status=$?
21397 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21398 - (exit $ac_status); }; }; then
21399 + (exit $ac_status); } && {
21400 + test -z "$ac_c_werror_flag" ||
21401 + test ! -s conftest.err
21402 + } && test -s conftest$ac_exeext &&
21403 + $as_test_x conftest$ac_exeext; then
21404 ac_cv_lib_intl_ngettext=yes
21405 else
21406 echo "$as_me: failed program was:" >&5
21407 @@ -28187,7 +26842,7 @@
21408 ac_cv_lib_intl_ngettext=no
21409 fi
21410
21411 -rm -f core conftest.err conftest.$ac_objext \
21412 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
21413 conftest$ac_exeext conftest.$ac_ext
21414 LIBS=$ac_check_lib_save_LIBS
21415 fi
21416 @@ -28236,27 +26891,11 @@
21417 rm -f conftest.er1
21418 cat conftest.err >&5
21419 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21420 - (exit $ac_status); } &&
21421 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21422 - { (case "(($ac_try" in
21423 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21424 - *) ac_try_echo=$ac_try;;
21425 -esac
21426 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21427 - (eval "$ac_try") 2>&5
21428 - ac_status=$?
21429 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21430 - (exit $ac_status); }; } &&
21431 - { ac_try='test -s conftest$ac_exeext'
21432 - { (case "(($ac_try" in
21433 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21434 - *) ac_try_echo=$ac_try;;
21435 -esac
21436 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21437 - (eval "$ac_try") 2>&5
21438 - ac_status=$?
21439 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21440 - (exit $ac_status); }; }; then
21441 + (exit $ac_status); } && {
21442 + test -z "$ac_c_werror_flag" ||
21443 + test ! -s conftest.err
21444 + } && test -s conftest$ac_exeext &&
21445 + $as_test_x conftest$ac_exeext; then
21446 ac_cv_lib_intl_dcgettext=yes
21447 else
21448 echo "$as_me: failed program was:" >&5
21449 @@ -28265,7 +26904,7 @@
21450 ac_cv_lib_intl_dcgettext=no
21451 fi
21452
21453 -rm -f core conftest.err conftest.$ac_objext \
21454 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
21455 conftest$ac_exeext conftest.$ac_ext
21456 LIBS=$ac_check_lib_save_LIBS
21457 fi
21458 @@ -28360,27 +26999,11 @@
21459 rm -f conftest.er1
21460 cat conftest.err >&5
21461 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21462 - (exit $ac_status); } &&
21463 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21464 - { (case "(($ac_try" in
21465 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21466 - *) ac_try_echo=$ac_try;;
21467 -esac
21468 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21469 - (eval "$ac_try") 2>&5
21470 - ac_status=$?
21471 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21472 - (exit $ac_status); }; } &&
21473 - { ac_try='test -s conftest$ac_exeext'
21474 - { (case "(($ac_try" in
21475 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21476 - *) ac_try_echo=$ac_try;;
21477 -esac
21478 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21479 - (eval "$ac_try") 2>&5
21480 - ac_status=$?
21481 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21482 - (exit $ac_status); }; }; then
21483 + (exit $ac_status); } && {
21484 + test -z "$ac_c_werror_flag" ||
21485 + test ! -s conftest.err
21486 + } && test -s conftest$ac_exeext &&
21487 + $as_test_x conftest$ac_exeext; then
21488 eval "$as_ac_var=yes"
21489 else
21490 echo "$as_me: failed program was:" >&5
21491 @@ -28389,7 +27012,7 @@
21492 eval "$as_ac_var=no"
21493 fi
21494
21495 -rm -f core conftest.err conftest.$ac_objext \
21496 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
21497 conftest$ac_exeext conftest.$ac_ext
21498 fi
21499 ac_res=`eval echo '${'$as_ac_var'}'`
21500 @@ -28536,27 +27159,11 @@
21501 rm -f conftest.er1
21502 cat conftest.err >&5
21503 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21504 - (exit $ac_status); } &&
21505 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21506 - { (case "(($ac_try" in
21507 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21508 - *) ac_try_echo=$ac_try;;
21509 -esac
21510 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21511 - (eval "$ac_try") 2>&5
21512 - ac_status=$?
21513 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21514 - (exit $ac_status); }; } &&
21515 - { ac_try='test -s conftest$ac_exeext'
21516 - { (case "(($ac_try" in
21517 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21518 - *) ac_try_echo=$ac_try;;
21519 -esac
21520 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21521 - (eval "$ac_try") 2>&5
21522 - ac_status=$?
21523 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21524 - (exit $ac_status); }; }; then
21525 + (exit $ac_status); } && {
21526 + test -z "$ac_c_werror_flag" ||
21527 + test ! -s conftest.err
21528 + } && test -s conftest$ac_exeext &&
21529 + $as_test_x conftest$ac_exeext; then
21530 eval "$as_ac_var=yes"
21531 else
21532 echo "$as_me: failed program was:" >&5
21533 @@ -28565,7 +27172,7 @@
21534 eval "$as_ac_var=no"
21535 fi
21536
21537 -rm -f core conftest.err conftest.$ac_objext \
21538 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
21539 conftest$ac_exeext conftest.$ac_ext
21540 fi
21541 ac_res=`eval echo '${'$as_ac_var'}'`
21542 @@ -28626,7 +27233,7 @@
21543 IFS=$as_save_IFS
21544 test -z "$as_dir" && as_dir=.
21545 for ac_exec_ext in '' $ac_executable_extensions; do
21546 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
21547 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
21548 ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
21549 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
21550 break 2
21551 @@ -28714,27 +27321,11 @@
21552 rm -f conftest.er1
21553 cat conftest.err >&5
21554 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21555 - (exit $ac_status); } &&
21556 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21557 - { (case "(($ac_try" in
21558 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21559 - *) ac_try_echo=$ac_try;;
21560 -esac
21561 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21562 - (eval "$ac_try") 2>&5
21563 - ac_status=$?
21564 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21565 - (exit $ac_status); }; } &&
21566 - { ac_try='test -s conftest$ac_exeext'
21567 - { (case "(($ac_try" in
21568 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21569 - *) ac_try_echo=$ac_try;;
21570 -esac
21571 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21572 - (eval "$ac_try") 2>&5
21573 - ac_status=$?
21574 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21575 - (exit $ac_status); }; }; then
21576 + (exit $ac_status); } && {
21577 + test -z "$ac_c_werror_flag" ||
21578 + test ! -s conftest.err
21579 + } && test -s conftest$ac_exeext &&
21580 + $as_test_x conftest$ac_exeext; then
21581 CATOBJEXT=.gmo
21582 DATADIRNAME=share
21583 else
21584 @@ -28806,27 +27397,11 @@
21585 rm -f conftest.er1
21586 cat conftest.err >&5
21587 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21588 - (exit $ac_status); } &&
21589 - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21590 - { (case "(($ac_try" in
21591 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21592 - *) ac_try_echo=$ac_try;;
21593 -esac
21594 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21595 - (eval "$ac_try") 2>&5
21596 - ac_status=$?
21597 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21598 - (exit $ac_status); }; } &&
21599 - { ac_try='test -s conftest$ac_exeext'
21600 - { (case "(($ac_try" in
21601 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
21602 - *) ac_try_echo=$ac_try;;
21603 -esac
21604 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
21605 - (eval "$ac_try") 2>&5
21606 - ac_status=$?
21607 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
21608 - (exit $ac_status); }; }; then
21609 + (exit $ac_status); } && {
21610 + test -z "$ac_c_werror_flag" ||
21611 + test ! -s conftest.err
21612 + } && test -s conftest$ac_exeext &&
21613 + $as_test_x conftest$ac_exeext; then
21614 ac_cv_func_bind_textdomain_codeset=yes
21615 else
21616 echo "$as_me: failed program was:" >&5
21617 @@ -28835,7 +27410,7 @@
21618 ac_cv_func_bind_textdomain_codeset=no
21619 fi
21620
21621 -rm -f core conftest.err conftest.$ac_objext \
21622 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
21623 conftest$ac_exeext conftest.$ac_ext
21624 fi
21625 { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
21626 @@ -28856,7 +27431,7 @@
21627 esac
21628 fi
21629
21630 -rm -f core conftest.err conftest.$ac_objext \
21631 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
21632 conftest$ac_exeext conftest.$ac_ext
21633 LIBS="$glib_save_LIBS"
21634 INSTOBJEXT=.mo
21635 @@ -29033,7 +27608,7 @@
21636 IFS=$as_save_IFS
21637 test -z "$as_dir" && as_dir=.
21638 for ac_exec_ext in '' $ac_executable_extensions; do
21639 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
21640 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
21641 ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
21642 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
21643 break 2
21644 @@ -29180,7 +27755,7 @@
21645 IFS=$as_save_IFS
21646 test -z "$as_dir" && as_dir=.
21647 for ac_exec_ext in '' $ac_executable_extensions; do
21648 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
21649 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
21650 ac_cv_path_SCROLLKEEPER_CONFIG="$as_dir/$ac_word$ac_exec_ext"
21651 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
21652 break 2
21653 @@ -29293,7 +27868,7 @@
21654 IFS=$as_save_IFS
21655 test -z "$as_dir" && as_dir=.
21656 for ac_exec_ext in '' $ac_executable_extensions; do
21657 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
21658 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
21659 ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext"
21660 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
21661 break 2
21662 @@ -29338,7 +27913,7 @@
21663 IFS=$as_save_IFS
21664 test -z "$as_dir" && as_dir=.
21665 for ac_exec_ext in '' $ac_executable_extensions; do
21666 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
21667 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
21668 ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
21669 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
21670 break 2
21671 @@ -29611,7 +28186,8 @@
21672 ## M4sh Initialization. ##
21673 ## --------------------- ##
21674
21675 -# Be Bourne compatible
21676 +# Be more Bourne compatible
21677 +DUALCASE=1; export DUALCASE # for MKS sh
21678 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
21679 emulate sh
21680 NULLCMD=:
21681 @@ -29620,10 +28196,13 @@
21682 alias -g '${1+"$@"}'='"$@"'
21683 setopt NO_GLOB_SUBST
21684 else
21685 - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
21686 + case `(set -o) 2>/dev/null` in
21687 + *posix*) set -o posix ;;
21688 +esac
21689 +
21690 fi
21691 -BIN_SH=xpg4; export BIN_SH # for Tru64
21692 -DUALCASE=1; export DUALCASE # for MKS sh
21693 +
21694 +
21695
21696
21697 # PATH needs CR
21698 @@ -29847,19 +28426,28 @@
21699 as_mkdir_p=false
21700 fi
21701
21702 -# Find out whether ``test -x'' works. Don't use a zero-byte file, as
21703 -# systems may use methods other than mode bits to determine executability.
21704 -cat >conf$$.file <<_ASEOF
21705 -#! /bin/sh
21706 -exit 0
21707 -_ASEOF
21708 -chmod +x conf$$.file
21709 -if test -x conf$$.file >/dev/null 2>&1; then
21710 - as_executable_p="test -x"
21711 +if test -x / >/dev/null 2>&1; then
21712 + as_test_x='test -x'
21713 else
21714 - as_executable_p=:
21715 + if ls -dL / >/dev/null 2>&1; then
21716 + as_ls_L_option=L
21717 + else
21718 + as_ls_L_option=
21719 + fi
21720 + as_test_x='
21721 + eval sh -c '\''
21722 + if test -d "$1"; then
21723 + test -d "$1/.";
21724 + else
21725 + case $1 in
21726 + -*)set "./$1";;
21727 + esac;
21728 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
21729 + ???[sx]*):;;*)false;;esac;fi
21730 + '\'' sh
21731 + '
21732 fi
21733 -rm -f conf$$.file
21734 +as_executable_p=$as_test_x
21735
21736 # Sed expression to map a string onto a valid CPP name.
21737 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
21738 @@ -29875,7 +28463,7 @@
21739 # values after options handling.
21740 ac_log="
21741 This file was extended by gnome-panel $as_me 2.20.3, which was
21742 -generated by GNU Autoconf 2.60. Invocation command line was
21743 +generated by GNU Autoconf 2.61. Invocation command line was
21744
21745 CONFIG_FILES = $CONFIG_FILES
21746 CONFIG_HEADERS = $CONFIG_HEADERS
21747 @@ -29904,7 +28492,7 @@
21748 Usage: $0 [OPTIONS] [FILE]...
21749
21750 -h, --help print this help, then exit
21751 - -V, --version print version number, then exit
21752 + -V, --version print version number and configuration settings, then exit
21753 -q, --quiet do not print progress messages
21754 -d, --debug don't remove temporary files
21755 --recheck update $as_me by reconfiguring in the same conditions
21756 @@ -29928,7 +28516,7 @@
21757 cat >>$CONFIG_STATUS <<_ACEOF
21758 ac_cs_version="\\
21759 gnome-panel config.status 2.20.3
21760 -configured by $0, generated by GNU Autoconf 2.60,
21761 +configured by $0, generated by GNU Autoconf 2.61,
21762 with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
21763
21764 Copyright (C) 2006 Free Software Foundation, Inc.
21765 @@ -30317,6 +28905,7 @@
21766 host_cpu!$host_cpu$ac_delim
21767 host_vendor!$host_vendor$ac_delim
21768 host_os!$host_os$ac_delim
21769 +SED!$SED$ac_delim
21770 LN_S!$LN_S$ac_delim
21771 ECHO!$ECHO$ac_delim
21772 AR!$AR$ac_delim
21773 @@ -30342,6 +28931,8 @@
21774 PKG_CONFIG!$PKG_CONFIG$ac_delim
21775 PANEL_CFLAGS!$PANEL_CFLAGS$ac_delim
21776 PANEL_LIBS!$PANEL_LIBS$ac_delim
21777 +LOGOUT_CFLAGS!$LOGOUT_CFLAGS$ac_delim
21778 +LOGOUT_LIBS!$LOGOUT_LIBS$ac_delim
21779 LIBPANEL_APPLET_CFLAGS!$LIBPANEL_APPLET_CFLAGS$ac_delim
21780 LIBPANEL_APPLET_LIBS!$LIBPANEL_APPLET_LIBS$ac_delim
21781 WNCKLET_CFLAGS!$WNCKLET_CFLAGS$ac_delim
21782 @@ -30388,9 +28979,6 @@
21783 GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim
21784 ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim
21785 ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim
21786 -GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim
21787 -GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim
21788 -HELP_DIR!$HELP_DIR$ac_delim
21789 _ACEOF
21790
21791 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
21792 @@ -30432,6 +29020,9 @@
21793 ac_delim='%!_!# '
21794 for ac_last_try in false false false false false :; do
21795 cat >conf$$subs.sed <<_ACEOF
21796 +GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim
21797 +GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim
21798 +HELP_DIR!$HELP_DIR$ac_delim
21799 OMF_DIR!$OMF_DIR$ac_delim
21800 DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
21801 ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
21802 @@ -30449,7 +29040,7 @@
21803 LTLIBOBJS!$LTLIBOBJS$ac_delim
21804 _ACEOF
21805
21806 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 15; then
21807 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
21808 break
21809 elif $ac_last_try; then
21810 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
21811 diff -Naur gnome-panel-2.20.3.old/doc/Makefile.in gnome-panel-2.20.3/doc/Makefile.in
21812 --- gnome-panel-2.20.3.old/doc/Makefile.in 2008-01-07 23:35:51.000000000 +0100
21813 +++ gnome-panel-2.20.3/doc/Makefile.in 2008-01-12 07:11:55.000000000 +0100
21814 @@ -152,6 +152,8 @@
21815 LIBTOOL = @LIBTOOL@
21816 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
21817 LN_S = @LN_S@
21818 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
21819 +LOGOUT_LIBS = @LOGOUT_LIBS@
21820 LTLIBOBJS = @LTLIBOBJS@
21821 MAINT = @MAINT@
21822 MAKEINFO = @MAKEINFO@
21823 @@ -182,6 +184,7 @@
21824 RANLIB = @RANLIB@
21825 REBUILD = @REBUILD@
21826 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
21827 +SED = @SED@
21828 SET_MAKE = @SET_MAKE@
21829 SHELL = @SHELL@
21830 STRIP = @STRIP@
21831 diff -Naur gnome-panel-2.20.3.old/doc/reference/Makefile.in gnome-panel-2.20.3/doc/reference/Makefile.in
21832 --- gnome-panel-2.20.3.old/doc/reference/Makefile.in 2008-01-07 23:35:52.000000000 +0100
21833 +++ gnome-panel-2.20.3/doc/reference/Makefile.in 2008-01-12 07:11:56.000000000 +0100
21834 @@ -152,6 +152,8 @@
21835 LIBTOOL = @LIBTOOL@
21836 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
21837 LN_S = @LN_S@
21838 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
21839 +LOGOUT_LIBS = @LOGOUT_LIBS@
21840 LTLIBOBJS = @LTLIBOBJS@
21841 MAINT = @MAINT@
21842 MAKEINFO = @MAKEINFO@
21843 @@ -182,6 +184,7 @@
21844 RANLIB = @RANLIB@
21845 REBUILD = @REBUILD@
21846 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
21847 +SED = @SED@
21848 SET_MAKE = @SET_MAKE@
21849 SHELL = @SHELL@
21850 STRIP = @STRIP@
21851 diff -Naur gnome-panel-2.20.3.old/doc/reference/panel-applet/Makefile.in gnome-panel-2.20.3/doc/reference/panel-applet/Makefile.in
21852 --- gnome-panel-2.20.3.old/doc/reference/panel-applet/Makefile.in 2008-01-07 23:35:52.000000000 +0100
21853 +++ gnome-panel-2.20.3/doc/reference/panel-applet/Makefile.in 2008-01-12 07:11:56.000000000 +0100
21854 @@ -147,6 +147,8 @@
21855 LIBTOOL = @LIBTOOL@
21856 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
21857 LN_S = @LN_S@
21858 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
21859 +LOGOUT_LIBS = @LOGOUT_LIBS@
21860 LTLIBOBJS = @LTLIBOBJS@
21861 MAINT = @MAINT@
21862 MAKEINFO = @MAKEINFO@
21863 @@ -177,6 +179,7 @@
21864 RANLIB = @RANLIB@
21865 REBUILD = @REBUILD@
21866 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
21867 +SED = @SED@
21868 SET_MAKE = @SET_MAKE@
21869 SHELL = @SHELL@
21870 STRIP = @STRIP@
21871 diff -Naur gnome-panel-2.20.3.old/gnome-panel/Makefile.in gnome-panel-2.20.3/gnome-panel/Makefile.in
21872 --- gnome-panel-2.20.3.old/gnome-panel/Makefile.in 2008-01-07 23:35:53.000000000 +0100
21873 +++ gnome-panel-2.20.3/gnome-panel/Makefile.in 2008-01-12 07:11:56.000000000 +0100
21874 @@ -33,7 +33,8 @@
21875 POST_UNINSTALL = :
21876 build_triplet = @build@
21877 host_triplet = @host@
21878 -bin_PROGRAMS = gnome-panel$(EXEEXT) gnome-desktop-item-edit$(EXEEXT)
21879 +bin_PROGRAMS = gnome-panel$(EXEEXT) gnome-panel-logout$(EXEEXT) \
21880 + gnome-desktop-item-edit$(EXEEXT)
21881 subdir = gnome-panel
21882 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
21883 $(srcdir)/gnome-panel.desktop.in.in ChangeLog
21884 @@ -98,6 +99,20 @@
21885 gnome_panel_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
21886 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
21887 $(gnome_panel_LDFLAGS) $(LDFLAGS) -o $@
21888 +am_gnome_panel_logout_OBJECTS = \
21889 + gnome_panel_logout-gnome-panel-logout.$(OBJEXT) \
21890 + gnome_panel_logout-panel-logout.$(OBJEXT) \
21891 + gnome_panel_logout-panel-gdm.$(OBJEXT) \
21892 + gnome_panel_logout-panel-power-manager.$(OBJEXT) \
21893 + gnome_panel_logout-panel-session.$(OBJEXT) \
21894 + gnome_panel_logout-panel-util.$(OBJEXT)
21895 +gnome_panel_logout_OBJECTS = $(am_gnome_panel_logout_OBJECTS)
21896 +gnome_panel_logout_DEPENDENCIES = $(am__DEPENDENCIES_1) \
21897 + $(am__DEPENDENCIES_1)
21898 +gnome_panel_logout_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
21899 + $(LIBTOOLFLAGS) --mode=link $(CCLD) \
21900 + $(gnome_panel_logout_CFLAGS) $(CFLAGS) \
21901 + $(gnome_panel_logout_LDFLAGS) $(LDFLAGS) -o $@
21902 DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
21903 depcomp = $(SHELL) $(top_srcdir)/depcomp
21904 am__depfiles_maybe = depfiles
21905 @@ -110,9 +125,10 @@
21906 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
21907 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
21908 $(LDFLAGS) -o $@
21909 -SOURCES = $(gnome_desktop_item_edit_SOURCES) $(gnome_panel_SOURCES)
21910 +SOURCES = $(gnome_desktop_item_edit_SOURCES) $(gnome_panel_SOURCES) \
21911 + $(gnome_panel_logout_SOURCES)
21912 DIST_SOURCES = $(gnome_desktop_item_edit_SOURCES) \
21913 - $(gnome_panel_SOURCES)
21914 + $(gnome_panel_SOURCES) $(gnome_panel_logout_SOURCES)
21915 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
21916 am__vpath_adj = case $$p in \
21917 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
21918 @@ -225,6 +241,8 @@
21919 LIBTOOL = @LIBTOOL@
21920 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
21921 LN_S = @LN_S@
21922 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
21923 +LOGOUT_LIBS = @LOGOUT_LIBS@
21924 LTLIBOBJS = @LTLIBOBJS@
21925 MAINT = @MAINT@
21926 MAKEINFO = @MAKEINFO@
21927 @@ -255,6 +273,7 @@
21928 RANLIB = @RANLIB@
21929 REBUILD = @REBUILD@
21930 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
21931 +SED = @SED@
21932 SET_MAKE = @SET_MAKE@
21933 SHELL = @SHELL@
21934 STRIP = @STRIP@
21935 @@ -473,6 +492,20 @@
21936 $(X_LIBS)
21937
21938 gnome_panel_LDFLAGS = -export-dynamic
21939 +gnome_panel_logout_SOURCES = \
21940 + gnome-panel-logout.c \
21941 + panel-logout.c \
21942 + panel-gdm.c \
21943 + panel-power-manager.c \
21944 + panel-session.c \
21945 + panel-util.c
21946 +
21947 +gnome_panel_logout_CFLAGS = -DBUILDING_STANDALONE_LOGOUT
21948 +gnome_panel_logout_LDADD = \
21949 + $(LOGOUT_LIBS) \
21950 + $(X_LIBS)
21951 +
21952 +gnome_panel_logout_LDFLAGS = -export-dynamic
21953 gnome_desktop_item_edit_SOURCES = \
21954 gnome-desktop-item-edit.c \
21955 panel-ditem-editor.c \
21956 @@ -606,6 +639,9 @@
21957 gnome-panel$(EXEEXT): $(gnome_panel_OBJECTS) $(gnome_panel_DEPENDENCIES)
21958 @rm -f gnome-panel$(EXEEXT)
21959 $(gnome_panel_LINK) $(gnome_panel_OBJECTS) $(gnome_panel_LDADD) $(LIBS)
21960 +gnome-panel-logout$(EXEEXT): $(gnome_panel_logout_OBJECTS) $(gnome_panel_logout_DEPENDENCIES)
21961 + @rm -f gnome-panel-logout$(EXEEXT)
21962 + $(gnome_panel_logout_LINK) $(gnome_panel_logout_OBJECTS) $(gnome_panel_logout_LDADD) $(LIBS)
21963
21964 mostlyclean-compile:
21965 -rm -f *.$(OBJEXT)
21966 @@ -620,6 +656,12 @@
21967 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/button-widget.Po@am__quote@
21968 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawer.Po@am__quote@
21969 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-desktop-item-edit.Po@am__quote@
21970 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Po@am__quote@
21971 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_panel_logout-panel-gdm.Po@am__quote@
21972 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_panel_logout-panel-logout.Po@am__quote@
21973 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_panel_logout-panel-power-manager.Po@am__quote@
21974 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_panel_logout-panel-session.Po@am__quote@
21975 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_panel_logout-panel-util.Po@am__quote@
21976 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launcher.Po@am__quote@
21977 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
21978 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu.Po@am__quote@
21979 @@ -685,6 +727,90 @@
21980 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
21981 @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
21982
21983 +gnome_panel_logout-gnome-panel-logout.o: gnome-panel-logout.c
21984 +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-gnome-panel-logout.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo -c -o gnome_panel_logout-gnome-panel-logout.o `test -f 'gnome-panel-logout.c' || echo '$(srcdir)/'`gnome-panel-logout.c
21985 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Po
21986 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnome-panel-logout.c' object='gnome_panel_logout-gnome-panel-logout.o' libtool=no @AMDEPBACKSLASH@
21987 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
21988 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-gnome-panel-logout.o `test -f 'gnome-panel-logout.c' || echo '$(srcdir)/'`gnome-panel-logout.c
21989 +
21990 +gnome_panel_logout-gnome-panel-logout.obj: gnome-panel-logout.c
21991 +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-gnome-panel-logout.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo -c -o gnome_panel_logout-gnome-panel-logout.obj `if test -f 'gnome-panel-logout.c'; then $(CYGPATH_W) 'gnome-panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/gnome-panel-logout.c'; fi`
21992 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Po
21993 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnome-panel-logout.c' object='gnome_panel_logout-gnome-panel-logout.obj' libtool=no @AMDEPBACKSLASH@
21994 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
21995 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-gnome-panel-logout.obj `if test -f 'gnome-panel-logout.c'; then $(CYGPATH_W) 'gnome-panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/gnome-panel-logout.c'; fi`
21996 +
21997 +gnome_panel_logout-panel-logout.o: panel-logout.c
21998 +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-logout.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-logout.Tpo -c -o gnome_panel_logout-panel-logout.o `test -f 'panel-logout.c' || echo '$(srcdir)/'`panel-logout.c
21999 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-logout.Tpo $(DEPDIR)/gnome_panel_logout-panel-logout.Po
22000 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-logout.c' object='gnome_panel_logout-panel-logout.o' libtool=no @AMDEPBACKSLASH@
22001 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22002 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-logout.o `test -f 'panel-logout.c' || echo '$(srcdir)/'`panel-logout.c
22003 +
22004 +gnome_panel_logout-panel-logout.obj: panel-logout.c
22005 +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-logout.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-logout.Tpo -c -o gnome_panel_logout-panel-logout.obj `if test -f 'panel-logout.c'; then $(CYGPATH_W) 'panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/panel-logout.c'; fi`
22006 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-logout.Tpo $(DEPDIR)/gnome_panel_logout-panel-logout.Po
22007 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-logout.c' object='gnome_panel_logout-panel-logout.obj' libtool=no @AMDEPBACKSLASH@
22008 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22009 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-logout.obj `if test -f 'panel-logout.c'; then $(CYGPATH_W) 'panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/panel-logout.c'; fi`
22010 +
22011 +gnome_panel_logout-panel-gdm.o: panel-gdm.c
22012 +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-gdm.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo -c -o gnome_panel_logout-panel-gdm.o `test -f 'panel-gdm.c' || echo '$(srcdir)/'`panel-gdm.c
22013 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo $(DEPDIR)/gnome_panel_logout-panel-gdm.Po
22014 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-gdm.c' object='gnome_panel_logout-panel-gdm.o' libtool=no @AMDEPBACKSLASH@
22015 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22016 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-gdm.o `test -f 'panel-gdm.c' || echo '$(srcdir)/'`panel-gdm.c
22017 +
22018 +gnome_panel_logout-panel-gdm.obj: panel-gdm.c
22019 +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-gdm.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo -c -o gnome_panel_logout-panel-gdm.obj `if test -f 'panel-gdm.c'; then $(CYGPATH_W) 'panel-gdm.c'; else $(CYGPATH_W) '$(srcdir)/panel-gdm.c'; fi`
22020 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo $(DEPDIR)/gnome_panel_logout-panel-gdm.Po
22021 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-gdm.c' object='gnome_panel_logout-panel-gdm.obj' libtool=no @AMDEPBACKSLASH@
22022 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22023 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-gdm.obj `if test -f 'panel-gdm.c'; then $(CYGPATH_W) 'panel-gdm.c'; else $(CYGPATH_W) '$(srcdir)/panel-gdm.c'; fi`
22024 +
22025 +gnome_panel_logout-panel-power-manager.o: panel-power-manager.c
22026 +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-power-manager.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-power-manager.Tpo -c -o gnome_panel_logout-panel-power-manager.o `test -f 'panel-power-manager.c' || echo '$(srcdir)/'`panel-power-manager.c
22027 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-power-manager.Tpo $(DEPDIR)/gnome_panel_logout-panel-power-manager.Po
22028 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-power-manager.c' object='gnome_panel_logout-panel-power-manager.o' libtool=no @AMDEPBACKSLASH@
22029 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22030 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-power-manager.o `test -f 'panel-power-manager.c' || echo '$(srcdir)/'`panel-power-manager.c
22031 +
22032 +gnome_panel_logout-panel-power-manager.obj: panel-power-manager.c
22033 +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-power-manager.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-power-manager.Tpo -c -o gnome_panel_logout-panel-power-manager.obj `if test -f 'panel-power-manager.c'; then $(CYGPATH_W) 'panel-power-manager.c'; else $(CYGPATH_W) '$(srcdir)/panel-power-manager.c'; fi`
22034 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-power-manager.Tpo $(DEPDIR)/gnome_panel_logout-panel-power-manager.Po
22035 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-power-manager.c' object='gnome_panel_logout-panel-power-manager.obj' libtool=no @AMDEPBACKSLASH@
22036 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22037 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-power-manager.obj `if test -f 'panel-power-manager.c'; then $(CYGPATH_W) 'panel-power-manager.c'; else $(CYGPATH_W) '$(srcdir)/panel-power-manager.c'; fi`
22038 +
22039 +gnome_panel_logout-panel-session.o: panel-session.c
22040 +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-session.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-session.Tpo -c -o gnome_panel_logout-panel-session.o `test -f 'panel-session.c' || echo '$(srcdir)/'`panel-session.c
22041 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-session.Tpo $(DEPDIR)/gnome_panel_logout-panel-session.Po
22042 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-session.c' object='gnome_panel_logout-panel-session.o' libtool=no @AMDEPBACKSLASH@
22043 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22044 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-session.o `test -f 'panel-session.c' || echo '$(srcdir)/'`panel-session.c
22045 +
22046 +gnome_panel_logout-panel-session.obj: panel-session.c
22047 +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-session.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-session.Tpo -c -o gnome_panel_logout-panel-session.obj `if test -f 'panel-session.c'; then $(CYGPATH_W) 'panel-session.c'; else $(CYGPATH_W) '$(srcdir)/panel-session.c'; fi`
22048 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-session.Tpo $(DEPDIR)/gnome_panel_logout-panel-session.Po
22049 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-session.c' object='gnome_panel_logout-panel-session.obj' libtool=no @AMDEPBACKSLASH@
22050 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22051 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-session.obj `if test -f 'panel-session.c'; then $(CYGPATH_W) 'panel-session.c'; else $(CYGPATH_W) '$(srcdir)/panel-session.c'; fi`
22052 +
22053 +gnome_panel_logout-panel-util.o: panel-util.c
22054 +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-util.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-util.Tpo -c -o gnome_panel_logout-panel-util.o `test -f 'panel-util.c' || echo '$(srcdir)/'`panel-util.c
22055 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-util.Tpo $(DEPDIR)/gnome_panel_logout-panel-util.Po
22056 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-util.c' object='gnome_panel_logout-panel-util.o' libtool=no @AMDEPBACKSLASH@
22057 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22058 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-util.o `test -f 'panel-util.c' || echo '$(srcdir)/'`panel-util.c
22059 +
22060 +gnome_panel_logout-panel-util.obj: panel-util.c
22061 +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-util.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-util.Tpo -c -o gnome_panel_logout-panel-util.obj `if test -f 'panel-util.c'; then $(CYGPATH_W) 'panel-util.c'; else $(CYGPATH_W) '$(srcdir)/panel-util.c'; fi`
22062 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-util.Tpo $(DEPDIR)/gnome_panel_logout-panel-util.Po
22063 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-util.c' object='gnome_panel_logout-panel-util.obj' libtool=no @AMDEPBACKSLASH@
22064 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22065 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-util.obj `if test -f 'panel-util.c'; then $(CYGPATH_W) 'panel-util.c'; else $(CYGPATH_W) '$(srcdir)/panel-util.c'; fi`
22066 +
22067 mostlyclean-libtool:
22068 -rm -f *.lo
22069
22070 diff -Naur gnome-panel-2.20.3.old/help/clock/Makefile.in gnome-panel-2.20.3/help/clock/Makefile.in
22071 --- gnome-panel-2.20.3.old/help/clock/Makefile.in 2008-01-07 23:35:54.000000000 +0100
22072 +++ gnome-panel-2.20.3/help/clock/Makefile.in 2008-01-12 07:11:56.000000000 +0100
22073 @@ -165,6 +165,8 @@
22074 LIBTOOL = @LIBTOOL@
22075 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22076 LN_S = @LN_S@
22077 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22078 +LOGOUT_LIBS = @LOGOUT_LIBS@
22079 LTLIBOBJS = @LTLIBOBJS@
22080 MAINT = @MAINT@
22081 MAKEINFO = @MAKEINFO@
22082 @@ -195,6 +197,7 @@
22083 RANLIB = @RANLIB@
22084 REBUILD = @REBUILD@
22085 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22086 +SED = @SED@
22087 SET_MAKE = @SET_MAKE@
22088 SHELL = @SHELL@
22089 STRIP = @STRIP@
22090 diff -Naur gnome-panel-2.20.3.old/help/de/fish/Makefile.in gnome-panel-2.20.3/help/de/fish/Makefile.in
22091 --- gnome-panel-2.20.3.old/help/de/fish/Makefile.in 2008-01-07 23:35:55.000000000 +0100
22092 +++ gnome-panel-2.20.3/help/de/fish/Makefile.in 2008-01-12 07:11:57.000000000 +0100
22093 @@ -203,6 +203,8 @@
22094 LIBTOOL = @LIBTOOL@
22095 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22096 LN_S = @LN_S@
22097 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22098 +LOGOUT_LIBS = @LOGOUT_LIBS@
22099 LTLIBOBJS = @LTLIBOBJS@
22100 MAINT = @MAINT@
22101 MAKEINFO = @MAKEINFO@
22102 @@ -233,6 +235,7 @@
22103 RANLIB = @RANLIB@
22104 REBUILD = @REBUILD@
22105 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22106 +SED = @SED@
22107 SET_MAKE = @SET_MAKE@
22108 SHELL = @SHELL@
22109 STRIP = @STRIP@
22110 diff -Naur gnome-panel-2.20.3.old/help/de/Makefile.in gnome-panel-2.20.3/help/de/Makefile.in
22111 --- gnome-panel-2.20.3.old/help/de/Makefile.in 2008-01-07 23:35:55.000000000 +0100
22112 +++ gnome-panel-2.20.3/help/de/Makefile.in 2008-01-12 07:11:56.000000000 +0100
22113 @@ -152,6 +152,8 @@
22114 LIBTOOL = @LIBTOOL@
22115 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22116 LN_S = @LN_S@
22117 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22118 +LOGOUT_LIBS = @LOGOUT_LIBS@
22119 LTLIBOBJS = @LTLIBOBJS@
22120 MAINT = @MAINT@
22121 MAKEINFO = @MAKEINFO@
22122 @@ -182,6 +184,7 @@
22123 RANLIB = @RANLIB@
22124 REBUILD = @REBUILD@
22125 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22126 +SED = @SED@
22127 SET_MAKE = @SET_MAKE@
22128 SHELL = @SHELL@
22129 STRIP = @STRIP@
22130 diff -Naur gnome-panel-2.20.3.old/help/de/window-list/Makefile.in gnome-panel-2.20.3/help/de/window-list/Makefile.in
22131 --- gnome-panel-2.20.3.old/help/de/window-list/Makefile.in 2008-01-07 23:35:56.000000000 +0100
22132 +++ gnome-panel-2.20.3/help/de/window-list/Makefile.in 2008-01-12 07:11:57.000000000 +0100
22133 @@ -203,6 +203,8 @@
22134 LIBTOOL = @LIBTOOL@
22135 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22136 LN_S = @LN_S@
22137 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22138 +LOGOUT_LIBS = @LOGOUT_LIBS@
22139 LTLIBOBJS = @LTLIBOBJS@
22140 MAINT = @MAINT@
22141 MAKEINFO = @MAKEINFO@
22142 @@ -233,6 +235,7 @@
22143 RANLIB = @RANLIB@
22144 REBUILD = @REBUILD@
22145 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22146 +SED = @SED@
22147 SET_MAKE = @SET_MAKE@
22148 SHELL = @SHELL@
22149 STRIP = @STRIP@
22150 diff -Naur gnome-panel-2.20.3.old/help/de/workspace-switcher/Makefile.in gnome-panel-2.20.3/help/de/workspace-switcher/Makefile.in
22151 --- gnome-panel-2.20.3.old/help/de/workspace-switcher/Makefile.in 2008-01-07 23:35:56.000000000 +0100
22152 +++ gnome-panel-2.20.3/help/de/workspace-switcher/Makefile.in 2008-01-12 07:11:57.000000000 +0100
22153 @@ -203,6 +203,8 @@
22154 LIBTOOL = @LIBTOOL@
22155 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22156 LN_S = @LN_S@
22157 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22158 +LOGOUT_LIBS = @LOGOUT_LIBS@
22159 LTLIBOBJS = @LTLIBOBJS@
22160 MAINT = @MAINT@
22161 MAKEINFO = @MAKEINFO@
22162 @@ -233,6 +235,7 @@
22163 RANLIB = @RANLIB@
22164 REBUILD = @REBUILD@
22165 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22166 +SED = @SED@
22167 SET_MAKE = @SET_MAKE@
22168 SHELL = @SHELL@
22169 STRIP = @STRIP@
22170 diff -Naur gnome-panel-2.20.3.old/help/fish/Makefile.in gnome-panel-2.20.3/help/fish/Makefile.in
22171 --- gnome-panel-2.20.3.old/help/fish/Makefile.in 2008-01-07 23:35:57.000000000 +0100
22172 +++ gnome-panel-2.20.3/help/fish/Makefile.in 2008-01-12 07:11:57.000000000 +0100
22173 @@ -165,6 +165,8 @@
22174 LIBTOOL = @LIBTOOL@
22175 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22176 LN_S = @LN_S@
22177 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22178 +LOGOUT_LIBS = @LOGOUT_LIBS@
22179 LTLIBOBJS = @LTLIBOBJS@
22180 MAINT = @MAINT@
22181 MAKEINFO = @MAKEINFO@
22182 @@ -195,6 +197,7 @@
22183 RANLIB = @RANLIB@
22184 REBUILD = @REBUILD@
22185 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22186 +SED = @SED@
22187 SET_MAKE = @SET_MAKE@
22188 SHELL = @SHELL@
22189 STRIP = @STRIP@
22190 diff -Naur gnome-panel-2.20.3.old/help/ja/fish/Makefile.in gnome-panel-2.20.3/help/ja/fish/Makefile.in
22191 --- gnome-panel-2.20.3.old/help/ja/fish/Makefile.in 2008-01-07 23:35:58.000000000 +0100
22192 +++ gnome-panel-2.20.3/help/ja/fish/Makefile.in 2008-01-12 07:11:57.000000000 +0100
22193 @@ -203,6 +203,8 @@
22194 LIBTOOL = @LIBTOOL@
22195 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22196 LN_S = @LN_S@
22197 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22198 +LOGOUT_LIBS = @LOGOUT_LIBS@
22199 LTLIBOBJS = @LTLIBOBJS@
22200 MAINT = @MAINT@
22201 MAKEINFO = @MAKEINFO@
22202 @@ -233,6 +235,7 @@
22203 RANLIB = @RANLIB@
22204 REBUILD = @REBUILD@
22205 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22206 +SED = @SED@
22207 SET_MAKE = @SET_MAKE@
22208 SHELL = @SHELL@
22209 STRIP = @STRIP@
22210 diff -Naur gnome-panel-2.20.3.old/help/ja/Makefile.in gnome-panel-2.20.3/help/ja/Makefile.in
22211 --- gnome-panel-2.20.3.old/help/ja/Makefile.in 2008-01-07 23:35:58.000000000 +0100
22212 +++ gnome-panel-2.20.3/help/ja/Makefile.in 2008-01-12 07:11:57.000000000 +0100
22213 @@ -152,6 +152,8 @@
22214 LIBTOOL = @LIBTOOL@
22215 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22216 LN_S = @LN_S@
22217 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22218 +LOGOUT_LIBS = @LOGOUT_LIBS@
22219 LTLIBOBJS = @LTLIBOBJS@
22220 MAINT = @MAINT@
22221 MAKEINFO = @MAKEINFO@
22222 @@ -182,6 +184,7 @@
22223 RANLIB = @RANLIB@
22224 REBUILD = @REBUILD@
22225 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22226 +SED = @SED@
22227 SET_MAKE = @SET_MAKE@
22228 SHELL = @SHELL@
22229 STRIP = @STRIP@
22230 diff -Naur gnome-panel-2.20.3.old/help/ja/window-list/Makefile.in gnome-panel-2.20.3/help/ja/window-list/Makefile.in
22231 --- gnome-panel-2.20.3.old/help/ja/window-list/Makefile.in 2008-01-07 23:35:59.000000000 +0100
22232 +++ gnome-panel-2.20.3/help/ja/window-list/Makefile.in 2008-01-12 07:11:57.000000000 +0100
22233 @@ -203,6 +203,8 @@
22234 LIBTOOL = @LIBTOOL@
22235 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22236 LN_S = @LN_S@
22237 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22238 +LOGOUT_LIBS = @LOGOUT_LIBS@
22239 LTLIBOBJS = @LTLIBOBJS@
22240 MAINT = @MAINT@
22241 MAKEINFO = @MAKEINFO@
22242 @@ -233,6 +235,7 @@
22243 RANLIB = @RANLIB@
22244 REBUILD = @REBUILD@
22245 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22246 +SED = @SED@
22247 SET_MAKE = @SET_MAKE@
22248 SHELL = @SHELL@
22249 STRIP = @STRIP@
22250 diff -Naur gnome-panel-2.20.3.old/help/ja/workspace-switcher/Makefile.in gnome-panel-2.20.3/help/ja/workspace-switcher/Makefile.in
22251 --- gnome-panel-2.20.3.old/help/ja/workspace-switcher/Makefile.in 2008-01-07 23:36:00.000000000 +0100
22252 +++ gnome-panel-2.20.3/help/ja/workspace-switcher/Makefile.in 2008-01-12 07:11:58.000000000 +0100
22253 @@ -203,6 +203,8 @@
22254 LIBTOOL = @LIBTOOL@
22255 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22256 LN_S = @LN_S@
22257 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22258 +LOGOUT_LIBS = @LOGOUT_LIBS@
22259 LTLIBOBJS = @LTLIBOBJS@
22260 MAINT = @MAINT@
22261 MAKEINFO = @MAKEINFO@
22262 @@ -233,6 +235,7 @@
22263 RANLIB = @RANLIB@
22264 REBUILD = @REBUILD@
22265 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22266 +SED = @SED@
22267 SET_MAKE = @SET_MAKE@
22268 SHELL = @SHELL@
22269 STRIP = @STRIP@
22270 diff -Naur gnome-panel-2.20.3.old/help/Makefile.in gnome-panel-2.20.3/help/Makefile.in
22271 --- gnome-panel-2.20.3.old/help/Makefile.in 2008-01-07 23:35:53.000000000 +0100
22272 +++ gnome-panel-2.20.3/help/Makefile.in 2008-01-12 07:11:56.000000000 +0100
22273 @@ -152,6 +152,8 @@
22274 LIBTOOL = @LIBTOOL@
22275 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22276 LN_S = @LN_S@
22277 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22278 +LOGOUT_LIBS = @LOGOUT_LIBS@
22279 LTLIBOBJS = @LTLIBOBJS@
22280 MAINT = @MAINT@
22281 MAKEINFO = @MAKEINFO@
22282 @@ -182,6 +184,7 @@
22283 RANLIB = @RANLIB@
22284 REBUILD = @REBUILD@
22285 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22286 +SED = @SED@
22287 SET_MAKE = @SET_MAKE@
22288 SHELL = @SHELL@
22289 STRIP = @STRIP@
22290 diff -Naur gnome-panel-2.20.3.old/help/window-list/Makefile.in gnome-panel-2.20.3/help/window-list/Makefile.in
22291 --- gnome-panel-2.20.3.old/help/window-list/Makefile.in 2008-01-07 23:36:01.000000000 +0100
22292 +++ gnome-panel-2.20.3/help/window-list/Makefile.in 2008-01-12 07:11:58.000000000 +0100
22293 @@ -165,6 +165,8 @@
22294 LIBTOOL = @LIBTOOL@
22295 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22296 LN_S = @LN_S@
22297 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22298 +LOGOUT_LIBS = @LOGOUT_LIBS@
22299 LTLIBOBJS = @LTLIBOBJS@
22300 MAINT = @MAINT@
22301 MAKEINFO = @MAKEINFO@
22302 @@ -195,6 +197,7 @@
22303 RANLIB = @RANLIB@
22304 REBUILD = @REBUILD@
22305 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22306 +SED = @SED@
22307 SET_MAKE = @SET_MAKE@
22308 SHELL = @SHELL@
22309 STRIP = @STRIP@
22310 diff -Naur gnome-panel-2.20.3.old/help/workspace-switcher/Makefile.in gnome-panel-2.20.3/help/workspace-switcher/Makefile.in
22311 --- gnome-panel-2.20.3.old/help/workspace-switcher/Makefile.in 2008-01-07 23:36:01.000000000 +0100
22312 +++ gnome-panel-2.20.3/help/workspace-switcher/Makefile.in 2008-01-12 07:11:58.000000000 +0100
22313 @@ -165,6 +165,8 @@
22314 LIBTOOL = @LIBTOOL@
22315 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22316 LN_S = @LN_S@
22317 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22318 +LOGOUT_LIBS = @LOGOUT_LIBS@
22319 LTLIBOBJS = @LTLIBOBJS@
22320 MAINT = @MAINT@
22321 MAKEINFO = @MAKEINFO@
22322 @@ -195,6 +197,7 @@
22323 RANLIB = @RANLIB@
22324 REBUILD = @REBUILD@
22325 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22326 +SED = @SED@
22327 SET_MAKE = @SET_MAKE@
22328 SHELL = @SHELL@
22329 STRIP = @STRIP@
22330 diff -Naur gnome-panel-2.20.3.old/help/zh_CN/fish/Makefile.in gnome-panel-2.20.3/help/zh_CN/fish/Makefile.in
22331 --- gnome-panel-2.20.3.old/help/zh_CN/fish/Makefile.in 2008-01-07 23:36:02.000000000 +0100
22332 +++ gnome-panel-2.20.3/help/zh_CN/fish/Makefile.in 2008-01-12 07:11:58.000000000 +0100
22333 @@ -203,6 +203,8 @@
22334 LIBTOOL = @LIBTOOL@
22335 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22336 LN_S = @LN_S@
22337 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22338 +LOGOUT_LIBS = @LOGOUT_LIBS@
22339 LTLIBOBJS = @LTLIBOBJS@
22340 MAINT = @MAINT@
22341 MAKEINFO = @MAKEINFO@
22342 @@ -233,6 +235,7 @@
22343 RANLIB = @RANLIB@
22344 REBUILD = @REBUILD@
22345 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22346 +SED = @SED@
22347 SET_MAKE = @SET_MAKE@
22348 SHELL = @SHELL@
22349 STRIP = @STRIP@
22350 diff -Naur gnome-panel-2.20.3.old/help/zh_CN/Makefile.in gnome-panel-2.20.3/help/zh_CN/Makefile.in
22351 --- gnome-panel-2.20.3.old/help/zh_CN/Makefile.in 2008-01-07 23:36:02.000000000 +0100
22352 +++ gnome-panel-2.20.3/help/zh_CN/Makefile.in 2008-01-12 07:11:58.000000000 +0100
22353 @@ -152,6 +152,8 @@
22354 LIBTOOL = @LIBTOOL@
22355 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22356 LN_S = @LN_S@
22357 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22358 +LOGOUT_LIBS = @LOGOUT_LIBS@
22359 LTLIBOBJS = @LTLIBOBJS@
22360 MAINT = @MAINT@
22361 MAKEINFO = @MAKEINFO@
22362 @@ -182,6 +184,7 @@
22363 RANLIB = @RANLIB@
22364 REBUILD = @REBUILD@
22365 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22366 +SED = @SED@
22367 SET_MAKE = @SET_MAKE@
22368 SHELL = @SHELL@
22369 STRIP = @STRIP@
22370 diff -Naur gnome-panel-2.20.3.old/help/zh_CN/workspace-switcher/Makefile.in gnome-panel-2.20.3/help/zh_CN/workspace-switcher/Makefile.in
22371 --- gnome-panel-2.20.3.old/help/zh_CN/workspace-switcher/Makefile.in 2008-01-07 23:36:03.000000000 +0100
22372 +++ gnome-panel-2.20.3/help/zh_CN/workspace-switcher/Makefile.in 2008-01-12 07:11:58.000000000 +0100
22373 @@ -203,6 +203,8 @@
22374 LIBTOOL = @LIBTOOL@
22375 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22376 LN_S = @LN_S@
22377 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22378 +LOGOUT_LIBS = @LOGOUT_LIBS@
22379 LTLIBOBJS = @LTLIBOBJS@
22380 MAINT = @MAINT@
22381 MAKEINFO = @MAKEINFO@
22382 @@ -233,6 +235,7 @@
22383 RANLIB = @RANLIB@
22384 REBUILD = @REBUILD@
22385 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22386 +SED = @SED@
22387 SET_MAKE = @SET_MAKE@
22388 SHELL = @SHELL@
22389 STRIP = @STRIP@
22390 diff -Naur gnome-panel-2.20.3.old/help/zh_TW/fish/Makefile.in gnome-panel-2.20.3/help/zh_TW/fish/Makefile.in
22391 --- gnome-panel-2.20.3.old/help/zh_TW/fish/Makefile.in 2008-01-07 23:36:04.000000000 +0100
22392 +++ gnome-panel-2.20.3/help/zh_TW/fish/Makefile.in 2008-01-12 07:11:59.000000000 +0100
22393 @@ -203,6 +203,8 @@
22394 LIBTOOL = @LIBTOOL@
22395 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22396 LN_S = @LN_S@
22397 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22398 +LOGOUT_LIBS = @LOGOUT_LIBS@
22399 LTLIBOBJS = @LTLIBOBJS@
22400 MAINT = @MAINT@
22401 MAKEINFO = @MAKEINFO@
22402 @@ -233,6 +235,7 @@
22403 RANLIB = @RANLIB@
22404 REBUILD = @REBUILD@
22405 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22406 +SED = @SED@
22407 SET_MAKE = @SET_MAKE@
22408 SHELL = @SHELL@
22409 STRIP = @STRIP@
22410 diff -Naur gnome-panel-2.20.3.old/help/zh_TW/Makefile.in gnome-panel-2.20.3/help/zh_TW/Makefile.in
22411 --- gnome-panel-2.20.3.old/help/zh_TW/Makefile.in 2008-01-07 23:36:03.000000000 +0100
22412 +++ gnome-panel-2.20.3/help/zh_TW/Makefile.in 2008-01-12 07:11:58.000000000 +0100
22413 @@ -152,6 +152,8 @@
22414 LIBTOOL = @LIBTOOL@
22415 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22416 LN_S = @LN_S@
22417 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22418 +LOGOUT_LIBS = @LOGOUT_LIBS@
22419 LTLIBOBJS = @LTLIBOBJS@
22420 MAINT = @MAINT@
22421 MAKEINFO = @MAKEINFO@
22422 @@ -182,6 +184,7 @@
22423 RANLIB = @RANLIB@
22424 REBUILD = @REBUILD@
22425 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22426 +SED = @SED@
22427 SET_MAKE = @SET_MAKE@
22428 SHELL = @SHELL@
22429 STRIP = @STRIP@
22430 diff -Naur gnome-panel-2.20.3.old/help/zh_TW/window-list/Makefile.in gnome-panel-2.20.3/help/zh_TW/window-list/Makefile.in
22431 --- gnome-panel-2.20.3.old/help/zh_TW/window-list/Makefile.in 2008-01-07 23:36:05.000000000 +0100
22432 +++ gnome-panel-2.20.3/help/zh_TW/window-list/Makefile.in 2008-01-12 07:11:59.000000000 +0100
22433 @@ -203,6 +203,8 @@
22434 LIBTOOL = @LIBTOOL@
22435 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22436 LN_S = @LN_S@
22437 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22438 +LOGOUT_LIBS = @LOGOUT_LIBS@
22439 LTLIBOBJS = @LTLIBOBJS@
22440 MAINT = @MAINT@
22441 MAKEINFO = @MAKEINFO@
22442 @@ -233,6 +235,7 @@
22443 RANLIB = @RANLIB@
22444 REBUILD = @REBUILD@
22445 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22446 +SED = @SED@
22447 SET_MAKE = @SET_MAKE@
22448 SHELL = @SHELL@
22449 STRIP = @STRIP@
22450 diff -Naur gnome-panel-2.20.3.old/help/zh_TW/workspace-switcher/Makefile.in gnome-panel-2.20.3/help/zh_TW/workspace-switcher/Makefile.in
22451 --- gnome-panel-2.20.3.old/help/zh_TW/workspace-switcher/Makefile.in 2008-01-07 23:36:06.000000000 +0100
22452 +++ gnome-panel-2.20.3/help/zh_TW/workspace-switcher/Makefile.in 2008-01-12 07:11:59.000000000 +0100
22453 @@ -203,6 +203,8 @@
22454 LIBTOOL = @LIBTOOL@
22455 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22456 LN_S = @LN_S@
22457 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22458 +LOGOUT_LIBS = @LOGOUT_LIBS@
22459 LTLIBOBJS = @LTLIBOBJS@
22460 MAINT = @MAINT@
22461 MAKEINFO = @MAKEINFO@
22462 @@ -233,6 +235,7 @@
22463 RANLIB = @RANLIB@
22464 REBUILD = @REBUILD@
22465 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22466 +SED = @SED@
22467 SET_MAKE = @SET_MAKE@
22468 SHELL = @SHELL@
22469 STRIP = @STRIP@
22470 diff -Naur gnome-panel-2.20.3.old/icons/16x16/Makefile.in gnome-panel-2.20.3/icons/16x16/Makefile.in
22471 --- gnome-panel-2.20.3.old/icons/16x16/Makefile.in 2008-01-07 23:36:07.000000000 +0100
22472 +++ gnome-panel-2.20.3/icons/16x16/Makefile.in 2008-01-12 07:11:59.000000000 +0100
22473 @@ -150,6 +150,8 @@
22474 LIBTOOL = @LIBTOOL@
22475 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22476 LN_S = @LN_S@
22477 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22478 +LOGOUT_LIBS = @LOGOUT_LIBS@
22479 LTLIBOBJS = @LTLIBOBJS@
22480 MAINT = @MAINT@
22481 MAKEINFO = @MAKEINFO@
22482 @@ -180,6 +182,7 @@
22483 RANLIB = @RANLIB@
22484 REBUILD = @REBUILD@
22485 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22486 +SED = @SED@
22487 SET_MAKE = @SET_MAKE@
22488 SHELL = @SHELL@
22489 STRIP = @STRIP@
22490 diff -Naur gnome-panel-2.20.3.old/icons/22x22/Makefile.in gnome-panel-2.20.3/icons/22x22/Makefile.in
22491 --- gnome-panel-2.20.3.old/icons/22x22/Makefile.in 2008-01-07 23:36:07.000000000 +0100
22492 +++ gnome-panel-2.20.3/icons/22x22/Makefile.in 2008-01-12 07:11:59.000000000 +0100
22493 @@ -150,6 +150,8 @@
22494 LIBTOOL = @LIBTOOL@
22495 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22496 LN_S = @LN_S@
22497 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22498 +LOGOUT_LIBS = @LOGOUT_LIBS@
22499 LTLIBOBJS = @LTLIBOBJS@
22500 MAINT = @MAINT@
22501 MAKEINFO = @MAKEINFO@
22502 @@ -180,6 +182,7 @@
22503 RANLIB = @RANLIB@
22504 REBUILD = @REBUILD@
22505 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22506 +SED = @SED@
22507 SET_MAKE = @SET_MAKE@
22508 SHELL = @SHELL@
22509 STRIP = @STRIP@
22510 diff -Naur gnome-panel-2.20.3.old/icons/24x24/Makefile.in gnome-panel-2.20.3/icons/24x24/Makefile.in
22511 --- gnome-panel-2.20.3.old/icons/24x24/Makefile.in 2008-01-07 23:36:09.000000000 +0100
22512 +++ gnome-panel-2.20.3/icons/24x24/Makefile.in 2008-01-12 07:11:59.000000000 +0100
22513 @@ -150,6 +150,8 @@
22514 LIBTOOL = @LIBTOOL@
22515 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22516 LN_S = @LN_S@
22517 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22518 +LOGOUT_LIBS = @LOGOUT_LIBS@
22519 LTLIBOBJS = @LTLIBOBJS@
22520 MAINT = @MAINT@
22521 MAKEINFO = @MAKEINFO@
22522 @@ -180,6 +182,7 @@
22523 RANLIB = @RANLIB@
22524 REBUILD = @REBUILD@
22525 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22526 +SED = @SED@
22527 SET_MAKE = @SET_MAKE@
22528 SHELL = @SHELL@
22529 STRIP = @STRIP@
22530 diff -Naur gnome-panel-2.20.3.old/icons/32x32/Makefile.in gnome-panel-2.20.3/icons/32x32/Makefile.in
22531 --- gnome-panel-2.20.3.old/icons/32x32/Makefile.in 2008-01-07 23:36:10.000000000 +0100
22532 +++ gnome-panel-2.20.3/icons/32x32/Makefile.in 2008-01-12 07:11:59.000000000 +0100
22533 @@ -150,6 +150,8 @@
22534 LIBTOOL = @LIBTOOL@
22535 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22536 LN_S = @LN_S@
22537 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22538 +LOGOUT_LIBS = @LOGOUT_LIBS@
22539 LTLIBOBJS = @LTLIBOBJS@
22540 MAINT = @MAINT@
22541 MAKEINFO = @MAKEINFO@
22542 @@ -180,6 +182,7 @@
22543 RANLIB = @RANLIB@
22544 REBUILD = @REBUILD@
22545 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22546 +SED = @SED@
22547 SET_MAKE = @SET_MAKE@
22548 SHELL = @SHELL@
22549 STRIP = @STRIP@
22550 diff -Naur gnome-panel-2.20.3.old/icons/Makefile.in gnome-panel-2.20.3/icons/Makefile.in
22551 --- gnome-panel-2.20.3.old/icons/Makefile.in 2008-01-07 23:36:12.000000000 +0100
22552 +++ gnome-panel-2.20.3/icons/Makefile.in 2008-01-12 07:11:59.000000000 +0100
22553 @@ -162,6 +162,8 @@
22554 LIBTOOL = @LIBTOOL@
22555 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22556 LN_S = @LN_S@
22557 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22558 +LOGOUT_LIBS = @LOGOUT_LIBS@
22559 LTLIBOBJS = @LTLIBOBJS@
22560 MAINT = @MAINT@
22561 MAKEINFO = @MAKEINFO@
22562 @@ -192,6 +194,7 @@
22563 RANLIB = @RANLIB@
22564 REBUILD = @REBUILD@
22565 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22566 +SED = @SED@
22567 SET_MAKE = @SET_MAKE@
22568 SHELL = @SHELL@
22569 STRIP = @STRIP@
22570 diff -Naur gnome-panel-2.20.3.old/icons/scalable/Makefile.in gnome-panel-2.20.3/icons/scalable/Makefile.in
22571 --- gnome-panel-2.20.3.old/icons/scalable/Makefile.in 2008-01-07 23:36:13.000000000 +0100
22572 +++ gnome-panel-2.20.3/icons/scalable/Makefile.in 2008-01-12 07:12:00.000000000 +0100
22573 @@ -150,6 +150,8 @@
22574 LIBTOOL = @LIBTOOL@
22575 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22576 LN_S = @LN_S@
22577 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22578 +LOGOUT_LIBS = @LOGOUT_LIBS@
22579 LTLIBOBJS = @LTLIBOBJS@
22580 MAINT = @MAINT@
22581 MAKEINFO = @MAKEINFO@
22582 @@ -180,6 +182,7 @@
22583 RANLIB = @RANLIB@
22584 REBUILD = @REBUILD@
22585 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22586 +SED = @SED@
22587 SET_MAKE = @SET_MAKE@
22588 SHELL = @SHELL@
22589 STRIP = @STRIP@
22590 diff -Naur gnome-panel-2.20.3.old/idl/Makefile.in gnome-panel-2.20.3/idl/Makefile.in
22591 --- gnome-panel-2.20.3.old/idl/Makefile.in 2008-01-07 23:36:14.000000000 +0100
22592 +++ gnome-panel-2.20.3/idl/Makefile.in 2008-01-12 07:12:00.000000000 +0100
22593 @@ -150,6 +150,8 @@
22594 LIBTOOL = @LIBTOOL@
22595 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22596 LN_S = @LN_S@
22597 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22598 +LOGOUT_LIBS = @LOGOUT_LIBS@
22599 LTLIBOBJS = @LTLIBOBJS@
22600 MAINT = @MAINT@
22601 MAKEINFO = @MAKEINFO@
22602 @@ -180,6 +182,7 @@
22603 RANLIB = @RANLIB@
22604 REBUILD = @REBUILD@
22605 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22606 +SED = @SED@
22607 SET_MAKE = @SET_MAKE@
22608 SHELL = @SHELL@
22609 STRIP = @STRIP@
22610 diff -Naur gnome-panel-2.20.3.old/intltool-extract.in gnome-panel-2.20.3/intltool-extract.in
22611 --- gnome-panel-2.20.3.old/intltool-extract.in 2008-01-07 23:34:36.000000000 +0100
22612 +++ gnome-panel-2.20.3/intltool-extract.in 2008-01-12 07:11:42.000000000 +0100
22613 @@ -32,7 +32,7 @@
22614 ## Release information
22615 my $PROGRAM = "intltool-extract";
22616 my $PACKAGE = "intltool";
22617 -my $VERSION = "0.36.1";
22618 +my $VERSION = "0.37.0";
22619
22620 ## Loaded modules
22621 use strict;
22622 @@ -161,7 +161,8 @@
22623 --type=TYPE Specify the file type of FILENAME. Currently supports:
22624 "gettext/glade", "gettext/ini", "gettext/keys"
22625 "gettext/rfc822deb", "gettext/schemas",
22626 - "gettext/scheme", "gettext/xml", "gettext/quoted"
22627 + "gettext/scheme", "gettext/xml", "gettext/quoted",
22628 + "gettext/quotedxml"
22629 -l, --local Writes output into current working directory
22630 (conflicts with --update)
22631 --update Writes output into the same directory the source file
22632 @@ -218,6 +219,7 @@
22633 &type_schemas if $gettext_type eq "schemas";
22634 &type_rfc822deb if $gettext_type eq "rfc822deb";
22635 &type_quoted if $gettext_type eq "quoted";
22636 + &type_quotedxml if $gettext_type eq "quotedxml";
22637 }
22638
22639 sub entity_decode_minimal
22640 @@ -731,6 +733,18 @@
22641 }
22642 }
22643
22644 +sub type_quotedxml {
22645 + while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
22646 + my $message = $1;
22647 + my $before = $`;
22648 + $message =~ s/\\\"/\"/g;
22649 + $message = entity_decode($message);
22650 + $before =~ s/[^\n]//g;
22651 + $messages{$message} = [];
22652 + $loc{$message} = length ($before) + 2;
22653 + }
22654 +}
22655 +
22656 sub type_glade {
22657 ### For translatable Glade XML files ###
22658
22659 diff -Naur gnome-panel-2.20.3.old/intltool-merge.in gnome-panel-2.20.3/intltool-merge.in
22660 --- gnome-panel-2.20.3.old/intltool-merge.in 2008-01-07 23:34:36.000000000 +0100
22661 +++ gnome-panel-2.20.3/intltool-merge.in 2008-01-12 07:11:42.000000000 +0100
22662 @@ -35,7 +35,7 @@
22663 ## Release information
22664 my $PROGRAM = "intltool-merge";
22665 my $PACKAGE = "intltool";
22666 -my $VERSION = "0.36.1";
22667 +my $VERSION = "0.37.0";
22668
22669 ## Loaded modules
22670 use strict;
22671 @@ -61,6 +61,7 @@
22672 my $SCHEMAS_STYLE_ARG = 0;
22673 my $RFC822DEB_STYLE_ARG = 0;
22674 my $QUOTED_STYLE_ARG = 0;
22675 +my $QUOTEDXML_STYLE_ARG = 0;
22676 my $QUIET_ARG = 0;
22677 my $PASS_THROUGH_ARG = 0;
22678 my $UTF8_ARG = 0;
22679 @@ -81,6 +82,7 @@
22680 "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
22681 "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
22682 "quoted-style" => \$QUOTED_STYLE_ARG,
22683 + "quotedxml-style" => \$QUOTEDXML_STYLE_ARG,
22684 "pass-through|p" => \$PASS_THROUGH_ARG,
22685 "utf8|u" => \$UTF8_ARG,
22686 "multiple-output|m" => \$MULTIPLE_OUTPUT,
22687 @@ -148,7 +150,7 @@
22688 &utf8_sanity_check;
22689 &preparation;
22690 &print_message;
22691 - &keys_merge_translations;
22692 + &keys_merge_translations;
22693 &finalize;
22694 }
22695 elsif ($DESKTOP_STYLE_ARG && @ARGV > 2)
22696 @@ -174,12 +176,12 @@
22697 &rfc822deb_merge_translations;
22698 &finalize;
22699 }
22700 -elsif ($QUOTED_STYLE_ARG && @ARGV > 2)
22701 +elsif (($QUOTED_STYLE_ARG || $QUOTEDXML_STYLE_ARG) && @ARGV > 2)
22702 {
22703 &utf8_sanity_check;
22704 &preparation;
22705 &print_message;
22706 - &quoted_merge_translations;
22707 + &quoted_merge_translations($QUOTEDXML_STYLE_ARG);
22708 &finalize;
22709 }
22710 else
22711 @@ -219,6 +221,7 @@
22712 -s, --schemas-style includes translations in the schemas style
22713 -r, --rfc822deb-style includes translations in the RFC822 style
22714 --quoted-style includes translations in the quoted string style
22715 + --quotedxml-style includes translations in the quoted xml string style
22716 -x, --xml-style includes translations in the standard xml style
22717
22718 Other options:
22719 @@ -575,6 +578,7 @@
22720 return "&amp;" if $_ == 38;
22721 return "&apos;" if $_ == 39;
22722 return "&lt;" if $_ == 60;
22723 + return "&gt;" if $_ == 62;
22724 return chr $_;
22725 }
22726
22727 @@ -1075,43 +1079,74 @@
22728 close OUTPUT;
22729 print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
22730 }
22731 - }
22732 - open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
22733 - binmode (OUTPUT) if $^O eq 'MSWin32';
22734 - my $tree = readXml($FILE);
22735 - print_header($FILE, \*OUTPUT);
22736 - parseTree(\*OUTPUT, $tree);
22737 - close OUTPUT;
22738 - print "CREATED $OUTFILE\n" unless $QUIET_ARG;
22739 + if ( ! -d "C" ) {
22740 + mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n";
22741 + }
22742 + open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n";
22743 + binmode (OUTPUT) if $^O eq 'MSWin32';
22744 + my $tree = readXml($FILE);
22745 + print_header($FILE, \*OUTPUT);
22746 + parseTree(\*OUTPUT, $tree);
22747 + close OUTPUT;
22748 + print "CREATED C/$OUTFILE\n" unless $QUIET_ARG;
22749 + } else {
22750 + open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
22751 + binmode (OUTPUT) if $^O eq 'MSWin32';
22752 + my $tree = readXml($FILE);
22753 + print_header($FILE, \*OUTPUT);
22754 + parseTree(\*OUTPUT, $tree);
22755 + close OUTPUT;
22756 + print "CREATED $OUTFILE\n" unless $QUIET_ARG;
22757 + }
22758 }
22759
22760 -sub keys_merge_translations
22761 +sub keys_merge_translation
22762 {
22763 - open INPUT, "<${FILE}" or die;
22764 - open OUTPUT, ">${OUTFILE}" or die;
22765 + my ($lang) = @_;
22766 +
22767 + if ( ! -d $lang && $MULTIPLE_OUTPUT)
22768 + {
22769 + mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
22770 + }
22771 +
22772 + open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n";
22773 + open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
22774 binmode (OUTPUT) if $^O eq 'MSWin32';
22775
22776 - while (<INPUT>)
22777 + while (<INPUT>)
22778 {
22779 - if (s/^(\s*)_(\w+=(.*))/$1$2/)
22780 + if (s/^(\s*)_(\w+=(.*))/$1$2/)
22781 {
22782 - my $string = $3;
22783 + my $string = $3;
22784
22785 - print OUTPUT;
22786 + if (!$MULTIPLE_OUTPUT)
22787 + {
22788 + print OUTPUT;
22789
22790 - my $non_translated_line = $_;
22791 + my $non_translated_line = $_;
22792
22793 - for my $lang (sort keys %po_files_by_lang)
22794 + for my $lang (sort keys %po_files_by_lang)
22795 + {
22796 + my $translation = $translations{$lang, $string};
22797 + next if !$translation;
22798 +
22799 + $_ = $non_translated_line;
22800 + s/(\w+)=.*/[$lang]$1=$translation/;
22801 + print OUTPUT;
22802 + }
22803 + }
22804 + else
22805 {
22806 - my $translation = $translations{$lang, $string};
22807 - next if !$translation;
22808 + my $non_translated_line = $_;
22809 + my $translation = $translations{$lang, $string};
22810 + $translation = $string if !$translation;
22811
22812 $_ = $non_translated_line;
22813 - s/(\w+)=.*/[$lang]$1=$translation/;
22814 + s/(\w+)=.*/$1=$translation/;
22815 print OUTPUT;
22816 }
22817 - }
22818 - else
22819 + }
22820 + else
22821 {
22822 print OUTPUT;
22823 }
22824 @@ -1119,6 +1154,24 @@
22825
22826 close OUTPUT;
22827 close INPUT;
22828 +
22829 + print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
22830 +}
22831 +
22832 +sub keys_merge_translations
22833 +{
22834 + if ($MULTIPLE_OUTPUT)
22835 + {
22836 + for my $lang (sort keys %po_files_by_lang)
22837 + {
22838 + keys_merge_translation ($lang);
22839 + }
22840 + keys_merge_translation ("C");
22841 + }
22842 + else
22843 + {
22844 + keys_merge_translation (".");
22845 + }
22846 }
22847
22848 sub desktop_merge_translations
22849 @@ -1414,19 +1467,22 @@
22850
22851 sub quoted_translation
22852 {
22853 - my ($lang, $string) = @_;
22854 + my ($xml_mode, $lang, $string) = @_;
22855
22856 + $string = entity_decode($string) if $xml_mode;
22857 $string =~ s/\\\"/\"/g;
22858
22859 my $translation = $translations{$lang, $string};
22860 $translation = $string if !$translation;
22861 -
22862 + $translation = entity_encode($translation) if $xml_mode;
22863 $translation =~ s/\"/\\\"/g;
22864 return $translation
22865 }
22866
22867 sub quoted_merge_translations
22868 {
22869 + my ($xml_mode) = @_;
22870 +
22871 if (!$MULTIPLE_OUTPUT) {
22872 print "Quoted only supports Multiple Output.\n";
22873 exit(1);
22874 @@ -1441,7 +1497,7 @@
22875 binmode (OUTPUT) if $^O eq 'MSWin32';
22876 while (<INPUT>)
22877 {
22878 - s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . &quoted_translation($lang, $1) . "\""/ge;
22879 + s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . &quoted_translation($xml_mode, $lang, $1) . "\""/ge;
22880 print OUTPUT;
22881 }
22882 close OUTPUT;
22883 diff -Naur gnome-panel-2.20.3.old/intltool-update.in gnome-panel-2.20.3/intltool-update.in
22884 --- gnome-panel-2.20.3.old/intltool-update.in 2008-01-07 23:34:36.000000000 +0100
22885 +++ gnome-panel-2.20.3/intltool-update.in 2008-01-12 07:11:42.000000000 +0100
22886 @@ -30,7 +30,7 @@
22887
22888 ## Release information
22889 my $PROGRAM = "intltool-update";
22890 -my $VERSION = "0.36.1";
22891 +my $VERSION = "0.37.0";
22892 my $PACKAGE = "intltool";
22893
22894 ## Loaded modules
22895 @@ -434,8 +434,8 @@
22896 last;
22897 }
22898
22899 - ## N_ Q_ and _ are the three macros defined in gi8n.h
22900 - if (/[NQ]?_ *\(QUOTEDTEXT/)
22901 + ## C_ N_ Q_ and _ are the macros defined in gi8n.h
22902 + if (/[CNQ]?_ *\(QUOTEDTEXT/)
22903 {
22904 if (defined isNotValidMissing (unpack("x3 A*", $file))) {
22905 ## Remove the first 3 chars and add newline
22906 @@ -777,7 +777,7 @@
22907 my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
22908 push @xgettext_argument, $XGETTEXT_KEYWORDS;
22909 my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
22910 - push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS;
22911 + push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS;
22912 push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
22913 push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
22914 my $xgettext_command = join ' ', @xgettext_argument;
22915 diff -Naur gnome-panel-2.20.3.old/libpanel-applet/Makefile.in gnome-panel-2.20.3/libpanel-applet/Makefile.in
22916 --- gnome-panel-2.20.3.old/libpanel-applet/Makefile.in 2008-01-07 23:36:14.000000000 +0100
22917 +++ gnome-panel-2.20.3/libpanel-applet/Makefile.in 2008-01-12 07:12:00.000000000 +0100
22918 @@ -207,6 +207,8 @@
22919 LIBTOOL = @LIBTOOL@
22920 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
22921 LN_S = @LN_S@
22922 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
22923 +LOGOUT_LIBS = @LOGOUT_LIBS@
22924 LTLIBOBJS = @LTLIBOBJS@
22925 MAINT = @MAINT@
22926 MAKEINFO = @MAKEINFO@
22927 @@ -237,6 +239,7 @@
22928 RANLIB = @RANLIB@
22929 REBUILD = @REBUILD@
22930 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
22931 +SED = @SED@
22932 SET_MAKE = @SET_MAKE@
22933 SHELL = @SHELL@
22934 STRIP = @STRIP@
22935 diff -Naur gnome-panel-2.20.3.old/ltmain.sh gnome-panel-2.20.3/ltmain.sh
22936 --- gnome-panel-2.20.3.old/ltmain.sh 2007-02-17 10:05:30.000000000 +0100
22937 +++ gnome-panel-2.20.3/ltmain.sh 2007-11-27 22:23:09.000000000 +0100
22938 @@ -1,8 +1,8 @@
22939 # ltmain.sh - Provide generalized library-building support services.
22940 # NOTE: Changing this file will not affect anything until you rerun configure.
22941 #
22942 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
22943 -# Free Software Foundation, Inc.
22944 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
22945 +# 2007 Free Software Foundation, Inc.
22946 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
22947 #
22948 # This program is free software; you can redistribute it and/or modify
22949 @@ -43,14 +43,22 @@
22950
22951 PROGRAM=ltmain.sh
22952 PACKAGE=libtool
22953 -VERSION=1.5.22
22954 -TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
22955 +VERSION="1.5.24 Debian 1.5.24-2"
22956 +TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
22957
22958 -# See if we are running on zsh, and set the options which allow our
22959 -# commands through without removal of \ escapes.
22960 -if test -n "${ZSH_VERSION+set}" ; then
22961 +# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
22962 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
22963 + emulate sh
22964 + NULLCMD=:
22965 + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
22966 + # is contrary to our usage. Disable this feature.
22967 + alias -g '${1+"$@"}'='"$@"'
22968 setopt NO_GLOB_SUBST
22969 +else
22970 + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
22971 fi
22972 +BIN_SH=xpg4; export BIN_SH # for Tru64
22973 +DUALCASE=1; export DUALCASE # for MKS sh
22974
22975 # Check that we have a working $echo.
22976 if test "X$1" = X--no-reexec; then
22977 @@ -105,12 +113,14 @@
22978 # These must not be set unconditionally because not all systems understand
22979 # e.g. LANG=C (notably SCO).
22980 # We save the old values to restore during execute mode.
22981 -if test "${LC_ALL+set}" = set; then
22982 - save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
22983 -fi
22984 -if test "${LANG+set}" = set; then
22985 - save_LANG="$LANG"; LANG=C; export LANG
22986 -fi
22987 +for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
22988 +do
22989 + eval "if test \"\${$lt_var+set}\" = set; then
22990 + save_$lt_var=\$$lt_var
22991 + $lt_var=C
22992 + export $lt_var
22993 + fi"
22994 +done
22995
22996 # Make sure IFS has a sensible default
22997 lt_nl='
22998 @@ -136,6 +146,8 @@
22999 preserve_args=
23000 lo2o="s/\\.lo\$/.${objext}/"
23001 o2lo="s/\\.${objext}\$/.lo/"
23002 +extracted_archives=
23003 +extracted_serial=0
23004
23005 #####################################
23006 # Shell function definitions:
23007 @@ -196,7 +208,13 @@
23008 if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
23009 $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
23010 win32_nmres=`eval $NM -f posix -A $1 | \
23011 - $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
23012 + $SED -n -e '1,100{
23013 + / I /{
23014 + s,.*,import,
23015 + p
23016 + q
23017 + }
23018 + }'`
23019 case $win32_nmres in
23020 import*) win32_libid_type="x86 archive import";;
23021 *) win32_libid_type="x86 archive static";;
23022 @@ -327,7 +345,17 @@
23023 *) my_xabs=`pwd`"/$my_xlib" ;;
23024 esac
23025 my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
23026 - my_xdir="$my_gentop/$my_xlib"
23027 + my_xlib_u=$my_xlib
23028 + while :; do
23029 + case " $extracted_archives " in
23030 + *" $my_xlib_u "*)
23031 + extracted_serial=`expr $extracted_serial + 1`
23032 + my_xlib_u=lt$extracted_serial-$my_xlib ;;
23033 + *) break ;;
23034 + esac
23035 + done
23036 + extracted_archives="$extracted_archives $my_xlib_u"
23037 + my_xdir="$my_gentop/$my_xlib_u"
23038
23039 $show "${rm}r $my_xdir"
23040 $run ${rm}r "$my_xdir"
23041 @@ -454,11 +482,12 @@
23042 ;;
23043
23044 --version)
23045 - $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
23046 - $echo
23047 - $echo "Copyright (C) 2005 Free Software Foundation, Inc."
23048 - $echo "This is free software; see the source for copying conditions. There is NO"
23049 - $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
23050 + echo "\
23051 +$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
23052 +
23053 +Copyright (C) 2007 Free Software Foundation, Inc.
23054 +This is free software; see the source for copying conditions. There is NO
23055 +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
23056 exit $?
23057 ;;
23058
23059 @@ -755,9 +784,10 @@
23060 *.class) xform=class ;;
23061 *.cpp) xform=cpp ;;
23062 *.cxx) xform=cxx ;;
23063 - *.f90) xform=f90 ;;
23064 + *.[fF][09]?) xform=[fF][09]. ;;
23065 *.for) xform=for ;;
23066 *.java) xform=java ;;
23067 + *.obj) xform=obj ;;
23068 esac
23069
23070 libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
23071 @@ -1138,8 +1168,9 @@
23072 for arg
23073 do
23074 case $arg in
23075 - -all-static | -static)
23076 - if test "X$arg" = "X-all-static"; then
23077 + -all-static | -static | -static-libtool-libs)
23078 + case $arg in
23079 + -all-static)
23080 if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
23081 $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
23082 fi
23083 @@ -1147,12 +1178,20 @@
23084 dlopen_self=$dlopen_self_static
23085 fi
23086 prefer_static_libs=yes
23087 - else
23088 + ;;
23089 + -static)
23090 if test -z "$pic_flag" && test -n "$link_static_flag"; then
23091 dlopen_self=$dlopen_self_static
23092 fi
23093 prefer_static_libs=built
23094 - fi
23095 + ;;
23096 + -static-libtool-libs)
23097 + if test -z "$pic_flag" && test -n "$link_static_flag"; then
23098 + dlopen_self=$dlopen_self_static
23099 + fi
23100 + prefer_static_libs=yes
23101 + ;;
23102 + esac
23103 build_libtool_libs=no
23104 build_old_libs=yes
23105 break
23106 @@ -1600,7 +1639,7 @@
23107 continue
23108 ;;
23109
23110 - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
23111 + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
23112 compiler_flags="$compiler_flags $arg"
23113 compile_command="$compile_command $arg"
23114 finalize_command="$finalize_command $arg"
23115 @@ -1620,10 +1659,11 @@
23116 # -m* pass through architecture-specific compiler args for GCC
23117 # -m*, -t[45]*, -txscale* pass through architecture-specific
23118 # compiler args for GCC
23119 - # -pg pass through profiling flag for GCC
23120 + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
23121 + # -F/path gives path to uninstalled frameworks, gcc on darwin
23122 # @file GCC response files
23123 - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
23124 - -t[45]*|-txscale*|@*)
23125 + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
23126 + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
23127
23128 # Unknown arguments in both finalize_command and compile_command need
23129 # to be aesthetically quoted because they are evaled later.
23130 @@ -1651,9 +1691,9 @@
23131
23132 -no-install)
23133 case $host in
23134 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
23135 + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
23136 # The PATH hackery in wrapper scripts is required on Windows
23137 - # in order for the loader to find any dlls it needs.
23138 + # and Darwin in order for the loader to find any dlls it needs.
23139 $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
23140 $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
23141 fast_install=no
23142 @@ -1712,7 +1752,7 @@
23143 continue
23144 ;;
23145
23146 - -static)
23147 + -static | -static-libtool-libs)
23148 # The effects of -static are defined in a previous loop.
23149 # We used to do the same as -all-static on platforms that
23150 # didn't have a PIC flag, but the assumption that the effects
23151 @@ -2082,7 +2122,10 @@
23152 case $pass in
23153 dlopen) libs="$dlfiles" ;;
23154 dlpreopen) libs="$dlprefiles" ;;
23155 - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
23156 + link)
23157 + libs="$deplibs %DEPLIBS%"
23158 + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
23159 + ;;
23160 esac
23161 fi
23162 if test "$pass" = dlopen; then
23163 @@ -2094,7 +2137,7 @@
23164 lib=
23165 found=no
23166 case $deplib in
23167 - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
23168 + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
23169 if test "$linkmode,$pass" = "prog,link"; then
23170 compile_deplibs="$deplib $compile_deplibs"
23171 finalize_deplibs="$deplib $finalize_deplibs"
23172 @@ -2490,7 +2533,9 @@
23173
23174 if test "$linkmode,$pass" = "prog,link"; then
23175 if test -n "$library_names" &&
23176 - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
23177 + { { test "$prefer_static_libs" = no ||
23178 + test "$prefer_static_libs,$installed" = "built,yes"; } ||
23179 + test -z "$old_library"; }; then
23180 # We need to hardcode the library path
23181 if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
23182 # Make sure the rpath contains only unique directories.
23183 @@ -3186,7 +3231,7 @@
23184 # which has an extra 1 added just for fun
23185 #
23186 case $version_type in
23187 - darwin|linux|osf|windows)
23188 + darwin|linux|osf|windows|none)
23189 current=`expr $number_major + $number_minor`
23190 age="$number_minor"
23191 revision="$number_revision"
23192 @@ -3197,9 +3242,15 @@
23193 age="0"
23194 ;;
23195 irix|nonstopux)
23196 - current=`expr $number_major + $number_minor - 1`
23197 + current=`expr $number_major + $number_minor`
23198 age="$number_minor"
23199 revision="$number_minor"
23200 + lt_irix_increment=no
23201 + ;;
23202 + *)
23203 + $echo "$modename: unknown library version type \`$version_type'" 1>&2
23204 + $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
23205 + exit $EXIT_FAILURE
23206 ;;
23207 esac
23208 ;;
23209 @@ -3258,7 +3309,8 @@
23210 versuffix="$major.$age.$revision"
23211 # Darwin ld doesn't like 0 for these options...
23212 minor_current=`expr $current + 1`
23213 - verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
23214 + xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
23215 + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
23216 ;;
23217
23218 freebsd-aout)
23219 @@ -3272,8 +3324,11 @@
23220 ;;
23221
23222 irix | nonstopux)
23223 - major=`expr $current - $age + 1`
23224 -
23225 + if test "X$lt_irix_increment" = "Xno"; then
23226 + major=`expr $current - $age`
23227 + else
23228 + major=`expr $current - $age + 1`
23229 + fi
23230 case $version_type in
23231 nonstopux) verstring_prefix=nonstopux ;;
23232 *) verstring_prefix=sgi ;;
23233 @@ -3410,11 +3465,11 @@
23234 fi
23235
23236 # Eliminate all temporary directories.
23237 - for path in $notinst_path; do
23238 - lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
23239 - deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
23240 - dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
23241 - done
23242 + #for path in $notinst_path; do
23243 + # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
23244 + # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
23245 + # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
23246 + #done
23247
23248 if test -n "$xrpath"; then
23249 # If the user specified any rpath flags, then add them.
23250 @@ -3515,13 +3570,12 @@
23251 int main() { return 0; }
23252 EOF
23253 $rm conftest
23254 - $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
23255 - if test "$?" -eq 0 ; then
23256 + if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
23257 ldd_output=`ldd conftest`
23258 for i in $deplibs; do
23259 name=`expr $i : '-l\(.*\)'`
23260 # If $name is empty we are operating on a -L argument.
23261 - if test "$name" != "" && test "$name" -ne "0"; then
23262 + if test "$name" != "" && test "$name" != "0"; then
23263 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
23264 case " $predeps $postdeps " in
23265 *" $i "*)
23266 @@ -3560,9 +3614,7 @@
23267 # If $name is empty we are operating on a -L argument.
23268 if test "$name" != "" && test "$name" != "0"; then
23269 $rm conftest
23270 - $LTCC $LTCFLAGS -o conftest conftest.c $i
23271 - # Did it work?
23272 - if test "$?" -eq 0 ; then
23273 + if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
23274 ldd_output=`ldd conftest`
23275 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
23276 case " $predeps $postdeps " in
23277 @@ -3594,7 +3646,7 @@
23278 droppeddeps=yes
23279 $echo
23280 $echo "*** Warning! Library $i is needed by this library but I was not able to"
23281 - $echo "*** make it link in! You will probably need to install it or some"
23282 + $echo "*** make it link in! You will probably need to install it or some"
23283 $echo "*** library that it depends on before this library will be fully"
23284 $echo "*** functional. Installing it before continuing would be even better."
23285 fi
23286 @@ -3880,7 +3932,10 @@
23287 test -n "$hardcode_libdirs"; then
23288 libdir="$hardcode_libdirs"
23289 if test -n "$hardcode_libdir_flag_spec_ld"; then
23290 - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
23291 + case $archive_cmds in
23292 + *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
23293 + *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
23294 + esac
23295 else
23296 eval dep_rpath=\"$hardcode_libdir_flag_spec\"
23297 fi
23298 @@ -4239,12 +4294,14 @@
23299 reload_conv_objs=
23300 gentop=
23301 # reload_cmds runs $LD directly, so let us get rid of
23302 - # -Wl from whole_archive_flag_spec
23303 + # -Wl from whole_archive_flag_spec and hope we can get by with
23304 + # turning comma into space..
23305 wl=
23306
23307 if test -n "$convenience"; then
23308 if test -n "$whole_archive_flag_spec"; then
23309 - eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
23310 + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
23311 + reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
23312 else
23313 gentop="$output_objdir/${obj}x"
23314 generated="$generated $gentop"
23315 @@ -4692,16 +4749,16 @@
23316 case $host in
23317 *cygwin* | *mingw* )
23318 if test -f "$output_objdir/${outputname}.def" ; then
23319 - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
23320 - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
23321 + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
23322 + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
23323 else
23324 - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
23325 - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
23326 + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
23327 + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
23328 fi
23329 ;;
23330 * )
23331 - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
23332 - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
23333 + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
23334 + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
23335 ;;
23336 esac
23337 ;;
23338 @@ -4716,13 +4773,13 @@
23339 # really was required.
23340
23341 # Nullify the symbol file.
23342 - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
23343 - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
23344 + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
23345 + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
23346 fi
23347
23348 if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
23349 # Replace the output file specification.
23350 - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
23351 + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
23352 link_command="$compile_command$compile_rpath"
23353
23354 # We have no uninstalled library dependencies, so finalize right now.
23355 @@ -4809,7 +4866,7 @@
23356 if test "$fast_install" != no; then
23357 link_command="$finalize_var$compile_command$finalize_rpath"
23358 if test "$fast_install" = yes; then
23359 - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
23360 + relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
23361 else
23362 # fast_install is set to needless
23363 relink_command=
23364 @@ -4846,7 +4903,7 @@
23365 fi
23366 done
23367 relink_command="(cd `pwd`; $relink_command)"
23368 - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
23369 + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
23370 fi
23371
23372 # Quote $echo for shipping.
23373 @@ -5253,6 +5310,20 @@
23374 Xsed='${SED} -e 1s/^X//'
23375 sed_quote_subst='$sed_quote_subst'
23376
23377 +# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
23378 +if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
23379 + emulate sh
23380 + NULLCMD=:
23381 + # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
23382 + # is contrary to our usage. Disable this feature.
23383 + alias -g '\${1+\"\$@\"}'='\"\$@\"'
23384 + setopt NO_GLOB_SUBST
23385 +else
23386 + case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
23387 +fi
23388 +BIN_SH=xpg4; export BIN_SH # for Tru64
23389 +DUALCASE=1; export DUALCASE # for MKS sh
23390 +
23391 # The HP-UX ksh and POSIX shell print the target directory to stdout
23392 # if CDPATH is set.
23393 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
23394 @@ -5395,7 +5466,7 @@
23395 ;;
23396 esac
23397 $echo >> $output "\
23398 - \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
23399 + \$echo \"\$0: cannot exec \$program \$*\"
23400 exit $EXIT_FAILURE
23401 fi
23402 else
23403 @@ -5581,7 +5652,7 @@
23404 done
23405 # Quote the link command for shipping.
23406 relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
23407 - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
23408 + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
23409 if test "$hardcode_automatic" = yes ; then
23410 relink_command=
23411 fi
23412 @@ -5926,9 +5997,9 @@
23413
23414 if test -n "$inst_prefix_dir"; then
23415 # Stick the inst_prefix_dir data into the link command.
23416 - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
23417 + relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
23418 else
23419 - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
23420 + relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
23421 fi
23422
23423 $echo "$modename: warning: relinking \`$file'" 1>&2
23424 @@ -6137,7 +6208,7 @@
23425 file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
23426 outputname="$tmpdir/$file"
23427 # Replace the output file specification.
23428 - relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
23429 + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
23430
23431 $show "$relink_command"
23432 if $run eval "$relink_command"; then :
23433 @@ -6348,8 +6419,10 @@
23434 if test -f "$dir/$objdir/$dlname"; then
23435 dir="$dir/$objdir"
23436 else
23437 - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
23438 - exit $EXIT_FAILURE
23439 + if test ! -f "$dir/$dlname"; then
23440 + $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
23441 + exit $EXIT_FAILURE
23442 + fi
23443 fi
23444 ;;
23445
23446 @@ -6413,12 +6486,12 @@
23447 fi
23448
23449 # Restore saved environment variables
23450 - if test "${save_LC_ALL+set}" = set; then
23451 - LC_ALL="$save_LC_ALL"; export LC_ALL
23452 - fi
23453 - if test "${save_LANG+set}" = set; then
23454 - LANG="$save_LANG"; export LANG
23455 - fi
23456 + for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
23457 + do
23458 + eval "if test \"\${save_$lt_var+set}\" = set; then
23459 + $lt_var=\$save_$lt_var; export $lt_var
23460 + fi"
23461 + done
23462
23463 # Now prepare to actually exec the command.
23464 exec_cmd="\$cmd$args"
23465 @@ -6775,9 +6848,9 @@
23466 -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
23467 -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
23468 -export-symbols SYMFILE
23469 - try to export only the symbols listed in SYMFILE
23470 + try to export only the symbols listed in SYMFILE
23471 -export-symbols-regex REGEX
23472 - try to export only the symbols matching REGEX
23473 + try to export only the symbols matching REGEX
23474 -LLIBDIR search LIBDIR for required installed libraries
23475 -lNAME OUTPUT-FILE requires the installed library libNAME
23476 -module build a library that can dlopened
23477 @@ -6791,9 +6864,11 @@
23478 -release RELEASE specify package release information
23479 -rpath LIBDIR the created library will eventually be installed in LIBDIR
23480 -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
23481 - -static do not do any dynamic linking of libtool libraries
23482 + -static do not do any dynamic linking of uninstalled libtool libraries
23483 + -static-libtool-libs
23484 + do not do any dynamic linking of libtool libraries
23485 -version-info CURRENT[:REVISION[:AGE]]
23486 - specify library version info [each variable defaults to 0]
23487 + specify library version info [each variable defaults to 0]
23488
23489 All other options (arguments beginning with \`-') are ignored.
23490
23491 diff -Naur gnome-panel-2.20.3.old/Makefile.in gnome-panel-2.20.3/Makefile.in
23492 --- gnome-panel-2.20.3.old/Makefile.in 2008-01-07 23:36:16.000000000 +0100
23493 +++ gnome-panel-2.20.3/Makefile.in 2008-01-12 07:12:00.000000000 +0100
23494 @@ -167,6 +167,8 @@
23495 LIBTOOL = @LIBTOOL@
23496 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
23497 LN_S = @LN_S@
23498 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
23499 +LOGOUT_LIBS = @LOGOUT_LIBS@
23500 LTLIBOBJS = @LTLIBOBJS@
23501 MAINT = @MAINT@
23502 MAKEINFO = @MAKEINFO@
23503 @@ -197,6 +199,7 @@
23504 RANLIB = @RANLIB@
23505 REBUILD = @REBUILD@
23506 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
23507 +SED = @SED@
23508 SET_MAKE = @SET_MAKE@
23509 SHELL = @SHELL@
23510 STRIP = @STRIP@
23511 diff -Naur gnome-panel-2.20.3.old/man/Makefile.in gnome-panel-2.20.3/man/Makefile.in
23512 --- gnome-panel-2.20.3.old/man/Makefile.in 2008-01-07 23:36:15.000000000 +0100
23513 +++ gnome-panel-2.20.3/man/Makefile.in 2008-01-12 07:12:00.000000000 +0100
23514 @@ -144,6 +144,8 @@
23515 LIBTOOL = @LIBTOOL@
23516 LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
23517 LN_S = @LN_S@
23518 +LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
23519 +LOGOUT_LIBS = @LOGOUT_LIBS@
23520 LTLIBOBJS = @LTLIBOBJS@
23521 MAINT = @MAINT@
23522 MAKEINFO = @MAKEINFO@
23523 @@ -174,6 +176,7 @@
23524 RANLIB = @RANLIB@
23525 REBUILD = @REBUILD@
23526 SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
23527 +SED = @SED@
23528 SET_MAKE = @SET_MAKE@
23529 SHELL = @SHELL@
23530 STRIP = @STRIP@
+0
-32
gnome-panel/debian/patches/99_ltmain_as-needed.patch less more
0 Index: gnome-panel-2.20.2/ltmain.sh
1 ===================================================================
2 --- gnome-panel-2.20.2.orig/ltmain.sh 2008-01-05 00:13:26.196419875 +0100
3 +++ gnome-panel-2.20.2/ltmain.sh 2008-01-05 00:15:22.179029347 +0100
4 @@ -1794,6 +1794,11 @@ EOF
5 arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
6 ;;
7
8 + -Wl,--as-needed)
9 + deplibs="$deplibs $arg"
10 + continue
11 + ;;
12 +
13 -Wl,*)
14 args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
15 arg=
16 @@ -2137,6 +2142,15 @@ EOF
17 lib=
18 found=no
19 case $deplib in
20 + -Wl,--as-needed)
21 + if test "$linkmode,$pass" = "prog,link"; then
22 + compile_deplibs="$deplib $compile_deplibs"
23 + finalize_deplibs="$deplib $finalize_deplibs"
24 + else
25 + deplibs="$deplib $deplibs"
26 + fi
27 + continue
28 + ;;
29 -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
30 if test "$linkmode,$pass" = "prog,link"; then
31 compile_deplibs="$deplib $compile_deplibs"
+0
-9
gnome-panel/debian/patches/series less more
0 01_panel_submenus.patch
1 02_switch-user_lock.patch
2 03_gnome-panel-logout.patch
3 04_logout-center.patch
4 05_missing_includes.patch
5 06_calendar_crashes.patch
6 60_caldav-clock-appointments.patch
7 70_relibtoolize.patch
8 99_ltmain_as-needed.patch
+0
-37
gnome-panel/debian/rules less more
0 #!/usr/bin/make -f
1
2 include /usr/share/cdbs/1/rules/debhelper.mk
3 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
4 include /usr/share/cdbs/1/rules/utils.mk
5 include /usr/share/cdbs/1/class/gnome.mk
6 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
7 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
8 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
9 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
10
11 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
12
13 DEB_CONFIGURE_EXTRA_FLAGS += \
14 --disable-scrollkeeper \
15 --with-in-process-applets=all \
16 --with-clock-time-utility="gksu time-admin"
17 ifneq ($(DEB_BUILD_GNU_SYSTEM),gnu)
18 DEB_CONFIGURE_EXTRA_FLAGS += --enable-eds
19 endif
20
21 DEB_DH_MAKESHLIBS_ARGS_libpanel-applet2-0 += -V"libpanel-applet2-0 (>= 2.19.3)"
22 DEB_DH_MAKESHLIBS_ARGS_gnome-panel += --no-act
23
24 binary-install/gnome-panel::
25 chmod a+x debian/gnome-panel/usr/lib/gnome-panel/*
26
27 binary-install/gnome-panel-data::
28 find debian/gnome-panel-data/usr/share -type f -exec chmod -R a-x {} \;
29 cd debian/gnome-panel-data/usr/share/gconf && \
30 mkdir defaults && \
31 mv schemas/panel-default-setup.entries \
32 defaults/05_panel-default-setup.entries
33
34 binary-install/libpanel-applet2-doc::
35 find debian/libpanel-applet2-doc/usr/share/doc/libpanel-applet2-doc/ -name ".arch-ids" -depth -exec rm -rf {} \;
36
+0
-3
gnome-panel/debian/watch less more
0 version=2
1 http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/([\d\.]+)[02468]/gnome-panel-(.*)\.tar\.gz \
2 debian uupdate