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 | 17 | Luke Yelavich | 17 | Luke Yelavich |
6 | 18 | Marco Trevisan (Treviño) | 18 | Marco Trevisan (Treviño) |
7 | 19 | Michael Terry | 19 | Michael Terry |
8 | 20 | Michal Hruby | ||
9 | 20 | Neil Jagdish Patel | 21 | Neil Jagdish Patel |
10 | 21 | Neil J. Patel | 22 | Neil J. Patel |
11 | 22 | Sebastien Bacher | 23 | Sebastien Bacher |
12 | 23 | 24 | ||
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 | 1 | # Generated by Makefile. Do not edit. | 1 | # Generated by Makefile. Do not edit. |
18 | 2 | 2 | ||
19 | 3 | 2011-09-28 Ted Gould <ted@gould.cx> | ||
20 | 4 | |||
21 | 5 | 0.4.1 | ||
22 | 6 | |||
23 | 7 | 2011-09-28 Ted Gould <ted@gould.cx> | ||
24 | 8 | |||
25 | 9 | Fix deps | ||
26 | 10 | |||
27 | 11 | 2011-09-28 Ted Gould <ted@gould.cx> | ||
28 | 12 | |||
29 | 13 | Fix dep as well | ||
30 | 14 | |||
31 | 15 | 2011-09-28 Ted Gould <ted@gould.cx> | ||
32 | 16 | |||
33 | 17 | Fix prefix on custom vala | ||
34 | 18 | |||
35 | 19 | 2011-09-28 Ted Gould <ted@gould.cx> | ||
36 | 20 | |||
37 | 21 | Switching out the prefix for a fixed name | ||
38 | 22 | |||
39 | 23 | 2011-09-28 Ted Gould <ted@gould.cx> | ||
40 | 24 | |||
41 | 25 | 0.4.0 | ||
42 | 26 | |||
43 | 27 | 2011-09-28 Ted Gould <ted@gould.cx> | ||
44 | 28 | |||
45 | 29 | Bring along custom and grab from srcdir | ||
46 | 30 | |||
47 | 31 | 2011-09-23 Ted Gould <ted@gould.cx> | ||
48 | 32 | |||
49 | 33 | Fixing Vala bindings | ||
50 | 34 | |||
51 | 35 | 2011-09-23 Michal Hruby <michal.mhr@gmail.com> | ||
52 | 36 | |||
53 | 37 | Fix type_check_function for vala bindings | ||
54 | 38 | |||
55 | 3 | 2011-08-11 Ted Gould <ted@gould.cx> | 39 | 2011-08-11 Ted Gould <ted@gould.cx> |
56 | 4 | 40 | ||
57 | 5 | 0.3.91 | 41 | 0.3.91 |
58 | 6 | 42 | ||
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 | 132 | CYGPATH_W = @CYGPATH_W@ | 132 | CYGPATH_W = @CYGPATH_W@ |
64 | 133 | DEFS = @DEFS@ | 133 | DEFS = @DEFS@ |
65 | 134 | DEPDIR = @DEPDIR@ | 134 | DEPDIR = @DEPDIR@ |
66 | 135 | DLLTOOL = @DLLTOOL@ | ||
67 | 135 | DSYMUTIL = @DSYMUTIL@ | 136 | DSYMUTIL = @DSYMUTIL@ |
68 | 136 | DUMPBIN = @DUMPBIN@ | 137 | DUMPBIN = @DUMPBIN@ |
69 | 137 | ECHO_C = @ECHO_C@ | 138 | ECHO_C = @ECHO_C@ |
70 | @@ -151,6 +152,8 @@ | |||
71 | 151 | GLIB_MKENUMS = @GLIB_MKENUMS@ | 152 | GLIB_MKENUMS = @GLIB_MKENUMS@ |
72 | 152 | GREP = @GREP@ | 153 | GREP = @GREP@ |
73 | 153 | GTKDOC_CHECK = @GTKDOC_CHECK@ | 154 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
74 | 155 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ | ||
75 | 156 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ | ||
76 | 154 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ | 157 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
77 | 155 | GTKDOC_REBASE = @GTKDOC_REBASE@ | 158 | GTKDOC_REBASE = @GTKDOC_REBASE@ |
78 | 156 | GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ | 159 | GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ |
79 | @@ -183,6 +186,7 @@ | |||
80 | 183 | LTLIBOBJS = @LTLIBOBJS@ | 186 | LTLIBOBJS = @LTLIBOBJS@ |
81 | 184 | MAINT = @MAINT@ | 187 | MAINT = @MAINT@ |
82 | 185 | MAKEINFO = @MAKEINFO@ | 188 | MAKEINFO = @MAKEINFO@ |
83 | 189 | MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
84 | 186 | MKDIR_P = @MKDIR_P@ | 190 | MKDIR_P = @MKDIR_P@ |
85 | 187 | MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@ | 191 | MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@ |
86 | 188 | MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@ | 192 | MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@ |
87 | @@ -228,6 +232,7 @@ | |||
88 | 228 | abs_srcdir = @abs_srcdir@ | 232 | abs_srcdir = @abs_srcdir@ |
89 | 229 | abs_top_builddir = @abs_top_builddir@ | 233 | abs_top_builddir = @abs_top_builddir@ |
90 | 230 | abs_top_srcdir = @abs_top_srcdir@ | 234 | abs_top_srcdir = @abs_top_srcdir@ |
91 | 235 | ac_ct_AR = @ac_ct_AR@ | ||
92 | 231 | ac_ct_CC = @ac_ct_CC@ | 236 | ac_ct_CC = @ac_ct_CC@ |
93 | 232 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | 237 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
94 | 233 | am__include = @am__include@ | 238 | am__include = @am__include@ |
95 | @@ -260,7 +265,6 @@ | |||
96 | 260 | libexecdir = @libexecdir@ | 265 | libexecdir = @libexecdir@ |
97 | 261 | localedir = @localedir@ | 266 | localedir = @localedir@ |
98 | 262 | localstatedir = @localstatedir@ | 267 | localstatedir = @localstatedir@ |
99 | 263 | lt_ECHO = @lt_ECHO@ | ||
100 | 264 | mandir = @mandir@ | 268 | mandir = @mandir@ |
101 | 265 | mkdir_p = @mkdir_p@ | 269 | mkdir_p = @mkdir_p@ |
102 | 266 | oldincludedir = @oldincludedir@ | 270 | oldincludedir = @oldincludedir@ |
103 | 267 | 271 | ||
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 | 19 | If you have problems, you may need to regenerate the build system entirely. | 19 | If you have problems, you may need to regenerate the build system entirely. |
109 | 20 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) | 20 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
110 | 21 | 21 | ||
111 | 22 | # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- | ||
112 | 23 | # | ||
113 | 24 | # Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. | ||
114 | 25 | # Written by Scott James Remnant, 2004. | ||
115 | 26 | # | ||
116 | 27 | # This file is free software; the Free Software Foundation gives | ||
117 | 28 | # unlimited permission to copy and/or distribute it, with or without | ||
118 | 29 | # modifications, as long as this notice is preserved. | ||
119 | 30 | |||
120 | 31 | # serial 5 lt~obsolete.m4 | ||
121 | 32 | |||
122 | 33 | # These exist entirely to fool aclocal when bootstrapping libtool. | ||
123 | 34 | # | ||
124 | 35 | # In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) | ||
125 | 36 | # which have later been changed to m4_define as they aren't part of the | ||
126 | 37 | # exported API, or moved to Autoconf or Automake where they belong. | ||
127 | 38 | # | ||
128 | 39 | # The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN | ||
129 | 40 | # in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us | ||
130 | 41 | # using a macro with the same name in our local m4/libtool.m4 it'll | ||
131 | 42 | # pull the old libtool.m4 in (it doesn't see our shiny new m4_define | ||
132 | 43 | # and doesn't know about Autoconf macros at all.) | ||
133 | 44 | # | ||
134 | 45 | # So we provide this file, which has a silly filename so it's always | ||
135 | 46 | # included after everything else. This provides aclocal with the | ||
136 | 47 | # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything | ||
137 | 48 | # because those macros already exist, or will be overwritten later. | ||
138 | 49 | # We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. | ||
139 | 50 | # | ||
140 | 51 | # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. | ||
141 | 52 | # Yes, that means every name once taken will need to remain here until | ||
142 | 53 | # we give up compatibility with versions before 1.7, at which point | ||
143 | 54 | # we need to keep only those names which we still refer to. | ||
144 | 55 | |||
145 | 56 | # This is to help aclocal find these macros, as it can't see m4_define. | ||
146 | 57 | AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) | ||
147 | 58 | |||
148 | 59 | m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) | ||
149 | 60 | m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) | ||
150 | 61 | m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) | ||
151 | 62 | m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) | ||
152 | 63 | m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) | ||
153 | 64 | m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) | ||
154 | 65 | m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) | ||
155 | 66 | m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) | ||
156 | 67 | m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) | ||
157 | 68 | m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) | ||
158 | 69 | m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) | ||
159 | 70 | m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) | ||
160 | 71 | m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) | ||
161 | 72 | m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) | ||
162 | 73 | m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) | ||
163 | 74 | m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) | ||
164 | 75 | m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) | ||
165 | 76 | m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) | ||
166 | 77 | m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) | ||
167 | 78 | m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) | ||
168 | 79 | m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) | ||
169 | 80 | m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) | ||
170 | 81 | m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) | ||
171 | 82 | m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) | ||
172 | 83 | m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) | ||
173 | 84 | m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) | ||
174 | 85 | m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) | ||
175 | 86 | m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) | ||
176 | 87 | m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) | ||
177 | 88 | m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) | ||
178 | 89 | m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) | ||
179 | 90 | m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) | ||
180 | 91 | m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) | ||
181 | 92 | m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) | ||
182 | 93 | m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) | ||
183 | 94 | m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) | ||
184 | 95 | m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) | ||
185 | 96 | m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) | ||
186 | 97 | m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) | ||
187 | 98 | m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) | ||
188 | 99 | m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) | ||
189 | 100 | m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) | ||
190 | 101 | m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) | ||
191 | 102 | m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) | ||
192 | 103 | m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) | ||
193 | 104 | m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) | ||
194 | 105 | m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) | ||
195 | 106 | m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) | ||
196 | 107 | m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) | ||
197 | 108 | m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) | ||
198 | 109 | m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) | ||
199 | 110 | m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) | ||
200 | 111 | m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) | ||
201 | 112 | m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) | ||
202 | 113 | m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) | ||
203 | 114 | m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) | ||
204 | 115 | m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) | ||
205 | 116 | m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) | ||
206 | 117 | m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) | ||
207 | 118 | m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) | ||
208 | 119 | m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) | ||
209 | 120 | |||
210 | 121 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | 22 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
211 | 122 | # serial 1 (pkg-config-0.24) | 23 | # serial 1 (pkg-config-0.24) |
212 | 123 | # | 24 | # |
213 | 124 | 25 | ||
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 | 116 | CYGPATH_W = @CYGPATH_W@ | 116 | CYGPATH_W = @CYGPATH_W@ |
219 | 117 | DEFS = @DEFS@ | 117 | DEFS = @DEFS@ |
220 | 118 | DEPDIR = @DEPDIR@ | 118 | DEPDIR = @DEPDIR@ |
221 | 119 | DLLTOOL = @DLLTOOL@ | ||
222 | 119 | DSYMUTIL = @DSYMUTIL@ | 120 | DSYMUTIL = @DSYMUTIL@ |
223 | 120 | DUMPBIN = @DUMPBIN@ | 121 | DUMPBIN = @DUMPBIN@ |
224 | 121 | ECHO_C = @ECHO_C@ | 122 | ECHO_C = @ECHO_C@ |
225 | @@ -135,6 +136,8 @@ | |||
226 | 135 | GLIB_MKENUMS = @GLIB_MKENUMS@ | 136 | GLIB_MKENUMS = @GLIB_MKENUMS@ |
227 | 136 | GREP = @GREP@ | 137 | GREP = @GREP@ |
228 | 137 | GTKDOC_CHECK = @GTKDOC_CHECK@ | 138 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
229 | 139 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ | ||
230 | 140 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ | ||
231 | 138 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ | 141 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
232 | 139 | GTKDOC_REBASE = @GTKDOC_REBASE@ | 142 | GTKDOC_REBASE = @GTKDOC_REBASE@ |
233 | 140 | GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ | 143 | GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ |
234 | @@ -167,6 +170,7 @@ | |||
235 | 167 | LTLIBOBJS = @LTLIBOBJS@ | 170 | LTLIBOBJS = @LTLIBOBJS@ |
236 | 168 | MAINT = @MAINT@ | 171 | MAINT = @MAINT@ |
237 | 169 | MAKEINFO = @MAKEINFO@ | 172 | MAKEINFO = @MAKEINFO@ |
238 | 173 | MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
239 | 170 | MKDIR_P = @MKDIR_P@ | 174 | MKDIR_P = @MKDIR_P@ |
240 | 171 | MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@ | 175 | MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@ |
241 | 172 | MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@ | 176 | MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@ |
242 | @@ -212,6 +216,7 @@ | |||
243 | 212 | abs_srcdir = @abs_srcdir@ | 216 | abs_srcdir = @abs_srcdir@ |
244 | 213 | abs_top_builddir = @abs_top_builddir@ | 217 | abs_top_builddir = @abs_top_builddir@ |
245 | 214 | abs_top_srcdir = @abs_top_srcdir@ | 218 | abs_top_srcdir = @abs_top_srcdir@ |
246 | 219 | ac_ct_AR = @ac_ct_AR@ | ||
247 | 215 | ac_ct_CC = @ac_ct_CC@ | 220 | ac_ct_CC = @ac_ct_CC@ |
248 | 216 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | 221 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
249 | 217 | am__include = @am__include@ | 222 | am__include = @am__include@ |
250 | @@ -244,7 +249,6 @@ | |||
251 | 244 | libexecdir = @libexecdir@ | 249 | libexecdir = @libexecdir@ |
252 | 245 | localedir = @localedir@ | 250 | localedir = @localedir@ |
253 | 246 | localstatedir = @localstatedir@ | 251 | localstatedir = @localstatedir@ |
254 | 247 | lt_ECHO = @lt_ECHO@ | ||
255 | 248 | mandir = @mandir@ | 252 | mandir = @mandir@ |
256 | 249 | mkdir_p = @mkdir_p@ | 253 | mkdir_p = @mkdir_p@ |
257 | 250 | oldincludedir = @oldincludedir@ | 254 | oldincludedir = @oldincludedir@ |
258 | 251 | 255 | ||
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 | 144 | CYGPATH_W = @CYGPATH_W@ | 144 | CYGPATH_W = @CYGPATH_W@ |
264 | 145 | DEFS = @DEFS@ | 145 | DEFS = @DEFS@ |
265 | 146 | DEPDIR = @DEPDIR@ | 146 | DEPDIR = @DEPDIR@ |
266 | 147 | DLLTOOL = @DLLTOOL@ | ||
267 | 147 | DSYMUTIL = @DSYMUTIL@ | 148 | DSYMUTIL = @DSYMUTIL@ |
268 | 148 | DUMPBIN = @DUMPBIN@ | 149 | DUMPBIN = @DUMPBIN@ |
269 | 149 | ECHO_C = @ECHO_C@ | 150 | ECHO_C = @ECHO_C@ |
270 | @@ -163,6 +164,8 @@ | |||
271 | 163 | GLIB_MKENUMS = @GLIB_MKENUMS@ | 164 | GLIB_MKENUMS = @GLIB_MKENUMS@ |
272 | 164 | GREP = @GREP@ | 165 | GREP = @GREP@ |
273 | 165 | GTKDOC_CHECK = @GTKDOC_CHECK@ | 166 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
274 | 167 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ | ||
275 | 168 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ | ||
276 | 166 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ | 169 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
277 | 167 | GTKDOC_REBASE = @GTKDOC_REBASE@ | 170 | GTKDOC_REBASE = @GTKDOC_REBASE@ |
278 | 168 | GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ | 171 | GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ |
279 | @@ -195,6 +198,7 @@ | |||
280 | 195 | LTLIBOBJS = @LTLIBOBJS@ | 198 | LTLIBOBJS = @LTLIBOBJS@ |
281 | 196 | MAINT = @MAINT@ | 199 | MAINT = @MAINT@ |
282 | 197 | MAKEINFO = @MAKEINFO@ | 200 | MAKEINFO = @MAKEINFO@ |
283 | 201 | MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
284 | 198 | MKDIR_P = @MKDIR_P@ | 202 | MKDIR_P = @MKDIR_P@ |
285 | 199 | MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@ | 203 | MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@ |
286 | 200 | MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@ | 204 | MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@ |
287 | @@ -240,6 +244,7 @@ | |||
288 | 240 | abs_srcdir = @abs_srcdir@ | 244 | abs_srcdir = @abs_srcdir@ |
289 | 241 | abs_top_builddir = @abs_top_builddir@ | 245 | abs_top_builddir = @abs_top_builddir@ |
290 | 242 | abs_top_srcdir = @abs_top_srcdir@ | 246 | abs_top_srcdir = @abs_top_srcdir@ |
291 | 247 | ac_ct_AR = @ac_ct_AR@ | ||
292 | 243 | ac_ct_CC = @ac_ct_CC@ | 248 | ac_ct_CC = @ac_ct_CC@ |
293 | 244 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | 249 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
294 | 245 | am__include = @am__include@ | 250 | am__include = @am__include@ |
295 | @@ -272,7 +277,6 @@ | |||
296 | 272 | libexecdir = @libexecdir@ | 277 | libexecdir = @libexecdir@ |
297 | 273 | localedir = @localedir@ | 278 | localedir = @localedir@ |
298 | 274 | localstatedir = @localstatedir@ | 279 | localstatedir = @localstatedir@ |
299 | 275 | lt_ECHO = @lt_ECHO@ | ||
300 | 276 | mandir = @mandir@ | 280 | mandir = @mandir@ |
301 | 277 | mkdir_p = @mkdir_p@ | 281 | mkdir_p = @mkdir_p@ |
302 | 278 | oldincludedir = @oldincludedir@ | 282 | oldincludedir = @oldincludedir@ |
303 | 279 | 283 | ||
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 | 77 | CYGPATH_W = @CYGPATH_W@ | 77 | CYGPATH_W = @CYGPATH_W@ |
309 | 78 | DEFS = @DEFS@ | 78 | DEFS = @DEFS@ |
310 | 79 | DEPDIR = @DEPDIR@ | 79 | DEPDIR = @DEPDIR@ |
311 | 80 | DLLTOOL = @DLLTOOL@ | ||
312 | 80 | DSYMUTIL = @DSYMUTIL@ | 81 | DSYMUTIL = @DSYMUTIL@ |
313 | 81 | DUMPBIN = @DUMPBIN@ | 82 | DUMPBIN = @DUMPBIN@ |
314 | 82 | ECHO_C = @ECHO_C@ | 83 | ECHO_C = @ECHO_C@ |
315 | @@ -96,6 +97,8 @@ | |||
316 | 96 | GLIB_MKENUMS = @GLIB_MKENUMS@ | 97 | GLIB_MKENUMS = @GLIB_MKENUMS@ |
317 | 97 | GREP = @GREP@ | 98 | GREP = @GREP@ |
318 | 98 | GTKDOC_CHECK = @GTKDOC_CHECK@ | 99 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
319 | 100 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ | ||
320 | 101 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ | ||
321 | 99 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ | 102 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
322 | 100 | GTKDOC_REBASE = @GTKDOC_REBASE@ | 103 | GTKDOC_REBASE = @GTKDOC_REBASE@ |
323 | 101 | GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ | 104 | GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ |
324 | @@ -128,6 +131,7 @@ | |||
325 | 128 | LTLIBOBJS = @LTLIBOBJS@ | 131 | LTLIBOBJS = @LTLIBOBJS@ |
326 | 129 | MAINT = @MAINT@ | 132 | MAINT = @MAINT@ |
327 | 130 | MAKEINFO = @MAKEINFO@ | 133 | MAKEINFO = @MAKEINFO@ |
328 | 134 | MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
329 | 131 | MKDIR_P = @MKDIR_P@ | 135 | MKDIR_P = @MKDIR_P@ |
330 | 132 | MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@ | 136 | MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@ |
331 | 133 | MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@ | 137 | MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@ |
332 | @@ -173,6 +177,7 @@ | |||
333 | 173 | abs_srcdir = @abs_srcdir@ | 177 | abs_srcdir = @abs_srcdir@ |
334 | 174 | abs_top_builddir = @abs_top_builddir@ | 178 | abs_top_builddir = @abs_top_builddir@ |
335 | 175 | abs_top_srcdir = @abs_top_srcdir@ | 179 | abs_top_srcdir = @abs_top_srcdir@ |
336 | 180 | ac_ct_AR = @ac_ct_AR@ | ||
337 | 176 | ac_ct_CC = @ac_ct_CC@ | 181 | ac_ct_CC = @ac_ct_CC@ |
338 | 177 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | 182 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
339 | 178 | am__include = @am__include@ | 183 | am__include = @am__include@ |
340 | @@ -205,7 +210,6 @@ | |||
341 | 205 | libexecdir = @libexecdir@ | 210 | libexecdir = @libexecdir@ |
342 | 206 | localedir = @localedir@ | 211 | localedir = @localedir@ |
343 | 207 | localstatedir = @localstatedir@ | 212 | localstatedir = @localstatedir@ |
344 | 208 | lt_ECHO = @lt_ECHO@ | ||
345 | 209 | mandir = @mandir@ | 213 | mandir = @mandir@ |
346 | 210 | mkdir_p = @mkdir_p@ | 214 | mkdir_p = @mkdir_p@ |
347 | 211 | oldincludedir = @oldincludedir@ | 215 | oldincludedir = @oldincludedir@ |
348 | 212 | 216 | ||
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 | 141 | CYGPATH_W = @CYGPATH_W@ | 141 | CYGPATH_W = @CYGPATH_W@ |
354 | 142 | DEFS = @DEFS@ | 142 | DEFS = @DEFS@ |
355 | 143 | DEPDIR = @DEPDIR@ | 143 | DEPDIR = @DEPDIR@ |
356 | 144 | DLLTOOL = @DLLTOOL@ | ||
357 | 144 | DSYMUTIL = @DSYMUTIL@ | 145 | DSYMUTIL = @DSYMUTIL@ |
358 | 145 | DUMPBIN = @DUMPBIN@ | 146 | DUMPBIN = @DUMPBIN@ |
359 | 146 | ECHO_C = @ECHO_C@ | 147 | ECHO_C = @ECHO_C@ |
360 | @@ -160,6 +161,8 @@ | |||
361 | 160 | GLIB_MKENUMS = @GLIB_MKENUMS@ | 161 | GLIB_MKENUMS = @GLIB_MKENUMS@ |
362 | 161 | GREP = @GREP@ | 162 | GREP = @GREP@ |
363 | 162 | GTKDOC_CHECK = @GTKDOC_CHECK@ | 163 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
364 | 164 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ | ||
365 | 165 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ | ||
366 | 163 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ | 166 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
367 | 164 | GTKDOC_REBASE = @GTKDOC_REBASE@ | 167 | GTKDOC_REBASE = @GTKDOC_REBASE@ |
368 | 165 | GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ | 168 | GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ |
369 | @@ -192,6 +195,7 @@ | |||
370 | 192 | LTLIBOBJS = @LTLIBOBJS@ | 195 | LTLIBOBJS = @LTLIBOBJS@ |
371 | 193 | MAINT = @MAINT@ | 196 | MAINT = @MAINT@ |
372 | 194 | MAKEINFO = @MAKEINFO@ | 197 | MAKEINFO = @MAKEINFO@ |
373 | 198 | MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
374 | 195 | MKDIR_P = @MKDIR_P@ | 199 | MKDIR_P = @MKDIR_P@ |
375 | 196 | MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@ | 200 | MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@ |
376 | 197 | MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@ | 201 | MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@ |
377 | @@ -237,6 +241,7 @@ | |||
378 | 237 | abs_srcdir = @abs_srcdir@ | 241 | abs_srcdir = @abs_srcdir@ |
379 | 238 | abs_top_builddir = @abs_top_builddir@ | 242 | abs_top_builddir = @abs_top_builddir@ |
380 | 239 | abs_top_srcdir = @abs_top_srcdir@ | 243 | abs_top_srcdir = @abs_top_srcdir@ |
381 | 244 | ac_ct_AR = @ac_ct_AR@ | ||
382 | 240 | ac_ct_CC = @ac_ct_CC@ | 245 | ac_ct_CC = @ac_ct_CC@ |
383 | 241 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | 246 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
384 | 242 | am__include = @am__include@ | 247 | am__include = @am__include@ |
385 | @@ -269,7 +274,6 @@ | |||
386 | 269 | libexecdir = @libexecdir@ | 274 | libexecdir = @libexecdir@ |
387 | 270 | localedir = @localedir@ | 275 | localedir = @localedir@ |
388 | 271 | localstatedir = @localstatedir@ | 276 | localstatedir = @localstatedir@ |
389 | 272 | lt_ECHO = @lt_ECHO@ | ||
390 | 273 | mandir = @mandir@ | 277 | mandir = @mandir@ |
391 | 274 | mkdir_p = @mkdir_p@ | 278 | mkdir_p = @mkdir_p@ |
392 | 275 | oldincludedir = @oldincludedir@ | 279 | oldincludedir = @oldincludedir@ |
393 | 276 | 280 | ||
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 | 25 | 25 | ||
399 | 26 | $(vapiprefix).vapi: $(top_builddir)/src/AppIndicator$(VER)-0.1.gir \ | 26 | $(vapiprefix).vapi: $(top_builddir)/src/AppIndicator$(VER)-0.1.gir \ |
400 | 27 | $(top_builddir)/src/AppIndicator$(VER)-0.1.metadata \ | 27 | $(top_builddir)/src/AppIndicator$(VER)-0.1.metadata \ |
401 | 28 | appindicator-0.1-custom.vala \ | ||
402 | 28 | $(vapiprefix).deps | 29 | $(vapiprefix).deps |
403 | 29 | $(VALA_API_GEN) --library=$(vapiprefix) --girdir=$(srcdir)/src \ | 30 | $(VALA_API_GEN) --library=$(vapiprefix) --girdir=$(srcdir)/src \ |
405 | 30 | $< | 31 | $< $(srcdir)/appindicator-0.1-custom.vala |
406 | 31 | 32 | ||
407 | 32 | 33 | ||
408 | 33 | CLEANFILES = $(vapi_DATA) | 34 | CLEANFILES = $(vapi_DATA) |
409 | 34 | 35 | ||
410 | 35 | endif | 36 | endif |
411 | 36 | endif | 37 | endif |
412 | 38 | |||
413 | 39 | EXTRA_DIST = \ | ||
414 | 40 | appindicator-0.1-custom.vala | ||
415 | 37 | 41 | ||
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 | 140 | CYGPATH_W = @CYGPATH_W@ | 140 | CYGPATH_W = @CYGPATH_W@ |
421 | 141 | DEFS = @DEFS@ | 141 | DEFS = @DEFS@ |
422 | 142 | DEPDIR = @DEPDIR@ | 142 | DEPDIR = @DEPDIR@ |
423 | 143 | DLLTOOL = @DLLTOOL@ | ||
424 | 143 | DSYMUTIL = @DSYMUTIL@ | 144 | DSYMUTIL = @DSYMUTIL@ |
425 | 144 | DUMPBIN = @DUMPBIN@ | 145 | DUMPBIN = @DUMPBIN@ |
426 | 145 | ECHO_C = @ECHO_C@ | 146 | ECHO_C = @ECHO_C@ |
427 | @@ -159,6 +160,8 @@ | |||
428 | 159 | GLIB_MKENUMS = @GLIB_MKENUMS@ | 160 | GLIB_MKENUMS = @GLIB_MKENUMS@ |
429 | 160 | GREP = @GREP@ | 161 | GREP = @GREP@ |
430 | 161 | GTKDOC_CHECK = @GTKDOC_CHECK@ | 162 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
431 | 163 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ | ||
432 | 164 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ | ||
433 | 162 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ | 165 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
434 | 163 | GTKDOC_REBASE = @GTKDOC_REBASE@ | 166 | GTKDOC_REBASE = @GTKDOC_REBASE@ |
435 | 164 | GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ | 167 | GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ |
436 | @@ -191,6 +194,7 @@ | |||
437 | 191 | LTLIBOBJS = @LTLIBOBJS@ | 194 | LTLIBOBJS = @LTLIBOBJS@ |
438 | 192 | MAINT = @MAINT@ | 195 | MAINT = @MAINT@ |
439 | 193 | MAKEINFO = @MAKEINFO@ | 196 | MAKEINFO = @MAKEINFO@ |
440 | 197 | MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
441 | 194 | MKDIR_P = @MKDIR_P@ | 198 | MKDIR_P = @MKDIR_P@ |
442 | 195 | MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@ | 199 | MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@ |
443 | 196 | MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@ | 200 | MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@ |
444 | @@ -236,6 +240,7 @@ | |||
445 | 236 | abs_srcdir = @abs_srcdir@ | 240 | abs_srcdir = @abs_srcdir@ |
446 | 237 | abs_top_builddir = @abs_top_builddir@ | 241 | abs_top_builddir = @abs_top_builddir@ |
447 | 238 | abs_top_srcdir = @abs_top_srcdir@ | 242 | abs_top_srcdir = @abs_top_srcdir@ |
448 | 243 | ac_ct_AR = @ac_ct_AR@ | ||
449 | 239 | ac_ct_CC = @ac_ct_CC@ | 244 | ac_ct_CC = @ac_ct_CC@ |
450 | 240 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | 245 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
451 | 241 | am__include = @am__include@ | 246 | am__include = @am__include@ |
452 | @@ -268,7 +273,6 @@ | |||
453 | 268 | libexecdir = @libexecdir@ | 273 | libexecdir = @libexecdir@ |
454 | 269 | localedir = @localedir@ | 274 | localedir = @localedir@ |
455 | 270 | localstatedir = @localstatedir@ | 275 | localstatedir = @localstatedir@ |
456 | 271 | lt_ECHO = @lt_ECHO@ | ||
457 | 272 | mandir = @mandir@ | 276 | mandir = @mandir@ |
458 | 273 | mkdir_p = @mkdir_p@ | 277 | mkdir_p = @mkdir_p@ |
459 | 274 | oldincludedir = @oldincludedir@ | 278 | oldincludedir = @oldincludedir@ |
460 | @@ -302,6 +306,9 @@ | |||
461 | 302 | @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@vapi_DATA = $(vapiprefix).vapi $(vapiprefix).deps | 306 | @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@vapi_DATA = $(vapiprefix).vapi $(vapiprefix).deps |
462 | 303 | @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@DEPS = $(GTKVAPI) | 307 | @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@DEPS = $(GTKVAPI) |
463 | 304 | @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@CLEANFILES = $(vapi_DATA) | 308 | @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@CLEANFILES = $(vapi_DATA) |
464 | 309 | EXTRA_DIST = \ | ||
465 | 310 | appindicator-0.1-custom.vala | ||
466 | 311 | |||
467 | 305 | all: all-recursive | 312 | all: all-recursive |
468 | 306 | 313 | ||
469 | 307 | .SUFFIXES: | 314 | .SUFFIXES: |
470 | @@ -678,9 +685,10 @@ | |||
471 | 678 | 685 | ||
472 | 679 | @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@$(vapiprefix).vapi: $(top_builddir)/src/AppIndicator$(VER)-0.1.gir \ | 686 | @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@$(vapiprefix).vapi: $(top_builddir)/src/AppIndicator$(VER)-0.1.gir \ |
473 | 680 | @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ $(top_builddir)/src/AppIndicator$(VER)-0.1.metadata \ | 687 | @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ $(top_builddir)/src/AppIndicator$(VER)-0.1.metadata \ |
474 | 688 | @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ appindicator-0.1-custom.vala \ | ||
475 | 681 | @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ $(vapiprefix).deps | 689 | @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ $(vapiprefix).deps |
476 | 682 | @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ $(VALA_API_GEN) --library=$(vapiprefix) --girdir=$(srcdir)/src \ | 690 | @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ $(VALA_API_GEN) --library=$(vapiprefix) --girdir=$(srcdir)/src \ |
478 | 683 | @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ $< | 691 | @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ $< $(srcdir)/appindicator-0.1-custom.vala |
479 | 684 | 692 | ||
480 | 685 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | 693 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
481 | 686 | # Otherwise a system limit (for SysV at least) may be exceeded. | 694 | # Otherwise a system limit (for SysV at least) may be exceeded. |
482 | 687 | 695 | ||
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 | 1 | /* | ||
488 | 2 | Copyright (C) 2011 Canonical, Ltd. | ||
489 | 3 | |||
490 | 4 | This program is free software: you can redistribute it and/or modify it | ||
491 | 5 | under the terms of either or both of the following licenses: | ||
492 | 6 | |||
493 | 7 | 1) the GNU Lesser General Public License version 3, as published by the | ||
494 | 8 | Free Software Foundation; and/or | ||
495 | 9 | 2) the GNU Lesser General Public License version 2.1, as published by | ||
496 | 10 | the Free Software Foundation. | ||
497 | 11 | |||
498 | 12 | This program is distributed in the hope that it will be useful, but | ||
499 | 13 | WITHOUT ANY WARRANTY; without even the implied warranties of | ||
500 | 14 | MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR | ||
501 | 15 | PURPOSE. See the applicable version of the GNU Lesser General Public | ||
502 | 16 | License for more details. | ||
503 | 17 | |||
504 | 18 | You should have received a copy of both the GNU Lesser General Public | ||
505 | 19 | License version 3 and version 2.1 along with this program. If not, see | ||
506 | 20 | <http://www.gnu.org/licenses/> | ||
507 | 21 | |||
508 | 22 | Authored by Michal Hruby <michal.hruby@canonical.com> | ||
509 | 23 | */ | ||
510 | 24 | |||
511 | 25 | namespace AppIndicator { | ||
512 | 26 | [CCode (type_check_function = "IS_APP_INDICATOR")] | ||
513 | 27 | public class Indicator : GLib.Object { | ||
514 | 28 | } | ||
515 | 29 | } | ||
516 | 30 | |||
517 | 31 | // vim:et:ai:cindent:ts=2 sts=2 sw=2: | ||
518 | 0 | 32 | ||
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 | 112 | CYGPATH_W = @CYGPATH_W@ | 112 | CYGPATH_W = @CYGPATH_W@ |
524 | 113 | DEFS = @DEFS@ | 113 | DEFS = @DEFS@ |
525 | 114 | DEPDIR = @DEPDIR@ | 114 | DEPDIR = @DEPDIR@ |
526 | 115 | DLLTOOL = @DLLTOOL@ | ||
527 | 115 | DSYMUTIL = @DSYMUTIL@ | 116 | DSYMUTIL = @DSYMUTIL@ |
528 | 116 | DUMPBIN = @DUMPBIN@ | 117 | DUMPBIN = @DUMPBIN@ |
529 | 117 | ECHO_C = @ECHO_C@ | 118 | ECHO_C = @ECHO_C@ |
530 | @@ -131,6 +132,8 @@ | |||
531 | 131 | GLIB_MKENUMS = @GLIB_MKENUMS@ | 132 | GLIB_MKENUMS = @GLIB_MKENUMS@ |
532 | 132 | GREP = @GREP@ | 133 | GREP = @GREP@ |
533 | 133 | GTKDOC_CHECK = @GTKDOC_CHECK@ | 134 | GTKDOC_CHECK = @GTKDOC_CHECK@ |
534 | 135 | GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ | ||
535 | 136 | GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ | ||
536 | 134 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ | 137 | GTKDOC_MKPDF = @GTKDOC_MKPDF@ |
537 | 135 | GTKDOC_REBASE = @GTKDOC_REBASE@ | 138 | GTKDOC_REBASE = @GTKDOC_REBASE@ |
538 | 136 | GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ | 139 | GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@ |
539 | @@ -163,6 +166,7 @@ | |||
540 | 163 | LTLIBOBJS = @LTLIBOBJS@ | 166 | LTLIBOBJS = @LTLIBOBJS@ |
541 | 164 | MAINT = @MAINT@ | 167 | MAINT = @MAINT@ |
542 | 165 | MAKEINFO = @MAKEINFO@ | 168 | MAKEINFO = @MAKEINFO@ |
543 | 169 | MANIFEST_TOOL = @MANIFEST_TOOL@ | ||
544 | 166 | MKDIR_P = @MKDIR_P@ | 170 | MKDIR_P = @MKDIR_P@ |
545 | 167 | MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@ | 171 | MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@ |
546 | 168 | MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@ | 172 | MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@ |
547 | @@ -208,6 +212,7 @@ | |||
548 | 208 | abs_srcdir = @abs_srcdir@ | 212 | abs_srcdir = @abs_srcdir@ |
549 | 209 | abs_top_builddir = @abs_top_builddir@ | 213 | abs_top_builddir = @abs_top_builddir@ |
550 | 210 | abs_top_srcdir = @abs_top_srcdir@ | 214 | abs_top_srcdir = @abs_top_srcdir@ |
551 | 215 | ac_ct_AR = @ac_ct_AR@ | ||
552 | 211 | ac_ct_CC = @ac_ct_CC@ | 216 | ac_ct_CC = @ac_ct_CC@ |
553 | 212 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | 217 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
554 | 213 | am__include = @am__include@ | 218 | am__include = @am__include@ |
555 | @@ -240,7 +245,6 @@ | |||
556 | 240 | libexecdir = @libexecdir@ | 245 | libexecdir = @libexecdir@ |
557 | 241 | localedir = @localedir@ | 246 | localedir = @localedir@ |
558 | 242 | localstatedir = @localstatedir@ | 247 | localstatedir = @localstatedir@ |
559 | 243 | lt_ECHO = @lt_ECHO@ | ||
560 | 244 | mandir = @mandir@ | 248 | mandir = @mandir@ |
561 | 245 | mkdir_p = @mkdir_p@ | 249 | mkdir_p = @mkdir_p@ |
562 | 246 | oldincludedir = @oldincludedir@ | 250 | oldincludedir = @oldincludedir@ |
563 | 247 | 251 | ||
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 | 34 | 34 | ||
569 | 35 | var indicator = new Indicator(win.title, "indicator-messages", | 35 | var indicator = new Indicator(win.title, "indicator-messages", |
570 | 36 | IndicatorCategory.APPLICATION_STATUS); | 36 | IndicatorCategory.APPLICATION_STATUS); |
571 | 37 | if (!(indicator is Indicator)) return -1; | ||
572 | 37 | 38 | ||
573 | 38 | indicator.set_status(IndicatorStatus.ACTIVE); | 39 | indicator.set_status(IndicatorStatus.ACTIVE); |
574 | 39 | indicator.set_attention_icon("indicator-messages-new"); | 40 | indicator.set_attention_icon("indicator-messages-new"); |
575 | 40 | 41 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
581 | 2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
582 | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
585 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
586 | 5 | # Free Software Foundation, Inc. | 5 | # 2011 Free Software Foundation, Inc. |
587 | 6 | 6 | ||
589 | 7 | timestamp='2009-12-30' | 7 | timestamp='2011-05-11' |
590 | 8 | 8 | ||
591 | 9 | # This file is free software; you can redistribute it and/or modify it | 9 | # This file is free software; you can redistribute it and/or modify it |
592 | 10 | # under the terms of the GNU General Public License as published by | 10 | # under the terms of the GNU General Public License as published by |
593 | @@ -57,7 +57,7 @@ | |||
594 | 57 | 57 | ||
595 | 58 | Originally written by Per Bothner. | 58 | Originally written by Per Bothner. |
596 | 59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, | 59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
598 | 60 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free | 60 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free |
599 | 61 | Software Foundation, Inc. | 61 | Software Foundation, Inc. |
600 | 62 | 62 | ||
601 | 63 | This is free software; see the source for copying conditions. There is NO | 63 | This is free software; see the source for copying conditions. There is NO |
602 | @@ -181,7 +181,7 @@ | |||
603 | 181 | fi | 181 | fi |
604 | 182 | ;; | 182 | ;; |
605 | 183 | *) | 183 | *) |
607 | 184 | os=netbsd | 184 | os=netbsd |
608 | 185 | ;; | 185 | ;; |
609 | 186 | esac | 186 | esac |
610 | 187 | # The OS release | 187 | # The OS release |
611 | @@ -224,7 +224,7 @@ | |||
612 | 224 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` | 224 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
613 | 225 | ;; | 225 | ;; |
614 | 226 | *5.*) | 226 | *5.*) |
616 | 227 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` | 227 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
617 | 228 | ;; | 228 | ;; |
618 | 229 | esac | 229 | esac |
619 | 230 | # According to Compaq, /usr/sbin/psrinfo has been available on | 230 | # According to Compaq, /usr/sbin/psrinfo has been available on |
620 | @@ -270,7 +270,10 @@ | |||
621 | 270 | # A Xn.n version is an unreleased experimental baselevel. | 270 | # A Xn.n version is an unreleased experimental baselevel. |
622 | 271 | # 1.2 uses "1.2" for uname -r. | 271 | # 1.2 uses "1.2" for uname -r. |
623 | 272 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` | 272 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
625 | 273 | exit ;; | 273 | # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
626 | 274 | exitcode=$? | ||
627 | 275 | trap '' 0 | ||
628 | 276 | exit $exitcode ;; | ||
629 | 274 | Alpha\ *:Windows_NT*:*) | 277 | Alpha\ *:Windows_NT*:*) |
630 | 275 | # How do we know it's Interix rather than the generic POSIX subsystem? | 278 | # How do we know it's Interix rather than the generic POSIX subsystem? |
631 | 276 | # Should we change UNAME_MACHINE based on the output of uname instead | 279 | # Should we change UNAME_MACHINE based on the output of uname instead |
632 | @@ -296,7 +299,7 @@ | |||
633 | 296 | echo s390-ibm-zvmoe | 299 | echo s390-ibm-zvmoe |
634 | 297 | exit ;; | 300 | exit ;; |
635 | 298 | *:OS400:*:*) | 301 | *:OS400:*:*) |
637 | 299 | echo powerpc-ibm-os400 | 302 | echo powerpc-ibm-os400 |
638 | 300 | exit ;; | 303 | exit ;; |
639 | 301 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) | 304 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
640 | 302 | echo arm-acorn-riscix${UNAME_RELEASE} | 305 | echo arm-acorn-riscix${UNAME_RELEASE} |
641 | @@ -395,23 +398,23 @@ | |||
642 | 395 | # MiNT. But MiNT is downward compatible to TOS, so this should | 398 | # MiNT. But MiNT is downward compatible to TOS, so this should |
643 | 396 | # be no problem. | 399 | # be no problem. |
644 | 397 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) | 400 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
646 | 398 | echo m68k-atari-mint${UNAME_RELEASE} | 401 | echo m68k-atari-mint${UNAME_RELEASE} |
647 | 399 | exit ;; | 402 | exit ;; |
648 | 400 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) | 403 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
649 | 401 | echo m68k-atari-mint${UNAME_RELEASE} | 404 | echo m68k-atari-mint${UNAME_RELEASE} |
651 | 402 | exit ;; | 405 | exit ;; |
652 | 403 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) | 406 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
654 | 404 | echo m68k-atari-mint${UNAME_RELEASE} | 407 | echo m68k-atari-mint${UNAME_RELEASE} |
655 | 405 | exit ;; | 408 | exit ;; |
656 | 406 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) | 409 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
659 | 407 | echo m68k-milan-mint${UNAME_RELEASE} | 410 | echo m68k-milan-mint${UNAME_RELEASE} |
660 | 408 | exit ;; | 411 | exit ;; |
661 | 409 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) | 412 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
664 | 410 | echo m68k-hades-mint${UNAME_RELEASE} | 413 | echo m68k-hades-mint${UNAME_RELEASE} |
665 | 411 | exit ;; | 414 | exit ;; |
666 | 412 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) | 415 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
669 | 413 | echo m68k-unknown-mint${UNAME_RELEASE} | 416 | echo m68k-unknown-mint${UNAME_RELEASE} |
670 | 414 | exit ;; | 417 | exit ;; |
671 | 415 | m68k:machten:*:*) | 418 | m68k:machten:*:*) |
672 | 416 | echo m68k-apple-machten${UNAME_RELEASE} | 419 | echo m68k-apple-machten${UNAME_RELEASE} |
673 | 417 | exit ;; | 420 | exit ;; |
674 | @@ -481,8 +484,8 @@ | |||
675 | 481 | echo m88k-motorola-sysv3 | 484 | echo m88k-motorola-sysv3 |
676 | 482 | exit ;; | 485 | exit ;; |
677 | 483 | AViiON:dgux:*:*) | 486 | AViiON:dgux:*:*) |
680 | 484 | # DG/UX returns AViiON for all architectures | 487 | # DG/UX returns AViiON for all architectures |
681 | 485 | UNAME_PROCESSOR=`/usr/bin/uname -p` | 488 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
682 | 486 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] | 489 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
683 | 487 | then | 490 | then |
684 | 488 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ | 491 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
685 | @@ -495,7 +498,7 @@ | |||
686 | 495 | else | 498 | else |
687 | 496 | echo i586-dg-dgux${UNAME_RELEASE} | 499 | echo i586-dg-dgux${UNAME_RELEASE} |
688 | 497 | fi | 500 | fi |
690 | 498 | exit ;; | 501 | exit ;; |
691 | 499 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) | 502 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
692 | 500 | echo m88k-dolphin-sysv3 | 503 | echo m88k-dolphin-sysv3 |
693 | 501 | exit ;; | 504 | exit ;; |
694 | @@ -552,7 +555,7 @@ | |||
695 | 552 | echo rs6000-ibm-aix3.2 | 555 | echo rs6000-ibm-aix3.2 |
696 | 553 | fi | 556 | fi |
697 | 554 | exit ;; | 557 | exit ;; |
699 | 555 | *:AIX:*:[456]) | 558 | *:AIX:*:[4567]) |
700 | 556 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` | 559 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
701 | 557 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then | 560 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
702 | 558 | IBM_ARCH=rs6000 | 561 | IBM_ARCH=rs6000 |
703 | @@ -595,52 +598,52 @@ | |||
704 | 595 | 9000/[678][0-9][0-9]) | 598 | 9000/[678][0-9][0-9]) |
705 | 596 | if [ -x /usr/bin/getconf ]; then | 599 | if [ -x /usr/bin/getconf ]; then |
706 | 597 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` | 600 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
715 | 598 | sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` | 601 | sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
716 | 599 | case "${sc_cpu_version}" in | 602 | case "${sc_cpu_version}" in |
717 | 600 | 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 | 603 | 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
718 | 601 | 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 | 604 | 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
719 | 602 | 532) # CPU_PA_RISC2_0 | 605 | 532) # CPU_PA_RISC2_0 |
720 | 603 | case "${sc_kernel_bits}" in | 606 | case "${sc_kernel_bits}" in |
721 | 604 | 32) HP_ARCH="hppa2.0n" ;; | 607 | 32) HP_ARCH="hppa2.0n" ;; |
722 | 605 | 64) HP_ARCH="hppa2.0w" ;; | 608 | 64) HP_ARCH="hppa2.0w" ;; |
723 | 606 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 | 609 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
726 | 607 | esac ;; | 610 | esac ;; |
727 | 608 | esac | 611 | esac |
728 | 609 | fi | 612 | fi |
729 | 610 | if [ "${HP_ARCH}" = "" ]; then | 613 | if [ "${HP_ARCH}" = "" ]; then |
730 | 611 | eval $set_cc_for_build | 614 | eval $set_cc_for_build |
763 | 612 | sed 's/^ //' << EOF >$dummy.c | 615 | sed 's/^ //' << EOF >$dummy.c |
764 | 613 | 616 | ||
765 | 614 | #define _HPUX_SOURCE | 617 | #define _HPUX_SOURCE |
766 | 615 | #include <stdlib.h> | 618 | #include <stdlib.h> |
767 | 616 | #include <unistd.h> | 619 | #include <unistd.h> |
768 | 617 | 620 | ||
769 | 618 | int main () | 621 | int main () |
770 | 619 | { | 622 | { |
771 | 620 | #if defined(_SC_KERNEL_BITS) | 623 | #if defined(_SC_KERNEL_BITS) |
772 | 621 | long bits = sysconf(_SC_KERNEL_BITS); | 624 | long bits = sysconf(_SC_KERNEL_BITS); |
773 | 622 | #endif | 625 | #endif |
774 | 623 | long cpu = sysconf (_SC_CPU_VERSION); | 626 | long cpu = sysconf (_SC_CPU_VERSION); |
775 | 624 | 627 | ||
776 | 625 | switch (cpu) | 628 | switch (cpu) |
777 | 626 | { | 629 | { |
778 | 627 | case CPU_PA_RISC1_0: puts ("hppa1.0"); break; | 630 | case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
779 | 628 | case CPU_PA_RISC1_1: puts ("hppa1.1"); break; | 631 | case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
780 | 629 | case CPU_PA_RISC2_0: | 632 | case CPU_PA_RISC2_0: |
781 | 630 | #if defined(_SC_KERNEL_BITS) | 633 | #if defined(_SC_KERNEL_BITS) |
782 | 631 | switch (bits) | 634 | switch (bits) |
783 | 632 | { | 635 | { |
784 | 633 | case 64: puts ("hppa2.0w"); break; | 636 | case 64: puts ("hppa2.0w"); break; |
785 | 634 | case 32: puts ("hppa2.0n"); break; | 637 | case 32: puts ("hppa2.0n"); break; |
786 | 635 | default: puts ("hppa2.0"); break; | 638 | default: puts ("hppa2.0"); break; |
787 | 636 | } break; | 639 | } break; |
788 | 637 | #else /* !defined(_SC_KERNEL_BITS) */ | 640 | #else /* !defined(_SC_KERNEL_BITS) */ |
789 | 638 | puts ("hppa2.0"); break; | 641 | puts ("hppa2.0"); break; |
790 | 639 | #endif | 642 | #endif |
791 | 640 | default: puts ("hppa1.0"); break; | 643 | default: puts ("hppa1.0"); break; |
792 | 641 | } | 644 | } |
793 | 642 | exit (0); | 645 | exit (0); |
794 | 643 | } | 646 | } |
795 | 644 | EOF | 647 | EOF |
796 | 645 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` | 648 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
797 | 646 | test -z "$HP_ARCH" && HP_ARCH=hppa | 649 | test -z "$HP_ARCH" && HP_ARCH=hppa |
798 | @@ -731,22 +734,22 @@ | |||
799 | 731 | exit ;; | 734 | exit ;; |
800 | 732 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) | 735 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
801 | 733 | echo c1-convex-bsd | 736 | echo c1-convex-bsd |
803 | 734 | exit ;; | 737 | exit ;; |
804 | 735 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) | 738 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
805 | 736 | if getsysinfo -f scalar_acc | 739 | if getsysinfo -f scalar_acc |
806 | 737 | then echo c32-convex-bsd | 740 | then echo c32-convex-bsd |
807 | 738 | else echo c2-convex-bsd | 741 | else echo c2-convex-bsd |
808 | 739 | fi | 742 | fi |
810 | 740 | exit ;; | 743 | exit ;; |
811 | 741 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) | 744 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
812 | 742 | echo c34-convex-bsd | 745 | echo c34-convex-bsd |
814 | 743 | exit ;; | 746 | exit ;; |
815 | 744 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) | 747 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
816 | 745 | echo c38-convex-bsd | 748 | echo c38-convex-bsd |
818 | 746 | exit ;; | 749 | exit ;; |
819 | 747 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) | 750 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
820 | 748 | echo c4-convex-bsd | 751 | echo c4-convex-bsd |
822 | 749 | exit ;; | 752 | exit ;; |
823 | 750 | CRAY*Y-MP:*:*:*) | 753 | CRAY*Y-MP:*:*:*) |
824 | 751 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 754 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
825 | 752 | exit ;; | 755 | exit ;; |
826 | @@ -770,14 +773,14 @@ | |||
827 | 770 | exit ;; | 773 | exit ;; |
828 | 771 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) | 774 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
829 | 772 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` | 775 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
834 | 773 | FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` | 776 | FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
835 | 774 | FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` | 777 | FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
836 | 775 | echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | 778 | echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
837 | 776 | exit ;; | 779 | exit ;; |
838 | 777 | 5000:UNIX_System_V:4.*:*) | 780 | 5000:UNIX_System_V:4.*:*) |
842 | 778 | FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` | 781 | FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
843 | 779 | FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` | 782 | FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
844 | 780 | echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | 783 | echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
845 | 781 | exit ;; | 784 | exit ;; |
846 | 782 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) | 785 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
847 | 783 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} | 786 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
848 | @@ -805,14 +808,14 @@ | |||
849 | 805 | echo ${UNAME_MACHINE}-pc-mingw32 | 808 | echo ${UNAME_MACHINE}-pc-mingw32 |
850 | 806 | exit ;; | 809 | exit ;; |
851 | 807 | i*:windows32*:*) | 810 | i*:windows32*:*) |
854 | 808 | # uname -m includes "-pc" on this system. | 811 | # uname -m includes "-pc" on this system. |
855 | 809 | echo ${UNAME_MACHINE}-mingw32 | 812 | echo ${UNAME_MACHINE}-mingw32 |
856 | 810 | exit ;; | 813 | exit ;; |
857 | 811 | i*:PW*:*) | 814 | i*:PW*:*) |
858 | 812 | echo ${UNAME_MACHINE}-pc-pw32 | 815 | echo ${UNAME_MACHINE}-pc-pw32 |
859 | 813 | exit ;; | 816 | exit ;; |
860 | 814 | *:Interix*:*) | 817 | *:Interix*:*) |
862 | 815 | case ${UNAME_MACHINE} in | 818 | case ${UNAME_MACHINE} in |
863 | 816 | x86) | 819 | x86) |
864 | 817 | echo i586-pc-interix${UNAME_RELEASE} | 820 | echo i586-pc-interix${UNAME_RELEASE} |
865 | 818 | exit ;; | 821 | exit ;; |
866 | @@ -867,7 +870,7 @@ | |||
867 | 867 | EV6) UNAME_MACHINE=alphaev6 ;; | 870 | EV6) UNAME_MACHINE=alphaev6 ;; |
868 | 868 | EV67) UNAME_MACHINE=alphaev67 ;; | 871 | EV67) UNAME_MACHINE=alphaev67 ;; |
869 | 869 | EV68*) UNAME_MACHINE=alphaev68 ;; | 872 | EV68*) UNAME_MACHINE=alphaev68 ;; |
871 | 870 | esac | 873 | esac |
872 | 871 | objdump --private-headers /bin/sh | grep -q ld.so.1 | 874 | objdump --private-headers /bin/sh | grep -q ld.so.1 |
873 | 872 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi | 875 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
874 | 873 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} | 876 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
875 | @@ -879,7 +882,13 @@ | |||
876 | 879 | then | 882 | then |
877 | 880 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 883 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
878 | 881 | else | 884 | else |
880 | 882 | echo ${UNAME_MACHINE}-unknown-linux-gnueabi | 885 | if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
881 | 886 | | grep -q __ARM_PCS_VFP | ||
882 | 887 | then | ||
883 | 888 | echo ${UNAME_MACHINE}-unknown-linux-gnueabi | ||
884 | 889 | else | ||
885 | 890 | echo ${UNAME_MACHINE}-unknown-linux-gnueabihf | ||
886 | 891 | fi | ||
887 | 883 | fi | 892 | fi |
888 | 884 | exit ;; | 893 | exit ;; |
889 | 885 | avr32*:Linux:*:*) | 894 | avr32*:Linux:*:*) |
890 | @@ -892,7 +901,7 @@ | |||
891 | 892 | echo crisv32-axis-linux-gnu | 901 | echo crisv32-axis-linux-gnu |
892 | 893 | exit ;; | 902 | exit ;; |
893 | 894 | frv:Linux:*:*) | 903 | frv:Linux:*:*) |
895 | 895 | echo frv-unknown-linux-gnu | 904 | echo frv-unknown-linux-gnu |
896 | 896 | exit ;; | 905 | exit ;; |
897 | 897 | i*86:Linux:*:*) | 906 | i*86:Linux:*:*) |
898 | 898 | LIBC=gnu | 907 | LIBC=gnu |
899 | @@ -960,7 +969,7 @@ | |||
900 | 960 | echo ${UNAME_MACHINE}-ibm-linux | 969 | echo ${UNAME_MACHINE}-ibm-linux |
901 | 961 | exit ;; | 970 | exit ;; |
902 | 962 | sh64*:Linux:*:*) | 971 | sh64*:Linux:*:*) |
904 | 963 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 972 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
905 | 964 | exit ;; | 973 | exit ;; |
906 | 965 | sh*:Linux:*:*) | 974 | sh*:Linux:*:*) |
907 | 966 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 975 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
908 | @@ -968,6 +977,9 @@ | |||
909 | 968 | sparc:Linux:*:* | sparc64:Linux:*:*) | 977 | sparc:Linux:*:* | sparc64:Linux:*:*) |
910 | 969 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 978 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
911 | 970 | exit ;; | 979 | exit ;; |
912 | 980 | tile*:Linux:*:*) | ||
913 | 981 | echo ${UNAME_MACHINE}-tilera-linux-gnu | ||
914 | 982 | exit ;; | ||
915 | 971 | vax:Linux:*:*) | 983 | vax:Linux:*:*) |
916 | 972 | echo ${UNAME_MACHINE}-dec-linux-gnu | 984 | echo ${UNAME_MACHINE}-dec-linux-gnu |
917 | 973 | exit ;; | 985 | exit ;; |
918 | @@ -975,7 +987,7 @@ | |||
919 | 975 | echo x86_64-unknown-linux-gnu | 987 | echo x86_64-unknown-linux-gnu |
920 | 976 | exit ;; | 988 | exit ;; |
921 | 977 | xtensa*:Linux:*:*) | 989 | xtensa*:Linux:*:*) |
923 | 978 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 990 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
924 | 979 | exit ;; | 991 | exit ;; |
925 | 980 | i*86:DYNIX/ptx:4*:*) | 992 | i*86:DYNIX/ptx:4*:*) |
926 | 981 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. | 993 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
927 | @@ -984,11 +996,11 @@ | |||
928 | 984 | echo i386-sequent-sysv4 | 996 | echo i386-sequent-sysv4 |
929 | 985 | exit ;; | 997 | exit ;; |
930 | 986 | i*86:UNIX_SV:4.2MP:2.*) | 998 | i*86:UNIX_SV:4.2MP:2.*) |
934 | 987 | # Unixware is an offshoot of SVR4, but it has its own version | 999 | # Unixware is an offshoot of SVR4, but it has its own version |
935 | 988 | # number series starting with 2... | 1000 | # number series starting with 2... |
936 | 989 | # I am not positive that other SVR4 systems won't match this, | 1001 | # I am not positive that other SVR4 systems won't match this, |
937 | 990 | # I just have to hope. -- rms. | 1002 | # I just have to hope. -- rms. |
939 | 991 | # Use sysv4.2uw... so that sysv4* matches it. | 1003 | # Use sysv4.2uw... so that sysv4* matches it. |
940 | 992 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} | 1004 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
941 | 993 | exit ;; | 1005 | exit ;; |
942 | 994 | i*86:OS/2:*:*) | 1006 | i*86:OS/2:*:*) |
943 | @@ -1020,7 +1032,7 @@ | |||
944 | 1020 | fi | 1032 | fi |
945 | 1021 | exit ;; | 1033 | exit ;; |
946 | 1022 | i*86:*:5:[678]*) | 1034 | i*86:*:5:[678]*) |
948 | 1023 | # UnixWare 7.x, OpenUNIX and OpenServer 6. | 1035 | # UnixWare 7.x, OpenUNIX and OpenServer 6. |
949 | 1024 | case `/bin/uname -X | grep "^Machine"` in | 1036 | case `/bin/uname -X | grep "^Machine"` in |
950 | 1025 | *486*) UNAME_MACHINE=i486 ;; | 1037 | *486*) UNAME_MACHINE=i486 ;; |
951 | 1026 | *Pentium) UNAME_MACHINE=i586 ;; | 1038 | *Pentium) UNAME_MACHINE=i586 ;; |
952 | @@ -1048,13 +1060,13 @@ | |||
953 | 1048 | exit ;; | 1060 | exit ;; |
954 | 1049 | pc:*:*:*) | 1061 | pc:*:*:*) |
955 | 1050 | # Left here for compatibility: | 1062 | # Left here for compatibility: |
958 | 1051 | # uname -m prints for DJGPP always 'pc', but it prints nothing about | 1063 | # uname -m prints for DJGPP always 'pc', but it prints nothing about |
959 | 1052 | # the processor, so we play safe by assuming i586. | 1064 | # the processor, so we play safe by assuming i586. |
960 | 1053 | # Note: whatever this is, it MUST be the same as what config.sub | 1065 | # Note: whatever this is, it MUST be the same as what config.sub |
961 | 1054 | # prints for the "djgpp" host, or else GDB configury will decide that | 1066 | # prints for the "djgpp" host, or else GDB configury will decide that |
962 | 1055 | # this is a cross-build. | 1067 | # this is a cross-build. |
963 | 1056 | echo i586-pc-msdosdjgpp | 1068 | echo i586-pc-msdosdjgpp |
965 | 1057 | exit ;; | 1069 | exit ;; |
966 | 1058 | Intel:Mach:3*:*) | 1070 | Intel:Mach:3*:*) |
967 | 1059 | echo i386-pc-mach3 | 1071 | echo i386-pc-mach3 |
968 | 1060 | exit ;; | 1072 | exit ;; |
969 | @@ -1089,8 +1101,8 @@ | |||
970 | 1089 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ | 1101 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
971 | 1090 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; | 1102 | && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
972 | 1091 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) | 1103 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
975 | 1092 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ | 1104 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
976 | 1093 | && { echo i486-ncr-sysv4; exit; } ;; | 1105 | && { echo i486-ncr-sysv4; exit; } ;; |
977 | 1094 | NCR*:*:4.2:* | MPRAS*:*:4.2:*) | 1106 | NCR*:*:4.2:* | MPRAS*:*:4.2:*) |
978 | 1095 | OS_REL='.3' | 1107 | OS_REL='.3' |
979 | 1096 | test -r /etc/.relid \ | 1108 | test -r /etc/.relid \ |
980 | @@ -1133,10 +1145,10 @@ | |||
981 | 1133 | echo ns32k-sni-sysv | 1145 | echo ns32k-sni-sysv |
982 | 1134 | fi | 1146 | fi |
983 | 1135 | exit ;; | 1147 | exit ;; |
988 | 1136 | PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort | 1148 | PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
989 | 1137 | # says <Richard.M.Bartel@ccMail.Census.GOV> | 1149 | # says <Richard.M.Bartel@ccMail.Census.GOV> |
990 | 1138 | echo i586-unisys-sysv4 | 1150 | echo i586-unisys-sysv4 |
991 | 1139 | exit ;; | 1151 | exit ;; |
992 | 1140 | *:UNIX_System_V:4*:FTX*) | 1152 | *:UNIX_System_V:4*:FTX*) |
993 | 1141 | # From Gerald Hewes <hewes@openmarket.com>. | 1153 | # From Gerald Hewes <hewes@openmarket.com>. |
994 | 1142 | # How about differentiating between stratus architectures? -djm | 1154 | # How about differentiating between stratus architectures? -djm |
995 | @@ -1162,11 +1174,11 @@ | |||
996 | 1162 | exit ;; | 1174 | exit ;; |
997 | 1163 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) | 1175 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
998 | 1164 | if [ -d /usr/nec ]; then | 1176 | if [ -d /usr/nec ]; then |
1000 | 1165 | echo mips-nec-sysv${UNAME_RELEASE} | 1177 | echo mips-nec-sysv${UNAME_RELEASE} |
1001 | 1166 | else | 1178 | else |
1003 | 1167 | echo mips-unknown-sysv${UNAME_RELEASE} | 1179 | echo mips-unknown-sysv${UNAME_RELEASE} |
1004 | 1168 | fi | 1180 | fi |
1006 | 1169 | exit ;; | 1181 | exit ;; |
1007 | 1170 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. | 1182 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
1008 | 1171 | echo powerpc-be-beos | 1183 | echo powerpc-be-beos |
1009 | 1172 | exit ;; | 1184 | exit ;; |
1010 | @@ -1231,6 +1243,9 @@ | |||
1011 | 1231 | *:QNX:*:4*) | 1243 | *:QNX:*:4*) |
1012 | 1232 | echo i386-pc-qnx | 1244 | echo i386-pc-qnx |
1013 | 1233 | exit ;; | 1245 | exit ;; |
1014 | 1246 | NEO-?:NONSTOP_KERNEL:*:*) | ||
1015 | 1247 | echo neo-tandem-nsk${UNAME_RELEASE} | ||
1016 | 1248 | exit ;; | ||
1017 | 1234 | NSE-?:NONSTOP_KERNEL:*:*) | 1249 | NSE-?:NONSTOP_KERNEL:*:*) |
1018 | 1235 | echo nse-tandem-nsk${UNAME_RELEASE} | 1250 | echo nse-tandem-nsk${UNAME_RELEASE} |
1019 | 1236 | exit ;; | 1251 | exit ;; |
1020 | @@ -1276,13 +1291,13 @@ | |||
1021 | 1276 | echo pdp10-unknown-its | 1291 | echo pdp10-unknown-its |
1022 | 1277 | exit ;; | 1292 | exit ;; |
1023 | 1278 | SEI:*:*:SEIUX) | 1293 | SEI:*:*:SEIUX) |
1025 | 1279 | echo mips-sei-seiux${UNAME_RELEASE} | 1294 | echo mips-sei-seiux${UNAME_RELEASE} |
1026 | 1280 | exit ;; | 1295 | exit ;; |
1027 | 1281 | *:DragonFly:*:*) | 1296 | *:DragonFly:*:*) |
1028 | 1282 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` | 1297 | echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
1029 | 1283 | exit ;; | 1298 | exit ;; |
1030 | 1284 | *:*VMS:*:*) | 1299 | *:*VMS:*:*) |
1032 | 1285 | UNAME_MACHINE=`(uname -p) 2>/dev/null` | 1300 | UNAME_MACHINE=`(uname -p) 2>/dev/null` |
1033 | 1286 | case "${UNAME_MACHINE}" in | 1301 | case "${UNAME_MACHINE}" in |
1034 | 1287 | A*) echo alpha-dec-vms ; exit ;; | 1302 | A*) echo alpha-dec-vms ; exit ;; |
1035 | 1288 | I*) echo ia64-dec-vms ; exit ;; | 1303 | I*) echo ia64-dec-vms ; exit ;; |
1036 | @@ -1322,11 +1337,11 @@ | |||
1037 | 1322 | #include <sys/param.h> | 1337 | #include <sys/param.h> |
1038 | 1323 | printf ("m68k-sony-newsos%s\n", | 1338 | printf ("m68k-sony-newsos%s\n", |
1039 | 1324 | #ifdef NEWSOS4 | 1339 | #ifdef NEWSOS4 |
1041 | 1325 | "4" | 1340 | "4" |
1042 | 1326 | #else | 1341 | #else |
1044 | 1327 | "" | 1342 | "" |
1045 | 1328 | #endif | 1343 | #endif |
1047 | 1329 | ); exit (0); | 1344 | ); exit (0); |
1048 | 1330 | #endif | 1345 | #endif |
1049 | 1331 | #endif | 1346 | #endif |
1050 | 1332 | 1347 | ||
1051 | 1333 | 1348 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
1057 | 2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
1058 | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
1061 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
1062 | 5 | # Free Software Foundation, Inc. | 5 | # 2011 Free Software Foundation, Inc. |
1063 | 6 | 6 | ||
1065 | 7 | timestamp='2010-01-22' | 7 | timestamp='2011-03-23' |
1066 | 8 | 8 | ||
1067 | 9 | # This file is (in principle) common to ALL GNU software. | 9 | # This file is (in principle) common to ALL GNU software. |
1068 | 10 | # The presence of a machine in this file suggests that SOME GNU software | 10 | # The presence of a machine in this file suggests that SOME GNU software |
1069 | @@ -76,7 +76,7 @@ | |||
1070 | 76 | GNU config.sub ($timestamp) | 76 | GNU config.sub ($timestamp) |
1071 | 77 | 77 | ||
1072 | 78 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, | 78 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
1074 | 79 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free | 79 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free |
1075 | 80 | Software Foundation, Inc. | 80 | Software Foundation, Inc. |
1076 | 81 | 81 | ||
1077 | 82 | This is free software; see the source for copying conditions. There is NO | 82 | This is free software; see the source for copying conditions. There is NO |
1078 | @@ -124,8 +124,9 @@ | |||
1079 | 124 | # Here we must recognize all the valid KERNEL-OS combinations. | 124 | # Here we must recognize all the valid KERNEL-OS combinations. |
1080 | 125 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | 125 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
1081 | 126 | case $maybe_os in | 126 | case $maybe_os in |
1084 | 127 | nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ | 127 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
1085 | 128 | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ | 128 | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
1086 | 129 | knetbsd*-gnu* | netbsd*-gnu* | \ | ||
1087 | 129 | kopensolaris*-gnu* | \ | 130 | kopensolaris*-gnu* | \ |
1088 | 130 | storm-chaos* | os2-emx* | rtmk-nova*) | 131 | storm-chaos* | os2-emx* | rtmk-nova*) |
1089 | 131 | os=-$maybe_os | 132 | os=-$maybe_os |
1090 | @@ -157,8 +158,8 @@ | |||
1091 | 157 | os= | 158 | os= |
1092 | 158 | basic_machine=$1 | 159 | basic_machine=$1 |
1093 | 159 | ;; | 160 | ;; |
1096 | 160 | -bluegene*) | 161 | -bluegene*) |
1097 | 161 | os=-cnk | 162 | os=-cnk |
1098 | 162 | ;; | 163 | ;; |
1099 | 163 | -sim | -cisco | -oki | -wec | -winbond) | 164 | -sim | -cisco | -oki | -wec | -winbond) |
1100 | 164 | os= | 165 | os= |
1101 | @@ -174,10 +175,10 @@ | |||
1102 | 174 | os=-chorusos | 175 | os=-chorusos |
1103 | 175 | basic_machine=$1 | 176 | basic_machine=$1 |
1104 | 176 | ;; | 177 | ;; |
1107 | 177 | -chorusrdb) | 178 | -chorusrdb) |
1108 | 178 | os=-chorusrdb | 179 | os=-chorusrdb |
1109 | 179 | basic_machine=$1 | 180 | basic_machine=$1 |
1111 | 180 | ;; | 181 | ;; |
1112 | 181 | -hiux*) | 182 | -hiux*) |
1113 | 182 | os=-hiuxwe2 | 183 | os=-hiuxwe2 |
1114 | 183 | ;; | 184 | ;; |
1115 | @@ -282,11 +283,13 @@ | |||
1116 | 282 | | moxie \ | 283 | | moxie \ |
1117 | 283 | | mt \ | 284 | | mt \ |
1118 | 284 | | msp430 \ | 285 | | msp430 \ |
1119 | 286 | | nds32 | nds32le | nds32be \ | ||
1120 | 285 | | nios | nios2 \ | 287 | | nios | nios2 \ |
1121 | 286 | | ns16k | ns32k \ | 288 | | ns16k | ns32k \ |
1122 | 289 | | open8 \ | ||
1123 | 287 | | or32 \ | 290 | | or32 \ |
1124 | 288 | | pdp10 | pdp11 | pj | pjl \ | 291 | | pdp10 | pdp11 | pj | pjl \ |
1126 | 289 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | 292 | | powerpc | powerpc64 | powerpc64le | powerpcle \ |
1127 | 290 | | pyramid \ | 293 | | pyramid \ |
1128 | 291 | | rx \ | 294 | | rx \ |
1129 | 292 | | score \ | 295 | | score \ |
1130 | @@ -294,15 +297,24 @@ | |||
1131 | 294 | | sh64 | sh64le \ | 297 | | sh64 | sh64le \ |
1132 | 295 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | 298 | | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
1133 | 296 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | 299 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
1136 | 297 | | spu | strongarm \ | 300 | | spu \ |
1137 | 298 | | tahoe | thumb | tic4x | tic80 | tron \ | 301 | | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
1138 | 299 | | ubicom32 \ | 302 | | ubicom32 \ |
1139 | 300 | | v850 | v850e \ | 303 | | v850 | v850e \ |
1140 | 301 | | we32k \ | 304 | | we32k \ |
1142 | 302 | | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | 305 | | x86 | xc16x | xstormy16 | xtensa \ |
1143 | 303 | | z8k | z80) | 306 | | z8k | z80) |
1144 | 304 | basic_machine=$basic_machine-unknown | 307 | basic_machine=$basic_machine-unknown |
1145 | 305 | ;; | 308 | ;; |
1146 | 309 | c54x) | ||
1147 | 310 | basic_machine=tic54x-unknown | ||
1148 | 311 | ;; | ||
1149 | 312 | c55x) | ||
1150 | 313 | basic_machine=tic55x-unknown | ||
1151 | 314 | ;; | ||
1152 | 315 | c6x) | ||
1153 | 316 | basic_machine=tic6x-unknown | ||
1154 | 317 | ;; | ||
1155 | 306 | m6811 | m68hc11 | m6812 | m68hc12 | picochip) | 318 | m6811 | m68hc11 | m6812 | m68hc12 | picochip) |
1156 | 307 | # Motorola 68HC11/12. | 319 | # Motorola 68HC11/12. |
1157 | 308 | basic_machine=$basic_machine-unknown | 320 | basic_machine=$basic_machine-unknown |
1158 | @@ -314,6 +326,18 @@ | |||
1159 | 314 | basic_machine=mt-unknown | 326 | basic_machine=mt-unknown |
1160 | 315 | ;; | 327 | ;; |
1161 | 316 | 328 | ||
1162 | 329 | strongarm | thumb | xscale) | ||
1163 | 330 | basic_machine=arm-unknown | ||
1164 | 331 | ;; | ||
1165 | 332 | |||
1166 | 333 | xscaleeb) | ||
1167 | 334 | basic_machine=armeb-unknown | ||
1168 | 335 | ;; | ||
1169 | 336 | |||
1170 | 337 | xscaleel) | ||
1171 | 338 | basic_machine=armel-unknown | ||
1172 | 339 | ;; | ||
1173 | 340 | |||
1174 | 317 | # We use `pc' rather than `unknown' | 341 | # We use `pc' rather than `unknown' |
1175 | 318 | # because (1) that's what they normally are, and | 342 | # because (1) that's what they normally are, and |
1176 | 319 | # (2) the word "unknown" tends to confuse beginning users. | 343 | # (2) the word "unknown" tends to confuse beginning users. |
1177 | @@ -334,7 +358,7 @@ | |||
1178 | 334 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | 358 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
1179 | 335 | | avr-* | avr32-* \ | 359 | | avr-* | avr32-* \ |
1180 | 336 | | bfin-* | bs2000-* \ | 360 | | bfin-* | bs2000-* \ |
1182 | 337 | | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | 361 | | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
1183 | 338 | | clipper-* | craynv-* | cydra-* \ | 362 | | clipper-* | craynv-* | cydra-* \ |
1184 | 339 | | d10v-* | d30v-* | dlx-* \ | 363 | | d10v-* | d30v-* | dlx-* \ |
1185 | 340 | | elxsi-* \ | 364 | | elxsi-* \ |
1186 | @@ -368,26 +392,28 @@ | |||
1187 | 368 | | mmix-* \ | 392 | | mmix-* \ |
1188 | 369 | | mt-* \ | 393 | | mt-* \ |
1189 | 370 | | msp430-* \ | 394 | | msp430-* \ |
1190 | 395 | | nds32-* | nds32le-* | nds32be-* \ | ||
1191 | 371 | | nios-* | nios2-* \ | 396 | | nios-* | nios2-* \ |
1192 | 372 | | none-* | np1-* | ns16k-* | ns32k-* \ | 397 | | none-* | np1-* | ns16k-* | ns32k-* \ |
1193 | 398 | | open8-* \ | ||
1194 | 373 | | orion-* \ | 399 | | orion-* \ |
1195 | 374 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | 400 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
1197 | 375 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | 401 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
1198 | 376 | | pyramid-* \ | 402 | | pyramid-* \ |
1199 | 377 | | romp-* | rs6000-* | rx-* \ | 403 | | romp-* | rs6000-* | rx-* \ |
1200 | 378 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | 404 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
1201 | 379 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | 405 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
1202 | 380 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | 406 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
1203 | 381 | | sparclite-* \ | 407 | | sparclite-* \ |
1206 | 382 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | 408 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
1207 | 383 | | tahoe-* | thumb-* \ | 409 | | tahoe-* \ |
1208 | 384 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | 410 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
1209 | 385 | | tile-* | tilegx-* \ | 411 | | tile-* | tilegx-* \ |
1210 | 386 | | tron-* \ | 412 | | tron-* \ |
1211 | 387 | | ubicom32-* \ | 413 | | ubicom32-* \ |
1212 | 388 | | v850-* | v850e-* | vax-* \ | 414 | | v850-* | v850e-* | vax-* \ |
1213 | 389 | | we32k-* \ | 415 | | we32k-* \ |
1215 | 390 | | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | 416 | | x86-* | x86_64-* | xc16x-* | xps100-* \ |
1216 | 391 | | xstormy16-* | xtensa*-* \ | 417 | | xstormy16-* | xtensa*-* \ |
1217 | 392 | | ymp-* \ | 418 | | ymp-* \ |
1218 | 393 | | z8k-* | z80-*) | 419 | | z8k-* | z80-*) |
1219 | @@ -412,7 +438,7 @@ | |||
1220 | 412 | basic_machine=a29k-amd | 438 | basic_machine=a29k-amd |
1221 | 413 | os=-udi | 439 | os=-udi |
1222 | 414 | ;; | 440 | ;; |
1224 | 415 | abacus) | 441 | abacus) |
1225 | 416 | basic_machine=abacus-unknown | 442 | basic_machine=abacus-unknown |
1226 | 417 | ;; | 443 | ;; |
1227 | 418 | adobe68k) | 444 | adobe68k) |
1228 | @@ -482,11 +508,20 @@ | |||
1229 | 482 | basic_machine=powerpc-ibm | 508 | basic_machine=powerpc-ibm |
1230 | 483 | os=-cnk | 509 | os=-cnk |
1231 | 484 | ;; | 510 | ;; |
1232 | 511 | c54x-*) | ||
1233 | 512 | basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
1234 | 513 | ;; | ||
1235 | 514 | c55x-*) | ||
1236 | 515 | basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
1237 | 516 | ;; | ||
1238 | 517 | c6x-*) | ||
1239 | 518 | basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
1240 | 519 | ;; | ||
1241 | 485 | c90) | 520 | c90) |
1242 | 486 | basic_machine=c90-cray | 521 | basic_machine=c90-cray |
1243 | 487 | os=-unicos | 522 | os=-unicos |
1244 | 488 | ;; | 523 | ;; |
1246 | 489 | cegcc) | 524 | cegcc) |
1247 | 490 | basic_machine=arm-unknown | 525 | basic_machine=arm-unknown |
1248 | 491 | os=-cegcc | 526 | os=-cegcc |
1249 | 492 | ;; | 527 | ;; |
1250 | @@ -518,7 +553,7 @@ | |||
1251 | 518 | basic_machine=craynv-cray | 553 | basic_machine=craynv-cray |
1252 | 519 | os=-unicosmp | 554 | os=-unicosmp |
1253 | 520 | ;; | 555 | ;; |
1255 | 521 | cr16) | 556 | cr16 | cr16-*) |
1256 | 522 | basic_machine=cr16-unknown | 557 | basic_machine=cr16-unknown |
1257 | 523 | os=-elf | 558 | os=-elf |
1258 | 524 | ;; | 559 | ;; |
1259 | @@ -734,7 +769,7 @@ | |||
1260 | 734 | basic_machine=ns32k-utek | 769 | basic_machine=ns32k-utek |
1261 | 735 | os=-sysv | 770 | os=-sysv |
1262 | 736 | ;; | 771 | ;; |
1264 | 737 | microblaze) | 772 | microblaze) |
1265 | 738 | basic_machine=microblaze-xilinx | 773 | basic_machine=microblaze-xilinx |
1266 | 739 | ;; | 774 | ;; |
1267 | 740 | mingw32) | 775 | mingw32) |
1268 | @@ -841,6 +876,12 @@ | |||
1269 | 841 | np1) | 876 | np1) |
1270 | 842 | basic_machine=np1-gould | 877 | basic_machine=np1-gould |
1271 | 843 | ;; | 878 | ;; |
1272 | 879 | neo-tandem) | ||
1273 | 880 | basic_machine=neo-tandem | ||
1274 | 881 | ;; | ||
1275 | 882 | nse-tandem) | ||
1276 | 883 | basic_machine=nse-tandem | ||
1277 | 884 | ;; | ||
1278 | 844 | nsr-tandem) | 885 | nsr-tandem) |
1279 | 845 | basic_machine=nsr-tandem | 886 | basic_machine=nsr-tandem |
1280 | 846 | ;; | 887 | ;; |
1281 | @@ -923,9 +964,10 @@ | |||
1282 | 923 | ;; | 964 | ;; |
1283 | 924 | power) basic_machine=power-ibm | 965 | power) basic_machine=power-ibm |
1284 | 925 | ;; | 966 | ;; |
1286 | 926 | ppc) basic_machine=powerpc-unknown | 967 | ppc | ppcbe) basic_machine=powerpc-unknown |
1287 | 927 | ;; | 968 | ;; |
1289 | 928 | ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` | 969 | ppc-* | ppcbe-*) |
1290 | 970 | basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
1291 | 929 | ;; | 971 | ;; |
1292 | 930 | ppcle | powerpclittle | ppc-le | powerpc-little) | 972 | ppcle | powerpclittle | ppc-le | powerpc-little) |
1293 | 931 | basic_machine=powerpcle-unknown | 973 | basic_machine=powerpcle-unknown |
1294 | @@ -1019,6 +1061,9 @@ | |||
1295 | 1019 | basic_machine=i860-stratus | 1061 | basic_machine=i860-stratus |
1296 | 1020 | os=-sysv4 | 1062 | os=-sysv4 |
1297 | 1021 | ;; | 1063 | ;; |
1298 | 1064 | strongarm-* | thumb-*) | ||
1299 | 1065 | basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
1300 | 1066 | ;; | ||
1301 | 1022 | sun2) | 1067 | sun2) |
1302 | 1023 | basic_machine=m68000-sun | 1068 | basic_machine=m68000-sun |
1303 | 1024 | ;; | 1069 | ;; |
1304 | @@ -1075,20 +1120,8 @@ | |||
1305 | 1075 | basic_machine=t90-cray | 1120 | basic_machine=t90-cray |
1306 | 1076 | os=-unicos | 1121 | os=-unicos |
1307 | 1077 | ;; | 1122 | ;; |
1322 | 1078 | tic54x | c54x*) | 1123 | # This must be matched before tile*. |
1323 | 1079 | basic_machine=tic54x-unknown | 1124 | tilegx*) |
1310 | 1080 | os=-coff | ||
1311 | 1081 | ;; | ||
1312 | 1082 | tic55x | c55x*) | ||
1313 | 1083 | basic_machine=tic55x-unknown | ||
1314 | 1084 | os=-coff | ||
1315 | 1085 | ;; | ||
1316 | 1086 | tic6x | c6x*) | ||
1317 | 1087 | basic_machine=tic6x-unknown | ||
1318 | 1088 | os=-coff | ||
1319 | 1089 | ;; | ||
1320 | 1090 | # This must be matched before tile*. | ||
1321 | 1091 | tilegx*) | ||
1324 | 1092 | basic_machine=tilegx-unknown | 1125 | basic_machine=tilegx-unknown |
1325 | 1093 | os=-linux-gnu | 1126 | os=-linux-gnu |
1326 | 1094 | ;; | 1127 | ;; |
1327 | @@ -1163,6 +1196,9 @@ | |||
1328 | 1163 | xps | xps100) | 1196 | xps | xps100) |
1329 | 1164 | basic_machine=xps100-honeywell | 1197 | basic_machine=xps100-honeywell |
1330 | 1165 | ;; | 1198 | ;; |
1331 | 1199 | xscale-* | xscalee[bl]-*) | ||
1332 | 1200 | basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` | ||
1333 | 1201 | ;; | ||
1334 | 1166 | ymp) | 1202 | ymp) |
1335 | 1167 | basic_machine=ymp-cray | 1203 | basic_machine=ymp-cray |
1336 | 1168 | os=-unicos | 1204 | os=-unicos |
1337 | @@ -1260,11 +1296,11 @@ | |||
1338 | 1260 | if [ x"$os" != x"" ] | 1296 | if [ x"$os" != x"" ] |
1339 | 1261 | then | 1297 | then |
1340 | 1262 | case $os in | 1298 | case $os in |
1343 | 1263 | # First match some system type aliases | 1299 | # First match some system type aliases |
1344 | 1264 | # that might get confused with valid system types. | 1300 | # that might get confused with valid system types. |
1345 | 1265 | # -solaris* is a basic system type, with this one exception. | 1301 | # -solaris* is a basic system type, with this one exception. |
1348 | 1266 | -auroraux) | 1302 | -auroraux) |
1349 | 1267 | os=-auroraux | 1303 | os=-auroraux |
1350 | 1268 | ;; | 1304 | ;; |
1351 | 1269 | -solaris1 | -solaris1.*) | 1305 | -solaris1 | -solaris1.*) |
1352 | 1270 | os=`echo $os | sed -e 's|solaris1|sunos4|'` | 1306 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
1353 | @@ -1301,7 +1337,8 @@ | |||
1354 | 1301 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | 1337 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
1355 | 1302 | | -chorusos* | -chorusrdb* | -cegcc* \ | 1338 | | -chorusos* | -chorusrdb* | -cegcc* \ |
1356 | 1303 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | 1339 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
1358 | 1304 | | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | 1340 | | -mingw32* | -linux-gnu* | -linux-android* \ |
1359 | 1341 | | -linux-newlib* | -linux-uclibc* \ | ||
1360 | 1305 | | -uxpv* | -beos* | -mpeix* | -udk* \ | 1342 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
1361 | 1306 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | 1343 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
1362 | 1307 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | 1344 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
1363 | @@ -1348,7 +1385,7 @@ | |||
1364 | 1348 | -opened*) | 1385 | -opened*) |
1365 | 1349 | os=-openedition | 1386 | os=-openedition |
1366 | 1350 | ;; | 1387 | ;; |
1368 | 1351 | -os400*) | 1388 | -os400*) |
1369 | 1352 | os=-os400 | 1389 | os=-os400 |
1370 | 1353 | ;; | 1390 | ;; |
1371 | 1354 | -wince*) | 1391 | -wince*) |
1372 | @@ -1397,7 +1434,7 @@ | |||
1373 | 1397 | -sinix*) | 1434 | -sinix*) |
1374 | 1398 | os=-sysv4 | 1435 | os=-sysv4 |
1375 | 1399 | ;; | 1436 | ;; |
1377 | 1400 | -tpf*) | 1437 | -tpf*) |
1378 | 1401 | os=-tpf | 1438 | os=-tpf |
1379 | 1402 | ;; | 1439 | ;; |
1380 | 1403 | -triton*) | 1440 | -triton*) |
1381 | @@ -1442,8 +1479,8 @@ | |||
1382 | 1442 | -dicos*) | 1479 | -dicos*) |
1383 | 1443 | os=-dicos | 1480 | os=-dicos |
1384 | 1444 | ;; | 1481 | ;; |
1387 | 1445 | -nacl*) | 1482 | -nacl*) |
1388 | 1446 | ;; | 1483 | ;; |
1389 | 1447 | -none) | 1484 | -none) |
1390 | 1448 | ;; | 1485 | ;; |
1391 | 1449 | *) | 1486 | *) |
1392 | @@ -1466,10 +1503,10 @@ | |||
1393 | 1466 | # system, and we'll never get to this point. | 1503 | # system, and we'll never get to this point. |
1394 | 1467 | 1504 | ||
1395 | 1468 | case $basic_machine in | 1505 | case $basic_machine in |
1397 | 1469 | score-*) | 1506 | score-*) |
1398 | 1470 | os=-elf | 1507 | os=-elf |
1399 | 1471 | ;; | 1508 | ;; |
1401 | 1472 | spu-*) | 1509 | spu-*) |
1402 | 1473 | os=-elf | 1510 | os=-elf |
1403 | 1474 | ;; | 1511 | ;; |
1404 | 1475 | *-acorn) | 1512 | *-acorn) |
1405 | @@ -1481,8 +1518,17 @@ | |||
1406 | 1481 | arm*-semi) | 1518 | arm*-semi) |
1407 | 1482 | os=-aout | 1519 | os=-aout |
1408 | 1483 | ;; | 1520 | ;; |
1411 | 1484 | c4x-* | tic4x-*) | 1521 | c4x-* | tic4x-*) |
1412 | 1485 | os=-coff | 1522 | os=-coff |
1413 | 1523 | ;; | ||
1414 | 1524 | tic54x-*) | ||
1415 | 1525 | os=-coff | ||
1416 | 1526 | ;; | ||
1417 | 1527 | tic55x-*) | ||
1418 | 1528 | os=-coff | ||
1419 | 1529 | ;; | ||
1420 | 1530 | tic6x-*) | ||
1421 | 1531 | os=-coff | ||
1422 | 1486 | ;; | 1532 | ;; |
1423 | 1487 | # This must come before the *-dec entry. | 1533 | # This must come before the *-dec entry. |
1424 | 1488 | pdp10-*) | 1534 | pdp10-*) |
1425 | @@ -1509,7 +1555,7 @@ | |||
1426 | 1509 | m68*-cisco) | 1555 | m68*-cisco) |
1427 | 1510 | os=-aout | 1556 | os=-aout |
1428 | 1511 | ;; | 1557 | ;; |
1430 | 1512 | mep-*) | 1558 | mep-*) |
1431 | 1513 | os=-elf | 1559 | os=-elf |
1432 | 1514 | ;; | 1560 | ;; |
1433 | 1515 | mips*-cisco) | 1561 | mips*-cisco) |
1434 | @@ -1536,7 +1582,7 @@ | |||
1435 | 1536 | *-ibm) | 1582 | *-ibm) |
1436 | 1537 | os=-aix | 1583 | os=-aix |
1437 | 1538 | ;; | 1584 | ;; |
1439 | 1539 | *-knuth) | 1585 | *-knuth) |
1440 | 1540 | os=-mmixware | 1586 | os=-mmixware |
1441 | 1541 | ;; | 1587 | ;; |
1442 | 1542 | *-wec) | 1588 | *-wec) |
1443 | 1543 | 1589 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
1449 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
1451 | 3 | # Generated by GNU Autoconf 2.68 for libappindicator 0.3.91. | 3 | # Generated by GNU Autoconf 2.68 for libappindicator 0.4.1. |
1452 | 4 | # | 4 | # |
1453 | 5 | # Report bugs to <http://bugs.launchpad.net/libappindicator>. | 5 | # Report bugs to <http://bugs.launchpad.net/libappindicator>. |
1454 | 6 | # | 6 | # |
1455 | @@ -176,6 +176,14 @@ | |||
1456 | 176 | as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO | 176 | as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
1457 | 177 | eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && | 177 | eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
1458 | 178 | test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 | 178 | test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 |
1459 | 179 | |||
1460 | 180 | test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( | ||
1461 | 181 | ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' | ||
1462 | 182 | ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO | ||
1463 | 183 | ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO | ||
1464 | 184 | PATH=/empty FPATH=/empty; export PATH FPATH | ||
1465 | 185 | test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ | ||
1466 | 186 | || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 | ||
1467 | 179 | test \$(( 1 + 1 )) = 2 || exit 1" | 187 | test \$(( 1 + 1 )) = 2 || exit 1" |
1468 | 180 | if (eval "$as_required") 2>/dev/null; then : | 188 | if (eval "$as_required") 2>/dev/null; then : |
1469 | 181 | as_have_required=yes | 189 | as_have_required=yes |
1470 | @@ -538,155 +546,8 @@ | |||
1471 | 538 | # Sed expression to map a string onto a valid variable name. | 546 | # Sed expression to map a string onto a valid variable name. |
1472 | 539 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" | 547 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" |
1473 | 540 | 548 | ||
1474 | 541 | |||
1475 | 542 | |||
1476 | 543 | # Check that we are running under the correct shell. | ||
1477 | 544 | SHELL=${CONFIG_SHELL-/bin/sh} | 549 | SHELL=${CONFIG_SHELL-/bin/sh} |
1478 | 545 | 550 | ||
1479 | 546 | case X$lt_ECHO in | ||
1480 | 547 | X*--fallback-echo) | ||
1481 | 548 | # Remove one level of quotation (which was required for Make). | ||
1482 | 549 | ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` | ||
1483 | 550 | ;; | ||
1484 | 551 | esac | ||
1485 | 552 | |||
1486 | 553 | ECHO=${lt_ECHO-echo} | ||
1487 | 554 | if test "X$1" = X--no-reexec; then | ||
1488 | 555 | # Discard the --no-reexec flag, and continue. | ||
1489 | 556 | shift | ||
1490 | 557 | elif test "X$1" = X--fallback-echo; then | ||
1491 | 558 | # Avoid inline document here, it may be left over | ||
1492 | 559 | : | ||
1493 | 560 | elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then | ||
1494 | 561 | # Yippee, $ECHO works! | ||
1495 | 562 | : | ||
1496 | 563 | else | ||
1497 | 564 | # Restart under the correct shell. | ||
1498 | 565 | exec $SHELL "$0" --no-reexec ${1+"$@"} | ||
1499 | 566 | fi | ||
1500 | 567 | |||
1501 | 568 | if test "X$1" = X--fallback-echo; then | ||
1502 | 569 | # used as fallback echo | ||
1503 | 570 | shift | ||
1504 | 571 | cat <<_LT_EOF | ||
1505 | 572 | $* | ||
1506 | 573 | _LT_EOF | ||
1507 | 574 | exit 0 | ||
1508 | 575 | fi | ||
1509 | 576 | |||
1510 | 577 | # The HP-UX ksh and POSIX shell print the target directory to stdout | ||
1511 | 578 | # if CDPATH is set. | ||
1512 | 579 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH | ||
1513 | 580 | |||
1514 | 581 | if test -z "$lt_ECHO"; then | ||
1515 | 582 | if test "X${echo_test_string+set}" != Xset; then | ||
1516 | 583 | # find a string as large as possible, as long as the shell can cope with it | ||
1517 | 584 | for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do | ||
1518 | 585 | # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... | ||
1519 | 586 | if { echo_test_string=`eval $cmd`; } 2>/dev/null && | ||
1520 | 587 | { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null | ||
1521 | 588 | then | ||
1522 | 589 | break | ||
1523 | 590 | fi | ||
1524 | 591 | done | ||
1525 | 592 | fi | ||
1526 | 593 | |||
1527 | 594 | if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && | ||
1528 | 595 | echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && | ||
1529 | 596 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
1530 | 597 | : | ||
1531 | 598 | else | ||
1532 | 599 | # The Solaris, AIX, and Digital Unix default echo programs unquote | ||
1533 | 600 | # backslashes. This makes it impossible to quote backslashes using | ||
1534 | 601 | # echo "$something" | sed 's/\\/\\\\/g' | ||
1535 | 602 | # | ||
1536 | 603 | # So, first we look for a working echo in the user's PATH. | ||
1537 | 604 | |||
1538 | 605 | lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR | ||
1539 | 606 | for dir in $PATH /usr/ucb; do | ||
1540 | 607 | IFS="$lt_save_ifs" | ||
1541 | 608 | if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && | ||
1542 | 609 | test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && | ||
1543 | 610 | echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && | ||
1544 | 611 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
1545 | 612 | ECHO="$dir/echo" | ||
1546 | 613 | break | ||
1547 | 614 | fi | ||
1548 | 615 | done | ||
1549 | 616 | IFS="$lt_save_ifs" | ||
1550 | 617 | |||
1551 | 618 | if test "X$ECHO" = Xecho; then | ||
1552 | 619 | # We didn't find a better echo, so look for alternatives. | ||
1553 | 620 | if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && | ||
1554 | 621 | echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && | ||
1555 | 622 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
1556 | 623 | # This shell has a builtin print -r that does the trick. | ||
1557 | 624 | ECHO='print -r' | ||
1558 | 625 | elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && | ||
1559 | 626 | test "X$CONFIG_SHELL" != X/bin/ksh; then | ||
1560 | 627 | # If we have ksh, try running configure again with it. | ||
1561 | 628 | ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} | ||
1562 | 629 | export ORIGINAL_CONFIG_SHELL | ||
1563 | 630 | CONFIG_SHELL=/bin/ksh | ||
1564 | 631 | export CONFIG_SHELL | ||
1565 | 632 | exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} | ||
1566 | 633 | else | ||
1567 | 634 | # Try using printf. | ||
1568 | 635 | ECHO='printf %s\n' | ||
1569 | 636 | if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && | ||
1570 | 637 | echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && | ||
1571 | 638 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
1572 | 639 | # Cool, printf works | ||
1573 | 640 | : | ||
1574 | 641 | elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && | ||
1575 | 642 | test "X$echo_testing_string" = 'X\t' && | ||
1576 | 643 | echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && | ||
1577 | 644 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
1578 | 645 | CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL | ||
1579 | 646 | export CONFIG_SHELL | ||
1580 | 647 | SHELL="$CONFIG_SHELL" | ||
1581 | 648 | export SHELL | ||
1582 | 649 | ECHO="$CONFIG_SHELL $0 --fallback-echo" | ||
1583 | 650 | elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && | ||
1584 | 651 | test "X$echo_testing_string" = 'X\t' && | ||
1585 | 652 | echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && | ||
1586 | 653 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
1587 | 654 | ECHO="$CONFIG_SHELL $0 --fallback-echo" | ||
1588 | 655 | else | ||
1589 | 656 | # maybe with a smaller string... | ||
1590 | 657 | prev=: | ||
1591 | 658 | |||
1592 | 659 | for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do | ||
1593 | 660 | if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null | ||
1594 | 661 | then | ||
1595 | 662 | break | ||
1596 | 663 | fi | ||
1597 | 664 | prev="$cmd" | ||
1598 | 665 | done | ||
1599 | 666 | |||
1600 | 667 | if test "$prev" != 'sed 50q "$0"'; then | ||
1601 | 668 | echo_test_string=`eval $prev` | ||
1602 | 669 | export echo_test_string | ||
1603 | 670 | exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} | ||
1604 | 671 | else | ||
1605 | 672 | # Oops. We lost completely, so just stick with echo. | ||
1606 | 673 | ECHO=echo | ||
1607 | 674 | fi | ||
1608 | 675 | fi | ||
1609 | 676 | fi | ||
1610 | 677 | fi | ||
1611 | 678 | fi | ||
1612 | 679 | fi | ||
1613 | 680 | |||
1614 | 681 | # Copy echo and quote the copy suitably for passing to libtool from | ||
1615 | 682 | # the Makefile, instead of quoting the original, which is used later. | ||
1616 | 683 | lt_ECHO=$ECHO | ||
1617 | 684 | if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then | ||
1618 | 685 | lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" | ||
1619 | 686 | fi | ||
1620 | 687 | |||
1621 | 688 | |||
1622 | 689 | |||
1623 | 690 | as_awk_strverscmp=' | 551 | as_awk_strverscmp=' |
1624 | 691 | # Use only awk features that work with 7th edition Unix awk (1978). | 552 | # Use only awk features that work with 7th edition Unix awk (1978). |
1625 | 692 | # My, what an old awk you have, Mr. Solaris! | 553 | # My, what an old awk you have, Mr. Solaris! |
1626 | @@ -771,8 +632,8 @@ | |||
1627 | 771 | # Identity of this package. | 632 | # Identity of this package. |
1628 | 772 | PACKAGE_NAME='libappindicator' | 633 | PACKAGE_NAME='libappindicator' |
1629 | 773 | PACKAGE_TARNAME='libappindicator' | 634 | PACKAGE_TARNAME='libappindicator' |
1632 | 774 | PACKAGE_VERSION='0.3.91' | 635 | PACKAGE_VERSION='0.4.1' |
1633 | 775 | PACKAGE_STRING='libappindicator 0.3.91' | 636 | PACKAGE_STRING='libappindicator 0.4.1' |
1634 | 776 | PACKAGE_BUGREPORT='http://bugs.launchpad.net/libappindicator' | 637 | PACKAGE_BUGREPORT='http://bugs.launchpad.net/libappindicator' |
1635 | 777 | PACKAGE_URL='http://launchpad.net/libappindicator' | 638 | PACKAGE_URL='http://launchpad.net/libappindicator' |
1636 | 778 | 639 | ||
1637 | @@ -882,6 +743,8 @@ | |||
1638 | 882 | GTK_DOC_BUILD_HTML_TRUE | 743 | GTK_DOC_BUILD_HTML_TRUE |
1639 | 883 | ENABLE_GTK_DOC_FALSE | 744 | ENABLE_GTK_DOC_FALSE |
1640 | 884 | ENABLE_GTK_DOC_TRUE | 745 | ENABLE_GTK_DOC_TRUE |
1641 | 746 | GTKDOC_DEPS_LIBS | ||
1642 | 747 | GTKDOC_DEPS_CFLAGS | ||
1643 | 885 | HTML_DIR | 748 | HTML_DIR |
1644 | 886 | GTKDOC_MKPDF | 749 | GTKDOC_MKPDF |
1645 | 887 | GTKDOC_REBASE | 750 | GTKDOC_REBASE |
1646 | @@ -897,9 +760,11 @@ | |||
1647 | 897 | LIPO | 760 | LIPO |
1648 | 898 | NMEDIT | 761 | NMEDIT |
1649 | 899 | DSYMUTIL | 762 | DSYMUTIL |
1651 | 900 | lt_ECHO | 763 | MANIFEST_TOOL |
1652 | 901 | RANLIB | 764 | RANLIB |
1653 | 765 | ac_ct_AR | ||
1654 | 902 | AR | 766 | AR |
1655 | 767 | DLLTOOL | ||
1656 | 903 | OBJDUMP | 768 | OBJDUMP |
1657 | 904 | LN_S | 769 | LN_S |
1658 | 905 | NM | 770 | NM |
1659 | @@ -1012,6 +877,7 @@ | |||
1660 | 1012 | with_pic | 877 | with_pic |
1661 | 1013 | enable_fast_install | 878 | enable_fast_install |
1662 | 1014 | with_gnu_ld | 879 | with_gnu_ld |
1663 | 880 | with_sysroot | ||
1664 | 1015 | enable_libtool_lock | 881 | enable_libtool_lock |
1665 | 1016 | with_html_dir | 882 | with_html_dir |
1666 | 1017 | enable_gtk_doc | 883 | enable_gtk_doc |
1667 | @@ -1033,6 +899,8 @@ | |||
1668 | 1033 | PKG_CONFIG | 899 | PKG_CONFIG |
1669 | 1034 | PKG_CONFIG_PATH | 900 | PKG_CONFIG_PATH |
1670 | 1035 | PKG_CONFIG_LIBDIR | 901 | PKG_CONFIG_LIBDIR |
1671 | 902 | GTKDOC_DEPS_CFLAGS | ||
1672 | 903 | GTKDOC_DEPS_LIBS | ||
1673 | 1036 | LIBRARY_CFLAGS | 904 | LIBRARY_CFLAGS |
1674 | 1037 | LIBRARY_LIBS | 905 | LIBRARY_LIBS |
1675 | 1038 | TESTDEPS_CFLAGS | 906 | TESTDEPS_CFLAGS |
1676 | @@ -1589,7 +1457,7 @@ | |||
1677 | 1589 | # Omit some internal or obsolete options to make the list less imposing. | 1457 | # Omit some internal or obsolete options to make the list less imposing. |
1678 | 1590 | # This message is too long to be a string in the A/UX 3.1 sh. | 1458 | # This message is too long to be a string in the A/UX 3.1 sh. |
1679 | 1591 | cat <<_ACEOF | 1459 | cat <<_ACEOF |
1681 | 1592 | \`configure' configures libappindicator 0.3.91 to adapt to many kinds of systems. | 1460 | \`configure' configures libappindicator 0.4.1 to adapt to many kinds of systems. |
1682 | 1593 | 1461 | ||
1683 | 1594 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1462 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1684 | 1595 | 1463 | ||
1685 | @@ -1659,7 +1527,7 @@ | |||
1686 | 1659 | 1527 | ||
1687 | 1660 | if test -n "$ac_init_help"; then | 1528 | if test -n "$ac_init_help"; then |
1688 | 1661 | case $ac_init_help in | 1529 | case $ac_init_help in |
1690 | 1662 | short | recursive ) echo "Configuration of libappindicator 0.3.91:";; | 1530 | short | recursive ) echo "Configuration of libappindicator 0.4.1:";; |
1691 | 1663 | esac | 1531 | esac |
1692 | 1664 | cat <<\_ACEOF | 1532 | cat <<\_ACEOF |
1693 | 1665 | 1533 | ||
1694 | @@ -1692,6 +1560,8 @@ | |||
1695 | 1692 | --with-pic try to use only PIC/non-PIC objects [default=use | 1560 | --with-pic try to use only PIC/non-PIC objects [default=use |
1696 | 1693 | both] | 1561 | both] |
1697 | 1694 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] | 1562 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
1698 | 1563 | --with-sysroot=DIR Search for dependent libraries within DIR | ||
1699 | 1564 | (or the compiler's sysroot if not specified). | ||
1700 | 1695 | --with-html-dir=PATH path to installed docs | 1565 | --with-html-dir=PATH path to installed docs |
1701 | 1696 | --with-gtk Which version of gtk to use [default=2] | 1566 | --with-gtk Which version of gtk to use [default=2] |
1702 | 1697 | 1567 | ||
1703 | @@ -1709,6 +1579,10 @@ | |||
1704 | 1709 | directories to add to pkg-config's search path | 1579 | directories to add to pkg-config's search path |
1705 | 1710 | PKG_CONFIG_LIBDIR | 1580 | PKG_CONFIG_LIBDIR |
1706 | 1711 | path overriding pkg-config's built-in search path | 1581 | path overriding pkg-config's built-in search path |
1707 | 1582 | GTKDOC_DEPS_CFLAGS | ||
1708 | 1583 | C compiler flags for GTKDOC_DEPS, overriding pkg-config | ||
1709 | 1584 | GTKDOC_DEPS_LIBS | ||
1710 | 1585 | linker flags for GTKDOC_DEPS, overriding pkg-config | ||
1711 | 1712 | LIBRARY_CFLAGS | 1586 | LIBRARY_CFLAGS |
1712 | 1713 | C compiler flags for LIBRARY, overriding pkg-config | 1587 | C compiler flags for LIBRARY, overriding pkg-config |
1713 | 1714 | LIBRARY_LIBS | 1588 | LIBRARY_LIBS |
1714 | @@ -1802,7 +1676,7 @@ | |||
1715 | 1802 | test -n "$ac_init_help" && exit $ac_status | 1676 | test -n "$ac_init_help" && exit $ac_status |
1716 | 1803 | if $ac_init_version; then | 1677 | if $ac_init_version; then |
1717 | 1804 | cat <<\_ACEOF | 1678 | cat <<\_ACEOF |
1719 | 1805 | libappindicator configure 0.3.91 | 1679 | libappindicator configure 0.4.1 |
1720 | 1806 | generated by GNU Autoconf 2.68 | 1680 | generated by GNU Autoconf 2.68 |
1721 | 1807 | 1681 | ||
1722 | 1808 | Copyright (C) 2010 Free Software Foundation, Inc. | 1682 | Copyright (C) 2010 Free Software Foundation, Inc. |
1723 | @@ -2082,7 +1956,7 @@ | |||
1724 | 2082 | This file contains any messages produced by compilers while | 1956 | This file contains any messages produced by compilers while |
1725 | 2083 | running configure, to aid debugging if configure makes a mistake. | 1957 | running configure, to aid debugging if configure makes a mistake. |
1726 | 2084 | 1958 | ||
1728 | 2085 | It was created by libappindicator $as_me 0.3.91, which was | 1959 | It was created by libappindicator $as_me 0.4.1, which was |
1729 | 2086 | generated by GNU Autoconf 2.68. Invocation command line was | 1960 | generated by GNU Autoconf 2.68. Invocation command line was |
1730 | 2087 | 1961 | ||
1731 | 2088 | $ $0 $@ | 1962 | $ $0 $@ |
1732 | @@ -2905,7 +2779,7 @@ | |||
1733 | 2905 | 2779 | ||
1734 | 2906 | # Define the identity of the package. | 2780 | # Define the identity of the package. |
1735 | 2907 | PACKAGE='libappindicator' | 2781 | PACKAGE='libappindicator' |
1737 | 2908 | VERSION='0.3.91' | 2782 | VERSION='0.4.1' |
1738 | 2909 | 2783 | ||
1739 | 2910 | 2784 | ||
1740 | 2911 | cat >>confdefs.h <<_ACEOF | 2785 | cat >>confdefs.h <<_ACEOF |
1741 | @@ -4181,8 +4055,8 @@ | |||
1742 | 4181 | 4055 | ||
1743 | 4182 | 4056 | ||
1744 | 4183 | 4057 | ||
1747 | 4184 | macro_version='2.2.6b' | 4058 | macro_version='2.4' |
1748 | 4185 | macro_revision='1.3017' | 4059 | macro_revision='1.3293' |
1749 | 4186 | 4060 | ||
1750 | 4187 | 4061 | ||
1751 | 4188 | 4062 | ||
1752 | @@ -4269,6 +4143,75 @@ | |||
1753 | 4269 | case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac | 4143 | case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac |
1754 | 4270 | 4144 | ||
1755 | 4271 | 4145 | ||
1756 | 4146 | # Backslashify metacharacters that are still active within | ||
1757 | 4147 | # double-quoted strings. | ||
1758 | 4148 | sed_quote_subst='s/\(["`$\\]\)/\\\1/g' | ||
1759 | 4149 | |||
1760 | 4150 | # Same as above, but do not quote variable references. | ||
1761 | 4151 | double_quote_subst='s/\(["`\\]\)/\\\1/g' | ||
1762 | 4152 | |||
1763 | 4153 | # Sed substitution to delay expansion of an escaped shell variable in a | ||
1764 | 4154 | # double_quote_subst'ed string. | ||
1765 | 4155 | delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' | ||
1766 | 4156 | |||
1767 | 4157 | # Sed substitution to delay expansion of an escaped single quote. | ||
1768 | 4158 | delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' | ||
1769 | 4159 | |||
1770 | 4160 | # Sed substitution to avoid accidental globbing in evaled expressions | ||
1771 | 4161 | no_glob_subst='s/\*/\\\*/g' | ||
1772 | 4162 | |||
1773 | 4163 | ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' | ||
1774 | 4164 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO | ||
1775 | 4165 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | ||
1776 | 4166 | |||
1777 | 4167 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 | ||
1778 | 4168 | $as_echo_n "checking how to print strings... " >&6; } | ||
1779 | 4169 | # Test print first, because it will be a builtin if present. | ||
1780 | 4170 | if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | ||
1781 | 4171 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
1782 | 4172 | ECHO='print -r --' | ||
1783 | 4173 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | ||
1784 | 4174 | ECHO='printf %s\n' | ||
1785 | 4175 | else | ||
1786 | 4176 | # Use this function as a fallback that always works. | ||
1787 | 4177 | func_fallback_echo () | ||
1788 | 4178 | { | ||
1789 | 4179 | eval 'cat <<_LTECHO_EOF | ||
1790 | 4180 | $1 | ||
1791 | 4181 | _LTECHO_EOF' | ||
1792 | 4182 | } | ||
1793 | 4183 | ECHO='func_fallback_echo' | ||
1794 | 4184 | fi | ||
1795 | 4185 | |||
1796 | 4186 | # func_echo_all arg... | ||
1797 | 4187 | # Invoke $ECHO with all args, space-separated. | ||
1798 | 4188 | func_echo_all () | ||
1799 | 4189 | { | ||
1800 | 4190 | $ECHO "" | ||
1801 | 4191 | } | ||
1802 | 4192 | |||
1803 | 4193 | case "$ECHO" in | ||
1804 | 4194 | printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 | ||
1805 | 4195 | $as_echo "printf" >&6; } ;; | ||
1806 | 4196 | print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 | ||
1807 | 4197 | $as_echo "print -r" >&6; } ;; | ||
1808 | 4198 | *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 | ||
1809 | 4199 | $as_echo "cat" >&6; } ;; | ||
1810 | 4200 | esac | ||
1811 | 4201 | |||
1812 | 4202 | |||
1813 | 4203 | |||
1814 | 4204 | |||
1815 | 4205 | |||
1816 | 4206 | |||
1817 | 4207 | |||
1818 | 4208 | |||
1819 | 4209 | |||
1820 | 4210 | |||
1821 | 4211 | |||
1822 | 4212 | |||
1823 | 4213 | |||
1824 | 4214 | |||
1825 | 4272 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 | 4215 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 |
1826 | 4273 | $as_echo_n "checking for a sed that does not truncate output... " >&6; } | 4216 | $as_echo_n "checking for a sed that does not truncate output... " >&6; } |
1827 | 4274 | if ${ac_cv_path_SED+:} false; then : | 4217 | if ${ac_cv_path_SED+:} false; then : |
1828 | @@ -4734,8 +4677,11 @@ | |||
1829 | 4734 | NM="$lt_cv_path_NM" | 4677 | NM="$lt_cv_path_NM" |
1830 | 4735 | else | 4678 | else |
1831 | 4736 | # Didn't find any BSD compatible name lister, look for dumpbin. | 4679 | # Didn't find any BSD compatible name lister, look for dumpbin. |
1834 | 4737 | if test -n "$ac_tool_prefix"; then | 4680 | if test -n "$DUMPBIN"; then : |
1835 | 4738 | for ac_prog in "dumpbin -symbols" "link -dump -symbols" | 4681 | # Let the user override the test. |
1836 | 4682 | else | ||
1837 | 4683 | if test -n "$ac_tool_prefix"; then | ||
1838 | 4684 | for ac_prog in dumpbin "link -dump" | ||
1839 | 4739 | do | 4685 | do |
1840 | 4740 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | 4686 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
1841 | 4741 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | 4687 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
1842 | @@ -4779,7 +4725,7 @@ | |||
1843 | 4779 | fi | 4725 | fi |
1844 | 4780 | if test -z "$DUMPBIN"; then | 4726 | if test -z "$DUMPBIN"; then |
1845 | 4781 | ac_ct_DUMPBIN=$DUMPBIN | 4727 | ac_ct_DUMPBIN=$DUMPBIN |
1847 | 4782 | for ac_prog in "dumpbin -symbols" "link -dump -symbols" | 4728 | for ac_prog in dumpbin "link -dump" |
1848 | 4783 | do | 4729 | do |
1849 | 4784 | # Extract the first word of "$ac_prog", so it can be a program name with args. | 4730 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
1850 | 4785 | set dummy $ac_prog; ac_word=$2 | 4731 | set dummy $ac_prog; ac_word=$2 |
1851 | @@ -4834,6 +4780,15 @@ | |||
1852 | 4834 | fi | 4780 | fi |
1853 | 4835 | fi | 4781 | fi |
1854 | 4836 | 4782 | ||
1855 | 4783 | case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in | ||
1856 | 4784 | *COFF*) | ||
1857 | 4785 | DUMPBIN="$DUMPBIN -symbols" | ||
1858 | 4786 | ;; | ||
1859 | 4787 | *) | ||
1860 | 4788 | DUMPBIN=: | ||
1861 | 4789 | ;; | ||
1862 | 4790 | esac | ||
1863 | 4791 | fi | ||
1864 | 4837 | 4792 | ||
1865 | 4838 | if test "$DUMPBIN" != ":"; then | 4793 | if test "$DUMPBIN" != ":"; then |
1866 | 4839 | NM="$DUMPBIN" | 4794 | NM="$DUMPBIN" |
1867 | @@ -4853,13 +4808,13 @@ | |||
1868 | 4853 | else | 4808 | else |
1869 | 4854 | lt_cv_nm_interface="BSD nm" | 4809 | lt_cv_nm_interface="BSD nm" |
1870 | 4855 | echo "int some_variable = 0;" > conftest.$ac_ext | 4810 | echo "int some_variable = 0;" > conftest.$ac_ext |
1872 | 4856 | (eval echo "\"\$as_me:4856: $ac_compile\"" >&5) | 4811 | (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) |
1873 | 4857 | (eval "$ac_compile" 2>conftest.err) | 4812 | (eval "$ac_compile" 2>conftest.err) |
1874 | 4858 | cat conftest.err >&5 | 4813 | cat conftest.err >&5 |
1876 | 4859 | (eval echo "\"\$as_me:4859: $NM \\\"conftest.$ac_objext\\\"\"" >&5) | 4814 | (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
1877 | 4860 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) | 4815 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
1878 | 4861 | cat conftest.err >&5 | 4816 | cat conftest.err >&5 |
1880 | 4862 | (eval echo "\"\$as_me:4862: output\"" >&5) | 4817 | (eval echo "\"\$as_me:$LINENO: output\"" >&5) |
1881 | 4863 | cat conftest.out >&5 | 4818 | cat conftest.out >&5 |
1882 | 4864 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then | 4819 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
1883 | 4865 | lt_cv_nm_interface="MS dumpbin" | 4820 | lt_cv_nm_interface="MS dumpbin" |
1884 | @@ -4916,6 +4871,11 @@ | |||
1885 | 4916 | lt_cv_sys_max_cmd_len=8192; | 4871 | lt_cv_sys_max_cmd_len=8192; |
1886 | 4917 | ;; | 4872 | ;; |
1887 | 4918 | 4873 | ||
1888 | 4874 | mint*) | ||
1889 | 4875 | # On MiNT this can take a long time and run out of memory. | ||
1890 | 4876 | lt_cv_sys_max_cmd_len=8192; | ||
1891 | 4877 | ;; | ||
1892 | 4878 | |||
1893 | 4919 | amigaos*) | 4879 | amigaos*) |
1894 | 4920 | # On AmigaOS with pdksh, this test takes hours, literally. | 4880 | # On AmigaOS with pdksh, this test takes hours, literally. |
1895 | 4921 | # So we just punt and use a minimum line length of 8192. | 4881 | # So we just punt and use a minimum line length of 8192. |
1896 | @@ -4980,8 +4940,8 @@ | |||
1897 | 4980 | # If test is not a shell built-in, we'll probably end up computing a | 4940 | # If test is not a shell built-in, we'll probably end up computing a |
1898 | 4981 | # maximum length that is only half of the actual maximum length, but | 4941 | # maximum length that is only half of the actual maximum length, but |
1899 | 4982 | # we can't tell. | 4942 | # we can't tell. |
1902 | 4983 | while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ | 4943 | while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
1903 | 4984 | = "XX$teststring$teststring"; } >/dev/null 2>&1 && | 4944 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
1904 | 4985 | test $i != 17 # 1/2 MB should be enough | 4945 | test $i != 17 # 1/2 MB should be enough |
1905 | 4986 | do | 4946 | do |
1906 | 4987 | i=`expr $i + 1` | 4947 | i=`expr $i + 1` |
1907 | @@ -5023,8 +4983,8 @@ | |||
1908 | 5023 | # Try some XSI features | 4983 | # Try some XSI features |
1909 | 5024 | xsi_shell=no | 4984 | xsi_shell=no |
1910 | 5025 | ( _lt_dummy="a/b/c" | 4985 | ( _lt_dummy="a/b/c" |
1913 | 5026 | test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ | 4986 | test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
1914 | 5027 | = c,a/b,, \ | 4987 | = c,a/b,b/c, \ |
1915 | 5028 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 4988 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
1916 | 5029 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 4989 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
1917 | 5030 | && xsi_shell=yes | 4990 | && xsi_shell=yes |
1918 | @@ -5073,6 +5033,80 @@ | |||
1919 | 5073 | 5033 | ||
1920 | 5074 | 5034 | ||
1921 | 5075 | 5035 | ||
1922 | 5036 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 | ||
1923 | 5037 | $as_echo_n "checking how to convert $build file names to $host format... " >&6; } | ||
1924 | 5038 | if ${lt_cv_to_host_file_cmd+:} false; then : | ||
1925 | 5039 | $as_echo_n "(cached) " >&6 | ||
1926 | 5040 | else | ||
1927 | 5041 | case $host in | ||
1928 | 5042 | *-*-mingw* ) | ||
1929 | 5043 | case $build in | ||
1930 | 5044 | *-*-mingw* ) # actually msys | ||
1931 | 5045 | lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | ||
1932 | 5046 | ;; | ||
1933 | 5047 | *-*-cygwin* ) | ||
1934 | 5048 | lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | ||
1935 | 5049 | ;; | ||
1936 | 5050 | * ) # otherwise, assume *nix | ||
1937 | 5051 | lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | ||
1938 | 5052 | ;; | ||
1939 | 5053 | esac | ||
1940 | 5054 | ;; | ||
1941 | 5055 | *-*-cygwin* ) | ||
1942 | 5056 | case $build in | ||
1943 | 5057 | *-*-mingw* ) # actually msys | ||
1944 | 5058 | lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | ||
1945 | 5059 | ;; | ||
1946 | 5060 | *-*-cygwin* ) | ||
1947 | 5061 | lt_cv_to_host_file_cmd=func_convert_file_noop | ||
1948 | 5062 | ;; | ||
1949 | 5063 | * ) # otherwise, assume *nix | ||
1950 | 5064 | lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | ||
1951 | 5065 | ;; | ||
1952 | 5066 | esac | ||
1953 | 5067 | ;; | ||
1954 | 5068 | * ) # unhandled hosts (and "normal" native builds) | ||
1955 | 5069 | lt_cv_to_host_file_cmd=func_convert_file_noop | ||
1956 | 5070 | ;; | ||
1957 | 5071 | esac | ||
1958 | 5072 | |||
1959 | 5073 | fi | ||
1960 | 5074 | |||
1961 | 5075 | to_host_file_cmd=$lt_cv_to_host_file_cmd | ||
1962 | 5076 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 | ||
1963 | 5077 | $as_echo "$lt_cv_to_host_file_cmd" >&6; } | ||
1964 | 5078 | |||
1965 | 5079 | |||
1966 | 5080 | |||
1967 | 5081 | |||
1968 | 5082 | |||
1969 | 5083 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 | ||
1970 | 5084 | $as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } | ||
1971 | 5085 | if ${lt_cv_to_tool_file_cmd+:} false; then : | ||
1972 | 5086 | $as_echo_n "(cached) " >&6 | ||
1973 | 5087 | else | ||
1974 | 5088 | #assume ordinary cross tools, or native build. | ||
1975 | 5089 | lt_cv_to_tool_file_cmd=func_convert_file_noop | ||
1976 | 5090 | case $host in | ||
1977 | 5091 | *-*-mingw* ) | ||
1978 | 5092 | case $build in | ||
1979 | 5093 | *-*-mingw* ) # actually msys | ||
1980 | 5094 | lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
1981 | 5095 | ;; | ||
1982 | 5096 | esac | ||
1983 | 5097 | ;; | ||
1984 | 5098 | esac | ||
1985 | 5099 | |||
1986 | 5100 | fi | ||
1987 | 5101 | |||
1988 | 5102 | to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
1989 | 5103 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 | ||
1990 | 5104 | $as_echo "$lt_cv_to_tool_file_cmd" >&6; } | ||
1991 | 5105 | |||
1992 | 5106 | |||
1993 | 5107 | |||
1994 | 5108 | |||
1995 | 5109 | |||
1996 | 5076 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 | 5110 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
1997 | 5077 | $as_echo_n "checking for $LD option to reload object files... " >&6; } | 5111 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
1998 | 5078 | if ${lt_cv_ld_reload_flag+:} false; then : | 5112 | if ${lt_cv_ld_reload_flag+:} false; then : |
1999 | @@ -5089,6 +5123,11 @@ | |||
2000 | 5089 | esac | 5123 | esac |
2001 | 5090 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 5124 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
2002 | 5091 | case $host_os in | 5125 | case $host_os in |
2003 | 5126 | cygwin* | mingw* | pw32* | cegcc*) | ||
2004 | 5127 | if test "$GCC" != yes; then | ||
2005 | 5128 | reload_cmds=false | ||
2006 | 5129 | fi | ||
2007 | 5130 | ;; | ||
2008 | 5092 | darwin*) | 5131 | darwin*) |
2009 | 5093 | if test "$GCC" = yes; then | 5132 | if test "$GCC" = yes; then |
2010 | 5094 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 5133 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
2011 | @@ -5252,16 +5291,18 @@ | |||
2012 | 5252 | # Base MSYS/MinGW do not provide the 'file' command needed by | 5291 | # Base MSYS/MinGW do not provide the 'file' command needed by |
2013 | 5253 | # func_win32_libid shell function, so use a weaker test based on 'objdump', | 5292 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
2014 | 5254 | # unless we find 'file', for example because we are cross-compiling. | 5293 | # unless we find 'file', for example because we are cross-compiling. |
2016 | 5255 | if ( file / ) >/dev/null 2>&1; then | 5294 | # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. |
2017 | 5295 | if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then | ||
2018 | 5256 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 5296 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
2019 | 5257 | lt_cv_file_magic_cmd='func_win32_libid' | 5297 | lt_cv_file_magic_cmd='func_win32_libid' |
2020 | 5258 | else | 5298 | else |
2022 | 5259 | lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | 5299 | # Keep this pattern in sync with the one in func_win32_libid. |
2023 | 5300 | lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
2024 | 5260 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 5301 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
2025 | 5261 | fi | 5302 | fi |
2026 | 5262 | ;; | 5303 | ;; |
2027 | 5263 | 5304 | ||
2029 | 5264 | cegcc) | 5305 | cegcc*) |
2030 | 5265 | # use the weaker test based on 'objdump'. See mingw*. | 5306 | # use the weaker test based on 'objdump'. See mingw*. |
2031 | 5266 | lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' | 5307 | lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' |
2032 | 5267 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 5308 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
2033 | @@ -5291,6 +5332,10 @@ | |||
2034 | 5291 | lt_cv_deplibs_check_method=pass_all | 5332 | lt_cv_deplibs_check_method=pass_all |
2035 | 5292 | ;; | 5333 | ;; |
2036 | 5293 | 5334 | ||
2037 | 5335 | haiku*) | ||
2038 | 5336 | lt_cv_deplibs_check_method=pass_all | ||
2039 | 5337 | ;; | ||
2040 | 5338 | |||
2041 | 5294 | hpux10.20* | hpux11*) | 5339 | hpux10.20* | hpux11*) |
2042 | 5295 | lt_cv_file_magic_cmd=/usr/bin/file | 5340 | lt_cv_file_magic_cmd=/usr/bin/file |
2043 | 5296 | case $host_cpu in | 5341 | case $host_cpu in |
2044 | @@ -5299,11 +5344,11 @@ | |||
2045 | 5299 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so | 5344 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
2046 | 5300 | ;; | 5345 | ;; |
2047 | 5301 | hppa*64*) | 5346 | hppa*64*) |
2049 | 5302 | 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]' | 5347 | 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 | 5303 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl | 5348 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl |
2051 | 5304 | ;; | 5349 | ;; |
2052 | 5305 | *) | 5350 | *) |
2054 | 5306 | lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' | 5351 | lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' |
2055 | 5307 | lt_cv_file_magic_test_file=/usr/lib/libc.sl | 5352 | lt_cv_file_magic_test_file=/usr/lib/libc.sl |
2056 | 5308 | ;; | 5353 | ;; |
2057 | 5309 | esac | 5354 | esac |
2058 | @@ -5406,6 +5451,21 @@ | |||
2059 | 5406 | fi | 5451 | fi |
2060 | 5407 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 | 5452 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
2061 | 5408 | $as_echo "$lt_cv_deplibs_check_method" >&6; } | 5453 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
2062 | 5454 | |||
2063 | 5455 | file_magic_glob= | ||
2064 | 5456 | want_nocaseglob=no | ||
2065 | 5457 | if test "$build" = "$host"; then | ||
2066 | 5458 | case $host_os in | ||
2067 | 5459 | mingw* | pw32*) | ||
2068 | 5460 | if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
2069 | 5461 | want_nocaseglob=yes | ||
2070 | 5462 | else | ||
2071 | 5463 | file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` | ||
2072 | 5464 | fi | ||
2073 | 5465 | ;; | ||
2074 | 5466 | esac | ||
2075 | 5467 | fi | ||
2076 | 5468 | |||
2077 | 5409 | file_magic_cmd=$lt_cv_file_magic_cmd | 5469 | file_magic_cmd=$lt_cv_file_magic_cmd |
2078 | 5410 | deplibs_check_method=$lt_cv_deplibs_check_method | 5470 | deplibs_check_method=$lt_cv_deplibs_check_method |
2079 | 5411 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 5471 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
2080 | @@ -5421,9 +5481,163 @@ | |||
2081 | 5421 | 5481 | ||
2082 | 5422 | 5482 | ||
2083 | 5423 | 5483 | ||
2087 | 5424 | if test -n "$ac_tool_prefix"; then | 5484 | |
2088 | 5425 | # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | 5485 | |
2089 | 5426 | set dummy ${ac_tool_prefix}ar; ac_word=$2 | 5486 | |
2090 | 5487 | |||
2091 | 5488 | |||
2092 | 5489 | |||
2093 | 5490 | |||
2094 | 5491 | |||
2095 | 5492 | |||
2096 | 5493 | |||
2097 | 5494 | if test -n "$ac_tool_prefix"; then | ||
2098 | 5495 | # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. | ||
2099 | 5496 | set dummy ${ac_tool_prefix}dlltool; ac_word=$2 | ||
2100 | 5497 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2101 | 5498 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2102 | 5499 | if ${ac_cv_prog_DLLTOOL+:} false; then : | ||
2103 | 5500 | $as_echo_n "(cached) " >&6 | ||
2104 | 5501 | else | ||
2105 | 5502 | if test -n "$DLLTOOL"; then | ||
2106 | 5503 | ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. | ||
2107 | 5504 | else | ||
2108 | 5505 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2109 | 5506 | for as_dir in $PATH | ||
2110 | 5507 | do | ||
2111 | 5508 | IFS=$as_save_IFS | ||
2112 | 5509 | test -z "$as_dir" && as_dir=. | ||
2113 | 5510 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2114 | 5511 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2115 | 5512 | ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" | ||
2116 | 5513 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2117 | 5514 | break 2 | ||
2118 | 5515 | fi | ||
2119 | 5516 | done | ||
2120 | 5517 | done | ||
2121 | 5518 | IFS=$as_save_IFS | ||
2122 | 5519 | |||
2123 | 5520 | fi | ||
2124 | 5521 | fi | ||
2125 | 5522 | DLLTOOL=$ac_cv_prog_DLLTOOL | ||
2126 | 5523 | if test -n "$DLLTOOL"; then | ||
2127 | 5524 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 | ||
2128 | 5525 | $as_echo "$DLLTOOL" >&6; } | ||
2129 | 5526 | else | ||
2130 | 5527 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2131 | 5528 | $as_echo "no" >&6; } | ||
2132 | 5529 | fi | ||
2133 | 5530 | |||
2134 | 5531 | |||
2135 | 5532 | fi | ||
2136 | 5533 | if test -z "$ac_cv_prog_DLLTOOL"; then | ||
2137 | 5534 | ac_ct_DLLTOOL=$DLLTOOL | ||
2138 | 5535 | # Extract the first word of "dlltool", so it can be a program name with args. | ||
2139 | 5536 | set dummy dlltool; ac_word=$2 | ||
2140 | 5537 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2141 | 5538 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2142 | 5539 | if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : | ||
2143 | 5540 | $as_echo_n "(cached) " >&6 | ||
2144 | 5541 | else | ||
2145 | 5542 | if test -n "$ac_ct_DLLTOOL"; then | ||
2146 | 5543 | ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. | ||
2147 | 5544 | else | ||
2148 | 5545 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2149 | 5546 | for as_dir in $PATH | ||
2150 | 5547 | do | ||
2151 | 5548 | IFS=$as_save_IFS | ||
2152 | 5549 | test -z "$as_dir" && as_dir=. | ||
2153 | 5550 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2154 | 5551 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2155 | 5552 | ac_cv_prog_ac_ct_DLLTOOL="dlltool" | ||
2156 | 5553 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2157 | 5554 | break 2 | ||
2158 | 5555 | fi | ||
2159 | 5556 | done | ||
2160 | 5557 | done | ||
2161 | 5558 | IFS=$as_save_IFS | ||
2162 | 5559 | |||
2163 | 5560 | fi | ||
2164 | 5561 | fi | ||
2165 | 5562 | ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL | ||
2166 | 5563 | if test -n "$ac_ct_DLLTOOL"; then | ||
2167 | 5564 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 | ||
2168 | 5565 | $as_echo "$ac_ct_DLLTOOL" >&6; } | ||
2169 | 5566 | else | ||
2170 | 5567 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2171 | 5568 | $as_echo "no" >&6; } | ||
2172 | 5569 | fi | ||
2173 | 5570 | |||
2174 | 5571 | if test "x$ac_ct_DLLTOOL" = x; then | ||
2175 | 5572 | DLLTOOL="false" | ||
2176 | 5573 | else | ||
2177 | 5574 | case $cross_compiling:$ac_tool_warned in | ||
2178 | 5575 | yes:) | ||
2179 | 5576 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
2180 | 5577 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
2181 | 5578 | ac_tool_warned=yes ;; | ||
2182 | 5579 | esac | ||
2183 | 5580 | DLLTOOL=$ac_ct_DLLTOOL | ||
2184 | 5581 | fi | ||
2185 | 5582 | else | ||
2186 | 5583 | DLLTOOL="$ac_cv_prog_DLLTOOL" | ||
2187 | 5584 | fi | ||
2188 | 5585 | |||
2189 | 5586 | test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
2190 | 5587 | |||
2191 | 5588 | |||
2192 | 5589 | |||
2193 | 5590 | |||
2194 | 5591 | |||
2195 | 5592 | |||
2196 | 5593 | |||
2197 | 5594 | |||
2198 | 5595 | |||
2199 | 5596 | |||
2200 | 5597 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 | ||
2201 | 5598 | $as_echo_n "checking how to associate runtime and link libraries... " >&6; } | ||
2202 | 5599 | if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : | ||
2203 | 5600 | $as_echo_n "(cached) " >&6 | ||
2204 | 5601 | else | ||
2205 | 5602 | lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
2206 | 5603 | |||
2207 | 5604 | case $host_os in | ||
2208 | 5605 | cygwin* | mingw* | pw32* | cegcc*) | ||
2209 | 5606 | # two different shell functions defined in ltmain.sh | ||
2210 | 5607 | # decide which to use based on capabilities of $DLLTOOL | ||
2211 | 5608 | case `$DLLTOOL --help 2>&1` in | ||
2212 | 5609 | *--identify-strict*) | ||
2213 | 5610 | lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
2214 | 5611 | ;; | ||
2215 | 5612 | *) | ||
2216 | 5613 | lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
2217 | 5614 | ;; | ||
2218 | 5615 | esac | ||
2219 | 5616 | ;; | ||
2220 | 5617 | *) | ||
2221 | 5618 | # fallback: assume linklib IS sharedlib | ||
2222 | 5619 | lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
2223 | 5620 | ;; | ||
2224 | 5621 | esac | ||
2225 | 5622 | |||
2226 | 5623 | fi | ||
2227 | 5624 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 | ||
2228 | 5625 | $as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } | ||
2229 | 5626 | sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
2230 | 5627 | test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
2231 | 5628 | |||
2232 | 5629 | |||
2233 | 5630 | |||
2234 | 5631 | |||
2235 | 5632 | |||
2236 | 5633 | |||
2237 | 5634 | |||
2238 | 5635 | |||
2239 | 5636 | if test -n "$ac_tool_prefix"; then | ||
2240 | 5637 | for ac_prog in ar | ||
2241 | 5638 | do | ||
2242 | 5639 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
2243 | 5640 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
2244 | 5427 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 5641 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2245 | 5428 | $as_echo_n "checking for $ac_word... " >&6; } | 5642 | $as_echo_n "checking for $ac_word... " >&6; } |
2246 | 5429 | if ${ac_cv_prog_AR+:} false; then : | 5643 | if ${ac_cv_prog_AR+:} false; then : |
2247 | @@ -5439,7 +5653,7 @@ | |||
2248 | 5439 | test -z "$as_dir" && as_dir=. | 5653 | test -z "$as_dir" && as_dir=. |
2249 | 5440 | for ac_exec_ext in '' $ac_executable_extensions; do | 5654 | for ac_exec_ext in '' $ac_executable_extensions; do |
2250 | 5441 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 5655 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2252 | 5442 | ac_cv_prog_AR="${ac_tool_prefix}ar" | 5656 | ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
2253 | 5443 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 5657 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2254 | 5444 | break 2 | 5658 | break 2 |
2255 | 5445 | fi | 5659 | fi |
2256 | @@ -5459,11 +5673,15 @@ | |||
2257 | 5459 | fi | 5673 | fi |
2258 | 5460 | 5674 | ||
2259 | 5461 | 5675 | ||
2260 | 5676 | test -n "$AR" && break | ||
2261 | 5677 | done | ||
2262 | 5462 | fi | 5678 | fi |
2264 | 5463 | if test -z "$ac_cv_prog_AR"; then | 5679 | if test -z "$AR"; then |
2265 | 5464 | ac_ct_AR=$AR | 5680 | ac_ct_AR=$AR |
2268 | 5465 | # Extract the first word of "ar", so it can be a program name with args. | 5681 | for ac_prog in ar |
2269 | 5466 | set dummy ar; ac_word=$2 | 5682 | do |
2270 | 5683 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
2271 | 5684 | set dummy $ac_prog; ac_word=$2 | ||
2272 | 5467 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 5685 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2273 | 5468 | $as_echo_n "checking for $ac_word... " >&6; } | 5686 | $as_echo_n "checking for $ac_word... " >&6; } |
2274 | 5469 | if ${ac_cv_prog_ac_ct_AR+:} false; then : | 5687 | if ${ac_cv_prog_ac_ct_AR+:} false; then : |
2275 | @@ -5479,7 +5697,7 @@ | |||
2276 | 5479 | test -z "$as_dir" && as_dir=. | 5697 | test -z "$as_dir" && as_dir=. |
2277 | 5480 | for ac_exec_ext in '' $ac_executable_extensions; do | 5698 | for ac_exec_ext in '' $ac_executable_extensions; do |
2278 | 5481 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 5699 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2280 | 5482 | ac_cv_prog_ac_ct_AR="ar" | 5700 | ac_cv_prog_ac_ct_AR="$ac_prog" |
2281 | 5483 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 5701 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2282 | 5484 | break 2 | 5702 | break 2 |
2283 | 5485 | fi | 5703 | fi |
2284 | @@ -5498,6 +5716,10 @@ | |||
2285 | 5498 | $as_echo "no" >&6; } | 5716 | $as_echo "no" >&6; } |
2286 | 5499 | fi | 5717 | fi |
2287 | 5500 | 5718 | ||
2288 | 5719 | |||
2289 | 5720 | test -n "$ac_ct_AR" && break | ||
2290 | 5721 | done | ||
2291 | 5722 | |||
2292 | 5501 | if test "x$ac_ct_AR" = x; then | 5723 | if test "x$ac_ct_AR" = x; then |
2293 | 5502 | AR="false" | 5724 | AR="false" |
2294 | 5503 | else | 5725 | else |
2295 | @@ -5509,16 +5731,72 @@ | |||
2296 | 5509 | esac | 5731 | esac |
2297 | 5510 | AR=$ac_ct_AR | 5732 | AR=$ac_ct_AR |
2298 | 5511 | fi | 5733 | fi |
2309 | 5512 | else | 5734 | fi |
2310 | 5513 | AR="$ac_cv_prog_AR" | 5735 | |
2311 | 5514 | fi | 5736 | : ${AR=ar} |
2312 | 5515 | 5737 | : ${AR_FLAGS=cru} | |
2313 | 5516 | test -z "$AR" && AR=ar | 5738 | |
2314 | 5517 | test -z "$AR_FLAGS" && AR_FLAGS=cru | 5739 | |
2315 | 5518 | 5740 | ||
2316 | 5519 | 5741 | ||
2317 | 5520 | 5742 | ||
2318 | 5521 | 5743 | ||
2319 | 5744 | |||
2320 | 5745 | |||
2321 | 5746 | |||
2322 | 5747 | |||
2323 | 5748 | |||
2324 | 5749 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 | ||
2325 | 5750 | $as_echo_n "checking for archiver @FILE support... " >&6; } | ||
2326 | 5751 | if ${lt_cv_ar_at_file+:} false; then : | ||
2327 | 5752 | $as_echo_n "(cached) " >&6 | ||
2328 | 5753 | else | ||
2329 | 5754 | lt_cv_ar_at_file=no | ||
2330 | 5755 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2331 | 5756 | /* end confdefs.h. */ | ||
2332 | 5757 | |||
2333 | 5758 | int | ||
2334 | 5759 | main () | ||
2335 | 5760 | { | ||
2336 | 5761 | |||
2337 | 5762 | ; | ||
2338 | 5763 | return 0; | ||
2339 | 5764 | } | ||
2340 | 5765 | _ACEOF | ||
2341 | 5766 | if ac_fn_c_try_compile "$LINENO"; then : | ||
2342 | 5767 | echo conftest.$ac_objext > conftest.lst | ||
2343 | 5768 | lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' | ||
2344 | 5769 | { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
2345 | 5770 | (eval $lt_ar_try) 2>&5 | ||
2346 | 5771 | ac_status=$? | ||
2347 | 5772 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
2348 | 5773 | test $ac_status = 0; } | ||
2349 | 5774 | if test "$ac_status" -eq 0; then | ||
2350 | 5775 | # Ensure the archiver fails upon bogus file names. | ||
2351 | 5776 | rm -f conftest.$ac_objext libconftest.a | ||
2352 | 5777 | { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 | ||
2353 | 5778 | (eval $lt_ar_try) 2>&5 | ||
2354 | 5779 | ac_status=$? | ||
2355 | 5780 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
2356 | 5781 | test $ac_status = 0; } | ||
2357 | 5782 | if test "$ac_status" -ne 0; then | ||
2358 | 5783 | lt_cv_ar_at_file=@ | ||
2359 | 5784 | fi | ||
2360 | 5785 | fi | ||
2361 | 5786 | rm -f conftest.* libconftest.a | ||
2362 | 5787 | |||
2363 | 5788 | fi | ||
2364 | 5789 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2365 | 5790 | |||
2366 | 5791 | fi | ||
2367 | 5792 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 | ||
2368 | 5793 | $as_echo "$lt_cv_ar_at_file" >&6; } | ||
2369 | 5794 | |||
2370 | 5795 | if test "x$lt_cv_ar_at_file" = xno; then | ||
2371 | 5796 | archiver_list_spec= | ||
2372 | 5797 | else | ||
2373 | 5798 | archiver_list_spec=$lt_cv_ar_at_file | ||
2374 | 5799 | fi | ||
2375 | 5522 | 5800 | ||
2376 | 5523 | 5801 | ||
2377 | 5524 | 5802 | ||
2378 | @@ -5741,6 +6019,18 @@ | |||
2379 | 5741 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" | 6019 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
2380 | 5742 | fi | 6020 | fi |
2381 | 5743 | 6021 | ||
2382 | 6022 | case $host_os in | ||
2383 | 6023 | darwin*) | ||
2384 | 6024 | lock_old_archive_extraction=yes ;; | ||
2385 | 6025 | *) | ||
2386 | 6026 | lock_old_archive_extraction=no ;; | ||
2387 | 6027 | esac | ||
2388 | 6028 | |||
2389 | 6029 | |||
2390 | 6030 | |||
2391 | 6031 | |||
2392 | 6032 | |||
2393 | 6033 | |||
2394 | 5744 | 6034 | ||
2395 | 5745 | 6035 | ||
2396 | 5746 | 6036 | ||
2397 | @@ -5848,8 +6138,8 @@ | |||
2398 | 5848 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 6138 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
2399 | 5849 | 6139 | ||
2400 | 5850 | # Transform an extracted symbol line into symbol name and symbol address | 6140 | # Transform an extracted symbol line into symbol name and symbol address |
2403 | 5851 | lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" | 6141 | 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 | 5852 | 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'" | 6142 | 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 | 5853 | 6143 | ||
2406 | 5854 | # Handle CRLF in mingw tool chain | 6144 | # Handle CRLF in mingw tool chain |
2407 | 5855 | opt_cr= | 6145 | opt_cr= |
2408 | @@ -5885,6 +6175,7 @@ | |||
2409 | 5885 | else | 6175 | else |
2410 | 5886 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 6176 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
2411 | 5887 | fi | 6177 | fi |
2412 | 6178 | lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
2413 | 5888 | 6179 | ||
2414 | 5889 | # Check to see that the pipe works correctly. | 6180 | # Check to see that the pipe works correctly. |
2415 | 5890 | pipe_works=no | 6181 | pipe_works=no |
2416 | @@ -5910,8 +6201,8 @@ | |||
2417 | 5910 | test $ac_status = 0; }; then | 6201 | test $ac_status = 0; }; then |
2418 | 5911 | # Now try to grab the symbols. | 6202 | # Now try to grab the symbols. |
2419 | 5912 | nlist=conftest.nm | 6203 | nlist=conftest.nm |
2422 | 5913 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 | 6204 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 |
2423 | 5914 | (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 | 6205 | (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 |
2424 | 5915 | ac_status=$? | 6206 | ac_status=$? |
2425 | 5916 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 6207 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2426 | 5917 | test $ac_status = 0; } && test -s "$nlist"; then | 6208 | test $ac_status = 0; } && test -s "$nlist"; then |
2427 | @@ -5926,6 +6217,18 @@ | |||
2428 | 5926 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 6217 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
2429 | 5927 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 6218 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
2430 | 5928 | cat <<_LT_EOF > conftest.$ac_ext | 6219 | cat <<_LT_EOF > conftest.$ac_ext |
2431 | 6220 | /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
2432 | 6221 | #if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
2433 | 6222 | /* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
2434 | 6223 | relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
2435 | 6224 | # define LT_DLSYM_CONST | ||
2436 | 6225 | #elif defined(__osf__) | ||
2437 | 6226 | /* This system does not cope well with relocations in const data. */ | ||
2438 | 6227 | # define LT_DLSYM_CONST | ||
2439 | 6228 | #else | ||
2440 | 6229 | # define LT_DLSYM_CONST const | ||
2441 | 6230 | #endif | ||
2442 | 6231 | |||
2443 | 5929 | #ifdef __cplusplus | 6232 | #ifdef __cplusplus |
2444 | 5930 | extern "C" { | 6233 | extern "C" { |
2445 | 5931 | #endif | 6234 | #endif |
2446 | @@ -5937,7 +6240,7 @@ | |||
2447 | 5937 | cat <<_LT_EOF >> conftest.$ac_ext | 6240 | cat <<_LT_EOF >> conftest.$ac_ext |
2448 | 5938 | 6241 | ||
2449 | 5939 | /* The mapping between symbol names and symbols. */ | 6242 | /* The mapping between symbol names and symbols. */ |
2451 | 5940 | const struct { | 6243 | LT_DLSYM_CONST struct { |
2452 | 5941 | const char *name; | 6244 | const char *name; |
2453 | 5942 | void *address; | 6245 | void *address; |
2454 | 5943 | } | 6246 | } |
2455 | @@ -5963,8 +6266,8 @@ | |||
2456 | 5963 | _LT_EOF | 6266 | _LT_EOF |
2457 | 5964 | # Now try linking the two files. | 6267 | # Now try linking the two files. |
2458 | 5965 | mv conftest.$ac_objext conftstm.$ac_objext | 6268 | mv conftest.$ac_objext conftstm.$ac_objext |
2461 | 5966 | lt_save_LIBS="$LIBS" | 6269 | lt_globsym_save_LIBS=$LIBS |
2462 | 5967 | lt_save_CFLAGS="$CFLAGS" | 6270 | lt_globsym_save_CFLAGS=$CFLAGS |
2463 | 5968 | LIBS="conftstm.$ac_objext" | 6271 | LIBS="conftstm.$ac_objext" |
2464 | 5969 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" | 6272 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
2465 | 5970 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 | 6273 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
2466 | @@ -5974,8 +6277,8 @@ | |||
2467 | 5974 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then | 6277 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
2468 | 5975 | pipe_works=yes | 6278 | pipe_works=yes |
2469 | 5976 | fi | 6279 | fi |
2472 | 5977 | LIBS="$lt_save_LIBS" | 6280 | LIBS=$lt_globsym_save_LIBS |
2473 | 5978 | CFLAGS="$lt_save_CFLAGS" | 6281 | CFLAGS=$lt_globsym_save_CFLAGS |
2474 | 5979 | else | 6282 | else |
2475 | 5980 | echo "cannot find nm_test_func in $nlist" >&5 | 6283 | echo "cannot find nm_test_func in $nlist" >&5 |
2476 | 5981 | fi | 6284 | fi |
2477 | @@ -6012,23 +6315,71 @@ | |||
2478 | 6012 | $as_echo "ok" >&6; } | 6315 | $as_echo "ok" >&6; } |
2479 | 6013 | fi | 6316 | fi |
2480 | 6014 | 6317 | ||
2498 | 6015 | 6318 | # Response file support. | |
2499 | 6016 | 6319 | if test "$lt_cv_nm_interface" = "MS dumpbin"; then | |
2500 | 6017 | 6320 | nm_file_list_spec='@' | |
2501 | 6018 | 6321 | elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then | |
2502 | 6019 | 6322 | nm_file_list_spec='@' | |
2503 | 6020 | 6323 | fi | |
2504 | 6021 | 6324 | ||
2505 | 6022 | 6325 | ||
2506 | 6023 | 6326 | ||
2507 | 6024 | 6327 | ||
2508 | 6025 | 6328 | ||
2509 | 6026 | 6329 | ||
2510 | 6027 | 6330 | ||
2511 | 6028 | 6331 | ||
2512 | 6029 | 6332 | ||
2513 | 6030 | 6333 | ||
2514 | 6031 | 6334 | ||
2515 | 6335 | |||
2516 | 6336 | |||
2517 | 6337 | |||
2518 | 6338 | |||
2519 | 6339 | |||
2520 | 6340 | |||
2521 | 6341 | |||
2522 | 6342 | |||
2523 | 6343 | |||
2524 | 6344 | |||
2525 | 6345 | |||
2526 | 6346 | |||
2527 | 6347 | |||
2528 | 6348 | |||
2529 | 6349 | |||
2530 | 6350 | |||
2531 | 6351 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 | ||
2532 | 6352 | $as_echo_n "checking for sysroot... " >&6; } | ||
2533 | 6353 | |||
2534 | 6354 | # Check whether --with-sysroot was given. | ||
2535 | 6355 | if test "${with_sysroot+set}" = set; then : | ||
2536 | 6356 | withval=$with_sysroot; | ||
2537 | 6357 | else | ||
2538 | 6358 | with_sysroot=no | ||
2539 | 6359 | fi | ||
2540 | 6360 | |||
2541 | 6361 | |||
2542 | 6362 | lt_sysroot= | ||
2543 | 6363 | case ${with_sysroot} in #( | ||
2544 | 6364 | yes) | ||
2545 | 6365 | if test "$GCC" = yes; then | ||
2546 | 6366 | lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
2547 | 6367 | fi | ||
2548 | 6368 | ;; #( | ||
2549 | 6369 | /*) | ||
2550 | 6370 | lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` | ||
2551 | 6371 | ;; #( | ||
2552 | 6372 | no|'') | ||
2553 | 6373 | ;; #( | ||
2554 | 6374 | *) | ||
2555 | 6375 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 | ||
2556 | 6376 | $as_echo "${with_sysroot}" >&6; } | ||
2557 | 6377 | as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 | ||
2558 | 6378 | ;; | ||
2559 | 6379 | esac | ||
2560 | 6380 | |||
2561 | 6381 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 | ||
2562 | 6382 | $as_echo "${lt_sysroot:-no}" >&6; } | ||
2563 | 6032 | 6383 | ||
2564 | 6033 | 6384 | ||
2565 | 6034 | 6385 | ||
2566 | @@ -6065,7 +6416,7 @@ | |||
2567 | 6065 | ;; | 6416 | ;; |
2568 | 6066 | *-*-irix6*) | 6417 | *-*-irix6*) |
2569 | 6067 | # Find out which ABI we are using. | 6418 | # Find out which ABI we are using. |
2571 | 6068 | echo '#line 6068 "configure"' > conftest.$ac_ext | 6419 | echo '#line '$LINENO' "configure"' > conftest.$ac_ext |
2572 | 6069 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 6420 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
2573 | 6070 | (eval $ac_compile) 2>&5 | 6421 | (eval $ac_compile) 2>&5 |
2574 | 6071 | ac_status=$? | 6422 | ac_status=$? |
2575 | @@ -6227,6 +6578,123 @@ | |||
2576 | 6227 | 6578 | ||
2577 | 6228 | need_locks="$enable_libtool_lock" | 6579 | need_locks="$enable_libtool_lock" |
2578 | 6229 | 6580 | ||
2579 | 6581 | if test -n "$ac_tool_prefix"; then | ||
2580 | 6582 | # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. | ||
2581 | 6583 | set dummy ${ac_tool_prefix}mt; ac_word=$2 | ||
2582 | 6584 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2583 | 6585 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2584 | 6586 | if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : | ||
2585 | 6587 | $as_echo_n "(cached) " >&6 | ||
2586 | 6588 | else | ||
2587 | 6589 | if test -n "$MANIFEST_TOOL"; then | ||
2588 | 6590 | ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. | ||
2589 | 6591 | else | ||
2590 | 6592 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2591 | 6593 | for as_dir in $PATH | ||
2592 | 6594 | do | ||
2593 | 6595 | IFS=$as_save_IFS | ||
2594 | 6596 | test -z "$as_dir" && as_dir=. | ||
2595 | 6597 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2596 | 6598 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2597 | 6599 | ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" | ||
2598 | 6600 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2599 | 6601 | break 2 | ||
2600 | 6602 | fi | ||
2601 | 6603 | done | ||
2602 | 6604 | done | ||
2603 | 6605 | IFS=$as_save_IFS | ||
2604 | 6606 | |||
2605 | 6607 | fi | ||
2606 | 6608 | fi | ||
2607 | 6609 | MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL | ||
2608 | 6610 | if test -n "$MANIFEST_TOOL"; then | ||
2609 | 6611 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 | ||
2610 | 6612 | $as_echo "$MANIFEST_TOOL" >&6; } | ||
2611 | 6613 | else | ||
2612 | 6614 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2613 | 6615 | $as_echo "no" >&6; } | ||
2614 | 6616 | fi | ||
2615 | 6617 | |||
2616 | 6618 | |||
2617 | 6619 | fi | ||
2618 | 6620 | if test -z "$ac_cv_prog_MANIFEST_TOOL"; then | ||
2619 | 6621 | ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL | ||
2620 | 6622 | # Extract the first word of "mt", so it can be a program name with args. | ||
2621 | 6623 | set dummy mt; ac_word=$2 | ||
2622 | 6624 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2623 | 6625 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2624 | 6626 | if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : | ||
2625 | 6627 | $as_echo_n "(cached) " >&6 | ||
2626 | 6628 | else | ||
2627 | 6629 | if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
2628 | 6630 | ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. | ||
2629 | 6631 | else | ||
2630 | 6632 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2631 | 6633 | for as_dir in $PATH | ||
2632 | 6634 | do | ||
2633 | 6635 | IFS=$as_save_IFS | ||
2634 | 6636 | test -z "$as_dir" && as_dir=. | ||
2635 | 6637 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2636 | 6638 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
2637 | 6639 | ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" | ||
2638 | 6640 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2639 | 6641 | break 2 | ||
2640 | 6642 | fi | ||
2641 | 6643 | done | ||
2642 | 6644 | done | ||
2643 | 6645 | IFS=$as_save_IFS | ||
2644 | 6646 | |||
2645 | 6647 | fi | ||
2646 | 6648 | fi | ||
2647 | 6649 | ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL | ||
2648 | 6650 | if test -n "$ac_ct_MANIFEST_TOOL"; then | ||
2649 | 6651 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 | ||
2650 | 6652 | $as_echo "$ac_ct_MANIFEST_TOOL" >&6; } | ||
2651 | 6653 | else | ||
2652 | 6654 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2653 | 6655 | $as_echo "no" >&6; } | ||
2654 | 6656 | fi | ||
2655 | 6657 | |||
2656 | 6658 | if test "x$ac_ct_MANIFEST_TOOL" = x; then | ||
2657 | 6659 | MANIFEST_TOOL=":" | ||
2658 | 6660 | else | ||
2659 | 6661 | case $cross_compiling:$ac_tool_warned in | ||
2660 | 6662 | yes:) | ||
2661 | 6663 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
2662 | 6664 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
2663 | 6665 | ac_tool_warned=yes ;; | ||
2664 | 6666 | esac | ||
2665 | 6667 | MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL | ||
2666 | 6668 | fi | ||
2667 | 6669 | else | ||
2668 | 6670 | MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" | ||
2669 | 6671 | fi | ||
2670 | 6672 | |||
2671 | 6673 | test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
2672 | 6674 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 | ||
2673 | 6675 | $as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } | ||
2674 | 6676 | if ${lt_cv_path_mainfest_tool+:} false; then : | ||
2675 | 6677 | $as_echo_n "(cached) " >&6 | ||
2676 | 6678 | else | ||
2677 | 6679 | lt_cv_path_mainfest_tool=no | ||
2678 | 6680 | echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 | ||
2679 | 6681 | $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
2680 | 6682 | cat conftest.err >&5 | ||
2681 | 6683 | if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
2682 | 6684 | lt_cv_path_mainfest_tool=yes | ||
2683 | 6685 | fi | ||
2684 | 6686 | rm -f conftest* | ||
2685 | 6687 | fi | ||
2686 | 6688 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 | ||
2687 | 6689 | $as_echo "$lt_cv_path_mainfest_tool" >&6; } | ||
2688 | 6690 | if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
2689 | 6691 | MANIFEST_TOOL=: | ||
2690 | 6692 | fi | ||
2691 | 6693 | |||
2692 | 6694 | |||
2693 | 6695 | |||
2694 | 6696 | |||
2695 | 6697 | |||
2696 | 6230 | 6698 | ||
2697 | 6231 | case $host_os in | 6699 | case $host_os in |
2698 | 6232 | rhapsody* | darwin*) | 6700 | rhapsody* | darwin*) |
2699 | @@ -6777,6 +7245,38 @@ | |||
2700 | 6777 | fi | 7245 | fi |
2701 | 6778 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 | 7246 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 |
2702 | 6779 | $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } | 7247 | $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } |
2703 | 7248 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 | ||
2704 | 7249 | $as_echo_n "checking for -force_load linker flag... " >&6; } | ||
2705 | 7250 | if ${lt_cv_ld_force_load+:} false; then : | ||
2706 | 7251 | $as_echo_n "(cached) " >&6 | ||
2707 | 7252 | else | ||
2708 | 7253 | lt_cv_ld_force_load=no | ||
2709 | 7254 | cat > conftest.c << _LT_EOF | ||
2710 | 7255 | int forced_loaded() { return 2;} | ||
2711 | 7256 | _LT_EOF | ||
2712 | 7257 | echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 | ||
2713 | 7258 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 | ||
2714 | 7259 | echo "$AR cru libconftest.a conftest.o" >&5 | ||
2715 | 7260 | $AR cru libconftest.a conftest.o 2>&5 | ||
2716 | 7261 | echo "$RANLIB libconftest.a" >&5 | ||
2717 | 7262 | $RANLIB libconftest.a 2>&5 | ||
2718 | 7263 | cat > conftest.c << _LT_EOF | ||
2719 | 7264 | int main() { return 0;} | ||
2720 | 7265 | _LT_EOF | ||
2721 | 7266 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 | ||
2722 | 7267 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err | ||
2723 | 7268 | _lt_result=$? | ||
2724 | 7269 | if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then | ||
2725 | 7270 | lt_cv_ld_force_load=yes | ||
2726 | 7271 | else | ||
2727 | 7272 | cat conftest.err >&5 | ||
2728 | 7273 | fi | ||
2729 | 7274 | rm -f conftest.err libconftest.a conftest conftest.c | ||
2730 | 7275 | rm -rf conftest.dSYM | ||
2731 | 7276 | |||
2732 | 7277 | fi | ||
2733 | 7278 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 | ||
2734 | 7279 | $as_echo "$lt_cv_ld_force_load" >&6; } | ||
2735 | 6780 | case $host_os in | 7280 | case $host_os in |
2736 | 6781 | rhapsody* | darwin1.[012]) | 7281 | rhapsody* | darwin1.[012]) |
2737 | 6782 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; | 7282 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
2738 | @@ -6804,7 +7304,7 @@ | |||
2739 | 6804 | else | 7304 | else |
2740 | 6805 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' | 7305 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
2741 | 6806 | fi | 7306 | fi |
2743 | 6807 | if test "$DSYMUTIL" != ":"; then | 7307 | if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then |
2744 | 6808 | _lt_dsymutil='~$DSYMUTIL $lib || :' | 7308 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
2745 | 6809 | else | 7309 | else |
2746 | 6810 | _lt_dsymutil= | 7310 | _lt_dsymutil= |
2747 | @@ -7094,6 +7594,8 @@ | |||
2748 | 7094 | 7594 | ||
2749 | 7095 | 7595 | ||
2750 | 7096 | 7596 | ||
2751 | 7597 | |||
2752 | 7598 | |||
2753 | 7097 | # Set options | 7599 | # Set options |
2754 | 7098 | 7600 | ||
2755 | 7099 | 7601 | ||
2756 | @@ -7246,6 +7748,7 @@ | |||
2757 | 7246 | 7748 | ||
2758 | 7247 | 7749 | ||
2759 | 7248 | 7750 | ||
2760 | 7751 | |||
2761 | 7249 | test -z "$LN_S" && LN_S="ln -s" | 7752 | test -z "$LN_S" && LN_S="ln -s" |
2762 | 7250 | 7753 | ||
2763 | 7251 | 7754 | ||
2764 | @@ -7295,19 +7798,6 @@ | |||
2765 | 7295 | 7798 | ||
2766 | 7296 | 7799 | ||
2767 | 7297 | 7800 | ||
2768 | 7298 | |||
2769 | 7299 | |||
2770 | 7300 | |||
2771 | 7301 | |||
2772 | 7302 | |||
2773 | 7303 | |||
2774 | 7304 | |||
2775 | 7305 | |||
2776 | 7306 | |||
2777 | 7307 | |||
2778 | 7308 | |||
2779 | 7309 | |||
2780 | 7310 | |||
2781 | 7311 | case $host_os in | 7801 | case $host_os in |
2782 | 7312 | aix3*) | 7802 | aix3*) |
2783 | 7313 | # AIX sometimes has problems with the GCC collect2 program. For some | 7803 | # AIX sometimes has problems with the GCC collect2 program. For some |
2784 | @@ -7320,23 +7810,6 @@ | |||
2785 | 7320 | ;; | 7810 | ;; |
2786 | 7321 | esac | 7811 | esac |
2787 | 7322 | 7812 | ||
2788 | 7323 | # Sed substitution that helps us do robust quoting. It backslashifies | ||
2789 | 7324 | # metacharacters that are still active within double-quoted strings. | ||
2790 | 7325 | sed_quote_subst='s/\(["`$\\]\)/\\\1/g' | ||
2791 | 7326 | |||
2792 | 7327 | # Same as above, but do not quote variable references. | ||
2793 | 7328 | double_quote_subst='s/\(["`\\]\)/\\\1/g' | ||
2794 | 7329 | |||
2795 | 7330 | # Sed substitution to delay expansion of an escaped shell variable in a | ||
2796 | 7331 | # double_quote_subst'ed string. | ||
2797 | 7332 | delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' | ||
2798 | 7333 | |||
2799 | 7334 | # Sed substitution to delay expansion of an escaped single quote. | ||
2800 | 7335 | delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' | ||
2801 | 7336 | |||
2802 | 7337 | # Sed substitution to avoid accidental globbing in evaled expressions | ||
2803 | 7338 | no_glob_subst='s/\*/\\\*/g' | ||
2804 | 7339 | |||
2805 | 7340 | # Global variables: | 7813 | # Global variables: |
2806 | 7341 | ofile=libtool | 7814 | ofile=libtool |
2807 | 7342 | can_build_shared=yes | 7815 | can_build_shared=yes |
2808 | @@ -7365,7 +7838,7 @@ | |||
2809 | 7365 | *) break;; | 7838 | *) break;; |
2810 | 7366 | esac | 7839 | esac |
2811 | 7367 | done | 7840 | done |
2813 | 7368 | cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` | 7841 | cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` |
2814 | 7369 | 7842 | ||
2815 | 7370 | 7843 | ||
2816 | 7371 | # Only perform the check for file, if the check method requires it | 7844 | # Only perform the check for file, if the check method requires it |
2817 | @@ -7574,7 +8047,12 @@ | |||
2818 | 7574 | lt_prog_compiler_no_builtin_flag= | 8047 | lt_prog_compiler_no_builtin_flag= |
2819 | 7575 | 8048 | ||
2820 | 7576 | if test "$GCC" = yes; then | 8049 | if test "$GCC" = yes; then |
2822 | 7577 | lt_prog_compiler_no_builtin_flag=' -fno-builtin' | 8050 | case $cc_basename in |
2823 | 8051 | nvcc*) | ||
2824 | 8052 | lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; | ||
2825 | 8053 | *) | ||
2826 | 8054 | lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; | ||
2827 | 8055 | esac | ||
2828 | 7578 | 8056 | ||
2829 | 7579 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | 8057 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 |
2830 | 7580 | $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } | 8058 | $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } |
2831 | @@ -7594,15 +8072,15 @@ | |||
2832 | 7594 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 8072 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
2833 | 7595 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 8073 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
2834 | 7596 | -e 's:$: $lt_compiler_flag:'` | 8074 | -e 's:$: $lt_compiler_flag:'` |
2836 | 7597 | (eval echo "\"\$as_me:7597: $lt_compile\"" >&5) | 8075 | (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
2837 | 7598 | (eval "$lt_compile" 2>conftest.err) | 8076 | (eval "$lt_compile" 2>conftest.err) |
2838 | 7599 | ac_status=$? | 8077 | ac_status=$? |
2839 | 7600 | cat conftest.err >&5 | 8078 | cat conftest.err >&5 |
2841 | 7601 | echo "$as_me:7601: \$? = $ac_status" >&5 | 8079 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2842 | 7602 | if (exit $ac_status) && test -s "$ac_outfile"; then | 8080 | if (exit $ac_status) && test -s "$ac_outfile"; then |
2843 | 7603 | # The compiler can only warn and ignore the option if not recognized | 8081 | # The compiler can only warn and ignore the option if not recognized |
2844 | 7604 | # So say no if there are warnings other than the usual output. | 8082 | # So say no if there are warnings other than the usual output. |
2846 | 7605 | $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp | 8083 | $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
2847 | 7606 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | 8084 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2848 | 7607 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then | 8085 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
2849 | 7608 | lt_cv_prog_compiler_rtti_exceptions=yes | 8086 | lt_cv_prog_compiler_rtti_exceptions=yes |
2850 | @@ -7631,8 +8109,6 @@ | |||
2851 | 7631 | lt_prog_compiler_pic= | 8109 | lt_prog_compiler_pic= |
2852 | 7632 | lt_prog_compiler_static= | 8110 | lt_prog_compiler_static= |
2853 | 7633 | 8111 | ||
2854 | 7634 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 | ||
2855 | 7635 | $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | ||
2856 | 7636 | 8112 | ||
2857 | 7637 | if test "$GCC" = yes; then | 8113 | if test "$GCC" = yes; then |
2858 | 7638 | lt_prog_compiler_wl='-Wl,' | 8114 | lt_prog_compiler_wl='-Wl,' |
2859 | @@ -7680,6 +8156,12 @@ | |||
2860 | 7680 | lt_prog_compiler_pic='-fno-common' | 8156 | lt_prog_compiler_pic='-fno-common' |
2861 | 7681 | ;; | 8157 | ;; |
2862 | 7682 | 8158 | ||
2863 | 8159 | haiku*) | ||
2864 | 8160 | # PIC is the default for Haiku. | ||
2865 | 8161 | # The "-static" flag exists, but is broken. | ||
2866 | 8162 | lt_prog_compiler_static= | ||
2867 | 8163 | ;; | ||
2868 | 8164 | |||
2869 | 7683 | hpux*) | 8165 | hpux*) |
2870 | 7684 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit | 8166 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
2871 | 7685 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag | 8167 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
2872 | @@ -7722,6 +8204,13 @@ | |||
2873 | 7722 | lt_prog_compiler_pic='-fPIC' | 8204 | lt_prog_compiler_pic='-fPIC' |
2874 | 7723 | ;; | 8205 | ;; |
2875 | 7724 | esac | 8206 | esac |
2876 | 8207 | |||
2877 | 8208 | case $cc_basename in | ||
2878 | 8209 | nvcc*) # Cuda Compiler Driver 2.2 | ||
2879 | 8210 | lt_prog_compiler_wl='-Xlinker ' | ||
2880 | 8211 | lt_prog_compiler_pic='-Xcompiler -fPIC' | ||
2881 | 8212 | ;; | ||
2882 | 8213 | esac | ||
2883 | 7725 | else | 8214 | else |
2884 | 7726 | # PORTME Check for flag to pass linker flags through the system compiler. | 8215 | # PORTME Check for flag to pass linker flags through the system compiler. |
2885 | 7727 | case $host_os in | 8216 | case $host_os in |
2886 | @@ -7784,7 +8273,13 @@ | |||
2887 | 7784 | lt_prog_compiler_pic='--shared' | 8273 | lt_prog_compiler_pic='--shared' |
2888 | 7785 | lt_prog_compiler_static='--static' | 8274 | lt_prog_compiler_static='--static' |
2889 | 7786 | ;; | 8275 | ;; |
2891 | 7787 | pgcc* | pgf77* | pgf90* | pgf95*) | 8276 | nagfor*) |
2892 | 8277 | # NAG Fortran compiler | ||
2893 | 8278 | lt_prog_compiler_wl='-Wl,-Wl,,' | ||
2894 | 8279 | lt_prog_compiler_pic='-PIC' | ||
2895 | 8280 | lt_prog_compiler_static='-Bstatic' | ||
2896 | 8281 | ;; | ||
2897 | 8282 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
2898 | 7788 | # Portland Group compilers (*not* the Pentium gcc compiler, | 8283 | # Portland Group compilers (*not* the Pentium gcc compiler, |
2899 | 7789 | # which looks to be a dead project) | 8284 | # which looks to be a dead project) |
2900 | 7790 | lt_prog_compiler_wl='-Wl,' | 8285 | lt_prog_compiler_wl='-Wl,' |
2901 | @@ -7796,26 +8291,26 @@ | |||
2902 | 7796 | # All Alpha code is PIC. | 8291 | # All Alpha code is PIC. |
2903 | 7797 | lt_prog_compiler_static='-non_shared' | 8292 | lt_prog_compiler_static='-non_shared' |
2904 | 7798 | ;; | 8293 | ;; |
2907 | 7799 | xl*) | 8294 | xl* | bgxl* | bgf* | mpixl*) |
2908 | 7800 | # IBM XL C 8.0/Fortran 10.1 on PPC | 8295 | # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene |
2909 | 7801 | lt_prog_compiler_wl='-Wl,' | 8296 | lt_prog_compiler_wl='-Wl,' |
2910 | 7802 | lt_prog_compiler_pic='-qpic' | 8297 | lt_prog_compiler_pic='-qpic' |
2911 | 7803 | lt_prog_compiler_static='-qstaticlink' | 8298 | lt_prog_compiler_static='-qstaticlink' |
2912 | 7804 | ;; | 8299 | ;; |
2913 | 7805 | *) | 8300 | *) |
2914 | 7806 | case `$CC -V 2>&1 | sed 5q` in | 8301 | case `$CC -V 2>&1 | sed 5q` in |
2915 | 8302 | *Sun\ F* | *Sun*Fortran*) | ||
2916 | 8303 | # Sun Fortran 8.3 passes all unrecognized flags to the linker | ||
2917 | 8304 | lt_prog_compiler_pic='-KPIC' | ||
2918 | 8305 | lt_prog_compiler_static='-Bstatic' | ||
2919 | 8306 | lt_prog_compiler_wl='' | ||
2920 | 8307 | ;; | ||
2921 | 7807 | *Sun\ C*) | 8308 | *Sun\ C*) |
2922 | 7808 | # Sun C 5.9 | 8309 | # Sun C 5.9 |
2923 | 7809 | lt_prog_compiler_pic='-KPIC' | 8310 | lt_prog_compiler_pic='-KPIC' |
2924 | 7810 | lt_prog_compiler_static='-Bstatic' | 8311 | lt_prog_compiler_static='-Bstatic' |
2925 | 7811 | lt_prog_compiler_wl='-Wl,' | 8312 | lt_prog_compiler_wl='-Wl,' |
2926 | 7812 | ;; | 8313 | ;; |
2927 | 7813 | *Sun\ F*) | ||
2928 | 7814 | # Sun Fortran 8.3 passes all unrecognized flags to the linker | ||
2929 | 7815 | lt_prog_compiler_pic='-KPIC' | ||
2930 | 7816 | lt_prog_compiler_static='-Bstatic' | ||
2931 | 7817 | lt_prog_compiler_wl='' | ||
2932 | 7818 | ;; | ||
2933 | 7819 | esac | 8314 | esac |
2934 | 7820 | ;; | 8315 | ;; |
2935 | 7821 | esac | 8316 | esac |
2936 | @@ -7846,7 +8341,7 @@ | |||
2937 | 7846 | lt_prog_compiler_pic='-KPIC' | 8341 | lt_prog_compiler_pic='-KPIC' |
2938 | 7847 | lt_prog_compiler_static='-Bstatic' | 8342 | lt_prog_compiler_static='-Bstatic' |
2939 | 7848 | case $cc_basename in | 8343 | case $cc_basename in |
2941 | 7849 | f77* | f90* | f95*) | 8344 | f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
2942 | 7850 | lt_prog_compiler_wl='-Qoption ld ';; | 8345 | lt_prog_compiler_wl='-Qoption ld ';; |
2943 | 7851 | *) | 8346 | *) |
2944 | 7852 | lt_prog_compiler_wl='-Wl,';; | 8347 | lt_prog_compiler_wl='-Wl,';; |
2945 | @@ -7903,13 +8398,17 @@ | |||
2946 | 7903 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" | 8398 | lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" |
2947 | 7904 | ;; | 8399 | ;; |
2948 | 7905 | esac | 8400 | esac |
2956 | 7906 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 | 8401 | |
2957 | 7907 | $as_echo "$lt_prog_compiler_pic" >&6; } | 8402 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
2958 | 7908 | 8403 | $as_echo_n "checking for $compiler option to produce PIC... " >&6; } | |
2959 | 7909 | 8404 | if ${lt_cv_prog_compiler_pic+:} false; then : | |
2960 | 7910 | 8405 | $as_echo_n "(cached) " >&6 | |
2961 | 7911 | 8406 | else | |
2962 | 7912 | 8407 | lt_cv_prog_compiler_pic=$lt_prog_compiler_pic | |
2963 | 8408 | fi | ||
2964 | 8409 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 | ||
2965 | 8410 | $as_echo "$lt_cv_prog_compiler_pic" >&6; } | ||
2966 | 8411 | lt_prog_compiler_pic=$lt_cv_prog_compiler_pic | ||
2967 | 7913 | 8412 | ||
2968 | 7914 | # | 8413 | # |
2969 | 7915 | # Check to make sure the PIC flag actually works. | 8414 | # Check to make sure the PIC flag actually works. |
2970 | @@ -7933,15 +8432,15 @@ | |||
2971 | 7933 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 8432 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
2972 | 7934 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 8433 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
2973 | 7935 | -e 's:$: $lt_compiler_flag:'` | 8434 | -e 's:$: $lt_compiler_flag:'` |
2975 | 7936 | (eval echo "\"\$as_me:7936: $lt_compile\"" >&5) | 8435 | (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
2976 | 7937 | (eval "$lt_compile" 2>conftest.err) | 8436 | (eval "$lt_compile" 2>conftest.err) |
2977 | 7938 | ac_status=$? | 8437 | ac_status=$? |
2978 | 7939 | cat conftest.err >&5 | 8438 | cat conftest.err >&5 |
2980 | 7940 | echo "$as_me:7940: \$? = $ac_status" >&5 | 8439 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
2981 | 7941 | if (exit $ac_status) && test -s "$ac_outfile"; then | 8440 | if (exit $ac_status) && test -s "$ac_outfile"; then |
2982 | 7942 | # The compiler can only warn and ignore the option if not recognized | 8441 | # The compiler can only warn and ignore the option if not recognized |
2983 | 7943 | # So say no if there are warnings other than the usual output. | 8442 | # So say no if there are warnings other than the usual output. |
2985 | 7944 | $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp | 8443 | $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
2986 | 7945 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | 8444 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
2987 | 7946 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then | 8445 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
2988 | 7947 | lt_cv_prog_compiler_pic_works=yes | 8446 | lt_cv_prog_compiler_pic_works=yes |
2989 | @@ -7970,6 +8469,11 @@ | |||
2990 | 7970 | 8469 | ||
2991 | 7971 | 8470 | ||
2992 | 7972 | 8471 | ||
2993 | 8472 | |||
2994 | 8473 | |||
2995 | 8474 | |||
2996 | 8475 | |||
2997 | 8476 | |||
2998 | 7973 | # | 8477 | # |
2999 | 7974 | # Check to make sure the static flag actually works. | 8478 | # Check to make sure the static flag actually works. |
3000 | 7975 | # | 8479 | # |
3001 | @@ -7989,7 +8493,7 @@ | |||
3002 | 7989 | if test -s conftest.err; then | 8493 | if test -s conftest.err; then |
3003 | 7990 | # Append any errors to the config.log. | 8494 | # Append any errors to the config.log. |
3004 | 7991 | cat conftest.err 1>&5 | 8495 | cat conftest.err 1>&5 |
3006 | 7992 | $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp | 8496 | $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp |
3007 | 7993 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | 8497 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
3008 | 7994 | if diff conftest.exp conftest.er2 >/dev/null; then | 8498 | if diff conftest.exp conftest.er2 >/dev/null; then |
3009 | 7995 | lt_cv_prog_compiler_static_works=yes | 8499 | lt_cv_prog_compiler_static_works=yes |
3010 | @@ -8038,16 +8542,16 @@ | |||
3011 | 8038 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 8542 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
3012 | 8039 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 8543 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
3013 | 8040 | -e 's:$: $lt_compiler_flag:'` | 8544 | -e 's:$: $lt_compiler_flag:'` |
3015 | 8041 | (eval echo "\"\$as_me:8041: $lt_compile\"" >&5) | 8545 | (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
3016 | 8042 | (eval "$lt_compile" 2>out/conftest.err) | 8546 | (eval "$lt_compile" 2>out/conftest.err) |
3017 | 8043 | ac_status=$? | 8547 | ac_status=$? |
3018 | 8044 | cat out/conftest.err >&5 | 8548 | cat out/conftest.err >&5 |
3020 | 8045 | echo "$as_me:8045: \$? = $ac_status" >&5 | 8549 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3021 | 8046 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 8550 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
3022 | 8047 | then | 8551 | then |
3023 | 8048 | # The compiler can only warn and ignore the option if not recognized | 8552 | # The compiler can only warn and ignore the option if not recognized |
3024 | 8049 | # So say no if there are warnings | 8553 | # So say no if there are warnings |
3026 | 8050 | $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp | 8554 | $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp |
3027 | 8051 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 | 8555 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
3028 | 8052 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then | 8556 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
3029 | 8053 | lt_cv_prog_compiler_c_o=yes | 8557 | lt_cv_prog_compiler_c_o=yes |
3030 | @@ -8093,16 +8597,16 @@ | |||
3031 | 8093 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 8597 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
3032 | 8094 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 8598 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
3033 | 8095 | -e 's:$: $lt_compiler_flag:'` | 8599 | -e 's:$: $lt_compiler_flag:'` |
3035 | 8096 | (eval echo "\"\$as_me:8096: $lt_compile\"" >&5) | 8600 | (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
3036 | 8097 | (eval "$lt_compile" 2>out/conftest.err) | 8601 | (eval "$lt_compile" 2>out/conftest.err) |
3037 | 8098 | ac_status=$? | 8602 | ac_status=$? |
3038 | 8099 | cat out/conftest.err >&5 | 8603 | cat out/conftest.err >&5 |
3040 | 8100 | echo "$as_me:8100: \$? = $ac_status" >&5 | 8604 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
3041 | 8101 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 8605 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
3042 | 8102 | then | 8606 | then |
3043 | 8103 | # The compiler can only warn and ignore the option if not recognized | 8607 | # The compiler can only warn and ignore the option if not recognized |
3044 | 8104 | # So say no if there are warnings | 8608 | # So say no if there are warnings |
3046 | 8105 | $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp | 8609 | $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp |
3047 | 8106 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 | 8610 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
3048 | 8107 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then | 8611 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
3049 | 8108 | lt_cv_prog_compiler_c_o=yes | 8612 | lt_cv_prog_compiler_c_o=yes |
3050 | @@ -8212,13 +8716,39 @@ | |||
3051 | 8212 | openbsd*) | 8716 | openbsd*) |
3052 | 8213 | with_gnu_ld=no | 8717 | with_gnu_ld=no |
3053 | 8214 | ;; | 8718 | ;; |
3055 | 8215 | linux* | k*bsd*-gnu) | 8719 | linux* | k*bsd*-gnu | gnu*) |
3056 | 8216 | link_all_deplibs=no | 8720 | link_all_deplibs=no |
3057 | 8217 | ;; | 8721 | ;; |
3058 | 8218 | esac | 8722 | esac |
3059 | 8219 | 8723 | ||
3060 | 8220 | ld_shlibs=yes | 8724 | ld_shlibs=yes |
3061 | 8725 | |||
3062 | 8726 | # On some targets, GNU ld is compatible enough with the native linker | ||
3063 | 8727 | # that we're better off using the native interface for both. | ||
3064 | 8728 | lt_use_gnu_ld_interface=no | ||
3065 | 8221 | if test "$with_gnu_ld" = yes; then | 8729 | if test "$with_gnu_ld" = yes; then |
3066 | 8730 | case $host_os in | ||
3067 | 8731 | aix*) | ||
3068 | 8732 | # The AIX port of GNU ld has always aspired to compatibility | ||
3069 | 8733 | # with the native linker. However, as the warning in the GNU ld | ||
3070 | 8734 | # block says, versions before 2.19.5* couldn't really create working | ||
3071 | 8735 | # shared libraries, regardless of the interface used. | ||
3072 | 8736 | case `$LD -v 2>&1` in | ||
3073 | 8737 | *\ \(GNU\ Binutils\)\ 2.19.5*) ;; | ||
3074 | 8738 | *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; | ||
3075 | 8739 | *\ \(GNU\ Binutils\)\ [3-9]*) ;; | ||
3076 | 8740 | *) | ||
3077 | 8741 | lt_use_gnu_ld_interface=yes | ||
3078 | 8742 | ;; | ||
3079 | 8743 | esac | ||
3080 | 8744 | ;; | ||
3081 | 8745 | *) | ||
3082 | 8746 | lt_use_gnu_ld_interface=yes | ||
3083 | 8747 | ;; | ||
3084 | 8748 | esac | ||
3085 | 8749 | fi | ||
3086 | 8750 | |||
3087 | 8751 | if test "$lt_use_gnu_ld_interface" = yes; then | ||
3088 | 8222 | # If archive_cmds runs LD, not CC, wlarc should be empty | 8752 | # If archive_cmds runs LD, not CC, wlarc should be empty |
3089 | 8223 | wlarc='${wl}' | 8753 | wlarc='${wl}' |
3090 | 8224 | 8754 | ||
3091 | @@ -8252,11 +8782,12 @@ | |||
3092 | 8252 | ld_shlibs=no | 8782 | ld_shlibs=no |
3093 | 8253 | cat <<_LT_EOF 1>&2 | 8783 | cat <<_LT_EOF 1>&2 |
3094 | 8254 | 8784 | ||
3096 | 8255 | *** Warning: the GNU linker, at least up to release 2.9.1, is reported | 8785 | *** Warning: the GNU linker, at least up to release 2.19, is reported |
3097 | 8256 | *** to be unable to reliably create shared libraries on AIX. | 8786 | *** to be unable to reliably create shared libraries on AIX. |
3098 | 8257 | *** Therefore, libtool is disabling shared libraries support. If you | 8787 | *** Therefore, libtool is disabling shared libraries support. If you |
3101 | 8258 | *** really care for shared libraries, you may want to modify your PATH | 8788 | *** really care for shared libraries, you may want to install binutils |
3102 | 8259 | *** so that a non-GNU linker is found, and then restart. | 8789 | *** 2.20 or above, or modify your PATH so that a non-GNU linker is found. |
3103 | 8790 | *** You will then need to restart the configuration process. | ||
3104 | 8260 | 8791 | ||
3105 | 8261 | _LT_EOF | 8792 | _LT_EOF |
3106 | 8262 | fi | 8793 | fi |
3107 | @@ -8292,10 +8823,12 @@ | |||
3108 | 8292 | # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, | 8823 | # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, |
3109 | 8293 | # as there is no search path for DLLs. | 8824 | # as there is no search path for DLLs. |
3110 | 8294 | hardcode_libdir_flag_spec='-L$libdir' | 8825 | hardcode_libdir_flag_spec='-L$libdir' |
3111 | 8826 | export_dynamic_flag_spec='${wl}--export-all-symbols' | ||
3112 | 8295 | allow_undefined_flag=unsupported | 8827 | allow_undefined_flag=unsupported |
3113 | 8296 | always_export_symbols=no | 8828 | always_export_symbols=no |
3114 | 8297 | enable_shared_with_static_runtimes=yes | 8829 | enable_shared_with_static_runtimes=yes |
3116 | 8298 | export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | 8830 | 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 | 8831 | exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' | ||
3118 | 8299 | 8832 | ||
3119 | 8300 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 8833 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
3120 | 8301 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 8834 | 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 | 8313 | fi | 8846 | fi |
3123 | 8314 | ;; | 8847 | ;; |
3124 | 8315 | 8848 | ||
3125 | 8849 | haiku*) | ||
3126 | 8850 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
3127 | 8851 | link_all_deplibs=yes | ||
3128 | 8852 | ;; | ||
3129 | 8853 | |||
3130 | 8316 | interix[3-9]*) | 8854 | interix[3-9]*) |
3131 | 8317 | hardcode_direct=no | 8855 | hardcode_direct=no |
3132 | 8318 | hardcode_shlibpath_var=no | 8856 | hardcode_shlibpath_var=no |
3133 | @@ -8338,15 +8876,16 @@ | |||
3134 | 8338 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ | 8876 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
3135 | 8339 | && test "$tmp_diet" = no | 8877 | && test "$tmp_diet" = no |
3136 | 8340 | then | 8878 | then |
3138 | 8341 | tmp_addflag= | 8879 | tmp_addflag=' $pic_flag' |
3139 | 8342 | tmp_sharedflag='-shared' | 8880 | tmp_sharedflag='-shared' |
3140 | 8343 | case $cc_basename,$host_cpu in | 8881 | case $cc_basename,$host_cpu in |
3141 | 8344 | pgcc*) # Portland Group C compiler | 8882 | pgcc*) # Portland Group C compiler |
3143 | 8345 | 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' | 8883 | 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 | 8346 | tmp_addflag=' $pic_flag' | 8884 | tmp_addflag=' $pic_flag' |
3145 | 8347 | ;; | 8885 | ;; |
3148 | 8348 | pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers | 8886 | pgf77* | pgf90* | pgf95* | pgfortran*) |
3149 | 8349 | 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' | 8887 | # Portland Group f77 and f90 compilers |
3150 | 8888 | 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 | 8350 | tmp_addflag=' $pic_flag -Mnomain' ;; | 8889 | tmp_addflag=' $pic_flag -Mnomain' ;; |
3152 | 8351 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 | 8890 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
3153 | 8352 | tmp_addflag=' -i_dynamic' ;; | 8891 | tmp_addflag=' -i_dynamic' ;; |
3154 | @@ -8357,13 +8896,17 @@ | |||
3155 | 8357 | lf95*) # Lahey Fortran 8.1 | 8896 | lf95*) # Lahey Fortran 8.1 |
3156 | 8358 | whole_archive_flag_spec= | 8897 | whole_archive_flag_spec= |
3157 | 8359 | tmp_sharedflag='--shared' ;; | 8898 | tmp_sharedflag='--shared' ;; |
3159 | 8360 | xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) | 8899 | xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
3160 | 8361 | tmp_sharedflag='-qmkshrobj' | 8900 | tmp_sharedflag='-qmkshrobj' |
3161 | 8362 | tmp_addflag= ;; | 8901 | tmp_addflag= ;; |
3162 | 8902 | nvcc*) # Cuda Compiler Driver 2.2 | ||
3163 | 8903 | 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 | 8904 | compiler_needs_object=yes | ||
3165 | 8905 | ;; | ||
3166 | 8363 | esac | 8906 | esac |
3167 | 8364 | case `$CC -V 2>&1 | sed 5q` in | 8907 | case `$CC -V 2>&1 | sed 5q` in |
3168 | 8365 | *Sun\ C*) # Sun C 5.9 | 8908 | *Sun\ C*) # Sun C 5.9 |
3170 | 8366 | 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' | 8909 | 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 | 8367 | compiler_needs_object=yes | 8910 | compiler_needs_object=yes |
3172 | 8368 | tmp_sharedflag='-G' ;; | 8911 | tmp_sharedflag='-G' ;; |
3173 | 8369 | *Sun\ F*) # Sun Fortran 8.3 | 8912 | *Sun\ F*) # Sun Fortran 8.3 |
3174 | @@ -8379,17 +8922,17 @@ | |||
3175 | 8379 | fi | 8922 | fi |
3176 | 8380 | 8923 | ||
3177 | 8381 | case $cc_basename in | 8924 | case $cc_basename in |
3179 | 8382 | xlf*) | 8925 | xlf* | bgf* | bgxlf* | mpixlf*) |
3180 | 8383 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself | 8926 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
3181 | 8384 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' | 8927 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
3182 | 8385 | hardcode_libdir_flag_spec= | 8928 | hardcode_libdir_flag_spec= |
3183 | 8386 | hardcode_libdir_flag_spec_ld='-rpath $libdir' | 8929 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
3185 | 8387 | archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | 8930 | archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
3186 | 8388 | if test "x$supports_anon_versioning" = xyes; then | 8931 | if test "x$supports_anon_versioning" = xyes; then |
3187 | 8389 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ | 8932 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
3188 | 8390 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | 8933 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
3189 | 8391 | echo "local: *; };" >> $output_objdir/$libname.ver~ | 8934 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
3191 | 8392 | $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | 8935 | $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
3192 | 8393 | fi | 8936 | fi |
3193 | 8394 | ;; | 8937 | ;; |
3194 | 8395 | esac | 8938 | esac |
3195 | @@ -8403,8 +8946,8 @@ | |||
3196 | 8403 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 8946 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
3197 | 8404 | wlarc= | 8947 | wlarc= |
3198 | 8405 | else | 8948 | else |
3201 | 8406 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 8949 | archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3202 | 8407 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | 8950 | 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 | 8408 | fi | 8951 | fi |
3204 | 8409 | ;; | 8952 | ;; |
3205 | 8410 | 8953 | ||
3206 | @@ -8422,8 +8965,8 @@ | |||
3207 | 8422 | 8965 | ||
3208 | 8423 | _LT_EOF | 8966 | _LT_EOF |
3209 | 8424 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 8967 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
3212 | 8425 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 8968 | archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3213 | 8426 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | 8969 | 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 | 8427 | else | 8970 | else |
3215 | 8428 | ld_shlibs=no | 8971 | ld_shlibs=no |
3216 | 8429 | fi | 8972 | fi |
3217 | @@ -8469,8 +9012,8 @@ | |||
3218 | 8469 | 9012 | ||
3219 | 8470 | *) | 9013 | *) |
3220 | 8471 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 9014 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
3223 | 8472 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 9015 | archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
3224 | 8473 | archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | 9016 | 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 | 8474 | else | 9017 | else |
3226 | 8475 | ld_shlibs=no | 9018 | ld_shlibs=no |
3227 | 8476 | fi | 9019 | fi |
3228 | @@ -8510,8 +9053,10 @@ | |||
3229 | 8510 | else | 9053 | else |
3230 | 8511 | # If we're using GNU nm, then we don't want the "-C" option. | 9054 | # If we're using GNU nm, then we don't want the "-C" option. |
3231 | 8512 | # -C means demangle to AIX nm, but means don't demangle with GNU nm | 9055 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
3232 | 9056 | # Also, AIX nm treats weak defined symbols like other global | ||
3233 | 9057 | # defined symbols, whereas GNU nm marks them as "W". | ||
3234 | 8513 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then | 9058 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
3236 | 8514 | 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' | 9059 | 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 | 8515 | else | 9060 | else |
3238 | 8516 | 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' | 9061 | 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 | 8517 | fi | 9062 | fi |
3240 | @@ -8599,7 +9144,13 @@ | |||
3241 | 8599 | allow_undefined_flag='-berok' | 9144 | allow_undefined_flag='-berok' |
3242 | 8600 | # Determine the default libpath from the value encoded in an | 9145 | # Determine the default libpath from the value encoded in an |
3243 | 8601 | # empty executable. | 9146 | # empty executable. |
3245 | 8602 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 9147 | if test "${lt_cv_aix_libpath+set}" = set; then |
3246 | 9148 | aix_libpath=$lt_cv_aix_libpath | ||
3247 | 9149 | else | ||
3248 | 9150 | if ${lt_cv_aix_libpath_+:} false; then : | ||
3249 | 9151 | $as_echo_n "(cached) " >&6 | ||
3250 | 9152 | else | ||
3251 | 9153 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3252 | 8603 | /* end confdefs.h. */ | 9154 | /* end confdefs.h. */ |
3253 | 8604 | 9155 | ||
3254 | 8605 | int | 9156 | int |
3255 | @@ -8612,25 +9163,32 @@ | |||
3256 | 8612 | _ACEOF | 9163 | _ACEOF |
3257 | 8613 | if ac_fn_c_try_link "$LINENO"; then : | 9164 | if ac_fn_c_try_link "$LINENO"; then : |
3258 | 8614 | 9165 | ||
3271 | 8615 | lt_aix_libpath_sed=' | 9166 | lt_aix_libpath_sed=' |
3272 | 8616 | /Import File Strings/,/^$/ { | 9167 | /Import File Strings/,/^$/ { |
3273 | 8617 | /^0/ { | 9168 | /^0/ { |
3274 | 8618 | s/^0 *\(.*\)$/\1/ | 9169 | s/^0 *\([^ ]*\) *$/\1/ |
3275 | 8619 | p | 9170 | p |
3276 | 8620 | } | 9171 | } |
3277 | 8621 | }' | 9172 | }' |
3278 | 8622 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | 9173 | lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
3279 | 8623 | # Check for a 64-bit object if we didn't find anything. | 9174 | # Check for a 64-bit object if we didn't find anything. |
3280 | 8624 | if test -z "$aix_libpath"; then | 9175 | if test -z "$lt_cv_aix_libpath_"; then |
3281 | 8625 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | 9176 | lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
3282 | 8626 | fi | 9177 | fi |
3283 | 8627 | fi | 9178 | fi |
3284 | 8628 | rm -f core conftest.err conftest.$ac_objext \ | 9179 | rm -f core conftest.err conftest.$ac_objext \ |
3285 | 8629 | conftest$ac_exeext conftest.$ac_ext | 9180 | conftest$ac_exeext conftest.$ac_ext |
3287 | 8630 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 9181 | if test -z "$lt_cv_aix_libpath_"; then |
3288 | 9182 | lt_cv_aix_libpath_="/usr/lib:/lib" | ||
3289 | 9183 | fi | ||
3290 | 9184 | |||
3291 | 9185 | fi | ||
3292 | 9186 | |||
3293 | 9187 | aix_libpath=$lt_cv_aix_libpath_ | ||
3294 | 9188 | fi | ||
3295 | 8631 | 9189 | ||
3296 | 8632 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 9190 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
3298 | 8633 | 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" | 9191 | 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 | 8634 | else | 9192 | else |
3300 | 8635 | if test "$host_cpu" = ia64; then | 9193 | if test "$host_cpu" = ia64; then |
3301 | 8636 | hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' | 9194 | hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' |
3302 | @@ -8639,7 +9197,13 @@ | |||
3303 | 8639 | else | 9197 | else |
3304 | 8640 | # Determine the default libpath from the value encoded in an | 9198 | # Determine the default libpath from the value encoded in an |
3305 | 8641 | # empty executable. | 9199 | # empty executable. |
3307 | 8642 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 9200 | if test "${lt_cv_aix_libpath+set}" = set; then |
3308 | 9201 | aix_libpath=$lt_cv_aix_libpath | ||
3309 | 9202 | else | ||
3310 | 9203 | if ${lt_cv_aix_libpath_+:} false; then : | ||
3311 | 9204 | $as_echo_n "(cached) " >&6 | ||
3312 | 9205 | else | ||
3313 | 9206 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3314 | 8643 | /* end confdefs.h. */ | 9207 | /* end confdefs.h. */ |
3315 | 8644 | 9208 | ||
3316 | 8645 | int | 9209 | int |
3317 | @@ -8652,30 +9216,42 @@ | |||
3318 | 8652 | _ACEOF | 9216 | _ACEOF |
3319 | 8653 | if ac_fn_c_try_link "$LINENO"; then : | 9217 | if ac_fn_c_try_link "$LINENO"; then : |
3320 | 8654 | 9218 | ||
3333 | 8655 | lt_aix_libpath_sed=' | 9219 | lt_aix_libpath_sed=' |
3334 | 8656 | /Import File Strings/,/^$/ { | 9220 | /Import File Strings/,/^$/ { |
3335 | 8657 | /^0/ { | 9221 | /^0/ { |
3336 | 8658 | s/^0 *\(.*\)$/\1/ | 9222 | s/^0 *\([^ ]*\) *$/\1/ |
3337 | 8659 | p | 9223 | p |
3338 | 8660 | } | 9224 | } |
3339 | 8661 | }' | 9225 | }' |
3340 | 8662 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | 9226 | lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
3341 | 8663 | # Check for a 64-bit object if we didn't find anything. | 9227 | # Check for a 64-bit object if we didn't find anything. |
3342 | 8664 | if test -z "$aix_libpath"; then | 9228 | if test -z "$lt_cv_aix_libpath_"; then |
3343 | 8665 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | 9229 | lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
3344 | 8666 | fi | 9230 | fi |
3345 | 8667 | fi | 9231 | fi |
3346 | 8668 | rm -f core conftest.err conftest.$ac_objext \ | 9232 | rm -f core conftest.err conftest.$ac_objext \ |
3347 | 8669 | conftest$ac_exeext conftest.$ac_ext | 9233 | conftest$ac_exeext conftest.$ac_ext |
3349 | 8670 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | 9234 | if test -z "$lt_cv_aix_libpath_"; then |
3350 | 9235 | lt_cv_aix_libpath_="/usr/lib:/lib" | ||
3351 | 9236 | fi | ||
3352 | 9237 | |||
3353 | 9238 | fi | ||
3354 | 9239 | |||
3355 | 9240 | aix_libpath=$lt_cv_aix_libpath_ | ||
3356 | 9241 | fi | ||
3357 | 8671 | 9242 | ||
3358 | 8672 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" | 9243 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
3359 | 8673 | # Warning - without using the other run time loading flags, | 9244 | # Warning - without using the other run time loading flags, |
3360 | 8674 | # -berok will link without error, but may produce a broken library. | 9245 | # -berok will link without error, but may produce a broken library. |
3361 | 8675 | no_undefined_flag=' ${wl}-bernotok' | 9246 | no_undefined_flag=' ${wl}-bernotok' |
3362 | 8676 | allow_undefined_flag=' ${wl}-berok' | 9247 | allow_undefined_flag=' ${wl}-berok' |
3365 | 8677 | # Exported symbols can be pulled into shared objects from archives | 9248 | if test "$with_gnu_ld" = yes; then |
3366 | 8678 | whole_archive_flag_spec='$convenience' | 9249 | # We only use this code for GNU lds that support --whole-archive. |
3367 | 9250 | whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' | ||
3368 | 9251 | else | ||
3369 | 9252 | # Exported symbols can be pulled into shared objects from archives | ||
3370 | 9253 | whole_archive_flag_spec='$convenience' | ||
3371 | 9254 | fi | ||
3372 | 8679 | archive_cmds_need_lc=yes | 9255 | archive_cmds_need_lc=yes |
3373 | 8680 | # This is similar to how AIX traditionally builds its shared libraries. | 9256 | # This is similar to how AIX traditionally builds its shared libraries. |
3374 | 8681 | 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' | 9257 | 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 | 8707 | # Microsoft Visual C++. | 9283 | # Microsoft Visual C++. |
3377 | 8708 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 9284 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
3378 | 8709 | # no search path for DLLs. | 9285 | # no search path for DLLs. |
3393 | 8710 | hardcode_libdir_flag_spec=' ' | 9286 | case $cc_basename in |
3394 | 8711 | allow_undefined_flag=unsupported | 9287 | cl*) |
3395 | 8712 | # Tell ltmain to make .lib files, not .a files. | 9288 | # Native MSVC |
3396 | 8713 | libext=lib | 9289 | hardcode_libdir_flag_spec=' ' |
3397 | 8714 | # Tell ltmain to make .dll files, not .so files. | 9290 | allow_undefined_flag=unsupported |
3398 | 8715 | shrext_cmds=".dll" | 9291 | always_export_symbols=yes |
3399 | 8716 | # FIXME: Setting linknames here is a bad hack. | 9292 | file_list_spec='@' |
3400 | 8717 | archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' | 9293 | # Tell ltmain to make .lib files, not .a files. |
3401 | 8718 | # The linker will automatically build a .lib file if we build a DLL. | 9294 | libext=lib |
3402 | 8719 | old_archive_from_new_cmds='true' | 9295 | # Tell ltmain to make .dll files, not .so files. |
3403 | 8720 | # FIXME: Should let the user specify the lib program. | 9296 | shrext_cmds=".dll" |
3404 | 8721 | old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | 9297 | # FIXME: Setting linknames here is a bad hack. |
3405 | 8722 | fix_srcfile_path='`cygpath -w "$srcfile"`' | 9298 | archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
3406 | 8723 | enable_shared_with_static_runtimes=yes | 9299 | archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
3407 | 9300 | sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
3408 | 9301 | else | ||
3409 | 9302 | sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
3410 | 9303 | fi~ | ||
3411 | 9304 | $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 | 9305 | linknames=' | ||
3413 | 9306 | # The linker will not automatically build a static lib if we build a DLL. | ||
3414 | 9307 | # _LT_TAGVAR(old_archive_from_new_cmds, )='true' | ||
3415 | 9308 | enable_shared_with_static_runtimes=yes | ||
3416 | 9309 | export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | ||
3417 | 9310 | # Don't use ranlib | ||
3418 | 9311 | old_postinstall_cmds='chmod 644 $oldlib' | ||
3419 | 9312 | postlink_cmds='lt_outputfile="@OUTPUT@"~ | ||
3420 | 9313 | lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
3421 | 9314 | case $lt_outputfile in | ||
3422 | 9315 | *.exe|*.EXE) ;; | ||
3423 | 9316 | *) | ||
3424 | 9317 | lt_outputfile="$lt_outputfile.exe" | ||
3425 | 9318 | lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
3426 | 9319 | ;; | ||
3427 | 9320 | esac~ | ||
3428 | 9321 | if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
3429 | 9322 | $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
3430 | 9323 | $RM "$lt_outputfile.manifest"; | ||
3431 | 9324 | fi' | ||
3432 | 9325 | ;; | ||
3433 | 9326 | *) | ||
3434 | 9327 | # Assume MSVC wrapper | ||
3435 | 9328 | hardcode_libdir_flag_spec=' ' | ||
3436 | 9329 | allow_undefined_flag=unsupported | ||
3437 | 9330 | # Tell ltmain to make .lib files, not .a files. | ||
3438 | 9331 | libext=lib | ||
3439 | 9332 | # Tell ltmain to make .dll files, not .so files. | ||
3440 | 9333 | shrext_cmds=".dll" | ||
3441 | 9334 | # FIXME: Setting linknames here is a bad hack. | ||
3442 | 9335 | archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
3443 | 9336 | # The linker will automatically build a .lib file if we build a DLL. | ||
3444 | 9337 | old_archive_from_new_cmds='true' | ||
3445 | 9338 | # FIXME: Should let the user specify the lib program. | ||
3446 | 9339 | old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
3447 | 9340 | enable_shared_with_static_runtimes=yes | ||
3448 | 9341 | ;; | ||
3449 | 9342 | esac | ||
3450 | 8724 | ;; | 9343 | ;; |
3451 | 8725 | 9344 | ||
3452 | 8726 | darwin* | rhapsody*) | 9345 | darwin* | rhapsody*) |
3453 | @@ -8730,7 +9349,11 @@ | |||
3454 | 8730 | hardcode_direct=no | 9349 | hardcode_direct=no |
3455 | 8731 | hardcode_automatic=yes | 9350 | hardcode_automatic=yes |
3456 | 8732 | hardcode_shlibpath_var=unsupported | 9351 | hardcode_shlibpath_var=unsupported |
3458 | 8733 | whole_archive_flag_spec='' | 9352 | if test "$lt_cv_ld_force_load" = "yes"; then |
3459 | 9353 | 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 | 9354 | else | ||
3461 | 9355 | whole_archive_flag_spec='' | ||
3462 | 9356 | fi | ||
3463 | 8734 | link_all_deplibs=yes | 9357 | link_all_deplibs=yes |
3464 | 8735 | allow_undefined_flag="$_lt_dar_allow_undefined" | 9358 | allow_undefined_flag="$_lt_dar_allow_undefined" |
3465 | 8736 | case $cc_basename in | 9359 | case $cc_basename in |
3466 | @@ -8738,7 +9361,7 @@ | |||
3467 | 8738 | *) _lt_dar_can_shared=$GCC ;; | 9361 | *) _lt_dar_can_shared=$GCC ;; |
3468 | 8739 | esac | 9362 | esac |
3469 | 8740 | if test "$_lt_dar_can_shared" = "yes"; then | 9363 | if test "$_lt_dar_can_shared" = "yes"; then |
3471 | 8741 | output_verbose_link_cmd=echo | 9364 | output_verbose_link_cmd=func_echo_all |
3472 | 8742 | archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" | 9365 | 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 | 8743 | module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" | 9366 | module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
3474 | 8744 | 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}" | 9367 | 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 | 8781 | 9404 | ||
3477 | 8782 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 9405 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
3478 | 8783 | freebsd* | dragonfly*) | 9406 | freebsd* | dragonfly*) |
3480 | 8784 | archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | 9407 | archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
3481 | 8785 | hardcode_libdir_flag_spec='-R$libdir' | 9408 | hardcode_libdir_flag_spec='-R$libdir' |
3482 | 8786 | hardcode_direct=yes | 9409 | hardcode_direct=yes |
3483 | 8787 | hardcode_shlibpath_var=no | 9410 | hardcode_shlibpath_var=no |
3484 | @@ -8789,7 +9412,7 @@ | |||
3485 | 8789 | 9412 | ||
3486 | 8790 | hpux9*) | 9413 | hpux9*) |
3487 | 8791 | if test "$GCC" = yes; then | 9414 | if test "$GCC" = yes; then |
3489 | 8792 | 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' | 9415 | 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 | 8793 | else | 9416 | else |
3491 | 8794 | 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' | 9417 | 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 | 8795 | fi | 9418 | fi |
3493 | @@ -8804,8 +9427,8 @@ | |||
3494 | 8804 | ;; | 9427 | ;; |
3495 | 8805 | 9428 | ||
3496 | 8806 | hpux10*) | 9429 | hpux10*) |
3499 | 8807 | if test "$GCC" = yes -a "$with_gnu_ld" = no; then | 9430 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
3500 | 8808 | archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 9431 | archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3501 | 8809 | else | 9432 | else |
3502 | 8810 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 9433 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
3503 | 8811 | fi | 9434 | fi |
3504 | @@ -8823,16 +9446,16 @@ | |||
3505 | 8823 | ;; | 9446 | ;; |
3506 | 8824 | 9447 | ||
3507 | 8825 | hpux11*) | 9448 | hpux11*) |
3509 | 8826 | if test "$GCC" = yes -a "$with_gnu_ld" = no; then | 9449 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then |
3510 | 8827 | case $host_cpu in | 9450 | case $host_cpu in |
3511 | 8828 | hppa*64*) | 9451 | hppa*64*) |
3512 | 8829 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 9452 | archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
3513 | 8830 | ;; | 9453 | ;; |
3514 | 8831 | ia64*) | 9454 | ia64*) |
3516 | 8832 | archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 9455 | archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3517 | 8833 | ;; | 9456 | ;; |
3518 | 8834 | *) | 9457 | *) |
3520 | 8835 | archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 9458 | archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
3521 | 8836 | ;; | 9459 | ;; |
3522 | 8837 | esac | 9460 | esac |
3523 | 8838 | else | 9461 | else |
3524 | @@ -8844,7 +9467,46 @@ | |||
3525 | 8844 | archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 9467 | archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
3526 | 8845 | ;; | 9468 | ;; |
3527 | 8846 | *) | 9469 | *) |
3529 | 8847 | archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 9470 | |
3530 | 9471 | # Older versions of the 11.00 compiler do not understand -b yet | ||
3531 | 9472 | # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) | ||
3532 | 9473 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 | ||
3533 | 9474 | $as_echo_n "checking if $CC understands -b... " >&6; } | ||
3534 | 9475 | if ${lt_cv_prog_compiler__b+:} false; then : | ||
3535 | 9476 | $as_echo_n "(cached) " >&6 | ||
3536 | 9477 | else | ||
3537 | 9478 | lt_cv_prog_compiler__b=no | ||
3538 | 9479 | save_LDFLAGS="$LDFLAGS" | ||
3539 | 9480 | LDFLAGS="$LDFLAGS -b" | ||
3540 | 9481 | echo "$lt_simple_link_test_code" > conftest.$ac_ext | ||
3541 | 9482 | if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then | ||
3542 | 9483 | # The linker can only warn and ignore the option if not recognized | ||
3543 | 9484 | # So say no if there are warnings | ||
3544 | 9485 | if test -s conftest.err; then | ||
3545 | 9486 | # Append any errors to the config.log. | ||
3546 | 9487 | cat conftest.err 1>&5 | ||
3547 | 9488 | $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp | ||
3548 | 9489 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | ||
3549 | 9490 | if diff conftest.exp conftest.er2 >/dev/null; then | ||
3550 | 9491 | lt_cv_prog_compiler__b=yes | ||
3551 | 9492 | fi | ||
3552 | 9493 | else | ||
3553 | 9494 | lt_cv_prog_compiler__b=yes | ||
3554 | 9495 | fi | ||
3555 | 9496 | fi | ||
3556 | 9497 | $RM -r conftest* | ||
3557 | 9498 | LDFLAGS="$save_LDFLAGS" | ||
3558 | 9499 | |||
3559 | 9500 | fi | ||
3560 | 9501 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 | ||
3561 | 9502 | $as_echo "$lt_cv_prog_compiler__b" >&6; } | ||
3562 | 9503 | |||
3563 | 9504 | if test x"$lt_cv_prog_compiler__b" = xyes; then | ||
3564 | 9505 | archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | ||
3565 | 9506 | else | ||
3566 | 9507 | archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | ||
3567 | 9508 | fi | ||
3568 | 9509 | |||
3569 | 8848 | ;; | 9510 | ;; |
3570 | 8849 | esac | 9511 | esac |
3571 | 8850 | fi | 9512 | fi |
3572 | @@ -8872,26 +9534,39 @@ | |||
3573 | 8872 | 9534 | ||
3574 | 8873 | irix5* | irix6* | nonstopux*) | 9535 | irix5* | irix6* | nonstopux*) |
3575 | 8874 | if test "$GCC" = yes; then | 9536 | if test "$GCC" = yes; then |
3577 | 8875 | 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' | 9537 | 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 | 8876 | # Try to use the -exported_symbol ld option, if it does not | 9538 | # Try to use the -exported_symbol ld option, if it does not |
3579 | 8877 | # work, assume that -exports_file does not work either and | 9539 | # work, assume that -exports_file does not work either and |
3580 | 8878 | # implicitly export all symbols. | 9540 | # implicitly export all symbols. |
3584 | 8879 | save_LDFLAGS="$LDFLAGS" | 9541 | # This should be the same for all languages, so no per-tag cache variable. |
3585 | 8880 | LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | 9542 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 |
3586 | 8881 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 9543 | $as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } |
3587 | 9544 | if ${lt_cv_irix_exported_symbol+:} false; then : | ||
3588 | 9545 | $as_echo_n "(cached) " >&6 | ||
3589 | 9546 | else | ||
3590 | 9547 | save_LDFLAGS="$LDFLAGS" | ||
3591 | 9548 | LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | ||
3592 | 9549 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3593 | 8882 | /* end confdefs.h. */ | 9550 | /* end confdefs.h. */ |
3595 | 8883 | int foo(void) {} | 9551 | int foo (void) { return 0; } |
3596 | 8884 | _ACEOF | 9552 | _ACEOF |
3597 | 8885 | if ac_fn_c_try_link "$LINENO"; then : | 9553 | if ac_fn_c_try_link "$LINENO"; then : |
3600 | 8886 | 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' | 9554 | lt_cv_irix_exported_symbol=yes |
3601 | 8887 | 9555 | else | |
3602 | 9556 | lt_cv_irix_exported_symbol=no | ||
3603 | 8888 | fi | 9557 | fi |
3604 | 8889 | rm -f core conftest.err conftest.$ac_objext \ | 9558 | rm -f core conftest.err conftest.$ac_objext \ |
3605 | 8890 | conftest$ac_exeext conftest.$ac_ext | 9559 | conftest$ac_exeext conftest.$ac_ext |
3607 | 8891 | LDFLAGS="$save_LDFLAGS" | 9560 | LDFLAGS="$save_LDFLAGS" |
3608 | 9561 | fi | ||
3609 | 9562 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 | ||
3610 | 9563 | $as_echo "$lt_cv_irix_exported_symbol" >&6; } | ||
3611 | 9564 | if test "$lt_cv_irix_exported_symbol" = yes; then | ||
3612 | 9565 | 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 | 9566 | fi | ||
3614 | 8892 | else | 9567 | else |
3617 | 8893 | 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' | 9568 | 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 | 8894 | 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' | 9569 | 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 | 8895 | fi | 9570 | fi |
3620 | 8896 | archive_cmds_need_lc='no' | 9571 | archive_cmds_need_lc='no' |
3621 | 8897 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 9572 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
3622 | @@ -8953,17 +9628,17 @@ | |||
3623 | 8953 | hardcode_libdir_flag_spec='-L$libdir' | 9628 | hardcode_libdir_flag_spec='-L$libdir' |
3624 | 8954 | hardcode_minus_L=yes | 9629 | hardcode_minus_L=yes |
3625 | 8955 | allow_undefined_flag=unsupported | 9630 | allow_undefined_flag=unsupported |
3627 | 8956 | 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' | 9631 | 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 | 8957 | old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' | 9632 | old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' |
3629 | 8958 | ;; | 9633 | ;; |
3630 | 8959 | 9634 | ||
3631 | 8960 | osf3*) | 9635 | osf3*) |
3632 | 8961 | if test "$GCC" = yes; then | 9636 | if test "$GCC" = yes; then |
3633 | 8962 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 9637 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
3635 | 8963 | 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' | 9638 | 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 | 8964 | else | 9639 | else |
3637 | 8965 | allow_undefined_flag=' -expect_unresolved \*' | 9640 | allow_undefined_flag=' -expect_unresolved \*' |
3639 | 8966 | 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' | 9641 | 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 | 8967 | fi | 9642 | fi |
3641 | 8968 | archive_cmds_need_lc='no' | 9643 | archive_cmds_need_lc='no' |
3642 | 8969 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 9644 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
3643 | @@ -8973,13 +9648,13 @@ | |||
3644 | 8973 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 9648 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
3645 | 8974 | if test "$GCC" = yes; then | 9649 | if test "$GCC" = yes; then |
3646 | 8975 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' | 9650 | allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' |
3648 | 8976 | 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' | 9651 | 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 | 8977 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' | 9652 | hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
3650 | 8978 | else | 9653 | else |
3651 | 8979 | allow_undefined_flag=' -expect_unresolved \*' | 9654 | allow_undefined_flag=' -expect_unresolved \*' |
3653 | 8980 | 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' | 9655 | 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 | 8981 | 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~ | 9656 | 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~ |
3656 | 8982 | $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' | 9657 | $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 | 8983 | 9658 | ||
3658 | 8984 | # Both c and cxx compiler support -rpath directly | 9659 | # Both c and cxx compiler support -rpath directly |
3659 | 8985 | hardcode_libdir_flag_spec='-rpath $libdir' | 9660 | hardcode_libdir_flag_spec='-rpath $libdir' |
3660 | @@ -8992,9 +9667,9 @@ | |||
3661 | 8992 | no_undefined_flag=' -z defs' | 9667 | no_undefined_flag=' -z defs' |
3662 | 8993 | if test "$GCC" = yes; then | 9668 | if test "$GCC" = yes; then |
3663 | 8994 | wlarc='${wl}' | 9669 | wlarc='${wl}' |
3665 | 8995 | archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 9670 | archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
3666 | 8996 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | 9671 | archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
3668 | 8997 | $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | 9672 | $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 | 8998 | else | 9673 | else |
3670 | 8999 | case `$CC -V 2>&1` in | 9674 | case `$CC -V 2>&1` in |
3671 | 9000 | *"Compilers 5.0"*) | 9675 | *"Compilers 5.0"*) |
3672 | @@ -9182,44 +9857,50 @@ | |||
3673 | 9182 | # to ld, don't add -lc before -lgcc. | 9857 | # to ld, don't add -lc before -lgcc. |
3674 | 9183 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 | 9858 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 |
3675 | 9184 | $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } | 9859 | $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } |
3678 | 9185 | $RM conftest* | 9860 | if ${lt_cv_archive_cmds_need_lc+:} false; then : |
3679 | 9186 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext | 9861 | $as_echo_n "(cached) " >&6 |
3680 | 9862 | else | ||
3681 | 9863 | $RM conftest* | ||
3682 | 9864 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext | ||
3683 | 9187 | 9865 | ||
3685 | 9188 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 9866 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
3686 | 9189 | (eval $ac_compile) 2>&5 | 9867 | (eval $ac_compile) 2>&5 |
3687 | 9190 | ac_status=$? | 9868 | ac_status=$? |
3688 | 9191 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 9869 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3689 | 9192 | test $ac_status = 0; } 2>conftest.err; then | 9870 | test $ac_status = 0; } 2>conftest.err; then |
3704 | 9193 | soname=conftest | 9871 | soname=conftest |
3705 | 9194 | lib=conftest | 9872 | lib=conftest |
3706 | 9195 | libobjs=conftest.$ac_objext | 9873 | libobjs=conftest.$ac_objext |
3707 | 9196 | deplibs= | 9874 | deplibs= |
3708 | 9197 | wl=$lt_prog_compiler_wl | 9875 | wl=$lt_prog_compiler_wl |
3709 | 9198 | pic_flag=$lt_prog_compiler_pic | 9876 | pic_flag=$lt_prog_compiler_pic |
3710 | 9199 | compiler_flags=-v | 9877 | compiler_flags=-v |
3711 | 9200 | linker_flags=-v | 9878 | linker_flags=-v |
3712 | 9201 | verstring= | 9879 | verstring= |
3713 | 9202 | output_objdir=. | 9880 | output_objdir=. |
3714 | 9203 | libname=conftest | 9881 | libname=conftest |
3715 | 9204 | lt_save_allow_undefined_flag=$allow_undefined_flag | 9882 | lt_save_allow_undefined_flag=$allow_undefined_flag |
3716 | 9205 | allow_undefined_flag= | 9883 | allow_undefined_flag= |
3717 | 9206 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 | 9884 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 |
3718 | 9207 | (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 | 9885 | (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 |
3719 | 9208 | ac_status=$? | 9886 | ac_status=$? |
3720 | 9209 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 9887 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3721 | 9210 | test $ac_status = 0; } | 9888 | test $ac_status = 0; } |
3734 | 9211 | then | 9889 | then |
3735 | 9212 | archive_cmds_need_lc=no | 9890 | lt_cv_archive_cmds_need_lc=no |
3736 | 9213 | else | 9891 | else |
3737 | 9214 | archive_cmds_need_lc=yes | 9892 | lt_cv_archive_cmds_need_lc=yes |
3738 | 9215 | fi | 9893 | fi |
3739 | 9216 | allow_undefined_flag=$lt_save_allow_undefined_flag | 9894 | allow_undefined_flag=$lt_save_allow_undefined_flag |
3740 | 9217 | else | 9895 | else |
3741 | 9218 | cat conftest.err 1>&5 | 9896 | cat conftest.err 1>&5 |
3742 | 9219 | fi | 9897 | fi |
3743 | 9220 | $RM conftest* | 9898 | $RM conftest* |
3744 | 9221 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 | 9899 | |
3745 | 9222 | $as_echo "$archive_cmds_need_lc" >&6; } | 9900 | fi |
3746 | 9901 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 | ||
3747 | 9902 | $as_echo "$lt_cv_archive_cmds_need_lc" >&6; } | ||
3748 | 9903 | archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc | ||
3749 | 9223 | ;; | 9904 | ;; |
3750 | 9224 | esac | 9905 | esac |
3751 | 9225 | fi | 9906 | fi |
3752 | @@ -9390,16 +10071,23 @@ | |||
3753 | 9390 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; | 10071 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; |
3754 | 9391 | *) lt_awk_arg="/^libraries:/" ;; | 10072 | *) lt_awk_arg="/^libraries:/" ;; |
3755 | 9392 | esac | 10073 | esac |
3758 | 9393 | lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` | 10074 | case $host_os in |
3759 | 9394 | if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then | 10075 | mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; |
3760 | 10076 | *) lt_sed_strip_eq="s,=/,/,g" ;; | ||
3761 | 10077 | esac | ||
3762 | 10078 | lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` | ||
3763 | 10079 | case $lt_search_path_spec in | ||
3764 | 10080 | *\;*) | ||
3765 | 9395 | # if the path contains ";" then we assume it to be the separator | 10081 | # if the path contains ";" then we assume it to be the separator |
3766 | 9396 | # otherwise default to the standard path separator (i.e. ":") - it is | 10082 | # otherwise default to the standard path separator (i.e. ":") - it is |
3767 | 9397 | # assumed that no part of a normal pathname contains ";" but that should | 10083 | # assumed that no part of a normal pathname contains ";" but that should |
3768 | 9398 | # okay in the real world where ";" in dirpaths is itself problematic. | 10084 | # okay in the real world where ";" in dirpaths is itself problematic. |
3773 | 9399 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` | 10085 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` |
3774 | 9400 | else | 10086 | ;; |
3775 | 9401 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | 10087 | *) |
3776 | 9402 | fi | 10088 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` |
3777 | 10089 | ;; | ||
3778 | 10090 | esac | ||
3779 | 9403 | # Ok, now we have the path, separated by spaces, we can step through it | 10091 | # Ok, now we have the path, separated by spaces, we can step through it |
3780 | 9404 | # and add multilib dir if necessary. | 10092 | # and add multilib dir if necessary. |
3781 | 9405 | lt_tmp_lt_search_path_spec= | 10093 | lt_tmp_lt_search_path_spec= |
3782 | @@ -9412,7 +10100,7 @@ | |||
3783 | 9412 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" | 10100 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" |
3784 | 9413 | fi | 10101 | fi |
3785 | 9414 | done | 10102 | done |
3787 | 9415 | lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' | 10103 | lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' |
3788 | 9416 | BEGIN {RS=" "; FS="/|\n";} { | 10104 | BEGIN {RS=" "; FS="/|\n";} { |
3789 | 9417 | lt_foo=""; | 10105 | lt_foo=""; |
3790 | 9418 | lt_count=0; | 10106 | lt_count=0; |
3791 | @@ -9432,7 +10120,13 @@ | |||
3792 | 9432 | if (lt_foo != "") { lt_freq[lt_foo]++; } | 10120 | if (lt_foo != "") { lt_freq[lt_foo]++; } |
3793 | 9433 | if (lt_freq[lt_foo] == 1) { print lt_foo; } | 10121 | if (lt_freq[lt_foo] == 1) { print lt_foo; } |
3794 | 9434 | }'` | 10122 | }'` |
3796 | 9435 | sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` | 10123 | # AWK program above erroneously prepends '/' to C:/dos/paths |
3797 | 10124 | # for these hosts. | ||
3798 | 10125 | case $host_os in | ||
3799 | 10126 | mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ | ||
3800 | 10127 | $SED 's,/\([A-Za-z]:\),\1,g'` ;; | ||
3801 | 10128 | esac | ||
3802 | 10129 | sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` | ||
3803 | 9436 | else | 10130 | else |
3804 | 9437 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" | 10131 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" |
3805 | 9438 | fi | 10132 | fi |
3806 | @@ -9520,7 +10214,7 @@ | |||
3807 | 9520 | m68k) | 10214 | m68k) |
3808 | 9521 | library_names_spec='$libname.ixlibrary $libname.a' | 10215 | library_names_spec='$libname.ixlibrary $libname.a' |
3809 | 9522 | # Create ${libname}_ixlibrary.a entries in /sys/libs. | 10216 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
3811 | 9523 | 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' | 10217 | 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 | 9524 | ;; | 10218 | ;; |
3813 | 9525 | esac | 10219 | esac |
3814 | 9526 | ;; | 10220 | ;; |
3815 | @@ -9551,8 +10245,9 @@ | |||
3816 | 9551 | need_version=no | 10245 | need_version=no |
3817 | 9552 | need_lib_prefix=no | 10246 | need_lib_prefix=no |
3818 | 9553 | 10247 | ||
3821 | 9554 | case $GCC,$host_os in | 10248 | case $GCC,$cc_basename in |
3822 | 9555 | yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) | 10249 | yes,*) |
3823 | 10250 | # gcc | ||
3824 | 9556 | library_names_spec='$libname.dll.a' | 10251 | library_names_spec='$libname.dll.a' |
3825 | 9557 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 10252 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
3826 | 9558 | postinstall_cmds='base_file=`basename \${file}`~ | 10253 | postinstall_cmds='base_file=`basename \${file}`~ |
3827 | @@ -9573,36 +10268,83 @@ | |||
3828 | 9573 | cygwin*) | 10268 | cygwin*) |
3829 | 9574 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' | 10269 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
3830 | 9575 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 10270 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
3832 | 9576 | sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" | 10271 | |
3833 | 10272 | sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" | ||
3834 | 9577 | ;; | 10273 | ;; |
3835 | 9578 | mingw* | cegcc*) | 10274 | mingw* | cegcc*) |
3836 | 9579 | # MinGW DLLs use traditional 'lib' prefix | 10275 | # MinGW DLLs use traditional 'lib' prefix |
3837 | 9580 | soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 10276 | soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
3838 | 9581 | sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` | ||
3839 | 9582 | if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
3840 | 9583 | # It is most probably a Windows format PATH printed by | ||
3841 | 9584 | # mingw gcc, but we are running on Cygwin. Gcc prints its search | ||
3842 | 9585 | # path with ; separators, and with drive letters. We can handle the | ||
3843 | 9586 | # drive letters (cygwin fileutils understands them), so leave them, | ||
3844 | 9587 | # especially as we might pass files found there to a mingw objdump, | ||
3845 | 9588 | # which wouldn't understand a cygwinified path. Ahh. | ||
3846 | 9589 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
3847 | 9590 | else | ||
3848 | 9591 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
3849 | 9592 | fi | ||
3850 | 9593 | ;; | 10277 | ;; |
3851 | 9594 | pw32*) | 10278 | pw32*) |
3852 | 9595 | # pw32 DLLs use 'pw' prefix rather than 'lib' | 10279 | # pw32 DLLs use 'pw' prefix rather than 'lib' |
3853 | 9596 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | 10280 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' |
3854 | 9597 | ;; | 10281 | ;; |
3855 | 9598 | esac | 10282 | esac |
3856 | 10283 | dynamic_linker='Win32 ld.exe' | ||
3857 | 10284 | ;; | ||
3858 | 10285 | |||
3859 | 10286 | *,cl*) | ||
3860 | 10287 | # Native MSVC | ||
3861 | 10288 | libname_spec='$name' | ||
3862 | 10289 | soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' | ||
3863 | 10290 | library_names_spec='${libname}.dll.lib' | ||
3864 | 10291 | |||
3865 | 10292 | case $build_os in | ||
3866 | 10293 | mingw*) | ||
3867 | 10294 | sys_lib_search_path_spec= | ||
3868 | 10295 | lt_save_ifs=$IFS | ||
3869 | 10296 | IFS=';' | ||
3870 | 10297 | for lt_path in $LIB | ||
3871 | 10298 | do | ||
3872 | 10299 | IFS=$lt_save_ifs | ||
3873 | 10300 | # Let DOS variable expansion print the short 8.3 style file name. | ||
3874 | 10301 | lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
3875 | 10302 | sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
3876 | 10303 | done | ||
3877 | 10304 | IFS=$lt_save_ifs | ||
3878 | 10305 | # Convert to MSYS style. | ||
3879 | 10306 | 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 | 10307 | ;; | ||
3881 | 10308 | cygwin*) | ||
3882 | 10309 | # Convert to unix form, then to dos form, then back to unix form | ||
3883 | 10310 | # but this time dos style (no spaces!) so that the unix form looks | ||
3884 | 10311 | # like /cygdrive/c/PROGRA~1:/cygdr... | ||
3885 | 10312 | sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
3886 | 10313 | sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
3887 | 10314 | sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
3888 | 10315 | ;; | ||
3889 | 10316 | *) | ||
3890 | 10317 | sys_lib_search_path_spec="$LIB" | ||
3891 | 10318 | if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then | ||
3892 | 10319 | # It is most probably a Windows format PATH. | ||
3893 | 10320 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | ||
3894 | 10321 | else | ||
3895 | 10322 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
3896 | 10323 | fi | ||
3897 | 10324 | # FIXME: find the short name or the path components, as spaces are | ||
3898 | 10325 | # common. (e.g. "Program Files" -> "PROGRA~1") | ||
3899 | 10326 | ;; | ||
3900 | 10327 | esac | ||
3901 | 10328 | |||
3902 | 10329 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
3903 | 10330 | postinstall_cmds='base_file=`basename \${file}`~ | ||
3904 | 10331 | dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
3905 | 10332 | dldir=$destdir/`dirname \$dlpath`~ | ||
3906 | 10333 | test -d \$dldir || mkdir -p \$dldir~ | ||
3907 | 10334 | $install_prog $dir/$dlname \$dldir/$dlname' | ||
3908 | 10335 | postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
3909 | 10336 | dlpath=$dir/\$dldll~ | ||
3910 | 10337 | $RM \$dlpath' | ||
3911 | 10338 | shlibpath_overrides_runpath=yes | ||
3912 | 10339 | dynamic_linker='Win32 link.exe' | ||
3913 | 9599 | ;; | 10340 | ;; |
3914 | 9600 | 10341 | ||
3915 | 9601 | *) | 10342 | *) |
3916 | 10343 | # Assume MSVC wrapper | ||
3917 | 9602 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' | 10344 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' |
3918 | 10345 | dynamic_linker='Win32 ld.exe' | ||
3919 | 9603 | ;; | 10346 | ;; |
3920 | 9604 | esac | 10347 | esac |
3921 | 9605 | dynamic_linker='Win32 ld.exe' | ||
3922 | 9606 | # FIXME: first we should search . and the directory the executable is in | 10348 | # FIXME: first we should search . and the directory the executable is in |
3923 | 9607 | shlibpath_var=PATH | 10349 | shlibpath_var=PATH |
3924 | 9608 | ;; | 10350 | ;; |
3925 | @@ -9686,6 +10428,20 @@ | |||
3926 | 9686 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | 10428 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
3927 | 9687 | soname_spec='${libname}${release}${shared_ext}$major' | 10429 | soname_spec='${libname}${release}${shared_ext}$major' |
3928 | 9688 | shlibpath_var=LD_LIBRARY_PATH | 10430 | shlibpath_var=LD_LIBRARY_PATH |
3929 | 10431 | shlibpath_overrides_runpath=no | ||
3930 | 10432 | hardcode_into_libs=yes | ||
3931 | 10433 | ;; | ||
3932 | 10434 | |||
3933 | 10435 | haiku*) | ||
3934 | 10436 | version_type=linux | ||
3935 | 10437 | need_lib_prefix=no | ||
3936 | 10438 | need_version=no | ||
3937 | 10439 | dynamic_linker="$host_os runtime_loader" | ||
3938 | 10440 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | ||
3939 | 10441 | soname_spec='${libname}${release}${shared_ext}$major' | ||
3940 | 10442 | shlibpath_var=LIBRARY_PATH | ||
3941 | 10443 | shlibpath_overrides_runpath=yes | ||
3942 | 10444 | sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | ||
3943 | 9689 | hardcode_into_libs=yes | 10445 | hardcode_into_libs=yes |
3944 | 9690 | ;; | 10446 | ;; |
3945 | 9691 | 10447 | ||
3946 | @@ -9731,8 +10487,10 @@ | |||
3947 | 9731 | soname_spec='${libname}${release}${shared_ext}$major' | 10487 | soname_spec='${libname}${release}${shared_ext}$major' |
3948 | 9732 | ;; | 10488 | ;; |
3949 | 9733 | esac | 10489 | esac |
3951 | 9734 | # HP-UX runs *really* slowly unless shared libraries are mode 555. | 10490 | # HP-UX runs *really* slowly unless shared libraries are mode 555, ... |
3952 | 9735 | postinstall_cmds='chmod 555 $lib' | 10491 | postinstall_cmds='chmod 555 $lib' |
3953 | 10492 | # or fails outright, so override atomically: | ||
3954 | 10493 | install_override_mode=555 | ||
3955 | 9736 | ;; | 10494 | ;; |
3956 | 9737 | 10495 | ||
3957 | 9738 | interix[3-9]*) | 10496 | interix[3-9]*) |
3958 | @@ -9799,12 +10557,17 @@ | |||
3959 | 9799 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' | 10557 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
3960 | 9800 | shlibpath_var=LD_LIBRARY_PATH | 10558 | shlibpath_var=LD_LIBRARY_PATH |
3961 | 9801 | shlibpath_overrides_runpath=no | 10559 | shlibpath_overrides_runpath=no |
3962 | 10560 | |||
3963 | 9802 | # Some binutils ld are patched to set DT_RUNPATH | 10561 | # Some binutils ld are patched to set DT_RUNPATH |
3969 | 9803 | save_LDFLAGS=$LDFLAGS | 10562 | if ${lt_cv_shlibpath_overrides_runpath+:} false; then : |
3970 | 9804 | save_libdir=$libdir | 10563 | $as_echo_n "(cached) " >&6 |
3971 | 9805 | eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ | 10564 | else |
3972 | 9806 | LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" | 10565 | lt_cv_shlibpath_overrides_runpath=no |
3973 | 9807 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 10566 | save_LDFLAGS=$LDFLAGS |
3974 | 10567 | save_libdir=$libdir | ||
3975 | 10568 | eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ | ||
3976 | 10569 | LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" | ||
3977 | 10570 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3978 | 9808 | /* end confdefs.h. */ | 10571 | /* end confdefs.h. */ |
3979 | 9809 | 10572 | ||
3980 | 9810 | int | 10573 | int |
3981 | @@ -9817,13 +10580,17 @@ | |||
3982 | 9817 | _ACEOF | 10580 | _ACEOF |
3983 | 9818 | if ac_fn_c_try_link "$LINENO"; then : | 10581 | if ac_fn_c_try_link "$LINENO"; then : |
3984 | 9819 | if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : | 10582 | if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : |
3986 | 9820 | shlibpath_overrides_runpath=yes | 10583 | lt_cv_shlibpath_overrides_runpath=yes |
3987 | 9821 | fi | 10584 | fi |
3988 | 9822 | fi | 10585 | fi |
3989 | 9823 | rm -f core conftest.err conftest.$ac_objext \ | 10586 | rm -f core conftest.err conftest.$ac_objext \ |
3990 | 9824 | conftest$ac_exeext conftest.$ac_ext | 10587 | conftest$ac_exeext conftest.$ac_ext |
3993 | 9825 | LDFLAGS=$save_LDFLAGS | 10588 | LDFLAGS=$save_LDFLAGS |
3994 | 9826 | libdir=$save_libdir | 10589 | libdir=$save_libdir |
3995 | 10590 | |||
3996 | 10591 | fi | ||
3997 | 10592 | |||
3998 | 10593 | shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath | ||
3999 | 9827 | 10594 | ||
4000 | 9828 | # This implies no fast_install, which is unacceptable. | 10595 | # This implies no fast_install, which is unacceptable. |
4001 | 9829 | # Some rework will be needed to allow for fast_install | 10596 | # Some rework will be needed to allow for fast_install |
4002 | @@ -9832,7 +10599,7 @@ | |||
4003 | 9832 | 10599 | ||
4004 | 9833 | # Append ld.so.conf contents to the search path | 10600 | # Append ld.so.conf contents to the search path |
4005 | 9834 | if test -f /etc/ld.so.conf; then | 10601 | if test -f /etc/ld.so.conf; then |
4007 | 9835 | 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' ' '` | 10602 | 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 | 9836 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | 10603 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
4009 | 9837 | fi | 10604 | fi |
4010 | 9838 | 10605 | ||
4011 | @@ -10147,6 +10914,11 @@ | |||
4012 | 10147 | 10914 | ||
4013 | 10148 | 10915 | ||
4014 | 10149 | 10916 | ||
4015 | 10917 | |||
4016 | 10918 | |||
4017 | 10919 | |||
4018 | 10920 | |||
4019 | 10921 | |||
4020 | 10150 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 | 10922 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 |
4021 | 10151 | $as_echo_n "checking how to hardcode library paths into programs... " >&6; } | 10923 | $as_echo_n "checking how to hardcode library paths into programs... " >&6; } |
4022 | 10152 | hardcode_action= | 10924 | hardcode_action= |
4023 | @@ -10477,7 +11249,7 @@ | |||
4024 | 10477 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 11249 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
4025 | 10478 | lt_status=$lt_dlunknown | 11250 | lt_status=$lt_dlunknown |
4026 | 10479 | cat > conftest.$ac_ext <<_LT_EOF | 11251 | cat > conftest.$ac_ext <<_LT_EOF |
4028 | 10480 | #line 10480 "configure" | 11252 | #line $LINENO "configure" |
4029 | 10481 | #include "confdefs.h" | 11253 | #include "confdefs.h" |
4030 | 10482 | 11254 | ||
4031 | 10483 | #if HAVE_DLFCN_H | 11255 | #if HAVE_DLFCN_H |
4032 | @@ -10518,7 +11290,13 @@ | |||
4033 | 10518 | # endif | 11290 | # endif |
4034 | 10519 | #endif | 11291 | #endif |
4035 | 10520 | 11292 | ||
4037 | 10521 | void fnord() { int i=42;} | 11293 | /* When -fvisbility=hidden is used, assume the code has been annotated |
4038 | 11294 | correspondingly for the symbols needed. */ | ||
4039 | 11295 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
4040 | 11296 | int fnord () __attribute__((visibility("default"))); | ||
4041 | 11297 | #endif | ||
4042 | 11298 | |||
4043 | 11299 | int fnord () { return 42; } | ||
4044 | 10522 | int main () | 11300 | int main () |
4045 | 10523 | { | 11301 | { |
4046 | 10524 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 11302 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
4047 | @@ -10527,7 +11305,11 @@ | |||
4048 | 10527 | if (self) | 11305 | if (self) |
4049 | 10528 | { | 11306 | { |
4050 | 10529 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; | 11307 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
4052 | 10530 | else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; | 11308 | else |
4053 | 11309 | { | ||
4054 | 11310 | if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; | ||
4055 | 11311 | else puts (dlerror ()); | ||
4056 | 11312 | } | ||
4057 | 10531 | /* dlclose (self); */ | 11313 | /* dlclose (self); */ |
4058 | 10532 | } | 11314 | } |
4059 | 10533 | else | 11315 | else |
4060 | @@ -10573,7 +11355,7 @@ | |||
4061 | 10573 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 11355 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
4062 | 10574 | lt_status=$lt_dlunknown | 11356 | lt_status=$lt_dlunknown |
4063 | 10575 | cat > conftest.$ac_ext <<_LT_EOF | 11357 | cat > conftest.$ac_ext <<_LT_EOF |
4065 | 10576 | #line 10576 "configure" | 11358 | #line $LINENO "configure" |
4066 | 10577 | #include "confdefs.h" | 11359 | #include "confdefs.h" |
4067 | 10578 | 11360 | ||
4068 | 10579 | #if HAVE_DLFCN_H | 11361 | #if HAVE_DLFCN_H |
4069 | @@ -10614,7 +11396,13 @@ | |||
4070 | 10614 | # endif | 11396 | # endif |
4071 | 10615 | #endif | 11397 | #endif |
4072 | 10616 | 11398 | ||
4074 | 10617 | void fnord() { int i=42;} | 11399 | /* When -fvisbility=hidden is used, assume the code has been annotated |
4075 | 11400 | correspondingly for the symbols needed. */ | ||
4076 | 11401 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
4077 | 11402 | int fnord () __attribute__((visibility("default"))); | ||
4078 | 11403 | #endif | ||
4079 | 11404 | |||
4080 | 11405 | int fnord () { return 42; } | ||
4081 | 10618 | int main () | 11406 | int main () |
4082 | 10619 | { | 11407 | { |
4083 | 10620 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 11408 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
4084 | @@ -10623,7 +11411,11 @@ | |||
4085 | 10623 | if (self) | 11411 | if (self) |
4086 | 10624 | { | 11412 | { |
4087 | 10625 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; | 11413 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
4089 | 10626 | else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; | 11414 | else |
4090 | 11415 | { | ||
4091 | 11416 | if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; | ||
4092 | 11417 | else puts (dlerror ()); | ||
4093 | 11418 | } | ||
4094 | 10627 | /* dlclose (self); */ | 11419 | /* dlclose (self); */ |
4095 | 10628 | } | 11420 | } |
4096 | 10629 | else | 11421 | else |
4097 | @@ -11009,6 +11801,7 @@ | |||
4098 | 11009 | 11801 | ||
4099 | 11010 | 11802 | ||
4100 | 11011 | 11803 | ||
4101 | 11804 | |||
4102 | 11012 | # Extract the first word of "gtkdoc-check", so it can be a program name with args. | 11805 | # Extract the first word of "gtkdoc-check", so it can be a program name with args. |
4103 | 11013 | set dummy gtkdoc-check; ac_word=$2 | 11806 | set dummy gtkdoc-check; ac_word=$2 |
4104 | 11014 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 11807 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4105 | @@ -11166,6 +11959,99 @@ | |||
4106 | 11166 | else | 11959 | else |
4107 | 11167 | as_fn_error $? "You need to have gtk-doc >= 1.9 installed to build $PACKAGE_NAME" "$LINENO" 5 | 11960 | as_fn_error $? "You need to have gtk-doc >= 1.9 installed to build $PACKAGE_NAME" "$LINENO" 5 |
4108 | 11168 | fi | 11961 | fi |
4109 | 11962 | if test "x$PACKAGE_NAME" != "xglib"; then | ||
4110 | 11963 | |||
4111 | 11964 | pkg_failed=no | ||
4112 | 11965 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 | ||
4113 | 11966 | $as_echo_n "checking for GTKDOC_DEPS... " >&6; } | ||
4114 | 11967 | |||
4115 | 11968 | if test -n "$GTKDOC_DEPS_CFLAGS"; then | ||
4116 | 11969 | pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" | ||
4117 | 11970 | elif test -n "$PKG_CONFIG"; then | ||
4118 | 11971 | if test -n "$PKG_CONFIG" && \ | ||
4119 | 11972 | { { $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 | 11973 | ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 | ||
4121 | 11974 | ac_status=$? | ||
4122 | 11975 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
4123 | 11976 | test $ac_status = 0; }; then | ||
4124 | 11977 | pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` | ||
4125 | 11978 | test "x$?" != "x0" && pkg_failed=yes | ||
4126 | 11979 | else | ||
4127 | 11980 | pkg_failed=yes | ||
4128 | 11981 | fi | ||
4129 | 11982 | else | ||
4130 | 11983 | pkg_failed=untried | ||
4131 | 11984 | fi | ||
4132 | 11985 | if test -n "$GTKDOC_DEPS_LIBS"; then | ||
4133 | 11986 | pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS" | ||
4134 | 11987 | elif test -n "$PKG_CONFIG"; then | ||
4135 | 11988 | if test -n "$PKG_CONFIG" && \ | ||
4136 | 11989 | { { $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 | 11990 | ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 | ||
4138 | 11991 | ac_status=$? | ||
4139 | 11992 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
4140 | 11993 | test $ac_status = 0; }; then | ||
4141 | 11994 | pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` | ||
4142 | 11995 | test "x$?" != "x0" && pkg_failed=yes | ||
4143 | 11996 | else | ||
4144 | 11997 | pkg_failed=yes | ||
4145 | 11998 | fi | ||
4146 | 11999 | else | ||
4147 | 12000 | pkg_failed=untried | ||
4148 | 12001 | fi | ||
4149 | 12002 | |||
4150 | 12003 | |||
4151 | 12004 | |||
4152 | 12005 | if test $pkg_failed = yes; then | ||
4153 | 12006 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4154 | 12007 | $as_echo "no" >&6; } | ||
4155 | 12008 | |||
4156 | 12009 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | ||
4157 | 12010 | _pkg_short_errors_supported=yes | ||
4158 | 12011 | else | ||
4159 | 12012 | _pkg_short_errors_supported=no | ||
4160 | 12013 | fi | ||
4161 | 12014 | if test $_pkg_short_errors_supported = yes; then | ||
4162 | 12015 | 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 | 12016 | else | ||
4164 | 12017 | 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 | 12018 | fi | ||
4166 | 12019 | # Put the nasty error message in config.log where it belongs | ||
4167 | 12020 | echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 | ||
4168 | 12021 | |||
4169 | 12022 | as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: | ||
4170 | 12023 | |||
4171 | 12024 | $GTKDOC_DEPS_PKG_ERRORS | ||
4172 | 12025 | |||
4173 | 12026 | Consider adjusting the PKG_CONFIG_PATH environment variable if you | ||
4174 | 12027 | installed software in a non-standard prefix. | ||
4175 | 12028 | |||
4176 | 12029 | Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS | ||
4177 | 12030 | and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. | ||
4178 | 12031 | See the pkg-config man page for more details." "$LINENO" 5 | ||
4179 | 12032 | elif test $pkg_failed = untried; then | ||
4180 | 12033 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
4181 | 12034 | $as_echo "no" >&6; } | ||
4182 | 12035 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
4183 | 12036 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
4184 | 12037 | as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it | ||
4185 | 12038 | is in your PATH or set the PKG_CONFIG environment variable to the full | ||
4186 | 12039 | path to pkg-config. | ||
4187 | 12040 | |||
4188 | 12041 | Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS | ||
4189 | 12042 | and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. | ||
4190 | 12043 | See the pkg-config man page for more details. | ||
4191 | 12044 | |||
4192 | 12045 | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | ||
4193 | 12046 | See \`config.log' for more details" "$LINENO" 5; } | ||
4194 | 12047 | else | ||
4195 | 12048 | GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS | ||
4196 | 12049 | GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS | ||
4197 | 12050 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
4198 | 12051 | $as_echo "yes" >&6; } | ||
4199 | 12052 | |||
4200 | 12053 | fi | ||
4201 | 12054 | fi | ||
4202 | 11169 | fi | 12055 | fi |
4203 | 11170 | 12056 | ||
4204 | 11171 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 | 12057 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 |
4205 | @@ -11844,11 +12730,11 @@ | |||
4206 | 11844 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Vala compiler found. You will not be able to compile .vala source files." >&5 | 12730 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Vala compiler found. You will not be able to compile .vala source files." >&5 |
4207 | 11845 | $as_echo "$as_me: WARNING: No Vala compiler found. You will not be able to compile .vala source files." >&2;} | 12731 | $as_echo "$as_me: WARNING: No Vala compiler found. You will not be able to compile .vala source files." >&2;} |
4208 | 11846 | else | 12732 | else |
4212 | 11847 | if test -n "0.11.0"; then : | 12733 | if test -n "0.14.0"; then : |
4213 | 11848 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking $VALAC is at least version 0.11.0" >&5 | 12734 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking $VALAC is at least version 0.14.0" >&5 |
4214 | 11849 | $as_echo_n "checking $VALAC is at least version 0.11.0... " >&6; } | 12735 | $as_echo_n "checking $VALAC is at least version 0.14.0... " >&6; } |
4215 | 11850 | am__vala_version=`$VALAC --version | sed 's/Vala *//'` | 12736 | am__vala_version=`$VALAC --version | sed 's/Vala *//'` |
4217 | 11851 | as_arg_v1=0.11.0 | 12737 | as_arg_v1=0.14.0 |
4218 | 11852 | as_arg_v2="$am__vala_version" | 12738 | as_arg_v2="$am__vala_version" |
4219 | 11853 | awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null | 12739 | awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null |
4220 | 11854 | case $? in #( | 12740 | case $? in #( |
4221 | @@ -11861,7 +12747,7 @@ | |||
4222 | 11861 | 2) : | 12747 | 2) : |
4223 | 11862 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 12748 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4224 | 11863 | $as_echo "no" >&6; } | 12749 | $as_echo "no" >&6; } |
4226 | 11864 | as_fn_error $? "Vala 0.11.0 not found." "$LINENO" 5 ;; #( | 12750 | as_fn_error $? "Vala 0.14.0 not found." "$LINENO" 5 ;; #( |
4227 | 11865 | *) : | 12751 | *) : |
4228 | 11866 | ;; | 12752 | ;; |
4229 | 11867 | esac | 12753 | esac |
4230 | @@ -13507,7 +14393,7 @@ | |||
4231 | 13507 | # report actual input values of CONFIG_FILES etc. instead of their | 14393 | # report actual input values of CONFIG_FILES etc. instead of their |
4232 | 13508 | # values after options handling. | 14394 | # values after options handling. |
4233 | 13509 | ac_log=" | 14395 | ac_log=" |
4235 | 13510 | This file was extended by libappindicator $as_me 0.3.91, which was | 14396 | This file was extended by libappindicator $as_me 0.4.1, which was |
4236 | 13511 | generated by GNU Autoconf 2.68. Invocation command line was | 14397 | generated by GNU Autoconf 2.68. Invocation command line was |
4237 | 13512 | 14398 | ||
4238 | 13513 | CONFIG_FILES = $CONFIG_FILES | 14399 | CONFIG_FILES = $CONFIG_FILES |
4239 | @@ -13574,7 +14460,7 @@ | |||
4240 | 13574 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 14460 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
4241 | 13575 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 14461 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
4242 | 13576 | ac_cs_version="\\ | 14462 | ac_cs_version="\\ |
4244 | 13577 | libappindicator config.status 0.3.91 | 14463 | libappindicator config.status 0.4.1 |
4245 | 13578 | configured by $0, generated by GNU Autoconf 2.68, | 14464 | configured by $0, generated by GNU Autoconf 2.68, |
4246 | 13579 | with options \\"\$ac_cs_config\\" | 14465 | with options \\"\$ac_cs_config\\" |
4247 | 13580 | 14466 | ||
4248 | @@ -13703,131 +14589,153 @@ | |||
4249 | 13703 | sed_quote_subst='$sed_quote_subst' | 14589 | sed_quote_subst='$sed_quote_subst' |
4250 | 13704 | double_quote_subst='$double_quote_subst' | 14590 | double_quote_subst='$double_quote_subst' |
4251 | 13705 | delay_variable_subst='$delay_variable_subst' | 14591 | delay_variable_subst='$delay_variable_subst' |
4370 | 13706 | macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' | 14592 | macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' |
4371 | 13707 | macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' | 14593 | macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' |
4372 | 13708 | enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' | 14594 | enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' |
4373 | 13709 | enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' | 14595 | enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' |
4374 | 13710 | pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' | 14596 | pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' |
4375 | 13711 | enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' | 14597 | enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' |
4376 | 13712 | host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' | 14598 | SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' |
4377 | 13713 | host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' | 14599 | ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' |
4378 | 13714 | host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' | 14600 | host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' |
4379 | 13715 | build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' | 14601 | host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' |
4380 | 13716 | build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' | 14602 | host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' |
4381 | 13717 | build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' | 14603 | build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' |
4382 | 13718 | SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' | 14604 | build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' |
4383 | 13719 | Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' | 14605 | build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' |
4384 | 13720 | GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' | 14606 | SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' |
4385 | 13721 | EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' | 14607 | Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' |
4386 | 13722 | FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' | 14608 | GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' |
4387 | 13723 | LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' | 14609 | EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' |
4388 | 13724 | NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' | 14610 | FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' |
4389 | 13725 | LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' | 14611 | LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' |
4390 | 13726 | max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' | 14612 | NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' |
4391 | 13727 | ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' | 14613 | LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' |
4392 | 13728 | exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' | 14614 | max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' |
4393 | 13729 | lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' | 14615 | ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' |
4394 | 13730 | lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' | 14616 | exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' |
4395 | 13731 | lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' | 14617 | lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' |
4396 | 13732 | reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' | 14618 | lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' |
4397 | 13733 | reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' | 14619 | lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' |
4398 | 13734 | OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' | 14620 | lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' |
4399 | 13735 | deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' | 14621 | lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' |
4400 | 13736 | file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' | 14622 | reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' |
4401 | 13737 | AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' | 14623 | reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' |
4402 | 13738 | AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' | 14624 | OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
4403 | 13739 | STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' | 14625 | deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' |
4404 | 13740 | RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' | 14626 | file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' |
4405 | 13741 | old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' | 14627 | file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' |
4406 | 13742 | old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' | 14628 | want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' |
4407 | 13743 | old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' | 14629 | DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
4408 | 13744 | CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' | 14630 | sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' |
4409 | 13745 | CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' | 14631 | AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' |
4410 | 13746 | compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' | 14632 | AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' |
4411 | 13747 | GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' | 14633 | archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' |
4412 | 13748 | lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' | 14634 | STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' |
4413 | 13749 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' | 14635 | RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' |
4414 | 13750 | 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"`' | 14636 | old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
4415 | 13751 | 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"`' | 14637 | old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' |
4416 | 13752 | objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' | 14638 | old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' |
4417 | 13753 | SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' | 14639 | lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' |
4418 | 13754 | ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' | 14640 | CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' |
4419 | 13755 | MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' | 14641 | CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' |
4420 | 13756 | lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' | 14642 | compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' |
4421 | 13757 | lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' | 14643 | GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' |
4422 | 13758 | lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' | 14644 | lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' |
4423 | 13759 | lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' | 14645 | lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' |
4424 | 13760 | lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' | 14646 | 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 | 13761 | need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' | 14647 | 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 | 13762 | DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' | 14648 | nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' |
4427 | 13763 | NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' | 14649 | lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' |
4428 | 13764 | LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' | 14650 | objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' |
4429 | 13765 | OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' | 14651 | MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' |
4430 | 13766 | OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' | 14652 | lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' |
4431 | 13767 | libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' | 14653 | lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' |
4432 | 13768 | shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' | 14654 | lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' |
4433 | 13769 | extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' | 14655 | lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' |
4434 | 13770 | archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' | 14656 | lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' |
4435 | 13771 | enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' | 14657 | need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' |
4436 | 13772 | export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' | 14658 | MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' |
4437 | 13773 | whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' | 14659 | DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' |
4438 | 13774 | compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' | 14660 | NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' |
4439 | 13775 | old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' | 14661 | LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' |
4440 | 13776 | old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' | 14662 | OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' |
4441 | 13777 | archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' | 14663 | OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' |
4442 | 13778 | archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' | 14664 | libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' |
4443 | 13779 | module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' | 14665 | shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' |
4444 | 13780 | module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' | 14666 | extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' |
4445 | 13781 | with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' | 14667 | archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' |
4446 | 13782 | allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' | 14668 | enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' |
4447 | 13783 | no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' | 14669 | export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' |
4448 | 13784 | hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' | 14670 | whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' |
4449 | 13785 | hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' | 14671 | compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' |
4450 | 13786 | hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' | 14672 | old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' |
4451 | 13787 | hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' | 14673 | old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' |
4452 | 13788 | hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' | 14674 | archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' |
4453 | 13789 | hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' | 14675 | archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' |
4454 | 13790 | hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' | 14676 | module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' |
4455 | 13791 | hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' | 14677 | module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' |
4456 | 13792 | inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' | 14678 | with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' |
4457 | 13793 | link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' | 14679 | allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' |
4458 | 13794 | fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' | 14680 | no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' |
4459 | 13795 | always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' | 14681 | hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' |
4460 | 13796 | export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' | 14682 | hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' |
4461 | 13797 | exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' | 14683 | hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' |
4462 | 13798 | include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' | 14684 | hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' |
4463 | 13799 | prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' | 14685 | hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' |
4464 | 13800 | file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' | 14686 | hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' |
4465 | 13801 | variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' | 14687 | hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' |
4466 | 13802 | need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' | 14688 | hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' |
4467 | 13803 | need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' | 14689 | inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' |
4468 | 13804 | version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' | 14690 | link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' |
4469 | 13805 | runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' | 14691 | always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' |
4470 | 13806 | shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' | 14692 | export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' |
4471 | 13807 | shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' | 14693 | exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' |
4472 | 13808 | libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' | 14694 | include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' |
4473 | 13809 | library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' | 14695 | prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' |
4474 | 13810 | soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' | 14696 | postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' |
4475 | 13811 | postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' | 14697 | file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' |
4476 | 13812 | postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' | 14698 | variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' |
4477 | 13813 | finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' | 14699 | need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' |
4478 | 13814 | finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' | 14700 | need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' |
4479 | 13815 | hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' | 14701 | version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' |
4480 | 13816 | sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' | 14702 | runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' |
4481 | 13817 | sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' | 14703 | shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' |
4482 | 13818 | hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' | 14704 | shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' |
4483 | 13819 | enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' | 14705 | libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' |
4484 | 13820 | enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' | 14706 | library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' |
4485 | 13821 | enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' | 14707 | soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' |
4486 | 13822 | old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' | 14708 | install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' |
4487 | 13823 | striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' | 14709 | postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' |
4488 | 14710 | postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' | ||
4489 | 14711 | finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' | ||
4490 | 14712 | finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' | ||
4491 | 14713 | hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' | ||
4492 | 14714 | sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' | ||
4493 | 14715 | sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' | ||
4494 | 14716 | hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' | ||
4495 | 14717 | enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' | ||
4496 | 14718 | enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' | ||
4497 | 14719 | enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' | ||
4498 | 14720 | old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' | ||
4499 | 14721 | striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' | ||
4500 | 13824 | 14722 | ||
4501 | 13825 | LTCC='$LTCC' | 14723 | LTCC='$LTCC' |
4502 | 13826 | LTCFLAGS='$LTCFLAGS' | 14724 | LTCFLAGS='$LTCFLAGS' |
4503 | 13827 | compiler='$compiler_DEFAULT' | 14725 | compiler='$compiler_DEFAULT' |
4504 | 13828 | 14726 | ||
4505 | 14727 | # A function that is used when there is no print builtin or printf. | ||
4506 | 14728 | func_fallback_echo () | ||
4507 | 14729 | { | ||
4508 | 14730 | eval 'cat <<_LTECHO_EOF | ||
4509 | 14731 | \$1 | ||
4510 | 14732 | _LTECHO_EOF' | ||
4511 | 14733 | } | ||
4512 | 14734 | |||
4513 | 13829 | # Quote evaled strings. | 14735 | # Quote evaled strings. |
4515 | 13830 | for var in SED \ | 14736 | for var in SHELL \ |
4516 | 14737 | ECHO \ | ||
4517 | 14738 | SED \ | ||
4518 | 13831 | GREP \ | 14739 | GREP \ |
4519 | 13832 | EGREP \ | 14740 | EGREP \ |
4520 | 13833 | FGREP \ | 14741 | FGREP \ |
4521 | @@ -13840,8 +14748,13 @@ | |||
4522 | 13840 | OBJDUMP \ | 14748 | OBJDUMP \ |
4523 | 13841 | deplibs_check_method \ | 14749 | deplibs_check_method \ |
4524 | 13842 | file_magic_cmd \ | 14750 | file_magic_cmd \ |
4525 | 14751 | file_magic_glob \ | ||
4526 | 14752 | want_nocaseglob \ | ||
4527 | 14753 | DLLTOOL \ | ||
4528 | 14754 | sharedlib_from_linklib_cmd \ | ||
4529 | 13843 | AR \ | 14755 | AR \ |
4530 | 13844 | AR_FLAGS \ | 14756 | AR_FLAGS \ |
4531 | 14757 | archiver_list_spec \ | ||
4532 | 13845 | STRIP \ | 14758 | STRIP \ |
4533 | 13846 | RANLIB \ | 14759 | RANLIB \ |
4534 | 13847 | CC \ | 14760 | CC \ |
4535 | @@ -13851,14 +14764,14 @@ | |||
4536 | 13851 | lt_cv_sys_global_symbol_to_cdecl \ | 14764 | lt_cv_sys_global_symbol_to_cdecl \ |
4537 | 13852 | lt_cv_sys_global_symbol_to_c_name_address \ | 14765 | lt_cv_sys_global_symbol_to_c_name_address \ |
4538 | 13853 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ | 14766 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ |
4541 | 13854 | SHELL \ | 14767 | nm_file_list_spec \ |
4540 | 13855 | ECHO \ | ||
4542 | 13856 | lt_prog_compiler_no_builtin_flag \ | 14768 | lt_prog_compiler_no_builtin_flag \ |
4543 | 14769 | lt_prog_compiler_pic \ | ||
4544 | 13857 | lt_prog_compiler_wl \ | 14770 | lt_prog_compiler_wl \ |
4545 | 13858 | lt_prog_compiler_pic \ | ||
4546 | 13859 | lt_prog_compiler_static \ | 14771 | lt_prog_compiler_static \ |
4547 | 13860 | lt_cv_prog_compiler_c_o \ | 14772 | lt_cv_prog_compiler_c_o \ |
4548 | 13861 | need_locks \ | 14773 | need_locks \ |
4549 | 14774 | MANIFEST_TOOL \ | ||
4550 | 13862 | DSYMUTIL \ | 14775 | DSYMUTIL \ |
4551 | 13863 | NMEDIT \ | 14776 | NMEDIT \ |
4552 | 13864 | LIPO \ | 14777 | LIPO \ |
4553 | @@ -13874,7 +14787,6 @@ | |||
4554 | 13874 | hardcode_libdir_flag_spec \ | 14787 | hardcode_libdir_flag_spec \ |
4555 | 13875 | hardcode_libdir_flag_spec_ld \ | 14788 | hardcode_libdir_flag_spec_ld \ |
4556 | 13876 | hardcode_libdir_separator \ | 14789 | hardcode_libdir_separator \ |
4557 | 13877 | fix_srcfile_path \ | ||
4558 | 13878 | exclude_expsyms \ | 14790 | exclude_expsyms \ |
4559 | 13879 | include_expsyms \ | 14791 | include_expsyms \ |
4560 | 13880 | file_list_spec \ | 14792 | file_list_spec \ |
4561 | @@ -13882,12 +14794,13 @@ | |||
4562 | 13882 | libname_spec \ | 14794 | libname_spec \ |
4563 | 13883 | library_names_spec \ | 14795 | library_names_spec \ |
4564 | 13884 | soname_spec \ | 14796 | soname_spec \ |
4565 | 14797 | install_override_mode \ | ||
4566 | 13885 | finish_eval \ | 14798 | finish_eval \ |
4567 | 13886 | old_striplib \ | 14799 | old_striplib \ |
4568 | 13887 | striplib; do | 14800 | striplib; do |
4570 | 13888 | case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in | 14801 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
4571 | 13889 | *[\\\\\\\`\\"\\\$]*) | 14802 | *[\\\\\\\`\\"\\\$]*) |
4573 | 13890 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" | 14803 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
4574 | 13891 | ;; | 14804 | ;; |
4575 | 13892 | *) | 14805 | *) |
4576 | 13893 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | 14806 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
4577 | @@ -13909,14 +14822,15 @@ | |||
4578 | 13909 | module_expsym_cmds \ | 14822 | module_expsym_cmds \ |
4579 | 13910 | export_symbols_cmds \ | 14823 | export_symbols_cmds \ |
4580 | 13911 | prelink_cmds \ | 14824 | prelink_cmds \ |
4581 | 14825 | postlink_cmds \ | ||
4582 | 13912 | postinstall_cmds \ | 14826 | postinstall_cmds \ |
4583 | 13913 | postuninstall_cmds \ | 14827 | postuninstall_cmds \ |
4584 | 13914 | finish_cmds \ | 14828 | finish_cmds \ |
4585 | 13915 | sys_lib_search_path_spec \ | 14829 | sys_lib_search_path_spec \ |
4586 | 13916 | sys_lib_dlsearch_path_spec; do | 14830 | sys_lib_dlsearch_path_spec; do |
4588 | 13917 | case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in | 14831 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in |
4589 | 13918 | *[\\\\\\\`\\"\\\$]*) | 14832 | *[\\\\\\\`\\"\\\$]*) |
4591 | 13919 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" | 14833 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
4592 | 13920 | ;; | 14834 | ;; |
4593 | 13921 | *) | 14835 | *) |
4594 | 13922 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | 14836 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
4595 | @@ -13924,12 +14838,6 @@ | |||
4596 | 13924 | esac | 14838 | esac |
4597 | 13925 | done | 14839 | done |
4598 | 13926 | 14840 | ||
4599 | 13927 | # Fix-up fallback echo if it was mangled by the above quoting rules. | ||
4600 | 13928 | case \$lt_ECHO in | ||
4601 | 13929 | *'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` | ||
4602 | 13930 | ;; | ||
4603 | 13931 | esac | ||
4604 | 13932 | |||
4605 | 13933 | ac_aux_dir='$ac_aux_dir' | 14841 | ac_aux_dir='$ac_aux_dir' |
4606 | 13934 | xsi_shell='$xsi_shell' | 14842 | xsi_shell='$xsi_shell' |
4607 | 13935 | lt_shell_append='$lt_shell_append' | 14843 | lt_shell_append='$lt_shell_append' |
4608 | @@ -14691,7 +15599,8 @@ | |||
4609 | 14691 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | 15599 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
4610 | 14692 | # | 15600 | # |
4611 | 14693 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 15601 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
4613 | 14694 | # 2006, 2007, 2008 Free Software Foundation, Inc. | 15602 | # 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
4614 | 15603 | # Inc. | ||
4615 | 14695 | # Written by Gordon Matzigkeit, 1996 | 15604 | # Written by Gordon Matzigkeit, 1996 |
4616 | 14696 | # | 15605 | # |
4617 | 14697 | # This file is part of GNU Libtool. | 15606 | # This file is part of GNU Libtool. |
4618 | @@ -14739,6 +15648,12 @@ | |||
4619 | 14739 | # Whether or not to optimize for fast installation. | 15648 | # Whether or not to optimize for fast installation. |
4620 | 14740 | fast_install=$enable_fast_install | 15649 | fast_install=$enable_fast_install |
4621 | 14741 | 15650 | ||
4622 | 15651 | # Shell to use when invoking shell scripts. | ||
4623 | 15652 | SHELL=$lt_SHELL | ||
4624 | 15653 | |||
4625 | 15654 | # An echo program that protects backslashes. | ||
4626 | 15655 | ECHO=$lt_ECHO | ||
4627 | 15656 | |||
4628 | 14742 | # The host system. | 15657 | # The host system. |
4629 | 14743 | host_alias=$host_alias | 15658 | host_alias=$host_alias |
4630 | 14744 | host=$host | 15659 | host=$host |
4631 | @@ -14788,9 +15703,11 @@ | |||
4632 | 14788 | # turn newlines into spaces. | 15703 | # turn newlines into spaces. |
4633 | 14789 | NL2SP=$lt_lt_NL2SP | 15704 | NL2SP=$lt_lt_NL2SP |
4634 | 14790 | 15705 | ||
4638 | 14791 | # How to create reloadable object files. | 15706 | # convert \$build file names to \$host format. |
4639 | 14792 | reload_flag=$lt_reload_flag | 15707 | to_host_file_cmd=$lt_cv_to_host_file_cmd |
4640 | 14793 | reload_cmds=$lt_reload_cmds | 15708 | |
4641 | 15709 | # convert \$build files to toolchain format. | ||
4642 | 15710 | to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
4643 | 14794 | 15711 | ||
4644 | 14795 | # An object symbol dumper. | 15712 | # An object symbol dumper. |
4645 | 14796 | OBJDUMP=$lt_OBJDUMP | 15713 | OBJDUMP=$lt_OBJDUMP |
4646 | @@ -14798,13 +15715,30 @@ | |||
4647 | 14798 | # Method to check whether dependent libraries are shared objects. | 15715 | # Method to check whether dependent libraries are shared objects. |
4648 | 14799 | deplibs_check_method=$lt_deplibs_check_method | 15716 | deplibs_check_method=$lt_deplibs_check_method |
4649 | 14800 | 15717 | ||
4651 | 14801 | # Command to use when deplibs_check_method == "file_magic". | 15718 | # Command to use when deplibs_check_method = "file_magic". |
4652 | 14802 | file_magic_cmd=$lt_file_magic_cmd | 15719 | file_magic_cmd=$lt_file_magic_cmd |
4653 | 14803 | 15720 | ||
4654 | 15721 | # How to find potential files when deplibs_check_method = "file_magic". | ||
4655 | 15722 | file_magic_glob=$lt_file_magic_glob | ||
4656 | 15723 | |||
4657 | 15724 | # Find potential files using nocaseglob when deplibs_check_method = "file_magic". | ||
4658 | 15725 | want_nocaseglob=$lt_want_nocaseglob | ||
4659 | 15726 | |||
4660 | 15727 | # DLL creation program. | ||
4661 | 15728 | DLLTOOL=$lt_DLLTOOL | ||
4662 | 15729 | |||
4663 | 15730 | # Command to associate shared and link libraries. | ||
4664 | 15731 | sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd | ||
4665 | 15732 | |||
4666 | 14804 | # The archiver. | 15733 | # The archiver. |
4667 | 14805 | AR=$lt_AR | 15734 | AR=$lt_AR |
4668 | 15735 | |||
4669 | 15736 | # Flags to create an archive. | ||
4670 | 14806 | AR_FLAGS=$lt_AR_FLAGS | 15737 | AR_FLAGS=$lt_AR_FLAGS |
4671 | 14807 | 15738 | ||
4672 | 15739 | # How to feed a file listing to the archiver. | ||
4673 | 15740 | archiver_list_spec=$lt_archiver_list_spec | ||
4674 | 15741 | |||
4675 | 14808 | # A symbol stripping program. | 15742 | # A symbol stripping program. |
4676 | 14809 | STRIP=$lt_STRIP | 15743 | STRIP=$lt_STRIP |
4677 | 14810 | 15744 | ||
4678 | @@ -14813,6 +15747,9 @@ | |||
4679 | 14813 | old_postinstall_cmds=$lt_old_postinstall_cmds | 15747 | old_postinstall_cmds=$lt_old_postinstall_cmds |
4680 | 14814 | old_postuninstall_cmds=$lt_old_postuninstall_cmds | 15748 | old_postuninstall_cmds=$lt_old_postuninstall_cmds |
4681 | 14815 | 15749 | ||
4682 | 15750 | # Whether to use a lock for old archive extraction. | ||
4683 | 15751 | lock_old_archive_extraction=$lock_old_archive_extraction | ||
4684 | 15752 | |||
4685 | 14816 | # A C compiler. | 15753 | # A C compiler. |
4686 | 14817 | LTCC=$lt_CC | 15754 | LTCC=$lt_CC |
4687 | 14818 | 15755 | ||
4688 | @@ -14831,21 +15768,24 @@ | |||
4689 | 14831 | # Transform the output of nm in a C name address pair when lib prefix is needed. | 15768 | # Transform the output of nm in a C name address pair when lib prefix is needed. |
4690 | 14832 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix | 15769 | global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix |
4691 | 14833 | 15770 | ||
4692 | 15771 | # Specify filename containing input files for \$NM. | ||
4693 | 15772 | nm_file_list_spec=$lt_nm_file_list_spec | ||
4694 | 15773 | |||
4695 | 15774 | # The root where to search for dependent libraries,and in which our libraries should be installed. | ||
4696 | 15775 | lt_sysroot=$lt_sysroot | ||
4697 | 15776 | |||
4698 | 14834 | # The name of the directory that contains temporary libtool files. | 15777 | # The name of the directory that contains temporary libtool files. |
4699 | 14835 | objdir=$objdir | 15778 | objdir=$objdir |
4700 | 14836 | 15779 | ||
4701 | 14837 | # Shell to use when invoking shell scripts. | ||
4702 | 14838 | SHELL=$lt_SHELL | ||
4703 | 14839 | |||
4704 | 14840 | # An echo program that does not interpret backslashes. | ||
4705 | 14841 | ECHO=$lt_ECHO | ||
4706 | 14842 | |||
4707 | 14843 | # Used to examine libraries when file_magic_cmd begins with "file". | 15780 | # Used to examine libraries when file_magic_cmd begins with "file". |
4708 | 14844 | MAGIC_CMD=$MAGIC_CMD | 15781 | MAGIC_CMD=$MAGIC_CMD |
4709 | 14845 | 15782 | ||
4710 | 14846 | # Must we lock files when doing compilation? | 15783 | # Must we lock files when doing compilation? |
4711 | 14847 | need_locks=$lt_need_locks | 15784 | need_locks=$lt_need_locks |
4712 | 14848 | 15785 | ||
4713 | 15786 | # Manifest tool. | ||
4714 | 15787 | MANIFEST_TOOL=$lt_MANIFEST_TOOL | ||
4715 | 15788 | |||
4716 | 14849 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. | 15789 | # Tool to manipulate archived DWARF debug symbol files on Mac OS X. |
4717 | 14850 | DSYMUTIL=$lt_DSYMUTIL | 15790 | DSYMUTIL=$lt_DSYMUTIL |
4718 | 14851 | 15791 | ||
4719 | @@ -14902,6 +15842,9 @@ | |||
4720 | 14902 | # The coded name of the library, if different from the real name. | 15842 | # The coded name of the library, if different from the real name. |
4721 | 14903 | soname_spec=$lt_soname_spec | 15843 | soname_spec=$lt_soname_spec |
4722 | 14904 | 15844 | ||
4723 | 15845 | # Permission mode override for installation of shared libraries. | ||
4724 | 15846 | install_override_mode=$lt_install_override_mode | ||
4725 | 15847 | |||
4726 | 14905 | # Command to use after installation of a shared archive. | 15848 | # Command to use after installation of a shared archive. |
4727 | 14906 | postinstall_cmds=$lt_postinstall_cmds | 15849 | postinstall_cmds=$lt_postinstall_cmds |
4728 | 14907 | 15850 | ||
4729 | @@ -14941,6 +15884,10 @@ | |||
4730 | 14941 | # The linker used to build libraries. | 15884 | # The linker used to build libraries. |
4731 | 14942 | LD=$lt_LD | 15885 | LD=$lt_LD |
4732 | 14943 | 15886 | ||
4733 | 15887 | # How to create reloadable object files. | ||
4734 | 15888 | reload_flag=$lt_reload_flag | ||
4735 | 15889 | reload_cmds=$lt_reload_cmds | ||
4736 | 15890 | |||
4737 | 14944 | # Commands used to build an old-style archive. | 15891 | # Commands used to build an old-style archive. |
4738 | 14945 | old_archive_cmds=$lt_old_archive_cmds | 15892 | old_archive_cmds=$lt_old_archive_cmds |
4739 | 14946 | 15893 | ||
4740 | @@ -14953,12 +15900,12 @@ | |||
4741 | 14953 | # Compiler flag to turn off builtin functions. | 15900 | # Compiler flag to turn off builtin functions. |
4742 | 14954 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag | 15901 | no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag |
4743 | 14955 | 15902 | ||
4744 | 15903 | # Additional compiler flags for building library objects. | ||
4745 | 15904 | pic_flag=$lt_lt_prog_compiler_pic | ||
4746 | 15905 | |||
4747 | 14956 | # How to pass a linker flag through the compiler. | 15906 | # How to pass a linker flag through the compiler. |
4748 | 14957 | wl=$lt_lt_prog_compiler_wl | 15907 | wl=$lt_lt_prog_compiler_wl |
4749 | 14958 | 15908 | ||
4750 | 14959 | # Additional compiler flags for building library objects. | ||
4751 | 14960 | pic_flag=$lt_lt_prog_compiler_pic | ||
4752 | 14961 | |||
4753 | 14962 | # Compiler flag to prevent dynamic linking. | 15909 | # Compiler flag to prevent dynamic linking. |
4754 | 14963 | link_static_flag=$lt_lt_prog_compiler_static | 15910 | link_static_flag=$lt_lt_prog_compiler_static |
4755 | 14964 | 15911 | ||
4756 | @@ -15045,9 +15992,6 @@ | |||
4757 | 15045 | # Whether libtool must link a program against all its dependency libraries. | 15992 | # Whether libtool must link a program against all its dependency libraries. |
4758 | 15046 | link_all_deplibs=$link_all_deplibs | 15993 | link_all_deplibs=$link_all_deplibs |
4759 | 15047 | 15994 | ||
4760 | 15048 | # Fix the shell variable \$srcfile for the compiler. | ||
4761 | 15049 | fix_srcfile_path=$lt_fix_srcfile_path | ||
4762 | 15050 | |||
4763 | 15051 | # Set to "yes" if exported symbols are required. | 15995 | # Set to "yes" if exported symbols are required. |
4764 | 15052 | always_export_symbols=$always_export_symbols | 15996 | always_export_symbols=$always_export_symbols |
4765 | 15053 | 15997 | ||
4766 | @@ -15063,6 +16007,9 @@ | |||
4767 | 15063 | # Commands necessary for linking programs (against libraries) with templates. | 16007 | # Commands necessary for linking programs (against libraries) with templates. |
4768 | 15064 | prelink_cmds=$lt_prelink_cmds | 16008 | prelink_cmds=$lt_prelink_cmds |
4769 | 15065 | 16009 | ||
4770 | 16010 | # Commands necessary for finishing linking programs. | ||
4771 | 16011 | postlink_cmds=$lt_postlink_cmds | ||
4772 | 16012 | |||
4773 | 15066 | # Specify filename containing input files. | 16013 | # Specify filename containing input files. |
4774 | 15067 | file_list_spec=$lt_file_list_spec | 16014 | file_list_spec=$lt_file_list_spec |
4775 | 15068 | 16015 | ||
4776 | @@ -15095,212 +16042,169 @@ | |||
4777 | 15095 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 16042 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
4778 | 15096 | # text mode, it properly converts lines to CR/LF. This bash problem | 16043 | # text mode, it properly converts lines to CR/LF. This bash problem |
4779 | 15097 | # is reportedly fixed, but why not run on old versions too? | 16044 | # is reportedly fixed, but why not run on old versions too? |
4986 | 15098 | sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ | 16045 | sed '$q' "$ltmain" >> "$cfgfile" \ |
4987 | 15099 | || (rm -f "$cfgfile"; exit 1) | 16046 | || (rm -f "$cfgfile"; exit 1) |
4988 | 15100 | 16047 | ||
4989 | 15101 | case $xsi_shell in | 16048 | if test x"$xsi_shell" = xyes; then |
4990 | 15102 | yes) | 16049 | sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ |
4991 | 15103 | cat << \_LT_EOF >> "$cfgfile" | 16050 | func_dirname ()\ |
4992 | 15104 | 16051 | {\ | |
4993 | 15105 | # func_dirname file append nondir_replacement | 16052 | \ case ${1} in\ |
4994 | 15106 | # Compute the dirname of FILE. If nonempty, add APPEND to the result, | 16053 | \ */*) func_dirname_result="${1%/*}${2}" ;;\ |
4995 | 15107 | # otherwise set result to NONDIR_REPLACEMENT. | 16054 | \ * ) func_dirname_result="${3}" ;;\ |
4996 | 15108 | func_dirname () | 16055 | \ esac\ |
4997 | 15109 | { | 16056 | } # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ |
4998 | 15110 | case ${1} in | 16057 | && mv -f "$cfgfile.tmp" "$cfgfile" \ |
4999 | 15111 | */*) func_dirname_result="${1%/*}${2}" ;; | 16058 | || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") |
5000 | 15112 | * ) func_dirname_result="${3}" ;; | 16059 | test 0 -eq $? || _lt_function_replace_fail=: |
4795 | 15113 | esac | ||
4796 | 15114 | } | ||
4797 | 15115 | |||
4798 | 15116 | # func_basename file | ||
4799 | 15117 | func_basename () | ||
4800 | 15118 | { | ||
4801 | 15119 | func_basename_result="${1##*/}" | ||
4802 | 15120 | } | ||
4803 | 15121 | |||
4804 | 15122 | # func_dirname_and_basename file append nondir_replacement | ||
4805 | 15123 | # perform func_basename and func_dirname in a single function | ||
4806 | 15124 | # call: | ||
4807 | 15125 | # dirname: Compute the dirname of FILE. If nonempty, | ||
4808 | 15126 | # add APPEND to the result, otherwise set result | ||
4809 | 15127 | # to NONDIR_REPLACEMENT. | ||
4810 | 15128 | # value returned in "$func_dirname_result" | ||
4811 | 15129 | # basename: Compute filename of FILE. | ||
4812 | 15130 | # value retuned in "$func_basename_result" | ||
4813 | 15131 | # Implementation must be kept synchronized with func_dirname | ||
4814 | 15132 | # and func_basename. For efficiency, we do not delegate to | ||
4815 | 15133 | # those functions but instead duplicate the functionality here. | ||
4816 | 15134 | func_dirname_and_basename () | ||
4817 | 15135 | { | ||
4818 | 15136 | case ${1} in | ||
4819 | 15137 | */*) func_dirname_result="${1%/*}${2}" ;; | ||
4820 | 15138 | * ) func_dirname_result="${3}" ;; | ||
4821 | 15139 | esac | ||
4822 | 15140 | func_basename_result="${1##*/}" | ||
4823 | 15141 | } | ||
4824 | 15142 | |||
4825 | 15143 | # func_stripname prefix suffix name | ||
4826 | 15144 | # strip PREFIX and SUFFIX off of NAME. | ||
4827 | 15145 | # PREFIX and SUFFIX must not contain globbing or regex special | ||
4828 | 15146 | # characters, hashes, percent signs, but SUFFIX may contain a leading | ||
4829 | 15147 | # dot (in which case that matches only a dot). | ||
4830 | 15148 | func_stripname () | ||
4831 | 15149 | { | ||
4832 | 15150 | # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
4833 | 15151 | # positional parameters, so assign one to ordinary parameter first. | ||
4834 | 15152 | func_stripname_result=${3} | ||
4835 | 15153 | func_stripname_result=${func_stripname_result#"${1}"} | ||
4836 | 15154 | func_stripname_result=${func_stripname_result%"${2}"} | ||
4837 | 15155 | } | ||
4838 | 15156 | |||
4839 | 15157 | # func_opt_split | ||
4840 | 15158 | func_opt_split () | ||
4841 | 15159 | { | ||
4842 | 15160 | func_opt_split_opt=${1%%=*} | ||
4843 | 15161 | func_opt_split_arg=${1#*=} | ||
4844 | 15162 | } | ||
4845 | 15163 | |||
4846 | 15164 | # func_lo2o object | ||
4847 | 15165 | func_lo2o () | ||
4848 | 15166 | { | ||
4849 | 15167 | case ${1} in | ||
4850 | 15168 | *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
4851 | 15169 | *) func_lo2o_result=${1} ;; | ||
4852 | 15170 | esac | ||
4853 | 15171 | } | ||
4854 | 15172 | |||
4855 | 15173 | # func_xform libobj-or-source | ||
4856 | 15174 | func_xform () | ||
4857 | 15175 | { | ||
4858 | 15176 | func_xform_result=${1%.*}.lo | ||
4859 | 15177 | } | ||
4860 | 15178 | |||
4861 | 15179 | # func_arith arithmetic-term... | ||
4862 | 15180 | func_arith () | ||
4863 | 15181 | { | ||
4864 | 15182 | func_arith_result=$(( $* )) | ||
4865 | 15183 | } | ||
4866 | 15184 | |||
4867 | 15185 | # func_len string | ||
4868 | 15186 | # STRING may not start with a hyphen. | ||
4869 | 15187 | func_len () | ||
4870 | 15188 | { | ||
4871 | 15189 | func_len_result=${#1} | ||
4872 | 15190 | } | ||
4873 | 15191 | |||
4874 | 15192 | _LT_EOF | ||
4875 | 15193 | ;; | ||
4876 | 15194 | *) # Bourne compatible functions. | ||
4877 | 15195 | cat << \_LT_EOF >> "$cfgfile" | ||
4878 | 15196 | |||
4879 | 15197 | # func_dirname file append nondir_replacement | ||
4880 | 15198 | # Compute the dirname of FILE. If nonempty, add APPEND to the result, | ||
4881 | 15199 | # otherwise set result to NONDIR_REPLACEMENT. | ||
4882 | 15200 | func_dirname () | ||
4883 | 15201 | { | ||
4884 | 15202 | # Extract subdirectory from the argument. | ||
4885 | 15203 | func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` | ||
4886 | 15204 | if test "X$func_dirname_result" = "X${1}"; then | ||
4887 | 15205 | func_dirname_result="${3}" | ||
4888 | 15206 | else | ||
4889 | 15207 | func_dirname_result="$func_dirname_result${2}" | ||
4890 | 15208 | fi | ||
4891 | 15209 | } | ||
4892 | 15210 | |||
4893 | 15211 | # func_basename file | ||
4894 | 15212 | func_basename () | ||
4895 | 15213 | { | ||
4896 | 15214 | func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` | ||
4897 | 15215 | } | ||
4898 | 15216 | |||
4899 | 15217 | |||
4900 | 15218 | # func_stripname prefix suffix name | ||
4901 | 15219 | # strip PREFIX and SUFFIX off of NAME. | ||
4902 | 15220 | # PREFIX and SUFFIX must not contain globbing or regex special | ||
4903 | 15221 | # characters, hashes, percent signs, but SUFFIX may contain a leading | ||
4904 | 15222 | # dot (in which case that matches only a dot). | ||
4905 | 15223 | # func_strip_suffix prefix name | ||
4906 | 15224 | func_stripname () | ||
4907 | 15225 | { | ||
4908 | 15226 | case ${2} in | ||
4909 | 15227 | .*) func_stripname_result=`$ECHO "X${3}" \ | ||
4910 | 15228 | | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; | ||
4911 | 15229 | *) func_stripname_result=`$ECHO "X${3}" \ | ||
4912 | 15230 | | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; | ||
4913 | 15231 | esac | ||
4914 | 15232 | } | ||
4915 | 15233 | |||
4916 | 15234 | # sed scripts: | ||
4917 | 15235 | my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' | ||
4918 | 15236 | my_sed_long_arg='1s/^-[^=]*=//' | ||
4919 | 15237 | |||
4920 | 15238 | # func_opt_split | ||
4921 | 15239 | func_opt_split () | ||
4922 | 15240 | { | ||
4923 | 15241 | func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` | ||
4924 | 15242 | func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` | ||
4925 | 15243 | } | ||
4926 | 15244 | |||
4927 | 15245 | # func_lo2o object | ||
4928 | 15246 | func_lo2o () | ||
4929 | 15247 | { | ||
4930 | 15248 | func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` | ||
4931 | 15249 | } | ||
4932 | 15250 | |||
4933 | 15251 | # func_xform libobj-or-source | ||
4934 | 15252 | func_xform () | ||
4935 | 15253 | { | ||
4936 | 15254 | func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` | ||
4937 | 15255 | } | ||
4938 | 15256 | |||
4939 | 15257 | # func_arith arithmetic-term... | ||
4940 | 15258 | func_arith () | ||
4941 | 15259 | { | ||
4942 | 15260 | func_arith_result=`expr "$@"` | ||
4943 | 15261 | } | ||
4944 | 15262 | |||
4945 | 15263 | # func_len string | ||
4946 | 15264 | # STRING may not start with a hyphen. | ||
4947 | 15265 | func_len () | ||
4948 | 15266 | { | ||
4949 | 15267 | func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` | ||
4950 | 15268 | } | ||
4951 | 15269 | |||
4952 | 15270 | _LT_EOF | ||
4953 | 15271 | esac | ||
4954 | 15272 | |||
4955 | 15273 | case $lt_shell_append in | ||
4956 | 15274 | yes) | ||
4957 | 15275 | cat << \_LT_EOF >> "$cfgfile" | ||
4958 | 15276 | |||
4959 | 15277 | # func_append var value | ||
4960 | 15278 | # Append VALUE to the end of shell variable VAR. | ||
4961 | 15279 | func_append () | ||
4962 | 15280 | { | ||
4963 | 15281 | eval "$1+=\$2" | ||
4964 | 15282 | } | ||
4965 | 15283 | _LT_EOF | ||
4966 | 15284 | ;; | ||
4967 | 15285 | *) | ||
4968 | 15286 | cat << \_LT_EOF >> "$cfgfile" | ||
4969 | 15287 | |||
4970 | 15288 | # func_append var value | ||
4971 | 15289 | # Append VALUE to the end of shell variable VAR. | ||
4972 | 15290 | func_append () | ||
4973 | 15291 | { | ||
4974 | 15292 | eval "$1=\$$1\$2" | ||
4975 | 15293 | } | ||
4976 | 15294 | |||
4977 | 15295 | _LT_EOF | ||
4978 | 15296 | ;; | ||
4979 | 15297 | esac | ||
4980 | 15298 | |||
4981 | 15299 | |||
4982 | 15300 | sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ | ||
4983 | 15301 | || (rm -f "$cfgfile"; exit 1) | ||
4984 | 15302 | |||
4985 | 15303 | mv -f "$cfgfile" "$ofile" || |
The diff has been truncated for viewing.