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