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