Merge lp:~logan/ubuntu/saucy/json-c/0.11-2ubuntu1 into lp:ubuntu/saucy/json-c
- Saucy (13.10)
- 0.11-2ubuntu1
- Merge into saucy
Status: | Rejected |
---|---|
Rejected by: | Colin Watson |
Proposed branch: | lp:~logan/ubuntu/saucy/json-c/0.11-2ubuntu1 |
Merge into: | lp:ubuntu/saucy/json-c |
Diff against target: |
35605 lines (+24370/-4987) 176 files modified
.deps/arraylist.Plo (+59/-0) .deps/debug.Plo (+118/-0) .deps/json_c_version.Plo (+5/-0) .deps/json_object.Plo (+100/-0) .deps/json_object_iterator.Plo (+99/-0) .deps/json_tokener.Plo (+116/-0) .deps/json_util.Plo (+139/-0) .deps/libjson.Plo (+40/-0) .deps/linkhash.Plo (+95/-0) .deps/printbuf.Plo (+66/-0) .gitignore (+10/-0) .pc/applied-patches (+0/-1) .pc/fix-format-string-in-test.patch/tests/test_printbuf.c (+0/-165) Android.configure.mk (+39/-0) COPYING (+23/-0) ChangeLog (+24/-0) Doxyfile (+1/-1) INSTALL (+184/-48) Makefile (+998/-0) Makefile.am (+55/-9) Makefile.am.inc (+1/-1) Makefile.in (+104/-44) README (+20/-4) RELEASE_CHECKLIST.txt (+9/-5) aclocal.m4 (+0/-12) arraylist.c (+3/-3) autogen.sh (+12/-0) config.h (+149/-0) config.h.in (+21/-0) config.log (+998/-0) config.status (+2072/-0) configure (+99/-27) configure.in (+33/-5) debian/changelog (+30/-0) debian/control (+44/-6) debian/copyright (+1/-1) debian/docs (+0/-1) debian/gbp.conf (+7/-0) debian/json-c-doc.doc-base (+9/-0) debian/libjson-c-dev.install (+5/-0) debian/libjson-c-doc.docs (+1/-0) debian/libjson-c-doc.links (+1/-0) debian/libjson-c2.install (+2/-0) debian/libjson-c2.symbols (+99/-0) debian/libjson0-dev.doc-base (+0/-9) debian/libjson0-dev.docs (+0/-1) debian/libjson0-dev.install (+2/-4) debian/libjson0-dev.postinst (+23/-0) debian/libjson0.install (+1/-2) debian/libjson0.postinst (+15/-0) debian/patches/fix-format-string-in-test.patch (+0/-17) debian/patches/series (+0/-1) debian/rules (+30/-10) debian/source.lintian-overrides (+2/-0) debian/symbols (+0/-84) debian/watch (+3/-1) doc/html/annotated.html (+54/-28) doc/html/arraylist_8h.html (+163/-121) doc/html/bits_8h.html (+100/-69) doc/html/classes.html (+58/-26) doc/html/debug_8h.html (+191/-154) doc/html/deprecated.html (+41/-23) doc/html/doxygen.css (+796/-169) doc/html/dynsections.js (+78/-0) doc/html/files.html (+57/-30) doc/html/functions.html (+83/-46) doc/html/functions_vars.html (+83/-46) doc/html/globals.html (+60/-630) doc/html/globals_0x61.html (+114/-0) doc/html/globals_0x65.html (+90/-0) doc/html/globals_0x66.html (+87/-0) doc/html/globals_0x68.html (+87/-0) doc/html/globals_0x69.html (+87/-0) doc/html/globals_0x6a.html (+486/-0) doc/html/globals_0x6c.html (+165/-0) doc/html/globals_0x6d.html (+126/-0) doc/html/globals_0x70.html (+108/-0) doc/html/globals_0x73.html (+87/-0) doc/html/globals_0x74.html (+87/-0) doc/html/globals_defs.html (+77/-36) doc/html/globals_enum.html (+41/-21) doc/html/globals_eval.html (+50/-24) doc/html/globals_func.html (+74/-30) doc/html/globals_type.html (+46/-23) doc/html/globals_vars.html (+41/-21) doc/html/index.html (+37/-13) doc/html/jquery.js (+8/-0) doc/html/json_8h.html (+40/-18) doc/html/json__c__version_8h.html (+178/-0) doc/html/json__inttypes_8h.html (+40/-18) doc/html/json__object_8h.html (+894/-622) doc/html/json__object__iterator_8h.html (+196/-135) doc/html/json__object__private_8h.html (+68/-50) doc/html/json__tokener_8h.html (+398/-253) doc/html/json__util_8h.html (+151/-87) doc/html/linkhash_8h.html (+466/-372) doc/html/pages.html (+43/-18) doc/html/printbuf_8h.html (+187/-144) doc/html/structarray__list.html (+100/-73) doc/html/structjson__object.html (+162/-103) doc/html/structjson__object__iter.html (+86/-59) doc/html/structjson__object__iterator.html (+54/-27) doc/html/structjson__tokener.html (+212/-157) doc/html/structjson__tokener__srec.html (+100/-73) doc/html/structlh__entry.html (+69/-42) doc/html/structlh__table.html (+119/-92) doc/html/structprintbuf.html (+86/-59) doc/html/tabs.css (+59/-104) doc/html/unionjson__object_1_1data.html (+160/-131) json-c-uninstalled.pc (+11/-0) json-c-uninstalled.pc.in (+11/-0) json-c.pc (+11/-0) json-c.pc.in (+11/-0) json.h (+1/-0) json.pc (+11/-0) json.pc.in (+5/-5) json_c_version.c (+20/-0) json_c_version.h (+22/-0) json_config.h (+4/-0) json_object.c (+143/-25) json_object.h (+86/-9) json_object_private.h (+4/-6) json_tokener.c (+97/-38) json_tokener.h (+25/-4) json_util.c (+88/-28) json_util.h (+1/-0) libjson.c (+26/-0) libtool (+8895/-0) linkhash.c (+6/-2) linkhash.h (+1/-0) printbuf.c (+4/-4) stamp-h1 (+1/-0) stamp-h2 (+1/-0) tests/.deps/test1.Po (+1/-0) tests/.deps/test1Formatted-parse_flags.Po (+1/-0) tests/.deps/test1Formatted-test1.Po (+1/-0) tests/.deps/test2.Po (+1/-0) tests/.deps/test2Formatted-parse_flags.Po (+1/-0) tests/.deps/test2Formatted-test2.Po (+1/-0) tests/.deps/test4.Po (+1/-0) tests/.deps/testReplaceExisting.Po (+1/-0) tests/.deps/test_cast.Po (+1/-0) tests/.deps/test_locale.Po (+1/-0) tests/.deps/test_null.Po (+1/-0) tests/.deps/test_parse.Po (+1/-0) tests/.deps/test_parse_int64.Po (+1/-0) tests/.deps/test_printbuf.Po (+1/-0) tests/.deps/test_set_serializer.Po (+1/-0) tests/Makefile (+742/-0) tests/Makefile.am (+12/-2) tests/Makefile.in (+39/-11) tests/parse_flags.c (+9/-1) tests/test1.c (+103/-94) tests/test1.expected (+1/-0) tests/test1Formatted_plain.expected (+1/-0) tests/test1Formatted_pretty.expected (+1/-0) tests/test1Formatted_spaced.expected (+1/-0) tests/test2.c (+6/-6) tests/test4.c (+36/-32) tests/testReplaceExisting.c (+78/-0) tests/testReplaceExisting.expected (+15/-0) tests/testReplaceExisting.test (+12/-0) tests/test_cast.c (+2/-2) tests/test_locale.c (+31/-0) tests/test_locale.expected (+2/-0) tests/test_locale.test (+12/-0) tests/test_null.c (+46/-24) tests/test_null.expected (+1/-0) tests/test_parse.c (+100/-80) tests/test_parse.expected (+12/-1) tests/test_parse_int64.c (+10/-0) tests/test_parse_int64.expected (+3/-0) tests/test_printbuf.c (+5/-4) tests/test_set_serializer.c (+71/-0) tests/test_set_serializer.expected (+10/-0) tests/test_set_serializer.test (+12/-0) |
To merge this branch: | bzr merge lp:~logan/ubuntu/saucy/json-c/0.11-2ubuntu1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Disapprove | ||
Ubuntu branches | Pending | ||
Review via email: mp+174910@code.launchpad.net |
Commit message
Description of the change
Unmerged revisions
- 16. By Logan Rosen
-
* Merge from Debian unstable. Remaining changes:
- Add autoreconf to update config.sub,guess for aarch64.
- debian/postinst: Force an upgrade to restart Upstart (to pick up new
package version) if the running instance supports it.
* Fix compat symlinks in libjson0 and libjson0-dev
* Imported Upstream version 0.11
* Transition from libjson to libjson-c reflecting upstream library name
change
* Add very thin symlink-based compatibility layer from libjson.so.0 to
libjson-c.so.2
* Remove debian/patches/ fix-format- string- in-test. patch; merged upstream
* Move documentation to SONAME agnostic package libjson-c-doc
* Rename dbg symbols package to libjson-c2-dbg
* Update watch file (Closes: #693518)
* Update homepage location (Closes: #704918)
Preview Diff
1 | === added directory '.deps' |
2 | === added file '.deps/arraylist.Plo' |
3 | --- .deps/arraylist.Plo 1970-01-01 00:00:00 +0000 |
4 | +++ .deps/arraylist.Plo 2013-07-16 03:35:32 +0000 |
5 | @@ -0,0 +1,59 @@ |
6 | +arraylist.lo: arraylist.c config.h /usr/include/stdlib.h \ |
7 | + /usr/include/sys/cdefs.h /usr/include/machine/cdefs.h \ |
8 | + /usr/include/sys/cdefs_elf.h /usr/include/sys/featuretest.h \ |
9 | + /usr/include/sys/types.h /usr/include/machine/types.h \ |
10 | + /usr/include/machine/int_types.h /usr/include/machine/ansi.h \ |
11 | + /usr/include/sys/ansi.h /usr/include/machine/endian.h \ |
12 | + /usr/include/sys/endian.h /usr/include/machine/endian_machdep.h \ |
13 | + /usr/include/machine/bswap.h /usr/include/machine/byte_swap.h \ |
14 | + /usr/include/sys/bswap.h /usr/include/sys/fd_set.h \ |
15 | + /usr/include/pthread_types.h /usr/include/sys/null.h \ |
16 | + /usr/include/string.h /usr/include/strings.h bits.h arraylist.h |
17 | + |
18 | +config.h: |
19 | + |
20 | +/usr/include/stdlib.h: |
21 | + |
22 | +/usr/include/sys/cdefs.h: |
23 | + |
24 | +/usr/include/machine/cdefs.h: |
25 | + |
26 | +/usr/include/sys/cdefs_elf.h: |
27 | + |
28 | +/usr/include/sys/featuretest.h: |
29 | + |
30 | +/usr/include/sys/types.h: |
31 | + |
32 | +/usr/include/machine/types.h: |
33 | + |
34 | +/usr/include/machine/int_types.h: |
35 | + |
36 | +/usr/include/machine/ansi.h: |
37 | + |
38 | +/usr/include/sys/ansi.h: |
39 | + |
40 | +/usr/include/machine/endian.h: |
41 | + |
42 | +/usr/include/sys/endian.h: |
43 | + |
44 | +/usr/include/machine/endian_machdep.h: |
45 | + |
46 | +/usr/include/machine/bswap.h: |
47 | + |
48 | +/usr/include/machine/byte_swap.h: |
49 | + |
50 | +/usr/include/sys/bswap.h: |
51 | + |
52 | +/usr/include/sys/fd_set.h: |
53 | + |
54 | +/usr/include/pthread_types.h: |
55 | + |
56 | +/usr/include/sys/null.h: |
57 | + |
58 | +/usr/include/string.h: |
59 | + |
60 | +/usr/include/strings.h: |
61 | + |
62 | +bits.h: |
63 | + |
64 | +arraylist.h: |
65 | |
66 | === added file '.deps/debug.Plo' |
67 | --- .deps/debug.Plo 1970-01-01 00:00:00 +0000 |
68 | +++ .deps/debug.Plo 2013-07-16 03:35:32 +0000 |
69 | @@ -0,0 +1,118 @@ |
70 | +debug.lo: debug.c config.h /usr/include/stdio.h /usr/include/sys/cdefs.h \ |
71 | + /usr/include/machine/cdefs.h /usr/include/sys/cdefs_elf.h \ |
72 | + /usr/include/sys/featuretest.h /usr/include/sys/ansi.h \ |
73 | + /usr/include/machine/ansi.h /usr/include/machine/int_types.h \ |
74 | + /usr/include/sys/null.h /usr/include/stdlib.h /usr/include/sys/types.h \ |
75 | + /usr/include/machine/types.h /usr/include/machine/endian.h \ |
76 | + /usr/include/sys/endian.h /usr/include/machine/endian_machdep.h \ |
77 | + /usr/include/machine/bswap.h /usr/include/machine/byte_swap.h \ |
78 | + /usr/include/sys/bswap.h /usr/include/sys/fd_set.h \ |
79 | + /usr/include/pthread_types.h /usr/include/string.h \ |
80 | + /usr/include/strings.h /usr/include/stdarg.h /usr/include/syslog.h \ |
81 | + /usr/include/unistd.h /usr/include/sys/unistd.h /usr/include/sys/param.h \ |
82 | + /usr/include/sys/inttypes.h /usr/include/sys/stdint.h \ |
83 | + /usr/include/machine/int_mwgwtypes.h /usr/include/machine/int_limits.h \ |
84 | + /usr/include/machine/int_const.h /usr/include/machine/wchar_limits.h \ |
85 | + /usr/include/machine/int_fmtio.h /usr/include/sys/syslimits.h \ |
86 | + /usr/include/sys/signal.h /usr/include/sys/sigtypes.h \ |
87 | + /usr/include/sys/satypes.h /usr/include/sys/siginfo.h \ |
88 | + /usr/include/machine/signal.h /usr/include/machine/trap.h \ |
89 | + /usr/include/x86/trap.h /usr/include/sys/ucontext.h \ |
90 | + /usr/include/machine/mcontext.h /usr/include/machine/param.h \ |
91 | + /usr/include/machine/limits.h debug.h |
92 | + |
93 | +config.h: |
94 | + |
95 | +/usr/include/stdio.h: |
96 | + |
97 | +/usr/include/sys/cdefs.h: |
98 | + |
99 | +/usr/include/machine/cdefs.h: |
100 | + |
101 | +/usr/include/sys/cdefs_elf.h: |
102 | + |
103 | +/usr/include/sys/featuretest.h: |
104 | + |
105 | +/usr/include/sys/ansi.h: |
106 | + |
107 | +/usr/include/machine/ansi.h: |
108 | + |
109 | +/usr/include/machine/int_types.h: |
110 | + |
111 | +/usr/include/sys/null.h: |
112 | + |
113 | +/usr/include/stdlib.h: |
114 | + |
115 | +/usr/include/sys/types.h: |
116 | + |
117 | +/usr/include/machine/types.h: |
118 | + |
119 | +/usr/include/machine/endian.h: |
120 | + |
121 | +/usr/include/sys/endian.h: |
122 | + |
123 | +/usr/include/machine/endian_machdep.h: |
124 | + |
125 | +/usr/include/machine/bswap.h: |
126 | + |
127 | +/usr/include/machine/byte_swap.h: |
128 | + |
129 | +/usr/include/sys/bswap.h: |
130 | + |
131 | +/usr/include/sys/fd_set.h: |
132 | + |
133 | +/usr/include/pthread_types.h: |
134 | + |
135 | +/usr/include/string.h: |
136 | + |
137 | +/usr/include/strings.h: |
138 | + |
139 | +/usr/include/stdarg.h: |
140 | + |
141 | +/usr/include/syslog.h: |
142 | + |
143 | +/usr/include/unistd.h: |
144 | + |
145 | +/usr/include/sys/unistd.h: |
146 | + |
147 | +/usr/include/sys/param.h: |
148 | + |
149 | +/usr/include/sys/inttypes.h: |
150 | + |
151 | +/usr/include/sys/stdint.h: |
152 | + |
153 | +/usr/include/machine/int_mwgwtypes.h: |
154 | + |
155 | +/usr/include/machine/int_limits.h: |
156 | + |
157 | +/usr/include/machine/int_const.h: |
158 | + |
159 | +/usr/include/machine/wchar_limits.h: |
160 | + |
161 | +/usr/include/machine/int_fmtio.h: |
162 | + |
163 | +/usr/include/sys/syslimits.h: |
164 | + |
165 | +/usr/include/sys/signal.h: |
166 | + |
167 | +/usr/include/sys/sigtypes.h: |
168 | + |
169 | +/usr/include/sys/satypes.h: |
170 | + |
171 | +/usr/include/sys/siginfo.h: |
172 | + |
173 | +/usr/include/machine/signal.h: |
174 | + |
175 | +/usr/include/machine/trap.h: |
176 | + |
177 | +/usr/include/x86/trap.h: |
178 | + |
179 | +/usr/include/sys/ucontext.h: |
180 | + |
181 | +/usr/include/machine/mcontext.h: |
182 | + |
183 | +/usr/include/machine/param.h: |
184 | + |
185 | +/usr/include/machine/limits.h: |
186 | + |
187 | +debug.h: |
188 | |
189 | === added file '.deps/json_c_version.Plo' |
190 | --- .deps/json_c_version.Plo 1970-01-01 00:00:00 +0000 |
191 | +++ .deps/json_c_version.Plo 2013-07-16 03:35:32 +0000 |
192 | @@ -0,0 +1,5 @@ |
193 | +json_c_version.lo: json_c_version.c config.h json_c_version.h |
194 | + |
195 | +config.h: |
196 | + |
197 | +json_c_version.h: |
198 | |
199 | === added file '.deps/json_object.Plo' |
200 | --- .deps/json_object.Plo 1970-01-01 00:00:00 +0000 |
201 | +++ .deps/json_object.Plo 2013-07-16 03:35:32 +0000 |
202 | @@ -0,0 +1,100 @@ |
203 | +json_object.lo: json_object.c config.h /usr/include/stdio.h \ |
204 | + /usr/include/sys/cdefs.h /usr/include/machine/cdefs.h \ |
205 | + /usr/include/sys/cdefs_elf.h /usr/include/sys/featuretest.h \ |
206 | + /usr/include/sys/ansi.h /usr/include/machine/ansi.h \ |
207 | + /usr/include/machine/int_types.h /usr/include/sys/null.h \ |
208 | + /usr/include/stdlib.h /usr/include/sys/types.h \ |
209 | + /usr/include/machine/types.h /usr/include/machine/endian.h \ |
210 | + /usr/include/sys/endian.h /usr/include/machine/endian_machdep.h \ |
211 | + /usr/include/machine/bswap.h /usr/include/machine/byte_swap.h \ |
212 | + /usr/include/sys/bswap.h /usr/include/sys/fd_set.h \ |
213 | + /usr/include/pthread_types.h /usr/include/stddef.h /usr/include/string.h \ |
214 | + /usr/include/strings.h debug.h printbuf.h linkhash.h json_object.h \ |
215 | + json_inttypes.h json_config.h /usr/include/inttypes.h \ |
216 | + /usr/include/sys/inttypes.h /usr/include/sys/stdint.h \ |
217 | + /usr/include/machine/int_mwgwtypes.h /usr/include/machine/int_limits.h \ |
218 | + /usr/include/machine/int_const.h /usr/include/machine/wchar_limits.h \ |
219 | + /usr/include/machine/int_fmtio.h arraylist.h json_object_private.h \ |
220 | + json_util.h |
221 | + |
222 | +config.h: |
223 | + |
224 | +/usr/include/stdio.h: |
225 | + |
226 | +/usr/include/sys/cdefs.h: |
227 | + |
228 | +/usr/include/machine/cdefs.h: |
229 | + |
230 | +/usr/include/sys/cdefs_elf.h: |
231 | + |
232 | +/usr/include/sys/featuretest.h: |
233 | + |
234 | +/usr/include/sys/ansi.h: |
235 | + |
236 | +/usr/include/machine/ansi.h: |
237 | + |
238 | +/usr/include/machine/int_types.h: |
239 | + |
240 | +/usr/include/sys/null.h: |
241 | + |
242 | +/usr/include/stdlib.h: |
243 | + |
244 | +/usr/include/sys/types.h: |
245 | + |
246 | +/usr/include/machine/types.h: |
247 | + |
248 | +/usr/include/machine/endian.h: |
249 | + |
250 | +/usr/include/sys/endian.h: |
251 | + |
252 | +/usr/include/machine/endian_machdep.h: |
253 | + |
254 | +/usr/include/machine/bswap.h: |
255 | + |
256 | +/usr/include/machine/byte_swap.h: |
257 | + |
258 | +/usr/include/sys/bswap.h: |
259 | + |
260 | +/usr/include/sys/fd_set.h: |
261 | + |
262 | +/usr/include/pthread_types.h: |
263 | + |
264 | +/usr/include/stddef.h: |
265 | + |
266 | +/usr/include/string.h: |
267 | + |
268 | +/usr/include/strings.h: |
269 | + |
270 | +debug.h: |
271 | + |
272 | +printbuf.h: |
273 | + |
274 | +linkhash.h: |
275 | + |
276 | +json_object.h: |
277 | + |
278 | +json_inttypes.h: |
279 | + |
280 | +json_config.h: |
281 | + |
282 | +/usr/include/inttypes.h: |
283 | + |
284 | +/usr/include/sys/inttypes.h: |
285 | + |
286 | +/usr/include/sys/stdint.h: |
287 | + |
288 | +/usr/include/machine/int_mwgwtypes.h: |
289 | + |
290 | +/usr/include/machine/int_limits.h: |
291 | + |
292 | +/usr/include/machine/int_const.h: |
293 | + |
294 | +/usr/include/machine/wchar_limits.h: |
295 | + |
296 | +/usr/include/machine/int_fmtio.h: |
297 | + |
298 | +arraylist.h: |
299 | + |
300 | +json_object_private.h: |
301 | + |
302 | +json_util.h: |
303 | |
304 | === added file '.deps/json_object_iterator.Plo' |
305 | --- .deps/json_object_iterator.Plo 1970-01-01 00:00:00 +0000 |
306 | +++ .deps/json_object_iterator.Plo 2013-07-16 03:35:32 +0000 |
307 | @@ -0,0 +1,99 @@ |
308 | +json_object_iterator.lo: json_object_iterator.c /usr/include/stddef.h \ |
309 | + /usr/include/sys/cdefs.h /usr/include/machine/cdefs.h \ |
310 | + /usr/include/sys/cdefs_elf.h /usr/include/sys/featuretest.h \ |
311 | + /usr/include/machine/ansi.h /usr/include/machine/int_types.h \ |
312 | + /usr/include/sys/null.h json.h bits.h debug.h /usr/include/stdlib.h \ |
313 | + /usr/include/sys/types.h /usr/include/machine/types.h \ |
314 | + /usr/include/sys/ansi.h /usr/include/machine/endian.h \ |
315 | + /usr/include/sys/endian.h /usr/include/machine/endian_machdep.h \ |
316 | + /usr/include/machine/bswap.h /usr/include/machine/byte_swap.h \ |
317 | + /usr/include/sys/bswap.h /usr/include/sys/fd_set.h \ |
318 | + /usr/include/pthread_types.h linkhash.h json_object.h json_inttypes.h \ |
319 | + json_config.h /usr/include/inttypes.h /usr/include/sys/inttypes.h \ |
320 | + /usr/include/sys/stdint.h /usr/include/machine/int_mwgwtypes.h \ |
321 | + /usr/include/machine/int_limits.h /usr/include/machine/int_const.h \ |
322 | + /usr/include/machine/wchar_limits.h /usr/include/machine/int_fmtio.h \ |
323 | + arraylist.h json_util.h json_tokener.h json_object_iterator.h \ |
324 | + json_c_version.h json_object_private.h |
325 | + |
326 | +/usr/include/stddef.h: |
327 | + |
328 | +/usr/include/sys/cdefs.h: |
329 | + |
330 | +/usr/include/machine/cdefs.h: |
331 | + |
332 | +/usr/include/sys/cdefs_elf.h: |
333 | + |
334 | +/usr/include/sys/featuretest.h: |
335 | + |
336 | +/usr/include/machine/ansi.h: |
337 | + |
338 | +/usr/include/machine/int_types.h: |
339 | + |
340 | +/usr/include/sys/null.h: |
341 | + |
342 | +json.h: |
343 | + |
344 | +bits.h: |
345 | + |
346 | +debug.h: |
347 | + |
348 | +/usr/include/stdlib.h: |
349 | + |
350 | +/usr/include/sys/types.h: |
351 | + |
352 | +/usr/include/machine/types.h: |
353 | + |
354 | +/usr/include/sys/ansi.h: |
355 | + |
356 | +/usr/include/machine/endian.h: |
357 | + |
358 | +/usr/include/sys/endian.h: |
359 | + |
360 | +/usr/include/machine/endian_machdep.h: |
361 | + |
362 | +/usr/include/machine/bswap.h: |
363 | + |
364 | +/usr/include/machine/byte_swap.h: |
365 | + |
366 | +/usr/include/sys/bswap.h: |
367 | + |
368 | +/usr/include/sys/fd_set.h: |
369 | + |
370 | +/usr/include/pthread_types.h: |
371 | + |
372 | +linkhash.h: |
373 | + |
374 | +json_object.h: |
375 | + |
376 | +json_inttypes.h: |
377 | + |
378 | +json_config.h: |
379 | + |
380 | +/usr/include/inttypes.h: |
381 | + |
382 | +/usr/include/sys/inttypes.h: |
383 | + |
384 | +/usr/include/sys/stdint.h: |
385 | + |
386 | +/usr/include/machine/int_mwgwtypes.h: |
387 | + |
388 | +/usr/include/machine/int_limits.h: |
389 | + |
390 | +/usr/include/machine/int_const.h: |
391 | + |
392 | +/usr/include/machine/wchar_limits.h: |
393 | + |
394 | +/usr/include/machine/int_fmtio.h: |
395 | + |
396 | +arraylist.h: |
397 | + |
398 | +json_util.h: |
399 | + |
400 | +json_tokener.h: |
401 | + |
402 | +json_object_iterator.h: |
403 | + |
404 | +json_c_version.h: |
405 | + |
406 | +json_object_private.h: |
407 | |
408 | === added file '.deps/json_tokener.Plo' |
409 | --- .deps/json_tokener.Plo 1970-01-01 00:00:00 +0000 |
410 | +++ .deps/json_tokener.Plo 2013-07-16 03:35:32 +0000 |
411 | @@ -0,0 +1,116 @@ |
412 | +json_tokener.lo: json_tokener.c config.h /usr/include/stdio.h \ |
413 | + /usr/include/sys/cdefs.h /usr/include/machine/cdefs.h \ |
414 | + /usr/include/sys/cdefs_elf.h /usr/include/sys/featuretest.h \ |
415 | + /usr/include/sys/ansi.h /usr/include/machine/ansi.h \ |
416 | + /usr/include/machine/int_types.h /usr/include/sys/null.h \ |
417 | + /usr/include/stdlib.h /usr/include/sys/types.h \ |
418 | + /usr/include/machine/types.h /usr/include/machine/endian.h \ |
419 | + /usr/include/sys/endian.h /usr/include/machine/endian_machdep.h \ |
420 | + /usr/include/machine/bswap.h /usr/include/machine/byte_swap.h \ |
421 | + /usr/include/sys/bswap.h /usr/include/sys/fd_set.h \ |
422 | + /usr/include/pthread_types.h /usr/include/stddef.h /usr/include/ctype.h \ |
423 | + /usr/include/sys/ctype_inline.h /usr/include/sys/ctype_bits.h \ |
424 | + /usr/include/string.h /usr/include/strings.h /usr/include/limits.h \ |
425 | + /usr/include/machine/limits.h /usr/include/sys/syslimits.h bits.h \ |
426 | + debug.h printbuf.h arraylist.h json_inttypes.h json_config.h \ |
427 | + /usr/include/inttypes.h /usr/include/sys/inttypes.h \ |
428 | + /usr/include/sys/stdint.h /usr/include/machine/int_mwgwtypes.h \ |
429 | + /usr/include/machine/int_limits.h /usr/include/machine/int_const.h \ |
430 | + /usr/include/machine/wchar_limits.h /usr/include/machine/int_fmtio.h \ |
431 | + json_object.h json_tokener.h json_util.h /usr/include/locale.h |
432 | + |
433 | +config.h: |
434 | + |
435 | +/usr/include/stdio.h: |
436 | + |
437 | +/usr/include/sys/cdefs.h: |
438 | + |
439 | +/usr/include/machine/cdefs.h: |
440 | + |
441 | +/usr/include/sys/cdefs_elf.h: |
442 | + |
443 | +/usr/include/sys/featuretest.h: |
444 | + |
445 | +/usr/include/sys/ansi.h: |
446 | + |
447 | +/usr/include/machine/ansi.h: |
448 | + |
449 | +/usr/include/machine/int_types.h: |
450 | + |
451 | +/usr/include/sys/null.h: |
452 | + |
453 | +/usr/include/stdlib.h: |
454 | + |
455 | +/usr/include/sys/types.h: |
456 | + |
457 | +/usr/include/machine/types.h: |
458 | + |
459 | +/usr/include/machine/endian.h: |
460 | + |
461 | +/usr/include/sys/endian.h: |
462 | + |
463 | +/usr/include/machine/endian_machdep.h: |
464 | + |
465 | +/usr/include/machine/bswap.h: |
466 | + |
467 | +/usr/include/machine/byte_swap.h: |
468 | + |
469 | +/usr/include/sys/bswap.h: |
470 | + |
471 | +/usr/include/sys/fd_set.h: |
472 | + |
473 | +/usr/include/pthread_types.h: |
474 | + |
475 | +/usr/include/stddef.h: |
476 | + |
477 | +/usr/include/ctype.h: |
478 | + |
479 | +/usr/include/sys/ctype_inline.h: |
480 | + |
481 | +/usr/include/sys/ctype_bits.h: |
482 | + |
483 | +/usr/include/string.h: |
484 | + |
485 | +/usr/include/strings.h: |
486 | + |
487 | +/usr/include/limits.h: |
488 | + |
489 | +/usr/include/machine/limits.h: |
490 | + |
491 | +/usr/include/sys/syslimits.h: |
492 | + |
493 | +bits.h: |
494 | + |
495 | +debug.h: |
496 | + |
497 | +printbuf.h: |
498 | + |
499 | +arraylist.h: |
500 | + |
501 | +json_inttypes.h: |
502 | + |
503 | +json_config.h: |
504 | + |
505 | +/usr/include/inttypes.h: |
506 | + |
507 | +/usr/include/sys/inttypes.h: |
508 | + |
509 | +/usr/include/sys/stdint.h: |
510 | + |
511 | +/usr/include/machine/int_mwgwtypes.h: |
512 | + |
513 | +/usr/include/machine/int_limits.h: |
514 | + |
515 | +/usr/include/machine/int_const.h: |
516 | + |
517 | +/usr/include/machine/wchar_limits.h: |
518 | + |
519 | +/usr/include/machine/int_fmtio.h: |
520 | + |
521 | +json_object.h: |
522 | + |
523 | +json_tokener.h: |
524 | + |
525 | +json_util.h: |
526 | + |
527 | +/usr/include/locale.h: |
528 | |
529 | === added file '.deps/json_util.Plo' |
530 | --- .deps/json_util.Plo 1970-01-01 00:00:00 +0000 |
531 | +++ .deps/json_util.Plo 2013-07-16 03:35:32 +0000 |
532 | @@ -0,0 +1,139 @@ |
533 | +json_util.lo: json_util.c config.h /usr/include/stdio.h \ |
534 | + /usr/include/sys/cdefs.h /usr/include/machine/cdefs.h \ |
535 | + /usr/include/sys/cdefs_elf.h /usr/include/sys/featuretest.h \ |
536 | + /usr/include/sys/ansi.h /usr/include/machine/ansi.h \ |
537 | + /usr/include/machine/int_types.h /usr/include/sys/null.h \ |
538 | + /usr/include/stdlib.h /usr/include/sys/types.h \ |
539 | + /usr/include/machine/types.h /usr/include/machine/endian.h \ |
540 | + /usr/include/sys/endian.h /usr/include/machine/endian_machdep.h \ |
541 | + /usr/include/machine/bswap.h /usr/include/machine/byte_swap.h \ |
542 | + /usr/include/sys/bswap.h /usr/include/sys/fd_set.h \ |
543 | + /usr/include/pthread_types.h /usr/include/stddef.h /usr/include/limits.h \ |
544 | + /usr/include/machine/limits.h /usr/include/sys/syslimits.h \ |
545 | + /usr/include/string.h /usr/include/strings.h /usr/include/errno.h \ |
546 | + /usr/include/sys/errno.h /usr/include/ctype.h \ |
547 | + /usr/include/sys/ctype_inline.h /usr/include/sys/ctype_bits.h \ |
548 | + /usr/include/sys/stat.h /usr/include/sys/time.h \ |
549 | + /usr/include/sys/select.h /usr/include/sys/sigtypes.h \ |
550 | + /usr/include/sys/satypes.h /usr/include/time.h /usr/include/fcntl.h \ |
551 | + /usr/include/unistd.h /usr/include/sys/unistd.h bits.h debug.h \ |
552 | + printbuf.h json_inttypes.h json_config.h /usr/include/inttypes.h \ |
553 | + /usr/include/sys/inttypes.h /usr/include/sys/stdint.h \ |
554 | + /usr/include/machine/int_mwgwtypes.h /usr/include/machine/int_limits.h \ |
555 | + /usr/include/machine/int_const.h /usr/include/machine/wchar_limits.h \ |
556 | + /usr/include/machine/int_fmtio.h json_object.h json_tokener.h \ |
557 | + json_util.h |
558 | + |
559 | +config.h: |
560 | + |
561 | +/usr/include/stdio.h: |
562 | + |
563 | +/usr/include/sys/cdefs.h: |
564 | + |
565 | +/usr/include/machine/cdefs.h: |
566 | + |
567 | +/usr/include/sys/cdefs_elf.h: |
568 | + |
569 | +/usr/include/sys/featuretest.h: |
570 | + |
571 | +/usr/include/sys/ansi.h: |
572 | + |
573 | +/usr/include/machine/ansi.h: |
574 | + |
575 | +/usr/include/machine/int_types.h: |
576 | + |
577 | +/usr/include/sys/null.h: |
578 | + |
579 | +/usr/include/stdlib.h: |
580 | + |
581 | +/usr/include/sys/types.h: |
582 | + |
583 | +/usr/include/machine/types.h: |
584 | + |
585 | +/usr/include/machine/endian.h: |
586 | + |
587 | +/usr/include/sys/endian.h: |
588 | + |
589 | +/usr/include/machine/endian_machdep.h: |
590 | + |
591 | +/usr/include/machine/bswap.h: |
592 | + |
593 | +/usr/include/machine/byte_swap.h: |
594 | + |
595 | +/usr/include/sys/bswap.h: |
596 | + |
597 | +/usr/include/sys/fd_set.h: |
598 | + |
599 | +/usr/include/pthread_types.h: |
600 | + |
601 | +/usr/include/stddef.h: |
602 | + |
603 | +/usr/include/limits.h: |
604 | + |
605 | +/usr/include/machine/limits.h: |
606 | + |
607 | +/usr/include/sys/syslimits.h: |
608 | + |
609 | +/usr/include/string.h: |
610 | + |
611 | +/usr/include/strings.h: |
612 | + |
613 | +/usr/include/errno.h: |
614 | + |
615 | +/usr/include/sys/errno.h: |
616 | + |
617 | +/usr/include/ctype.h: |
618 | + |
619 | +/usr/include/sys/ctype_inline.h: |
620 | + |
621 | +/usr/include/sys/ctype_bits.h: |
622 | + |
623 | +/usr/include/sys/stat.h: |
624 | + |
625 | +/usr/include/sys/time.h: |
626 | + |
627 | +/usr/include/sys/select.h: |
628 | + |
629 | +/usr/include/sys/sigtypes.h: |
630 | + |
631 | +/usr/include/sys/satypes.h: |
632 | + |
633 | +/usr/include/time.h: |
634 | + |
635 | +/usr/include/fcntl.h: |
636 | + |
637 | +/usr/include/unistd.h: |
638 | + |
639 | +/usr/include/sys/unistd.h: |
640 | + |
641 | +bits.h: |
642 | + |
643 | +debug.h: |
644 | + |
645 | +printbuf.h: |
646 | + |
647 | +json_inttypes.h: |
648 | + |
649 | +json_config.h: |
650 | + |
651 | +/usr/include/inttypes.h: |
652 | + |
653 | +/usr/include/sys/inttypes.h: |
654 | + |
655 | +/usr/include/sys/stdint.h: |
656 | + |
657 | +/usr/include/machine/int_mwgwtypes.h: |
658 | + |
659 | +/usr/include/machine/int_limits.h: |
660 | + |
661 | +/usr/include/machine/int_const.h: |
662 | + |
663 | +/usr/include/machine/wchar_limits.h: |
664 | + |
665 | +/usr/include/machine/int_fmtio.h: |
666 | + |
667 | +json_object.h: |
668 | + |
669 | +json_tokener.h: |
670 | + |
671 | +json_util.h: |
672 | |
673 | === added file '.deps/libjson.Plo' |
674 | --- .deps/libjson.Plo 1970-01-01 00:00:00 +0000 |
675 | +++ .deps/libjson.Plo 2013-07-16 03:35:32 +0000 |
676 | @@ -0,0 +1,40 @@ |
677 | +libjson.lo: libjson.c json_object.h json_inttypes.h json_config.h \ |
678 | + /usr/include/inttypes.h /usr/include/sys/cdefs.h \ |
679 | + /usr/include/machine/cdefs.h /usr/include/sys/cdefs_elf.h \ |
680 | + /usr/include/sys/inttypes.h /usr/include/sys/stdint.h \ |
681 | + /usr/include/machine/int_types.h /usr/include/machine/int_mwgwtypes.h \ |
682 | + /usr/include/machine/int_limits.h /usr/include/machine/int_const.h \ |
683 | + /usr/include/machine/wchar_limits.h /usr/include/machine/int_fmtio.h \ |
684 | + /usr/include/machine/ansi.h |
685 | + |
686 | +json_object.h: |
687 | + |
688 | +json_inttypes.h: |
689 | + |
690 | +json_config.h: |
691 | + |
692 | +/usr/include/inttypes.h: |
693 | + |
694 | +/usr/include/sys/cdefs.h: |
695 | + |
696 | +/usr/include/machine/cdefs.h: |
697 | + |
698 | +/usr/include/sys/cdefs_elf.h: |
699 | + |
700 | +/usr/include/sys/inttypes.h: |
701 | + |
702 | +/usr/include/sys/stdint.h: |
703 | + |
704 | +/usr/include/machine/int_types.h: |
705 | + |
706 | +/usr/include/machine/int_mwgwtypes.h: |
707 | + |
708 | +/usr/include/machine/int_limits.h: |
709 | + |
710 | +/usr/include/machine/int_const.h: |
711 | + |
712 | +/usr/include/machine/wchar_limits.h: |
713 | + |
714 | +/usr/include/machine/int_fmtio.h: |
715 | + |
716 | +/usr/include/machine/ansi.h: |
717 | |
718 | === added file '.deps/linkhash.Plo' |
719 | --- .deps/linkhash.Plo 1970-01-01 00:00:00 +0000 |
720 | +++ .deps/linkhash.Plo 2013-07-16 03:35:32 +0000 |
721 | @@ -0,0 +1,95 @@ |
722 | +linkhash.lo: linkhash.c /usr/include/stdio.h /usr/include/sys/cdefs.h \ |
723 | + /usr/include/machine/cdefs.h /usr/include/sys/cdefs_elf.h \ |
724 | + /usr/include/sys/featuretest.h /usr/include/sys/ansi.h \ |
725 | + /usr/include/machine/ansi.h /usr/include/machine/int_types.h \ |
726 | + /usr/include/sys/null.h /usr/include/string.h /usr/include/strings.h \ |
727 | + /usr/include/stdlib.h /usr/include/sys/types.h \ |
728 | + /usr/include/machine/types.h /usr/include/machine/endian.h \ |
729 | + /usr/include/sys/endian.h /usr/include/machine/endian_machdep.h \ |
730 | + /usr/include/machine/bswap.h /usr/include/machine/byte_swap.h \ |
731 | + /usr/include/sys/bswap.h /usr/include/sys/fd_set.h \ |
732 | + /usr/include/pthread_types.h /usr/include/stdarg.h /usr/include/stddef.h \ |
733 | + /usr/include/limits.h /usr/include/machine/limits.h \ |
734 | + /usr/include/sys/syslimits.h linkhash.h json_object.h json_inttypes.h \ |
735 | + json_config.h /usr/include/inttypes.h /usr/include/sys/inttypes.h \ |
736 | + /usr/include/sys/stdint.h /usr/include/machine/int_mwgwtypes.h \ |
737 | + /usr/include/machine/int_limits.h /usr/include/machine/int_const.h \ |
738 | + /usr/include/machine/wchar_limits.h /usr/include/machine/int_fmtio.h |
739 | + |
740 | +/usr/include/stdio.h: |
741 | + |
742 | +/usr/include/sys/cdefs.h: |
743 | + |
744 | +/usr/include/machine/cdefs.h: |
745 | + |
746 | +/usr/include/sys/cdefs_elf.h: |
747 | + |
748 | +/usr/include/sys/featuretest.h: |
749 | + |
750 | +/usr/include/sys/ansi.h: |
751 | + |
752 | +/usr/include/machine/ansi.h: |
753 | + |
754 | +/usr/include/machine/int_types.h: |
755 | + |
756 | +/usr/include/sys/null.h: |
757 | + |
758 | +/usr/include/string.h: |
759 | + |
760 | +/usr/include/strings.h: |
761 | + |
762 | +/usr/include/stdlib.h: |
763 | + |
764 | +/usr/include/sys/types.h: |
765 | + |
766 | +/usr/include/machine/types.h: |
767 | + |
768 | +/usr/include/machine/endian.h: |
769 | + |
770 | +/usr/include/sys/endian.h: |
771 | + |
772 | +/usr/include/machine/endian_machdep.h: |
773 | + |
774 | +/usr/include/machine/bswap.h: |
775 | + |
776 | +/usr/include/machine/byte_swap.h: |
777 | + |
778 | +/usr/include/sys/bswap.h: |
779 | + |
780 | +/usr/include/sys/fd_set.h: |
781 | + |
782 | +/usr/include/pthread_types.h: |
783 | + |
784 | +/usr/include/stdarg.h: |
785 | + |
786 | +/usr/include/stddef.h: |
787 | + |
788 | +/usr/include/limits.h: |
789 | + |
790 | +/usr/include/machine/limits.h: |
791 | + |
792 | +/usr/include/sys/syslimits.h: |
793 | + |
794 | +linkhash.h: |
795 | + |
796 | +json_object.h: |
797 | + |
798 | +json_inttypes.h: |
799 | + |
800 | +json_config.h: |
801 | + |
802 | +/usr/include/inttypes.h: |
803 | + |
804 | +/usr/include/sys/inttypes.h: |
805 | + |
806 | +/usr/include/sys/stdint.h: |
807 | + |
808 | +/usr/include/machine/int_mwgwtypes.h: |
809 | + |
810 | +/usr/include/machine/int_limits.h: |
811 | + |
812 | +/usr/include/machine/int_const.h: |
813 | + |
814 | +/usr/include/machine/wchar_limits.h: |
815 | + |
816 | +/usr/include/machine/int_fmtio.h: |
817 | |
818 | === added file '.deps/printbuf.Plo' |
819 | --- .deps/printbuf.Plo 1970-01-01 00:00:00 +0000 |
820 | +++ .deps/printbuf.Plo 2013-07-16 03:35:32 +0000 |
821 | @@ -0,0 +1,66 @@ |
822 | +printbuf.lo: printbuf.c config.h /usr/include/stdio.h \ |
823 | + /usr/include/sys/cdefs.h /usr/include/machine/cdefs.h \ |
824 | + /usr/include/sys/cdefs_elf.h /usr/include/sys/featuretest.h \ |
825 | + /usr/include/sys/ansi.h /usr/include/machine/ansi.h \ |
826 | + /usr/include/machine/int_types.h /usr/include/sys/null.h \ |
827 | + /usr/include/stdlib.h /usr/include/sys/types.h \ |
828 | + /usr/include/machine/types.h /usr/include/machine/endian.h \ |
829 | + /usr/include/sys/endian.h /usr/include/machine/endian_machdep.h \ |
830 | + /usr/include/machine/bswap.h /usr/include/machine/byte_swap.h \ |
831 | + /usr/include/sys/bswap.h /usr/include/sys/fd_set.h \ |
832 | + /usr/include/pthread_types.h /usr/include/string.h \ |
833 | + /usr/include/strings.h /usr/include/stdarg.h bits.h debug.h printbuf.h |
834 | + |
835 | +config.h: |
836 | + |
837 | +/usr/include/stdio.h: |
838 | + |
839 | +/usr/include/sys/cdefs.h: |
840 | + |
841 | +/usr/include/machine/cdefs.h: |
842 | + |
843 | +/usr/include/sys/cdefs_elf.h: |
844 | + |
845 | +/usr/include/sys/featuretest.h: |
846 | + |
847 | +/usr/include/sys/ansi.h: |
848 | + |
849 | +/usr/include/machine/ansi.h: |
850 | + |
851 | +/usr/include/machine/int_types.h: |
852 | + |
853 | +/usr/include/sys/null.h: |
854 | + |
855 | +/usr/include/stdlib.h: |
856 | + |
857 | +/usr/include/sys/types.h: |
858 | + |
859 | +/usr/include/machine/types.h: |
860 | + |
861 | +/usr/include/machine/endian.h: |
862 | + |
863 | +/usr/include/sys/endian.h: |
864 | + |
865 | +/usr/include/machine/endian_machdep.h: |
866 | + |
867 | +/usr/include/machine/bswap.h: |
868 | + |
869 | +/usr/include/machine/byte_swap.h: |
870 | + |
871 | +/usr/include/sys/bswap.h: |
872 | + |
873 | +/usr/include/sys/fd_set.h: |
874 | + |
875 | +/usr/include/pthread_types.h: |
876 | + |
877 | +/usr/include/string.h: |
878 | + |
879 | +/usr/include/strings.h: |
880 | + |
881 | +/usr/include/stdarg.h: |
882 | + |
883 | +bits.h: |
884 | + |
885 | +debug.h: |
886 | + |
887 | +printbuf.h: |
888 | |
889 | === modified file '.gitignore' |
890 | --- .gitignore 2012-08-17 16:40:10 +0000 |
891 | +++ .gitignore 2013-07-16 03:35:32 +0000 |
892 | @@ -1,3 +1,6 @@ |
893 | +*~ |
894 | +*.swp |
895 | +/INSTALL |
896 | .deps/ |
897 | .libs/ |
898 | /aclocal.m4 |
899 | @@ -10,8 +13,11 @@ |
900 | /config.sub |
901 | /configure |
902 | /depcomp |
903 | +/doc |
904 | /install-sh |
905 | /json.pc |
906 | +/json-c.pc |
907 | +/json-c-uninstalled.pc |
908 | /libtool |
909 | /ltmain.sh |
910 | /Makefile |
911 | @@ -26,14 +32,18 @@ |
912 | /tests/test2 |
913 | /tests/test2Formatted |
914 | /tests/test4 |
915 | +/tests/testReplaceExisting |
916 | /tests/testSubDir |
917 | /tests/test_parse_int64 |
918 | /tests/test_parse |
919 | /tests/test_cast |
920 | /tests/test_null |
921 | /tests/test_printbuf |
922 | +/tests/test_set_serializer |
923 | +/tests/*.vg.out |
924 | /Debug |
925 | /Release |
926 | *.lo |
927 | *.o |
928 | +/libjson-c.la |
929 | /libjson.la |
930 | |
931 | === modified file '.pc/applied-patches' |
932 | --- .pc/applied-patches 2012-08-27 12:56:32 +0000 |
933 | +++ .pc/applied-patches 2013-07-16 03:35:32 +0000 |
934 | @@ -1,1 +0,0 @@ |
935 | -fix-format-string-in-test.patch |
936 | |
937 | === removed directory '.pc/fix-format-string-in-test.patch' |
938 | === removed directory '.pc/fix-format-string-in-test.patch/tests' |
939 | === removed file '.pc/fix-format-string-in-test.patch/tests/test_printbuf.c' |
940 | --- .pc/fix-format-string-in-test.patch/tests/test_printbuf.c 2012-08-17 16:40:10 +0000 |
941 | +++ .pc/fix-format-string-in-test.patch/tests/test_printbuf.c 1970-01-01 00:00:00 +0000 |
942 | @@ -1,165 +0,0 @@ |
943 | -#include <assert.h> |
944 | -#include <stddef.h> |
945 | -#include <stdio.h> |
946 | -#include <stdlib.h> |
947 | -#include <string.h> |
948 | -#include <limits.h> |
949 | - |
950 | -#include "debug.h" |
951 | -#include "printbuf.h" |
952 | - |
953 | -static void test_basic_printbuf_memset(void); |
954 | -static void test_printbuf_memset_length(void); |
955 | - |
956 | -static void test_basic_printbuf_memset() |
957 | -{ |
958 | - struct printbuf *pb; |
959 | - |
960 | - printf("%s: starting test\n", __func__); |
961 | - pb = printbuf_new(); |
962 | - sprintbuf(pb, "blue:%d", 1); |
963 | - printbuf_memset(pb, -1, 'x', 52); |
964 | - printf("Buffer contents:%.*s\n", printbuf_length(pb), pb->buf); |
965 | - printbuf_free(pb); |
966 | - printf("%s: end test\n", __func__); |
967 | -} |
968 | - |
969 | -static void test_printbuf_memset_length() |
970 | -{ |
971 | - struct printbuf *pb; |
972 | - |
973 | - printf("%s: starting test\n", __func__); |
974 | - pb = printbuf_new(); |
975 | - printbuf_memset(pb, -1, ' ', 0); |
976 | - printbuf_memset(pb, -1, ' ', 0); |
977 | - printbuf_memset(pb, -1, ' ', 0); |
978 | - printbuf_memset(pb, -1, ' ', 0); |
979 | - printbuf_memset(pb, -1, ' ', 0); |
980 | - printf("Buffer length: %d\n", printbuf_length(pb)); |
981 | - printbuf_memset(pb, -1, ' ', 2); |
982 | - printbuf_memset(pb, -1, ' ', 4); |
983 | - printbuf_memset(pb, -1, ' ', 6); |
984 | - printf("Buffer length: %d\n", printbuf_length(pb)); |
985 | - printbuf_memset(pb, -1, ' ', 6); |
986 | - printf("Buffer length: %d\n", printbuf_length(pb)); |
987 | - printbuf_memset(pb, -1, ' ', 8); |
988 | - printbuf_memset(pb, -1, ' ', 10); |
989 | - printbuf_memset(pb, -1, ' ', 10); |
990 | - printbuf_memset(pb, -1, ' ', 10); |
991 | - printbuf_memset(pb, -1, ' ', 20); |
992 | - printf("Buffer length: %d\n", printbuf_length(pb)); |
993 | - |
994 | - // No length change should occur |
995 | - printbuf_memset(pb, 0, 'x', 30); |
996 | - printf("Buffer length: %d\n", printbuf_length(pb)); |
997 | - |
998 | - // This should extend it by one. |
999 | - printbuf_memset(pb, 0, 'x', printbuf_length(pb) + 1); |
1000 | - printf("Buffer length: %d\n", printbuf_length(pb)); |
1001 | - |
1002 | - printbuf_free(pb); |
1003 | - printf("%s: end test\n", __func__); |
1004 | -} |
1005 | - |
1006 | -static void test_printbuf_memappend(int *before_resize); |
1007 | -static void test_printbuf_memappend(int *before_resize) |
1008 | -{ |
1009 | - struct printbuf *pb; |
1010 | - int initial_size; |
1011 | - |
1012 | - printf("%s: starting test\n", __func__); |
1013 | - pb = printbuf_new(); |
1014 | - printf("Buffer length: %d\n", printbuf_length(pb)); |
1015 | - |
1016 | - initial_size = pb->size; |
1017 | - |
1018 | - while(pb->size == initial_size) |
1019 | - { |
1020 | - printbuf_memappend_fast(pb, "x", 1); |
1021 | - } |
1022 | - *before_resize = printbuf_length(pb) - 1; |
1023 | - printf("Appended %d bytes for resize: [%s]\n", *before_resize + 1, pb->buf); |
1024 | - |
1025 | - printbuf_reset(pb); |
1026 | - printbuf_memappend_fast(pb, "bluexyz123", 3); |
1027 | - printf("Partial append: %d, [%s]\n", printbuf_length(pb), pb->buf); |
1028 | - |
1029 | - char with_nulls[] = { 'a', 'b', '\0', 'c' }; |
1030 | - printbuf_reset(pb); |
1031 | - printbuf_memappend_fast(pb, with_nulls, sizeof(with_nulls)); |
1032 | - printf("With embedded \\0 character: %d, [%s]\n", printbuf_length(pb), pb->buf); |
1033 | - |
1034 | - printbuf_free(pb); |
1035 | - pb = printbuf_new(); |
1036 | - char *data = malloc(*before_resize); |
1037 | - memset(data, 'X', *before_resize); |
1038 | - printbuf_memappend_fast(pb, data, *before_resize); |
1039 | - printf("Append to just before resize: %d, [%s]\n", printbuf_length(pb), pb->buf); |
1040 | - |
1041 | - free(data); |
1042 | - printbuf_free(pb); |
1043 | - |
1044 | - pb = printbuf_new(); |
1045 | - data = malloc(*before_resize + 1); |
1046 | - memset(data, 'X', *before_resize + 1); |
1047 | - printbuf_memappend_fast(pb, data, *before_resize + 1); |
1048 | - printf("Append to just after resize: %d, [%s]\n", printbuf_length(pb), pb->buf); |
1049 | - |
1050 | - free(data); |
1051 | - |
1052 | - printbuf_free(pb); |
1053 | - printf("%s: end test\n", __func__); |
1054 | -} |
1055 | - |
1056 | -static void test_sprintbuf(int before_resize); |
1057 | -static void test_sprintbuf(int before_resize) |
1058 | -{ |
1059 | - struct printbuf *pb; |
1060 | - |
1061 | - printf("%s: starting test\n", __func__); |
1062 | - pb = printbuf_new(); |
1063 | - printf("Buffer length: %d\n", printbuf_length(pb)); |
1064 | - |
1065 | - char *data = malloc(before_resize + 1 + 1); |
1066 | - memset(data, 'X', before_resize + 1 + 1); |
1067 | - data[before_resize + 1] = '\0'; |
1068 | - sprintbuf(pb, "%s", data); |
1069 | - printf("sprintbuf to just after resize(%d+1): %d, [%s], strlen(buf)=%d\n", before_resize, printbuf_length(pb), pb->buf, strlen(pb->buf)); |
1070 | - |
1071 | - printbuf_reset(pb); |
1072 | - sprintbuf(pb, "plain"); |
1073 | - printf("%d, [%s]\n", printbuf_length(pb), pb->buf); |
1074 | - |
1075 | - sprintbuf(pb, "%d", 1); |
1076 | - printf("%d, [%s]\n", printbuf_length(pb), pb->buf); |
1077 | - |
1078 | - sprintbuf(pb, "%d", INT_MAX); |
1079 | - printf("%d, [%s]\n", printbuf_length(pb), pb->buf); |
1080 | - |
1081 | - sprintbuf(pb, "%d", INT_MIN); |
1082 | - printf("%d, [%s]\n", printbuf_length(pb), pb->buf); |
1083 | - |
1084 | - sprintbuf(pb, "%s", "%s"); |
1085 | - printf("%d, [%s]\n", printbuf_length(pb), pb->buf); |
1086 | - |
1087 | - printbuf_free(pb); |
1088 | - printf("%s: end test\n", __func__); |
1089 | -} |
1090 | - |
1091 | -int main(int argc, char **argv) |
1092 | -{ |
1093 | - int before_resize = 0; |
1094 | - |
1095 | - mc_set_debug(1); |
1096 | - |
1097 | - test_basic_printbuf_memset(); |
1098 | - printf("========================================\n"); |
1099 | - test_printbuf_memset_length(); |
1100 | - printf("========================================\n"); |
1101 | - test_printbuf_memappend(&before_resize); |
1102 | - printf("========================================\n"); |
1103 | - test_sprintbuf(before_resize); |
1104 | - printf("========================================\n"); |
1105 | - |
1106 | - return 0; |
1107 | -} |
1108 | |
1109 | === added file 'Android.configure.mk' |
1110 | --- Android.configure.mk 1970-01-01 00:00:00 +0000 |
1111 | +++ Android.configure.mk 2013-07-16 03:35:32 +0000 |
1112 | @@ -0,0 +1,39 @@ |
1113 | +# This file is the top android makefile for all sub-modules. |
1114 | + |
1115 | +LOCAL_PATH := $(call my-dir) |
1116 | +include $(CLEAR_VARS) |
1117 | + |
1118 | +json_c_TOP := $(LOCAL_PATH) |
1119 | + |
1120 | +JSON_C_BUILT_SOURCES := Android.mk |
1121 | + |
1122 | +JSON_C_BUILT_SOURCES := $(patsubst %, $(abspath $(json_c_TOP))/%, $(JSON_C_BUILT_SOURCES)) |
1123 | + |
1124 | +.PHONY: json-c-configure json-c-configure-real |
1125 | +json-c-configure-real: |
1126 | + echo $(JSON_C_BUILT_SOURCES) |
1127 | + cd $(json_c_TOP) ; \ |
1128 | + $(abspath $(json_c_TOP))/autogen.sh && \ |
1129 | + CC="$(CONFIGURE_CC)" \ |
1130 | + CFLAGS="$(CONFIGURE_CFLAGS)" \ |
1131 | + LD=$(TARGET_LD) \ |
1132 | + LDFLAGS="$(CONFIGURE_LDFLAGS)" \ |
1133 | + CPP=$(CONFIGURE_CPP) \ |
1134 | + CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \ |
1135 | + PKG_CONFIG_LIBDIR=$(CONFIGURE_PKG_CONFIG_LIBDIR) \ |
1136 | + PKG_CONFIG_TOP_BUILD_DIR=/ \ |
1137 | + ac_cv_func_malloc_0_nonnull=yes \ |
1138 | + ac_cv_func_realloc_0_nonnull=yes \ |
1139 | + $(abspath $(json_c_TOP))/$(CONFIGURE) --host=$(CONFIGURE_HOST) \ |
1140 | + --prefix=/system \ |
1141 | + && \ |
1142 | + for file in $(JSON_C_BUILT_SOURCES); do \ |
1143 | + rm -f $$file && \ |
1144 | + make -C $$(dirname $$file) $$(basename $$file) ; \ |
1145 | + done |
1146 | + |
1147 | +json-c-configure: json-c-configure-real |
1148 | + |
1149 | +PA_CONFIGURE_TARGETS += json-c-configure |
1150 | + |
1151 | +-include $(json_c_TOP)/Android.mk |
1152 | |
1153 | === modified file 'COPYING' |
1154 | --- COPYING 2009-11-11 16:34:13 +0000 |
1155 | +++ COPYING 2013-07-16 03:35:32 +0000 |
1156 | @@ -1,3 +1,26 @@ |
1157 | + |
1158 | +Copyright (c) 2009-2012 Eric Haszlakiewicz |
1159 | + |
1160 | +Permission is hereby granted, free of charge, to any person obtaining a |
1161 | +copy of this software and associated documentation files (the "Software"), |
1162 | +to deal in the Software without restriction, including without limitation |
1163 | +the rights to use, copy, modify, merge, publish, distribute, sublicense, |
1164 | +and/or sell copies of the Software, and to permit persons to whom the |
1165 | +Software is furnished to do so, subject to the following conditions: |
1166 | + |
1167 | +The above copyright notice and this permission notice shall be included |
1168 | +in all copies or substantial portions of the Software. |
1169 | + |
1170 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
1171 | +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
1172 | +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
1173 | +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
1174 | +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
1175 | +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
1176 | +SOFTWARE. |
1177 | + |
1178 | +---------------------------------------------------------------- |
1179 | + |
1180 | Copyright (c) 2004, 2005 Metaparadigm Pte Ltd |
1181 | |
1182 | Permission is hereby granted, free of charge, to any person obtaining a |
1183 | |
1184 | === modified file 'ChangeLog' |
1185 | --- ChangeLog 2012-08-17 16:40:10 +0000 |
1186 | +++ ChangeLog 2013-07-16 03:35:32 +0000 |
1187 | @@ -1,3 +1,27 @@ |
1188 | + |
1189 | +0.11 |
1190 | + |
1191 | + * IMPORTANT: the name of the library has changed to libjson-c.so and |
1192 | + the header files are now in include/json-c. |
1193 | + The pkgconfig name has also changed from json to json-c. |
1194 | + You should change your build to use appropriate -I and -l options. |
1195 | + A compatibility shim is in place so builds using the old name will |
1196 | + continue to work, but that will be removed in the next release. |
1197 | + * Maximum recursion depth is now a runtime option. |
1198 | + json_tokener_new() is provided for compatibility. |
1199 | + json_tokener_new_ex(depth) |
1200 | + * Include json_object_iterator.h in the installed headers. |
1201 | + * Add support for building on Android. |
1202 | + * Rewrite json_object_object_add to replace just the value if the key already exists so keys remain valid. |
1203 | + * Make it safe to delete keys while iterating with the json_object_object_foreach macro. |
1204 | + * Add a json_set_serializer() function to allow the string output of a json_object to be customized. |
1205 | + * Make float parsing locale independent. |
1206 | + * Add a json_tokener_set_flags() function and a JSON_TOKENER_STRICT flag. |
1207 | + * Enable -Werror when building. |
1208 | + * speed improvements to parsing 64-bit integers on systems with working sscanf |
1209 | + * Add a json_object_object_length function. |
1210 | + * Fix a bug (buffer overrun) when expanding arrays to more than 64 entries. |
1211 | + |
1212 | 0.10 |
1213 | |
1214 | * Add a json_object_to_json_string_ext() function to allow output to be |
1215 | |
1216 | === modified file 'Doxyfile' |
1217 | --- Doxyfile 2012-08-17 16:40:10 +0000 |
1218 | +++ Doxyfile 2013-07-16 03:35:32 +0000 |
1219 | @@ -23,7 +23,7 @@ |
1220 | # This could be handy for archiving the generated documentation or |
1221 | # if some version control system is used. |
1222 | |
1223 | -PROJECT_NUMBER = 0.10 |
1224 | +PROJECT_NUMBER = 0.11 |
1225 | |
1226 | # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) |
1227 | # base path where the generated documentation will be put. |
1228 | |
1229 | === modified file 'INSTALL' |
1230 | --- INSTALL 2009-11-11 16:34:13 +0000 |
1231 | +++ INSTALL 2013-07-16 03:35:32 +0000 |
1232 | @@ -1,13 +1,25 @@ |
1233 | -Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software |
1234 | -Foundation, Inc. |
1235 | - |
1236 | - This file is free documentation; the Free Software Foundation gives |
1237 | -unlimited permission to copy, distribute and modify it. |
1238 | +Installation Instructions |
1239 | +************************* |
1240 | + |
1241 | +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, |
1242 | +2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
1243 | + |
1244 | + Copying and distribution of this file, with or without modification, |
1245 | +are permitted in any medium without royalty provided the copyright |
1246 | +notice and this notice are preserved. This file is offered as-is, |
1247 | +without warranty of any kind. |
1248 | |
1249 | Basic Installation |
1250 | ================== |
1251 | |
1252 | - These are generic installation instructions. |
1253 | + Briefly, the shell commands `./configure; make; make install' should |
1254 | +configure, build, and install this package. The following |
1255 | +more-detailed instructions are generic; see the `README' file for |
1256 | +instructions specific to this package. Some packages provide this |
1257 | +`INSTALL' file but do not implement all of the features documented |
1258 | +below. The lack of an optional feature in a given package is not |
1259 | +necessarily a bug. More recommendations for GNU packages can be found |
1260 | +in *note Makefile Conventions: (standards)Makefile Conventions. |
1261 | |
1262 | The `configure' shell script attempts to guess correct values for |
1263 | various system-dependent variables used during compilation. It uses |
1264 | @@ -20,9 +32,9 @@ |
1265 | |
1266 | It can also use an optional file (typically called `config.cache' |
1267 | and enabled with `--cache-file=config.cache' or simply `-C') that saves |
1268 | -the results of its tests to speed up reconfiguring. (Caching is |
1269 | +the results of its tests to speed up reconfiguring. Caching is |
1270 | disabled by default to prevent problems with accidental use of stale |
1271 | -cache files.) |
1272 | +cache files. |
1273 | |
1274 | If you need to do unusual things to compile the package, please try |
1275 | to figure out how `configure' could check whether to do them, and mail |
1276 | @@ -32,30 +44,37 @@ |
1277 | may remove or edit it. |
1278 | |
1279 | The file `configure.ac' (or `configure.in') is used to create |
1280 | -`configure' by a program called `autoconf'. You only need |
1281 | -`configure.ac' if you want to change it or regenerate `configure' using |
1282 | -a newer version of `autoconf'. |
1283 | +`configure' by a program called `autoconf'. You need `configure.ac' if |
1284 | +you want to change it or regenerate `configure' using a newer version |
1285 | +of `autoconf'. |
1286 | |
1287 | -The simplest way to compile this package is: |
1288 | + The simplest way to compile this package is: |
1289 | |
1290 | 1. `cd' to the directory containing the package's source code and type |
1291 | - `./configure' to configure the package for your system. If you're |
1292 | - using `csh' on an old version of System V, you might need to type |
1293 | - `sh ./configure' instead to prevent `csh' from trying to execute |
1294 | - `configure' itself. |
1295 | + `./configure' to configure the package for your system. |
1296 | |
1297 | - Running `configure' takes awhile. While running, it prints some |
1298 | - messages telling which features it is checking for. |
1299 | + Running `configure' might take a while. While running, it prints |
1300 | + some messages telling which features it is checking for. |
1301 | |
1302 | 2. Type `make' to compile the package. |
1303 | |
1304 | 3. Optionally, type `make check' to run any self-tests that come with |
1305 | - the package. |
1306 | + the package, generally using the just-built uninstalled binaries. |
1307 | |
1308 | 4. Type `make install' to install the programs and any data files and |
1309 | - documentation. |
1310 | - |
1311 | - 5. You can remove the program binaries and object files from the |
1312 | + documentation. When installing into a prefix owned by root, it is |
1313 | + recommended that the package be configured and built as a regular |
1314 | + user, and only the `make install' phase executed with root |
1315 | + privileges. |
1316 | + |
1317 | + 5. Optionally, type `make installcheck' to repeat any self-tests, but |
1318 | + this time using the binaries in their final installed location. |
1319 | + This target does not install anything. Running this target as a |
1320 | + regular user, particularly if the prior `make install' required |
1321 | + root privileges, verifies that the installation completed |
1322 | + correctly. |
1323 | + |
1324 | + 6. You can remove the program binaries and object files from the |
1325 | source code directory by typing `make clean'. To also remove the |
1326 | files that `configure' created (so you can compile the package for |
1327 | a different kind of computer), type `make distclean'. There is |
1328 | @@ -64,6 +83,16 @@ |
1329 | all sorts of other programs in order to regenerate files that came |
1330 | with the distribution. |
1331 | |
1332 | + 7. Often, you can also type `make uninstall' to remove the installed |
1333 | + files again. In practice, not all packages have tested that |
1334 | + uninstallation works correctly, even though it is required by the |
1335 | + GNU Coding Standards. |
1336 | + |
1337 | + 8. Some packages, particularly those that use Automake, provide `make |
1338 | + distcheck', which can by used by developers to test that all other |
1339 | + targets like `make install' and `make uninstall' work correctly. |
1340 | + This target is generally not run by end users. |
1341 | + |
1342 | Compilers and Options |
1343 | ===================== |
1344 | |
1345 | @@ -75,7 +104,7 @@ |
1346 | by setting variables in the command line or in the environment. Here |
1347 | is an example: |
1348 | |
1349 | - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix |
1350 | + ./configure CC=c99 CFLAGS=-g LIBS=-lposix |
1351 | |
1352 | *Note Defining Variables::, for more details. |
1353 | |
1354 | @@ -84,44 +113,89 @@ |
1355 | |
1356 | You can compile the package for more than one kind of computer at the |
1357 | same time, by placing the object files for each architecture in their |
1358 | -own directory. To do this, you must use a version of `make' that |
1359 | -supports the `VPATH' variable, such as GNU `make'. `cd' to the |
1360 | +own directory. To do this, you can use GNU `make'. `cd' to the |
1361 | directory where you want the object files and executables to go and run |
1362 | the `configure' script. `configure' automatically checks for the |
1363 | -source code in the directory that `configure' is in and in `..'. |
1364 | - |
1365 | - If you have to use a `make' that does not support the `VPATH' |
1366 | -variable, you have to compile the package for one architecture at a |
1367 | -time in the source code directory. After you have installed the |
1368 | -package for one architecture, use `make distclean' before reconfiguring |
1369 | -for another architecture. |
1370 | +source code in the directory that `configure' is in and in `..'. This |
1371 | +is known as a "VPATH" build. |
1372 | + |
1373 | + With a non-GNU `make', it is safer to compile the package for one |
1374 | +architecture at a time in the source code directory. After you have |
1375 | +installed the package for one architecture, use `make distclean' before |
1376 | +reconfiguring for another architecture. |
1377 | + |
1378 | + On MacOS X 10.5 and later systems, you can create libraries and |
1379 | +executables that work on multiple system types--known as "fat" or |
1380 | +"universal" binaries--by specifying multiple `-arch' options to the |
1381 | +compiler but only a single `-arch' option to the preprocessor. Like |
1382 | +this: |
1383 | + |
1384 | + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ |
1385 | + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ |
1386 | + CPP="gcc -E" CXXCPP="g++ -E" |
1387 | + |
1388 | + This is not guaranteed to produce working output in all cases, you |
1389 | +may have to build one architecture at a time and combine the results |
1390 | +using the `lipo' tool if you have problems. |
1391 | |
1392 | Installation Names |
1393 | ================== |
1394 | |
1395 | - By default, `make install' will install the package's files in |
1396 | -`/usr/local/bin', `/usr/local/man', etc. You can specify an |
1397 | -installation prefix other than `/usr/local' by giving `configure' the |
1398 | -option `--prefix=PATH'. |
1399 | + By default, `make install' installs the package's commands under |
1400 | +`/usr/local/bin', include files under `/usr/local/include', etc. You |
1401 | +can specify an installation prefix other than `/usr/local' by giving |
1402 | +`configure' the option `--prefix=PREFIX', where PREFIX must be an |
1403 | +absolute file name. |
1404 | |
1405 | You can specify separate installation prefixes for |
1406 | architecture-specific files and architecture-independent files. If you |
1407 | -give `configure' the option `--exec-prefix=PATH', the package will use |
1408 | -PATH as the prefix for installing programs and libraries. |
1409 | -Documentation and other data files will still use the regular prefix. |
1410 | +pass the option `--exec-prefix=PREFIX' to `configure', the package uses |
1411 | +PREFIX as the prefix for installing programs and libraries. |
1412 | +Documentation and other data files still use the regular prefix. |
1413 | |
1414 | In addition, if you use an unusual directory layout you can give |
1415 | -options like `--bindir=PATH' to specify different values for particular |
1416 | +options like `--bindir=DIR' to specify different values for particular |
1417 | kinds of files. Run `configure --help' for a list of the directories |
1418 | -you can set and what kinds of files go in them. |
1419 | +you can set and what kinds of files go in them. In general, the |
1420 | +default for these options is expressed in terms of `${prefix}', so that |
1421 | +specifying just `--prefix' will affect all of the other directory |
1422 | +specifications that were not explicitly provided. |
1423 | + |
1424 | + The most portable way to affect installation locations is to pass the |
1425 | +correct locations to `configure'; however, many packages provide one or |
1426 | +both of the following shortcuts of passing variable assignments to the |
1427 | +`make install' command line to change installation locations without |
1428 | +having to reconfigure or recompile. |
1429 | + |
1430 | + The first method involves providing an override variable for each |
1431 | +affected directory. For example, `make install |
1432 | +prefix=/alternate/directory' will choose an alternate location for all |
1433 | +directory configuration variables that were expressed in terms of |
1434 | +`${prefix}'. Any directories that were specified during `configure', |
1435 | +but not in terms of `${prefix}', must each be overridden at install |
1436 | +time for the entire installation to be relocated. The approach of |
1437 | +makefile variable overrides for each directory variable is required by |
1438 | +the GNU Coding Standards, and ideally causes no recompilation. |
1439 | +However, some platforms have known limitations with the semantics of |
1440 | +shared libraries that end up requiring recompilation when using this |
1441 | +method, particularly noticeable in packages that use GNU Libtool. |
1442 | + |
1443 | + The second method involves providing the `DESTDIR' variable. For |
1444 | +example, `make install DESTDIR=/alternate/directory' will prepend |
1445 | +`/alternate/directory' before all installation names. The approach of |
1446 | +`DESTDIR' overrides is not required by the GNU Coding Standards, and |
1447 | +does not work on platforms that have drive letters. On the other hand, |
1448 | +it does better at avoiding recompilation issues, and works well even |
1449 | +when some directory options were not specified in terms of `${prefix}' |
1450 | +at `configure' time. |
1451 | + |
1452 | +Optional Features |
1453 | +================= |
1454 | |
1455 | If the package supports it, you can cause programs to be installed |
1456 | with an extra prefix or suffix on their names by giving `configure' the |
1457 | option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. |
1458 | |
1459 | -Optional Features |
1460 | -================= |
1461 | - |
1462 | Some packages pay attention to `--enable-FEATURE' options to |
1463 | `configure', where FEATURE indicates an optional part of the package. |
1464 | They may also pay attention to `--with-PACKAGE' options, where PACKAGE |
1465 | @@ -134,6 +208,45 @@ |
1466 | you can use the `configure' options `--x-includes=DIR' and |
1467 | `--x-libraries=DIR' to specify their locations. |
1468 | |
1469 | + Some packages offer the ability to configure how verbose the |
1470 | +execution of `make' will be. For these packages, running `./configure |
1471 | +--enable-silent-rules' sets the default to minimal output, which can be |
1472 | +overridden with `make V=1'; while running `./configure |
1473 | +--disable-silent-rules' sets the default to verbose, which can be |
1474 | +overridden with `make V=0'. |
1475 | + |
1476 | +Particular systems |
1477 | +================== |
1478 | + |
1479 | + On HP-UX, the default C compiler is not ANSI C compatible. If GNU |
1480 | +CC is not installed, it is recommended to use the following options in |
1481 | +order to use an ANSI C compiler: |
1482 | + |
1483 | + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" |
1484 | + |
1485 | +and if that doesn't work, install pre-built binaries of GCC for HP-UX. |
1486 | + |
1487 | + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot |
1488 | +parse its `<wchar.h>' header file. The option `-nodtk' can be used as |
1489 | +a workaround. If GNU CC is not installed, it is therefore recommended |
1490 | +to try |
1491 | + |
1492 | + ./configure CC="cc" |
1493 | + |
1494 | +and if that doesn't work, try |
1495 | + |
1496 | + ./configure CC="cc -nodtk" |
1497 | + |
1498 | + On Solaris, don't put `/usr/ucb' early in your `PATH'. This |
1499 | +directory contains several dysfunctional programs; working variants of |
1500 | +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' |
1501 | +in your `PATH', put it _after_ `/usr/bin'. |
1502 | + |
1503 | + On Haiku, software installed for all users goes in `/boot/common', |
1504 | +not `/usr/local'. It is recommended to use the following options: |
1505 | + |
1506 | + ./configure --prefix=/boot/common |
1507 | + |
1508 | Specifying the System Type |
1509 | ========================== |
1510 | |
1511 | @@ -149,14 +262,15 @@ |
1512 | |
1513 | where SYSTEM can have one of these forms: |
1514 | |
1515 | - OS KERNEL-OS |
1516 | + OS |
1517 | + KERNEL-OS |
1518 | |
1519 | See the file `config.sub' for the possible values of each field. If |
1520 | `config.sub' isn't included in this package, then this package doesn't |
1521 | need to know the machine type. |
1522 | |
1523 | If you are _building_ compiler tools for cross-compiling, you should |
1524 | -use the `--target=TYPE' option to select the type of system they will |
1525 | +use the option `--target=TYPE' to select the type of system they will |
1526 | produce code for. |
1527 | |
1528 | If you want to _use_ a cross compiler, that generates code for a |
1529 | @@ -186,9 +300,14 @@ |
1530 | |
1531 | ./configure CC=/usr/local2/bin/gcc |
1532 | |
1533 | -will cause the specified gcc to be used as the C compiler (unless it is |
1534 | +causes the specified `gcc' to be used as the C compiler (unless it is |
1535 | overridden in the site shell script). |
1536 | |
1537 | +Unfortunately, this technique does not work for `CONFIG_SHELL' due to |
1538 | +an Autoconf bug. Until the bug is fixed you can use this workaround: |
1539 | + |
1540 | + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash |
1541 | + |
1542 | `configure' Invocation |
1543 | ====================== |
1544 | |
1545 | @@ -197,7 +316,14 @@ |
1546 | |
1547 | `--help' |
1548 | `-h' |
1549 | - Print a summary of the options to `configure', and exit. |
1550 | + Print a summary of all of the options to `configure', and exit. |
1551 | + |
1552 | +`--help=short' |
1553 | +`--help=recursive' |
1554 | + Print a summary of the options unique to this package's |
1555 | + `configure', and exit. The `short' variant lists options used |
1556 | + only in the top level, while the `recursive' variant lists options |
1557 | + also present in any nested packages. |
1558 | |
1559 | `--version' |
1560 | `-V' |
1561 | @@ -224,6 +350,16 @@ |
1562 | Look for the package's source code in directory DIR. Usually |
1563 | `configure' can determine that directory automatically. |
1564 | |
1565 | +`--prefix=DIR' |
1566 | + Use DIR as the installation prefix. *note Installation Names:: |
1567 | + for more details, including other options available for fine-tuning |
1568 | + the installation locations. |
1569 | + |
1570 | +`--no-create' |
1571 | +`-n' |
1572 | + Run the configure checks, but stop before creating any output |
1573 | + files. |
1574 | + |
1575 | `configure' also accepts some other, not widely useful, options. Run |
1576 | `configure --help' for more details. |
1577 | |
1578 | |
1579 | === added file 'Makefile' |
1580 | --- Makefile 1970-01-01 00:00:00 +0000 |
1581 | +++ Makefile 2013-07-16 03:35:32 +0000 |
1582 | @@ -0,0 +1,998 @@ |
1583 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. |
1584 | +# Makefile. Generated from Makefile.in by configure. |
1585 | + |
1586 | +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
1587 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
1588 | +# Inc. |
1589 | +# This Makefile.in is free software; the Free Software Foundation |
1590 | +# gives unlimited permission to copy and/or distribute it, |
1591 | +# with or without modifications, as long as this notice is preserved. |
1592 | + |
1593 | +# This program is distributed in the hope that it will be useful, |
1594 | +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without |
1595 | +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
1596 | +# PARTICULAR PURPOSE. |
1597 | + |
1598 | + |
1599 | + |
1600 | + |
1601 | + |
1602 | + |
1603 | +pkgdatadir = $(datadir)/json-c |
1604 | +pkgincludedir = $(includedir)/json-c |
1605 | +pkglibdir = $(libdir)/json-c |
1606 | +pkglibexecdir = $(libexecdir)/json-c |
1607 | +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
1608 | +install_sh_DATA = $(install_sh) -c -m 644 |
1609 | +install_sh_PROGRAM = $(install_sh) -c |
1610 | +install_sh_SCRIPT = $(install_sh) -c |
1611 | +INSTALL_HEADER = $(INSTALL_DATA) |
1612 | +transform = $(program_transform_name) |
1613 | +NORMAL_INSTALL = : |
1614 | +PRE_INSTALL = : |
1615 | +POST_INSTALL = : |
1616 | +NORMAL_UNINSTALL = : |
1617 | +PRE_UNINSTALL = : |
1618 | +POST_UNINSTALL = : |
1619 | +build_triplet = i386-unknown-netbsdelf6.0.1 |
1620 | +host_triplet = i386-unknown-netbsdelf6.0.1 |
1621 | +DIST_COMMON = README $(am__configure_deps) $(libjson_cinclude_HEADERS) \ |
1622 | + $(srcdir)/Makefile.am $(srcdir)/Makefile.am.inc \ |
1623 | + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
1624 | + $(srcdir)/json-c-uninstalled.pc.in $(srcdir)/json-c.pc.in \ |
1625 | + $(srcdir)/json.pc.in $(srcdir)/json_config.h.in \ |
1626 | + $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ |
1627 | + config.guess config.sub depcomp install-sh ltmain.sh missing |
1628 | +am__append_1 = libjson.la |
1629 | +am__append_2 = json.pc |
1630 | +subdir = . |
1631 | +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1632 | +am__aclocal_m4_deps = $(top_srcdir)/configure.in |
1633 | +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1634 | + $(ACLOCAL_M4) |
1635 | +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
1636 | + configure.lineno config.status.lineno |
1637 | +mkinstalldirs = $(install_sh) -d |
1638 | +CONFIG_HEADER = config.h json_config.h |
1639 | +CONFIG_CLEAN_FILES = json.pc json-c.pc json-c-uninstalled.pc |
1640 | +CONFIG_CLEAN_VPATH_FILES = |
1641 | +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
1642 | +am__vpath_adj = case $$p in \ |
1643 | + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
1644 | + *) f=$$p;; \ |
1645 | + esac; |
1646 | +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; |
1647 | +am__install_max = 40 |
1648 | +am__nobase_strip_setup = \ |
1649 | + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` |
1650 | +am__nobase_strip = \ |
1651 | + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" |
1652 | +am__nobase_list = $(am__nobase_strip_setup); \ |
1653 | + for p in $$list; do echo "$$p $$p"; done | \ |
1654 | + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ |
1655 | + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ |
1656 | + if (++n[$$2] == $(am__install_max)) \ |
1657 | + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ |
1658 | + END { for (dir in files) print dir, files[dir] }' |
1659 | +am__base_list = \ |
1660 | + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
1661 | + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
1662 | +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \ |
1663 | + "$(DESTDIR)$(libjson_cincludedir)" |
1664 | +LTLIBRARIES = $(lib_LTLIBRARIES) |
1665 | +libjson_c_la_LIBADD = |
1666 | +am_libjson_c_la_OBJECTS = arraylist.lo debug.lo json_c_version.lo \ |
1667 | + json_object.lo json_object_iterator.lo json_tokener.lo \ |
1668 | + json_util.lo linkhash.lo printbuf.lo |
1669 | +libjson_c_la_OBJECTS = $(am_libjson_c_la_OBJECTS) |
1670 | +libjson_c_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ |
1671 | + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
1672 | + $(libjson_c_la_LDFLAGS) $(LDFLAGS) -o $@ |
1673 | +libjson_la_DEPENDENCIES = |
1674 | +libjson_la_SOURCES = libjson.c |
1675 | +libjson_la_OBJECTS = libjson.lo |
1676 | +libjson_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ |
1677 | + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
1678 | + $(libjson_la_LDFLAGS) $(LDFLAGS) -o $@ |
1679 | +am_libjson_la_rpath = -rpath $(libdir) |
1680 | +DEFAULT_INCLUDES = -I. |
1681 | +depcomp = $(SHELL) $(top_srcdir)/depcomp |
1682 | +am__depfiles_maybe = depfiles |
1683 | +am__mv = mv -f |
1684 | +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
1685 | + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
1686 | +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ |
1687 | + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ |
1688 | + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
1689 | +CCLD = $(CC) |
1690 | +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ |
1691 | + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ |
1692 | + $(LDFLAGS) -o $@ |
1693 | +SOURCES = $(libjson_c_la_SOURCES) libjson.c |
1694 | +DIST_SOURCES = $(libjson_c_la_SOURCES) libjson.c |
1695 | +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
1696 | + html-recursive info-recursive install-data-recursive \ |
1697 | + install-dvi-recursive install-exec-recursive \ |
1698 | + install-html-recursive install-info-recursive \ |
1699 | + install-pdf-recursive install-ps-recursive install-recursive \ |
1700 | + installcheck-recursive installdirs-recursive pdf-recursive \ |
1701 | + ps-recursive uninstall-recursive |
1702 | +DATA = $(pkgconfig_DATA) |
1703 | +HEADERS = $(libjson_cinclude_HEADERS) |
1704 | +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
1705 | + distclean-recursive maintainer-clean-recursive |
1706 | +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
1707 | + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
1708 | + distdir dist dist-all distcheck |
1709 | +ETAGS = etags |
1710 | +CTAGS = ctags |
1711 | +DIST_SUBDIRS = $(SUBDIRS) |
1712 | +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
1713 | +distdir = $(PACKAGE)-$(VERSION) |
1714 | +top_distdir = $(distdir) |
1715 | +am__remove_distdir = \ |
1716 | + { test ! -d "$(distdir)" \ |
1717 | + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
1718 | + && rm -fr "$(distdir)"; }; } |
1719 | +am__relativize = \ |
1720 | + dir0=`pwd`; \ |
1721 | + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
1722 | + sed_rest='s,^[^/]*/*,,'; \ |
1723 | + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ |
1724 | + sed_butlast='s,/*[^/]*$$,,'; \ |
1725 | + while test -n "$$dir1"; do \ |
1726 | + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ |
1727 | + if test "$$first" != "."; then \ |
1728 | + if test "$$first" = ".."; then \ |
1729 | + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ |
1730 | + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ |
1731 | + else \ |
1732 | + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ |
1733 | + if test "$$first2" = "$$first"; then \ |
1734 | + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ |
1735 | + else \ |
1736 | + dir2="../$$dir2"; \ |
1737 | + fi; \ |
1738 | + dir0="$$dir0"/"$$first"; \ |
1739 | + fi; \ |
1740 | + fi; \ |
1741 | + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ |
1742 | + done; \ |
1743 | + reldir="$$dir2" |
1744 | +DIST_ARCHIVES = $(distdir).tar.gz |
1745 | +GZIP_ENV = --best |
1746 | +distuninstallcheck_listfiles = find . -type f -print |
1747 | +distcleancheck_listfiles = find . -type f -print |
1748 | +ACLOCAL = ${SHELL} /home/erh/json-c/json-c-0.11/missing --run aclocal-1.11 |
1749 | +AMTAR = ${SHELL} /home/erh/json-c/json-c-0.11/missing --run tar |
1750 | +AR = ar |
1751 | +AUTOCONF = ${SHELL} /home/erh/json-c/json-c-0.11/missing --run autoconf |
1752 | +AUTOHEADER = ${SHELL} /home/erh/json-c/json-c-0.11/missing --run autoheader |
1753 | +AUTOMAKE = ${SHELL} /home/erh/json-c/json-c-0.11/missing --run automake-1.11 |
1754 | +AWK = awk |
1755 | +CC = gcc |
1756 | +CCDEPMODE = depmode=gcc3 |
1757 | +CFLAGS = -g -O2 |
1758 | +CPP = gcc -E |
1759 | +CPPFLAGS = |
1760 | +CYGPATH_W = echo |
1761 | +DEFS = -DHAVE_CONFIG_H |
1762 | +DEPDIR = .deps |
1763 | +DSYMUTIL = |
1764 | +DUMPBIN = |
1765 | +ECHO_C = |
1766 | +ECHO_N = -n |
1767 | +ECHO_T = |
1768 | +EGREP = /usr/bin/grep -E |
1769 | +EXEEXT = |
1770 | +FGREP = /usr/bin/grep -F |
1771 | +GREP = /usr/bin/grep |
1772 | +INSTALL = /usr/bin/install -c |
1773 | +INSTALL_DATA = ${INSTALL} -m 644 |
1774 | +INSTALL_PROGRAM = ${INSTALL} |
1775 | +INSTALL_SCRIPT = ${INSTALL} |
1776 | +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s |
1777 | +LD = /usr/bin/ld |
1778 | +LDFLAGS = |
1779 | +LIBOBJS = |
1780 | +LIBS = |
1781 | +LIBTOOL = $(SHELL) $(top_builddir)/libtool |
1782 | +LIPO = |
1783 | +LN_S = ln -s |
1784 | +LTLIBOBJS = |
1785 | +MAKEINFO = ${SHELL} /home/erh/json-c/json-c-0.11/missing --run makeinfo |
1786 | +MKDIR_P = ./install-sh -c -d |
1787 | +NM = /usr/bin/nm -B |
1788 | +NMEDIT = |
1789 | +OBJDUMP = objdump |
1790 | +OBJEXT = o |
1791 | +OTOOL = |
1792 | +OTOOL64 = |
1793 | +PACKAGE = json-c |
1794 | +PACKAGE_BUGREPORT = json-c@googlegroups.com |
1795 | +PACKAGE_NAME = json-c |
1796 | +PACKAGE_STRING = json-c 0.11 |
1797 | +PACKAGE_TARNAME = json-c |
1798 | +PACKAGE_URL = |
1799 | +PACKAGE_VERSION = 0.11 |
1800 | +PATH_SEPARATOR = : |
1801 | +RANLIB = ranlib |
1802 | +SED = /usr/bin/sed |
1803 | +SET_MAKE = |
1804 | +SHELL = /bin/ksh |
1805 | +STRIP = strip |
1806 | +VERSION = 0.11 |
1807 | +abs_builddir = /home/erh/json-c/json-c-0.11 |
1808 | +abs_srcdir = /home/erh/json-c/json-c-0.11 |
1809 | +abs_top_builddir = /home/erh/json-c/json-c-0.11 |
1810 | +abs_top_srcdir = /home/erh/json-c/json-c-0.11 |
1811 | +ac_ct_CC = gcc |
1812 | +ac_ct_DUMPBIN = |
1813 | +am__include = include |
1814 | +am__leading_dot = . |
1815 | +am__quote = |
1816 | +am__tar = ${AMTAR} chof - "$$tardir" |
1817 | +am__untar = ${AMTAR} xf - |
1818 | +bindir = ${exec_prefix}/bin |
1819 | +build = i386-unknown-netbsdelf6.0.1 |
1820 | +build_alias = |
1821 | +build_cpu = i386 |
1822 | +build_os = netbsdelf6.0.1 |
1823 | +build_vendor = unknown |
1824 | +builddir = . |
1825 | +datadir = ${datarootdir} |
1826 | +datarootdir = ${prefix}/share |
1827 | +docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} |
1828 | +dvidir = ${docdir} |
1829 | +exec_prefix = ${prefix} |
1830 | +host = i386-unknown-netbsdelf6.0.1 |
1831 | +host_alias = |
1832 | +host_cpu = i386 |
1833 | +host_os = netbsdelf6.0.1 |
1834 | +host_vendor = unknown |
1835 | +htmldir = ${docdir} |
1836 | +includedir = ${prefix}/include |
1837 | +infodir = ${datarootdir}/info |
1838 | +install_sh = ${SHELL} /home/erh/json-c/json-c-0.11/install-sh |
1839 | +libdir = ${exec_prefix}/lib |
1840 | +libexecdir = ${exec_prefix}/libexec |
1841 | +localedir = ${datarootdir}/locale |
1842 | +localstatedir = ${prefix}/var |
1843 | +lt_ECHO = /bin/echo |
1844 | +mandir = ${datarootdir}/man |
1845 | +mkdir_p = $(top_builddir)/./install-sh -c -d |
1846 | +oldincludedir = /usr/include |
1847 | +pdfdir = ${docdir} |
1848 | +prefix = /home/erh/json-c/jci11 |
1849 | +program_transform_name = s,x,x, |
1850 | +psdir = ${docdir} |
1851 | +sbindir = ${exec_prefix}/sbin |
1852 | +sharedstatedir = ${prefix}/com |
1853 | +srcdir = . |
1854 | +sysconfdir = ${prefix}/etc |
1855 | +target_alias = |
1856 | +top_build_prefix = |
1857 | +top_builddir = . |
1858 | +top_srcdir = . |
1859 | +AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT |
1860 | +EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj |
1861 | +SUBDIRS = . tests |
1862 | +lib_LTLIBRARIES = libjson-c.la $(am__append_1) |
1863 | +pkgconfigdir = $(libdir)/pkgconfig |
1864 | +pkgconfig_DATA = json-c.pc $(am__append_2) |
1865 | +libjson_cincludedir = $(includedir)/json-c |
1866 | +libjson_cinclude_HEADERS = \ |
1867 | + arraylist.h \ |
1868 | + bits.h \ |
1869 | + debug.h \ |
1870 | + json.h \ |
1871 | + json_config.h \ |
1872 | + json_c_version.h \ |
1873 | + json_inttypes.h \ |
1874 | + json_object.h \ |
1875 | + json_object_iterator.h \ |
1876 | + json_object_private.h \ |
1877 | + json_tokener.h \ |
1878 | + json_util.h \ |
1879 | + linkhash.h \ |
1880 | + printbuf.h |
1881 | + |
1882 | + |
1883 | +#libjsonx_includedir = $(libdir)/json-c-0.11 |
1884 | +# |
1885 | +#libjsonx_include_HEADERS = \ |
1886 | +# json_config.h |
1887 | +libjson_c_la_LDFLAGS = -version-info 2:1:0 -no-undefined |
1888 | +libjson_la_LDFLAGS = -version-info 1:0:1 -no-undefined -ljson-c |
1889 | + |
1890 | +# Temporary libjson library. This will be removed after one release. |
1891 | +libjson_la_LIBADD = -ljson-c |
1892 | +libjson_c_la_SOURCES = \ |
1893 | + arraylist.c \ |
1894 | + debug.c \ |
1895 | + json_c_version.c \ |
1896 | + json_object.c \ |
1897 | + json_object_iterator.c \ |
1898 | + json_tokener.c \ |
1899 | + json_util.c \ |
1900 | + linkhash.c \ |
1901 | + printbuf.c |
1902 | + |
1903 | +ANDROID_CFLAGS = -I$(top_srcdir) -DHAVE_CONFIG_H |
1904 | +all: config.h json_config.h |
1905 | + $(MAKE) $(AM_MAKEFLAGS) all-recursive |
1906 | + |
1907 | +.SUFFIXES: |
1908 | +.SUFFIXES: .c .lo .o .obj |
1909 | +am--refresh: |
1910 | + @: |
1911 | +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/Makefile.am.inc $(am__configure_deps) |
1912 | + @for dep in $?; do \ |
1913 | + case '$(am__configure_deps)' in \ |
1914 | + *$$dep*) \ |
1915 | + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ |
1916 | + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ |
1917 | + && exit 0; \ |
1918 | + exit 1;; \ |
1919 | + esac; \ |
1920 | + done; \ |
1921 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ |
1922 | + $(am__cd) $(top_srcdir) && \ |
1923 | + $(AUTOMAKE) --gnu Makefile |
1924 | +.PRECIOUS: Makefile |
1925 | +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
1926 | + @case '$?' in \ |
1927 | + *config.status*) \ |
1928 | + echo ' $(SHELL) ./config.status'; \ |
1929 | + $(SHELL) ./config.status;; \ |
1930 | + *) \ |
1931 | + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ |
1932 | + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ |
1933 | + esac; |
1934 | + |
1935 | +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
1936 | + $(SHELL) ./config.status --recheck |
1937 | + |
1938 | +$(top_srcdir)/configure: $(am__configure_deps) |
1939 | + $(am__cd) $(srcdir) && $(AUTOCONF) |
1940 | +$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
1941 | + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
1942 | +$(am__aclocal_m4_deps): |
1943 | + |
1944 | +config.h: stamp-h1 |
1945 | + @if test ! -f $@; then \ |
1946 | + rm -f stamp-h1; \ |
1947 | + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ |
1948 | + else :; fi |
1949 | + |
1950 | +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
1951 | + @rm -f stamp-h1 |
1952 | + cd $(top_builddir) && $(SHELL) ./config.status config.h |
1953 | +$(srcdir)/config.h.in: $(am__configure_deps) |
1954 | + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) |
1955 | + rm -f stamp-h1 |
1956 | + touch $@ |
1957 | + |
1958 | +json_config.h: stamp-h2 |
1959 | + @if test ! -f $@; then \ |
1960 | + rm -f stamp-h2; \ |
1961 | + $(MAKE) $(AM_MAKEFLAGS) stamp-h2; \ |
1962 | + else :; fi |
1963 | + |
1964 | +stamp-h2: $(srcdir)/json_config.h.in $(top_builddir)/config.status |
1965 | + @rm -f stamp-h2 |
1966 | + cd $(top_builddir) && $(SHELL) ./config.status json_config.h |
1967 | + |
1968 | +distclean-hdr: |
1969 | + -rm -f config.h stamp-h1 json_config.h stamp-h2 |
1970 | +json.pc: $(top_builddir)/config.status $(srcdir)/json.pc.in |
1971 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
1972 | +json-c.pc: $(top_builddir)/config.status $(srcdir)/json-c.pc.in |
1973 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
1974 | +json-c-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/json-c-uninstalled.pc.in |
1975 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
1976 | +install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
1977 | + @$(NORMAL_INSTALL) |
1978 | + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" |
1979 | + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ |
1980 | + list2=; for p in $$list; do \ |
1981 | + if test -f $$p; then \ |
1982 | + list2="$$list2 $$p"; \ |
1983 | + else :; fi; \ |
1984 | + done; \ |
1985 | + test -z "$$list2" || { \ |
1986 | + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ |
1987 | + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ |
1988 | + } |
1989 | + |
1990 | +uninstall-libLTLIBRARIES: |
1991 | + @$(NORMAL_UNINSTALL) |
1992 | + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ |
1993 | + for p in $$list; do \ |
1994 | + $(am__strip_dir) \ |
1995 | + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ |
1996 | + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ |
1997 | + done |
1998 | + |
1999 | +clean-libLTLIBRARIES: |
2000 | + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) |
2001 | + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ |
2002 | + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ |
2003 | + test "$$dir" != "$$p" || dir=.; \ |
2004 | + echo "rm -f \"$${dir}/so_locations\""; \ |
2005 | + rm -f "$${dir}/so_locations"; \ |
2006 | + done |
2007 | +libjson-c.la: $(libjson_c_la_OBJECTS) $(libjson_c_la_DEPENDENCIES) |
2008 | + $(libjson_c_la_LINK) -rpath $(libdir) $(libjson_c_la_OBJECTS) $(libjson_c_la_LIBADD) $(LIBS) |
2009 | +libjson.la: $(libjson_la_OBJECTS) $(libjson_la_DEPENDENCIES) |
2010 | + $(libjson_la_LINK) $(am_libjson_la_rpath) $(libjson_la_OBJECTS) $(libjson_la_LIBADD) $(LIBS) |
2011 | + |
2012 | +mostlyclean-compile: |
2013 | + -rm -f *.$(OBJEXT) |
2014 | + |
2015 | +distclean-compile: |
2016 | + -rm -f *.tab.c |
2017 | + |
2018 | +include ./$(DEPDIR)/arraylist.Plo |
2019 | +include ./$(DEPDIR)/debug.Plo |
2020 | +include ./$(DEPDIR)/json_c_version.Plo |
2021 | +include ./$(DEPDIR)/json_object.Plo |
2022 | +include ./$(DEPDIR)/json_object_iterator.Plo |
2023 | +include ./$(DEPDIR)/json_tokener.Plo |
2024 | +include ./$(DEPDIR)/json_util.Plo |
2025 | +include ./$(DEPDIR)/libjson.Plo |
2026 | +include ./$(DEPDIR)/linkhash.Plo |
2027 | +include ./$(DEPDIR)/printbuf.Plo |
2028 | + |
2029 | +.c.o: |
2030 | + $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
2031 | + $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
2032 | +# source='$<' object='$@' libtool=no \ |
2033 | +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ |
2034 | +# $(COMPILE) -c $< |
2035 | + |
2036 | +.c.obj: |
2037 | + $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` |
2038 | + $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
2039 | +# source='$<' object='$@' libtool=no \ |
2040 | +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ |
2041 | +# $(COMPILE) -c `$(CYGPATH_W) '$<'` |
2042 | + |
2043 | +.c.lo: |
2044 | + $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
2045 | + $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo |
2046 | +# source='$<' object='$@' libtool=yes \ |
2047 | +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ |
2048 | +# $(LTCOMPILE) -c -o $@ $< |
2049 | + |
2050 | +mostlyclean-libtool: |
2051 | + -rm -f *.lo |
2052 | + |
2053 | +clean-libtool: |
2054 | + -rm -rf .libs _libs |
2055 | + |
2056 | +distclean-libtool: |
2057 | + -rm -f libtool config.lt |
2058 | +install-pkgconfigDATA: $(pkgconfig_DATA) |
2059 | + @$(NORMAL_INSTALL) |
2060 | + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" |
2061 | + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
2062 | + for p in $$list; do \ |
2063 | + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
2064 | + echo "$$d$$p"; \ |
2065 | + done | $(am__base_list) | \ |
2066 | + while read files; do \ |
2067 | + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ |
2068 | + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ |
2069 | + done |
2070 | + |
2071 | +uninstall-pkgconfigDATA: |
2072 | + @$(NORMAL_UNINSTALL) |
2073 | + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
2074 | + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
2075 | + test -n "$$files" || exit 0; \ |
2076 | + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ |
2077 | + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files |
2078 | +install-libjson_cincludeHEADERS: $(libjson_cinclude_HEADERS) |
2079 | + @$(NORMAL_INSTALL) |
2080 | + test -z "$(libjson_cincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libjson_cincludedir)" |
2081 | + @list='$(libjson_cinclude_HEADERS)'; test -n "$(libjson_cincludedir)" || list=; \ |
2082 | + for p in $$list; do \ |
2083 | + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
2084 | + echo "$$d$$p"; \ |
2085 | + done | $(am__base_list) | \ |
2086 | + while read files; do \ |
2087 | + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libjson_cincludedir)'"; \ |
2088 | + $(INSTALL_HEADER) $$files "$(DESTDIR)$(libjson_cincludedir)" || exit $$?; \ |
2089 | + done |
2090 | + |
2091 | +uninstall-libjson_cincludeHEADERS: |
2092 | + @$(NORMAL_UNINSTALL) |
2093 | + @list='$(libjson_cinclude_HEADERS)'; test -n "$(libjson_cincludedir)" || list=; \ |
2094 | + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
2095 | + test -n "$$files" || exit 0; \ |
2096 | + echo " ( cd '$(DESTDIR)$(libjson_cincludedir)' && rm -f" $$files ")"; \ |
2097 | + cd "$(DESTDIR)$(libjson_cincludedir)" && rm -f $$files |
2098 | + |
2099 | +# This directory's subdirectories are mostly independent; you can cd |
2100 | +# into them and run `make' without going through this Makefile. |
2101 | +# To change the values of `make' variables: instead of editing Makefiles, |
2102 | +# (1) if the variable is set in `config.status', edit `config.status' |
2103 | +# (which will cause the Makefiles to be regenerated when you run `make'); |
2104 | +# (2) otherwise, pass the desired values on the `make' command line. |
2105 | +$(RECURSIVE_TARGETS): |
2106 | + @fail= failcom='exit 1'; \ |
2107 | + for f in x $$MAKEFLAGS; do \ |
2108 | + case $$f in \ |
2109 | + *=* | --[!k]*);; \ |
2110 | + *k*) failcom='fail=yes';; \ |
2111 | + esac; \ |
2112 | + done; \ |
2113 | + dot_seen=no; \ |
2114 | + target=`echo $@ | sed s/-recursive//`; \ |
2115 | + list='$(SUBDIRS)'; for subdir in $$list; do \ |
2116 | + echo "Making $$target in $$subdir"; \ |
2117 | + if test "$$subdir" = "."; then \ |
2118 | + dot_seen=yes; \ |
2119 | + local_target="$$target-am"; \ |
2120 | + else \ |
2121 | + local_target="$$target"; \ |
2122 | + fi; \ |
2123 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
2124 | + || eval $$failcom; \ |
2125 | + done; \ |
2126 | + if test "$$dot_seen" = "no"; then \ |
2127 | + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
2128 | + fi; test -z "$$fail" |
2129 | + |
2130 | +$(RECURSIVE_CLEAN_TARGETS): |
2131 | + @fail= failcom='exit 1'; \ |
2132 | + for f in x $$MAKEFLAGS; do \ |
2133 | + case $$f in \ |
2134 | + *=* | --[!k]*);; \ |
2135 | + *k*) failcom='fail=yes';; \ |
2136 | + esac; \ |
2137 | + done; \ |
2138 | + dot_seen=no; \ |
2139 | + case "$@" in \ |
2140 | + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ |
2141 | + *) list='$(SUBDIRS)' ;; \ |
2142 | + esac; \ |
2143 | + rev=''; for subdir in $$list; do \ |
2144 | + if test "$$subdir" = "."; then :; else \ |
2145 | + rev="$$subdir $$rev"; \ |
2146 | + fi; \ |
2147 | + done; \ |
2148 | + rev="$$rev ."; \ |
2149 | + target=`echo $@ | sed s/-recursive//`; \ |
2150 | + for subdir in $$rev; do \ |
2151 | + echo "Making $$target in $$subdir"; \ |
2152 | + if test "$$subdir" = "."; then \ |
2153 | + local_target="$$target-am"; \ |
2154 | + else \ |
2155 | + local_target="$$target"; \ |
2156 | + fi; \ |
2157 | + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
2158 | + || eval $$failcom; \ |
2159 | + done && test -z "$$fail" |
2160 | +tags-recursive: |
2161 | + list='$(SUBDIRS)'; for subdir in $$list; do \ |
2162 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
2163 | + done |
2164 | +ctags-recursive: |
2165 | + list='$(SUBDIRS)'; for subdir in $$list; do \ |
2166 | + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
2167 | + done |
2168 | + |
2169 | +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
2170 | + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
2171 | + unique=`for i in $$list; do \ |
2172 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
2173 | + done | \ |
2174 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
2175 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
2176 | + mkid -fID $$unique |
2177 | +tags: TAGS |
2178 | + |
2179 | +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in json_config.h.in $(TAGS_DEPENDENCIES) \ |
2180 | + $(TAGS_FILES) $(LISP) |
2181 | + set x; \ |
2182 | + here=`pwd`; \ |
2183 | + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
2184 | + include_option=--etags-include; \ |
2185 | + empty_fix=.; \ |
2186 | + else \ |
2187 | + include_option=--include; \ |
2188 | + empty_fix=; \ |
2189 | + fi; \ |
2190 | + list='$(SUBDIRS)'; for subdir in $$list; do \ |
2191 | + if test "$$subdir" = .; then :; else \ |
2192 | + test ! -f $$subdir/TAGS || \ |
2193 | + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
2194 | + fi; \ |
2195 | + done; \ |
2196 | + list='$(SOURCES) $(HEADERS) config.h.in json_config.h.in $(LISP) $(TAGS_FILES)'; \ |
2197 | + unique=`for i in $$list; do \ |
2198 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
2199 | + done | \ |
2200 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
2201 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
2202 | + shift; \ |
2203 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
2204 | + test -n "$$unique" || unique=$$empty_fix; \ |
2205 | + if test $$# -gt 0; then \ |
2206 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
2207 | + "$$@" $$unique; \ |
2208 | + else \ |
2209 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
2210 | + $$unique; \ |
2211 | + fi; \ |
2212 | + fi |
2213 | +ctags: CTAGS |
2214 | +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in json_config.h.in $(TAGS_DEPENDENCIES) \ |
2215 | + $(TAGS_FILES) $(LISP) |
2216 | + list='$(SOURCES) $(HEADERS) config.h.in json_config.h.in $(LISP) $(TAGS_FILES)'; \ |
2217 | + unique=`for i in $$list; do \ |
2218 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
2219 | + done | \ |
2220 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
2221 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
2222 | + test -z "$(CTAGS_ARGS)$$unique" \ |
2223 | + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
2224 | + $$unique |
2225 | + |
2226 | +GTAGS: |
2227 | + here=`$(am__cd) $(top_builddir) && pwd` \ |
2228 | + && $(am__cd) $(top_srcdir) \ |
2229 | + && gtags -i $(GTAGS_ARGS) "$$here" |
2230 | + |
2231 | +distclean-tags: |
2232 | + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
2233 | + |
2234 | +distdir: $(DISTFILES) |
2235 | + $(am__remove_distdir) |
2236 | + test -d "$(distdir)" || mkdir "$(distdir)" |
2237 | + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
2238 | + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
2239 | + list='$(DISTFILES)'; \ |
2240 | + dist_files=`for file in $$list; do echo $$file; done | \ |
2241 | + sed -e "s|^$$srcdirstrip/||;t" \ |
2242 | + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ |
2243 | + case $$dist_files in \ |
2244 | + */*) $(MKDIR_P) `echo "$$dist_files" | \ |
2245 | + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ |
2246 | + sort -u` ;; \ |
2247 | + esac; \ |
2248 | + for file in $$dist_files; do \ |
2249 | + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
2250 | + if test -d $$d/$$file; then \ |
2251 | + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ |
2252 | + if test -d "$(distdir)/$$file"; then \ |
2253 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
2254 | + fi; \ |
2255 | + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ |
2256 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ |
2257 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
2258 | + fi; \ |
2259 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ |
2260 | + else \ |
2261 | + test -f "$(distdir)/$$file" \ |
2262 | + || cp -p $$d/$$file "$(distdir)/$$file" \ |
2263 | + || exit 1; \ |
2264 | + fi; \ |
2265 | + done |
2266 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
2267 | + if test "$$subdir" = .; then :; else \ |
2268 | + test -d "$(distdir)/$$subdir" \ |
2269 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
2270 | + || exit 1; \ |
2271 | + fi; \ |
2272 | + done |
2273 | + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
2274 | + if test "$$subdir" = .; then :; else \ |
2275 | + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
2276 | + $(am__relativize); \ |
2277 | + new_distdir=$$reldir; \ |
2278 | + dir1=$$subdir; dir2="$(top_distdir)"; \ |
2279 | + $(am__relativize); \ |
2280 | + new_top_distdir=$$reldir; \ |
2281 | + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ |
2282 | + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ |
2283 | + ($(am__cd) $$subdir && \ |
2284 | + $(MAKE) $(AM_MAKEFLAGS) \ |
2285 | + top_distdir="$$new_top_distdir" \ |
2286 | + distdir="$$new_distdir" \ |
2287 | + am__remove_distdir=: \ |
2288 | + am__skip_length_check=: \ |
2289 | + am__skip_mode_fix=: \ |
2290 | + distdir) \ |
2291 | + || exit 1; \ |
2292 | + fi; \ |
2293 | + done |
2294 | + -test -n "$(am__skip_mode_fix)" \ |
2295 | + || find "$(distdir)" -type d ! -perm -755 \ |
2296 | + -exec chmod u+rwx,go+rx {} \; -o \ |
2297 | + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ |
2298 | + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ |
2299 | + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ |
2300 | + || chmod -R a+r "$(distdir)" |
2301 | +dist-gzip: distdir |
2302 | + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
2303 | + $(am__remove_distdir) |
2304 | + |
2305 | +dist-bzip2: distdir |
2306 | + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
2307 | + $(am__remove_distdir) |
2308 | + |
2309 | +dist-lzma: distdir |
2310 | + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma |
2311 | + $(am__remove_distdir) |
2312 | + |
2313 | +dist-xz: distdir |
2314 | + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
2315 | + $(am__remove_distdir) |
2316 | + |
2317 | +dist-tarZ: distdir |
2318 | + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
2319 | + $(am__remove_distdir) |
2320 | + |
2321 | +dist-shar: distdir |
2322 | + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
2323 | + $(am__remove_distdir) |
2324 | + |
2325 | +dist-zip: distdir |
2326 | + -rm -f $(distdir).zip |
2327 | + zip -rq $(distdir).zip $(distdir) |
2328 | + $(am__remove_distdir) |
2329 | + |
2330 | +dist dist-all: distdir |
2331 | + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz |
2332 | + $(am__remove_distdir) |
2333 | + |
2334 | +# This target untars the dist file and tries a VPATH configuration. Then |
2335 | +# it guarantees that the distribution is self-contained by making another |
2336 | +# tarfile. |
2337 | +distcheck: dist |
2338 | + case '$(DIST_ARCHIVES)' in \ |
2339 | + *.tar.gz*) \ |
2340 | + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ |
2341 | + *.tar.bz2*) \ |
2342 | + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
2343 | + *.tar.lzma*) \ |
2344 | + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
2345 | + *.tar.xz*) \ |
2346 | + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
2347 | + *.tar.Z*) \ |
2348 | + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ |
2349 | + *.shar.gz*) \ |
2350 | + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ |
2351 | + *.zip*) \ |
2352 | + unzip $(distdir).zip ;;\ |
2353 | + esac |
2354 | + chmod -R a-w $(distdir); chmod a+w $(distdir) |
2355 | + mkdir $(distdir)/_build |
2356 | + mkdir $(distdir)/_inst |
2357 | + chmod a-w $(distdir) |
2358 | + test -d $(distdir)/_build || exit 0; \ |
2359 | + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
2360 | + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
2361 | + && am__cwd=`pwd` \ |
2362 | + && $(am__cd) $(distdir)/_build \ |
2363 | + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
2364 | + $(DISTCHECK_CONFIGURE_FLAGS) \ |
2365 | + && $(MAKE) $(AM_MAKEFLAGS) \ |
2366 | + && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
2367 | + && $(MAKE) $(AM_MAKEFLAGS) check \ |
2368 | + && $(MAKE) $(AM_MAKEFLAGS) install \ |
2369 | + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ |
2370 | + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ |
2371 | + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ |
2372 | + distuninstallcheck \ |
2373 | + && chmod -R a-w "$$dc_install_base" \ |
2374 | + && ({ \ |
2375 | + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ |
2376 | + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ |
2377 | + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ |
2378 | + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ |
2379 | + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ |
2380 | + } || { rm -rf "$$dc_destdir"; exit 1; }) \ |
2381 | + && rm -rf "$$dc_destdir" \ |
2382 | + && $(MAKE) $(AM_MAKEFLAGS) dist \ |
2383 | + && rm -rf $(DIST_ARCHIVES) \ |
2384 | + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ |
2385 | + && cd "$$am__cwd" \ |
2386 | + || exit 1 |
2387 | + $(am__remove_distdir) |
2388 | + @(echo "$(distdir) archives ready for distribution: "; \ |
2389 | + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
2390 | + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
2391 | +distuninstallcheck: |
2392 | + @$(am__cd) '$(distuninstallcheck_dir)' \ |
2393 | + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
2394 | + || { echo "ERROR: files left after uninstall:" ; \ |
2395 | + if test -n "$(DESTDIR)"; then \ |
2396 | + echo " (check DESTDIR support)"; \ |
2397 | + fi ; \ |
2398 | + $(distuninstallcheck_listfiles) ; \ |
2399 | + exit 1; } >&2 |
2400 | +distcleancheck: distclean |
2401 | + @if test '$(srcdir)' = . ; then \ |
2402 | + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ |
2403 | + exit 1 ; \ |
2404 | + fi |
2405 | + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ |
2406 | + || { echo "ERROR: files left in build directory after distclean:" ; \ |
2407 | + $(distcleancheck_listfiles) ; \ |
2408 | + exit 1; } >&2 |
2409 | +check-am: all-am |
2410 | +check: check-recursive |
2411 | +all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h \ |
2412 | + json_config.h |
2413 | +installdirs: installdirs-recursive |
2414 | +installdirs-am: |
2415 | + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libjson_cincludedir)"; do \ |
2416 | + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
2417 | + done |
2418 | +install: install-recursive |
2419 | +install-exec: install-exec-recursive |
2420 | +install-data: install-data-recursive |
2421 | +uninstall: uninstall-recursive |
2422 | + |
2423 | +install-am: all-am |
2424 | + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am |
2425 | + |
2426 | +installcheck: installcheck-recursive |
2427 | +install-strip: |
2428 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
2429 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
2430 | + `test -z '$(STRIP)' || \ |
2431 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
2432 | +mostlyclean-generic: |
2433 | + |
2434 | +clean-generic: |
2435 | + |
2436 | +distclean-generic: |
2437 | + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
2438 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) |
2439 | + |
2440 | +maintainer-clean-generic: |
2441 | + @echo "This command is intended for maintainers to use" |
2442 | + @echo "it deletes files that may require special tools to rebuild." |
2443 | +#uninstall-local: |
2444 | +#install-data-hook: |
2445 | +clean: clean-recursive |
2446 | + |
2447 | +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ |
2448 | + mostlyclean-am |
2449 | + |
2450 | +distclean: distclean-recursive |
2451 | + -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
2452 | + -rm -rf ./$(DEPDIR) |
2453 | + -rm -f Makefile |
2454 | +distclean-am: clean-am distclean-compile distclean-generic \ |
2455 | + distclean-hdr distclean-libtool distclean-local distclean-tags |
2456 | + |
2457 | +dvi: dvi-recursive |
2458 | + |
2459 | +dvi-am: |
2460 | + |
2461 | +html: html-recursive |
2462 | + |
2463 | +html-am: |
2464 | + |
2465 | +info: info-recursive |
2466 | + |
2467 | +info-am: |
2468 | + |
2469 | +install-data-am: install-libjson_cincludeHEADERS install-pkgconfigDATA |
2470 | + @$(NORMAL_INSTALL) |
2471 | + $(MAKE) $(AM_MAKEFLAGS) install-data-hook |
2472 | +install-dvi: install-dvi-recursive |
2473 | + |
2474 | +install-dvi-am: |
2475 | + |
2476 | +install-exec-am: install-libLTLIBRARIES |
2477 | + |
2478 | +install-html: install-html-recursive |
2479 | + |
2480 | +install-html-am: |
2481 | + |
2482 | +install-info: install-info-recursive |
2483 | + |
2484 | +install-info-am: |
2485 | + |
2486 | +install-man: |
2487 | + |
2488 | +install-pdf: install-pdf-recursive |
2489 | + |
2490 | +install-pdf-am: |
2491 | + |
2492 | +install-ps: install-ps-recursive |
2493 | + |
2494 | +install-ps-am: |
2495 | + |
2496 | +installcheck-am: |
2497 | + |
2498 | +maintainer-clean: maintainer-clean-recursive |
2499 | + -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
2500 | + -rm -rf $(top_srcdir)/autom4te.cache |
2501 | + -rm -rf ./$(DEPDIR) |
2502 | + -rm -f Makefile |
2503 | +maintainer-clean-am: distclean-am maintainer-clean-generic \ |
2504 | + maintainer-clean-local |
2505 | + |
2506 | +mostlyclean: mostlyclean-recursive |
2507 | + |
2508 | +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ |
2509 | + mostlyclean-libtool |
2510 | + |
2511 | +pdf: pdf-recursive |
2512 | + |
2513 | +pdf-am: |
2514 | + |
2515 | +ps: ps-recursive |
2516 | + |
2517 | +ps-am: |
2518 | + |
2519 | +uninstall-am: uninstall-libLTLIBRARIES \ |
2520 | + uninstall-libjson_cincludeHEADERS uninstall-local \ |
2521 | + uninstall-pkgconfigDATA |
2522 | + |
2523 | +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ |
2524 | + ctags-recursive install-am install-data-am install-strip \ |
2525 | + tags-recursive |
2526 | + |
2527 | +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
2528 | + all all-am am--refresh check check-am clean clean-generic \ |
2529 | + clean-libLTLIBRARIES clean-libtool ctags ctags-recursive dist \ |
2530 | + dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \ |
2531 | + dist-xz dist-zip distcheck distclean distclean-compile \ |
2532 | + distclean-generic distclean-hdr distclean-libtool \ |
2533 | + distclean-local distclean-tags distcleancheck distdir \ |
2534 | + distuninstallcheck dvi dvi-am html html-am info info-am \ |
2535 | + install install-am install-data install-data-am \ |
2536 | + install-data-hook install-dvi install-dvi-am install-exec \ |
2537 | + install-exec-am install-html install-html-am install-info \ |
2538 | + install-info-am install-libLTLIBRARIES \ |
2539 | + install-libjson_cincludeHEADERS install-man install-pdf \ |
2540 | + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ |
2541 | + install-strip installcheck installcheck-am installdirs \ |
2542 | + installdirs-am maintainer-clean maintainer-clean-generic \ |
2543 | + maintainer-clean-local mostlyclean mostlyclean-compile \ |
2544 | + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
2545 | + tags tags-recursive uninstall uninstall-am \ |
2546 | + uninstall-libLTLIBRARIES uninstall-libjson_cincludeHEADERS \ |
2547 | + uninstall-local uninstall-pkgconfigDATA |
2548 | + |
2549 | + |
2550 | +distclean-local: |
2551 | + -rm -rf $(testsubdir) |
2552 | + -rm -rf config.h.in~ Makefile.in aclocal.m4 autom4te.cache/ config.guess config.sub depcomp install-sh ltmain.sh missing |
2553 | + |
2554 | +maintainer-clean-local: |
2555 | + -rm -rf configure |
2556 | + |
2557 | +install-data-hook: |
2558 | + test \! -e "$(DESTDIR)${prefix}/include/json" || rm "$(DESTDIR)${prefix}/include/json" |
2559 | + $(LN_S) json-c "$(DESTDIR)${prefix}/include/json" |
2560 | + |
2561 | +uninstall-local: |
2562 | + rm -f "$(DESTDIR)${prefix}/include/json" |
2563 | + rm -rf "$(DESTDIR)${prefix}/include/json-c" |
2564 | + |
2565 | +Android.mk: Makefile.am |
2566 | + androgenizer -:PROJECT json-c \ |
2567 | + -:SHARED libjson-c \ |
2568 | + -:TAGS eng debug \ |
2569 | + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ |
2570 | + -:SOURCES $(libjson_c_la_SOURCES) $(nodist_libjson_c_la_SOURCES) \ |
2571 | + -:CFLAGS $(DEFS) $(ANDROID_CFLAGS) $(libjson_c_la_CFLAGS) \ |
2572 | + -:LDFLAGS $(libjson_c_la_LDFLAGS) $(libjson_c_la_LIBADD) \ |
2573 | + -:HEADER_TARGET json-c \ |
2574 | + -:HEADERS $(libjson_cinclude_HEADERS) \ |
2575 | + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ |
2576 | + > $@ |
2577 | + |
2578 | +# Tell versions [3.59,3.63) of GNU make to not export all variables. |
2579 | +# Otherwise a system limit (for SysV at least) may be exceeded. |
2580 | +.NOEXPORT: |
2581 | |
2582 | === modified file 'Makefile.am' |
2583 | --- Makefile.am 2012-08-27 12:56:32 +0000 |
2584 | +++ Makefile.am 2013-07-16 03:35:32 +0000 |
2585 | @@ -3,20 +3,28 @@ |
2586 | EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj |
2587 | SUBDIRS = . tests |
2588 | |
2589 | -lib_LTLIBRARIES = libjson.la |
2590 | +lib_LTLIBRARIES = libjson-c.la |
2591 | +if ENABLE_OLDNAME_COMPAT |
2592 | +lib_LTLIBRARIES+=libjson.la |
2593 | +endif |
2594 | |
2595 | pkgconfigdir = $(libdir)/pkgconfig |
2596 | -pkgconfig_DATA = json.pc |
2597 | +pkgconfig_DATA = json-c.pc |
2598 | +if ENABLE_OLDNAME_COMPAT |
2599 | +pkgconfig_DATA += json.pc |
2600 | +endif |
2601 | |
2602 | -libjsonincludedir = $(includedir)/json |
2603 | -libjsoninclude_HEADERS = \ |
2604 | +libjson_cincludedir = $(includedir)/json-c |
2605 | +libjson_cinclude_HEADERS = \ |
2606 | arraylist.h \ |
2607 | bits.h \ |
2608 | debug.h \ |
2609 | json.h \ |
2610 | json_config.h \ |
2611 | + json_c_version.h \ |
2612 | json_inttypes.h \ |
2613 | json_object.h \ |
2614 | + json_object_iterator.h \ |
2615 | json_object_private.h \ |
2616 | json_tokener.h \ |
2617 | json_util.h \ |
2618 | @@ -28,12 +36,22 @@ |
2619 | #libjsonx_include_HEADERS = \ |
2620 | # json_config.h |
2621 | |
2622 | -libjson_la_LDFLAGS = -version-info 1:0:1 -no-undefined |
2623 | - |
2624 | -libjson_la_SOURCES = \ |
2625 | +libjson_c_la_LDFLAGS = -version-info 2:1:0 -no-undefined |
2626 | + |
2627 | +if ENABLE_OLDNAME_COMPAT |
2628 | +libjson_la_LDFLAGS = -version-info 1:0:1 -no-undefined -ljson-c |
2629 | + |
2630 | +# Temporary libjson library. This will be removed after one release. |
2631 | +libjson_la_LIBADD = -ljson-c |
2632 | +endif |
2633 | + |
2634 | + |
2635 | +libjson_c_la_SOURCES = \ |
2636 | arraylist.c \ |
2637 | debug.c \ |
2638 | + json_c_version.c \ |
2639 | json_object.c \ |
2640 | + json_object_iterator.c \ |
2641 | json_tokener.c \ |
2642 | json_util.c \ |
2643 | linkhash.c \ |
2644 | @@ -42,5 +60,33 @@ |
2645 | |
2646 | distclean-local: |
2647 | -rm -rf $(testsubdir) |
2648 | - -rm -rf config.h.in~ Makefile.in aclocal.m4 autom4te.cache/ config.guess config.sub configure depcomp install-sh ltmain.sh missing |
2649 | - |
2650 | + -rm -rf config.h.in~ Makefile.in aclocal.m4 autom4te.cache/ config.guess config.sub depcomp install-sh ltmain.sh missing |
2651 | + |
2652 | +maintainer-clean-local: |
2653 | + -rm -rf configure |
2654 | + |
2655 | +if ENABLE_OLDNAME_COMPAT |
2656 | +install-data-hook: |
2657 | + test \! -e "$(DESTDIR)@includedir@/json" || rm "$(DESTDIR)@includedir@/json" |
2658 | + $(LN_S) json-c "$(DESTDIR)@includedir@/json" |
2659 | + |
2660 | +uninstall-local: |
2661 | + rm -f "$(DESTDIR)@includedir@/json" |
2662 | + rm -rf "$(DESTDIR)@includedir@/json-c" |
2663 | + |
2664 | +endif |
2665 | + |
2666 | +ANDROID_CFLAGS = -I$(top_srcdir) -DHAVE_CONFIG_H |
2667 | + |
2668 | +Android.mk: Makefile.am |
2669 | + androgenizer -:PROJECT json-c \ |
2670 | + -:SHARED libjson-c \ |
2671 | + -:TAGS eng debug \ |
2672 | + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ |
2673 | + -:SOURCES $(libjson_c_la_SOURCES) $(nodist_libjson_c_la_SOURCES) \ |
2674 | + -:CFLAGS $(DEFS) $(ANDROID_CFLAGS) $(libjson_c_la_CFLAGS) \ |
2675 | + -:LDFLAGS $(libjson_c_la_LDFLAGS) $(libjson_c_la_LIBADD) \ |
2676 | + -:HEADER_TARGET json-c \ |
2677 | + -:HEADERS $(libjson_cinclude_HEADERS) \ |
2678 | + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ |
2679 | + > $@ |
2680 | |
2681 | === modified file 'Makefile.am.inc' |
2682 | --- Makefile.am.inc 2012-08-17 16:40:10 +0000 |
2683 | +++ Makefile.am.inc 2013-07-16 03:35:32 +0000 |
2684 | @@ -1,2 +1,2 @@ |
2685 | -AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT |
2686 | +AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT |
2687 | |
2688 | |
2689 | === modified file 'Makefile.in' |
2690 | --- Makefile.in 2012-08-17 16:40:10 +0000 |
2691 | +++ Makefile.in 2013-07-16 03:35:32 +0000 |
2692 | @@ -36,12 +36,15 @@ |
2693 | POST_UNINSTALL = : |
2694 | build_triplet = @build@ |
2695 | host_triplet = @host@ |
2696 | -DIST_COMMON = README $(am__configure_deps) $(libjsoninclude_HEADERS) \ |
2697 | +DIST_COMMON = README $(am__configure_deps) $(libjson_cinclude_HEADERS) \ |
2698 | $(srcdir)/Makefile.am $(srcdir)/Makefile.am.inc \ |
2699 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
2700 | + $(srcdir)/json-c-uninstalled.pc.in $(srcdir)/json-c.pc.in \ |
2701 | $(srcdir)/json.pc.in $(srcdir)/json_config.h.in \ |
2702 | $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ |
2703 | config.guess config.sub depcomp install-sh ltmain.sh missing |
2704 | +@ENABLE_OLDNAME_COMPAT_TRUE@am__append_1 = libjson.la |
2705 | +@ENABLE_OLDNAME_COMPAT_TRUE@am__append_2 = json.pc |
2706 | subdir = . |
2707 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
2708 | am__aclocal_m4_deps = $(top_srcdir)/configure.in |
2709 | @@ -51,7 +54,7 @@ |
2710 | configure.lineno config.status.lineno |
2711 | mkinstalldirs = $(install_sh) -d |
2712 | CONFIG_HEADER = config.h json_config.h |
2713 | -CONFIG_CLEAN_FILES = json.pc |
2714 | +CONFIG_CLEAN_FILES = json.pc json-c.pc json-c-uninstalled.pc |
2715 | CONFIG_CLEAN_VPATH_FILES = |
2716 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
2717 | am__vpath_adj = case $$p in \ |
2718 | @@ -75,15 +78,23 @@ |
2719 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
2720 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
2721 | am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \ |
2722 | - "$(DESTDIR)$(libjsonincludedir)" |
2723 | + "$(DESTDIR)$(libjson_cincludedir)" |
2724 | LTLIBRARIES = $(lib_LTLIBRARIES) |
2725 | -libjson_la_LIBADD = |
2726 | -am_libjson_la_OBJECTS = arraylist.lo debug.lo json_object.lo \ |
2727 | - json_tokener.lo json_util.lo linkhash.lo printbuf.lo |
2728 | -libjson_la_OBJECTS = $(am_libjson_la_OBJECTS) |
2729 | +libjson_c_la_LIBADD = |
2730 | +am_libjson_c_la_OBJECTS = arraylist.lo debug.lo json_c_version.lo \ |
2731 | + json_object.lo json_object_iterator.lo json_tokener.lo \ |
2732 | + json_util.lo linkhash.lo printbuf.lo |
2733 | +libjson_c_la_OBJECTS = $(am_libjson_c_la_OBJECTS) |
2734 | +libjson_c_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2735 | + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
2736 | + $(libjson_c_la_LDFLAGS) $(LDFLAGS) -o $@ |
2737 | +libjson_la_DEPENDENCIES = |
2738 | +libjson_la_SOURCES = libjson.c |
2739 | +libjson_la_OBJECTS = libjson.lo |
2740 | libjson_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2741 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
2742 | $(libjson_la_LDFLAGS) $(LDFLAGS) -o $@ |
2743 | +@ENABLE_OLDNAME_COMPAT_TRUE@am_libjson_la_rpath = -rpath $(libdir) |
2744 | DEFAULT_INCLUDES = -I.@am__isrc@ |
2745 | depcomp = $(SHELL) $(top_srcdir)/depcomp |
2746 | am__depfiles_maybe = depfiles |
2747 | @@ -97,8 +108,8 @@ |
2748 | LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ |
2749 | --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ |
2750 | $(LDFLAGS) -o $@ |
2751 | -SOURCES = $(libjson_la_SOURCES) |
2752 | -DIST_SOURCES = $(libjson_la_SOURCES) |
2753 | +SOURCES = $(libjson_c_la_SOURCES) libjson.c |
2754 | +DIST_SOURCES = $(libjson_c_la_SOURCES) libjson.c |
2755 | RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
2756 | html-recursive info-recursive install-data-recursive \ |
2757 | install-dvi-recursive install-exec-recursive \ |
2758 | @@ -107,7 +118,7 @@ |
2759 | installcheck-recursive installdirs-recursive pdf-recursive \ |
2760 | ps-recursive uninstall-recursive |
2761 | DATA = $(pkgconfig_DATA) |
2762 | -HEADERS = $(libjsoninclude_HEADERS) |
2763 | +HEADERS = $(libjson_cinclude_HEADERS) |
2764 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
2765 | distclean-recursive maintainer-clean-recursive |
2766 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
2767 | @@ -263,21 +274,23 @@ |
2768 | top_build_prefix = @top_build_prefix@ |
2769 | top_builddir = @top_builddir@ |
2770 | top_srcdir = @top_srcdir@ |
2771 | -AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT |
2772 | +AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT |
2773 | EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj |
2774 | SUBDIRS = . tests |
2775 | -lib_LTLIBRARIES = libjson.la |
2776 | +lib_LTLIBRARIES = libjson-c.la $(am__append_1) |
2777 | pkgconfigdir = $(libdir)/pkgconfig |
2778 | -pkgconfig_DATA = json.pc |
2779 | -libjsonincludedir = $(includedir)/json |
2780 | -libjsoninclude_HEADERS = \ |
2781 | +pkgconfig_DATA = json-c.pc $(am__append_2) |
2782 | +libjson_cincludedir = $(includedir)/json-c |
2783 | +libjson_cinclude_HEADERS = \ |
2784 | arraylist.h \ |
2785 | bits.h \ |
2786 | debug.h \ |
2787 | json.h \ |
2788 | json_config.h \ |
2789 | + json_c_version.h \ |
2790 | json_inttypes.h \ |
2791 | json_object.h \ |
2792 | + json_object_iterator.h \ |
2793 | json_object_private.h \ |
2794 | json_tokener.h \ |
2795 | json_util.h \ |
2796 | @@ -289,16 +302,23 @@ |
2797 | # |
2798 | #libjsonx_include_HEADERS = \ |
2799 | # json_config.h |
2800 | -libjson_la_LDFLAGS = -version-info 1:0:1 -no-undefined |
2801 | -libjson_la_SOURCES = \ |
2802 | +libjson_c_la_LDFLAGS = -version-info 2:1:0 -no-undefined |
2803 | +@ENABLE_OLDNAME_COMPAT_TRUE@libjson_la_LDFLAGS = -version-info 1:0:1 -no-undefined -ljson-c |
2804 | + |
2805 | +# Temporary libjson library. This will be removed after one release. |
2806 | +@ENABLE_OLDNAME_COMPAT_TRUE@libjson_la_LIBADD = -ljson-c |
2807 | +libjson_c_la_SOURCES = \ |
2808 | arraylist.c \ |
2809 | debug.c \ |
2810 | + json_c_version.c \ |
2811 | json_object.c \ |
2812 | + json_object_iterator.c \ |
2813 | json_tokener.c \ |
2814 | json_util.c \ |
2815 | linkhash.c \ |
2816 | printbuf.c |
2817 | |
2818 | +ANDROID_CFLAGS = -I$(top_srcdir) -DHAVE_CONFIG_H |
2819 | all: config.h json_config.h |
2820 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
2821 | |
2822 | @@ -367,6 +387,10 @@ |
2823 | -rm -f config.h stamp-h1 json_config.h stamp-h2 |
2824 | json.pc: $(top_builddir)/config.status $(srcdir)/json.pc.in |
2825 | cd $(top_builddir) && $(SHELL) ./config.status $@ |
2826 | +json-c.pc: $(top_builddir)/config.status $(srcdir)/json-c.pc.in |
2827 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
2828 | +json-c-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/json-c-uninstalled.pc.in |
2829 | + cd $(top_builddir) && $(SHELL) ./config.status $@ |
2830 | install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
2831 | @$(NORMAL_INSTALL) |
2832 | test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" |
2833 | @@ -398,8 +422,10 @@ |
2834 | echo "rm -f \"$${dir}/so_locations\""; \ |
2835 | rm -f "$${dir}/so_locations"; \ |
2836 | done |
2837 | +libjson-c.la: $(libjson_c_la_OBJECTS) $(libjson_c_la_DEPENDENCIES) |
2838 | + $(libjson_c_la_LINK) -rpath $(libdir) $(libjson_c_la_OBJECTS) $(libjson_c_la_LIBADD) $(LIBS) |
2839 | libjson.la: $(libjson_la_OBJECTS) $(libjson_la_DEPENDENCIES) |
2840 | - $(libjson_la_LINK) -rpath $(libdir) $(libjson_la_OBJECTS) $(libjson_la_LIBADD) $(LIBS) |
2841 | + $(libjson_la_LINK) $(am_libjson_la_rpath) $(libjson_la_OBJECTS) $(libjson_la_LIBADD) $(LIBS) |
2842 | |
2843 | mostlyclean-compile: |
2844 | -rm -f *.$(OBJEXT) |
2845 | @@ -409,9 +435,12 @@ |
2846 | |
2847 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arraylist.Plo@am__quote@ |
2848 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Plo@am__quote@ |
2849 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json_c_version.Plo@am__quote@ |
2850 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json_object.Plo@am__quote@ |
2851 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json_object_iterator.Plo@am__quote@ |
2852 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json_tokener.Plo@am__quote@ |
2853 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json_util.Plo@am__quote@ |
2854 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjson.Plo@am__quote@ |
2855 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linkhash.Plo@am__quote@ |
2856 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printbuf.Plo@am__quote@ |
2857 | |
2858 | @@ -464,26 +493,26 @@ |
2859 | test -n "$$files" || exit 0; \ |
2860 | echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ |
2861 | cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files |
2862 | -install-libjsonincludeHEADERS: $(libjsoninclude_HEADERS) |
2863 | +install-libjson_cincludeHEADERS: $(libjson_cinclude_HEADERS) |
2864 | @$(NORMAL_INSTALL) |
2865 | - test -z "$(libjsonincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libjsonincludedir)" |
2866 | - @list='$(libjsoninclude_HEADERS)'; test -n "$(libjsonincludedir)" || list=; \ |
2867 | + test -z "$(libjson_cincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libjson_cincludedir)" |
2868 | + @list='$(libjson_cinclude_HEADERS)'; test -n "$(libjson_cincludedir)" || list=; \ |
2869 | for p in $$list; do \ |
2870 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
2871 | echo "$$d$$p"; \ |
2872 | done | $(am__base_list) | \ |
2873 | while read files; do \ |
2874 | - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libjsonincludedir)'"; \ |
2875 | - $(INSTALL_HEADER) $$files "$(DESTDIR)$(libjsonincludedir)" || exit $$?; \ |
2876 | + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libjson_cincludedir)'"; \ |
2877 | + $(INSTALL_HEADER) $$files "$(DESTDIR)$(libjson_cincludedir)" || exit $$?; \ |
2878 | done |
2879 | |
2880 | -uninstall-libjsonincludeHEADERS: |
2881 | +uninstall-libjson_cincludeHEADERS: |
2882 | @$(NORMAL_UNINSTALL) |
2883 | - @list='$(libjsoninclude_HEADERS)'; test -n "$(libjsonincludedir)" || list=; \ |
2884 | + @list='$(libjson_cinclude_HEADERS)'; test -n "$(libjson_cincludedir)" || list=; \ |
2885 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
2886 | test -n "$$files" || exit 0; \ |
2887 | - echo " ( cd '$(DESTDIR)$(libjsonincludedir)' && rm -f" $$files ")"; \ |
2888 | - cd "$(DESTDIR)$(libjsonincludedir)" && rm -f $$files |
2889 | + echo " ( cd '$(DESTDIR)$(libjson_cincludedir)' && rm -f" $$files ")"; \ |
2890 | + cd "$(DESTDIR)$(libjson_cincludedir)" && rm -f $$files |
2891 | |
2892 | # This directory's subdirectories are mostly independent; you can cd |
2893 | # into them and run `make' without going through this Makefile. |
2894 | @@ -801,7 +830,7 @@ |
2895 | json_config.h |
2896 | installdirs: installdirs-recursive |
2897 | installdirs-am: |
2898 | - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libjsonincludedir)"; do \ |
2899 | + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libjson_cincludedir)"; do \ |
2900 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
2901 | done |
2902 | install: install-recursive |
2903 | @@ -829,6 +858,8 @@ |
2904 | maintainer-clean-generic: |
2905 | @echo "This command is intended for maintainers to use" |
2906 | @echo "it deletes files that may require special tools to rebuild." |
2907 | +@ENABLE_OLDNAME_COMPAT_FALSE@uninstall-local: |
2908 | +@ENABLE_OLDNAME_COMPAT_FALSE@install-data-hook: |
2909 | clean: clean-recursive |
2910 | |
2911 | clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ |
2912 | @@ -853,8 +884,9 @@ |
2913 | |
2914 | info-am: |
2915 | |
2916 | -install-data-am: install-libjsonincludeHEADERS install-pkgconfigDATA |
2917 | - |
2918 | +install-data-am: install-libjson_cincludeHEADERS install-pkgconfigDATA |
2919 | + @$(NORMAL_INSTALL) |
2920 | + $(MAKE) $(AM_MAKEFLAGS) install-data-hook |
2921 | install-dvi: install-dvi-recursive |
2922 | |
2923 | install-dvi-am: |
2924 | @@ -886,7 +918,8 @@ |
2925 | -rm -rf $(top_srcdir)/autom4te.cache |
2926 | -rm -rf ./$(DEPDIR) |
2927 | -rm -f Makefile |
2928 | -maintainer-clean-am: distclean-am maintainer-clean-generic |
2929 | +maintainer-clean-am: distclean-am maintainer-clean-generic \ |
2930 | + maintainer-clean-local |
2931 | |
2932 | mostlyclean: mostlyclean-recursive |
2933 | |
2934 | @@ -901,11 +934,13 @@ |
2935 | |
2936 | ps-am: |
2937 | |
2938 | -uninstall-am: uninstall-libLTLIBRARIES uninstall-libjsonincludeHEADERS \ |
2939 | +uninstall-am: uninstall-libLTLIBRARIES \ |
2940 | + uninstall-libjson_cincludeHEADERS uninstall-local \ |
2941 | uninstall-pkgconfigDATA |
2942 | |
2943 | .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ |
2944 | - ctags-recursive install-am install-strip tags-recursive |
2945 | + ctags-recursive install-am install-data-am install-strip \ |
2946 | + tags-recursive |
2947 | |
2948 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
2949 | all all-am am--refresh check check-am clean clean-generic \ |
2950 | @@ -915,23 +950,48 @@ |
2951 | distclean-generic distclean-hdr distclean-libtool \ |
2952 | distclean-local distclean-tags distcleancheck distdir \ |
2953 | distuninstallcheck dvi dvi-am html html-am info info-am \ |
2954 | - install install-am install-data install-data-am install-dvi \ |
2955 | - install-dvi-am install-exec install-exec-am install-html \ |
2956 | - install-html-am install-info install-info-am \ |
2957 | - install-libLTLIBRARIES install-libjsonincludeHEADERS \ |
2958 | - install-man install-pdf install-pdf-am install-pkgconfigDATA \ |
2959 | - install-ps install-ps-am install-strip installcheck \ |
2960 | - installcheck-am installdirs installdirs-am maintainer-clean \ |
2961 | - maintainer-clean-generic mostlyclean mostlyclean-compile \ |
2962 | + install install-am install-data install-data-am \ |
2963 | + install-data-hook install-dvi install-dvi-am install-exec \ |
2964 | + install-exec-am install-html install-html-am install-info \ |
2965 | + install-info-am install-libLTLIBRARIES \ |
2966 | + install-libjson_cincludeHEADERS install-man install-pdf \ |
2967 | + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ |
2968 | + install-strip installcheck installcheck-am installdirs \ |
2969 | + installdirs-am maintainer-clean maintainer-clean-generic \ |
2970 | + maintainer-clean-local mostlyclean mostlyclean-compile \ |
2971 | mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
2972 | tags tags-recursive uninstall uninstall-am \ |
2973 | - uninstall-libLTLIBRARIES uninstall-libjsonincludeHEADERS \ |
2974 | - uninstall-pkgconfigDATA |
2975 | + uninstall-libLTLIBRARIES uninstall-libjson_cincludeHEADERS \ |
2976 | + uninstall-local uninstall-pkgconfigDATA |
2977 | |
2978 | |
2979 | distclean-local: |
2980 | -rm -rf $(testsubdir) |
2981 | - -rm -rf config.h.in~ Makefile.in aclocal.m4 autom4te.cache/ config.guess config.sub configure depcomp install-sh ltmain.sh missing |
2982 | + -rm -rf config.h.in~ Makefile.in aclocal.m4 autom4te.cache/ config.guess config.sub depcomp install-sh ltmain.sh missing |
2983 | + |
2984 | +maintainer-clean-local: |
2985 | + -rm -rf configure |
2986 | + |
2987 | +@ENABLE_OLDNAME_COMPAT_TRUE@install-data-hook: |
2988 | +@ENABLE_OLDNAME_COMPAT_TRUE@ test \! -e "$(DESTDIR)@includedir@/json" || rm "$(DESTDIR)@includedir@/json" |
2989 | +@ENABLE_OLDNAME_COMPAT_TRUE@ $(LN_S) json-c "$(DESTDIR)@includedir@/json" |
2990 | + |
2991 | +@ENABLE_OLDNAME_COMPAT_TRUE@uninstall-local: |
2992 | +@ENABLE_OLDNAME_COMPAT_TRUE@ rm -f "$(DESTDIR)@includedir@/json" |
2993 | +@ENABLE_OLDNAME_COMPAT_TRUE@ rm -rf "$(DESTDIR)@includedir@/json-c" |
2994 | + |
2995 | +Android.mk: Makefile.am |
2996 | + androgenizer -:PROJECT json-c \ |
2997 | + -:SHARED libjson-c \ |
2998 | + -:TAGS eng debug \ |
2999 | + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ |
3000 | + -:SOURCES $(libjson_c_la_SOURCES) $(nodist_libjson_c_la_SOURCES) \ |
3001 | + -:CFLAGS $(DEFS) $(ANDROID_CFLAGS) $(libjson_c_la_CFLAGS) \ |
3002 | + -:LDFLAGS $(libjson_c_la_LDFLAGS) $(libjson_c_la_LIBADD) \ |
3003 | + -:HEADER_TARGET json-c \ |
3004 | + -:HEADERS $(libjson_cinclude_HEADERS) \ |
3005 | + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ |
3006 | + > $@ |
3007 | |
3008 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
3009 | # Otherwise a system limit (for SysV at least) may be exceeded. |
3010 | |
3011 | === modified file 'README' |
3012 | --- README 2012-08-17 16:40:10 +0000 |
3013 | +++ README 2013-07-16 03:35:32 +0000 |
3014 | @@ -1,7 +1,17 @@ |
3015 | Building on Unix with git, gcc and autotools |
3016 | |
3017 | Home page for json-c: |
3018 | - http://oss.metaparadigm.com/json-c/ |
3019 | + https://github.com/json-c/json-c/wiki |
3020 | + |
3021 | + Caution: do NOT use sources from svn.metaparadigm.com, they are old. |
3022 | + |
3023 | +Prerequisites: |
3024 | + gcc (or another C compiler) |
3025 | + libtool |
3026 | + |
3027 | + If you're not using a release tarball, you'll also need: |
3028 | + autoconf (autoreconf) |
3029 | + automake |
3030 | |
3031 | Github repo for json-c: |
3032 | https://github.com/json-c/json-c |
3033 | @@ -20,9 +30,15 @@ |
3034 | |
3035 | $ make check |
3036 | |
3037 | -Linking to libjson |
3038 | +Linking to libjson-c |
3039 | |
3040 | If your system has pkgconfig then you can just add this to your makefile |
3041 | |
3042 | -CFLAGS += $(shell pkg-config --cflags json) |
3043 | -LDFLAGS += $(shell pkg-config --libs json) |
3044 | +CFLAGS += $(shell pkg-config --cflags json-c) |
3045 | +LDFLAGS += $(shell pkg-config --libs json-c) |
3046 | + |
3047 | +Without pkgconfig, you would do something like this: |
3048 | + |
3049 | +JSON_C_DIR=/path/to/json_c/install |
3050 | +CFLAGS += -I$(JSON_C_DIR)/include/json-c |
3051 | +LDFLAGS+= -L$(JSON_C_DIR)/lib -ljson-c |
3052 | |
3053 | === modified file 'RELEASE_CHECKLIST.txt' |
3054 | --- RELEASE_CHECKLIST.txt 2012-08-17 16:40:10 +0000 |
3055 | +++ RELEASE_CHECKLIST.txt 2013-07-16 03:35:32 +0000 |
3056 | @@ -1,7 +1,7 @@ |
3057 | |
3058 | Release checklist: |
3059 | |
3060 | -release=0.10 |
3061 | +release=0.11 |
3062 | git clone https://github.com/json-c/json-c json-c-${release} |
3063 | cd json-c-${release} |
3064 | |
3065 | @@ -17,7 +17,8 @@ |
3066 | sh autogen.sh |
3067 | git add -f Makefile.in aclocal.m4 config.guess \ |
3068 | config.sub configure depcomp install-sh \ |
3069 | - ltmain.sh missing tests/Makefile.in |
3070 | + ltmain.sh missing tests/Makefile.in \ |
3071 | + INSTALL |
3072 | |
3073 | # check for anything else to be added: |
3074 | git status --ignored |
3075 | @@ -25,7 +26,7 @@ |
3076 | |
3077 | Generate the doxygen documentation: |
3078 | doxygen |
3079 | - git add doc |
3080 | + git add -f doc |
3081 | git commit doc |
3082 | |
3083 | cd .. |
3084 | @@ -34,11 +35,13 @@ |
3085 | tar -czf json-c-${release}.tar.gz -X excludes json-c-${release} |
3086 | |
3087 | echo doc >> excludes |
3088 | -tar -czf json-c-${release}-doc.tar.gz -X excludes json-c-${release} |
3089 | +tar -czf json-c-${release}-nodoc.tar.gz -X excludes json-c-${release} |
3090 | |
3091 | Tag the branch: |
3092 | cd json-c-${release} |
3093 | -git tag json-c-${release}-$(date +%Y%m%d) |
3094 | +git tag -a json-c-${release}-$(date +%Y%m%d) |
3095 | +git push |
3096 | +git push --tags |
3097 | |
3098 | Go to https://github.com/json-c/json-c/downloads |
3099 | Upload the two tarballs. |
3100 | @@ -50,6 +53,7 @@ |
3101 | |
3102 | git branch master |
3103 | Add new section to CHANGES |
3104 | +Update the version in json_c_version.h |
3105 | Update the version in Doxyfile |
3106 | Update the version in configure.in |
3107 | Update the libjson_la_LDFLAGS line in Makefile.am to the new version. |
3108 | |
3109 | === modified file 'aclocal.m4' |
3110 | --- aclocal.m4 2012-08-17 16:40:10 +0000 |
3111 | +++ aclocal.m4 2013-07-16 03:35:32 +0000 |
3112 | @@ -8361,18 +8361,6 @@ |
3113 | [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) |
3114 | ]) |
3115 | |
3116 | -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 |
3117 | -# Free Software Foundation, Inc. |
3118 | -# |
3119 | -# This file is free software; the Free Software Foundation |
3120 | -# gives unlimited permission to copy and/or distribute it, |
3121 | -# with or without modifications, as long as this notice is preserved. |
3122 | - |
3123 | -# serial 8 |
3124 | - |
3125 | -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. |
3126 | -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) |
3127 | - |
3128 | # Do all the work for Automake. -*- Autoconf -*- |
3129 | |
3130 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
3131 | |
3132 | === modified file 'arraylist.c' |
3133 | --- arraylist.c 2012-08-17 16:40:10 +0000 |
3134 | +++ arraylist.c 2013-07-16 03:35:32 +0000 |
3135 | @@ -11,12 +11,12 @@ |
3136 | |
3137 | #include "config.h" |
3138 | |
3139 | -#if STDC_HEADERS |
3140 | +#ifdef STDC_HEADERS |
3141 | # include <stdlib.h> |
3142 | # include <string.h> |
3143 | #endif /* STDC_HEADERS */ |
3144 | |
3145 | -#if defined HAVE_STRINGS_H && !defined _STRING_H && !defined __USE_BSD |
3146 | +#if defined(HAVE_STRINGS_H) && !defined(_STRING_H) && !defined(__USE_BSD) |
3147 | # include <strings.h> |
3148 | #endif /* HAVE_STRINGS_H */ |
3149 | |
3150 | @@ -74,7 +74,7 @@ |
3151 | int |
3152 | array_list_put_idx(struct array_list *arr, int idx, void *data) |
3153 | { |
3154 | - if(array_list_expand_internal(arr, idx)) return -1; |
3155 | + if(array_list_expand_internal(arr, idx+1)) return -1; |
3156 | if(arr->array[idx]) arr->free_fn(arr->array[idx]); |
3157 | arr->array[idx] = data; |
3158 | if(arr->length <= idx) arr->length = idx + 1; |
3159 | |
3160 | === modified file 'autogen.sh' |
3161 | --- autogen.sh 2012-08-17 16:40:10 +0000 |
3162 | +++ autogen.sh 2013-07-16 03:35:32 +0000 |
3163 | @@ -1,1 +1,13 @@ |
3164 | +#!/bin/sh |
3165 | autoreconf -v --install || exit 1 |
3166 | + |
3167 | +# If there are any options, assume the user wants to run configure. |
3168 | +# To run configure w/o any options, use ./autogen.sh --configure |
3169 | +if [ $# -gt 0 ] ; then |
3170 | + case "$1" in |
3171 | + --conf*) |
3172 | + shift 1 |
3173 | + ;; |
3174 | + esac |
3175 | + exec ./configure "$@" |
3176 | +fi |
3177 | |
3178 | === added file 'config.h' |
3179 | --- config.h 1970-01-01 00:00:00 +0000 |
3180 | +++ config.h 2013-07-16 03:35:32 +0000 |
3181 | @@ -0,0 +1,149 @@ |
3182 | +/* config.h. Generated from config.h.in by configure. */ |
3183 | +/* config.h.in. Generated from configure.in by autoheader. */ |
3184 | + |
3185 | +/* Define if .gnu.warning accepts long strings. */ |
3186 | +/* #undef HAS_GNU_WARNING_LONG */ |
3187 | + |
3188 | +/* Define to 1 if you have the <dlfcn.h> header file. */ |
3189 | +#define HAVE_DLFCN_H 1 |
3190 | + |
3191 | +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ |
3192 | +/* #undef HAVE_DOPRNT */ |
3193 | + |
3194 | +/* Define to 1 if you have the <fcntl.h> header file. */ |
3195 | +#define HAVE_FCNTL_H 1 |
3196 | + |
3197 | +/* Define to 1 if you have the <inttypes.h> header file. */ |
3198 | +#define HAVE_INTTYPES_H 1 |
3199 | + |
3200 | +/* Define to 1 if you have the <limits.h> header file. */ |
3201 | +#define HAVE_LIMITS_H 1 |
3202 | + |
3203 | +/* Define to 1 if you have the <locale.h> header file. */ |
3204 | +#define HAVE_LOCALE_H 1 |
3205 | + |
3206 | +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and |
3207 | + to 0 otherwise. */ |
3208 | +#define HAVE_MALLOC 1 |
3209 | + |
3210 | +/* Define to 1 if you have the <memory.h> header file. */ |
3211 | +#define HAVE_MEMORY_H 1 |
3212 | + |
3213 | +/* Define to 1 if you have the `open' function. */ |
3214 | +#define HAVE_OPEN 1 |
3215 | + |
3216 | +/* Define to 1 if your system has a GNU libc compatible `realloc' function, |
3217 | + and to 0 otherwise. */ |
3218 | +#define HAVE_REALLOC 1 |
3219 | + |
3220 | +/* Define to 1 if you have the `setlocale' function. */ |
3221 | +#define HAVE_SETLOCALE 1 |
3222 | + |
3223 | +/* Define to 1 if you have the `snprintf' function. */ |
3224 | +#define HAVE_SNPRINTF 1 |
3225 | + |
3226 | +/* Define to 1 if you have the <stdarg.h> header file. */ |
3227 | +#define HAVE_STDARG_H 1 |
3228 | + |
3229 | +/* Define to 1 if you have the <stdint.h> header file. */ |
3230 | +#define HAVE_STDINT_H 1 |
3231 | + |
3232 | +/* Define to 1 if you have the <stdlib.h> header file. */ |
3233 | +#define HAVE_STDLIB_H 1 |
3234 | + |
3235 | +/* Define to 1 if you have the `strcasecmp' function. */ |
3236 | +#define HAVE_STRCASECMP 1 |
3237 | + |
3238 | +/* Define to 1 if you have the `strdup' function. */ |
3239 | +#define HAVE_STRDUP 1 |
3240 | + |
3241 | +/* Define to 1 if you have the `strerror' function. */ |
3242 | +#define HAVE_STRERROR 1 |
3243 | + |
3244 | +/* Define to 1 if you have the <strings.h> header file. */ |
3245 | +#define HAVE_STRINGS_H 1 |
3246 | + |
3247 | +/* Define to 1 if you have the <string.h> header file. */ |
3248 | +#define HAVE_STRING_H 1 |
3249 | + |
3250 | +/* Define to 1 if you have the `strncasecmp' function. */ |
3251 | +#define HAVE_STRNCASECMP 1 |
3252 | + |
3253 | +/* Define to 1 if you have the `strndup' function. */ |
3254 | +#define HAVE_STRNDUP 1 |
3255 | + |
3256 | +/* Define to 1 if you have the <syslog.h> header file. */ |
3257 | +#define HAVE_SYSLOG_H 1 |
3258 | + |
3259 | +/* Define to 1 if you have the <sys/cdefs.h> header file. */ |
3260 | +#define HAVE_SYS_CDEFS_H 1 |
3261 | + |
3262 | +/* Define to 1 if you have the <sys/param.h> header file. */ |
3263 | +#define HAVE_SYS_PARAM_H 1 |
3264 | + |
3265 | +/* Define to 1 if you have the <sys/stat.h> header file. */ |
3266 | +#define HAVE_SYS_STAT_H 1 |
3267 | + |
3268 | +/* Define to 1 if you have the <sys/types.h> header file. */ |
3269 | +#define HAVE_SYS_TYPES_H 1 |
3270 | + |
3271 | +/* Define to 1 if you have the <unistd.h> header file. */ |
3272 | +#define HAVE_UNISTD_H 1 |
3273 | + |
3274 | +/* Define to 1 if you have the `vasprintf' function. */ |
3275 | +#define HAVE_VASPRINTF 1 |
3276 | + |
3277 | +/* Define to 1 if you have the `vprintf' function. */ |
3278 | +#define HAVE_VPRINTF 1 |
3279 | + |
3280 | +/* Define to 1 if you have the `vsnprintf' function. */ |
3281 | +#define HAVE_VSNPRINTF 1 |
3282 | + |
3283 | +/* Define to 1 if you have the `vsyslog' function. */ |
3284 | +#define HAVE_VSYSLOG 1 |
3285 | + |
3286 | +/* Public define for json_inttypes.h */ |
3287 | +#define JSON_C_HAVE_INTTYPES_H 1 |
3288 | + |
3289 | +/* Define to the sub-directory in which libtool stores uninstalled libraries. |
3290 | + */ |
3291 | +#define LT_OBJDIR ".libs/" |
3292 | + |
3293 | +/* Name of package */ |
3294 | +#define PACKAGE "json-c" |
3295 | + |
3296 | +/* Define to the address where bug reports for this package should be sent. */ |
3297 | +#define PACKAGE_BUGREPORT "json-c@googlegroups.com" |
3298 | + |
3299 | +/* Define to the full name of this package. */ |
3300 | +#define PACKAGE_NAME "json-c" |
3301 | + |
3302 | +/* Define to the full name and version of this package. */ |
3303 | +#define PACKAGE_STRING "json-c 0.11" |
3304 | + |
3305 | +/* Define to the one symbol short name of this package. */ |
3306 | +#define PACKAGE_TARNAME "json-c" |
3307 | + |
3308 | +/* Define to the home page for this package. */ |
3309 | +#define PACKAGE_URL "" |
3310 | + |
3311 | +/* Define to the version of this package. */ |
3312 | +#define PACKAGE_VERSION "0.11" |
3313 | + |
3314 | +/* Define to 1 if you have the ANSI C header files. */ |
3315 | +#define STDC_HEADERS 1 |
3316 | + |
3317 | +/* Version number of package */ |
3318 | +#define VERSION "0.11" |
3319 | + |
3320 | +/* Define to empty if `const' does not conform to ANSI C. */ |
3321 | +/* #undef const */ |
3322 | + |
3323 | +/* Define to rpl_malloc if the replacement function should be used. */ |
3324 | +/* #undef malloc */ |
3325 | + |
3326 | +/* Define to rpl_realloc if the replacement function should be used. */ |
3327 | +/* #undef realloc */ |
3328 | + |
3329 | +/* Define to `unsigned int' if <sys/types.h> does not define. */ |
3330 | +/* #undef size_t */ |
3331 | |
3332 | === modified file 'config.h.in' |
3333 | --- config.h.in 2012-08-17 16:40:10 +0000 |
3334 | +++ config.h.in 2013-07-16 03:35:32 +0000 |
3335 | @@ -1,5 +1,8 @@ |
3336 | /* config.h.in. Generated from configure.in by autoheader. */ |
3337 | |
3338 | +/* Define if .gnu.warning accepts long strings. */ |
3339 | +#undef HAS_GNU_WARNING_LONG |
3340 | + |
3341 | /* Define to 1 if you have the <dlfcn.h> header file. */ |
3342 | #undef HAVE_DLFCN_H |
3343 | |
3344 | @@ -15,6 +18,9 @@ |
3345 | /* Define to 1 if you have the <limits.h> header file. */ |
3346 | #undef HAVE_LIMITS_H |
3347 | |
3348 | +/* Define to 1 if you have the <locale.h> header file. */ |
3349 | +#undef HAVE_LOCALE_H |
3350 | + |
3351 | /* Define to 1 if your system has a GNU libc compatible `malloc' function, and |
3352 | to 0 otherwise. */ |
3353 | #undef HAVE_MALLOC |
3354 | @@ -29,6 +35,12 @@ |
3355 | and to 0 otherwise. */ |
3356 | #undef HAVE_REALLOC |
3357 | |
3358 | +/* Define to 1 if you have the `setlocale' function. */ |
3359 | +#undef HAVE_SETLOCALE |
3360 | + |
3361 | +/* Define to 1 if you have the `snprintf' function. */ |
3362 | +#undef HAVE_SNPRINTF |
3363 | + |
3364 | /* Define to 1 if you have the <stdarg.h> header file. */ |
3365 | #undef HAVE_STDARG_H |
3366 | |
3367 | @@ -38,6 +50,12 @@ |
3368 | /* Define to 1 if you have the <stdlib.h> header file. */ |
3369 | #undef HAVE_STDLIB_H |
3370 | |
3371 | +/* Define to 1 if you have the `strcasecmp' function. */ |
3372 | +#undef HAVE_STRCASECMP |
3373 | + |
3374 | +/* Define to 1 if you have the `strdup' function. */ |
3375 | +#undef HAVE_STRDUP |
3376 | + |
3377 | /* Define to 1 if you have the `strerror' function. */ |
3378 | #undef HAVE_STRERROR |
3379 | |
3380 | @@ -56,6 +74,9 @@ |
3381 | /* Define to 1 if you have the <syslog.h> header file. */ |
3382 | #undef HAVE_SYSLOG_H |
3383 | |
3384 | +/* Define to 1 if you have the <sys/cdefs.h> header file. */ |
3385 | +#undef HAVE_SYS_CDEFS_H |
3386 | + |
3387 | /* Define to 1 if you have the <sys/param.h> header file. */ |
3388 | #undef HAVE_SYS_PARAM_H |
3389 | |
3390 | |
3391 | === added file 'config.log' |
3392 | --- config.log 1970-01-01 00:00:00 +0000 |
3393 | +++ config.log 2013-07-16 03:35:32 +0000 |
3394 | @@ -0,0 +1,998 @@ |
3395 | +This file contains any messages produced by compilers while |
3396 | +running configure, to aid debugging if configure makes a mistake. |
3397 | + |
3398 | +It was created by json-c configure 0.11, which was |
3399 | +generated by GNU Autoconf 2.68. Invocation command line was |
3400 | + |
3401 | + $ ./configure --prefix /home/erh/json-c/jci11 |
3402 | + |
3403 | +## --------- ## |
3404 | +## Platform. ## |
3405 | +## --------- ## |
3406 | + |
3407 | +hostname = poe.swapsimple.com |
3408 | +uname -m = i386 |
3409 | +uname -r = 6.0.1 |
3410 | +uname -s = NetBSD |
3411 | +uname -v = NetBSD 6.0.1 (GENERIC) |
3412 | + |
3413 | +/usr/bin/uname -p = i386 |
3414 | +/bin/uname -X = unknown |
3415 | + |
3416 | +/bin/arch = unknown |
3417 | +/usr/bin/arch -k = unknown |
3418 | +/usr/convex/getsysinfo = unknown |
3419 | +/usr/bin/hostinfo = unknown |
3420 | +/bin/machine = unknown |
3421 | +/usr/bin/oslevel = unknown |
3422 | +/bin/universe = unknown |
3423 | + |
3424 | +PATH: /space/netbsd/build-current/tools/bin |
3425 | +PATH: /home/erh/scripts |
3426 | +PATH: /usr/pkg/java/sun-1.5/bin |
3427 | +PATH: /ss/bin |
3428 | +PATH: /usr/pkg/java/sun-1.5/bin |
3429 | +PATH: /bin |
3430 | +PATH: /usr/bin |
3431 | +PATH: /usr/pkg/bin |
3432 | +PATH: /usr/local/bin |
3433 | +PATH: /usr/X11R7/bin |
3434 | +PATH: /usr/sbin |
3435 | +PATH: /sbin |
3436 | +PATH: /usr/pkg/sbin |
3437 | +PATH: /usr/X11R7/bin |
3438 | + |
3439 | + |
3440 | +## ----------- ## |
3441 | +## Core tests. ## |
3442 | +## ----------- ## |
3443 | + |
3444 | +configure:2416: checking for a BSD-compatible install |
3445 | +configure:2484: result: /usr/bin/install -c |
3446 | +configure:2495: checking whether build environment is sane |
3447 | +configure:2545: result: yes |
3448 | +configure:2686: checking for a thread-safe mkdir -p |
3449 | +configure:2725: result: ./install-sh -c -d |
3450 | +configure:2738: checking for gawk |
3451 | +configure:2768: result: no |
3452 | +configure:2738: checking for mawk |
3453 | +configure:2768: result: no |
3454 | +configure:2738: checking for nawk |
3455 | +configure:2768: result: no |
3456 | +configure:2738: checking for awk |
3457 | +configure:2754: found /usr/bin/awk |
3458 | +configure:2765: result: awk |
3459 | +configure:2776: checking whether make sets $(MAKE) |
3460 | +configure:2798: result: yes |
3461 | +configure:2879: checking whether make sets $(MAKE) |
3462 | +configure:2901: result: yes |
3463 | +configure:2949: checking for style of include used by make |
3464 | +configure:2977: result: GNU |
3465 | +configure:3047: checking for gcc |
3466 | +configure:3063: found /usr/bin/gcc |
3467 | +configure:3074: result: gcc |
3468 | +configure:3303: checking for C compiler version |
3469 | +configure:3312: gcc --version >&5 |
3470 | +gcc (NetBSD nb2 20110806) 4.5.3 |
3471 | +Copyright (C) 2010 Free Software Foundation, Inc. |
3472 | +This is free software; see the source for copying conditions. There is NO |
3473 | +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
3474 | + |
3475 | +configure:3323: $? = 0 |
3476 | +configure:3312: gcc -v >&5 |
3477 | +Using built-in specs. |
3478 | +COLLECT_GCC=gcc |
3479 | +Target: i486--netbsdelf |
3480 | +Configured with: /usr/src2/tools/gcc/../../external/gpl3/gcc/dist/configure --target=i486--netbsdelf --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb2 20111202' --enable-__cxa_atexit --with-arch=i486 --with-tune=nocona --with-mpc=/var/obj/mknative/i386/usr/src2/destdir.i386/usr --with-mpfr=/var/obj/mknative/i386/usr/src2/destdir.i386/usr --with-gmp=/var/obj/mknative/i386/usr/src2/destdir.i386/usr --enable-tls --disable-multilib --disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd5.99.56 --host=i486--netbsdelf |
3481 | +Thread model: posix |
3482 | +gcc version 4.5.3 (NetBSD nb2 20110806) |
3483 | +configure:3323: $? = 0 |
3484 | +configure:3312: gcc -V >&5 |
3485 | +gcc: '-V' option must have argument |
3486 | +configure:3323: $? = 1 |
3487 | +configure:3312: gcc -qversion >&5 |
3488 | +gcc: unrecognized option '-qversion' |
3489 | +gcc: no input files |
3490 | +configure:3323: $? = 1 |
3491 | +configure:3343: checking whether the C compiler works |
3492 | +configure:3365: gcc conftest.c >&5 |
3493 | +configure:3369: $? = 0 |
3494 | +configure:3417: result: yes |
3495 | +configure:3420: checking for C compiler default output file name |
3496 | +configure:3422: result: a.out |
3497 | +configure:3428: checking for suffix of executables |
3498 | +configure:3435: gcc -o conftest conftest.c >&5 |
3499 | +configure:3439: $? = 0 |
3500 | +configure:3461: result: |
3501 | +configure:3483: checking whether we are cross compiling |
3502 | +configure:3491: gcc -o conftest conftest.c >&5 |
3503 | +configure:3495: $? = 0 |
3504 | +configure:3502: ./conftest |
3505 | +configure:3506: $? = 0 |
3506 | +configure:3521: result: no |
3507 | +configure:3526: checking for suffix of object files |
3508 | +configure:3548: gcc -c conftest.c >&5 |
3509 | +configure:3552: $? = 0 |
3510 | +configure:3573: result: o |
3511 | +configure:3577: checking whether we are using the GNU C compiler |
3512 | +configure:3596: gcc -c conftest.c >&5 |
3513 | +configure:3596: $? = 0 |
3514 | +configure:3605: result: yes |
3515 | +configure:3614: checking whether gcc accepts -g |
3516 | +configure:3634: gcc -c -g conftest.c >&5 |
3517 | +configure:3634: $? = 0 |
3518 | +configure:3675: result: yes |
3519 | +configure:3692: checking for gcc option to accept ISO C89 |
3520 | +configure:3756: gcc -c -g -O2 conftest.c >&5 |
3521 | +configure:3756: $? = 0 |
3522 | +configure:3769: result: none needed |
3523 | +configure:3791: checking dependency style of gcc |
3524 | +configure:3901: result: gcc3 |
3525 | +configure:3922: checking how to run the C preprocessor |
3526 | +configure:3953: gcc -E conftest.c |
3527 | +configure:3953: $? = 0 |
3528 | +configure:3967: gcc -E conftest.c |
3529 | +conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory |
3530 | +compilation terminated. |
3531 | +configure:3967: $? = 1 |
3532 | +configure: failed program was: |
3533 | +| /* confdefs.h */ |
3534 | +| #define PACKAGE_NAME "json-c" |
3535 | +| #define PACKAGE_TARNAME "json-c" |
3536 | +| #define PACKAGE_VERSION "0.11" |
3537 | +| #define PACKAGE_STRING "json-c 0.11" |
3538 | +| #define PACKAGE_BUGREPORT "json-c@googlegroups.com" |
3539 | +| #define PACKAGE_URL "" |
3540 | +| #define PACKAGE "json-c" |
3541 | +| #define VERSION "0.11" |
3542 | +| /* end confdefs.h. */ |
3543 | +| #include <ac_nonexistent.h> |
3544 | +configure:3992: result: gcc -E |
3545 | +configure:4012: gcc -E conftest.c |
3546 | +configure:4012: $? = 0 |
3547 | +configure:4026: gcc -E conftest.c |
3548 | +conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory |
3549 | +compilation terminated. |
3550 | +configure:4026: $? = 1 |
3551 | +configure: failed program was: |
3552 | +| /* confdefs.h */ |
3553 | +| #define PACKAGE_NAME "json-c" |
3554 | +| #define PACKAGE_TARNAME "json-c" |
3555 | +| #define PACKAGE_VERSION "0.11" |
3556 | +| #define PACKAGE_STRING "json-c 0.11" |
3557 | +| #define PACKAGE_BUGREPORT "json-c@googlegroups.com" |
3558 | +| #define PACKAGE_URL "" |
3559 | +| #define PACKAGE "json-c" |
3560 | +| #define VERSION "0.11" |
3561 | +| /* end confdefs.h. */ |
3562 | +| #include <ac_nonexistent.h> |
3563 | +configure:4055: checking for grep that handles long lines and -e |
3564 | +configure:4113: result: /usr/bin/grep |
3565 | +configure:4118: checking for egrep |
3566 | +configure:4180: result: /usr/bin/grep -E |
3567 | +configure:4185: checking for ANSI C header files |
3568 | +configure:4205: gcc -c -g -O2 conftest.c >&5 |
3569 | +configure:4205: $? = 0 |
3570 | +configure:4278: gcc -o conftest -g -O2 conftest.c >&5 |
3571 | +configure:4278: $? = 0 |
3572 | +configure:4278: ./conftest |
3573 | +configure:4278: $? = 0 |
3574 | +configure:4289: result: yes |
3575 | +configure:4302: checking for sys/types.h |
3576 | +configure:4302: gcc -c -g -O2 conftest.c >&5 |
3577 | +configure:4302: $? = 0 |
3578 | +configure:4302: result: yes |
3579 | +configure:4302: checking for sys/stat.h |
3580 | +configure:4302: gcc -c -g -O2 conftest.c >&5 |
3581 | +configure:4302: $? = 0 |
3582 | +configure:4302: result: yes |
3583 | +configure:4302: checking for stdlib.h |
3584 | +configure:4302: gcc -c -g -O2 conftest.c >&5 |
3585 | +configure:4302: $? = 0 |
3586 | +configure:4302: result: yes |
3587 | +configure:4302: checking for string.h |
3588 | +configure:4302: gcc -c -g -O2 conftest.c >&5 |
3589 | +configure:4302: $? = 0 |
3590 | +configure:4302: result: yes |
3591 | +configure:4302: checking for memory.h |
3592 | +configure:4302: gcc -c -g -O2 conftest.c >&5 |
3593 | +configure:4302: $? = 0 |
3594 | +configure:4302: result: yes |
3595 | +configure:4302: checking for strings.h |
3596 | +configure:4302: gcc -c -g -O2 conftest.c >&5 |
3597 | +configure:4302: $? = 0 |
3598 | +configure:4302: result: yes |
3599 | +configure:4302: checking for inttypes.h |
3600 | +configure:4302: gcc -c -g -O2 conftest.c >&5 |
3601 | +configure:4302: $? = 0 |
3602 | +configure:4302: result: yes |
3603 | +configure:4302: checking for stdint.h |
3604 | +configure:4302: gcc -c -g -O2 conftest.c >&5 |
3605 | +configure:4302: $? = 0 |
3606 | +configure:4302: result: yes |
3607 | +configure:4302: checking for unistd.h |
3608 | +configure:4302: gcc -c -g -O2 conftest.c >&5 |
3609 | +configure:4302: $? = 0 |
3610 | +configure:4302: result: yes |
3611 | +configure:4317: checking fcntl.h usability |
3612 | +configure:4317: gcc -c -g -O2 conftest.c >&5 |
3613 | +configure:4317: $? = 0 |
3614 | +configure:4317: result: yes |
3615 | +configure:4317: checking fcntl.h presence |
3616 | +configure:4317: gcc -E conftest.c |
3617 | +configure:4317: $? = 0 |
3618 | +configure:4317: result: yes |
3619 | +configure:4317: checking for fcntl.h |
3620 | +configure:4317: result: yes |
3621 | +configure:4317: checking limits.h usability |
3622 | +configure:4317: gcc -c -g -O2 conftest.c >&5 |
3623 | +configure:4317: $? = 0 |
3624 | +configure:4317: result: yes |
3625 | +configure:4317: checking limits.h presence |
3626 | +configure:4317: gcc -E conftest.c |
3627 | +configure:4317: $? = 0 |
3628 | +configure:4317: result: yes |
3629 | +configure:4317: checking for limits.h |
3630 | +configure:4317: result: yes |
3631 | +configure:4317: checking for strings.h |
3632 | +configure:4317: result: yes |
3633 | +configure:4317: checking syslog.h usability |
3634 | +configure:4317: gcc -c -g -O2 conftest.c >&5 |
3635 | +configure:4317: $? = 0 |
3636 | +configure:4317: result: yes |
3637 | +configure:4317: checking syslog.h presence |
3638 | +configure:4317: gcc -E conftest.c |
3639 | +configure:4317: $? = 0 |
3640 | +configure:4317: result: yes |
3641 | +configure:4317: checking for syslog.h |
3642 | +configure:4317: result: yes |
3643 | +configure:4317: checking for unistd.h |
3644 | +configure:4317: result: yes |
3645 | +configure:4317: checking sys/cdefs.h usability |
3646 | +configure:4317: gcc -c -g -O2 conftest.c >&5 |
3647 | +configure:4317: $? = 0 |
3648 | +configure:4317: result: yes |
3649 | +configure:4317: checking sys/cdefs.h presence |
3650 | +configure:4317: gcc -E conftest.c |
3651 | +configure:4317: $? = 0 |
3652 | +configure:4317: result: yes |
3653 | +configure:4317: checking for sys/cdefs.h |
3654 | +configure:4317: result: yes |
3655 | +configure:4317: checking sys/param.h usability |
3656 | +configure:4317: gcc -c -g -O2 conftest.c >&5 |
3657 | +configure:4317: $? = 0 |
3658 | +configure:4317: result: yes |
3659 | +configure:4317: checking sys/param.h presence |
3660 | +configure:4317: gcc -E conftest.c |
3661 | +configure:4317: $? = 0 |
3662 | +configure:4317: result: yes |
3663 | +configure:4317: checking for sys/param.h |
3664 | +configure:4317: result: yes |
3665 | +configure:4317: checking stdarg.h usability |
3666 | +configure:4317: gcc -c -g -O2 conftest.c >&5 |
3667 | +configure:4317: $? = 0 |
3668 | +configure:4317: result: yes |
3669 | +configure:4317: checking stdarg.h presence |
3670 | +configure:4317: gcc -E conftest.c |
3671 | +configure:4317: $? = 0 |
3672 | +configure:4317: result: yes |
3673 | +configure:4317: checking for stdarg.h |
3674 | +configure:4317: result: yes |
3675 | +configure:4317: checking locale.h usability |
3676 | +configure:4317: gcc -c -g -O2 conftest.c >&5 |
3677 | +configure:4317: $? = 0 |
3678 | +configure:4317: result: yes |
3679 | +configure:4317: checking locale.h presence |
3680 | +configure:4317: gcc -E conftest.c |
3681 | +configure:4317: $? = 0 |
3682 | +configure:4317: result: yes |
3683 | +configure:4317: checking for locale.h |
3684 | +configure:4317: result: yes |
3685 | +configure:4327: checking for inttypes.h |
3686 | +configure:4327: result: yes |
3687 | +configure:4337: checking for an ANSI C-conforming const |
3688 | +configure:4402: gcc -c -g -O2 conftest.c >&5 |
3689 | +configure:4402: $? = 0 |
3690 | +configure:4409: result: yes |
3691 | +configure:4417: checking for size_t |
3692 | +configure:4417: gcc -c -g -O2 conftest.c >&5 |
3693 | +configure:4417: $? = 0 |
3694 | +configure:4417: gcc -c -g -O2 conftest.c >&5 |
3695 | +conftest.c: In function 'main': |
3696 | +conftest.c:67:21: error: expected expression before ')' token |
3697 | +configure:4417: $? = 1 |
3698 | +configure: failed program was: |
3699 | +| /* confdefs.h */ |
3700 | +| #define PACKAGE_NAME "json-c" |
3701 | +| #define PACKAGE_TARNAME "json-c" |
3702 | +| #define PACKAGE_VERSION "0.11" |
3703 | +| #define PACKAGE_STRING "json-c 0.11" |
3704 | +| #define PACKAGE_BUGREPORT "json-c@googlegroups.com" |
3705 | +| #define PACKAGE_URL "" |
3706 | +| #define PACKAGE "json-c" |
3707 | +| #define VERSION "0.11" |
3708 | +| #define STDC_HEADERS 1 |
3709 | +| #define HAVE_SYS_TYPES_H 1 |
3710 | +| #define HAVE_SYS_STAT_H 1 |
3711 | +| #define HAVE_STDLIB_H 1 |
3712 | +| #define HAVE_STRING_H 1 |
3713 | +| #define HAVE_MEMORY_H 1 |
3714 | +| #define HAVE_STRINGS_H 1 |
3715 | +| #define HAVE_INTTYPES_H 1 |
3716 | +| #define HAVE_STDINT_H 1 |
3717 | +| #define HAVE_UNISTD_H 1 |
3718 | +| #define HAVE_FCNTL_H 1 |
3719 | +| #define HAVE_LIMITS_H 1 |
3720 | +| #define HAVE_STRINGS_H 1 |
3721 | +| #define HAVE_SYSLOG_H 1 |
3722 | +| #define HAVE_UNISTD_H 1 |
3723 | +| #define HAVE_SYS_CDEFS_H 1 |
3724 | +| #define HAVE_SYS_PARAM_H 1 |
3725 | +| #define HAVE_STDARG_H 1 |
3726 | +| #define HAVE_LOCALE_H 1 |
3727 | +| #define JSON_C_HAVE_INTTYPES_H 1 |
3728 | +| /* end confdefs.h. */ |
3729 | +| #include <stdio.h> |
3730 | +| #ifdef HAVE_SYS_TYPES_H |
3731 | +| # include <sys/types.h> |
3732 | +| #endif |
3733 | +| #ifdef HAVE_SYS_STAT_H |
3734 | +| # include <sys/stat.h> |
3735 | +| #endif |
3736 | +| #ifdef STDC_HEADERS |
3737 | +| # include <stdlib.h> |
3738 | +| # include <stddef.h> |
3739 | +| #else |
3740 | +| # ifdef HAVE_STDLIB_H |
3741 | +| # include <stdlib.h> |
3742 | +| # endif |
3743 | +| #endif |
3744 | +| #ifdef HAVE_STRING_H |
3745 | +| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H |
3746 | +| # include <memory.h> |
3747 | +| # endif |
3748 | +| # include <string.h> |
3749 | +| #endif |
3750 | +| #ifdef HAVE_STRINGS_H |
3751 | +| # include <strings.h> |
3752 | +| #endif |
3753 | +| #ifdef HAVE_INTTYPES_H |
3754 | +| # include <inttypes.h> |
3755 | +| #endif |
3756 | +| #ifdef HAVE_STDINT_H |
3757 | +| # include <stdint.h> |
3758 | +| #endif |
3759 | +| #ifdef HAVE_UNISTD_H |
3760 | +| # include <unistd.h> |
3761 | +| #endif |
3762 | +| int |
3763 | +| main () |
3764 | +| { |
3765 | +| if (sizeof ((size_t))) |
3766 | +| return 0; |
3767 | +| ; |
3768 | +| return 0; |
3769 | +| } |
3770 | +configure:4417: result: yes |
3771 | +configure:4432: checking for vprintf |
3772 | +configure:4432: gcc -o conftest -g -O2 conftest.c >&5 |
3773 | +conftest.c:54:6: warning: conflicting types for built-in function 'vprintf' |
3774 | +configure:4432: $? = 0 |
3775 | +configure:4432: result: yes |
3776 | +configure:4438: checking for _doprnt |
3777 | +configure:4438: gcc -o conftest -g -O2 conftest.c >&5 |
3778 | +/var/tmp//ccsWyVjo.o: In function `main': |
3779 | +/home/erh/json-c/json-c-0.11/conftest.c:66: undefined reference to `_doprnt' |
3780 | +configure:4438: $? = 1 |
3781 | +configure: failed program was: |
3782 | +| /* confdefs.h */ |
3783 | +| #define PACKAGE_NAME "json-c" |
3784 | +| #define PACKAGE_TARNAME "json-c" |
3785 | +| #define PACKAGE_VERSION "0.11" |
3786 | +| #define PACKAGE_STRING "json-c 0.11" |
3787 | +| #define PACKAGE_BUGREPORT "json-c@googlegroups.com" |
3788 | +| #define PACKAGE_URL "" |
3789 | +| #define PACKAGE "json-c" |
3790 | +| #define VERSION "0.11" |
3791 | +| #define STDC_HEADERS 1 |
3792 | +| #define HAVE_SYS_TYPES_H 1 |
3793 | +| #define HAVE_SYS_STAT_H 1 |
3794 | +| #define HAVE_STDLIB_H 1 |
3795 | +| #define HAVE_STRING_H 1 |
3796 | +| #define HAVE_MEMORY_H 1 |
3797 | +| #define HAVE_STRINGS_H 1 |
3798 | +| #define HAVE_INTTYPES_H 1 |
3799 | +| #define HAVE_STDINT_H 1 |
3800 | +| #define HAVE_UNISTD_H 1 |
3801 | +| #define HAVE_FCNTL_H 1 |
3802 | +| #define HAVE_LIMITS_H 1 |
3803 | +| #define HAVE_STRINGS_H 1 |
3804 | +| #define HAVE_SYSLOG_H 1 |
3805 | +| #define HAVE_UNISTD_H 1 |
3806 | +| #define HAVE_SYS_CDEFS_H 1 |
3807 | +| #define HAVE_SYS_PARAM_H 1 |
3808 | +| #define HAVE_STDARG_H 1 |
3809 | +| #define HAVE_LOCALE_H 1 |
3810 | +| #define JSON_C_HAVE_INTTYPES_H 1 |
3811 | +| #define HAVE_VPRINTF 1 |
3812 | +| /* end confdefs.h. */ |
3813 | +| /* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt. |
3814 | +| For example, HP-UX 11i <limits.h> declares gettimeofday. */ |
3815 | +| #define _doprnt innocuous__doprnt |
3816 | +| |
3817 | +| /* System header to define __stub macros and hopefully few prototypes, |
3818 | +| which can conflict with char _doprnt (); below. |
3819 | +| Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
3820 | +| <limits.h> exists even on freestanding compilers. */ |
3821 | +| |
3822 | +| #ifdef __STDC__ |
3823 | +| # include <limits.h> |
3824 | +| #else |
3825 | +| # include <assert.h> |
3826 | +| #endif |
3827 | +| |
3828 | +| #undef _doprnt |
3829 | +| |
3830 | +| /* Override any GCC internal prototype to avoid an error. |
3831 | +| Use char because int might match the return type of a GCC |
3832 | +| builtin and then its argument prototype would still apply. */ |
3833 | +| #ifdef __cplusplus |
3834 | +| extern "C" |
3835 | +| #endif |
3836 | +| char _doprnt (); |
3837 | +| /* The GNU C library defines this for functions which it implements |
3838 | +| to always fail with ENOSYS. Some functions are actually named |
3839 | +| something starting with __ and the normal name is an alias. */ |
3840 | +| #if defined __stub__doprnt || defined __stub____doprnt |
3841 | +| choke me |
3842 | +| #endif |
3843 | +| |
3844 | +| int |
3845 | +| main () |
3846 | +| { |
3847 | +| return _doprnt (); |
3848 | +| ; |
3849 | +| return 0; |
3850 | +| } |
3851 | +configure:4438: result: no |
3852 | +configure:4449: checking for working memcmp |
3853 | +configure:4492: gcc -o conftest -g -O2 conftest.c >&5 |
3854 | +configure:4492: $? = 0 |
3855 | +configure:4492: ./conftest |
3856 | +configure:4492: $? = 0 |
3857 | +configure:4502: result: yes |
3858 | +configure:4513: checking for stdlib.h |
3859 | +configure:4513: result: yes |
3860 | +configure:4523: checking for GNU libc compatible malloc |
3861 | +configure:4547: gcc -o conftest -g -O2 conftest.c >&5 |
3862 | +configure:4547: $? = 0 |
3863 | +configure:4547: ./conftest |
3864 | +configure:4547: $? = 0 |
3865 | +configure:4557: result: yes |
3866 | +configure:4580: checking for stdlib.h |
3867 | +configure:4580: result: yes |
3868 | +configure:4590: checking for GNU libc compatible realloc |
3869 | +configure:4614: gcc -o conftest -g -O2 conftest.c >&5 |
3870 | +configure:4614: $? = 0 |
3871 | +configure:4614: ./conftest |
3872 | +configure:4614: $? = 0 |
3873 | +configure:4624: result: yes |
3874 | +configure:4648: checking for strcasecmp |
3875 | +configure:4648: gcc -o conftest -g -O2 conftest.c >&5 |
3876 | +conftest.c:59:6: warning: conflicting types for built-in function 'strcasecmp' |
3877 | +configure:4648: $? = 0 |
3878 | +configure:4648: result: yes |
3879 | +configure:4648: checking for strdup |
3880 | +configure:4648: gcc -o conftest -g -O2 conftest.c >&5 |
3881 | +conftest.c:60:6: warning: conflicting types for built-in function 'strdup' |
3882 | +configure:4648: $? = 0 |
3883 | +configure:4648: result: yes |
3884 | +configure:4648: checking for strndup |
3885 | +configure:4648: gcc -o conftest -g -O2 conftest.c >&5 |
3886 | +conftest.c:61:6: warning: conflicting types for built-in function 'strndup' |
3887 | +configure:4648: $? = 0 |
3888 | +configure:4648: result: yes |
3889 | +configure:4648: checking for strerror |
3890 | +configure:4648: gcc -o conftest -g -O2 conftest.c >&5 |
3891 | +configure:4648: $? = 0 |
3892 | +configure:4648: result: yes |
3893 | +configure:4648: checking for snprintf |
3894 | +configure:4648: gcc -o conftest -g -O2 conftest.c >&5 |
3895 | +conftest.c:63:6: warning: conflicting types for built-in function 'snprintf' |
3896 | +configure:4648: $? = 0 |
3897 | +configure:4648: result: yes |
3898 | +configure:4648: checking for vsnprintf |
3899 | +configure:4648: gcc -o conftest -g -O2 conftest.c >&5 |
3900 | +conftest.c:64:6: warning: conflicting types for built-in function 'vsnprintf' |
3901 | +configure:4648: $? = 0 |
3902 | +configure:4648: result: yes |
3903 | +configure:4648: checking for vasprintf |
3904 | +configure:4648: gcc -o conftest -g -O2 conftest.c >&5 |
3905 | +configure:4648: $? = 0 |
3906 | +configure:4648: result: yes |
3907 | +configure:4648: checking for open |
3908 | +configure:4648: gcc -o conftest -g -O2 conftest.c >&5 |
3909 | +configure:4648: $? = 0 |
3910 | +configure:4648: result: yes |
3911 | +configure:4648: checking for vsyslog |
3912 | +configure:4648: gcc -o conftest -g -O2 conftest.c >&5 |
3913 | +configure:4648: $? = 0 |
3914 | +configure:4648: result: yes |
3915 | +configure:4648: checking for strncasecmp |
3916 | +configure:4648: gcc -o conftest -g -O2 conftest.c >&5 |
3917 | +conftest.c:68:6: warning: conflicting types for built-in function 'strncasecmp' |
3918 | +configure:4648: $? = 0 |
3919 | +configure:4648: result: yes |
3920 | +configure:4648: checking for setlocale |
3921 | +configure:4648: gcc -o conftest -g -O2 conftest.c >&5 |
3922 | +/var/tmp//cca55u2q.o: In function `main': |
3923 | +/home/erh/json-c/json-c-0.11/conftest.c:80: warning: warning: reference to compatibility setlocale();include <locale.h> for correct reference |
3924 | +configure:4648: $? = 0 |
3925 | +configure:4648: result: yes |
3926 | +configure:4666: checking if .gnu.warning accepts long strings |
3927 | +configure:4677: gcc -o conftest -g -O2 conftest.c >&5 |
3928 | +/var/tmp//ccUEpfjq.s: Assembler messages: |
3929 | +/var/tmp//ccUEpfjq.s:12: Error: character following name is not '#' |
3930 | +configure:4677: $? = 1 |
3931 | +configure: failed program was: |
3932 | +| /* confdefs.h */ |
3933 | +| #define PACKAGE_NAME "json-c" |
3934 | +| #define PACKAGE_TARNAME "json-c" |
3935 | +| #define PACKAGE_VERSION "0.11" |
3936 | +| #define PACKAGE_STRING "json-c 0.11" |
3937 | +| #define PACKAGE_BUGREPORT "json-c@googlegroups.com" |
3938 | +| #define PACKAGE_URL "" |
3939 | +| #define PACKAGE "json-c" |
3940 | +| #define VERSION "0.11" |
3941 | +| #define STDC_HEADERS 1 |
3942 | +| #define HAVE_SYS_TYPES_H 1 |
3943 | +| #define HAVE_SYS_STAT_H 1 |
3944 | +| #define HAVE_STDLIB_H 1 |
3945 | +| #define HAVE_STRING_H 1 |
3946 | +| #define HAVE_MEMORY_H 1 |
3947 | +| #define HAVE_STRINGS_H 1 |
3948 | +| #define HAVE_INTTYPES_H 1 |
3949 | +| #define HAVE_STDINT_H 1 |
3950 | +| #define HAVE_UNISTD_H 1 |
3951 | +| #define HAVE_FCNTL_H 1 |
3952 | +| #define HAVE_LIMITS_H 1 |
3953 | +| #define HAVE_STRINGS_H 1 |
3954 | +| #define HAVE_SYSLOG_H 1 |
3955 | +| #define HAVE_UNISTD_H 1 |
3956 | +| #define HAVE_SYS_CDEFS_H 1 |
3957 | +| #define HAVE_SYS_PARAM_H 1 |
3958 | +| #define HAVE_STDARG_H 1 |
3959 | +| #define HAVE_LOCALE_H 1 |
3960 | +| #define JSON_C_HAVE_INTTYPES_H 1 |
3961 | +| #define HAVE_VPRINTF 1 |
3962 | +| #define HAVE_STDLIB_H 1 |
3963 | +| #define HAVE_MALLOC 1 |
3964 | +| #define HAVE_STDLIB_H 1 |
3965 | +| #define HAVE_REALLOC 1 |
3966 | +| #define HAVE_STRCASECMP 1 |
3967 | +| #define HAVE_STRDUP 1 |
3968 | +| #define HAVE_STRNDUP 1 |
3969 | +| #define HAVE_STRERROR 1 |
3970 | +| #define HAVE_SNPRINTF 1 |
3971 | +| #define HAVE_VSNPRINTF 1 |
3972 | +| #define HAVE_VASPRINTF 1 |
3973 | +| #define HAVE_OPEN 1 |
3974 | +| #define HAVE_VSYSLOG 1 |
3975 | +| #define HAVE_STRNCASECMP 1 |
3976 | +| #define HAVE_SETLOCALE 1 |
3977 | +| /* end confdefs.h. */ |
3978 | +| |
3979 | +| extern void json_object_get(); |
3980 | +| __asm__(".section .gnu.json_object_get,\n\t.ascii \"Please link against libjson-c instead of libjson\"\n\t.text"); |
3981 | +| |
3982 | +| int main(int c,char* v) {return 0;} |
3983 | +| |
3984 | +configure:4687: result: no |
3985 | +configure:4730: checking build system type |
3986 | +configure:4744: result: i386-unknown-netbsdelf6.0.1 |
3987 | +configure:4764: checking host system type |
3988 | +configure:4777: result: i386-unknown-netbsdelf6.0.1 |
3989 | +configure:4797: checking for a sed that does not truncate output |
3990 | +configure:4861: result: /usr/bin/sed |
3991 | +configure:4879: checking for fgrep |
3992 | +configure:4941: result: /usr/bin/grep -F |
3993 | +configure:4976: checking for ld used by gcc |
3994 | +configure:5043: result: /usr/bin/ld |
3995 | +configure:5050: checking if the linker (/usr/bin/ld) is GNU ld |
3996 | +configure:5065: result: yes |
3997 | +configure:5077: checking for BSD- or MS-compatible name lister (nm) |
3998 | +configure:5126: result: /usr/bin/nm -B |
3999 | +configure:5244: checking the name lister (/usr/bin/nm -B) interface |
4000 | +configure:5251: gcc -c -g -O2 conftest.c >&5 |
4001 | +configure:5254: /usr/bin/nm -B "conftest.o" |
4002 | +configure:5257: output |
4003 | +00000000 B some_variable |
4004 | +configure:5264: result: BSD nm |
4005 | +configure:5267: checking whether ln -s works |
4006 | +configure:5271: result: yes |
4007 | +configure:5279: checking the maximum length of command line arguments |
4008 | +configure:5399: result: 196608 |
4009 | +configure:5416: checking whether the shell understands some XSI constructs |
4010 | +configure:5426: result: yes |
4011 | +configure:5430: checking whether the shell understands "+=" |
4012 | +configure:5436: result: no |
4013 | +configure:5471: checking for /usr/bin/ld option to reload object files |
4014 | +configure:5478: result: -r |
4015 | +configure:5547: checking for objdump |
4016 | +configure:5563: found /usr/bin/objdump |
4017 | +configure:5574: result: objdump |
4018 | +configure:5606: checking how to recognize dependent libraries |
4019 | +configure:5802: result: match_pattern /lib[^/]+(\.so|_pic\.a)$ |
4020 | +configure:5862: checking for ar |
4021 | +configure:5878: found /usr/bin/ar |
4022 | +configure:5889: result: ar |
4023 | +configure:5967: checking for strip |
4024 | +configure:5983: found /usr/bin/strip |
4025 | +configure:5994: result: strip |
4026 | +configure:6066: checking for ranlib |
4027 | +configure:6082: found /usr/bin/ranlib |
4028 | +configure:6093: result: ranlib |
4029 | +configure:6183: checking command to parse /usr/bin/nm -B output from gcc object |
4030 | +configure:6301: gcc -c -g -O2 conftest.c >&5 |
4031 | +configure:6304: $? = 0 |
4032 | +configure:6308: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm |
4033 | +configure:6311: $? = 0 |
4034 | +configure:6365: gcc -o conftest -g -O2 conftest.c conftstm.o >&5 |
4035 | +configure:6368: $? = 0 |
4036 | +configure:6406: result: ok |
4037 | +configure:7211: checking for dlfcn.h |
4038 | +configure:7211: gcc -c -g -O2 conftest.c >&5 |
4039 | +configure:7211: $? = 0 |
4040 | +configure:7211: result: yes |
4041 | +configure:7395: checking for objdir |
4042 | +configure:7410: result: .libs |
4043 | +configure:7702: checking if gcc supports -fno-rtti -fno-exceptions |
4044 | +configure:7720: gcc -c -g -O2 -fno-rtti -fno-exceptions conftest.c >&5 |
4045 | +cc1: warning: command line option "-fno-rtti" is valid for C++/ObjC++ but not for C |
4046 | +configure:7724: $? = 0 |
4047 | +configure:7737: result: no |
4048 | +configure:7757: checking for gcc option to produce PIC |
4049 | +configure:8029: result: -fPIC -DPIC |
4050 | +configure:8041: checking if gcc PIC flag -fPIC -DPIC works |
4051 | +configure:8059: gcc -c -g -O2 -fPIC -DPIC -DPIC conftest.c >&5 |
4052 | +configure:8063: $? = 0 |
4053 | +configure:8076: result: yes |
4054 | +configure:8100: checking if gcc static flag -static works |
4055 | +configure:8128: result: yes |
4056 | +configure:8143: checking if gcc supports -c -o file.o |
4057 | +configure:8164: gcc -c -g -O2 -o out/conftest2.o conftest.c >&5 |
4058 | +configure:8168: $? = 0 |
4059 | +configure:8190: result: yes |
4060 | +configure:8198: checking if gcc supports -c -o file.o |
4061 | +configure:8245: result: yes |
4062 | +configure:8278: checking whether the gcc linker (/usr/bin/ld) supports shared libraries |
4063 | +configure:9265: result: yes |
4064 | +configure:9302: checking whether -lc should be explicitly linked in |
4065 | +configure:9307: gcc -c -g -O2 conftest.c >&5 |
4066 | +configure:9310: $? = 0 |
4067 | +configure:9325: gcc -shared conftest.o -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /usr/bin/grep -lc \>/dev/null 2\>\&1 |
4068 | +configure:9328: $? = 0 |
4069 | +configure:9340: result: no |
4070 | +configure:9504: checking dynamic linker characteristics |
4071 | +configure:10155: result: NetBSD ld.elf_so |
4072 | +configure:10257: checking how to hardcode library paths into programs |
4073 | +configure:10282: result: immediate |
4074 | +configure:10802: checking whether stripping libraries is possible |
4075 | +configure:10807: result: yes |
4076 | +configure:10842: checking if libtool supports shared libraries |
4077 | +configure:10844: result: yes |
4078 | +configure:10847: checking whether to build shared libraries |
4079 | +configure:10868: result: yes |
4080 | +configure:10871: checking whether to build static libraries |
4081 | +configure:10875: result: yes |
4082 | +configure:11048: creating ./config.status |
4083 | + |
4084 | +## ---------------------- ## |
4085 | +## Running config.status. ## |
4086 | +## ---------------------- ## |
4087 | + |
4088 | +This file was extended by json-c config.status 0.11, which was |
4089 | +generated by GNU Autoconf 2.68. Invocation command line was |
4090 | + |
4091 | + CONFIG_FILES = |
4092 | + CONFIG_HEADERS = |
4093 | + CONFIG_LINKS = |
4094 | + CONFIG_COMMANDS = |
4095 | + $ ./config.status |
4096 | + |
4097 | +on poe.swapsimple.com |
4098 | + |
4099 | +config.status:1101: creating Makefile |
4100 | +config.status:1101: creating json.pc |
4101 | +config.status:1101: creating json-c.pc |
4102 | +config.status:1101: creating tests/Makefile |
4103 | +config.status:1101: creating json-c-uninstalled.pc |
4104 | +config.status:1101: creating config.h |
4105 | +config.status:1101: creating json_config.h |
4106 | +config.status:1330: executing depfiles commands |
4107 | +config.status:1330: executing libtool commands |
4108 | + |
4109 | +## ---------------- ## |
4110 | +## Cache variables. ## |
4111 | +## ---------------- ## |
4112 | + |
4113 | +ac_cv_build=i386-unknown-netbsdelf6.0.1 |
4114 | +ac_cv_c_compiler_gnu=yes |
4115 | +ac_cv_c_const=yes |
4116 | +ac_cv_env_CC_set= |
4117 | +ac_cv_env_CC_value= |
4118 | +ac_cv_env_CFLAGS_set= |
4119 | +ac_cv_env_CFLAGS_value= |
4120 | +ac_cv_env_CPPFLAGS_set= |
4121 | +ac_cv_env_CPPFLAGS_value= |
4122 | +ac_cv_env_CPP_set= |
4123 | +ac_cv_env_CPP_value= |
4124 | +ac_cv_env_LDFLAGS_set= |
4125 | +ac_cv_env_LDFLAGS_value= |
4126 | +ac_cv_env_LIBS_set= |
4127 | +ac_cv_env_LIBS_value= |
4128 | +ac_cv_env_build_alias_set= |
4129 | +ac_cv_env_build_alias_value= |
4130 | +ac_cv_env_host_alias_set= |
4131 | +ac_cv_env_host_alias_value= |
4132 | +ac_cv_env_target_alias_set= |
4133 | +ac_cv_env_target_alias_value= |
4134 | +ac_cv_func__doprnt=no |
4135 | +ac_cv_func_malloc_0_nonnull=yes |
4136 | +ac_cv_func_memcmp_working=yes |
4137 | +ac_cv_func_open=yes |
4138 | +ac_cv_func_realloc_0_nonnull=yes |
4139 | +ac_cv_func_setlocale=yes |
4140 | +ac_cv_func_snprintf=yes |
4141 | +ac_cv_func_strcasecmp=yes |
4142 | +ac_cv_func_strdup=yes |
4143 | +ac_cv_func_strerror=yes |
4144 | +ac_cv_func_strncasecmp=yes |
4145 | +ac_cv_func_strndup=yes |
4146 | +ac_cv_func_vasprintf=yes |
4147 | +ac_cv_func_vprintf=yes |
4148 | +ac_cv_func_vsnprintf=yes |
4149 | +ac_cv_func_vsyslog=yes |
4150 | +ac_cv_header_dlfcn_h=yes |
4151 | +ac_cv_header_fcntl_h=yes |
4152 | +ac_cv_header_inttypes_h=yes |
4153 | +ac_cv_header_limits_h=yes |
4154 | +ac_cv_header_locale_h=yes |
4155 | +ac_cv_header_memory_h=yes |
4156 | +ac_cv_header_stdarg_h=yes |
4157 | +ac_cv_header_stdc=yes |
4158 | +ac_cv_header_stdint_h=yes |
4159 | +ac_cv_header_stdlib_h=yes |
4160 | +ac_cv_header_string_h=yes |
4161 | +ac_cv_header_strings_h=yes |
4162 | +ac_cv_header_sys_cdefs_h=yes |
4163 | +ac_cv_header_sys_param_h=yes |
4164 | +ac_cv_header_sys_stat_h=yes |
4165 | +ac_cv_header_sys_types_h=yes |
4166 | +ac_cv_header_syslog_h=yes |
4167 | +ac_cv_header_unistd_h=yes |
4168 | +ac_cv_host=i386-unknown-netbsdelf6.0.1 |
4169 | +ac_cv_objext=o |
4170 | +ac_cv_path_EGREP='/usr/bin/grep -E' |
4171 | +ac_cv_path_FGREP='/usr/bin/grep -F' |
4172 | +ac_cv_path_GREP=/usr/bin/grep |
4173 | +ac_cv_path_SED=/usr/bin/sed |
4174 | +ac_cv_path_install='/usr/bin/install -c' |
4175 | +ac_cv_prog_AWK=awk |
4176 | +ac_cv_prog_CPP='gcc -E' |
4177 | +ac_cv_prog_ac_ct_AR=ar |
4178 | +ac_cv_prog_ac_ct_CC=gcc |
4179 | +ac_cv_prog_ac_ct_OBJDUMP=objdump |
4180 | +ac_cv_prog_ac_ct_RANLIB=ranlib |
4181 | +ac_cv_prog_ac_ct_STRIP=strip |
4182 | +ac_cv_prog_cc_c89= |
4183 | +ac_cv_prog_cc_g=yes |
4184 | +ac_cv_prog_make_make_set=yes |
4185 | +ac_cv_type_size_t=yes |
4186 | +am_cv_CC_dependencies_compiler_type=gcc3 |
4187 | +lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' |
4188 | +lt_cv_file_magic_cmd='$MAGIC_CMD' |
4189 | +lt_cv_file_magic_test_file= |
4190 | +lt_cv_ld_reload_flag=-r |
4191 | +lt_cv_nm_interface='BSD nm' |
4192 | +lt_cv_objdir=.libs |
4193 | +lt_cv_path_LD=/usr/bin/ld |
4194 | +lt_cv_path_NM='/usr/bin/nm -B' |
4195 | +lt_cv_prog_compiler_c_o=yes |
4196 | +lt_cv_prog_compiler_pic_works=yes |
4197 | +lt_cv_prog_compiler_rtti_exceptions=no |
4198 | +lt_cv_prog_compiler_static_works=yes |
4199 | +lt_cv_prog_gnu_ld=yes |
4200 | +lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\' |
4201 | +lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\) $/ {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/ {"\2", (void *) \&\2},/p'\' |
4202 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \([^ ]*\) $/ {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \(lib[^ ]*\)$/ {"\2", (void *) \&\2},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/ {"lib\2", (void *) \&\2},/p'\' |
4203 | +lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\' |
4204 | +lt_cv_sys_max_cmd_len=196608 |
4205 | + |
4206 | +## ----------------- ## |
4207 | +## Output variables. ## |
4208 | +## ----------------- ## |
4209 | + |
4210 | +ACLOCAL='${SHELL} /home/erh/json-c/json-c-0.11/missing --run aclocal-1.11' |
4211 | +AMDEPBACKSLASH='\' |
4212 | +AMDEP_FALSE='#' |
4213 | +AMDEP_TRUE='' |
4214 | +AMTAR='${SHELL} /home/erh/json-c/json-c-0.11/missing --run tar' |
4215 | +AR='ar' |
4216 | +AUTOCONF='${SHELL} /home/erh/json-c/json-c-0.11/missing --run autoconf' |
4217 | +AUTOHEADER='${SHELL} /home/erh/json-c/json-c-0.11/missing --run autoheader' |
4218 | +AUTOMAKE='${SHELL} /home/erh/json-c/json-c-0.11/missing --run automake-1.11' |
4219 | +AWK='awk' |
4220 | +CC='gcc' |
4221 | +CCDEPMODE='depmode=gcc3' |
4222 | +CFLAGS='-g -O2' |
4223 | +CPP='gcc -E' |
4224 | +CPPFLAGS='' |
4225 | +CYGPATH_W='echo' |
4226 | +DEFS='-DHAVE_CONFIG_H' |
4227 | +DEPDIR='.deps' |
4228 | +DSYMUTIL='' |
4229 | +DUMPBIN='' |
4230 | +ECHO_C='' |
4231 | +ECHO_N='-n' |
4232 | +ECHO_T='' |
4233 | +EGREP='/usr/bin/grep -E' |
4234 | +ENABLE_OLDNAME_COMPAT_FALSE='#' |
4235 | +ENABLE_OLDNAME_COMPAT_TRUE='' |
4236 | +EXEEXT='' |
4237 | +FGREP='/usr/bin/grep -F' |
4238 | +GREP='/usr/bin/grep' |
4239 | +INSTALL_DATA='${INSTALL} -m 644' |
4240 | +INSTALL_PROGRAM='${INSTALL}' |
4241 | +INSTALL_SCRIPT='${INSTALL}' |
4242 | +INSTALL_STRIP_PROGRAM='$(install_sh) -c -s' |
4243 | +LD='/usr/bin/ld' |
4244 | +LDFLAGS='' |
4245 | +LIBOBJS='' |
4246 | +LIBS='' |
4247 | +LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
4248 | +LIPO='' |
4249 | +LN_S='ln -s' |
4250 | +LTLIBOBJS='' |
4251 | +MAKEINFO='${SHELL} /home/erh/json-c/json-c-0.11/missing --run makeinfo' |
4252 | +MKDIR_P='./install-sh -c -d' |
4253 | +NM='/usr/bin/nm -B' |
4254 | +NMEDIT='' |
4255 | +OBJDUMP='objdump' |
4256 | +OBJEXT='o' |
4257 | +OTOOL64='' |
4258 | +OTOOL='' |
4259 | +PACKAGE='json-c' |
4260 | +PACKAGE_BUGREPORT='json-c@googlegroups.com' |
4261 | +PACKAGE_NAME='json-c' |
4262 | +PACKAGE_STRING='json-c 0.11' |
4263 | +PACKAGE_TARNAME='json-c' |
4264 | +PACKAGE_URL='' |
4265 | +PACKAGE_VERSION='0.11' |
4266 | +PATH_SEPARATOR=':' |
4267 | +RANLIB='ranlib' |
4268 | +SED='/usr/bin/sed' |
4269 | +SET_MAKE='' |
4270 | +SHELL='/bin/ksh' |
4271 | +STRIP='strip' |
4272 | +VERSION='0.11' |
4273 | +ac_ct_CC='gcc' |
4274 | +ac_ct_DUMPBIN='' |
4275 | +am__EXEEXT_FALSE='' |
4276 | +am__EXEEXT_TRUE='#' |
4277 | +am__fastdepCC_FALSE='#' |
4278 | +am__fastdepCC_TRUE='' |
4279 | +am__include='include' |
4280 | +am__isrc='' |
4281 | +am__leading_dot='.' |
4282 | +am__quote='' |
4283 | +am__tar='${AMTAR} chof - "$$tardir"' |
4284 | +am__untar='${AMTAR} xf -' |
4285 | +bindir='${exec_prefix}/bin' |
4286 | +build='i386-unknown-netbsdelf6.0.1' |
4287 | +build_alias='' |
4288 | +build_cpu='i386' |
4289 | +build_os='netbsdelf6.0.1' |
4290 | +build_vendor='unknown' |
4291 | +datadir='${datarootdir}' |
4292 | +datarootdir='${prefix}/share' |
4293 | +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' |
4294 | +dvidir='${docdir}' |
4295 | +exec_prefix='${prefix}' |
4296 | +host='i386-unknown-netbsdelf6.0.1' |
4297 | +host_alias='' |
4298 | +host_cpu='i386' |
4299 | +host_os='netbsdelf6.0.1' |
4300 | +host_vendor='unknown' |
4301 | +htmldir='${docdir}' |
4302 | +includedir='${prefix}/include' |
4303 | +infodir='${datarootdir}/info' |
4304 | +install_sh='${SHELL} /home/erh/json-c/json-c-0.11/install-sh' |
4305 | +libdir='${exec_prefix}/lib' |
4306 | +libexecdir='${exec_prefix}/libexec' |
4307 | +localedir='${datarootdir}/locale' |
4308 | +localstatedir='${prefix}/var' |
4309 | +lt_ECHO='/bin/echo' |
4310 | +mandir='${datarootdir}/man' |
4311 | +mkdir_p='$(top_builddir)/./install-sh -c -d' |
4312 | +oldincludedir='/usr/include' |
4313 | +pdfdir='${docdir}' |
4314 | +prefix='/home/erh/json-c/jci11' |
4315 | +program_transform_name='s,x,x,' |
4316 | +psdir='${docdir}' |
4317 | +sbindir='${exec_prefix}/sbin' |
4318 | +sharedstatedir='${prefix}/com' |
4319 | +sysconfdir='${prefix}/etc' |
4320 | +target_alias='' |
4321 | + |
4322 | +## ----------- ## |
4323 | +## confdefs.h. ## |
4324 | +## ----------- ## |
4325 | + |
4326 | +/* confdefs.h */ |
4327 | +#define PACKAGE_NAME "json-c" |
4328 | +#define PACKAGE_TARNAME "json-c" |
4329 | +#define PACKAGE_VERSION "0.11" |
4330 | +#define PACKAGE_STRING "json-c 0.11" |
4331 | +#define PACKAGE_BUGREPORT "json-c@googlegroups.com" |
4332 | +#define PACKAGE_URL "" |
4333 | +#define PACKAGE "json-c" |
4334 | +#define VERSION "0.11" |
4335 | +#define STDC_HEADERS 1 |
4336 | +#define HAVE_SYS_TYPES_H 1 |
4337 | +#define HAVE_SYS_STAT_H 1 |
4338 | +#define HAVE_STDLIB_H 1 |
4339 | +#define HAVE_STRING_H 1 |
4340 | +#define HAVE_MEMORY_H 1 |
4341 | +#define HAVE_STRINGS_H 1 |
4342 | +#define HAVE_INTTYPES_H 1 |
4343 | +#define HAVE_STDINT_H 1 |
4344 | +#define HAVE_UNISTD_H 1 |
4345 | +#define HAVE_FCNTL_H 1 |
4346 | +#define HAVE_LIMITS_H 1 |
4347 | +#define HAVE_STRINGS_H 1 |
4348 | +#define HAVE_SYSLOG_H 1 |
4349 | +#define HAVE_UNISTD_H 1 |
4350 | +#define HAVE_SYS_CDEFS_H 1 |
4351 | +#define HAVE_SYS_PARAM_H 1 |
4352 | +#define HAVE_STDARG_H 1 |
4353 | +#define HAVE_LOCALE_H 1 |
4354 | +#define JSON_C_HAVE_INTTYPES_H 1 |
4355 | +#define HAVE_VPRINTF 1 |
4356 | +#define HAVE_STDLIB_H 1 |
4357 | +#define HAVE_MALLOC 1 |
4358 | +#define HAVE_STDLIB_H 1 |
4359 | +#define HAVE_REALLOC 1 |
4360 | +#define HAVE_STRCASECMP 1 |
4361 | +#define HAVE_STRDUP 1 |
4362 | +#define HAVE_STRNDUP 1 |
4363 | +#define HAVE_STRERROR 1 |
4364 | +#define HAVE_SNPRINTF 1 |
4365 | +#define HAVE_VSNPRINTF 1 |
4366 | +#define HAVE_VASPRINTF 1 |
4367 | +#define HAVE_OPEN 1 |
4368 | +#define HAVE_VSYSLOG 1 |
4369 | +#define HAVE_STRNCASECMP 1 |
4370 | +#define HAVE_SETLOCALE 1 |
4371 | +#define HAVE_DLFCN_H 1 |
4372 | +#define LT_OBJDIR ".libs/" |
4373 | + |
4374 | +configure: exit 0 |
4375 | + |
4376 | +## ---------------------- ## |
4377 | +## Running config.status. ## |
4378 | +## ---------------------- ## |
4379 | + |
4380 | +This file was extended by json-c config.status 0.11, which was |
4381 | +generated by GNU Autoconf 2.68. Invocation command line was |
4382 | + |
4383 | + CONFIG_FILES = |
4384 | + CONFIG_HEADERS = |
4385 | + CONFIG_LINKS = |
4386 | + CONFIG_COMMANDS = |
4387 | + $ ./config.status config.h |
4388 | + |
4389 | +on poe.swapsimple.com |
4390 | + |
4391 | +config.status:1101: creating config.h |
4392 | +config.status:1282: config.h is unchanged |
4393 | |
4394 | === added file 'config.status' |
4395 | --- config.status 1970-01-01 00:00:00 +0000 |
4396 | +++ config.status 2013-07-16 03:35:32 +0000 |
4397 | @@ -0,0 +1,2072 @@ |
4398 | +#! /bin/ksh |
4399 | +# Generated by configure. |
4400 | +# Run this file to recreate the current configuration. |
4401 | +# Compiler output produced by configure, useful for debugging |
4402 | +# configure, is in config.log if it exists. |
4403 | + |
4404 | +debug=false |
4405 | +ac_cs_recheck=false |
4406 | +ac_cs_silent=false |
4407 | + |
4408 | +SHELL=${CONFIG_SHELL-/bin/ksh} |
4409 | +export SHELL |
4410 | +## -------------------- ## |
4411 | +## M4sh Initialization. ## |
4412 | +## -------------------- ## |
4413 | + |
4414 | +# Be more Bourne compatible |
4415 | +DUALCASE=1; export DUALCASE # for MKS sh |
4416 | +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : |
4417 | + emulate sh |
4418 | + NULLCMD=: |
4419 | + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which |
4420 | + # is contrary to our usage. Disable this feature. |
4421 | + alias -g '${1+"$@"}'='"$@"' |
4422 | + setopt NO_GLOB_SUBST |
4423 | +else |
4424 | + case `(set -o) 2>/dev/null` in #( |
4425 | + *posix*) : |
4426 | + set -o posix ;; #( |
4427 | + *) : |
4428 | + ;; |
4429 | +esac |
4430 | +fi |
4431 | + |
4432 | + |
4433 | +as_nl=' |
4434 | +' |
4435 | +export as_nl |
4436 | +# Printing a long string crashes Solaris 7 /usr/bin/printf. |
4437 | +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
4438 | +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo |
4439 | +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo |
4440 | +# Prefer a ksh shell builtin over an external printf program on Solaris, |
4441 | +# but without wasting forks for bash or zsh. |
4442 | +if test -z "$BASH_VERSION$ZSH_VERSION" \ |
4443 | + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then |
4444 | + as_echo='print -r --' |
4445 | + as_echo_n='print -rn --' |
4446 | +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then |
4447 | + as_echo='printf %s\n' |
4448 | + as_echo_n='printf %s' |
4449 | +else |
4450 | + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then |
4451 | + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' |
4452 | + as_echo_n='/usr/ucb/echo -n' |
4453 | + else |
4454 | + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' |
4455 | + as_echo_n_body='eval |
4456 | + arg=$1; |
4457 | + case $arg in #( |
4458 | + *"$as_nl"*) |
4459 | + expr "X$arg" : "X\\(.*\\)$as_nl"; |
4460 | + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; |
4461 | + esac; |
4462 | + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" |
4463 | + ' |
4464 | + export as_echo_n_body |
4465 | + as_echo_n='sh -c $as_echo_n_body as_echo' |
4466 | + fi |
4467 | + export as_echo_body |
4468 | + as_echo='sh -c $as_echo_body as_echo' |
4469 | +fi |
4470 | + |
4471 | +# The user is always right. |
4472 | +if test "${PATH_SEPARATOR+set}" != set; then |
4473 | + PATH_SEPARATOR=: |
4474 | + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { |
4475 | + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || |
4476 | + PATH_SEPARATOR=';' |
4477 | + } |
4478 | +fi |
4479 | + |
4480 | + |
4481 | +# IFS |
4482 | +# We need space, tab and new line, in precisely that order. Quoting is |
4483 | +# there to prevent editors from complaining about space-tab. |
4484 | +# (If _AS_PATH_WALK were called with IFS unset, it would disable word |
4485 | +# splitting by setting IFS to empty value.) |
4486 | +IFS=" "" $as_nl" |
4487 | + |
4488 | +# Find who we are. Look in the path if we contain no directory separator. |
4489 | +as_myself= |
4490 | +case $0 in #(( |
4491 | + *[\\/]* ) as_myself=$0 ;; |
4492 | + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
4493 | +for as_dir in $PATH |
4494 | +do |
4495 | + IFS=$as_save_IFS |
4496 | + test -z "$as_dir" && as_dir=. |
4497 | + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break |
4498 | + done |
4499 | +IFS=$as_save_IFS |
4500 | + |
4501 | + ;; |
4502 | +esac |
4503 | +# We did not find ourselves, most probably we were run as `sh COMMAND' |
4504 | +# in which case we are not to be found in the path. |
4505 | +if test "x$as_myself" = x; then |
4506 | + as_myself=$0 |
4507 | +fi |
4508 | +if test ! -f "$as_myself"; then |
4509 | + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 |
4510 | + exit 1 |
4511 | +fi |
4512 | + |
4513 | +# Unset variables that we do not need and which cause bugs (e.g. in |
4514 | +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" |
4515 | +# suppresses any "Segmentation fault" message there. '((' could |
4516 | +# trigger a bug in pdksh 5.2.14. |
4517 | +for as_var in BASH_ENV ENV MAIL MAILPATH |
4518 | +do eval test x\${$as_var+set} = xset \ |
4519 | + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : |
4520 | +done |
4521 | +PS1='$ ' |
4522 | +PS2='> ' |
4523 | +PS4='+ ' |
4524 | + |
4525 | +# NLS nuisances. |
4526 | +LC_ALL=C |
4527 | +export LC_ALL |
4528 | +LANGUAGE=C |
4529 | +export LANGUAGE |
4530 | + |
4531 | +# CDPATH. |
4532 | +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
4533 | + |
4534 | + |
4535 | +# as_fn_error STATUS ERROR [LINENO LOG_FD] |
4536 | +# ---------------------------------------- |
4537 | +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
4538 | +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
4539 | +# script with STATUS, using 1 if that was 0. |
4540 | +as_fn_error () |
4541 | +{ |
4542 | + as_status=$1; test $as_status -eq 0 && as_status=1 |
4543 | + if test "$4"; then |
4544 | + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
4545 | + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 |
4546 | + fi |
4547 | + $as_echo "$as_me: error: $2" >&2 |
4548 | + as_fn_exit $as_status |
4549 | +} # as_fn_error |
4550 | + |
4551 | + |
4552 | +# as_fn_set_status STATUS |
4553 | +# ----------------------- |
4554 | +# Set $? to STATUS, without forking. |
4555 | +as_fn_set_status () |
4556 | +{ |
4557 | + return $1 |
4558 | +} # as_fn_set_status |
4559 | + |
4560 | +# as_fn_exit STATUS |
4561 | +# ----------------- |
4562 | +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. |
4563 | +as_fn_exit () |
4564 | +{ |
4565 | + set +e |
4566 | + as_fn_set_status $1 |
4567 | + exit $1 |
4568 | +} # as_fn_exit |
4569 | + |
4570 | +# as_fn_unset VAR |
4571 | +# --------------- |
4572 | +# Portably unset VAR. |
4573 | +as_fn_unset () |
4574 | +{ |
4575 | + { eval $1=; unset $1;} |
4576 | +} |
4577 | +as_unset=as_fn_unset |
4578 | +# as_fn_append VAR VALUE |
4579 | +# ---------------------- |
4580 | +# Append the text in VALUE to the end of the definition contained in VAR. Take |
4581 | +# advantage of any shell optimizations that allow amortized linear growth over |
4582 | +# repeated appends, instead of the typical quadratic growth present in naive |
4583 | +# implementations. |
4584 | +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : |
4585 | + eval 'as_fn_append () |
4586 | + { |
4587 | + eval $1+=\$2 |
4588 | + }' |
4589 | +else |
4590 | + as_fn_append () |
4591 | + { |
4592 | + eval $1=\$$1\$2 |
4593 | + } |
4594 | +fi # as_fn_append |
4595 | + |
4596 | +# as_fn_arith ARG... |
4597 | +# ------------------ |
4598 | +# Perform arithmetic evaluation on the ARGs, and store the result in the |
4599 | +# global $as_val. Take advantage of shells that can avoid forks. The arguments |
4600 | +# must be portable across $(()) and expr. |
4601 | +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : |
4602 | + eval 'as_fn_arith () |
4603 | + { |
4604 | + as_val=$(( $* )) |
4605 | + }' |
4606 | +else |
4607 | + as_fn_arith () |
4608 | + { |
4609 | + as_val=`expr "$@" || test $? -eq 1` |
4610 | + } |
4611 | +fi # as_fn_arith |
4612 | + |
4613 | + |
4614 | +if expr a : '\(a\)' >/dev/null 2>&1 && |
4615 | + test "X`expr 00001 : '.*\(...\)'`" = X001; then |
4616 | + as_expr=expr |
4617 | +else |
4618 | + as_expr=false |
4619 | +fi |
4620 | + |
4621 | +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then |
4622 | + as_basename=basename |
4623 | +else |
4624 | + as_basename=false |
4625 | +fi |
4626 | + |
4627 | +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then |
4628 | + as_dirname=dirname |
4629 | +else |
4630 | + as_dirname=false |
4631 | +fi |
4632 | + |
4633 | +as_me=`$as_basename -- "$0" || |
4634 | +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ |
4635 | + X"$0" : 'X\(//\)$' \| \ |
4636 | + X"$0" : 'X\(/\)' \| . 2>/dev/null || |
4637 | +$as_echo X/"$0" | |
4638 | + sed '/^.*\/\([^/][^/]*\)\/*$/{ |
4639 | + s//\1/ |
4640 | + q |
4641 | + } |
4642 | + /^X\/\(\/\/\)$/{ |
4643 | + s//\1/ |
4644 | + q |
4645 | + } |
4646 | + /^X\/\(\/\).*/{ |
4647 | + s//\1/ |
4648 | + q |
4649 | + } |
4650 | + s/.*/./; q'` |
4651 | + |
4652 | +# Avoid depending upon Character Ranges. |
4653 | +as_cr_letters='abcdefghijklmnopqrstuvwxyz' |
4654 | +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' |
4655 | +as_cr_Letters=$as_cr_letters$as_cr_LETTERS |
4656 | +as_cr_digits='0123456789' |
4657 | +as_cr_alnum=$as_cr_Letters$as_cr_digits |
4658 | + |
4659 | +ECHO_C= ECHO_N= ECHO_T= |
4660 | +case `echo -n x` in #((((( |
4661 | +-n*) |
4662 | + case `echo 'xy\c'` in |
4663 | + *c*) ECHO_T=' ';; # ECHO_T is single tab character. |
4664 | + xy) ECHO_C='\c';; |
4665 | + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null |
4666 | + ECHO_T=' ';; |
4667 | + esac;; |
4668 | +*) |
4669 | + ECHO_N='-n';; |
4670 | +esac |
4671 | + |
4672 | +rm -f conf$$ conf$$.exe conf$$.file |
4673 | +if test -d conf$$.dir; then |
4674 | + rm -f conf$$.dir/conf$$.file |
4675 | +else |
4676 | + rm -f conf$$.dir |
4677 | + mkdir conf$$.dir 2>/dev/null |
4678 | +fi |
4679 | +if (echo >conf$$.file) 2>/dev/null; then |
4680 | + if ln -s conf$$.file conf$$ 2>/dev/null; then |
4681 | + as_ln_s='ln -s' |
4682 | + # ... but there are two gotchas: |
4683 | + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
4684 | + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
4685 | + # In both cases, we have to default to `cp -p'. |
4686 | + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
4687 | + as_ln_s='cp -p' |
4688 | + elif ln conf$$.file conf$$ 2>/dev/null; then |
4689 | + as_ln_s=ln |
4690 | + else |
4691 | + as_ln_s='cp -p' |
4692 | + fi |
4693 | +else |
4694 | + as_ln_s='cp -p' |
4695 | +fi |
4696 | +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
4697 | +rmdir conf$$.dir 2>/dev/null |
4698 | + |
4699 | + |
4700 | +# as_fn_mkdir_p |
4701 | +# ------------- |
4702 | +# Create "$as_dir" as a directory, including parents if necessary. |
4703 | +as_fn_mkdir_p () |
4704 | +{ |
4705 | + |
4706 | + case $as_dir in #( |
4707 | + -*) as_dir=./$as_dir;; |
4708 | + esac |
4709 | + test -d "$as_dir" || eval $as_mkdir_p || { |
4710 | + as_dirs= |
4711 | + while :; do |
4712 | + case $as_dir in #( |
4713 | + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( |
4714 | + *) as_qdir=$as_dir;; |
4715 | + esac |
4716 | + as_dirs="'$as_qdir' $as_dirs" |
4717 | + as_dir=`$as_dirname -- "$as_dir" || |
4718 | +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
4719 | + X"$as_dir" : 'X\(//\)[^/]' \| \ |
4720 | + X"$as_dir" : 'X\(//\)$' \| \ |
4721 | + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || |
4722 | +$as_echo X"$as_dir" | |
4723 | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
4724 | + s//\1/ |
4725 | + q |
4726 | + } |
4727 | + /^X\(\/\/\)[^/].*/{ |
4728 | + s//\1/ |
4729 | + q |
4730 | + } |
4731 | + /^X\(\/\/\)$/{ |
4732 | + s//\1/ |
4733 | + q |
4734 | + } |
4735 | + /^X\(\/\).*/{ |
4736 | + s//\1/ |
4737 | + q |
4738 | + } |
4739 | + s/.*/./; q'` |
4740 | + test -d "$as_dir" && break |
4741 | + done |
4742 | + test -z "$as_dirs" || eval "mkdir $as_dirs" |
4743 | + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" |
4744 | + |
4745 | + |
4746 | +} # as_fn_mkdir_p |
4747 | +if mkdir -p . 2>/dev/null; then |
4748 | + as_mkdir_p='mkdir -p "$as_dir"' |
4749 | +else |
4750 | + test -d ./-p && rmdir ./-p |
4751 | + as_mkdir_p=false |
4752 | +fi |
4753 | + |
4754 | +if test -x / >/dev/null 2>&1; then |
4755 | + as_test_x='test -x' |
4756 | +else |
4757 | + if ls -dL / >/dev/null 2>&1; then |
4758 | + as_ls_L_option=L |
4759 | + else |
4760 | + as_ls_L_option= |
4761 | + fi |
4762 | + as_test_x=' |
4763 | + eval sh -c '\'' |
4764 | + if test -d "$1"; then |
4765 | + test -d "$1/."; |
4766 | + else |
4767 | + case $1 in #( |
4768 | + -*)set "./$1";; |
4769 | + esac; |
4770 | + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
4771 | + ???[sx]*):;;*)false;;esac;fi |
4772 | + '\'' sh |
4773 | + ' |
4774 | +fi |
4775 | +as_executable_p=$as_test_x |
4776 | + |
4777 | +# Sed expression to map a string onto a valid CPP name. |
4778 | +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
4779 | + |
4780 | +# Sed expression to map a string onto a valid variable name. |
4781 | +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" |
4782 | + |
4783 | + |
4784 | +exec 6>&1 |
4785 | +## ----------------------------------- ## |
4786 | +## Main body of $CONFIG_STATUS script. ## |
4787 | +## ----------------------------------- ## |
4788 | +# Save the log message, to keep $0 and so on meaningful, and to |
4789 | +# report actual input values of CONFIG_FILES etc. instead of their |
4790 | +# values after options handling. |
4791 | +ac_log=" |
4792 | +This file was extended by json-c $as_me 0.11, which was |
4793 | +generated by GNU Autoconf 2.68. Invocation command line was |
4794 | + |
4795 | + CONFIG_FILES = $CONFIG_FILES |
4796 | + CONFIG_HEADERS = $CONFIG_HEADERS |
4797 | + CONFIG_LINKS = $CONFIG_LINKS |
4798 | + CONFIG_COMMANDS = $CONFIG_COMMANDS |
4799 | + $ $0 $@ |
4800 | + |
4801 | +on `(hostname || uname -n) 2>/dev/null | sed 1q` |
4802 | +" |
4803 | + |
4804 | +# Files that config.status was made for. |
4805 | +config_files=" Makefile json.pc json-c.pc tests/Makefile json-c-uninstalled.pc" |
4806 | +config_headers=" config.h json_config.h" |
4807 | +config_commands=" depfiles libtool" |
4808 | + |
4809 | +ac_cs_usage="\ |
4810 | +\`$as_me' instantiates files and other configuration actions |
4811 | +from templates according to the current configuration. Unless the files |
4812 | +and actions are specified as TAGs, all are instantiated by default. |
4813 | + |
4814 | +Usage: $0 [OPTION]... [TAG]... |
4815 | + |
4816 | + -h, --help print this help, then exit |
4817 | + -V, --version print version number and configuration settings, then exit |
4818 | + --config print configuration, then exit |
4819 | + -q, --quiet, --silent |
4820 | + do not print progress messages |
4821 | + -d, --debug don't remove temporary files |
4822 | + --recheck update $as_me by reconfiguring in the same conditions |
4823 | + --file=FILE[:TEMPLATE] |
4824 | + instantiate the configuration file FILE |
4825 | + --header=FILE[:TEMPLATE] |
4826 | + instantiate the configuration header FILE |
4827 | + |
4828 | +Configuration files: |
4829 | +$config_files |
4830 | + |
4831 | +Configuration headers: |
4832 | +$config_headers |
4833 | + |
4834 | +Configuration commands: |
4835 | +$config_commands |
4836 | + |
4837 | +Report bugs to <json-c@googlegroups.com>." |
4838 | + |
4839 | +ac_cs_config="'--prefix' '/home/erh/json-c/jci11'" |
4840 | +ac_cs_version="\ |
4841 | +json-c config.status 0.11 |
4842 | +configured by ./configure, generated by GNU Autoconf 2.68, |
4843 | + with options \"$ac_cs_config\" |
4844 | + |
4845 | +Copyright (C) 2010 Free Software Foundation, Inc. |
4846 | +This config.status script is free software; the Free Software Foundation |
4847 | +gives unlimited permission to copy, distribute and modify it." |
4848 | + |
4849 | +ac_pwd='/home/erh/json-c/json-c-0.11' |
4850 | +srcdir='.' |
4851 | +INSTALL='/usr/bin/install -c' |
4852 | +MKDIR_P='./install-sh -c -d' |
4853 | +AWK='awk' |
4854 | +test -n "$AWK" || AWK=awk |
4855 | +# The default lists apply if the user does not specify any file. |
4856 | +ac_need_defaults=: |
4857 | +while test $# != 0 |
4858 | +do |
4859 | + case $1 in |
4860 | + --*=?*) |
4861 | + ac_option=`expr "X$1" : 'X\([^=]*\)='` |
4862 | + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` |
4863 | + ac_shift=: |
4864 | + ;; |
4865 | + --*=) |
4866 | + ac_option=`expr "X$1" : 'X\([^=]*\)='` |
4867 | + ac_optarg= |
4868 | + ac_shift=: |
4869 | + ;; |
4870 | + *) |
4871 | + ac_option=$1 |
4872 | + ac_optarg=$2 |
4873 | + ac_shift=shift |
4874 | + ;; |
4875 | + esac |
4876 | + |
4877 | + case $ac_option in |
4878 | + # Handling of the options. |
4879 | + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) |
4880 | + ac_cs_recheck=: ;; |
4881 | + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) |
4882 | + $as_echo "$ac_cs_version"; exit ;; |
4883 | + --config | --confi | --conf | --con | --co | --c ) |
4884 | + $as_echo "$ac_cs_config"; exit ;; |
4885 | + --debug | --debu | --deb | --de | --d | -d ) |
4886 | + debug=: ;; |
4887 | + --file | --fil | --fi | --f ) |
4888 | + $ac_shift |
4889 | + case $ac_optarg in |
4890 | + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; |
4891 | + '') as_fn_error $? "missing file argument" ;; |
4892 | + esac |
4893 | + as_fn_append CONFIG_FILES " '$ac_optarg'" |
4894 | + ac_need_defaults=false;; |
4895 | + --header | --heade | --head | --hea ) |
4896 | + $ac_shift |
4897 | + case $ac_optarg in |
4898 | + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; |
4899 | + esac |
4900 | + as_fn_append CONFIG_HEADERS " '$ac_optarg'" |
4901 | + ac_need_defaults=false;; |
4902 | + --he | --h) |
4903 | + # Conflict between --help and --header |
4904 | + as_fn_error $? "ambiguous option: \`$1' |
4905 | +Try \`$0 --help' for more information.";; |
4906 | + --help | --hel | -h ) |
4907 | + $as_echo "$ac_cs_usage"; exit ;; |
4908 | + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ |
4909 | + | -silent | --silent | --silen | --sile | --sil | --si | --s) |
4910 | + ac_cs_silent=: ;; |
4911 | + |
4912 | + # This is an error. |
4913 | + -*) as_fn_error $? "unrecognized option: \`$1' |
4914 | +Try \`$0 --help' for more information." ;; |
4915 | + |
4916 | + *) as_fn_append ac_config_targets " $1" |
4917 | + ac_need_defaults=false ;; |
4918 | + |
4919 | + esac |
4920 | + shift |
4921 | +done |
4922 | + |
4923 | +ac_configure_extra_args= |
4924 | + |
4925 | +if $ac_cs_silent; then |
4926 | + exec 6>/dev/null |
4927 | + ac_configure_extra_args="$ac_configure_extra_args --silent" |
4928 | +fi |
4929 | + |
4930 | +if $ac_cs_recheck; then |
4931 | + set X '/bin/ksh' './configure' '--prefix' '/home/erh/json-c/jci11' $ac_configure_extra_args --no-create --no-recursion |
4932 | + shift |
4933 | + $as_echo "running CONFIG_SHELL=/bin/ksh $*" >&6 |
4934 | + CONFIG_SHELL='/bin/ksh' |
4935 | + export CONFIG_SHELL |
4936 | + exec "$@" |
4937 | +fi |
4938 | + |
4939 | +exec 5>>config.log |
4940 | +{ |
4941 | + echo |
4942 | + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX |
4943 | +## Running $as_me. ## |
4944 | +_ASBOX |
4945 | + $as_echo "$ac_log" |
4946 | +} >&5 |
4947 | + |
4948 | +# |
4949 | +# INIT-COMMANDS |
4950 | +# |
4951 | +AMDEP_TRUE="" ac_aux_dir="." |
4952 | + |
4953 | + |
4954 | +# The HP-UX ksh and POSIX shell print the target directory to stdout |
4955 | +# if CDPATH is set. |
4956 | +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
4957 | + |
4958 | +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' |
4959 | +double_quote_subst='s/\(["`\\]\)/\\\1/g' |
4960 | +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
4961 | +macro_version='2.2.6b' |
4962 | +macro_revision='1.3017' |
4963 | +enable_shared='yes' |
4964 | +enable_static='yes' |
4965 | +pic_mode='default' |
4966 | +enable_fast_install='needless' |
4967 | +host_alias='' |
4968 | +host='i386-unknown-netbsdelf6.0.1' |
4969 | +host_os='netbsdelf6.0.1' |
4970 | +build_alias='' |
4971 | +build='i386-unknown-netbsdelf6.0.1' |
4972 | +build_os='netbsdelf6.0.1' |
4973 | +SED='/usr/bin/sed' |
4974 | +Xsed='/usr/bin/sed -e 1s/^X//' |
4975 | +GREP='/usr/bin/grep' |
4976 | +EGREP='/usr/bin/grep -E' |
4977 | +FGREP='/usr/bin/grep -F' |
4978 | +LD='/usr/bin/ld' |
4979 | +NM='/usr/bin/nm -B' |
4980 | +LN_S='ln -s' |
4981 | +max_cmd_len='196608' |
4982 | +ac_objext='o' |
4983 | +exeext='' |
4984 | +lt_unset='unset' |
4985 | +lt_SP2NL='tr \040 \012' |
4986 | +lt_NL2SP='tr \015\012 \040\040' |
4987 | +reload_flag=' -r' |
4988 | +reload_cmds='$LD$reload_flag -o $output$reload_objs' |
4989 | +OBJDUMP='objdump' |
4990 | +deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' |
4991 | +file_magic_cmd='$MAGIC_CMD' |
4992 | +AR='ar' |
4993 | +AR_FLAGS='cru' |
4994 | +STRIP='strip' |
4995 | +RANLIB='ranlib' |
4996 | +old_postinstall_cmds='chmod 644 $oldlib~$RANLIB $oldlib' |
4997 | +old_postuninstall_cmds='' |
4998 | +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs~$RANLIB $oldlib' |
4999 | +CC='gcc' |
5000 | +CFLAGS='-g -O2' |
Looks like Colin already merged this. Thanks for your work on this in any case.