Merge lp:~bregma/xorg-gtest/xorg-gtest into lp:ubuntu/raring/xorg-gtest
- xorg-gtest
- Merge into raring
Proposed by
Stephen M. Webb
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 9 | ||||
Proposed branch: | lp:~bregma/xorg-gtest/xorg-gtest | ||||
Merge into: | lp:ubuntu/raring/xorg-gtest | ||||
Diff against target: |
44284 lines (+37231/-4650) 76 files modified
COPYING (+1/-0) ChangeLog (+0/-1273) Makefile.am (+1/-1) Makefile.in (+40/-18) README (+19/-4) aclocal.m4 (+6/-6) aclocal/Makefile.in (+33/-7) aclocal/xorg-gtest.m4 (+8/-38) autogen.sh (+0/-11) config.sub (+10/-1) configure (+419/-539) configure.ac (+24/-18) data/Makefile (+51/-25) data/Makefile.in (+34/-8) debian/changelog (+11/-0) debian/control (+4/-3) debian/copyright (+32/-1) debian/libxorg-gtest-data.install (+1/-1) debian/libxorg-gtest-doc.install (+0/-1) debian/patches/0001-fix-example-failures.patch (+42/-0) debian/patches/0002-fix-valgrind-test-failure.patch (+20/-0) debian/patches/series (+2/-0) debian/rules (+2/-2) debian/source/format (+1/-1) depcomp (+72/-52) doc/Doxyfile (+0/-1720) doc/Doxyfile.in (+1834/-0) doc/Makefile.am (+6/-6) doc/Makefile.in (+63/-36) examples/Makefile.am (+25/-12) examples/Makefile.in (+95/-28) examples/xorg-gtest-environment-example.cpp (+101/-0) examples/xorg-gtest-example.cpp (+97/-12) gtest/Makefile.am (+28/-0) gtest/Makefile.in (+674/-0) gtest/README (+8/-0) gtest/include/Makefile.am (+25/-0) gtest/include/Makefile.in (+526/-0) gtest/include/gtest/gtest-spi.h (+232/-0) gtest/include/gtest/gtest.h (+19537/-0) gtest/src/gtest-all.cc (+9118/-0) gtest/src/gtest_main.cc (+39/-0) include/Makefile.am (+5/-4) include/Makefile.in (+39/-12) include/xorg/gtest/evemu/xorg-gtest-device.h (+120/-0) include/xorg/gtest/evemu/xorg-gtest_device.h (+0/-91) include/xorg/gtest/xorg-gtest-environment.h (+234/-0) include/xorg/gtest/xorg-gtest-process.h (+253/-0) include/xorg/gtest/xorg-gtest-test.h (+115/-0) include/xorg/gtest/xorg-gtest-xserver.h (+295/-0) include/xorg/gtest/xorg-gtest.h (+16/-4) include/xorg/gtest/xorg-gtest_environment.h (+0/-184) include/xorg/gtest/xorg-gtest_process.h (+0/-166) include/xorg/gtest/xorg-gtest_test.h (+0/-104) m4/ac_define_dir.m4 (+49/-0) m4/gtest.m4 (+0/-63) src/Makefile-xorg-gtest.am (+6/-2) src/Makefile.am (+2/-0) src/Makefile.in (+36/-7) src/defines.h (+1/-1) src/device.cpp (+156/-2) src/environment.cpp (+73/-130) src/process.cpp (+153/-34) src/test.cpp (+22/-4) src/xorg-gtest-all.cpp (+1/-0) src/xorg-gtest_main.cpp (+20/-17) src/xserver.cpp (+587/-0) test/Makefile.am (+87/-0) test/Makefile.in (+855/-0) test/PIXART-USB-OPTICAL-MOUSE.desc (+41/-0) test/device-test.cpp (+33/-0) test/process-test-helper.cpp (+10/-0) test/process-test.cpp (+379/-0) test/xserver-test-helper.cpp (+19/-0) test/xserver-test.cpp (+382/-0) xorg-gtest.pc.in (+1/-1) |
||||
To merge this branch: | bzr merge lp:~bregma/xorg-gtest/xorg-gtest | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Ubuntu branches | Pending | ||
Review via email: mp+144045@code.launchpad.net |
Commit message
Description of the change
Import newer upstream v0.7.0.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'COPYING' | |||
2 | --- COPYING 2012-03-19 18:39:04 +0000 | |||
3 | +++ COPYING 2013-01-21 00:48:20 +0000 | |||
4 | @@ -1,4 +1,5 @@ | |||
5 | 1 | Copyright (C) 2011, 2012 Canonical, Ltd. | 1 | Copyright (C) 2011, 2012 Canonical, Ltd. |
6 | 2 | Copyright © 2012 Red Hat, Inc. | ||
7 | 2 | 3 | ||
8 | 3 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 4 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
9 | 4 | this software and associated documentation files (the "Software"), to deal in | 5 | this software and associated documentation files (the "Software"), to deal in |
10 | 5 | 6 | ||
11 | === modified file 'ChangeLog' | |||
12 | --- ChangeLog 2012-06-08 12:39:52 +0000 | |||
13 | +++ ChangeLog 2013-01-21 00:48:20 +0000 | |||
14 | @@ -1,1273 +0,0 @@ | |||
15 | 1 | commit 3774f91ba3722bd56b532dde549aef1df1749a51 | ||
16 | 2 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
17 | 3 | Date: Fri Jun 8 12:01:23 2012 -0700 | ||
18 | 4 | |||
19 | 5 | Release version 0.3.0 | ||
20 | 6 | |||
21 | 7 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
22 | 8 | |||
23 | 9 | commit 9c8986c3d9854cb9a6f1f5dc39b8c16a1139ae91 | ||
24 | 10 | Author: Peter Hutterer <peter.hutterer@who-t.net> | ||
25 | 11 | Date: Tue Jun 5 14:49:34 2012 +1000 | ||
26 | 12 | |||
27 | 13 | Set log verbosity to 10 | ||
28 | 14 | |||
29 | 15 | Might as well get as much data as possible. | ||
30 | 16 | |||
31 | 17 | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
32 | 18 | Reviewed-by: Chase Douglas <chase.douglas@canonical.com> | ||
33 | 19 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
34 | 20 | |||
35 | 21 | commit 0c038b4c0a63f494eb7aec08baace7e750ab1b81 | ||
36 | 22 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
37 | 23 | Date: Fri May 25 08:17:57 2012 -0700 | ||
38 | 24 | |||
39 | 25 | Check if log file and old log file are writable before starting X server | ||
40 | 26 | |||
41 | 27 | Otherwise, the server will fail to start and it won't be obvious what | ||
42 | 28 | happened. | ||
43 | 29 | |||
44 | 30 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
45 | 31 | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
46 | 32 | |||
47 | 33 | commit 68b4ef7b5f100a14a5aee33d5c34ef8b29bafa3b | ||
48 | 34 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
49 | 35 | Date: Fri May 25 07:40:49 2012 -0700 | ||
50 | 36 | |||
51 | 37 | Check if a server is already running on the chosen display name | ||
52 | 38 | |||
53 | 39 | Otherwise, our server will silently die and we will connect to the | ||
54 | 40 | already running server without knowing. | ||
55 | 41 | |||
56 | 42 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
57 | 43 | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
58 | 44 | |||
59 | 45 | commit 2b5f29b84b87040be9ad6ce8d986b23bab253189 | ||
60 | 46 | Author: Peter Hutterer <peter.hutterer@who-t.net> | ||
61 | 47 | Date: Fri May 25 11:57:20 2012 +1000 | ||
62 | 48 | |||
63 | 49 | XCloseDisplay(3) cannot handle NULL | ||
64 | 50 | |||
65 | 51 | If the display failed to start, tearing it down with a NULL pointer causes a | ||
66 | 52 | segfault. | ||
67 | 53 | |||
68 | 54 | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
69 | 55 | Reviewed-by: Chase Douglas <chase.douglas@canonical.com> | ||
70 | 56 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
71 | 57 | |||
72 | 58 | commit 631aa80fe44b21dfac2938f2702d3ab15365dfba | ||
73 | 59 | Author: Peter Hutterer <peter.hutterer@who-t.net> | ||
74 | 60 | Date: Fri May 25 11:57:19 2012 +1000 | ||
75 | 61 | |||
76 | 62 | Print the display we were trying to start up on. | ||
77 | 63 | |||
78 | 64 | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
79 | 65 | Reviewed-by: Chase Douglas <chase.douglas@canonical.com> | ||
80 | 66 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
81 | 67 | |||
82 | 68 | commit b6fb8681c4b56f6028f9c981cfa27f6466ff74bd | ||
83 | 69 | Merge: d5bc8f1 6a1174b | ||
84 | 70 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
85 | 71 | Date: Thu May 24 10:00:25 2012 -0700 | ||
86 | 72 | |||
87 | 73 | Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/test/xorg-gtest | ||
88 | 74 | |||
89 | 75 | commit 6a1174b8cdfc2079dd72209f49197d7a9c6555f1 | ||
90 | 76 | Author: Peter Hutterer <peter.hutterer@who-t.net> | ||
91 | 77 | Date: Thu May 24 13:13:28 2012 +1000 | ||
92 | 78 | |||
93 | 79 | Update source files to use new headers | ||
94 | 80 | |||
95 | 81 | introduced in e1c010f23272e61c28c73aa603b477ba6fbae875 | ||
96 | 82 | |||
97 | 83 | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
98 | 84 | Reviewed-by: Chase Douglas <chase.douglas@canonical.com> | ||
99 | 85 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
100 | 86 | |||
101 | 87 | commit e1c010f23272e61c28c73aa603b477ba6fbae875 | ||
102 | 88 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
103 | 89 | Date: Fri May 18 13:23:32 2012 -0700 | ||
104 | 90 | |||
105 | 91 | Namespace xorg-gtest header filenames | ||
106 | 92 | |||
107 | 93 | Due to the default automake compilation flags including -I. -I.., it is | ||
108 | 94 | possible to pick up an xorg-gtest header like device.h instead of a | ||
109 | 95 | project header. Namespacing the headers should resolve this issue. Users | ||
110 | 96 | should be including xorg-gtest.h instead of individual headers, so this | ||
111 | 97 | should not cause compilation failures. | ||
112 | 98 | |||
113 | 99 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
114 | 100 | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
115 | 101 | |||
116 | 102 | commit d57dc7dc787af4b5a9728b83eb1cfccf94ff08b0 | ||
117 | 103 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
118 | 104 | Date: Fri May 18 13:23:31 2012 -0700 | ||
119 | 105 | |||
120 | 106 | Add comment to Makefile-xorg-gtest.am about compiling with -w | ||
121 | 107 | |||
122 | 108 | Users of xorg-gtest will not want warnings or failed builds due to | ||
123 | 109 | issues in gtest or xorg-gtest. | ||
124 | 110 | |||
125 | 111 | Note that the internal build of the xorg-gtest example does not use the | ||
126 | 112 | -w flag when building examples, so we will still see warnings when | ||
127 | 113 | xorg-gtest itself is built. | ||
128 | 114 | |||
129 | 115 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
130 | 116 | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
131 | 117 | |||
132 | 118 | commit d5bc8f147f25f4a5aff8011a2ea542ddd606df23 | ||
133 | 119 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
134 | 120 | Date: Fri May 18 13:16:25 2012 -0700 | ||
135 | 121 | |||
136 | 122 | Namespace xorg-gtest header filenames | ||
137 | 123 | |||
138 | 124 | Due to the default automake compilation flags including -I. -I.., it is | ||
139 | 125 | possible to pick up an xorg-gtest header like device.h instead of a | ||
140 | 126 | project header. Namespacing the headers should resolve this issue. Users | ||
141 | 127 | should be including xorg-gtest.h instead of individual headers, so this | ||
142 | 128 | should not cause compilation failures. | ||
143 | 129 | |||
144 | 130 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
145 | 131 | |||
146 | 132 | commit 5b0320cf21aa64d6359319f95194efd60288c924 | ||
147 | 133 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
148 | 134 | Date: Fri May 18 13:11:21 2012 -0700 | ||
149 | 135 | |||
150 | 136 | Add comment to Makefile-xorg-gtest.am about compiling with -w | ||
151 | 137 | |||
152 | 138 | Users of xorg-gtest will not want warnings or failed builds due to | ||
153 | 139 | issues in gtest or xorg-gtest. | ||
154 | 140 | |||
155 | 141 | Note that the internal build of the xorg-gtest example does not use the | ||
156 | 142 | -w flag when building examples, so we will still see warnings when | ||
157 | 143 | xorg-gtest itself is built. | ||
158 | 144 | |||
159 | 145 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
160 | 146 | |||
161 | 147 | commit ae1e069ad03682d6f6e830bf6d237e41984d3cf3 | ||
162 | 148 | Author: Peter Hutterer <peter.hutterer@who-t.net> | ||
163 | 149 | Date: Wed May 16 09:08:40 2012 +1000 | ||
164 | 150 | |||
165 | 151 | examples: built tests as noinst_PROGRAMS | ||
166 | 152 | |||
167 | 153 | check_PROGRAMS is only built on make check, so it's a good way of | ||
168 | 154 | introducing build errors until later (as we discovered in the server). | ||
169 | 155 | Always built the tests, running them is optional. | ||
170 | 156 | |||
171 | 157 | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
172 | 158 | Reviewed-by: Chase Douglas <chase.douglas@canonical.com> | ||
173 | 159 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
174 | 160 | |||
175 | 161 | commit 31b64e0fbc8dfe420d51e325c67a07e2eaa413f7 | ||
176 | 162 | Author: Peter Hutterer <peter.hutterer@who-t.net> | ||
177 | 163 | Date: Wed May 16 09:07:41 2012 +1000 | ||
178 | 164 | |||
179 | 165 | m4: if a source is specified, use that for the include path | ||
180 | 166 | |||
181 | 167 | Don't require users to specify both source and include path. We can assume | ||
182 | 168 | that if they have the source at a certain location, they want those headers | ||
183 | 169 | too. | ||
184 | 170 | |||
185 | 171 | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
186 | 172 | Reviewed-by: Chase Douglas <chase.douglas@canonical.com> | ||
187 | 173 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
188 | 174 | |||
189 | 175 | commit 6b66ce9fc632108a765a8e96cd287b6179f9cbb0 | ||
190 | 176 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
191 | 177 | Date: Fri Apr 20 09:41:45 2012 -0700 | ||
192 | 178 | |||
193 | 179 | Wait for dummy X server to shut down in Environment::TearDown() | ||
194 | 180 | |||
195 | 181 | If two xorg-gtest binaries are executed one after another, the second | ||
196 | 182 | one may attempt to start its X server before the first one's X server | ||
197 | 183 | has fully shut down. This leads to the second X server not starting. | ||
198 | 184 | |||
199 | 185 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
200 | 186 | Reviewed-by: Stephen M. Webb <stephen.webb@bregmasoft.ca> | ||
201 | 187 | |||
202 | 188 | commit 080cee4010157b45c60b5693eca4f9aebda0c900 | ||
203 | 189 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
204 | 190 | Date: Wed Apr 18 10:30:18 2012 -0700 | ||
205 | 191 | |||
206 | 192 | Provide a full server layout in dummy.conf | ||
207 | 193 | |||
208 | 194 | The X.org server uses the first server layout, and provides one if none | ||
209 | 195 | are found. If a layout is specified in /usr/share/X11/xorg.conf.d, the | ||
210 | 196 | dummy video device configuration may not be used. | ||
211 | 197 | |||
212 | 198 | This change ensures that the dummy video device is used by providing a | ||
213 | 199 | full server layout in the main configuration file. | ||
214 | 200 | |||
215 | 201 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
216 | 202 | Reviewed-by: Stephen M. Webb <stephen.webb@bregmasoft.ca> | ||
217 | 203 | |||
218 | 204 | commit 91261b2371dedc0b8eba9161950b099c130c408a | ||
219 | 205 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
220 | 206 | Date: Wed Apr 18 10:24:50 2012 -0700 | ||
221 | 207 | |||
222 | 208 | Kill dummy Xorg server when a terminating signal arrives | ||
223 | 209 | |||
224 | 210 | This only takes effect if the program links in the provided main() | ||
225 | 211 | function. If you provide your own main() you must handle signals | ||
226 | 212 | yourself. | ||
227 | 213 | |||
228 | 214 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
229 | 215 | Reviewed-by: Stephen M. Webb <stephen.webb@bregmasoft.ca> | ||
230 | 216 | |||
231 | 217 | commit ff1f42e50b36885008e6f8b82595dec8949deba3 | ||
232 | 218 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
233 | 219 | Date: Wed Apr 18 10:23:38 2012 -0700 | ||
234 | 220 | |||
235 | 221 | Add Environment::Kill() to forcefully terminate the dummy Xorg server | ||
236 | 222 | |||
237 | 223 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
238 | 224 | Reviewed-by: Stephen M. Webb <stephen.webb@bregmasoft.ca> | ||
239 | 225 | |||
240 | 226 | commit 1e7618f41e48e29c8dfa30cb74dbdeb8ebd83896 | ||
241 | 227 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
242 | 228 | Date: Mon Mar 26 09:55:21 2012 -0700 | ||
243 | 229 | |||
244 | 230 | Add missing Identifier name to 99-virtual-test-devices.conf | ||
245 | 231 | |||
246 | 232 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
247 | 233 | |||
248 | 234 | commit c77b5e188451c7ac9995ade5e3cf069ccc803e8e | ||
249 | 235 | Author: Thomas Voß <thomas.voss@canonical.com> | ||
250 | 236 | Date: Thu Mar 22 14:59:19 2012 -0400 | ||
251 | 237 | |||
252 | 238 | Add an xorg configuration file snippet to disable grabbing of test devices. | ||
253 | 239 | |||
254 | 240 | When a test creates a test trackpad device, an already running X server | ||
255 | 241 | will likely grab the event node. This causes the dummy X server to fail | ||
256 | 242 | to instantiate the device, and ends in test failure. | ||
257 | 243 | |||
258 | 244 | This will ensure that the normal X server does not attempt to grab the | ||
259 | 245 | test device. | ||
260 | 246 | |||
261 | 247 | Signed-off-by: Thomas Voß <thomas.voss@canonical.com> | ||
262 | 248 | Reviewed-by: Chase Douglas <chase.douglas@canonical.com> | ||
263 | 249 | Acked-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
264 | 250 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
265 | 251 | |||
266 | 252 | commit ad440d9c228a44981f1e2364fb0678840b08be3c | ||
267 | 253 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
268 | 254 | Date: Mon Mar 19 17:00:45 2012 -0700 | ||
269 | 255 | |||
270 | 256 | Release version 0.2.0 | ||
271 | 257 | |||
272 | 258 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
273 | 259 | |||
274 | 260 | commit 852b504288ca579a06b741b4588ee1b98b1b45f5 | ||
275 | 261 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
276 | 262 | Date: Thu Mar 8 14:51:40 2012 -0800 | ||
277 | 263 | |||
278 | 264 | Ship xorg-gtest.m4 and Makefile-xorg-gtest.am | ||
279 | 265 | |||
280 | 266 | See README for instructions on how to use them. | ||
281 | 267 | |||
282 | 268 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
283 | 269 | Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> | ||
284 | 270 | |||
285 | 271 | commit 3f019e8272e33869312a7b5a94af94e14c81cd15 | ||
286 | 272 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
287 | 273 | Date: Tue Mar 13 23:30:39 2012 -0700 | ||
288 | 274 | |||
289 | 275 | Print more helpful error message when X server fails to start | ||
290 | 276 | |||
291 | 277 | Usually, xorg-gtest requires the dummy video driver. It also requires an | ||
292 | 278 | X server at least version 1.12, or to be run as root when testing with a | ||
293 | 279 | previous X server. Print this information when the server fails to | ||
294 | 280 | start, and point the user to the log file for further details. | ||
295 | 281 | |||
296 | 282 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
297 | 283 | Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com> | ||
298 | 284 | |||
299 | 285 | commit 6d0cd228d5ea5ff734f3bc1754d0dfbb93e6d1b4 | ||
300 | 286 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
301 | 287 | Date: Tue Mar 13 11:32:02 2012 -0700 | ||
302 | 288 | |||
303 | 289 | Allow user to override default Xorg server binary | ||
304 | 290 | |||
305 | 291 | This can be accomplished by compiling xorg-gtest with | ||
306 | 292 | -DDEFAULT_XORG_SERVER=path/to/Xorg. | ||
307 | 293 | |||
308 | 294 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
309 | 295 | Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com> | ||
310 | 296 | |||
311 | 297 | commit 4acb16f939c73dc081775e29eb4089e4184fffbf | ||
312 | 298 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
313 | 299 | Date: Thu Mar 8 14:24:16 2012 -0800 | ||
314 | 300 | |||
315 | 301 | Install, but do not build into a library, the xorg-gtest sources | ||
316 | 302 | |||
317 | 303 | This mimics the Google Test distribution mechanism. See: | ||
318 | 304 | |||
319 | 305 | http://code.google.com/p/googletest/wiki/FAQ#Why_is_it_not_recommended_to_install_a_pre-compiled_copy_of_Goog | ||
320 | 306 | |||
321 | 307 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
322 | 308 | Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com> | ||
323 | 309 | |||
324 | 310 | commit 71f006cadac2bc7f249965896d898143d7592f12 | ||
325 | 311 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
326 | 312 | Date: Thu Mar 8 14:18:39 2012 -0800 | ||
327 | 313 | |||
328 | 314 | Build gtest as part of the project | ||
329 | 315 | |||
330 | 316 | Google Test does not recommend using precompiled gtest libraries. See: | ||
331 | 317 | |||
332 | 318 | http://code.google.com/p/googletest/wiki/FAQ#Why_is_it_not_recommended_to_install_a_pre-compiled_copy_of_Goog | ||
333 | 319 | |||
334 | 320 | This change modifies the build system so the examples build the gtest | ||
335 | 321 | and xorg-gtest libraries and link against the locally built libraries | ||
336 | 322 | instead of any other precompiled libraries on the system. It uses the | ||
337 | 323 | same compiler flags to compile everything so the C++ One-Definition Rule | ||
338 | 324 | is not broken. | ||
339 | 325 | |||
340 | 326 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
341 | 327 | Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com> | ||
342 | 328 | |||
343 | 329 | commit d02b5095dbe69b695034242a978c489aaef61109 | ||
344 | 330 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
345 | 331 | Date: Thu Mar 8 14:00:04 2012 -0800 | ||
346 | 332 | |||
347 | 333 | Provide meta-source file xorg-gtest-all.cpp | ||
348 | 334 | |||
349 | 335 | This will make compiling the project each time it is used much easier. | ||
350 | 336 | |||
351 | 337 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
352 | 338 | Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com> | ||
353 | 339 | |||
354 | 340 | commit 5afddf4681d6ce651164c5486a15b41a0b098ac4 | ||
355 | 341 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
356 | 342 | Date: Thu Mar 8 11:55:01 2012 -0800 | ||
357 | 343 | |||
358 | 344 | Rename main.cpp to xorg-gtest_main.cpp | ||
359 | 345 | |||
360 | 346 | This matches the library name and will help with understanding what the | ||
361 | 347 | includes since we are now shipping the source code. | ||
362 | 348 | |||
363 | 349 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
364 | 350 | Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com> | ||
365 | 351 | |||
366 | 352 | commit e0f7ec50461b68851cfb13c7b73c1ee4faa7a7d5 | ||
367 | 353 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
368 | 354 | Date: Thu Mar 8 11:50:05 2012 -0800 | ||
369 | 355 | |||
370 | 356 | Add a meta-header xorg-gtest.h | ||
371 | 357 | |||
372 | 358 | The header merely includes all the other headers. It will make building | ||
373 | 359 | xorg-gtest into each project easier. | ||
374 | 360 | |||
375 | 361 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
376 | 362 | Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com> | ||
377 | 363 | |||
378 | 364 | commit 7102f4115ed044a903c5071e6930630456778313 | ||
379 | 365 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
380 | 366 | Date: Thu Mar 8 09:38:05 2012 -0800 | ||
381 | 367 | |||
382 | 368 | Install xorg-gtest source code in $(prefix)/src/xorg-gtest | ||
383 | 369 | |||
384 | 370 | Google Test suggests that source code be built into each test rather | ||
385 | 371 | than use a pre-compiled library. This change follows their lead and | ||
386 | 372 | installs the xorg-gtest source code. | ||
387 | 373 | |||
388 | 374 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
389 | 375 | Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com> | ||
390 | 376 | |||
391 | 377 | commit fcb1f66c5caec990d499bff94215057b221ea004 | ||
392 | 378 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
393 | 379 | Date: Thu Mar 8 09:42:37 2012 -0800 | ||
394 | 380 | |||
395 | 381 | Move xorg-gtest.cpp to xorg-gtest-example.cpp | ||
396 | 382 | |||
397 | 383 | This makes the source file match the built executable. | ||
398 | 384 | |||
399 | 385 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
400 | 386 | Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com> | ||
401 | 387 | |||
402 | 388 | commit 3a8d82db172612f6071b0ab5423828ff6daad2b7 | ||
403 | 389 | Author: Gaetan Nadon <memsize@videotron.ca> | ||
404 | 390 | Date: Thu Mar 8 19:48:28 2012 -0500 | ||
405 | 391 | |||
406 | 392 | config: merge both AC_CONFIG_FILES statements. | ||
407 | 393 | |||
408 | 394 | Typically all modules have a single statement unless some output files | ||
409 | 395 | are conditionally generated. | ||
410 | 396 | |||
411 | 397 | Signed-off-by: Gaetan Nadon <memsize@videotron.ca> | ||
412 | 398 | Reviewed-by: Chase Douglas <chase.douglas@canonical.com> | ||
413 | 399 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
414 | 400 | |||
415 | 401 | commit 23ce7387c7a762626aef6ffb2c3970a714716595 | ||
416 | 402 | Author: Gaetan Nadon <memsize@videotron.ca> | ||
417 | 403 | Date: Thu Mar 8 19:48:27 2012 -0500 | ||
418 | 404 | |||
419 | 405 | config: remove unrequired AC_SUBST DUMMY_CONF_PATH statement | ||
420 | 406 | |||
421 | 407 | The variable is not used in any makefile. Configure.ac does not participate | ||
422 | 408 | in the determination of the conf path. The final value of datadir is not | ||
423 | 409 | known at config time, only at make time. | ||
424 | 410 | |||
425 | 411 | Signed-off-by: Gaetan Nadon <memsize@videotron.ca> | ||
426 | 412 | Reviewed-by: Chase Douglas <chase.douglas@canonical.com> | ||
427 | 413 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
428 | 414 | |||
429 | 415 | commit 9bccebeff291e21e9d65c168fabce39e4ba9e97a | ||
430 | 416 | Author: Gaetan Nadon <memsize@videotron.ca> | ||
431 | 417 | Date: Thu Mar 8 17:33:21 2012 -0500 | ||
432 | 418 | |||
433 | 419 | config: use existing feature --enable-strict-compilation | ||
434 | 420 | |||
435 | 421 | This replaces current code attempting to perform similar function. | ||
436 | 422 | In configure.ac, the code is gcc specific. | ||
437 | 423 | The src/Makefile.am has $(WARNING_FLAGS) rather than $(WARNING_CPPFLAGS) | ||
438 | 424 | |||
439 | 425 | http://cgit.freedesktop.org/xorg/util/macros/tree/xorg-macros.m4.in | ||
440 | 426 | |||
441 | 427 | Looking at the xorg-gtest module --help text: | ||
442 | 428 | --enable-strict-compilation | ||
443 | 429 | Enable all warnings from compiler and make them | ||
444 | 430 | errors (default: disabled) | ||
445 | 431 | |||
446 | 432 | Signed-off-by: Gaetan Nadon <memsize@videotron.ca> | ||
447 | 433 | Reviewed-by: Chase Douglas <chase.douglas@canonical.com> | ||
448 | 434 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
449 | 435 | |||
450 | 436 | commit ea7303900e3689d5b258bd5d61593f8b1ae3b4b0 | ||
451 | 437 | Author: Gaetan Nadon <memsize@videotron.ca> | ||
452 | 438 | Date: Thu Mar 8 17:33:20 2012 -0500 | ||
453 | 439 | |||
454 | 440 | config: support Automake 1.10 | ||
455 | 441 | |||
456 | 442 | X.Org has a requirement to support 1.10 or later. | ||
457 | 443 | The silent rules are handled by XORG_DEFAULT_OPTIONS | ||
458 | 444 | We do not write the version number, but refer to the wiki: | ||
459 | 445 | http://www.x.org/wiki/ModularDevelopersGuide#GNU_Build_System | ||
460 | 446 | |||
461 | 447 | Signed-off-by: Gaetan Nadon <memsize@videotron.ca> | ||
462 | 448 | Reviewed-by: Chase Douglas <chase.douglas@canonical.com> | ||
463 | 449 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
464 | 450 | |||
465 | 451 | commit caec23aa80e92ad760dbcd4f285e62cbea6a99c3 | ||
466 | 452 | Author: Gaetan Nadon <memsize@videotron.ca> | ||
467 | 453 | Date: Thu Mar 8 17:33:19 2012 -0500 | ||
468 | 454 | |||
469 | 455 | config: remove redundant AC_PROG_INSTALL | ||
470 | 456 | |||
471 | 457 | Already included in XORG_DEFAULT_OPTIONS | ||
472 | 458 | |||
473 | 459 | Signed-off-by: Gaetan Nadon <memsize@videotron.ca> | ||
474 | 460 | Reviewed-by: Chase Douglas <chase.douglas@canonical.com> | ||
475 | 461 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
476 | 462 | |||
477 | 463 | commit 0a55043449c23f12fc3c2385b2c2784ee6826749 | ||
478 | 464 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
479 | 465 | Date: Mon Mar 5 10:52:21 2012 -0800 | ||
480 | 466 | |||
481 | 467 | Add xorg::testing::evemu::Device | ||
482 | 468 | |||
483 | 469 | Device uses utouch-evemu for input device recording playback through the | ||
484 | 470 | Linux kernel. | ||
485 | 471 | |||
486 | 472 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
487 | 473 | Acked-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
488 | 474 | Reviewed-by: Stephen Webb <stephen.webb@canonical.com> | ||
489 | 475 | |||
490 | 476 | commit bf4a7db2485ab2d28a6bb6333df7d431a928cc95 | ||
491 | 477 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
492 | 478 | Date: Tue Mar 6 17:15:58 2012 -0800 | ||
493 | 479 | |||
494 | 480 | Fix dummy.conf location definition | ||
495 | 481 | |||
496 | 482 | Now that the xorg-gtest data build has been separated from the src | ||
497 | 483 | build, the location definition is broken and results in xorg-gtest | ||
498 | 484 | looking for /dummy.conf instead of ${datadir}/xorg/gtest/dummy.conf. | ||
499 | 485 | This change fixes the location | ||
500 | 486 | |||
501 | 487 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
502 | 488 | |||
503 | 489 | commit b36f5493258e8fb896ed4a710b03c7428a2cf21b | ||
504 | 490 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
505 | 491 | Date: Mon Mar 5 11:31:57 2012 -0800 | ||
506 | 492 | |||
507 | 493 | Add examples/xorg-gtest-example to .gitignore | ||
508 | 494 | |||
509 | 495 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
510 | 496 | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
511 | 497 | |||
512 | 498 | commit dd6e963e0833b2920f1bb120b6fba6e2e3c60121 | ||
513 | 499 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
514 | 500 | Date: Mon Mar 5 11:26:38 2012 -0800 | ||
515 | 501 | |||
516 | 502 | Define automake CPP warning flags in Makefile.am, not configure.ac | ||
517 | 503 | |||
518 | 504 | Otherwise, AM_CPPFLAGS could not be overridden in Makefile.am. | ||
519 | 505 | |||
520 | 506 | Also, move AM_CXXFLAGS to the top of src/Makefile.am to match. | ||
521 | 507 | |||
522 | 508 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
523 | 509 | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
524 | 510 | |||
525 | 511 | commit e888dcd08cb4b5ee332f155207a56f7098524e14 | ||
526 | 512 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
527 | 513 | Date: Wed Feb 29 12:26:48 2012 -0800 | ||
528 | 514 | |||
529 | 515 | Use BASE_CXXFLAGS from xorg macros | ||
530 | 516 | |||
531 | 517 | The X.org macros package version 1.16.2 is the first to define | ||
532 | 518 | BASE_CXXFLAGS; however, we don't need to require version 1.16.2. If it's | ||
533 | 519 | available, then great. If not, $(BASE_CXXFLAGS) will be empty and | ||
534 | 520 | nothing terrible will happen. | ||
535 | 521 | |||
536 | 522 | Included in this commit is a fix for an error, now that we are using | ||
537 | 523 | BASE_CXXFLAGS, for shadowing variables from parent contexts. | ||
538 | 524 | |||
539 | 525 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
540 | 526 | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
541 | 527 | |||
542 | 528 | commit 63a2903a15d53a19930b72ffda06b92492718e6c | ||
543 | 529 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
544 | 530 | Date: Mon Mar 5 11:07:48 2012 -0800 | ||
545 | 531 | |||
546 | 532 | Split data and include build rules out of src build rules | ||
547 | 533 | |||
548 | 534 | This will simplify things when we add more features to xorg-gtest. | ||
549 | 535 | |||
550 | 536 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
551 | 537 | Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
552 | 538 | |||
553 | 539 | commit 20827807711933b0083458c968aa6bbc06db859f | ||
554 | 540 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
555 | 541 | Date: Thu Mar 1 10:24:59 2012 -0800 | ||
556 | 542 | |||
557 | 543 | Relicense under the X.org preferred license | ||
558 | 544 | |||
559 | 545 | Copied from http://www.x.org/releases/X11R7.6/doc/xorg-docs/License.html | ||
560 | 546 | |||
561 | 547 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
562 | 548 | Acked-by: Daniel Stone <daniel@fooishbar.org> | ||
563 | 549 | Reviewed-by: Gaetan Nadon <memsize@videotron.ca> | ||
564 | 550 | |||
565 | 551 | commit 3e9e3232638a75e21f3ef2ca12888aaade8792f4 | ||
566 | 552 | Author: Gaetan Nadon <memsize@videotron.ca> | ||
567 | 553 | Date: Wed Feb 29 18:23:44 2012 -0500 | ||
568 | 554 | |||
569 | 555 | config: do not initialize libtool twice | ||
570 | 556 | |||
571 | 557 | AC_PROG_LIBTOOL initializes libtool, contrary to what the name may suggest. | ||
572 | 558 | It has been renamed to LT_INIT in libtool v2. However X.Org has a requirement | ||
573 | 559 | to support libtool v1.5. | ||
574 | 560 | |||
575 | 561 | Signed-off-by: Gaetan Nadon <memsize@videotron.ca> | ||
576 | 562 | Reviewed-by: Chase Douglas <chase.douglas@canonical.com> | ||
577 | 563 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
578 | 564 | |||
579 | 565 | commit e43cc450a17245f838dfacb44492cf10383bdbb6 | ||
580 | 566 | Author: Gaetan Nadon <memsize@videotron.ca> | ||
581 | 567 | Date: Wed Feb 29 18:23:43 2012 -0500 | ||
582 | 568 | |||
583 | 569 | config: no need to m4_include gtest.m4 | ||
584 | 570 | |||
585 | 571 | This is done when autoconf runs aclocal. | ||
586 | 572 | |||
587 | 573 | Signed-off-by: Gaetan Nadon <memsize@videotron.ca> | ||
588 | 574 | Reviewed-by: Chase Douglas <chase.douglas@canonical.com> | ||
589 | 575 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
590 | 576 | |||
591 | 577 | commit 8812b410c2458329ac8648b31f6f7e1f2b428df1 | ||
592 | 578 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
593 | 579 | Date: Wed Feb 29 10:55:33 2012 -0800 | ||
594 | 580 | |||
595 | 581 | Remove xorg-server pkgconfig check | ||
596 | 582 | |||
597 | 583 | xorg-server flags are not needed. Including them also causes | ||
598 | 584 | -fvisibility=hidden to be used, which breaks the build output. | ||
599 | 585 | |||
600 | 586 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
601 | 587 | Reviewed-by: Gaeton Nadon <memsize@videotron.ca> | ||
602 | 588 | |||
603 | 589 | commit c444aebf7a56183531055767bf982f0206da3db0 | ||
604 | 590 | Author: Gaetan Nadon <memsize@videotron.ca> | ||
605 | 591 | Date: Mon Feb 27 11:04:36 2012 -0500 | ||
606 | 592 | |||
607 | 593 | distcheck: cannot create directory `xorg-gtest-0.1.1': Permission denied | ||
608 | 594 | |||
609 | 595 | Use the util-macros implementation to generate the ChangeLog | ||
610 | 596 | and the INSTALL file. | ||
611 | 597 | |||
612 | 598 | Signed-off-by: Gaetan Nadon <memsize@videotron.ca> | ||
613 | 599 | |||
614 | 600 | commit e19ee59526198734118a5894ef2c4cef97528064 | ||
615 | 601 | Author: Gaetan Nadon <memsize@videotron.ca> | ||
616 | 602 | Date: Mon Feb 27 11:04:35 2012 -0500 | ||
617 | 603 | |||
618 | 604 | distcheck fails: cannot open linker script file libxorg-gtest.ver | ||
619 | 605 | |||
620 | 606 | The $(top_srcdir) path is needed to locate the source as it is not | ||
621 | 607 | in the same dir as the generated files. | ||
622 | 608 | |||
623 | 609 | Signed-off-by: Gaetan Nadon <memsize@videotron.ca> | ||
624 | 610 | Reviewed-by: Chase Douglas <chase.douglas@canonical.com> | ||
625 | 611 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
626 | 612 | |||
627 | 613 | commit 749b0eabd8c6075cac082b3727da5efdcc68d6e6 | ||
628 | 614 | Author: Gaetan Nadon <memsize@videotron.ca> | ||
629 | 615 | Date: Sun Feb 26 19:53:45 2012 -0500 | ||
630 | 616 | |||
631 | 617 | Revert "Use the standard autogen.sh script from xorg" | ||
632 | 618 | |||
633 | 619 | This reverts commit 839257c03d033f4352243ac70be9f78c5a8dfdd0. | ||
634 | 620 | |||
635 | 621 | This module has different requirements for autogen.sh. | ||
636 | 622 | The upcoming version with the variable NOCONFIGURE | ||
637 | 623 | would probably be satisfactory. | ||
638 | 624 | |||
639 | 625 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
640 | 626 | |||
641 | 627 | commit 131c80ac6b199988b08df26f30dabe1c7ba9684a | ||
642 | 628 | Author: Gaetan Nadon <memsize@videotron.ca> | ||
643 | 629 | Date: Sun Feb 26 16:36:55 2012 -0500 | ||
644 | 630 | |||
645 | 631 | examples/test.cpp: fatal error: X11/Xlib.h: No such file or directory | ||
646 | 632 | |||
647 | 633 | Need XSERVER_CFLAGS to locate Xlib.h | ||
648 | 634 | |||
649 | 635 | Signed-off-by: Gaetan Nadon <memsize@videotron.ca> | ||
650 | 636 | |||
651 | 637 | commit 35d0a43e9a059e54e95fda1211112104ad6ad262 | ||
652 | 638 | Author: Gaetan Nadon <memsize@videotron.ca> | ||
653 | 639 | Date: Sun Feb 26 16:08:55 2012 -0500 | ||
654 | 640 | |||
655 | 641 | test.cpp: fatal error: X11/Xlib.h: No such file or directory | ||
656 | 642 | |||
657 | 643 | Need XSERVER_CFLAGS to locate Xlib.h | ||
658 | 644 | |||
659 | 645 | Signed-off-by: Gaetan Nadon <memsize@videotron.ca> | ||
660 | 646 | |||
661 | 647 | commit 6bae528bd9c8744d39b003c06f4f0a2ab41c9331 | ||
662 | 648 | Author: Gaetan Nadon <memsize@videotron.ca> | ||
663 | 649 | Date: Sun Feb 26 16:20:25 2012 -0500 | ||
664 | 650 | |||
665 | 651 | Fix typo in .gitignore comment | ||
666 | 652 | |||
667 | 653 | Signed-off-by: Gaetan Nadon <memsize@videotron.ca> | ||
668 | 654 | |||
669 | 655 | commit 5c5dc5ee2891a2456b77ec322e847ba9234112b0 | ||
670 | 656 | Author: Gaetan Nadon <memsize@videotron.ca> | ||
671 | 657 | Date: Sun Feb 26 16:12:43 2012 -0500 | ||
672 | 658 | |||
673 | 659 | Add standard xorg toplevel .gitignore | ||
674 | 660 | |||
675 | 661 | Signed-off-by: Gaetan Nadon <memsize@videotron.ca> | ||
676 | 662 | |||
677 | 663 | commit 839257c03d033f4352243ac70be9f78c5a8dfdd0 | ||
678 | 664 | Author: Gaetan Nadon <memsize@videotron.ca> | ||
679 | 665 | Date: Sun Feb 26 14:26:33 2012 -0500 | ||
680 | 666 | |||
681 | 667 | Use the standard autogen.sh script from xorg | ||
682 | 668 | |||
683 | 669 | The one here does not work the same way. It is very confusing when | ||
684 | 670 | these don't work the same way for all xorg modules. | ||
685 | 671 | |||
686 | 672 | It can be proposed as a new version version for all xorg modules | ||
687 | 673 | if it can be deemed to be more desirable. | ||
688 | 674 | |||
689 | 675 | Signed-off-by: Gaetan Nadon <memsize@videotron.ca> | ||
690 | 676 | |||
691 | 677 | commit a15d88e39f19efdd6aa20053a7a3ce6ffc8c0d9e | ||
692 | 678 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
693 | 679 | Date: Fri Feb 24 08:39:56 2012 -0800 | ||
694 | 680 | |||
695 | 681 | Release version 0.1.1 | ||
696 | 682 | |||
697 | 683 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
698 | 684 | |||
699 | 685 | commit 6422b13b33438a1dfa2d57c2df3593fcac719814 | ||
700 | 686 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
701 | 687 | Date: Fri Feb 24 08:35:13 2012 -0800 | ||
702 | 688 | |||
703 | 689 | Generate ChangeLog at make dist time | ||
704 | 690 | |||
705 | 691 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
706 | 692 | |||
707 | 693 | commit 66bcd7de0d9bd4a822b6cf3bca79d295d7fb86ab | ||
708 | 694 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
709 | 695 | Date: Fri Feb 24 08:01:17 2012 -0800 | ||
710 | 696 | |||
711 | 697 | Add GPLv3 license as COPYING | ||
712 | 698 | |||
713 | 699 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
714 | 700 | |||
715 | 701 | commit 5b130039fed4bb232d06aa419bf43336a7153e07 | ||
716 | 702 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
717 | 703 | Date: Fri Feb 24 07:58:03 2012 -0800 | ||
718 | 704 | |||
719 | 705 | Link libxorg-gtest_main against libxorg-gtest | ||
720 | 706 | |||
721 | 707 | This fixes build failures if one only links against libxorg-gtest_main | ||
722 | 708 | but does not use any other xorg-gtest symbols. | ||
723 | 709 | |||
724 | 710 | Reported-by: Stephen Webb <stephen.webb@canonical.com> | ||
725 | 711 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
726 | 712 | |||
727 | 713 | commit fc02e9aa96646c0ea60384b14083107a10e965b2 | ||
728 | 714 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
729 | 715 | Date: Wed Feb 15 08:54:08 2012 -0800 | ||
730 | 716 | |||
731 | 717 | Fix linking against X server libs | ||
732 | 718 | |||
733 | 719 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
734 | 720 | |||
735 | 721 | commit 1f4bd9c267e70cf9ac8a57f90bf1795b0fa63d6c | ||
736 | 722 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
737 | 723 | Date: Sat Feb 4 11:47:35 2012 -0800 | ||
738 | 724 | |||
739 | 725 | Add symbol version scripts | ||
740 | 726 | |||
741 | 727 | It would be nice to explicitly list each class method, but there's no | ||
742 | 728 | documentation on how to do it, and everything I try fails. At least this | ||
743 | 729 | ensures we don't ship visible symbols that are really part of GTest. | ||
744 | 730 | |||
745 | 731 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
746 | 732 | Reviewed-by: Stephen Webb <stephen.webb@canonical.com> | ||
747 | 733 | |||
748 | 734 | commit 4216fddec31fed8b141f6d6f233c31e73e651fde | ||
749 | 735 | Author: Daniel d'Andrada <daniel.dandrada@canonical.com> | ||
750 | 736 | Date: Mon Feb 6 09:29:46 2012 -0200 | ||
751 | 737 | |||
752 | 738 | Make Environment API property-based. | ||
753 | 739 | |||
754 | 740 | Instead of shoving all parameters in the constructor. | ||
755 | 741 | |||
756 | 742 | Signed-off-by: Daniel d'Andrada <daniel.dandrada@canonical.com> | ||
757 | 743 | Reviewed-by: Chase Douglas <chase.douglas@canonical.com> | ||
758 | 744 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
759 | 745 | |||
760 | 746 | commit d568a6c0626eeef038753f207f234037bbbb26e4 | ||
761 | 747 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
762 | 748 | Date: Fri Feb 3 17:21:22 2012 -0800 | ||
763 | 749 | |||
764 | 750 | Ship conf files | ||
765 | 751 | |||
766 | 752 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
767 | 753 | |||
768 | 754 | commit 50cd80649cd09800a245754bb7621de777026022 | ||
769 | 755 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
770 | 756 | Date: Fri Feb 3 17:20:10 2012 -0800 | ||
771 | 757 | |||
772 | 758 | Add defines.h to the list of source files | ||
773 | 759 | |||
774 | 760 | This ensures the header is shipped in the dist tarball. | ||
775 | 761 | |||
776 | 762 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
777 | 763 | |||
778 | 764 | commit 24fbaa20c179ce4b4d9be9627bb41daffc91527a | ||
779 | 765 | Author: Jussi Pakkanen <jussi.pakkanen@canonical.com> | ||
780 | 766 | Date: Thu Feb 2 14:36:32 2012 +0200 | ||
781 | 767 | |||
782 | 768 | Fix build system. | ||
783 | 769 | |||
784 | 770 | The project could not be built from scratch due to erroneous | ||
785 | 771 | Autofoo setup. This commit makes it work. | ||
786 | 772 | |||
787 | 773 | Signed-off-by: Jussi Pakkanen <jussi.pakkanen@canonical.com> | ||
788 | 774 | Reviewed-by: Chase Douglas <chase.douglas@canonical.com> | ||
789 | 775 | Signed-off-by: Chase Douglas <chase.douglas@canonical.com> | ||
790 | 776 | |||
791 | 777 | commit 79b2d4e7f976621705bd32a9fd16e56c989a5a45 | ||
792 | 778 | Author: Chase Douglas <chase.douglas@canonical.com> | ||
793 | 779 | Date: Wed Feb 1 11:12:29 2012 -0800 | ||
794 | 780 | |||
795 | 781 | And by default point to a location that doesn't require root privileges to be used. | ||
796 | 782 | |||
797 | 783 | This will make it possible to run Xorg without being root. | ||
798 | 784 | |||
799 | 785 | Signed-off-by: Daniel d'Andrada <daniel.dandrada@canonical.com> | ||
800 | 786 | |||
801 | 787 | commit 656d8b22be42b23d5336a85173d7381bf115a327 | ||
802 | 788 | Merge: 37906b3 e5f21a6 | ||
803 | 789 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
804 | 790 | Date: Wed Dec 21 08:30:43 2011 -0800 | ||
805 | 791 | |||
806 | 792 | Merge some miscellaneous fixes | ||
807 | 793 | |||
808 | 794 | commit e5f21a67393a5db4d91f07f87a649ec38d27fcc7 | ||
809 | 795 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
810 | 796 | Date: Wed Dec 21 08:09:22 2011 -0800 | ||
811 | 797 | |||
812 | 798 | Use "make doc" to build all documentation | ||
813 | 799 | |||
814 | 800 | And clean up doc/Makefile.am targets. | ||
815 | 801 | |||
816 | 802 | commit 739e52c343cdd412c0c4e9e21dd79be25b3027ca | ||
817 | 803 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
818 | 804 | Date: Wed Dec 21 07:51:51 2011 -0800 | ||
819 | 805 | |||
820 | 806 | Rename xorg_gtest_example to xorg-gtest-example | ||
821 | 807 | |||
822 | 808 | commit c63e0369cc4c7db7ffe3109b6ea8ff478ac4ba91 | ||
823 | 809 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
824 | 810 | Date: Wed Dec 21 07:51:10 2011 -0800 | ||
825 | 811 | |||
826 | 812 | Install man pages too | ||
827 | 813 | |||
828 | 814 | commit c276dc0ac292d54ffc00dcab83ce7cc056c6c3df | ||
829 | 815 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
830 | 816 | Date: Wed Dec 21 07:49:58 2011 -0800 | ||
831 | 817 | |||
832 | 818 | Start the so library version at 0.0.0 | ||
833 | 819 | |||
834 | 820 | commit 37906b3c6431e470a07bbf5fd26784f5116b141c | ||
835 | 821 | Merge: 67c98e9 5f10cf0 | ||
836 | 822 | Author: Thomas Voß <thomas.voss@rub.de> | ||
837 | 823 | Date: Fri Dec 16 11:44:34 2011 +0100 | ||
838 | 824 | |||
839 | 825 | Merged in lp:~chasedouglas/xorg-gtest/fixes. | ||
840 | 826 | |||
841 | 827 | commit 67c98e96ab8ee10e2d399d1ed4fd1f20e3daffd5 | ||
842 | 828 | Merge: 286707f be95cf5 | ||
843 | 829 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
844 | 830 | Date: Wed Dec 14 11:59:40 2011 -0800 | ||
845 | 831 | |||
846 | 832 | Merge example documentation fixes | ||
847 | 833 | |||
848 | 834 | commit 5f10cf0d7bc2492e53bba8dc2105c8a9b8445a18 | ||
849 | 835 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
850 | 836 | Date: Wed Dec 14 11:34:01 2011 -0800 | ||
851 | 837 | |||
852 | 838 | Fix gtest cpp flags | ||
853 | 839 | |||
854 | 840 | commit c8a4e665b558f2e39b63bfe91a7081fc041887c2 | ||
855 | 841 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
856 | 842 | Date: Wed Dec 14 11:18:49 2011 -0800 | ||
857 | 843 | |||
858 | 844 | Use gtest lib path when checking for gtest library | ||
859 | 845 | |||
860 | 846 | commit 5bbdf9fe259a3bde28192286de2a685457b49a50 | ||
861 | 847 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
862 | 848 | Date: Wed Dec 14 11:11:25 2011 -0800 | ||
863 | 849 | |||
864 | 850 | Use Process::SetEnv() in Environment::SetUp() | ||
865 | 851 | |||
866 | 852 | commit 327d46a503ab1f57134e9d3a56f6792b151e8c03 | ||
867 | 853 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
868 | 854 | Date: Wed Dec 14 11:10:59 2011 -0800 | ||
869 | 855 | |||
870 | 856 | Make Process::GetEnv and SetEnv static methods | ||
871 | 857 | |||
872 | 858 | They do not modify or use a Process object. They are merely helper | ||
873 | 859 | functions. | ||
874 | 860 | |||
875 | 861 | commit 8b2947df181dba16e07bd399d33ef0ae60aebdeb | ||
876 | 862 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
877 | 863 | Date: Wed Dec 14 11:01:39 2011 -0800 | ||
878 | 864 | |||
879 | 865 | Move SetUp and TearDown methods to protected sections | ||
880 | 866 | |||
881 | 867 | commit 7b18bcffa98443e736dbfde2848698f5e6d6efa9 | ||
882 | 868 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
883 | 869 | Date: Wed Dec 14 11:00:13 2011 -0800 | ||
884 | 870 | |||
885 | 871 | Don't install Doxyfile | ||
886 | 872 | |||
887 | 873 | commit e51bcee92edeb7f3da577f9f2da2b6ecb96d17d4 | ||
888 | 874 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
889 | 875 | Date: Wed Dec 14 10:54:33 2011 -0800 | ||
890 | 876 | |||
891 | 877 | Only install documentation if it was created | ||
892 | 878 | |||
893 | 879 | commit d5df40d00c6729dfdf1504d50f3658d3de22c5f5 | ||
894 | 880 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
895 | 881 | Date: Wed Dec 14 10:38:44 2011 -0800 | ||
896 | 882 | |||
897 | 883 | Remove leftover geistest doc line in doc/Makefile.am | ||
898 | 884 | |||
899 | 885 | commit 286707f7a39ce7daa753994f35776ff2f273f07e | ||
900 | 886 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
901 | 887 | Date: Wed Dec 14 10:29:22 2011 -0800 | ||
902 | 888 | |||
903 | 889 | Don't link gtest when creating library | ||
904 | 890 | |||
905 | 891 | commit be95cf5f4fccaf6393ac65f3c3f9254acfd8ee17 | ||
906 | 892 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
907 | 893 | Date: Wed Dec 14 09:27:07 2011 -0800 | ||
908 | 894 | |||
909 | 895 | Include examples directory when scanning for documented sources | ||
910 | 896 | |||
911 | 897 | commit 42d3e9d818d4827ae001c50dd190fd477ffce593 | ||
912 | 898 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
913 | 899 | Date: Wed Dec 14 09:21:30 2011 -0800 | ||
914 | 900 | |||
915 | 901 | Remove license header from example | ||
916 | 902 | |||
917 | 903 | It clutters up the example and is unnecessary for such a small file. | ||
918 | 904 | |||
919 | 905 | commit 6f0204791b3057ad49719675f30810c1b2755aff | ||
920 | 906 | Merge: bb34e85 2e13892 | ||
921 | 907 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
922 | 908 | Date: Wed Dec 14 09:13:34 2011 -0800 | ||
923 | 909 | |||
924 | 910 | Merge in Doxygen branch, which also includes many fixes | ||
925 | 911 | |||
926 | 912 | commit bb34e8586f1d74e4717dc8300bea6628b9a38804 | ||
927 | 913 | Merge: 4ee62b3 5b07f09 | ||
928 | 914 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
929 | 915 | Date: Wed Dec 14 08:25:54 2011 -0800 | ||
930 | 916 | |||
931 | 917 | Merge gtest configure check fixes | ||
932 | 918 | |||
933 | 919 | commit 2e13892e9031e10dc91a2677295be654eb6b7747 | ||
934 | 920 | Author: Thomas Voß <thomas.voss@rub.de> | ||
935 | 921 | Date: Wed Dec 14 16:19:03 2011 +0100 | ||
936 | 922 | |||
937 | 923 | Introduced examples. Added virtual d'tors to xorg::testing::Environment and xorg::testing::Test. | ||
938 | 924 | |||
939 | 925 | commit 5b07f09f0713b670070e4d44ada2aeab3f6e883c | ||
940 | 926 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
941 | 927 | Date: Tue Dec 13 17:30:48 2011 -0800 | ||
942 | 928 | |||
943 | 929 | Use AC_LANG_PUSH(C++)/AC_LANG_POP so as not to contaminate configure.ac | ||
944 | 930 | |||
945 | 931 | commit 9a493fa6cbaa61582092b2484ab2cf95edcc8dcf | ||
946 | 932 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
947 | 933 | Date: Tue Dec 13 17:21:24 2011 -0800 | ||
948 | 934 | |||
949 | 935 | Link against pthread when checking for gtest library | ||
950 | 936 | |||
951 | 937 | commit 9b93e8df1f350fd1fc3cd0888c0bf565bf3e18f0 | ||
952 | 938 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
953 | 939 | Date: Tue Dec 13 17:02:48 2011 -0800 | ||
954 | 940 | |||
955 | 941 | Move check result test to configure.ac and use standard variables | ||
956 | 942 | |||
957 | 943 | commit 41d0b41fc5b244438af787de687a4b341889cadc | ||
958 | 944 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
959 | 945 | Date: Tue Dec 13 16:49:08 2011 -0800 | ||
960 | 946 | |||
961 | 947 | Remove unnecessary HAVE_GTEST conditional in configure.ac | ||
962 | 948 | |||
963 | 949 | commit 0ada1132294813196503527124d321093cb36e7f | ||
964 | 950 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
965 | 951 | Date: Tue Dec 13 16:48:37 2011 -0800 | ||
966 | 952 | |||
967 | 953 | Make gtest a requirement for successful configuration | ||
968 | 954 | |||
969 | 955 | And switch to the non-deprecated AC_CHECK_LIB. | ||
970 | 956 | |||
971 | 957 | commit 69569cba1db0c17ae04d5c26c62fd02fa6473191 | ||
972 | 958 | Author: Thomas Voß <thomas.voss@rub.de> | ||
973 | 959 | Date: Tue Dec 13 18:33:39 2011 +0100 | ||
974 | 960 | |||
975 | 961 | Adjusted signature of Process::GetEnv. Adjusted documentation. | ||
976 | 962 | |||
977 | 963 | commit 78ac5be868fd1e1d31300a61f8e425736c586b58 | ||
978 | 964 | Author: Thomas Voß <thomas.voss@rub.de> | ||
979 | 965 | Date: Tue Dec 13 10:15:24 2011 +0100 | ||
980 | 966 | |||
981 | 967 | Fixed typo in test.h. | ||
982 | 968 | |||
983 | 969 | commit 8ace60ed7cc70589de26ec3e5e409588a0f0bd00 | ||
984 | 970 | Author: Thomas Voß <thomas.voss@rub.de> | ||
985 | 971 | Date: Tue Dec 13 10:08:09 2011 +0100 | ||
986 | 972 | |||
987 | 973 | Modified Process::Terminate and Process::Kill to reset process identifier. Adjusted documentation. | ||
988 | 974 | |||
989 | 975 | commit 932bf1ec03ed9160c9784fdbb7f3a9456a5beb50 | ||
990 | 976 | Author: Thomas Voß <thomas.voss@rub.de> | ||
991 | 977 | Date: Tue Dec 13 10:00:07 2011 +0100 | ||
992 | 978 | |||
993 | 979 | Adjusted documentation according to review. Switched to std::string for environment query/adjustment in Process. | ||
994 | 980 | |||
995 | 981 | commit 07ffdc1266c3c3d7c5d2df56666567777fd54050 | ||
996 | 982 | Author: Thomas Voß <thomas.voss@rub.de> | ||
997 | 983 | Date: Tue Dec 13 07:37:37 2011 +0100 | ||
998 | 984 | |||
999 | 985 | Prevent from linking Test in Google Test. Set HIDE_SCOPE_NAMES to NO. | ||
1000 | 986 | |||
1001 | 987 | commit 4ee62b348d2346e03b6cbbfd94f710eda499d011 | ||
1002 | 988 | Merge: bd17c14 934da76 | ||
1003 | 989 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1004 | 990 | Date: Mon Dec 12 11:28:13 2011 -0800 | ||
1005 | 991 | |||
1006 | 992 | Merge cleanup and fixes branch | ||
1007 | 993 | |||
1008 | 994 | commit bb43c8271894e29a5818fadacde9bb459a55e6e1 | ||
1009 | 995 | Author: Thomas Voß <thomas.voss@rub.de> | ||
1010 | 996 | Date: Mon Dec 12 09:44:51 2011 +0100 | ||
1011 | 997 | |||
1012 | 998 | Referenced manpage of execvp in documentation. | ||
1013 | 999 | |||
1014 | 1000 | commit 6383f42858833f9695580f365352df30f4e33fb2 | ||
1015 | 1001 | Author: Thomas Voß <thomas.voss@rub.de> | ||
1016 | 1002 | Date: Mon Dec 12 09:31:21 2011 +0100 | ||
1017 | 1003 | |||
1018 | 1004 | Fixed whitespace issue. | ||
1019 | 1005 | |||
1020 | 1006 | commit e7ea9a0717b58af7aaf9728862df424c84e58b77 | ||
1021 | 1007 | Merge: f815612 934da76 | ||
1022 | 1008 | Author: Thomas Voß <thomas.voss@rub.de> | ||
1023 | 1009 | Date: Mon Dec 12 09:22:17 2011 +0100 | ||
1024 | 1010 | |||
1025 | 1011 | Added: Additional doxygen documentation and adjusted build setup to include docs. | ||
1026 | 1012 | |||
1027 | 1013 | commit 934da7636d0cc811600c2dd73c6cd386f0851e25 | ||
1028 | 1014 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1029 | 1015 | Date: Fri Dec 9 13:03:46 2011 -0800 | ||
1030 | 1016 | |||
1031 | 1017 | Throw runtime_error if Test::SetUp fails to open connection to server | ||
1032 | 1018 | |||
1033 | 1019 | gtest treats exceptions as test failures, so this should have the same | ||
1034 | 1020 | result but is a cleaner implementation. | ||
1035 | 1021 | |||
1036 | 1022 | commit c0b553ebe1be0bf4c2ebffc1582a0e07f40aaa5a | ||
1037 | 1023 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1038 | 1024 | Date: Fri Dec 9 12:09:28 2011 -0800 | ||
1039 | 1025 | |||
1040 | 1026 | Add initializer for Environment::Private struct since it is not a POD | ||
1041 | 1027 | |||
1042 | 1028 | commit f815612acc574081880c62b64ba803f5305b8bc5 | ||
1043 | 1029 | Author: Thomas Voß <thomas.voss@rub.de> | ||
1044 | 1030 | Date: Fri Dec 9 09:58:35 2011 +0100 | ||
1045 | 1031 | |||
1046 | 1032 | Added doxygen documentation for public interface classes. | ||
1047 | 1033 | |||
1048 | 1034 | commit ef3e43e4edba9577097430bed545ad4c7dca3fb8 | ||
1049 | 1035 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1050 | 1036 | Date: Thu Dec 8 15:07:53 2011 -0800 | ||
1051 | 1037 | |||
1052 | 1038 | Remove strdup from argument parsing in Process::Start() | ||
1053 | 1039 | |||
1054 | 1040 | The data pointed to by the args should still be valid. There's no real | ||
1055 | 1041 | need to copy the data. | ||
1056 | 1042 | |||
1057 | 1043 | commit 330dfc09ecc78cfd91a93ed5d41f31f0341e81a1 | ||
1058 | 1044 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1059 | 1045 | Date: Thu Dec 8 15:00:25 2011 -0800 | ||
1060 | 1046 | |||
1061 | 1047 | Use std::vector to store process arguments passed to execvp | ||
1062 | 1048 | |||
1063 | 1049 | commit 3eda6c1380ab4bdfaf891d6d20097dc83dac8e65 | ||
1064 | 1050 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1065 | 1051 | Date: Thu Dec 8 14:20:53 2011 -0800 | ||
1066 | 1052 | |||
1067 | 1053 | Use std::auto_ptr for Test pimpl too | ||
1068 | 1054 | |||
1069 | 1055 | commit 826c9bbf23fd5650cd2ca0e3314e4e8559b1061e | ||
1070 | 1056 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1071 | 1057 | Date: Thu Dec 8 14:09:23 2011 -0800 | ||
1072 | 1058 | |||
1073 | 1059 | Use C++ headers, such as cstring, instead of C-compatibility headers | ||
1074 | 1060 | |||
1075 | 1061 | commit 1bc40ffa16a3986d901bf602fcf17504afdf6cfc | ||
1076 | 1062 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1077 | 1063 | Date: Thu Dec 8 14:02:26 2011 -0800 | ||
1078 | 1064 | |||
1079 | 1065 | Remove obsolete Process::SetEnvBehavior enum | ||
1080 | 1066 | |||
1081 | 1067 | commit 6757be79645ba5a4e582e010934d1ef908896e9d | ||
1082 | 1068 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1083 | 1069 | Date: Thu Dec 8 13:59:34 2011 -0800 | ||
1084 | 1070 | |||
1085 | 1071 | Use std::auto_ptr for pimpls | ||
1086 | 1072 | |||
1087 | 1073 | commit 3ddfc3d8b1dd8a99126faa2eb05687eb08c279fb | ||
1088 | 1074 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1089 | 1075 | Date: Thu Dec 8 13:51:17 2011 -0800 | ||
1090 | 1076 | |||
1091 | 1077 | Add newlines to end of Environment::TearDown() error messages | ||
1092 | 1078 | |||
1093 | 1079 | commit ad2cdf9b4daf3193dc852342153719817c8b1fc0 | ||
1094 | 1080 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1095 | 1081 | Date: Thu Dec 8 13:50:11 2011 -0800 | ||
1096 | 1082 | |||
1097 | 1083 | In Environment::SetUp, pass std::string into Process::Start | ||
1098 | 1084 | |||
1099 | 1085 | commit dc354884d529bf6060a6a1537339527ad70d80a7 | ||
1100 | 1086 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1101 | 1087 | Date: Wed Dec 7 15:34:30 2011 -0800 | ||
1102 | 1088 | |||
1103 | 1089 | Fix a couple usages of C++ line comments | ||
1104 | 1090 | |||
1105 | 1091 | C++ line comments are only used for documenting end of namespace scopes | ||
1106 | 1092 | and #endif macros. | ||
1107 | 1093 | |||
1108 | 1094 | commit 016ff9329130266f10edd7f4828bf22e59a8c97f | ||
1109 | 1095 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1110 | 1096 | Date: Wed Dec 7 14:46:28 2011 -0800 | ||
1111 | 1097 | |||
1112 | 1098 | Add xorg::testing::Test base test fixture | ||
1113 | 1099 | |||
1114 | 1100 | commit 3aea1bbbbb7f7ab8a76cdbfc110fa9c5ed14ae25 | ||
1115 | 1101 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1116 | 1102 | Date: Wed Dec 7 12:38:04 2011 -0800 | ||
1117 | 1103 | |||
1118 | 1104 | Add server executable path option so one can test different servers | ||
1119 | 1105 | |||
1120 | 1106 | Also, fix issues with the main option parsing code. | ||
1121 | 1107 | |||
1122 | 1108 | commit 4f083dd6a3ea2473913d23aecf4d06f664f95bce | ||
1123 | 1109 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1124 | 1110 | Date: Wed Dec 7 12:40:30 2011 -0800 | ||
1125 | 1111 | |||
1126 | 1112 | Reorder Process copy constructor declarations | ||
1127 | 1113 | |||
1128 | 1114 | commit 8fe2c7c8bfc167c577674273f462f2d7c7a1a9fa | ||
1129 | 1115 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1130 | 1116 | Date: Wed Dec 7 12:27:12 2011 -0800 | ||
1131 | 1117 | |||
1132 | 1118 | Fix comment in environment.h | ||
1133 | 1119 | |||
1134 | 1120 | commit 3d4a10a0280ed3320ed221e33595623af8d20150 | ||
1135 | 1121 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1136 | 1122 | Date: Wed Dec 7 12:26:25 2011 -0800 | ||
1137 | 1123 | |||
1138 | 1124 | Cleanup unnecessary braces in if .. else blocks in Environment::SetUp() | ||
1139 | 1125 | |||
1140 | 1126 | commit 4348b83156925eee6f2cbdca24a2473ebfd90c9f | ||
1141 | 1127 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1142 | 1128 | Date: Wed Dec 7 12:24:59 2011 -0800 | ||
1143 | 1129 | |||
1144 | 1130 | Don't fail the tests if the X server refuses to die | ||
1145 | 1131 | |||
1146 | 1132 | commit e97811a1be63c97706fe3ca87a0568eb5a585a08 | ||
1147 | 1133 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1148 | 1134 | Date: Wed Dec 7 12:15:08 2011 -0800 | ||
1149 | 1135 | |||
1150 | 1136 | Let setenv() and getenv() do error handling, and throw exception if they | ||
1151 | 1137 | fail | ||
1152 | 1138 | |||
1153 | 1139 | commit bd446fb14847d6ab4d6531fb39309eea58aac4df | ||
1154 | 1140 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1155 | 1141 | Date: Wed Dec 7 12:09:04 2011 -0800 | ||
1156 | 1142 | |||
1157 | 1143 | Throw exception if child process tries to kill itself | ||
1158 | 1144 | |||
1159 | 1145 | commit f052b71de4ab05158b2b239d9d31d64e0aad76a4 | ||
1160 | 1146 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1161 | 1147 | Date: Wed Dec 7 12:05:26 2011 -0800 | ||
1162 | 1148 | |||
1163 | 1149 | Remove Process::Wait() | ||
1164 | 1150 | |||
1165 | 1151 | There are many ways to wait on the status of a process. We don't want to | ||
1166 | 1152 | get into wrapping all of them. Let the caller pick and choose from the | ||
1167 | 1153 | c library. | ||
1168 | 1154 | |||
1169 | 1155 | commit 723704879e551b971e1e3504be7338e371d4981d | ||
1170 | 1156 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1171 | 1157 | Date: Wed Dec 7 12:02:05 2011 -0800 | ||
1172 | 1158 | |||
1173 | 1159 | Rename Process::pid() to Process::Pid() to follow naming conventions | ||
1174 | 1160 | |||
1175 | 1161 | commit 2a3c526f6f6d1e32a4f51bef557a26520fe01ef7 | ||
1176 | 1162 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1177 | 1163 | Date: Wed Dec 7 11:58:20 2011 -0800 | ||
1178 | 1164 | |||
1179 | 1165 | Fix Process::Start() and switch to using exceptions | ||
1180 | 1166 | |||
1181 | 1167 | commit 737e0bc858cb741407c24fc8597bd98f3c15a271 | ||
1182 | 1168 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1183 | 1169 | Date: Wed Dec 7 09:01:57 2011 -0800 | ||
1184 | 1170 | |||
1185 | 1171 | Switch Process::Private to a POD struct | ||
1186 | 1172 | |||
1187 | 1173 | Some other syntax cleanups too. | ||
1188 | 1174 | |||
1189 | 1175 | commit c182eb93570139e18f8eeb3144e9ed5ccf3a3252 | ||
1190 | 1176 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1191 | 1177 | Date: Wed Dec 7 08:50:50 2011 -0800 | ||
1192 | 1178 | |||
1193 | 1179 | Re-enable X server startup timeout | ||
1194 | 1180 | |||
1195 | 1181 | commit eba6481ae557d05da0b151087a090d00496d1aa2 | ||
1196 | 1182 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1197 | 1183 | Date: Wed Dec 7 08:50:06 2011 -0800 | ||
1198 | 1184 | |||
1199 | 1185 | Remove dead code in Environment | ||
1200 | 1186 | |||
1201 | 1187 | commit 204cfd5c09eb1b40059d49b9864ee0f584630a4c | ||
1202 | 1188 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1203 | 1189 | Date: Wed Dec 7 08:47:56 2011 -0800 | ||
1204 | 1190 | |||
1205 | 1191 | Make Environment::Private a POD struct | ||
1206 | 1192 | |||
1207 | 1193 | commit 9c003eb98bc41d196847ab911d9d155c5a7972a4 | ||
1208 | 1194 | Author: Thomas Voß <thomas.voss@rub.de> | ||
1209 | 1195 | Date: Wed Dec 7 15:34:53 2011 +0100 | ||
1210 | 1196 | |||
1211 | 1197 | ADDED: Simple and lightweight class to abstract process handling. | ||
1212 | 1198 | |||
1213 | 1199 | commit bd17c146ff4a159393ec37f1300c613d40921bbf | ||
1214 | 1200 | Merge: 1ff7a96 7777cbb | ||
1215 | 1201 | Author: Thomas Voß <thomas.voss@rub.de> | ||
1216 | 1202 | Date: Tue Dec 6 11:16:25 2011 +0100 | ||
1217 | 1203 | |||
1218 | 1204 | Merged. | ||
1219 | 1205 | |||
1220 | 1206 | commit 7777cbbbd16d428d68fc738a946816edcb718654 | ||
1221 | 1207 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1222 | 1208 | Date: Mon Dec 5 16:25:36 2011 -0800 | ||
1223 | 1209 | |||
1224 | 1210 | Use installed dummy.conf location | ||
1225 | 1211 | |||
1226 | 1212 | Also, set the location in the pkg-config file so other packages can find | ||
1227 | 1213 | it. | ||
1228 | 1214 | |||
1229 | 1215 | commit ad0ef22400f1b9960e15e0f6fe39b3e95701f21e | ||
1230 | 1216 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1231 | 1217 | Date: Mon Dec 5 16:02:22 2011 -0800 | ||
1232 | 1218 | |||
1233 | 1219 | Rename testing::xorg to xorg::testing | ||
1234 | 1220 | |||
1235 | 1221 | Prevents a possible collision with gtest's testing namespace | ||
1236 | 1222 | |||
1237 | 1223 | commit e10564038f99adee0a12cb028cac5bd1610d7b40 | ||
1238 | 1224 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1239 | 1225 | Date: Mon Dec 5 11:32:36 2011 -0800 | ||
1240 | 1226 | |||
1241 | 1227 | Remove unused fixture.h | ||
1242 | 1228 | |||
1243 | 1229 | commit 4a1d0ed99f929b658e726f83e4ded4cc5e21aabc | ||
1244 | 1230 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1245 | 1231 | Date: Mon Dec 5 11:32:04 2011 -0800 | ||
1246 | 1232 | |||
1247 | 1233 | Add pkg-config file | ||
1248 | 1234 | |||
1249 | 1235 | commit 9fc1496d5a10266337773daff2b3d9937fbf8cf1 | ||
1250 | 1236 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1251 | 1237 | Date: Mon Dec 5 10:54:49 2011 -0800 | ||
1252 | 1238 | |||
1253 | 1239 | Remove unused gcov support | ||
1254 | 1240 | |||
1255 | 1241 | commit e1d5b252f4c09ee52380a7b7b7533a9b7c382975 | ||
1256 | 1242 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1257 | 1243 | Date: Mon Dec 5 10:53:37 2011 -0800 | ||
1258 | 1244 | |||
1259 | 1245 | Remove autoconf check for C compiler since we only use C++ | ||
1260 | 1246 | |||
1261 | 1247 | commit f4706dc1c47eb59bda619dc105a0e6e9f0a81a21 | ||
1262 | 1248 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1263 | 1249 | Date: Mon Dec 5 10:49:52 2011 -0800 | ||
1264 | 1250 | |||
1265 | 1251 | Init gtest before checking for special args so --help works properly | ||
1266 | 1252 | |||
1267 | 1253 | Otherwise, it's impossible to list the gtest help list. | ||
1268 | 1254 | |||
1269 | 1255 | commit 26cdf7ae0eb8477b2c8afa97d3857d8810de3d99 | ||
1270 | 1256 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1271 | 1257 | Date: Mon Dec 5 10:47:31 2011 -0800 | ||
1272 | 1258 | |||
1273 | 1259 | Remove unnecessary c++0x std flag | ||
1274 | 1260 | |||
1275 | 1261 | We can add it back in if we actually use any of its features. | ||
1276 | 1262 | |||
1277 | 1263 | commit d401f679f3e9161bbb06ce33bf48678c74329cd0 | ||
1278 | 1264 | Author: Chase Douglas <chase.douglas@ubuntu.com> | ||
1279 | 1265 | Date: Mon Dec 5 10:46:07 2011 -0800 | ||
1280 | 1266 | |||
1281 | 1267 | Rename to xorg-gtest, move some files around, make some fixes | ||
1282 | 1268 | |||
1283 | 1269 | commit 1ff7a967e0648d6f71bf3bc30e3642431765da7e | ||
1284 | 1270 | Author: Thomas Voß <thomas.voss@rub.de> | ||
1285 | 1271 | Date: Mon Dec 5 17:27:29 2011 +0100 | ||
1286 | 1272 | |||
1287 | 1273 | init checkin. | ||
1288 | 1274 | 0 | ||
1289 | === modified file 'Makefile.am' | |||
1290 | --- Makefile.am 2012-03-19 18:39:04 +0000 | |||
1291 | +++ Makefile.am 2013-01-21 00:48:20 +0000 | |||
1292 | @@ -23,7 +23,7 @@ | |||
1293 | 23 | # SOFTWARE. | 23 | # SOFTWARE. |
1294 | 24 | # | 24 | # |
1295 | 25 | 25 | ||
1297 | 26 | SUBDIRS = aclocal data doc include src examples | 26 | SUBDIRS = aclocal data doc include src examples test gtest |
1298 | 27 | 27 | ||
1299 | 28 | pkgconfigdir = $(libdir)/pkgconfig | 28 | pkgconfigdir = $(libdir)/pkgconfig |
1300 | 29 | pkgconfig_DATA = xorg-gtest.pc | 29 | pkgconfig_DATA = xorg-gtest.pc |
1301 | 30 | 30 | ||
1302 | === modified file 'Makefile.in' | |||
1303 | --- Makefile.in 2012-03-19 18:39:04 +0000 | |||
1304 | +++ Makefile.in 2013-01-21 00:48:20 +0000 | |||
1305 | @@ -1,4 +1,4 @@ | |||
1307 | 1 | # Makefile.in generated by automake 1.11.3 from Makefile.am. | 1 | # Makefile.in generated by automake 1.11.6 from Makefile.am. |
1308 | 2 | # @configure_input@ | 2 | # @configure_input@ |
1309 | 3 | 3 | ||
1310 | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
1311 | @@ -41,6 +41,23 @@ | |||
1312 | 41 | # | 41 | # |
1313 | 42 | 42 | ||
1314 | 43 | VPATH = @srcdir@ | 43 | VPATH = @srcdir@ |
1315 | 44 | am__make_dryrun = \ | ||
1316 | 45 | { \ | ||
1317 | 46 | am__dry=no; \ | ||
1318 | 47 | case $$MAKEFLAGS in \ | ||
1319 | 48 | *\\[\ \ ]*) \ | ||
1320 | 49 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | ||
1321 | 50 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | ||
1322 | 51 | *) \ | ||
1323 | 52 | for am__flg in $$MAKEFLAGS; do \ | ||
1324 | 53 | case $$am__flg in \ | ||
1325 | 54 | *=*|--*) ;; \ | ||
1326 | 55 | *n*) am__dry=yes; break;; \ | ||
1327 | 56 | esac; \ | ||
1328 | 57 | done;; \ | ||
1329 | 58 | esac; \ | ||
1330 | 59 | test $$am__dry = yes; \ | ||
1331 | 60 | } | ||
1332 | 44 | pkgdatadir = $(datadir)/@PACKAGE@ | 61 | pkgdatadir = $(datadir)/@PACKAGE@ |
1333 | 45 | pkgincludedir = $(includedir)/@PACKAGE@ | 62 | pkgincludedir = $(includedir)/@PACKAGE@ |
1334 | 46 | pkglibdir = $(libdir)/@PACKAGE@ | 63 | pkglibdir = $(libdir)/@PACKAGE@ |
1335 | @@ -65,7 +82,7 @@ | |||
1336 | 65 | $(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \ | 82 | $(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \ |
1337 | 66 | config.sub depcomp install-sh missing | 83 | config.sub depcomp install-sh missing |
1338 | 67 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 84 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1340 | 68 | am__aclocal_m4_deps = $(top_srcdir)/m4/gtest.m4 \ | 85 | am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ |
1341 | 69 | $(top_srcdir)/configure.ac | 86 | $(top_srcdir)/configure.ac |
1342 | 70 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 87 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1343 | 71 | $(ACLOCAL_M4) | 88 | $(ACLOCAL_M4) |
1344 | @@ -89,6 +106,11 @@ | |||
1345 | 89 | install-pdf-recursive install-ps-recursive install-recursive \ | 106 | install-pdf-recursive install-ps-recursive install-recursive \ |
1346 | 90 | installcheck-recursive installdirs-recursive pdf-recursive \ | 107 | installcheck-recursive installdirs-recursive pdf-recursive \ |
1347 | 91 | ps-recursive uninstall-recursive | 108 | ps-recursive uninstall-recursive |
1348 | 109 | am__can_run_installinfo = \ | ||
1349 | 110 | case $$AM_UPDATE_INFO_DIR in \ | ||
1350 | 111 | n|no|NO) false;; \ | ||
1351 | 112 | *) (install-info --version) >/dev/null 2>&1;; \ | ||
1352 | 113 | esac | ||
1353 | 92 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | 114 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
1354 | 93 | am__vpath_adj = case $$p in \ | 115 | am__vpath_adj = case $$p in \ |
1355 | 94 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | 116 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
1356 | @@ -160,8 +182,8 @@ | |||
1357 | 160 | dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ | 182 | dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ |
1358 | 161 | done; \ | 183 | done; \ |
1359 | 162 | reldir="$$dir2" | 184 | reldir="$$dir2" |
1360 | 163 | DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 | ||
1361 | 164 | GZIP_ENV = --best | 185 | GZIP_ENV = --best |
1362 | 186 | DIST_ARCHIVES = $(distdir).tar.bz2 | ||
1363 | 165 | distuninstallcheck_listfiles = find . -type f -print | 187 | distuninstallcheck_listfiles = find . -type f -print |
1364 | 166 | am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | 188 | am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
1365 | 167 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' | 189 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
1366 | @@ -177,6 +199,7 @@ | |||
1367 | 177 | AUTOHEADER = @AUTOHEADER@ | 199 | AUTOHEADER = @AUTOHEADER@ |
1368 | 178 | AUTOMAKE = @AUTOMAKE@ | 200 | AUTOMAKE = @AUTOMAKE@ |
1369 | 179 | AWK = @AWK@ | 201 | AWK = @AWK@ |
1370 | 202 | BASE_CPPFLAGS = @BASE_CPPFLAGS@ | ||
1371 | 180 | BASE_CXXFLAGS = @BASE_CXXFLAGS@ | 203 | BASE_CXXFLAGS = @BASE_CXXFLAGS@ |
1372 | 181 | CHANGELOG_CMD = @CHANGELOG_CMD@ | 204 | CHANGELOG_CMD = @CHANGELOG_CMD@ |
1373 | 182 | CPPFLAGS = @CPPFLAGS@ | 205 | CPPFLAGS = @CPPFLAGS@ |
1374 | @@ -188,6 +211,7 @@ | |||
1375 | 188 | CYGPATH_W = @CYGPATH_W@ | 211 | CYGPATH_W = @CYGPATH_W@ |
1376 | 189 | DEFS = @DEFS@ | 212 | DEFS = @DEFS@ |
1377 | 190 | DEPDIR = @DEPDIR@ | 213 | DEPDIR = @DEPDIR@ |
1378 | 214 | DOXYGEN = @DOXYGEN@ | ||
1379 | 191 | DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ | 215 | DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ |
1380 | 192 | DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ | 216 | DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ |
1381 | 193 | DUMMY_CONF_PATH = @DUMMY_CONF_PATH@ | 217 | DUMMY_CONF_PATH = @DUMMY_CONF_PATH@ |
1382 | @@ -201,8 +225,6 @@ | |||
1383 | 201 | FILE_MAN_DIR = @FILE_MAN_DIR@ | 225 | FILE_MAN_DIR = @FILE_MAN_DIR@ |
1384 | 202 | FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ | 226 | FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ |
1385 | 203 | GREP = @GREP@ | 227 | GREP = @GREP@ |
1386 | 204 | GTEST_CPPFLAGS = @GTEST_CPPFLAGS@ | ||
1387 | 205 | GTEST_SOURCE = @GTEST_SOURCE@ | ||
1388 | 206 | INSTALL = @INSTALL@ | 228 | INSTALL = @INSTALL@ |
1389 | 207 | INSTALL_CMD = @INSTALL_CMD@ | 229 | INSTALL_CMD = @INSTALL_CMD@ |
1390 | 208 | INSTALL_DATA = @INSTALL_DATA@ | 230 | INSTALL_DATA = @INSTALL_DATA@ |
1391 | @@ -214,6 +236,7 @@ | |||
1392 | 214 | LIBS = @LIBS@ | 236 | LIBS = @LIBS@ |
1393 | 215 | LIB_MAN_DIR = @LIB_MAN_DIR@ | 237 | LIB_MAN_DIR = @LIB_MAN_DIR@ |
1394 | 216 | LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ | 238 | LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ |
1395 | 239 | LOGFILE_DIR = @LOGFILE_DIR@ | ||
1396 | 217 | LTLIBOBJS = @LTLIBOBJS@ | 240 | LTLIBOBJS = @LTLIBOBJS@ |
1397 | 218 | MAINT = @MAINT@ | 241 | MAINT = @MAINT@ |
1398 | 219 | MAKEINFO = @MAKEINFO@ | 242 | MAKEINFO = @MAKEINFO@ |
1399 | @@ -241,10 +264,10 @@ | |||
1400 | 241 | STRICT_CXXFLAGS = @STRICT_CXXFLAGS@ | 264 | STRICT_CXXFLAGS = @STRICT_CXXFLAGS@ |
1401 | 242 | STRIP = @STRIP@ | 265 | STRIP = @STRIP@ |
1402 | 243 | VERSION = @VERSION@ | 266 | VERSION = @VERSION@ |
1403 | 267 | X11_CFLAGS = @X11_CFLAGS@ | ||
1404 | 268 | X11_LIBS = @X11_LIBS@ | ||
1405 | 244 | XORG_MALLOC_DEBUG_ENV = @XORG_MALLOC_DEBUG_ENV@ | 269 | XORG_MALLOC_DEBUG_ENV = @XORG_MALLOC_DEBUG_ENV@ |
1406 | 245 | XORG_MAN_PAGE = @XORG_MAN_PAGE@ | 270 | XORG_MAN_PAGE = @XORG_MAN_PAGE@ |
1407 | 246 | XSERVER_CFLAGS = @XSERVER_CFLAGS@ | ||
1408 | 247 | XSERVER_LIBS = @XSERVER_LIBS@ | ||
1409 | 248 | abs_builddir = @abs_builddir@ | 271 | abs_builddir = @abs_builddir@ |
1410 | 249 | abs_srcdir = @abs_srcdir@ | 272 | abs_srcdir = @abs_srcdir@ |
1411 | 250 | abs_top_builddir = @abs_top_builddir@ | 273 | abs_top_builddir = @abs_top_builddir@ |
1412 | @@ -295,7 +318,7 @@ | |||
1413 | 295 | top_build_prefix = @top_build_prefix@ | 318 | top_build_prefix = @top_build_prefix@ |
1414 | 296 | top_builddir = @top_builddir@ | 319 | top_builddir = @top_builddir@ |
1415 | 297 | top_srcdir = @top_srcdir@ | 320 | top_srcdir = @top_srcdir@ |
1417 | 298 | SUBDIRS = aclocal data doc include src examples | 321 | SUBDIRS = aclocal data doc include src examples test gtest |
1418 | 299 | pkgconfigdir = $(libdir)/pkgconfig | 322 | pkgconfigdir = $(libdir)/pkgconfig |
1419 | 300 | pkgconfig_DATA = xorg-gtest.pc | 323 | pkgconfig_DATA = xorg-gtest.pc |
1420 | 301 | ACLOCAL_AMFLAGS = -I m4 | 324 | ACLOCAL_AMFLAGS = -I m4 |
1421 | @@ -342,8 +365,11 @@ | |||
1422 | 342 | cd $(top_builddir) && $(SHELL) ./config.status $@ | 365 | cd $(top_builddir) && $(SHELL) ./config.status $@ |
1423 | 343 | install-pkgconfigDATA: $(pkgconfig_DATA) | 366 | install-pkgconfigDATA: $(pkgconfig_DATA) |
1424 | 344 | @$(NORMAL_INSTALL) | 367 | @$(NORMAL_INSTALL) |
1425 | 345 | test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" | ||
1426 | 346 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ | 368 | @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
1427 | 369 | if test -n "$$list"; then \ | ||
1428 | 370 | echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ | ||
1429 | 371 | $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ | ||
1430 | 372 | fi; \ | ||
1431 | 347 | for p in $$list; do \ | 373 | for p in $$list; do \ |
1432 | 348 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | 374 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
1433 | 349 | echo "$$d$$p"; \ | 375 | echo "$$d$$p"; \ |
1434 | @@ -528,13 +554,10 @@ | |||
1435 | 528 | done | 554 | done |
1436 | 529 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | 555 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
1437 | 530 | if test "$$subdir" = .; then :; else \ | 556 | if test "$$subdir" = .; then :; else \ |
1445 | 531 | test -d "$(distdir)/$$subdir" \ | 557 | $(am__make_dryrun) \ |
1446 | 532 | || $(MKDIR_P) "$(distdir)/$$subdir" \ | 558 | || test -d "$(distdir)/$$subdir" \ |
1447 | 533 | || exit 1; \ | 559 | || $(MKDIR_P) "$(distdir)/$$subdir" \ |
1448 | 534 | fi; \ | 560 | || exit 1; \ |
1442 | 535 | done | ||
1443 | 536 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | ||
1444 | 537 | if test "$$subdir" = .; then :; else \ | ||
1449 | 538 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ | 561 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
1450 | 539 | $(am__relativize); \ | 562 | $(am__relativize); \ |
1451 | 540 | new_distdir=$$reldir; \ | 563 | new_distdir=$$reldir; \ |
1452 | @@ -597,7 +620,6 @@ | |||
1453 | 597 | $(am__remove_distdir) | 620 | $(am__remove_distdir) |
1454 | 598 | 621 | ||
1455 | 599 | dist dist-all: distdir | 622 | dist dist-all: distdir |
1456 | 600 | tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | ||
1457 | 601 | tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 | 623 | tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
1458 | 602 | $(am__remove_distdir) | 624 | $(am__remove_distdir) |
1459 | 603 | 625 | ||
1460 | @@ -623,7 +645,7 @@ | |||
1461 | 623 | *.zip*) \ | 645 | *.zip*) \ |
1462 | 624 | unzip $(distdir).zip ;;\ | 646 | unzip $(distdir).zip ;;\ |
1463 | 625 | esac | 647 | esac |
1465 | 626 | chmod -R a-w $(distdir); chmod a+w $(distdir) | 648 | chmod -R a-w $(distdir); chmod u+w $(distdir) |
1466 | 627 | mkdir $(distdir)/_build | 649 | mkdir $(distdir)/_build |
1467 | 628 | mkdir $(distdir)/_inst | 650 | mkdir $(distdir)/_inst |
1468 | 629 | chmod a-w $(distdir) | 651 | chmod a-w $(distdir) |
1469 | 630 | 652 | ||
1470 | === modified file 'README' | |||
1471 | --- README 2012-03-19 18:39:04 +0000 | |||
1472 | +++ README 2013-01-21 00:48:20 +0000 | |||
1473 | @@ -2,10 +2,9 @@ | |||
1474 | 2 | =============================================== | 2 | =============================================== |
1475 | 3 | 3 | ||
1476 | 4 | Provides a Google Test environment for starting and stopping | 4 | Provides a Google Test environment for starting and stopping |
1481 | 5 | a dummy X server for headless testing purposes. The actual | 5 | a X server for testing purposes. The actual environment is defined in header |
1482 | 6 | environment is defined in header environment.h. Please refer to | 6 | environment.h. Please refer to the Google test documentation for information |
1483 | 7 | the Google test documentation for information on how to add a custom | 7 | on how to add a custom environment. |
1480 | 8 | environment. | ||
1484 | 9 | 8 | ||
1485 | 10 | Moreover, a custom main() function that takes care of setting up the | 9 | Moreover, a custom main() function that takes care of setting up the |
1486 | 11 | environment is provided in xorg-gtest_main.cpp. This can be used as a | 10 | environment is provided in xorg-gtest_main.cpp. This can be used as a |
1487 | @@ -74,3 +73,19 @@ | |||
1488 | 74 | xorg-gtest library targets if multiple builds with different compilation flags | 73 | xorg-gtest library targets if multiple builds with different compilation flags |
1489 | 75 | are needed. Finally, link the tests with the appropriate gtest and xorg-gtest | 74 | are needed. Finally, link the tests with the appropriate gtest and xorg-gtest |
1490 | 76 | libraries and their dependencies: libpthread and libX11. | 75 | libraries and their dependencies: libpthread and libX11. |
1491 | 76 | |||
1492 | 77 | Environment variables | ||
1493 | 78 | --------------------- | ||
1494 | 79 | XORG_GTEST_XSERVER_SIGSTOP | ||
1495 | 80 | If set, an XServer object will raise a SIGSTOP signal after startup. | ||
1496 | 81 | XORG_GTEST_XSERVER_KEEPALIVE | ||
1497 | 82 | If set, the XServer object will ignore calls to Terminate() or Kill(). | ||
1498 | 83 | This is useful for debugging a server without having the test terminate | ||
1499 | 84 | the process while still looking at gdb output. | ||
1500 | 85 | XORG_GTEST_CHILD_STDOUT | ||
1501 | 86 | If set to any value, Process::Start() will _not_ close stdout/stdin/stderr | ||
1502 | 87 | for the forked child. | ||
1503 | 88 | XORG_GTEST_USE_VALGRIND | ||
1504 | 89 | Set to the valgrind command to use when starting a process. Options must | ||
1505 | 90 | be space-separated, e.g. "valgrind --leak-check=full --someotherarg" | ||
1506 | 91 | Not limited to valgrind, you can specify any executable here. | ||
1507 | 77 | 92 | ||
1508 | === modified file 'aclocal.m4' | |||
1509 | --- aclocal.m4 2012-03-19 18:39:04 +0000 | |||
1510 | +++ aclocal.m4 2013-01-21 00:48:20 +0000 | |||
1511 | @@ -1,4 +1,4 @@ | |||
1513 | 1 | # generated automatically by aclocal 1.11.3 -*- Autoconf -*- | 1 | # generated automatically by aclocal 1.11.6 -*- Autoconf -*- |
1514 | 2 | 2 | ||
1515 | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
1516 | 4 | # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, | 4 | # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
1517 | @@ -14,8 +14,8 @@ | |||
1518 | 14 | 14 | ||
1519 | 15 | m4_ifndef([AC_AUTOCONF_VERSION], | 15 | m4_ifndef([AC_AUTOCONF_VERSION], |
1520 | 16 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | 16 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1523 | 17 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, | 17 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
1524 | 18 | [m4_warning([this file was generated for autoconf 2.68. | 18 | [m4_warning([this file was generated for autoconf 2.69. |
1525 | 19 | You have another version of autoconf. It may work, but is not guaranteed to. | 19 | You have another version of autoconf. It may work, but is not guaranteed to. |
1526 | 20 | If you have problems, you may need to regenerate the build system entirely. | 20 | If you have problems, you may need to regenerate the build system entirely. |
1527 | 21 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) | 21 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
1528 | @@ -2051,7 +2051,7 @@ | |||
1529 | 2051 | [am__api_version='1.11' | 2051 | [am__api_version='1.11' |
1530 | 2052 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | 2052 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
1531 | 2053 | dnl require some minimum version. Point them to the right macro. | 2053 | dnl require some minimum version. Point them to the right macro. |
1533 | 2054 | m4_if([$1], [1.11.3], [], | 2054 | m4_if([$1], [1.11.6], [], |
1534 | 2055 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | 2055 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
1535 | 2056 | ]) | 2056 | ]) |
1536 | 2057 | 2057 | ||
1537 | @@ -2067,7 +2067,7 @@ | |||
1538 | 2067 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | 2067 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
1539 | 2068 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | 2068 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
1540 | 2069 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | 2069 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
1542 | 2070 | [AM_AUTOMAKE_VERSION([1.11.3])dnl | 2070 | [AM_AUTOMAKE_VERSION([1.11.6])dnl |
1543 | 2071 | m4_ifndef([AC_AUTOCONF_VERSION], | 2071 | m4_ifndef([AC_AUTOCONF_VERSION], |
1544 | 2072 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | 2072 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1545 | 2073 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | 2073 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
1546 | @@ -3079,4 +3079,4 @@ | |||
1547 | 3079 | AC_SUBST([am__untar]) | 3079 | AC_SUBST([am__untar]) |
1548 | 3080 | ]) # _AM_PROG_TAR | 3080 | ]) # _AM_PROG_TAR |
1549 | 3081 | 3081 | ||
1551 | 3082 | m4_include([m4/gtest.m4]) | 3082 | m4_include([m4/ac_define_dir.m4]) |
1552 | 3083 | 3083 | ||
1553 | === modified file 'aclocal/Makefile.in' | |||
1554 | --- aclocal/Makefile.in 2012-03-19 18:39:04 +0000 | |||
1555 | +++ aclocal/Makefile.in 2013-01-21 00:48:20 +0000 | |||
1556 | @@ -1,4 +1,4 @@ | |||
1558 | 1 | # Makefile.in generated by automake 1.11.3 from Makefile.am. | 1 | # Makefile.in generated by automake 1.11.6 from Makefile.am. |
1559 | 2 | # @configure_input@ | 2 | # @configure_input@ |
1560 | 3 | 3 | ||
1561 | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
1562 | @@ -41,6 +41,23 @@ | |||
1563 | 41 | # | 41 | # |
1564 | 42 | 42 | ||
1565 | 43 | VPATH = @srcdir@ | 43 | VPATH = @srcdir@ |
1566 | 44 | am__make_dryrun = \ | ||
1567 | 45 | { \ | ||
1568 | 46 | am__dry=no; \ | ||
1569 | 47 | case $$MAKEFLAGS in \ | ||
1570 | 48 | *\\[\ \ ]*) \ | ||
1571 | 49 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | ||
1572 | 50 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | ||
1573 | 51 | *) \ | ||
1574 | 52 | for am__flg in $$MAKEFLAGS; do \ | ||
1575 | 53 | case $$am__flg in \ | ||
1576 | 54 | *=*|--*) ;; \ | ||
1577 | 55 | *n*) am__dry=yes; break;; \ | ||
1578 | 56 | esac; \ | ||
1579 | 57 | done;; \ | ||
1580 | 58 | esac; \ | ||
1581 | 59 | test $$am__dry = yes; \ | ||
1582 | 60 | } | ||
1583 | 44 | pkgdatadir = $(datadir)/@PACKAGE@ | 61 | pkgdatadir = $(datadir)/@PACKAGE@ |
1584 | 45 | pkgincludedir = $(includedir)/@PACKAGE@ | 62 | pkgincludedir = $(includedir)/@PACKAGE@ |
1585 | 46 | pkglibdir = $(libdir)/@PACKAGE@ | 63 | pkglibdir = $(libdir)/@PACKAGE@ |
1586 | @@ -63,7 +80,7 @@ | |||
1587 | 63 | DIST_COMMON = $(dist_aclocal_DATA) $(srcdir)/Makefile.am \ | 80 | DIST_COMMON = $(dist_aclocal_DATA) $(srcdir)/Makefile.am \ |
1588 | 64 | $(srcdir)/Makefile.in | 81 | $(srcdir)/Makefile.in |
1589 | 65 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 82 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1591 | 66 | am__aclocal_m4_deps = $(top_srcdir)/m4/gtest.m4 \ | 83 | am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ |
1592 | 67 | $(top_srcdir)/configure.ac | 84 | $(top_srcdir)/configure.ac |
1593 | 68 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 85 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1594 | 69 | $(ACLOCAL_M4) | 86 | $(ACLOCAL_M4) |
1595 | @@ -78,6 +95,11 @@ | |||
1596 | 78 | am__v_at_0 = @ | 95 | am__v_at_0 = @ |
1597 | 79 | SOURCES = | 96 | SOURCES = |
1598 | 80 | DIST_SOURCES = | 97 | DIST_SOURCES = |
1599 | 98 | am__can_run_installinfo = \ | ||
1600 | 99 | case $$AM_UPDATE_INFO_DIR in \ | ||
1601 | 100 | n|no|NO) false;; \ | ||
1602 | 101 | *) (install-info --version) >/dev/null 2>&1;; \ | ||
1603 | 102 | esac | ||
1604 | 81 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | 103 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
1605 | 82 | am__vpath_adj = case $$p in \ | 104 | am__vpath_adj = case $$p in \ |
1606 | 83 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | 105 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
1607 | @@ -119,6 +141,7 @@ | |||
1608 | 119 | AUTOHEADER = @AUTOHEADER@ | 141 | AUTOHEADER = @AUTOHEADER@ |
1609 | 120 | AUTOMAKE = @AUTOMAKE@ | 142 | AUTOMAKE = @AUTOMAKE@ |
1610 | 121 | AWK = @AWK@ | 143 | AWK = @AWK@ |
1611 | 144 | BASE_CPPFLAGS = @BASE_CPPFLAGS@ | ||
1612 | 122 | BASE_CXXFLAGS = @BASE_CXXFLAGS@ | 145 | BASE_CXXFLAGS = @BASE_CXXFLAGS@ |
1613 | 123 | CHANGELOG_CMD = @CHANGELOG_CMD@ | 146 | CHANGELOG_CMD = @CHANGELOG_CMD@ |
1614 | 124 | CPPFLAGS = @CPPFLAGS@ | 147 | CPPFLAGS = @CPPFLAGS@ |
1615 | @@ -130,6 +153,7 @@ | |||
1616 | 130 | CYGPATH_W = @CYGPATH_W@ | 153 | CYGPATH_W = @CYGPATH_W@ |
1617 | 131 | DEFS = @DEFS@ | 154 | DEFS = @DEFS@ |
1618 | 132 | DEPDIR = @DEPDIR@ | 155 | DEPDIR = @DEPDIR@ |
1619 | 156 | DOXYGEN = @DOXYGEN@ | ||
1620 | 133 | DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ | 157 | DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ |
1621 | 134 | DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ | 158 | DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ |
1622 | 135 | DUMMY_CONF_PATH = @DUMMY_CONF_PATH@ | 159 | DUMMY_CONF_PATH = @DUMMY_CONF_PATH@ |
1623 | @@ -143,8 +167,6 @@ | |||
1624 | 143 | FILE_MAN_DIR = @FILE_MAN_DIR@ | 167 | FILE_MAN_DIR = @FILE_MAN_DIR@ |
1625 | 144 | FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ | 168 | FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ |
1626 | 145 | GREP = @GREP@ | 169 | GREP = @GREP@ |
1627 | 146 | GTEST_CPPFLAGS = @GTEST_CPPFLAGS@ | ||
1628 | 147 | GTEST_SOURCE = @GTEST_SOURCE@ | ||
1629 | 148 | INSTALL = @INSTALL@ | 170 | INSTALL = @INSTALL@ |
1630 | 149 | INSTALL_CMD = @INSTALL_CMD@ | 171 | INSTALL_CMD = @INSTALL_CMD@ |
1631 | 150 | INSTALL_DATA = @INSTALL_DATA@ | 172 | INSTALL_DATA = @INSTALL_DATA@ |
1632 | @@ -156,6 +178,7 @@ | |||
1633 | 156 | LIBS = @LIBS@ | 178 | LIBS = @LIBS@ |
1634 | 157 | LIB_MAN_DIR = @LIB_MAN_DIR@ | 179 | LIB_MAN_DIR = @LIB_MAN_DIR@ |
1635 | 158 | LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ | 180 | LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ |
1636 | 181 | LOGFILE_DIR = @LOGFILE_DIR@ | ||
1637 | 159 | LTLIBOBJS = @LTLIBOBJS@ | 182 | LTLIBOBJS = @LTLIBOBJS@ |
1638 | 160 | MAINT = @MAINT@ | 183 | MAINT = @MAINT@ |
1639 | 161 | MAKEINFO = @MAKEINFO@ | 184 | MAKEINFO = @MAKEINFO@ |
1640 | @@ -183,10 +206,10 @@ | |||
1641 | 183 | STRICT_CXXFLAGS = @STRICT_CXXFLAGS@ | 206 | STRICT_CXXFLAGS = @STRICT_CXXFLAGS@ |
1642 | 184 | STRIP = @STRIP@ | 207 | STRIP = @STRIP@ |
1643 | 185 | VERSION = @VERSION@ | 208 | VERSION = @VERSION@ |
1644 | 209 | X11_CFLAGS = @X11_CFLAGS@ | ||
1645 | 210 | X11_LIBS = @X11_LIBS@ | ||
1646 | 186 | XORG_MALLOC_DEBUG_ENV = @XORG_MALLOC_DEBUG_ENV@ | 211 | XORG_MALLOC_DEBUG_ENV = @XORG_MALLOC_DEBUG_ENV@ |
1647 | 187 | XORG_MAN_PAGE = @XORG_MAN_PAGE@ | 212 | XORG_MAN_PAGE = @XORG_MAN_PAGE@ |
1648 | 188 | XSERVER_CFLAGS = @XSERVER_CFLAGS@ | ||
1649 | 189 | XSERVER_LIBS = @XSERVER_LIBS@ | ||
1650 | 190 | abs_builddir = @abs_builddir@ | 213 | abs_builddir = @abs_builddir@ |
1651 | 191 | abs_srcdir = @abs_srcdir@ | 214 | abs_srcdir = @abs_srcdir@ |
1652 | 192 | abs_top_builddir = @abs_top_builddir@ | 215 | abs_top_builddir = @abs_top_builddir@ |
1653 | @@ -274,8 +297,11 @@ | |||
1654 | 274 | $(am__aclocal_m4_deps): | 297 | $(am__aclocal_m4_deps): |
1655 | 275 | install-dist_aclocalDATA: $(dist_aclocal_DATA) | 298 | install-dist_aclocalDATA: $(dist_aclocal_DATA) |
1656 | 276 | @$(NORMAL_INSTALL) | 299 | @$(NORMAL_INSTALL) |
1657 | 277 | test -z "$(aclocaldir)" || $(MKDIR_P) "$(DESTDIR)$(aclocaldir)" | ||
1658 | 278 | @list='$(dist_aclocal_DATA)'; test -n "$(aclocaldir)" || list=; \ | 300 | @list='$(dist_aclocal_DATA)'; test -n "$(aclocaldir)" || list=; \ |
1659 | 301 | if test -n "$$list"; then \ | ||
1660 | 302 | echo " $(MKDIR_P) '$(DESTDIR)$(aclocaldir)'"; \ | ||
1661 | 303 | $(MKDIR_P) "$(DESTDIR)$(aclocaldir)" || exit 1; \ | ||
1662 | 304 | fi; \ | ||
1663 | 279 | for p in $$list; do \ | 305 | for p in $$list; do \ |
1664 | 280 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | 306 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
1665 | 281 | echo "$$d$$p"; \ | 307 | echo "$$d$$p"; \ |
1666 | 282 | 308 | ||
1667 | === modified file 'aclocal/xorg-gtest.m4' | |||
1668 | --- aclocal/xorg-gtest.m4 2012-06-08 12:39:52 +0000 | |||
1669 | +++ aclocal/xorg-gtest.m4 2013-01-21 00:48:20 +0000 | |||
1670 | @@ -1,4 +1,4 @@ | |||
1672 | 1 | # serial 2 | 1 | # serial 9 |
1673 | 2 | 2 | ||
1674 | 3 | # Copyright (C) 2012 Canonical, Ltd. | 3 | # Copyright (C) 2012 Canonical, Ltd. |
1675 | 4 | # | 4 | # |
1676 | @@ -21,35 +21,6 @@ | |||
1677 | 21 | # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 21 | # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
1678 | 22 | # SOFTWARE. | 22 | # SOFTWARE. |
1679 | 23 | 23 | ||
1680 | 24 | # Checks whether the gtest source is available on the system. Allows for | ||
1681 | 25 | # adjusting the include and source path. Sets have_gtest=yes if the source is | ||
1682 | 26 | # present. Sets GTEST_CPPFLAGS and GTEST_SOURCE to the preprocessor flags and | ||
1683 | 27 | # source location respectively. | ||
1684 | 28 | AC_DEFUN([_CHECK_GTEST], | ||
1685 | 29 | [ | ||
1686 | 30 | AC_ARG_WITH([gtest-source-path], | ||
1687 | 31 | [AS_HELP_STRING([--with-gtest-source-path], | ||
1688 | 32 | [location of the Google test sources, defaults to /usr/src/gtest])], | ||
1689 | 33 | [GTEST_SOURCE="$withval"; GTEST_CPPFLAGS="-I$withval/include"], | ||
1690 | 34 | [GTEST_SOURCE="/usr/src/gtest"]) | ||
1691 | 35 | |||
1692 | 36 | AC_ARG_WITH([gtest-include-path], | ||
1693 | 37 | [AS_HELP_STRING([--with-gtest-include-path], | ||
1694 | 38 | [location of the Google test headers])], | ||
1695 | 39 | [GTEST_CPPFLAGS="-I$withval"]) | ||
1696 | 40 | |||
1697 | 41 | GTEST_CPPFLAGS="$GTEST_CPPFLAGS -I$GTEST_SOURCE" | ||
1698 | 42 | |||
1699 | 43 | AC_CHECK_FILES([$GTEST_SOURCE/src/gtest-all.cc] | ||
1700 | 44 | [$GTEST_SOURCE/src/gtest_main.cc], | ||
1701 | 45 | [have_gtest=yes], | ||
1702 | 46 | [have_gtest=no]) | ||
1703 | 47 | |||
1704 | 48 | AS_IF([test "x$have_gtest_source" = xyes], | ||
1705 | 49 | [AC_SUBST(GTEST_CPPFLAGS)] | ||
1706 | 50 | [AC_SUBST(GTEST_SOURCE)]) | ||
1707 | 51 | ]) # _CHECK_GTEST | ||
1708 | 52 | |||
1709 | 53 | # CHECK_XORG_GTEST([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) | 24 | # CHECK_XORG_GTEST([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
1710 | 54 | # | 25 | # |
1711 | 55 | # Checks whether the xorg-gtest source is available on the system. Allows for | 26 | # Checks whether the xorg-gtest source is available on the system. Allows for |
1712 | @@ -61,20 +32,20 @@ | |||
1713 | 61 | # Both default actions are no-ops. | 32 | # Both default actions are no-ops. |
1714 | 62 | AC_DEFUN([CHECK_XORG_GTEST], | 33 | AC_DEFUN([CHECK_XORG_GTEST], |
1715 | 63 | [ | 34 | [ |
1716 | 64 | AC_REQUIRE([_CHECK_GTEST]) | ||
1717 | 65 | |||
1718 | 66 | PKG_CHECK_EXISTS([xorg-gtest], | 35 | PKG_CHECK_EXISTS([xorg-gtest], |
1719 | 67 | [have_xorg_gtest=yes], | 36 | [have_xorg_gtest=yes], |
1720 | 68 | [have_xorg_gtest=no]) | 37 | [have_xorg_gtest=no]) |
1721 | 69 | 38 | ||
1722 | 70 | XORG_GTEST_SOURCE=`$PKG_CONFIG --variable=sourcedir --print-errors xorg-gtest` | 39 | XORG_GTEST_SOURCE=`$PKG_CONFIG --variable=sourcedir --print-errors xorg-gtest` |
1723 | 40 | GTEST_SOURCE="$XORG_GTEST_SOURCE/src/gtest" | ||
1724 | 41 | GTEST_CPPFLAGS="-I$XORG_GTEST_SOURCE/src/gtest/include -I$XORG_GTEST_SOURCE/src/gtest" | ||
1725 | 71 | XORG_GTEST_CPPFLAGS=`$PKG_CONFIG --variable=CPPflags --print-errors xorg-gtest` | 42 | XORG_GTEST_CPPFLAGS=`$PKG_CONFIG --variable=CPPflags --print-errors xorg-gtest` |
1726 | 72 | XORG_GTEST_CPPFLAGS="$GTEST_CPPFLAGS $XORG_GTEST_CPPFLAGS" | 43 | XORG_GTEST_CPPFLAGS="$GTEST_CPPFLAGS $XORG_GTEST_CPPFLAGS" |
1727 | 73 | XORG_GTEST_CPPFLAGS="$XORG_GTEST_CPPFLAGS -I$XORG_GTEST_SOURCE" | 44 | XORG_GTEST_CPPFLAGS="$XORG_GTEST_CPPFLAGS -I$XORG_GTEST_SOURCE" |
1728 | 74 | 45 | ||
1729 | 75 | PKG_CHECK_MODULES(X11, [x11], [have_x11=yes], [have_x11=no]) | 46 | PKG_CHECK_MODULES(X11, [x11], [have_x11=yes], [have_x11=no]) |
1730 | 76 | 47 | ||
1732 | 77 | # Check if we should include support for utouch-evemu | 48 | # Check if we should include support for evemu |
1733 | 78 | AC_ARG_WITH([evemu], | 49 | AC_ARG_WITH([evemu], |
1734 | 79 | [AS_HELP_STRING([--with-evemu], | 50 | [AS_HELP_STRING([--with-evemu], |
1735 | 80 | [support Linux input device recording playback | 51 | [support Linux input device recording playback |
1736 | @@ -83,19 +54,18 @@ | |||
1737 | 83 | [with_evemu=check]) | 54 | [with_evemu=check]) |
1738 | 84 | 55 | ||
1739 | 85 | AS_IF([test "x$with_evemu" = xyes], | 56 | AS_IF([test "x$with_evemu" = xyes], |
1741 | 86 | [PKG_CHECK_MODULES(EVEMU, [utouch-evemu], [have_xorg_gtest_evemu=yes])], | 57 | [PKG_CHECK_MODULES(EVEMU, [evemu], [have_xorg_gtest_evemu=yes])], |
1742 | 87 | [test "x$with_evemu" = xcheck], | 58 | [test "x$with_evemu" = xcheck], |
1743 | 88 | [PKG_CHECK_MODULES(EVEMU, | 59 | [PKG_CHECK_MODULES(EVEMU, |
1745 | 89 | [utouch-evemu], | 60 | [evemu], |
1746 | 90 | [have_xorg_gtest_evemu=yes], | 61 | [have_xorg_gtest_evemu=yes], |
1747 | 91 | [have_xorg_gtest_evemu=no])]) | 62 | [have_xorg_gtest_evemu=no])]) |
1748 | 92 | AS_IF([test "x$have_xorg_gtest_evemu" = xyes], | 63 | AS_IF([test "x$have_xorg_gtest_evemu" = xyes], |
1749 | 93 | [XORG_GTEST_CPPFLAGS="$XORG_GTEST_CPPFLAGS -DHAVE_EVEMU"]) | 64 | [XORG_GTEST_CPPFLAGS="$XORG_GTEST_CPPFLAGS -DHAVE_EVEMU"]) |
1750 | 94 | 65 | ||
1751 | 95 | AS_IF([test "x$have_gtest" != xyes -o "x$have_x11" != xyes], | ||
1752 | 96 | [have_xorg_gtest=no]) | ||
1753 | 97 | |||
1754 | 98 | AS_IF([test "x$have_xorg_gtest" = xyes], | 66 | AS_IF([test "x$have_xorg_gtest" = xyes], |
1755 | 67 | [AC_SUBST(GTEST_SOURCE)] | ||
1756 | 68 | [AC_SUBST(GTEST_CPPFLAGS)] | ||
1757 | 99 | [AC_SUBST(XORG_GTEST_SOURCE)] | 69 | [AC_SUBST(XORG_GTEST_SOURCE)] |
1758 | 100 | [AC_SUBST(XORG_GTEST_CPPFLAGS)] | 70 | [AC_SUBST(XORG_GTEST_CPPFLAGS)] |
1759 | 101 | 71 | ||
1760 | 102 | 72 | ||
1761 | === removed file 'autogen.sh' | |||
1762 | --- autogen.sh 2012-02-15 09:18:17 +0000 | |||
1763 | +++ autogen.sh 1970-01-01 00:00:00 +0000 | |||
1764 | @@ -1,11 +0,0 @@ | |||
1765 | 1 | #! /bin/sh | ||
1766 | 2 | |||
1767 | 3 | srcdir=`dirname $0` | ||
1768 | 4 | test -z "$srcdir" && srcdir=. | ||
1769 | 5 | |||
1770 | 6 | ORIGDIR=`pwd` | ||
1771 | 7 | cd $srcdir | ||
1772 | 8 | |||
1773 | 9 | autoreconf -v --install || exit 1 | ||
1774 | 10 | cd $ORIGDIR || exit $? | ||
1775 | 11 | |||
1776 | 12 | 0 | ||
1777 | === modified file 'config.sub' | |||
1778 | --- config.sub 2012-02-24 09:44:47 +0000 | |||
1779 | +++ config.sub 2013-01-21 00:48:20 +0000 | |||
1780 | @@ -4,7 +4,7 @@ | |||
1781 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
1782 | 5 | # 2011, 2012 Free Software Foundation, Inc. | 5 | # 2011, 2012 Free Software Foundation, Inc. |
1783 | 6 | 6 | ||
1785 | 7 | timestamp='2012-02-10' | 7 | timestamp='2012-04-18' |
1786 | 8 | 8 | ||
1787 | 9 | # This file is (in principle) common to ALL GNU software. | 9 | # This file is (in principle) common to ALL GNU software. |
1788 | 10 | # The presence of a machine in this file suggests that SOME GNU software | 10 | # The presence of a machine in this file suggests that SOME GNU software |
1789 | @@ -225,6 +225,12 @@ | |||
1790 | 225 | -isc*) | 225 | -isc*) |
1791 | 226 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` | 226 | basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
1792 | 227 | ;; | 227 | ;; |
1793 | 228 | -lynx*178) | ||
1794 | 229 | os=-lynxos178 | ||
1795 | 230 | ;; | ||
1796 | 231 | -lynx*5) | ||
1797 | 232 | os=-lynxos5 | ||
1798 | 233 | ;; | ||
1799 | 228 | -lynx*) | 234 | -lynx*) |
1800 | 229 | os=-lynxos | 235 | os=-lynxos |
1801 | 230 | ;; | 236 | ;; |
1802 | @@ -1537,6 +1543,9 @@ | |||
1803 | 1537 | c4x-* | tic4x-*) | 1543 | c4x-* | tic4x-*) |
1804 | 1538 | os=-coff | 1544 | os=-coff |
1805 | 1539 | ;; | 1545 | ;; |
1806 | 1546 | hexagon-*) | ||
1807 | 1547 | os=-elf | ||
1808 | 1548 | ;; | ||
1809 | 1540 | tic54x-*) | 1549 | tic54x-*) |
1810 | 1541 | os=-coff | 1550 | os=-coff |
1811 | 1542 | ;; | 1551 | ;; |
1812 | 1543 | 1552 | ||
1813 | === modified file 'configure' | |||
1814 | --- configure 2012-06-08 12:39:52 +0000 | |||
1815 | +++ configure 2013-01-21 00:48:20 +0000 | |||
1816 | @@ -1,11 +1,9 @@ | |||
1817 | 1 | #! /bin/sh | 1 | #! /bin/sh |
1818 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
1825 | 3 | # Generated by GNU Autoconf 2.68 for Dummy X.org Testing Environment for Google Test 0.3.0. | 3 | # Generated by GNU Autoconf 2.69 for X.org Testing Environment for Google Test 0.7.0. |
1826 | 4 | # | 4 | # |
1827 | 5 | # | 5 | # |
1828 | 6 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | 6 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
1823 | 7 | # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software | ||
1824 | 8 | # Foundation, Inc. | ||
1829 | 9 | # | 7 | # |
1830 | 10 | # | 8 | # |
1831 | 11 | # This configure script is free software; the Free Software Foundation | 9 | # This configure script is free software; the Free Software Foundation |
1832 | @@ -134,6 +132,31 @@ | |||
1833 | 134 | # CDPATH. | 132 | # CDPATH. |
1834 | 135 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH | 133 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
1835 | 136 | 134 | ||
1836 | 135 | # Use a proper internal environment variable to ensure we don't fall | ||
1837 | 136 | # into an infinite loop, continuously re-executing ourselves. | ||
1838 | 137 | if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then | ||
1839 | 138 | _as_can_reexec=no; export _as_can_reexec; | ||
1840 | 139 | # We cannot yet assume a decent shell, so we have to provide a | ||
1841 | 140 | # neutralization value for shells without unset; and this also | ||
1842 | 141 | # works around shells that cannot unset nonexistent variables. | ||
1843 | 142 | # Preserve -v and -x to the replacement shell. | ||
1844 | 143 | BASH_ENV=/dev/null | ||
1845 | 144 | ENV=/dev/null | ||
1846 | 145 | (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV | ||
1847 | 146 | case $- in # (((( | ||
1848 | 147 | *v*x* | *x*v* ) as_opts=-vx ;; | ||
1849 | 148 | *v* ) as_opts=-v ;; | ||
1850 | 149 | *x* ) as_opts=-x ;; | ||
1851 | 150 | * ) as_opts= ;; | ||
1852 | 151 | esac | ||
1853 | 152 | exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} | ||
1854 | 153 | # Admittedly, this is quite paranoid, since all the known shells bail | ||
1855 | 154 | # out after a failed `exec'. | ||
1856 | 155 | $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 | ||
1857 | 156 | as_fn_exit 255 | ||
1858 | 157 | fi | ||
1859 | 158 | # We don't want this to propagate to other subprocesses. | ||
1860 | 159 | { _as_can_reexec=; unset _as_can_reexec;} | ||
1861 | 137 | if test "x$CONFIG_SHELL" = x; then | 160 | if test "x$CONFIG_SHELL" = x; then |
1862 | 138 | as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : | 161 | as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : |
1863 | 139 | emulate sh | 162 | emulate sh |
1864 | @@ -167,7 +190,8 @@ | |||
1865 | 167 | else | 190 | else |
1866 | 168 | exitcode=1; echo positional parameters were not saved. | 191 | exitcode=1; echo positional parameters were not saved. |
1867 | 169 | fi | 192 | fi |
1869 | 170 | test x\$exitcode = x0 || exit 1" | 193 | test x\$exitcode = x0 || exit 1 |
1870 | 194 | test -x / || exit 1" | ||
1871 | 171 | as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO | 195 | as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO |
1872 | 172 | as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO | 196 | as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
1873 | 173 | eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && | 197 | eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
1874 | @@ -212,21 +236,25 @@ | |||
1875 | 212 | 236 | ||
1876 | 213 | 237 | ||
1877 | 214 | if test "x$CONFIG_SHELL" != x; then : | 238 | if test "x$CONFIG_SHELL" != x; then : |
1893 | 215 | # We cannot yet assume a decent shell, so we have to provide a | 239 | export CONFIG_SHELL |
1894 | 216 | # neutralization value for shells without unset; and this also | 240 | # We cannot yet assume a decent shell, so we have to provide a |
1895 | 217 | # works around shells that cannot unset nonexistent variables. | 241 | # neutralization value for shells without unset; and this also |
1896 | 218 | # Preserve -v and -x to the replacement shell. | 242 | # works around shells that cannot unset nonexistent variables. |
1897 | 219 | BASH_ENV=/dev/null | 243 | # Preserve -v and -x to the replacement shell. |
1898 | 220 | ENV=/dev/null | 244 | BASH_ENV=/dev/null |
1899 | 221 | (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV | 245 | ENV=/dev/null |
1900 | 222 | export CONFIG_SHELL | 246 | (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
1901 | 223 | case $- in # (((( | 247 | case $- in # (((( |
1902 | 224 | *v*x* | *x*v* ) as_opts=-vx ;; | 248 | *v*x* | *x*v* ) as_opts=-vx ;; |
1903 | 225 | *v* ) as_opts=-v ;; | 249 | *v* ) as_opts=-v ;; |
1904 | 226 | *x* ) as_opts=-x ;; | 250 | *x* ) as_opts=-x ;; |
1905 | 227 | * ) as_opts= ;; | 251 | * ) as_opts= ;; |
1906 | 228 | esac | 252 | esac |
1907 | 229 | exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} | 253 | exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
1908 | 254 | # Admittedly, this is quite paranoid, since all the known shells bail | ||
1909 | 255 | # out after a failed `exec'. | ||
1910 | 256 | $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 | ||
1911 | 257 | exit 255 | ||
1912 | 230 | fi | 258 | fi |
1913 | 231 | 259 | ||
1914 | 232 | if test x$as_have_required = xno; then : | 260 | if test x$as_have_required = xno; then : |
1915 | @@ -328,6 +356,14 @@ | |||
1916 | 328 | 356 | ||
1917 | 329 | 357 | ||
1918 | 330 | } # as_fn_mkdir_p | 358 | } # as_fn_mkdir_p |
1919 | 359 | |||
1920 | 360 | # as_fn_executable_p FILE | ||
1921 | 361 | # ----------------------- | ||
1922 | 362 | # Test if FILE is an executable regular file. | ||
1923 | 363 | as_fn_executable_p () | ||
1924 | 364 | { | ||
1925 | 365 | test -f "$1" && test -x "$1" | ||
1926 | 366 | } # as_fn_executable_p | ||
1927 | 331 | # as_fn_append VAR VALUE | 367 | # as_fn_append VAR VALUE |
1928 | 332 | # ---------------------- | 368 | # ---------------------- |
1929 | 333 | # Append the text in VALUE to the end of the definition contained in VAR. Take | 369 | # Append the text in VALUE to the end of the definition contained in VAR. Take |
1930 | @@ -449,6 +485,10 @@ | |||
1931 | 449 | chmod +x "$as_me.lineno" || | 485 | chmod +x "$as_me.lineno" || |
1932 | 450 | { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } | 486 | { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } |
1933 | 451 | 487 | ||
1934 | 488 | # If we had to re-execute with $CONFIG_SHELL, we're ensured to have | ||
1935 | 489 | # already done that, so ensure we don't try to do so again and fall | ||
1936 | 490 | # in an infinite loop. This has already happened in practice. | ||
1937 | 491 | _as_can_reexec=no; export _as_can_reexec | ||
1938 | 452 | # Don't try to exec as it changes $[0], causing all sort of problems | 492 | # Don't try to exec as it changes $[0], causing all sort of problems |
1939 | 453 | # (the dirname of $[0] is not the place where we might find the | 493 | # (the dirname of $[0] is not the place where we might find the |
1940 | 454 | # original and so on. Autoconf is especially sensitive to this). | 494 | # original and so on. Autoconf is especially sensitive to this). |
1941 | @@ -483,16 +523,16 @@ | |||
1942 | 483 | # ... but there are two gotchas: | 523 | # ... but there are two gotchas: |
1943 | 484 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | 524 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
1944 | 485 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | 525 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
1946 | 486 | # In both cases, we have to default to `cp -p'. | 526 | # In both cases, we have to default to `cp -pR'. |
1947 | 487 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | 527 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
1949 | 488 | as_ln_s='cp -p' | 528 | as_ln_s='cp -pR' |
1950 | 489 | elif ln conf$$.file conf$$ 2>/dev/null; then | 529 | elif ln conf$$.file conf$$ 2>/dev/null; then |
1951 | 490 | as_ln_s=ln | 530 | as_ln_s=ln |
1952 | 491 | else | 531 | else |
1954 | 492 | as_ln_s='cp -p' | 532 | as_ln_s='cp -pR' |
1955 | 493 | fi | 533 | fi |
1956 | 494 | else | 534 | else |
1958 | 495 | as_ln_s='cp -p' | 535 | as_ln_s='cp -pR' |
1959 | 496 | fi | 536 | fi |
1960 | 497 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file | 537 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
1961 | 498 | rmdir conf$$.dir 2>/dev/null | 538 | rmdir conf$$.dir 2>/dev/null |
1962 | @@ -504,28 +544,8 @@ | |||
1963 | 504 | as_mkdir_p=false | 544 | as_mkdir_p=false |
1964 | 505 | fi | 545 | fi |
1965 | 506 | 546 | ||
1988 | 507 | if test -x / >/dev/null 2>&1; then | 547 | as_test_x='test -x' |
1989 | 508 | as_test_x='test -x' | 548 | as_executable_p=as_fn_executable_p |
1968 | 509 | else | ||
1969 | 510 | if ls -dL / >/dev/null 2>&1; then | ||
1970 | 511 | as_ls_L_option=L | ||
1971 | 512 | else | ||
1972 | 513 | as_ls_L_option= | ||
1973 | 514 | fi | ||
1974 | 515 | as_test_x=' | ||
1975 | 516 | eval sh -c '\'' | ||
1976 | 517 | if test -d "$1"; then | ||
1977 | 518 | test -d "$1/."; | ||
1978 | 519 | else | ||
1979 | 520 | case $1 in #( | ||
1980 | 521 | -*)set "./$1";; | ||
1981 | 522 | esac; | ||
1982 | 523 | case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( | ||
1983 | 524 | ???[sx]*):;;*)false;;esac;fi | ||
1984 | 525 | '\'' sh | ||
1985 | 526 | ' | ||
1986 | 527 | fi | ||
1987 | 528 | as_executable_p=$as_test_x | ||
1990 | 529 | 549 | ||
1991 | 530 | # Sed expression to map a string onto a valid CPP name. | 550 | # Sed expression to map a string onto a valid CPP name. |
1992 | 531 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | 551 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
1993 | @@ -555,10 +575,10 @@ | |||
1994 | 555 | MAKEFLAGS= | 575 | MAKEFLAGS= |
1995 | 556 | 576 | ||
1996 | 557 | # Identity of this package. | 577 | # Identity of this package. |
1998 | 558 | PACKAGE_NAME='Dummy X.org Testing Environment for Google Test' | 578 | PACKAGE_NAME='X.org Testing Environment for Google Test' |
1999 | 559 | PACKAGE_TARNAME='xorg-gtest' | 579 | PACKAGE_TARNAME='xorg-gtest' |
2002 | 560 | PACKAGE_VERSION='0.3.0' | 580 | PACKAGE_VERSION='0.7.0' |
2003 | 561 | PACKAGE_STRING='Dummy X.org Testing Environment for Google Test 0.3.0' | 581 | PACKAGE_STRING='X.org Testing Environment for Google Test 0.7.0' |
2004 | 562 | PACKAGE_BUGREPORT='' | 582 | PACKAGE_BUGREPORT='' |
2005 | 563 | PACKAGE_URL='' | 583 | PACKAGE_URL='' |
2006 | 564 | 584 | ||
2007 | @@ -605,16 +625,19 @@ | |||
2008 | 605 | LIBOBJS | 625 | LIBOBJS |
2009 | 606 | ENABLE_XORG_GTEST_TESTS_FALSE | 626 | ENABLE_XORG_GTEST_TESTS_FALSE |
2010 | 607 | ENABLE_XORG_GTEST_TESTS_TRUE | 627 | ENABLE_XORG_GTEST_TESTS_TRUE |
2012 | 608 | DUMMY_CONF_PATH | 628 | BASE_CPPFLAGS |
2013 | 609 | SOURCEDIR | 629 | SOURCEDIR |
2014 | 610 | HAVE_EVEMU_FALSE | 630 | HAVE_EVEMU_FALSE |
2015 | 611 | HAVE_EVEMU_TRUE | 631 | HAVE_EVEMU_TRUE |
2016 | 612 | EVEMU_LIBS | 632 | EVEMU_LIBS |
2017 | 613 | EVEMU_CFLAGS | 633 | EVEMU_CFLAGS |
2022 | 614 | GTEST_SOURCE | 634 | DUMMY_CONF_PATH |
2023 | 615 | GTEST_CPPFLAGS | 635 | LOGFILE_DIR |
2024 | 616 | XSERVER_LIBS | 636 | X11_LIBS |
2025 | 617 | XSERVER_CFLAGS | 637 | X11_CFLAGS |
2026 | 638 | HAVE_DOXYGEN_FALSE | ||
2027 | 639 | HAVE_DOXYGEN_TRUE | ||
2028 | 640 | DOXYGEN | ||
2029 | 618 | ENABLE_INTEGRATION_TESTS_FALSE | 641 | ENABLE_INTEGRATION_TESTS_FALSE |
2030 | 619 | ENABLE_INTEGRATION_TESTS_TRUE | 642 | ENABLE_INTEGRATION_TESTS_TRUE |
2031 | 620 | XORG_MALLOC_DEBUG_ENV | 643 | XORG_MALLOC_DEBUG_ENV |
2032 | @@ -747,8 +770,8 @@ | |||
2033 | 747 | enable_strict_compilation | 770 | enable_strict_compilation |
2034 | 748 | enable_silent_rules | 771 | enable_silent_rules |
2035 | 749 | enable_integration_tests | 772 | enable_integration_tests |
2038 | 750 | with_gtest_source_path | 773 | with_doxygen |
2039 | 751 | with_gtest_include_path | 774 | with_logfile_dir |
2040 | 752 | with_evemu | 775 | with_evemu |
2041 | 753 | ' | 776 | ' |
2042 | 754 | ac_precious_vars='build_alias | 777 | ac_precious_vars='build_alias |
2043 | @@ -765,8 +788,9 @@ | |||
2044 | 765 | PKG_CONFIG_PATH | 788 | PKG_CONFIG_PATH |
2045 | 766 | PKG_CONFIG_LIBDIR | 789 | PKG_CONFIG_LIBDIR |
2046 | 767 | XORG_MALLOC_DEBUG_ENV | 790 | XORG_MALLOC_DEBUG_ENV |
2049 | 768 | XSERVER_CFLAGS | 791 | DOXYGEN |
2050 | 769 | XSERVER_LIBS | 792 | X11_CFLAGS |
2051 | 793 | X11_LIBS | ||
2052 | 770 | EVEMU_CFLAGS | 794 | EVEMU_CFLAGS |
2053 | 771 | EVEMU_LIBS' | 795 | EVEMU_LIBS' |
2054 | 772 | 796 | ||
2055 | @@ -1224,8 +1248,6 @@ | |||
2056 | 1224 | if test "x$host_alias" != x; then | 1248 | if test "x$host_alias" != x; then |
2057 | 1225 | if test "x$build_alias" = x; then | 1249 | if test "x$build_alias" = x; then |
2058 | 1226 | cross_compiling=maybe | 1250 | cross_compiling=maybe |
2059 | 1227 | $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. | ||
2060 | 1228 | If a cross compiler is detected then cross compile mode will be used" >&2 | ||
2061 | 1229 | elif test "x$build_alias" != "x$host_alias"; then | 1251 | elif test "x$build_alias" != "x$host_alias"; then |
2062 | 1230 | cross_compiling=yes | 1252 | cross_compiling=yes |
2063 | 1231 | fi | 1253 | fi |
2064 | @@ -1311,7 +1333,7 @@ | |||
2065 | 1311 | # Omit some internal or obsolete options to make the list less imposing. | 1333 | # Omit some internal or obsolete options to make the list less imposing. |
2066 | 1312 | # This message is too long to be a string in the A/UX 3.1 sh. | 1334 | # This message is too long to be a string in the A/UX 3.1 sh. |
2067 | 1313 | cat <<_ACEOF | 1335 | cat <<_ACEOF |
2069 | 1314 | \`configure' configures Dummy X.org Testing Environment for Google Test 0.3.0 to adapt to many kinds of systems. | 1336 | \`configure' configures X.org Testing Environment for Google Test 0.7.0 to adapt to many kinds of systems. |
2070 | 1315 | 1337 | ||
2071 | 1316 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1338 | Usage: $0 [OPTION]... [VAR=VALUE]... |
2072 | 1317 | 1339 | ||
2073 | @@ -1381,7 +1403,7 @@ | |||
2074 | 1381 | 1403 | ||
2075 | 1382 | if test -n "$ac_init_help"; then | 1404 | if test -n "$ac_init_help"; then |
2076 | 1383 | case $ac_init_help in | 1405 | case $ac_init_help in |
2078 | 1384 | short | recursive ) echo "Configuration of Dummy X.org Testing Environment for Google Test 0.3.0:";; | 1406 | short | recursive ) echo "Configuration of X.org Testing Environment for Google Test 0.7.0:";; |
2079 | 1385 | esac | 1407 | esac |
2080 | 1386 | cat <<\_ACEOF | 1408 | cat <<\_ACEOF |
2081 | 1387 | 1409 | ||
2082 | @@ -1408,11 +1430,10 @@ | |||
2083 | 1408 | Optional Packages: | 1430 | Optional Packages: |
2084 | 1409 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] | 1431 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] |
2085 | 1410 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) | 1432 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) |
2091 | 1411 | --with-gtest-source-path | 1433 | --with-doxygen Use doxygen to regenerate documentation (default: |
2092 | 1412 | location of the Google test sources, defaults to | 1434 | auto) |
2093 | 1413 | /usr/src/gtest | 1435 | --with-logfile-dir=/tmp , |
2094 | 1414 | --with-gtest-include-path | 1436 | Base path for log files used as defaults and during tests (default: /tmp) |
2090 | 1415 | location of the Google test headers | ||
2095 | 1416 | --with-evemu support Linux input device recording playback | 1437 | --with-evemu support Linux input device recording playback |
2096 | 1417 | (default: enabled if available) | 1438 | (default: enabled if available) |
2097 | 1418 | 1439 | ||
2098 | @@ -1432,10 +1453,9 @@ | |||
2099 | 1432 | path overriding pkg-config's built-in search path | 1453 | path overriding pkg-config's built-in search path |
2100 | 1433 | XORG_MALLOC_DEBUG_ENV | 1454 | XORG_MALLOC_DEBUG_ENV |
2101 | 1434 | Environment variables to enable memory checking in tests | 1455 | Environment variables to enable memory checking in tests |
2106 | 1435 | XSERVER_CFLAGS | 1456 | DOXYGEN Path to doxygen command |
2107 | 1436 | C compiler flags for XSERVER, overriding pkg-config | 1457 | X11_CFLAGS C compiler flags for X11, overriding pkg-config |
2108 | 1437 | XSERVER_LIBS | 1458 | X11_LIBS linker flags for X11, overriding pkg-config |
2105 | 1438 | linker flags for XSERVER, overriding pkg-config | ||
2109 | 1439 | EVEMU_CFLAGS | 1459 | EVEMU_CFLAGS |
2110 | 1440 | C compiler flags for EVEMU, overriding pkg-config | 1460 | C compiler flags for EVEMU, overriding pkg-config |
2111 | 1441 | EVEMU_LIBS linker flags for EVEMU, overriding pkg-config | 1461 | EVEMU_LIBS linker flags for EVEMU, overriding pkg-config |
2112 | @@ -1506,10 +1526,10 @@ | |||
2113 | 1506 | test -n "$ac_init_help" && exit $ac_status | 1526 | test -n "$ac_init_help" && exit $ac_status |
2114 | 1507 | if $ac_init_version; then | 1527 | if $ac_init_version; then |
2115 | 1508 | cat <<\_ACEOF | 1528 | cat <<\_ACEOF |
2118 | 1509 | Dummy X.org Testing Environment for Google Test configure 0.3.0 | 1529 | X.org Testing Environment for Google Test configure 0.7.0 |
2119 | 1510 | generated by GNU Autoconf 2.68 | 1530 | generated by GNU Autoconf 2.69 |
2120 | 1511 | 1531 | ||
2122 | 1512 | Copyright (C) 2010 Free Software Foundation, Inc. | 1532 | Copyright (C) 2012 Free Software Foundation, Inc. |
2123 | 1513 | This configure script is free software; the Free Software Foundation | 1533 | This configure script is free software; the Free Software Foundation |
2124 | 1514 | gives unlimited permission to copy, distribute and modify it. | 1534 | gives unlimited permission to copy, distribute and modify it. |
2125 | 1515 | _ACEOF | 1535 | _ACEOF |
2126 | @@ -1741,7 +1761,7 @@ | |||
2127 | 1741 | test ! -s conftest.err | 1761 | test ! -s conftest.err |
2128 | 1742 | } && test -s conftest$ac_exeext && { | 1762 | } && test -s conftest$ac_exeext && { |
2129 | 1743 | test "$cross_compiling" = yes || | 1763 | test "$cross_compiling" = yes || |
2131 | 1744 | $as_test_x conftest$ac_exeext | 1764 | test -x conftest$ac_exeext |
2132 | 1745 | }; then : | 1765 | }; then : |
2133 | 1746 | ac_retval=0 | 1766 | ac_retval=0 |
2134 | 1747 | else | 1767 | else |
2135 | @@ -1759,99 +1779,12 @@ | |||
2136 | 1759 | as_fn_set_status $ac_retval | 1779 | as_fn_set_status $ac_retval |
2137 | 1760 | 1780 | ||
2138 | 1761 | } # ac_fn_cxx_try_link | 1781 | } # ac_fn_cxx_try_link |
2139 | 1762 | |||
2140 | 1763 | # ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES | ||
2141 | 1764 | # --------------------------------------------------------- | ||
2142 | 1765 | # Tests whether HEADER exists, giving a warning if it cannot be compiled using | ||
2143 | 1766 | # the include files in INCLUDES and setting the cache variable VAR | ||
2144 | 1767 | # accordingly. | ||
2145 | 1768 | ac_fn_cxx_check_header_mongrel () | ||
2146 | 1769 | { | ||
2147 | 1770 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
2148 | 1771 | if eval \${$3+:} false; then : | ||
2149 | 1772 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | ||
2150 | 1773 | $as_echo_n "checking for $2... " >&6; } | ||
2151 | 1774 | if eval \${$3+:} false; then : | ||
2152 | 1775 | $as_echo_n "(cached) " >&6 | ||
2153 | 1776 | fi | ||
2154 | 1777 | eval ac_res=\$$3 | ||
2155 | 1778 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
2156 | 1779 | $as_echo "$ac_res" >&6; } | ||
2157 | 1780 | else | ||
2158 | 1781 | # Is the header compilable? | ||
2159 | 1782 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 | ||
2160 | 1783 | $as_echo_n "checking $2 usability... " >&6; } | ||
2161 | 1784 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2162 | 1785 | /* end confdefs.h. */ | ||
2163 | 1786 | $4 | ||
2164 | 1787 | #include <$2> | ||
2165 | 1788 | _ACEOF | ||
2166 | 1789 | if ac_fn_cxx_try_compile "$LINENO"; then : | ||
2167 | 1790 | ac_header_compiler=yes | ||
2168 | 1791 | else | ||
2169 | 1792 | ac_header_compiler=no | ||
2170 | 1793 | fi | ||
2171 | 1794 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2172 | 1795 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 | ||
2173 | 1796 | $as_echo "$ac_header_compiler" >&6; } | ||
2174 | 1797 | |||
2175 | 1798 | # Is the header present? | ||
2176 | 1799 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 | ||
2177 | 1800 | $as_echo_n "checking $2 presence... " >&6; } | ||
2178 | 1801 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2179 | 1802 | /* end confdefs.h. */ | ||
2180 | 1803 | #include <$2> | ||
2181 | 1804 | _ACEOF | ||
2182 | 1805 | if ac_fn_cxx_try_cpp "$LINENO"; then : | ||
2183 | 1806 | ac_header_preproc=yes | ||
2184 | 1807 | else | ||
2185 | 1808 | ac_header_preproc=no | ||
2186 | 1809 | fi | ||
2187 | 1810 | rm -f conftest.err conftest.i conftest.$ac_ext | ||
2188 | 1811 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 | ||
2189 | 1812 | $as_echo "$ac_header_preproc" >&6; } | ||
2190 | 1813 | |||
2191 | 1814 | # So? What about this header? | ||
2192 | 1815 | case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #(( | ||
2193 | 1816 | yes:no: ) | ||
2194 | 1817 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 | ||
2195 | 1818 | $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} | ||
2196 | 1819 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 | ||
2197 | 1820 | $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} | ||
2198 | 1821 | ;; | ||
2199 | 1822 | no:yes:* ) | ||
2200 | 1823 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 | ||
2201 | 1824 | $as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} | ||
2202 | 1825 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 | ||
2203 | 1826 | $as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} | ||
2204 | 1827 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 | ||
2205 | 1828 | $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} | ||
2206 | 1829 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 | ||
2207 | 1830 | $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} | ||
2208 | 1831 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 | ||
2209 | 1832 | $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} | ||
2210 | 1833 | ;; | ||
2211 | 1834 | esac | ||
2212 | 1835 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | ||
2213 | 1836 | $as_echo_n "checking for $2... " >&6; } | ||
2214 | 1837 | if eval \${$3+:} false; then : | ||
2215 | 1838 | $as_echo_n "(cached) " >&6 | ||
2216 | 1839 | else | ||
2217 | 1840 | eval "$3=\$ac_header_compiler" | ||
2218 | 1841 | fi | ||
2219 | 1842 | eval ac_res=\$$3 | ||
2220 | 1843 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
2221 | 1844 | $as_echo "$ac_res" >&6; } | ||
2222 | 1845 | fi | ||
2223 | 1846 | eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno | ||
2224 | 1847 | |||
2225 | 1848 | } # ac_fn_cxx_check_header_mongrel | ||
2226 | 1849 | cat >config.log <<_ACEOF | 1782 | cat >config.log <<_ACEOF |
2227 | 1850 | This file contains any messages produced by compilers while | 1783 | This file contains any messages produced by compilers while |
2228 | 1851 | running configure, to aid debugging if configure makes a mistake. | 1784 | running configure, to aid debugging if configure makes a mistake. |
2229 | 1852 | 1785 | ||
2232 | 1853 | It was created by Dummy X.org Testing Environment for Google Test $as_me 0.3.0, which was | 1786 | It was created by X.org Testing Environment for Google Test $as_me 0.7.0, which was |
2233 | 1854 | generated by GNU Autoconf 2.68. Invocation command line was | 1787 | generated by GNU Autoconf 2.69. Invocation command line was |
2234 | 1855 | 1788 | ||
2235 | 1856 | $ $0 $@ | 1789 | $ $0 $@ |
2236 | 1857 | 1790 | ||
2237 | @@ -2270,7 +2203,7 @@ | |||
2238 | 2270 | # by default. | 2203 | # by default. |
2239 | 2271 | for ac_prog in ginstall scoinst install; do | 2204 | for ac_prog in ginstall scoinst install; do |
2240 | 2272 | for ac_exec_ext in '' $ac_executable_extensions; do | 2205 | for ac_exec_ext in '' $ac_executable_extensions; do |
2242 | 2273 | if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then | 2206 | if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then |
2243 | 2274 | if test $ac_prog = install && | 2207 | if test $ac_prog = install && |
2244 | 2275 | grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | 2208 | grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then |
2245 | 2276 | # AIX install. It has an incompatible calling convention. | 2209 | # AIX install. It has an incompatible calling convention. |
2246 | @@ -2439,7 +2372,7 @@ | |||
2247 | 2439 | IFS=$as_save_IFS | 2372 | IFS=$as_save_IFS |
2248 | 2440 | test -z "$as_dir" && as_dir=. | 2373 | test -z "$as_dir" && as_dir=. |
2249 | 2441 | for ac_exec_ext in '' $ac_executable_extensions; do | 2374 | for ac_exec_ext in '' $ac_executable_extensions; do |
2251 | 2442 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 2375 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2252 | 2443 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" | 2376 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
2253 | 2444 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2377 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2254 | 2445 | break 2 | 2378 | break 2 |
2255 | @@ -2479,7 +2412,7 @@ | |||
2256 | 2479 | IFS=$as_save_IFS | 2412 | IFS=$as_save_IFS |
2257 | 2480 | test -z "$as_dir" && as_dir=. | 2413 | test -z "$as_dir" && as_dir=. |
2258 | 2481 | for ac_exec_ext in '' $ac_executable_extensions; do | 2414 | for ac_exec_ext in '' $ac_executable_extensions; do |
2260 | 2482 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 2415 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2261 | 2483 | ac_cv_prog_ac_ct_STRIP="strip" | 2416 | ac_cv_prog_ac_ct_STRIP="strip" |
2262 | 2484 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2417 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2263 | 2485 | break 2 | 2418 | break 2 |
2264 | @@ -2530,7 +2463,7 @@ | |||
2265 | 2530 | test -z "$as_dir" && as_dir=. | 2463 | test -z "$as_dir" && as_dir=. |
2266 | 2531 | for ac_prog in mkdir gmkdir; do | 2464 | for ac_prog in mkdir gmkdir; do |
2267 | 2532 | for ac_exec_ext in '' $ac_executable_extensions; do | 2465 | for ac_exec_ext in '' $ac_executable_extensions; do |
2269 | 2533 | { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue | 2466 | as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue |
2270 | 2534 | case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( | 2467 | case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( |
2271 | 2535 | 'mkdir (GNU coreutils) '* | \ | 2468 | 'mkdir (GNU coreutils) '* | \ |
2272 | 2536 | 'mkdir (coreutils) '* | \ | 2469 | 'mkdir (coreutils) '* | \ |
2273 | @@ -2583,7 +2516,7 @@ | |||
2274 | 2583 | IFS=$as_save_IFS | 2516 | IFS=$as_save_IFS |
2275 | 2584 | test -z "$as_dir" && as_dir=. | 2517 | test -z "$as_dir" && as_dir=. |
2276 | 2585 | for ac_exec_ext in '' $ac_executable_extensions; do | 2518 | for ac_exec_ext in '' $ac_executable_extensions; do |
2278 | 2586 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 2519 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2279 | 2587 | ac_cv_prog_AWK="$ac_prog" | 2520 | ac_cv_prog_AWK="$ac_prog" |
2280 | 2588 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2521 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2281 | 2589 | break 2 | 2522 | break 2 |
2282 | @@ -2669,7 +2602,7 @@ | |||
2283 | 2669 | 2602 | ||
2284 | 2670 | # Define the identity of the package. | 2603 | # Define the identity of the package. |
2285 | 2671 | PACKAGE='xorg-gtest' | 2604 | PACKAGE='xorg-gtest' |
2287 | 2672 | VERSION='0.3.0' | 2605 | VERSION='0.7.0' |
2288 | 2673 | 2606 | ||
2289 | 2674 | 2607 | ||
2290 | 2675 | cat >>confdefs.h <<_ACEOF | 2608 | cat >>confdefs.h <<_ACEOF |
2291 | @@ -2762,7 +2695,7 @@ | |||
2292 | 2762 | IFS=$as_save_IFS | 2695 | IFS=$as_save_IFS |
2293 | 2763 | test -z "$as_dir" && as_dir=. | 2696 | test -z "$as_dir" && as_dir=. |
2294 | 2764 | for ac_exec_ext in '' $ac_executable_extensions; do | 2697 | for ac_exec_ext in '' $ac_executable_extensions; do |
2296 | 2765 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 2698 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2297 | 2766 | ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" | 2699 | ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" |
2298 | 2767 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2700 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2299 | 2768 | break 2 | 2701 | break 2 |
2300 | @@ -2806,7 +2739,7 @@ | |||
2301 | 2806 | IFS=$as_save_IFS | 2739 | IFS=$as_save_IFS |
2302 | 2807 | test -z "$as_dir" && as_dir=. | 2740 | test -z "$as_dir" && as_dir=. |
2303 | 2808 | for ac_exec_ext in '' $ac_executable_extensions; do | 2741 | for ac_exec_ext in '' $ac_executable_extensions; do |
2305 | 2809 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 2742 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2306 | 2810 | ac_cv_prog_ac_ct_CXX="$ac_prog" | 2743 | ac_cv_prog_ac_ct_CXX="$ac_prog" |
2307 | 2811 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 2744 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2308 | 2812 | break 2 | 2745 | break 2 |
2309 | @@ -3449,7 +3382,7 @@ | |||
2310 | 3449 | IFS=$as_save_IFS | 3382 | IFS=$as_save_IFS |
2311 | 3450 | test -z "$as_dir" && as_dir=. | 3383 | test -z "$as_dir" && as_dir=. |
2312 | 3451 | for ac_exec_ext in '' $ac_executable_extensions; do | 3384 | for ac_exec_ext in '' $ac_executable_extensions; do |
2314 | 3452 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 3385 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2315 | 3453 | ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" | 3386 | ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" |
2316 | 3454 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 3387 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2317 | 3455 | break 2 | 3388 | break 2 |
2318 | @@ -3489,7 +3422,7 @@ | |||
2319 | 3489 | IFS=$as_save_IFS | 3422 | IFS=$as_save_IFS |
2320 | 3490 | test -z "$as_dir" && as_dir=. | 3423 | test -z "$as_dir" && as_dir=. |
2321 | 3491 | for ac_exec_ext in '' $ac_executable_extensions; do | 3424 | for ac_exec_ext in '' $ac_executable_extensions; do |
2323 | 3492 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 3425 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2324 | 3493 | ac_cv_prog_ac_ct_RANLIB="ranlib" | 3426 | ac_cv_prog_ac_ct_RANLIB="ranlib" |
2325 | 3494 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 3427 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2326 | 3495 | break 2 | 3428 | break 2 |
2327 | @@ -3695,7 +3628,7 @@ | |||
2328 | 3695 | for ac_prog in grep ggrep; do | 3628 | for ac_prog in grep ggrep; do |
2329 | 3696 | for ac_exec_ext in '' $ac_executable_extensions; do | 3629 | for ac_exec_ext in '' $ac_executable_extensions; do |
2330 | 3697 | ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" | 3630 | ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" |
2332 | 3698 | { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue | 3631 | as_fn_executable_p "$ac_path_GREP" || continue |
2333 | 3699 | # Check for GNU ac_path_GREP and select it if it is found. | 3632 | # Check for GNU ac_path_GREP and select it if it is found. |
2334 | 3700 | # Check for GNU $ac_path_GREP | 3633 | # Check for GNU $ac_path_GREP |
2335 | 3701 | case `"$ac_path_GREP" --version 2>&1` in | 3634 | case `"$ac_path_GREP" --version 2>&1` in |
2336 | @@ -3761,7 +3694,7 @@ | |||
2337 | 3761 | for ac_prog in egrep; do | 3694 | for ac_prog in egrep; do |
2338 | 3762 | for ac_exec_ext in '' $ac_executable_extensions; do | 3695 | for ac_exec_ext in '' $ac_executable_extensions; do |
2339 | 3763 | ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" | 3696 | ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" |
2341 | 3764 | { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue | 3697 | as_fn_executable_p "$ac_path_EGREP" || continue |
2342 | 3765 | # Check for GNU ac_path_EGREP and select it if it is found. | 3698 | # Check for GNU ac_path_EGREP and select it if it is found. |
2343 | 3766 | # Check for GNU $ac_path_EGREP | 3699 | # Check for GNU $ac_path_EGREP |
2344 | 3767 | case `"$ac_path_EGREP" --version 2>&1` in | 3700 | case `"$ac_path_EGREP" --version 2>&1` in |
2345 | @@ -3992,7 +3925,7 @@ | |||
2346 | 3992 | IFS=$as_save_IFS | 3925 | IFS=$as_save_IFS |
2347 | 3993 | test -z "$as_dir" && as_dir=. | 3926 | test -z "$as_dir" && as_dir=. |
2348 | 3994 | for ac_exec_ext in '' $ac_executable_extensions; do | 3927 | for ac_exec_ext in '' $ac_executable_extensions; do |
2350 | 3995 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 3928 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2351 | 3996 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | 3929 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
2352 | 3997 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 3930 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2353 | 3998 | break 2 | 3931 | break 2 |
2354 | @@ -4035,7 +3968,7 @@ | |||
2355 | 4035 | IFS=$as_save_IFS | 3968 | IFS=$as_save_IFS |
2356 | 4036 | test -z "$as_dir" && as_dir=. | 3969 | test -z "$as_dir" && as_dir=. |
2357 | 4037 | for ac_exec_ext in '' $ac_executable_extensions; do | 3970 | for ac_exec_ext in '' $ac_executable_extensions; do |
2359 | 4038 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | 3971 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2360 | 4039 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | 3972 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
2361 | 4040 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | 3973 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2362 | 4041 | break 2 | 3974 | break 2 |
2363 | @@ -4178,7 +4111,7 @@ | |||
2364 | 4178 | for ac_prog in sed gsed; do | 4111 | for ac_prog in sed gsed; do |
2365 | 4179 | for ac_exec_ext in '' $ac_executable_extensions; do | 4112 | for ac_exec_ext in '' $ac_executable_extensions; do |
2366 | 4180 | ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" | 4113 | ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" |
2368 | 4181 | { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue | 4114 | as_fn_executable_p "$ac_path_SED" || continue |
2369 | 4182 | # Check for GNU ac_path_SED and select it if it is found. | 4115 | # Check for GNU ac_path_SED and select it if it is found. |
2370 | 4183 | # Check for GNU $ac_path_SED | 4116 | # Check for GNU $ac_path_SED |
2371 | 4184 | case `"$ac_path_SED" --version 2>&1` in | 4117 | case `"$ac_path_SED" --version 2>&1` in |
2372 | @@ -4685,7 +4618,7 @@ | |||
2373 | 4685 | 4618 | ||
2374 | 4686 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Wformat=2" >&5 | 4619 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Wformat=2" >&5 |
2375 | 4687 | $as_echo_n "checking if $CXX supports-Wformat=2... " >&6; } | 4620 | $as_echo_n "checking if $CXX supports-Wformat=2... " >&6; } |
2377 | 4688 | cacheid=`$as_echo "xorg_cv_cxx_flag_-Wformat=2" | $as_tr_sh` | 4621 | cacheid=xorg_cv_cxx_flag__Wformat_2 |
2378 | 4689 | if eval \${$cacheid+:} false; then : | 4622 | if eval \${$cacheid+:} false; then : |
2379 | 4690 | $as_echo_n "(cached) " >&6 | 4623 | $as_echo_n "(cached) " >&6 |
2380 | 4691 | else | 4624 | else |
2381 | @@ -5694,7 +5627,7 @@ | |||
2382 | 5694 | 5627 | ||
2383 | 5695 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=implicit" >&5 | 5628 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=implicit" >&5 |
2384 | 5696 | $as_echo_n "checking if $CXX supports-Werror=implicit... " >&6; } | 5629 | $as_echo_n "checking if $CXX supports-Werror=implicit... " >&6; } |
2386 | 5697 | cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=implicit" | $as_tr_sh` | 5630 | cacheid=xorg_cv_cxx_flag__Werror_implicit |
2387 | 5698 | if eval \${$cacheid+:} false; then : | 5631 | if eval \${$cacheid+:} false; then : |
2388 | 5699 | $as_echo_n "(cached) " >&6 | 5632 | $as_echo_n "(cached) " >&6 |
2389 | 5700 | else | 5633 | else |
2390 | @@ -5743,7 +5676,7 @@ | |||
2391 | 5743 | 5676 | ||
2392 | 5744 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5 | 5677 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5 |
2393 | 5745 | $as_echo_n "checking if $CXX supports-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; } | 5678 | $as_echo_n "checking if $CXX supports-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; } |
2395 | 5746 | cacheid=`$as_echo "xorg_cv_cxx_flag_-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" | $as_tr_sh` | 5679 | cacheid=xorg_cv_cxx_flag__errwarn_E_NO_EXPLICIT_TYPE_GIVEN__errwarn_E_NO_IMPLICIT_DECL_ALLOWED |
2396 | 5747 | if eval \${$cacheid+:} false; then : | 5680 | if eval \${$cacheid+:} false; then : |
2397 | 5748 | $as_echo_n "(cached) " >&6 | 5681 | $as_echo_n "(cached) " >&6 |
2398 | 5749 | else | 5682 | else |
2399 | @@ -5861,7 +5794,7 @@ | |||
2400 | 5861 | 5794 | ||
2401 | 5862 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=nonnull" >&5 | 5795 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=nonnull" >&5 |
2402 | 5863 | $as_echo_n "checking if $CXX supports-Werror=nonnull... " >&6; } | 5796 | $as_echo_n "checking if $CXX supports-Werror=nonnull... " >&6; } |
2404 | 5864 | cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=nonnull" | $as_tr_sh` | 5797 | cacheid=xorg_cv_cxx_flag__Werror_nonnull |
2405 | 5865 | if eval \${$cacheid+:} false; then : | 5798 | if eval \${$cacheid+:} false; then : |
2406 | 5866 | $as_echo_n "(cached) " >&6 | 5799 | $as_echo_n "(cached) " >&6 |
2407 | 5867 | else | 5800 | else |
2408 | @@ -5979,7 +5912,7 @@ | |||
2409 | 5979 | 5912 | ||
2410 | 5980 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=init-self" >&5 | 5913 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=init-self" >&5 |
2411 | 5981 | $as_echo_n "checking if $CXX supports-Werror=init-self... " >&6; } | 5914 | $as_echo_n "checking if $CXX supports-Werror=init-self... " >&6; } |
2413 | 5982 | cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=init-self" | $as_tr_sh` | 5915 | cacheid=xorg_cv_cxx_flag__Werror_init_self |
2414 | 5983 | if eval \${$cacheid+:} false; then : | 5916 | if eval \${$cacheid+:} false; then : |
2415 | 5984 | $as_echo_n "(cached) " >&6 | 5917 | $as_echo_n "(cached) " >&6 |
2416 | 5985 | else | 5918 | else |
2417 | @@ -6097,7 +6030,7 @@ | |||
2418 | 6097 | 6030 | ||
2419 | 6098 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=main" >&5 | 6031 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=main" >&5 |
2420 | 6099 | $as_echo_n "checking if $CXX supports-Werror=main... " >&6; } | 6032 | $as_echo_n "checking if $CXX supports-Werror=main... " >&6; } |
2422 | 6100 | cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=main" | $as_tr_sh` | 6033 | cacheid=xorg_cv_cxx_flag__Werror_main |
2423 | 6101 | if eval \${$cacheid+:} false; then : | 6034 | if eval \${$cacheid+:} false; then : |
2424 | 6102 | $as_echo_n "(cached) " >&6 | 6035 | $as_echo_n "(cached) " >&6 |
2425 | 6103 | else | 6036 | else |
2426 | @@ -6215,7 +6148,7 @@ | |||
2427 | 6215 | 6148 | ||
2428 | 6216 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=missing-braces" >&5 | 6149 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=missing-braces" >&5 |
2429 | 6217 | $as_echo_n "checking if $CXX supports-Werror=missing-braces... " >&6; } | 6150 | $as_echo_n "checking if $CXX supports-Werror=missing-braces... " >&6; } |
2431 | 6218 | cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=missing-braces" | $as_tr_sh` | 6151 | cacheid=xorg_cv_cxx_flag__Werror_missing_braces |
2432 | 6219 | if eval \${$cacheid+:} false; then : | 6152 | if eval \${$cacheid+:} false; then : |
2433 | 6220 | $as_echo_n "(cached) " >&6 | 6153 | $as_echo_n "(cached) " >&6 |
2434 | 6221 | else | 6154 | else |
2435 | @@ -6333,7 +6266,7 @@ | |||
2436 | 6333 | 6266 | ||
2437 | 6334 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=sequence-point" >&5 | 6267 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=sequence-point" >&5 |
2438 | 6335 | $as_echo_n "checking if $CXX supports-Werror=sequence-point... " >&6; } | 6268 | $as_echo_n "checking if $CXX supports-Werror=sequence-point... " >&6; } |
2440 | 6336 | cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=sequence-point" | $as_tr_sh` | 6269 | cacheid=xorg_cv_cxx_flag__Werror_sequence_point |
2441 | 6337 | if eval \${$cacheid+:} false; then : | 6270 | if eval \${$cacheid+:} false; then : |
2442 | 6338 | $as_echo_n "(cached) " >&6 | 6271 | $as_echo_n "(cached) " >&6 |
2443 | 6339 | else | 6272 | else |
2444 | @@ -6451,7 +6384,7 @@ | |||
2445 | 6451 | 6384 | ||
2446 | 6452 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=return-type" >&5 | 6385 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=return-type" >&5 |
2447 | 6453 | $as_echo_n "checking if $CXX supports-Werror=return-type... " >&6; } | 6386 | $as_echo_n "checking if $CXX supports-Werror=return-type... " >&6; } |
2449 | 6454 | cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=return-type" | $as_tr_sh` | 6387 | cacheid=xorg_cv_cxx_flag__Werror_return_type |
2450 | 6455 | if eval \${$cacheid+:} false; then : | 6388 | if eval \${$cacheid+:} false; then : |
2451 | 6456 | $as_echo_n "(cached) " >&6 | 6389 | $as_echo_n "(cached) " >&6 |
2452 | 6457 | else | 6390 | else |
2453 | @@ -6500,7 +6433,7 @@ | |||
2454 | 6500 | 6433 | ||
2455 | 6501 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5 | 6434 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5 |
2456 | 6502 | $as_echo_n "checking if $CXX supports-errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; } | 6435 | $as_echo_n "checking if $CXX supports-errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; } |
2458 | 6503 | cacheid=`$as_echo "xorg_cv_cxx_flag_-errwarn=E_FUNC_HAS_NO_RETURN_STMT" | $as_tr_sh` | 6436 | cacheid=xorg_cv_cxx_flag__errwarn_E_FUNC_HAS_NO_RETURN_STMT |
2459 | 6504 | if eval \${$cacheid+:} false; then : | 6437 | if eval \${$cacheid+:} false; then : |
2460 | 6505 | $as_echo_n "(cached) " >&6 | 6438 | $as_echo_n "(cached) " >&6 |
2461 | 6506 | else | 6439 | else |
2462 | @@ -6618,7 +6551,7 @@ | |||
2463 | 6618 | 6551 | ||
2464 | 6619 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=trigraphs" >&5 | 6552 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=trigraphs" >&5 |
2465 | 6620 | $as_echo_n "checking if $CXX supports-Werror=trigraphs... " >&6; } | 6553 | $as_echo_n "checking if $CXX supports-Werror=trigraphs... " >&6; } |
2467 | 6621 | cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=trigraphs" | $as_tr_sh` | 6554 | cacheid=xorg_cv_cxx_flag__Werror_trigraphs |
2468 | 6622 | if eval \${$cacheid+:} false; then : | 6555 | if eval \${$cacheid+:} false; then : |
2469 | 6623 | $as_echo_n "(cached) " >&6 | 6556 | $as_echo_n "(cached) " >&6 |
2470 | 6624 | else | 6557 | else |
2471 | @@ -6736,7 +6669,7 @@ | |||
2472 | 6736 | 6669 | ||
2473 | 6737 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=array-bounds" >&5 | 6670 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=array-bounds" >&5 |
2474 | 6738 | $as_echo_n "checking if $CXX supports-Werror=array-bounds... " >&6; } | 6671 | $as_echo_n "checking if $CXX supports-Werror=array-bounds... " >&6; } |
2476 | 6739 | cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=array-bounds" | $as_tr_sh` | 6672 | cacheid=xorg_cv_cxx_flag__Werror_array_bounds |
2477 | 6740 | if eval \${$cacheid+:} false; then : | 6673 | if eval \${$cacheid+:} false; then : |
2478 | 6741 | $as_echo_n "(cached) " >&6 | 6674 | $as_echo_n "(cached) " >&6 |
2479 | 6742 | else | 6675 | else |
2480 | @@ -6854,7 +6787,7 @@ | |||
2481 | 6854 | 6787 | ||
2482 | 6855 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=write-strings" >&5 | 6788 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=write-strings" >&5 |
2483 | 6856 | $as_echo_n "checking if $CXX supports-Werror=write-strings... " >&6; } | 6789 | $as_echo_n "checking if $CXX supports-Werror=write-strings... " >&6; } |
2485 | 6857 | cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=write-strings" | $as_tr_sh` | 6790 | cacheid=xorg_cv_cxx_flag__Werror_write_strings |
2486 | 6858 | if eval \${$cacheid+:} false; then : | 6791 | if eval \${$cacheid+:} false; then : |
2487 | 6859 | $as_echo_n "(cached) " >&6 | 6792 | $as_echo_n "(cached) " >&6 |
2488 | 6860 | else | 6793 | else |
2489 | @@ -6972,7 +6905,7 @@ | |||
2490 | 6972 | 6905 | ||
2491 | 6973 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=address" >&5 | 6906 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=address" >&5 |
2492 | 6974 | $as_echo_n "checking if $CXX supports-Werror=address... " >&6; } | 6907 | $as_echo_n "checking if $CXX supports-Werror=address... " >&6; } |
2494 | 6975 | cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=address" | $as_tr_sh` | 6908 | cacheid=xorg_cv_cxx_flag__Werror_address |
2495 | 6976 | if eval \${$cacheid+:} false; then : | 6909 | if eval \${$cacheid+:} false; then : |
2496 | 6977 | $as_echo_n "(cached) " >&6 | 6910 | $as_echo_n "(cached) " >&6 |
2497 | 6978 | else | 6911 | else |
2498 | @@ -7090,7 +7023,7 @@ | |||
2499 | 7090 | 7023 | ||
2500 | 7091 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=int-to-pointer-cast" >&5 | 7024 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=int-to-pointer-cast" >&5 |
2501 | 7092 | $as_echo_n "checking if $CXX supports-Werror=int-to-pointer-cast... " >&6; } | 7025 | $as_echo_n "checking if $CXX supports-Werror=int-to-pointer-cast... " >&6; } |
2503 | 7093 | cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=int-to-pointer-cast" | $as_tr_sh` | 7026 | cacheid=xorg_cv_cxx_flag__Werror_int_to_pointer_cast |
2504 | 7094 | if eval \${$cacheid+:} false; then : | 7027 | if eval \${$cacheid+:} false; then : |
2505 | 7095 | $as_echo_n "(cached) " >&6 | 7028 | $as_echo_n "(cached) " >&6 |
2506 | 7096 | else | 7029 | else |
2507 | @@ -7139,7 +7072,7 @@ | |||
2508 | 7139 | 7072 | ||
2509 | 7140 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-errwarn=E_BAD_PTR_INT_COMBINATION" >&5 | 7073 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-errwarn=E_BAD_PTR_INT_COMBINATION" >&5 |
2510 | 7141 | $as_echo_n "checking if $CXX supports-errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; } | 7074 | $as_echo_n "checking if $CXX supports-errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; } |
2512 | 7142 | cacheid=`$as_echo "xorg_cv_cxx_flag_-errwarn=E_BAD_PTR_INT_COMBINATION" | $as_tr_sh` | 7075 | cacheid=xorg_cv_cxx_flag__errwarn_E_BAD_PTR_INT_COMBINATION |
2513 | 7143 | if eval \${$cacheid+:} false; then : | 7076 | if eval \${$cacheid+:} false; then : |
2514 | 7144 | $as_echo_n "(cached) " >&6 | 7077 | $as_echo_n "(cached) " >&6 |
2515 | 7145 | else | 7078 | else |
2516 | @@ -7257,7 +7190,7 @@ | |||
2517 | 7257 | 7190 | ||
2518 | 7258 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=pointer-to-int-cast" >&5 | 7191 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=pointer-to-int-cast" >&5 |
2519 | 7259 | $as_echo_n "checking if $CXX supports-Werror=pointer-to-int-cast... " >&6; } | 7192 | $as_echo_n "checking if $CXX supports-Werror=pointer-to-int-cast... " >&6; } |
2521 | 7260 | cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=pointer-to-int-cast" | $as_tr_sh` | 7193 | cacheid=xorg_cv_cxx_flag__Werror_pointer_to_int_cast |
2522 | 7261 | if eval \${$cacheid+:} false; then : | 7194 | if eval \${$cacheid+:} false; then : |
2523 | 7262 | $as_echo_n "(cached) " >&6 | 7195 | $as_echo_n "(cached) " >&6 |
2524 | 7263 | else | 7196 | else |
2525 | @@ -9227,7 +9160,7 @@ | |||
2526 | 9227 | 9160 | ||
2527 | 9228 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=attributes" >&5 | 9161 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports-Werror=attributes" >&5 |
2528 | 9229 | $as_echo_n "checking if $CXX supports-Werror=attributes... " >&6; } | 9162 | $as_echo_n "checking if $CXX supports-Werror=attributes... " >&6; } |
2530 | 9230 | cacheid=`$as_echo "xorg_cv_cxx_flag_-Werror=attributes" | $as_tr_sh` | 9163 | cacheid=xorg_cv_cxx_flag__Werror_attributes |
2531 | 9231 | if eval \${$cacheid+:} false; then : | 9164 | if eval \${$cacheid+:} false; then : |
2532 | 9232 | $as_echo_n "(cached) " >&6 | 9165 | $as_echo_n "(cached) " >&6 |
2533 | 9233 | else | 9166 | else |
2534 | @@ -9539,20 +9472,145 @@ | |||
2535 | 9539 | 9472 | ||
2536 | 9540 | 9473 | ||
2537 | 9541 | 9474 | ||
2538 | 9475 | |||
2539 | 9476 | |||
2540 | 9477 | # Check whether --with-doxygen was given. | ||
2541 | 9478 | if test "${with_doxygen+set}" = set; then : | ||
2542 | 9479 | withval=$with_doxygen; use_doxygen=$withval | ||
2543 | 9480 | else | ||
2544 | 9481 | use_doxygen=auto | ||
2545 | 9482 | fi | ||
2546 | 9483 | |||
2547 | 9484 | |||
2548 | 9485 | |||
2549 | 9486 | if test "x$use_doxygen" = x"auto"; then | ||
2550 | 9487 | # Extract the first word of "doxygen", so it can be a program name with args. | ||
2551 | 9488 | set dummy doxygen; ac_word=$2 | ||
2552 | 9489 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2553 | 9490 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2554 | 9491 | if ${ac_cv_path_DOXYGEN+:} false; then : | ||
2555 | 9492 | $as_echo_n "(cached) " >&6 | ||
2556 | 9493 | else | ||
2557 | 9494 | case $DOXYGEN in | ||
2558 | 9495 | [\\/]* | ?:[\\/]*) | ||
2559 | 9496 | ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path. | ||
2560 | 9497 | ;; | ||
2561 | 9498 | *) | ||
2562 | 9499 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2563 | 9500 | for as_dir in $PATH | ||
2564 | 9501 | do | ||
2565 | 9502 | IFS=$as_save_IFS | ||
2566 | 9503 | test -z "$as_dir" && as_dir=. | ||
2567 | 9504 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2568 | 9505 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2569 | 9506 | ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" | ||
2570 | 9507 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2571 | 9508 | break 2 | ||
2572 | 9509 | fi | ||
2573 | 9510 | done | ||
2574 | 9511 | done | ||
2575 | 9512 | IFS=$as_save_IFS | ||
2576 | 9513 | |||
2577 | 9514 | ;; | ||
2578 | 9515 | esac | ||
2579 | 9516 | fi | ||
2580 | 9517 | DOXYGEN=$ac_cv_path_DOXYGEN | ||
2581 | 9518 | if test -n "$DOXYGEN"; then | ||
2582 | 9519 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 | ||
2583 | 9520 | $as_echo "$DOXYGEN" >&6; } | ||
2584 | 9521 | else | ||
2585 | 9522 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2586 | 9523 | $as_echo "no" >&6; } | ||
2587 | 9524 | fi | ||
2588 | 9525 | |||
2589 | 9526 | |||
2590 | 9527 | if test "x$DOXYGEN" = "x"; then | ||
2591 | 9528 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: doxygen not found - documentation targets will be skipped" >&5 | ||
2592 | 9529 | $as_echo "$as_me: WARNING: doxygen not found - documentation targets will be skipped" >&2;} | ||
2593 | 9530 | have_doxygen=no | ||
2594 | 9531 | else | ||
2595 | 9532 | have_doxygen=yes | ||
2596 | 9533 | fi | ||
2597 | 9534 | elif test "x$use_doxygen" = x"yes" ; then | ||
2598 | 9535 | # Extract the first word of "doxygen", so it can be a program name with args. | ||
2599 | 9536 | set dummy doxygen; ac_word=$2 | ||
2600 | 9537 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
2601 | 9538 | $as_echo_n "checking for $ac_word... " >&6; } | ||
2602 | 9539 | if ${ac_cv_path_DOXYGEN+:} false; then : | ||
2603 | 9540 | $as_echo_n "(cached) " >&6 | ||
2604 | 9541 | else | ||
2605 | 9542 | case $DOXYGEN in | ||
2606 | 9543 | [\\/]* | ?:[\\/]*) | ||
2607 | 9544 | ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path. | ||
2608 | 9545 | ;; | ||
2609 | 9546 | *) | ||
2610 | 9547 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
2611 | 9548 | for as_dir in $PATH | ||
2612 | 9549 | do | ||
2613 | 9550 | IFS=$as_save_IFS | ||
2614 | 9551 | test -z "$as_dir" && as_dir=. | ||
2615 | 9552 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
2616 | 9553 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
2617 | 9554 | ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" | ||
2618 | 9555 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
2619 | 9556 | break 2 | ||
2620 | 9557 | fi | ||
2621 | 9558 | done | ||
2622 | 9559 | done | ||
2623 | 9560 | IFS=$as_save_IFS | ||
2624 | 9561 | |||
2625 | 9562 | ;; | ||
2626 | 9563 | esac | ||
2627 | 9564 | fi | ||
2628 | 9565 | DOXYGEN=$ac_cv_path_DOXYGEN | ||
2629 | 9566 | if test -n "$DOXYGEN"; then | ||
2630 | 9567 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 | ||
2631 | 9568 | $as_echo "$DOXYGEN" >&6; } | ||
2632 | 9569 | else | ||
2633 | 9570 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
2634 | 9571 | $as_echo "no" >&6; } | ||
2635 | 9572 | fi | ||
2636 | 9573 | |||
2637 | 9574 | |||
2638 | 9575 | if test "x$DOXYGEN" = "x"; then | ||
2639 | 9576 | as_fn_error $? "--with-doxygen=yes specified but doxygen not found in PATH" "$LINENO" 5 | ||
2640 | 9577 | fi | ||
2641 | 9578 | have_doxygen=yes | ||
2642 | 9579 | elif test "x$use_doxygen" = x"no" ; then | ||
2643 | 9580 | if test "x$DOXYGEN" != "x"; then | ||
2644 | 9581 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring DOXYGEN environment variable since --with-doxygen=no was specified" >&5 | ||
2645 | 9582 | $as_echo "$as_me: WARNING: ignoring DOXYGEN environment variable since --with-doxygen=no was specified" >&2;} | ||
2646 | 9583 | fi | ||
2647 | 9584 | have_doxygen=no | ||
2648 | 9585 | else | ||
2649 | 9586 | as_fn_error $? "--with-doxygen expects 'yes' or 'no'" "$LINENO" 5 | ||
2650 | 9587 | fi | ||
2651 | 9588 | |||
2652 | 9589 | if test "$have_doxygen" = yes; then | ||
2653 | 9590 | HAVE_DOXYGEN_TRUE= | ||
2654 | 9591 | HAVE_DOXYGEN_FALSE='#' | ||
2655 | 9592 | else | ||
2656 | 9593 | HAVE_DOXYGEN_TRUE='#' | ||
2657 | 9594 | HAVE_DOXYGEN_FALSE= | ||
2658 | 9595 | fi | ||
2659 | 9596 | |||
2660 | 9597 | |||
2661 | 9598 | |||
2662 | 9599 | |||
2663 | 9542 | pkg_failed=no | 9600 | pkg_failed=no |
2666 | 9543 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSERVER" >&5 | 9601 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5 |
2667 | 9544 | $as_echo_n "checking for XSERVER... " >&6; } | 9602 | $as_echo_n "checking for X11... " >&6; } |
2668 | 9545 | 9603 | ||
2671 | 9546 | if test -n "$XSERVER_CFLAGS"; then | 9604 | if test -n "$X11_CFLAGS"; then |
2672 | 9547 | pkg_cv_XSERVER_CFLAGS="$XSERVER_CFLAGS" | 9605 | pkg_cv_X11_CFLAGS="$X11_CFLAGS" |
2673 | 9548 | elif test -n "$PKG_CONFIG"; then | 9606 | elif test -n "$PKG_CONFIG"; then |
2674 | 9549 | if test -n "$PKG_CONFIG" && \ | 9607 | if test -n "$PKG_CONFIG" && \ |
2677 | 9550 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5 | 9608 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xi\""; } >&5 |
2678 | 9551 | ($PKG_CONFIG --exists --print-errors "x11") 2>&5 | 9609 | ($PKG_CONFIG --exists --print-errors "x11 xi") 2>&5 |
2679 | 9552 | ac_status=$? | 9610 | ac_status=$? |
2680 | 9553 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 9611 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2681 | 9554 | test $ac_status = 0; }; then | 9612 | test $ac_status = 0; }; then |
2683 | 9555 | pkg_cv_XSERVER_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null` | 9613 | pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "x11 xi" 2>/dev/null` |
2684 | 9556 | test "x$?" != "x0" && pkg_failed=yes | 9614 | test "x$?" != "x0" && pkg_failed=yes |
2685 | 9557 | else | 9615 | else |
2686 | 9558 | pkg_failed=yes | 9616 | pkg_failed=yes |
2687 | @@ -9560,16 +9618,16 @@ | |||
2688 | 9560 | else | 9618 | else |
2689 | 9561 | pkg_failed=untried | 9619 | pkg_failed=untried |
2690 | 9562 | fi | 9620 | fi |
2693 | 9563 | if test -n "$XSERVER_LIBS"; then | 9621 | if test -n "$X11_LIBS"; then |
2694 | 9564 | pkg_cv_XSERVER_LIBS="$XSERVER_LIBS" | 9622 | pkg_cv_X11_LIBS="$X11_LIBS" |
2695 | 9565 | elif test -n "$PKG_CONFIG"; then | 9623 | elif test -n "$PKG_CONFIG"; then |
2696 | 9566 | if test -n "$PKG_CONFIG" && \ | 9624 | if test -n "$PKG_CONFIG" && \ |
2699 | 9567 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5 | 9625 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xi\""; } >&5 |
2700 | 9568 | ($PKG_CONFIG --exists --print-errors "x11") 2>&5 | 9626 | ($PKG_CONFIG --exists --print-errors "x11 xi") 2>&5 |
2701 | 9569 | ac_status=$? | 9627 | ac_status=$? |
2702 | 9570 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 9628 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2703 | 9571 | test $ac_status = 0; }; then | 9629 | test $ac_status = 0; }; then |
2705 | 9572 | pkg_cv_XSERVER_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null` | 9630 | pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "x11 xi" 2>/dev/null` |
2706 | 9573 | test "x$?" != "x0" && pkg_failed=yes | 9631 | test "x$?" != "x0" && pkg_failed=yes |
2707 | 9574 | else | 9632 | else |
2708 | 9575 | pkg_failed=yes | 9633 | pkg_failed=yes |
2709 | @@ -9590,22 +9648,22 @@ | |||
2710 | 9590 | _pkg_short_errors_supported=no | 9648 | _pkg_short_errors_supported=no |
2711 | 9591 | fi | 9649 | fi |
2712 | 9592 | if test $_pkg_short_errors_supported = yes; then | 9650 | if test $_pkg_short_errors_supported = yes; then |
2714 | 9593 | XSERVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11" 2>&1` | 9651 | X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11 xi" 2>&1` |
2715 | 9594 | else | 9652 | else |
2717 | 9595 | XSERVER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11" 2>&1` | 9653 | X11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11 xi" 2>&1` |
2718 | 9596 | fi | 9654 | fi |
2719 | 9597 | # Put the nasty error message in config.log where it belongs | 9655 | # Put the nasty error message in config.log where it belongs |
2725 | 9598 | echo "$XSERVER_PKG_ERRORS" >&5 | 9656 | echo "$X11_PKG_ERRORS" >&5 |
2726 | 9599 | 9657 | ||
2727 | 9600 | as_fn_error $? "Package requirements (x11) were not met: | 9658 | as_fn_error $? "Package requirements (x11 xi) were not met: |
2728 | 9601 | 9659 | ||
2729 | 9602 | $XSERVER_PKG_ERRORS | 9660 | $X11_PKG_ERRORS |
2730 | 9603 | 9661 | ||
2731 | 9604 | Consider adjusting the PKG_CONFIG_PATH environment variable if you | 9662 | Consider adjusting the PKG_CONFIG_PATH environment variable if you |
2732 | 9605 | installed software in a non-standard prefix. | 9663 | installed software in a non-standard prefix. |
2733 | 9606 | 9664 | ||
2736 | 9607 | Alternatively, you may set the environment variables XSERVER_CFLAGS | 9665 | Alternatively, you may set the environment variables X11_CFLAGS |
2737 | 9608 | and XSERVER_LIBS to avoid the need to call pkg-config. | 9666 | and X11_LIBS to avoid the need to call pkg-config. |
2738 | 9609 | See the pkg-config man page for more details." "$LINENO" 5 | 9667 | See the pkg-config man page for more details." "$LINENO" 5 |
2739 | 9610 | elif test $pkg_failed = untried; then | 9668 | elif test $pkg_failed = untried; then |
2740 | 9611 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 9669 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2741 | @@ -9616,137 +9674,49 @@ | |||
2742 | 9616 | is in your PATH or set the PKG_CONFIG environment variable to the full | 9674 | is in your PATH or set the PKG_CONFIG environment variable to the full |
2743 | 9617 | path to pkg-config. | 9675 | path to pkg-config. |
2744 | 9618 | 9676 | ||
2747 | 9619 | Alternatively, you may set the environment variables XSERVER_CFLAGS | 9677 | Alternatively, you may set the environment variables X11_CFLAGS |
2748 | 9620 | and XSERVER_LIBS to avoid the need to call pkg-config. | 9678 | and X11_LIBS to avoid the need to call pkg-config. |
2749 | 9621 | See the pkg-config man page for more details. | 9679 | See the pkg-config man page for more details. |
2750 | 9622 | 9680 | ||
2751 | 9623 | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | 9681 | To get pkg-config, see <http://pkg-config.freedesktop.org/>. |
2752 | 9624 | See \`config.log' for more details" "$LINENO" 5; } | 9682 | See \`config.log' for more details" "$LINENO" 5; } |
2753 | 9625 | else | 9683 | else |
2756 | 9626 | XSERVER_CFLAGS=$pkg_cv_XSERVER_CFLAGS | 9684 | X11_CFLAGS=$pkg_cv_X11_CFLAGS |
2757 | 9627 | XSERVER_LIBS=$pkg_cv_XSERVER_LIBS | 9685 | X11_LIBS=$pkg_cv_X11_LIBS |
2758 | 9628 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 9686 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2759 | 9629 | $as_echo "yes" >&6; } | 9687 | $as_echo "yes" >&6; } |
2760 | 9630 | 9688 | ||
2761 | 9631 | fi | 9689 | fi |
2762 | 9632 | 9690 | ||
2880 | 9633 | # Check for Google Test | 9691 | |
2881 | 9634 | 9692 | # Check whether --with-logfile-dir was given. | |
2882 | 9635 | 9693 | if test "${with_logfile_dir+set}" = set; then : | |
2883 | 9636 | # Check whether --with-gtest-source-path was given. | 9694 | withval=$with_logfile_dir; LOGFILE_DIR="$withval" |
2884 | 9637 | if test "${with_gtest_source_path+set}" = set; then : | 9695 | else |
2885 | 9638 | withval=$with_gtest_source_path; GTEST_SOURCE="$withval"; GTEST_CPPFLAGS="-I$withval/include" | 9696 | LOGFILE_DIR="/tmp" |
2886 | 9639 | else | 9697 | fi |
2887 | 9640 | GTEST_SOURCE="/usr/src/gtest" | 9698 | |
2888 | 9641 | fi | 9699 | |
2889 | 9642 | 9700 | prefix_NONE= | |
2890 | 9643 | 9701 | exec_prefix_NONE= | |
2891 | 9644 | 9702 | test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix | |
2892 | 9645 | # Check whether --with-gtest-include-path was given. | 9703 | test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix |
2893 | 9646 | if test "${with_gtest_include_path+set}" = set; then : | 9704 | eval ac_define_dir="\"$LOGFILE_DIR\"" |
2894 | 9647 | withval=$with_gtest_include_path; GTEST_CPPFLAGS="-I$withval" | 9705 | eval ac_define_dir="\"$ac_define_dir\"" |
2895 | 9648 | fi | 9706 | LOGFILE_DIR="$ac_define_dir" |
2896 | 9649 | 9707 | ||
2897 | 9650 | 9708 | ||
2898 | 9651 | GTEST_CPPFLAGS="$GTEST_CPPFLAGS -I$GTEST_SOURCE" | 9709 | cat >>confdefs.h <<_ACEOF |
2899 | 9652 | 9710 | #define LOGFILE_DIR "$ac_define_dir" | |
2900 | 9653 | ac_ext=cpp | 9711 | _ACEOF |
2901 | 9654 | ac_cpp='$CXXCPP $CPPFLAGS' | 9712 | |
2902 | 9655 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 9713 | test "$prefix_NONE" && prefix=NONE |
2903 | 9656 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 9714 | test "$exec_prefix_NONE" && exec_prefix=NONE |
2904 | 9657 | ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | 9715 | |
2905 | 9658 | 9716 | DUMMY_CONF_PATH='${LOGFILE_DIR}' | |
2906 | 9659 | 9717 | ||
2907 | 9660 | tmp_CPPFLAGS="$CPPFLAGS" | 9718 | |
2908 | 9661 | CPPFLAGS="$CPPFLAGS $GTEST_CPPFLAGS" | 9719 | # Check if we should include support for evemu |
2792 | 9662 | |||
2793 | 9663 | ac_fn_cxx_check_header_mongrel "$LINENO" "gtest/gtest.h" "ac_cv_header_gtest_gtest_h" "$ac_includes_default" | ||
2794 | 9664 | if test "x$ac_cv_header_gtest_gtest_h" = xyes; then : | ||
2795 | 9665 | |||
2796 | 9666 | fi | ||
2797 | 9667 | |||
2798 | 9668 | |||
2799 | 9669 | |||
2800 | 9670 | CPPFLAGS="$tmp_CPPFLAGS" | ||
2801 | 9671 | |||
2802 | 9672 | ac_ext=cpp | ||
2803 | 9673 | ac_cpp='$CXXCPP $CPPFLAGS' | ||
2804 | 9674 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
2805 | 9675 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
2806 | 9676 | ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
2807 | 9677 | |||
2808 | 9678 | |||
2809 | 9679 | as_ac_File=`$as_echo "ac_cv_file_$GTEST_SOURCE/src/gtest-all.cc" | $as_tr_sh` | ||
2810 | 9680 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $GTEST_SOURCE/src/gtest-all.cc" >&5 | ||
2811 | 9681 | $as_echo_n "checking for $GTEST_SOURCE/src/gtest-all.cc... " >&6; } | ||
2812 | 9682 | if eval \${$as_ac_File+:} false; then : | ||
2813 | 9683 | $as_echo_n "(cached) " >&6 | ||
2814 | 9684 | else | ||
2815 | 9685 | test "$cross_compiling" = yes && | ||
2816 | 9686 | as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 | ||
2817 | 9687 | if test -r "$GTEST_SOURCE/src/gtest-all.cc"; then | ||
2818 | 9688 | eval "$as_ac_File=yes" | ||
2819 | 9689 | else | ||
2820 | 9690 | eval "$as_ac_File=no" | ||
2821 | 9691 | fi | ||
2822 | 9692 | fi | ||
2823 | 9693 | eval ac_res=\$$as_ac_File | ||
2824 | 9694 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
2825 | 9695 | $as_echo "$ac_res" >&6; } | ||
2826 | 9696 | if eval test \"x\$"$as_ac_File"\" = x"yes"; then : | ||
2827 | 9697 | |||
2828 | 9698 | cat >>confdefs.h <<_ACEOF | ||
2829 | 9699 | #define `$as_echo "HAVE_$GTEST_SOURCE/src/gtest-all.cc" | $as_tr_cpp` 1 | ||
2830 | 9700 | _ACEOF | ||
2831 | 9701 | have_gtest_source=yes | ||
2832 | 9702 | else | ||
2833 | 9703 | have_gtest_source=no | ||
2834 | 9704 | fi | ||
2835 | 9705 | as_ac_File=`$as_echo "ac_cv_file_$GTEST_SOURCE/src/gtest_main.cc" | $as_tr_sh` | ||
2836 | 9706 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $GTEST_SOURCE/src/gtest_main.cc" >&5 | ||
2837 | 9707 | $as_echo_n "checking for $GTEST_SOURCE/src/gtest_main.cc... " >&6; } | ||
2838 | 9708 | if eval \${$as_ac_File+:} false; then : | ||
2839 | 9709 | $as_echo_n "(cached) " >&6 | ||
2840 | 9710 | else | ||
2841 | 9711 | test "$cross_compiling" = yes && | ||
2842 | 9712 | as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 | ||
2843 | 9713 | if test -r "$GTEST_SOURCE/src/gtest_main.cc"; then | ||
2844 | 9714 | eval "$as_ac_File=yes" | ||
2845 | 9715 | else | ||
2846 | 9716 | eval "$as_ac_File=no" | ||
2847 | 9717 | fi | ||
2848 | 9718 | fi | ||
2849 | 9719 | eval ac_res=\$$as_ac_File | ||
2850 | 9720 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
2851 | 9721 | $as_echo "$ac_res" >&6; } | ||
2852 | 9722 | if eval test \"x\$"$as_ac_File"\" = x"yes"; then : | ||
2853 | 9723 | |||
2854 | 9724 | cat >>confdefs.h <<_ACEOF | ||
2855 | 9725 | #define `$as_echo "HAVE_$GTEST_SOURCE/src/gtest_main.cc" | $as_tr_cpp` 1 | ||
2856 | 9726 | _ACEOF | ||
2857 | 9727 | have_gtest_source=yes | ||
2858 | 9728 | else | ||
2859 | 9729 | have_gtest_source=no | ||
2860 | 9730 | fi | ||
2861 | 9731 | |||
2862 | 9732 | |||
2863 | 9733 | if test "x$ac_cv_header_gtest_gtest_h" = xyes -a \ | ||
2864 | 9734 | "x$have_gtest_source" = xyes; then : | ||
2865 | 9735 | have_gtest=yes | ||
2866 | 9736 | |||
2867 | 9737 | |||
2868 | 9738 | else | ||
2869 | 9739 | have_gtest=no | ||
2870 | 9740 | fi | ||
2871 | 9741 | |||
2872 | 9742 | |||
2873 | 9743 | if test "x$have_gtest" != xyes; then : | ||
2874 | 9744 | as_fn_error $? "package 'gtest' not found" "$LINENO" 5 | ||
2875 | 9745 | fi | ||
2876 | 9746 | |||
2877 | 9747 | |||
2878 | 9748 | |||
2879 | 9749 | # Check if we should include support for utouch-evemu | ||
2909 | 9750 | 9720 | ||
2910 | 9751 | # Check whether --with-evemu was given. | 9721 | # Check whether --with-evemu was given. |
2911 | 9752 | if test "${with_evemu+set}" = set; then : | 9722 | if test "${with_evemu+set}" = set; then : |
2912 | @@ -9756,171 +9726,82 @@ | |||
2913 | 9756 | fi | 9726 | fi |
2914 | 9757 | 9727 | ||
2915 | 9758 | 9728 | ||
3081 | 9759 | if test "x$with_evemu" == xyes; then : | 9729 | |
3082 | 9760 | 9730 | pkg_failed=no | |
3083 | 9761 | pkg_failed=no | 9731 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVEMU" >&5 |
3084 | 9762 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVEMU" >&5 | 9732 | $as_echo_n "checking for EVEMU... " >&6; } |
3085 | 9763 | $as_echo_n "checking for EVEMU... " >&6; } | 9733 | |
3086 | 9764 | 9734 | if test -n "$EVEMU_CFLAGS"; then | |
3087 | 9765 | if test -n "$EVEMU_CFLAGS"; then | 9735 | pkg_cv_EVEMU_CFLAGS="$EVEMU_CFLAGS" |
3088 | 9766 | pkg_cv_EVEMU_CFLAGS="$EVEMU_CFLAGS" | 9736 | elif test -n "$PKG_CONFIG"; then |
3089 | 9767 | elif test -n "$PKG_CONFIG"; then | 9737 | if test -n "$PKG_CONFIG" && \ |
3090 | 9768 | if test -n "$PKG_CONFIG" && \ | 9738 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evemu >= 1.0.10 \""; } >&5 |
3091 | 9769 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu\""; } >&5 | 9739 | ($PKG_CONFIG --exists --print-errors "evemu >= 1.0.10 ") 2>&5 |
3092 | 9770 | ($PKG_CONFIG --exists --print-errors "utouch-evemu") 2>&5 | 9740 | ac_status=$? |
3093 | 9771 | ac_status=$? | 9741 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3094 | 9772 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 9742 | test $ac_status = 0; }; then |
3095 | 9773 | test $ac_status = 0; }; then | 9743 | pkg_cv_EVEMU_CFLAGS=`$PKG_CONFIG --cflags "evemu >= 1.0.10 " 2>/dev/null` |
3096 | 9774 | pkg_cv_EVEMU_CFLAGS=`$PKG_CONFIG --cflags "utouch-evemu" 2>/dev/null` | 9744 | test "x$?" != "x0" && pkg_failed=yes |
3097 | 9775 | test "x$?" != "x0" && pkg_failed=yes | 9745 | else |
3098 | 9776 | else | 9746 | pkg_failed=yes |
3099 | 9777 | pkg_failed=yes | 9747 | fi |
3100 | 9778 | fi | 9748 | else |
3101 | 9779 | else | 9749 | pkg_failed=untried |
3102 | 9780 | pkg_failed=untried | 9750 | fi |
3103 | 9781 | fi | 9751 | if test -n "$EVEMU_LIBS"; then |
3104 | 9782 | if test -n "$EVEMU_LIBS"; then | 9752 | pkg_cv_EVEMU_LIBS="$EVEMU_LIBS" |
3105 | 9783 | pkg_cv_EVEMU_LIBS="$EVEMU_LIBS" | 9753 | elif test -n "$PKG_CONFIG"; then |
3106 | 9784 | elif test -n "$PKG_CONFIG"; then | 9754 | if test -n "$PKG_CONFIG" && \ |
3107 | 9785 | if test -n "$PKG_CONFIG" && \ | 9755 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evemu >= 1.0.10 \""; } >&5 |
3108 | 9786 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu\""; } >&5 | 9756 | ($PKG_CONFIG --exists --print-errors "evemu >= 1.0.10 ") 2>&5 |
3109 | 9787 | ($PKG_CONFIG --exists --print-errors "utouch-evemu") 2>&5 | 9757 | ac_status=$? |
3110 | 9788 | ac_status=$? | 9758 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3111 | 9789 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 9759 | test $ac_status = 0; }; then |
3112 | 9790 | test $ac_status = 0; }; then | 9760 | pkg_cv_EVEMU_LIBS=`$PKG_CONFIG --libs "evemu >= 1.0.10 " 2>/dev/null` |
3113 | 9791 | pkg_cv_EVEMU_LIBS=`$PKG_CONFIG --libs "utouch-evemu" 2>/dev/null` | 9761 | test "x$?" != "x0" && pkg_failed=yes |
3114 | 9792 | test "x$?" != "x0" && pkg_failed=yes | 9762 | else |
3115 | 9793 | else | 9763 | pkg_failed=yes |
3116 | 9794 | pkg_failed=yes | 9764 | fi |
3117 | 9795 | fi | 9765 | else |
3118 | 9796 | else | 9766 | pkg_failed=untried |
3119 | 9797 | pkg_failed=untried | 9767 | fi |
3120 | 9798 | fi | 9768 | |
3121 | 9799 | 9769 | ||
3122 | 9800 | 9770 | ||
3123 | 9801 | 9771 | if test $pkg_failed = yes; then | |
3124 | 9802 | if test $pkg_failed = yes; then | 9772 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3125 | 9803 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 9773 | $as_echo "no" >&6; } |
3126 | 9804 | $as_echo "no" >&6; } | 9774 | |
3127 | 9805 | 9775 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |
3128 | 9806 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 9776 | _pkg_short_errors_supported=yes |
3129 | 9807 | _pkg_short_errors_supported=yes | 9777 | else |
3130 | 9808 | else | 9778 | _pkg_short_errors_supported=no |
3131 | 9809 | _pkg_short_errors_supported=no | 9779 | fi |
3132 | 9810 | fi | 9780 | if test $_pkg_short_errors_supported = yes; then |
3133 | 9811 | if test $_pkg_short_errors_supported = yes; then | 9781 | EVEMU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evemu >= 1.0.10 " 2>&1` |
3134 | 9812 | EVEMU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "utouch-evemu" 2>&1` | 9782 | else |
3135 | 9813 | else | 9783 | EVEMU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evemu >= 1.0.10 " 2>&1` |
3136 | 9814 | EVEMU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "utouch-evemu" 2>&1` | 9784 | fi |
3137 | 9815 | fi | 9785 | # Put the nasty error message in config.log where it belongs |
3138 | 9816 | # Put the nasty error message in config.log where it belongs | 9786 | echo "$EVEMU_PKG_ERRORS" >&5 |
3139 | 9817 | echo "$EVEMU_PKG_ERRORS" >&5 | 9787 | |
3140 | 9818 | 9788 | have_evemu=no | |
3141 | 9819 | as_fn_error $? "Package requirements (utouch-evemu) were not met: | 9789 | elif test $pkg_failed = untried; then |
3142 | 9820 | 9790 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
3143 | 9821 | $EVEMU_PKG_ERRORS | 9791 | $as_echo "no" >&6; } |
3144 | 9822 | 9792 | have_evemu=no | |
3145 | 9823 | Consider adjusting the PKG_CONFIG_PATH environment variable if you | 9793 | else |
3146 | 9824 | installed software in a non-standard prefix. | 9794 | EVEMU_CFLAGS=$pkg_cv_EVEMU_CFLAGS |
3147 | 9825 | 9795 | EVEMU_LIBS=$pkg_cv_EVEMU_LIBS | |
3148 | 9826 | Alternatively, you may set the environment variables EVEMU_CFLAGS | 9796 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
3149 | 9827 | and EVEMU_LIBS to avoid the need to call pkg-config. | 9797 | $as_echo "yes" >&6; } |
3150 | 9828 | See the pkg-config man page for more details." "$LINENO" 5 | 9798 | have_evemu=yes |
3151 | 9829 | elif test $pkg_failed = untried; then | 9799 | fi |
3152 | 9830 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 9800 | |
3153 | 9831 | $as_echo "no" >&6; } | 9801 | if test "x$with_evemu" == xyes && test "x$have_evemu" != xyes; then : |
3154 | 9832 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 9802 | as_fn_error $? "package 'evemu' not found" "$LINENO" 5 |
3155 | 9833 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 9803 | fi |
3156 | 9834 | as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it | 9804 | |
2992 | 9835 | is in your PATH or set the PKG_CONFIG environment variable to the full | ||
2993 | 9836 | path to pkg-config. | ||
2994 | 9837 | |||
2995 | 9838 | Alternatively, you may set the environment variables EVEMU_CFLAGS | ||
2996 | 9839 | and EVEMU_LIBS to avoid the need to call pkg-config. | ||
2997 | 9840 | See the pkg-config man page for more details. | ||
2998 | 9841 | |||
2999 | 9842 | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | ||
3000 | 9843 | See \`config.log' for more details" "$LINENO" 5; } | ||
3001 | 9844 | else | ||
3002 | 9845 | EVEMU_CFLAGS=$pkg_cv_EVEMU_CFLAGS | ||
3003 | 9846 | EVEMU_LIBS=$pkg_cv_EVEMU_LIBS | ||
3004 | 9847 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
3005 | 9848 | $as_echo "yes" >&6; } | ||
3006 | 9849 | have_evemu=yes | ||
3007 | 9850 | fi | ||
3008 | 9851 | elif test "x$with_evemu" == xcheck; then : | ||
3009 | 9852 | |||
3010 | 9853 | pkg_failed=no | ||
3011 | 9854 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVEMU" >&5 | ||
3012 | 9855 | $as_echo_n "checking for EVEMU... " >&6; } | ||
3013 | 9856 | |||
3014 | 9857 | if test -n "$EVEMU_CFLAGS"; then | ||
3015 | 9858 | pkg_cv_EVEMU_CFLAGS="$EVEMU_CFLAGS" | ||
3016 | 9859 | elif test -n "$PKG_CONFIG"; then | ||
3017 | 9860 | if test -n "$PKG_CONFIG" && \ | ||
3018 | 9861 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu\""; } >&5 | ||
3019 | 9862 | ($PKG_CONFIG --exists --print-errors "utouch-evemu") 2>&5 | ||
3020 | 9863 | ac_status=$? | ||
3021 | 9864 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
3022 | 9865 | test $ac_status = 0; }; then | ||
3023 | 9866 | pkg_cv_EVEMU_CFLAGS=`$PKG_CONFIG --cflags "utouch-evemu" 2>/dev/null` | ||
3024 | 9867 | test "x$?" != "x0" && pkg_failed=yes | ||
3025 | 9868 | else | ||
3026 | 9869 | pkg_failed=yes | ||
3027 | 9870 | fi | ||
3028 | 9871 | else | ||
3029 | 9872 | pkg_failed=untried | ||
3030 | 9873 | fi | ||
3031 | 9874 | if test -n "$EVEMU_LIBS"; then | ||
3032 | 9875 | pkg_cv_EVEMU_LIBS="$EVEMU_LIBS" | ||
3033 | 9876 | elif test -n "$PKG_CONFIG"; then | ||
3034 | 9877 | if test -n "$PKG_CONFIG" && \ | ||
3035 | 9878 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu\""; } >&5 | ||
3036 | 9879 | ($PKG_CONFIG --exists --print-errors "utouch-evemu") 2>&5 | ||
3037 | 9880 | ac_status=$? | ||
3038 | 9881 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
3039 | 9882 | test $ac_status = 0; }; then | ||
3040 | 9883 | pkg_cv_EVEMU_LIBS=`$PKG_CONFIG --libs "utouch-evemu" 2>/dev/null` | ||
3041 | 9884 | test "x$?" != "x0" && pkg_failed=yes | ||
3042 | 9885 | else | ||
3043 | 9886 | pkg_failed=yes | ||
3044 | 9887 | fi | ||
3045 | 9888 | else | ||
3046 | 9889 | pkg_failed=untried | ||
3047 | 9890 | fi | ||
3048 | 9891 | |||
3049 | 9892 | |||
3050 | 9893 | |||
3051 | 9894 | if test $pkg_failed = yes; then | ||
3052 | 9895 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3053 | 9896 | $as_echo "no" >&6; } | ||
3054 | 9897 | |||
3055 | 9898 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | ||
3056 | 9899 | _pkg_short_errors_supported=yes | ||
3057 | 9900 | else | ||
3058 | 9901 | _pkg_short_errors_supported=no | ||
3059 | 9902 | fi | ||
3060 | 9903 | if test $_pkg_short_errors_supported = yes; then | ||
3061 | 9904 | EVEMU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "utouch-evemu" 2>&1` | ||
3062 | 9905 | else | ||
3063 | 9906 | EVEMU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "utouch-evemu" 2>&1` | ||
3064 | 9907 | fi | ||
3065 | 9908 | # Put the nasty error message in config.log where it belongs | ||
3066 | 9909 | echo "$EVEMU_PKG_ERRORS" >&5 | ||
3067 | 9910 | |||
3068 | 9911 | : | ||
3069 | 9912 | elif test $pkg_failed = untried; then | ||
3070 | 9913 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3071 | 9914 | $as_echo "no" >&6; } | ||
3072 | 9915 | : | ||
3073 | 9916 | else | ||
3074 | 9917 | EVEMU_CFLAGS=$pkg_cv_EVEMU_CFLAGS | ||
3075 | 9918 | EVEMU_LIBS=$pkg_cv_EVEMU_LIBS | ||
3076 | 9919 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
3077 | 9920 | $as_echo "yes" >&6; } | ||
3078 | 9921 | have_evemu=yes | ||
3079 | 9922 | fi | ||
3080 | 9923 | fi | ||
3157 | 9924 | if test "x$have_evemu" = "xyes"; then | 9805 | if test "x$have_evemu" = "xyes"; then |
3158 | 9925 | HAVE_EVEMU_TRUE= | 9806 | HAVE_EVEMU_TRUE= |
3159 | 9926 | HAVE_EVEMU_FALSE='#' | 9807 | HAVE_EVEMU_FALSE='#' |
3160 | @@ -9939,6 +9820,9 @@ | |||
3161 | 9939 | DUMMY_CONF_PATH='${datarootdir}/xorg/gtest/dummy.conf' | 9820 | DUMMY_CONF_PATH='${datarootdir}/xorg/gtest/dummy.conf' |
3162 | 9940 | 9821 | ||
3163 | 9941 | 9822 | ||
3164 | 9823 | BASE_CPPFLAGS='$(X11_CFLAGS) $(EVEMU_CFLAGS)' | ||
3165 | 9824 | |||
3166 | 9825 | |||
3167 | 9942 | # Check if we can build integration tests | 9826 | # Check if we can build integration tests |
3168 | 9943 | if test "x$enable_integration_tests" != xno; then : | 9827 | if test "x$enable_integration_tests" != xno; then : |
3169 | 9944 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X.org server" >&5 | 9828 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X.org server" >&5 |
3170 | @@ -10002,7 +9886,7 @@ | |||
3171 | 10002 | fi | 9886 | fi |
3172 | 10003 | 9887 | ||
3173 | 10004 | 9888 | ||
3175 | 10005 | ac_config_files="$ac_config_files Makefile aclocal/Makefile data/Makefile doc/Makefile examples/Makefile include/Makefile src/Makefile xorg-gtest.pc" | 9889 | ac_config_files="$ac_config_files Makefile aclocal/Makefile gtest/Makefile gtest/include/Makefile data/Makefile doc/Doxyfile doc/Makefile examples/Makefile include/Makefile src/Makefile test/Makefile xorg-gtest.pc" |
3176 | 10006 | 9890 | ||
3177 | 10007 | 9891 | ||
3178 | 10008 | cat >confcache <<\_ACEOF | 9892 | cat >confcache <<\_ACEOF |
3179 | @@ -10174,6 +10058,10 @@ | |||
3180 | 10174 | as_fn_error $? "conditional \"ENABLE_INTEGRATION_TESTS\" was never defined. | 10058 | as_fn_error $? "conditional \"ENABLE_INTEGRATION_TESTS\" was never defined. |
3181 | 10175 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 10059 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
3182 | 10176 | fi | 10060 | fi |
3183 | 10061 | if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then | ||
3184 | 10062 | as_fn_error $? "conditional \"HAVE_DOXYGEN\" was never defined. | ||
3185 | 10063 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
3186 | 10064 | fi | ||
3187 | 10177 | if test -z "${HAVE_EVEMU_TRUE}" && test -z "${HAVE_EVEMU_FALSE}"; then | 10065 | if test -z "${HAVE_EVEMU_TRUE}" && test -z "${HAVE_EVEMU_FALSE}"; then |
3188 | 10178 | as_fn_error $? "conditional \"HAVE_EVEMU\" was never defined. | 10066 | as_fn_error $? "conditional \"HAVE_EVEMU\" was never defined. |
3189 | 10179 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 10067 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
3190 | @@ -10480,16 +10368,16 @@ | |||
3191 | 10480 | # ... but there are two gotchas: | 10368 | # ... but there are two gotchas: |
3192 | 10481 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | 10369 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
3193 | 10482 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | 10370 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
3195 | 10483 | # In both cases, we have to default to `cp -p'. | 10371 | # In both cases, we have to default to `cp -pR'. |
3196 | 10484 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | 10372 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
3198 | 10485 | as_ln_s='cp -p' | 10373 | as_ln_s='cp -pR' |
3199 | 10486 | elif ln conf$$.file conf$$ 2>/dev/null; then | 10374 | elif ln conf$$.file conf$$ 2>/dev/null; then |
3200 | 10487 | as_ln_s=ln | 10375 | as_ln_s=ln |
3201 | 10488 | else | 10376 | else |
3203 | 10489 | as_ln_s='cp -p' | 10377 | as_ln_s='cp -pR' |
3204 | 10490 | fi | 10378 | fi |
3205 | 10491 | else | 10379 | else |
3207 | 10492 | as_ln_s='cp -p' | 10380 | as_ln_s='cp -pR' |
3208 | 10493 | fi | 10381 | fi |
3209 | 10494 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file | 10382 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
3210 | 10495 | rmdir conf$$.dir 2>/dev/null | 10383 | rmdir conf$$.dir 2>/dev/null |
3211 | @@ -10549,28 +10437,16 @@ | |||
3212 | 10549 | as_mkdir_p=false | 10437 | as_mkdir_p=false |
3213 | 10550 | fi | 10438 | fi |
3214 | 10551 | 10439 | ||
3237 | 10552 | if test -x / >/dev/null 2>&1; then | 10440 | |
3238 | 10553 | as_test_x='test -x' | 10441 | # as_fn_executable_p FILE |
3239 | 10554 | else | 10442 | # ----------------------- |
3240 | 10555 | if ls -dL / >/dev/null 2>&1; then | 10443 | # Test if FILE is an executable regular file. |
3241 | 10556 | as_ls_L_option=L | 10444 | as_fn_executable_p () |
3242 | 10557 | else | 10445 | { |
3243 | 10558 | as_ls_L_option= | 10446 | test -f "$1" && test -x "$1" |
3244 | 10559 | fi | 10447 | } # as_fn_executable_p |
3245 | 10560 | as_test_x=' | 10448 | as_test_x='test -x' |
3246 | 10561 | eval sh -c '\'' | 10449 | as_executable_p=as_fn_executable_p |
3225 | 10562 | if test -d "$1"; then | ||
3226 | 10563 | test -d "$1/."; | ||
3227 | 10564 | else | ||
3228 | 10565 | case $1 in #( | ||
3229 | 10566 | -*)set "./$1";; | ||
3230 | 10567 | esac; | ||
3231 | 10568 | case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( | ||
3232 | 10569 | ???[sx]*):;;*)false;;esac;fi | ||
3233 | 10570 | '\'' sh | ||
3234 | 10571 | ' | ||
3235 | 10572 | fi | ||
3236 | 10573 | as_executable_p=$as_test_x | ||
3247 | 10574 | 10450 | ||
3248 | 10575 | # Sed expression to map a string onto a valid CPP name. | 10451 | # Sed expression to map a string onto a valid CPP name. |
3249 | 10576 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | 10452 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
3250 | @@ -10591,8 +10467,8 @@ | |||
3251 | 10591 | # report actual input values of CONFIG_FILES etc. instead of their | 10467 | # report actual input values of CONFIG_FILES etc. instead of their |
3252 | 10592 | # values after options handling. | 10468 | # values after options handling. |
3253 | 10593 | ac_log=" | 10469 | ac_log=" |
3256 | 10594 | This file was extended by Dummy X.org Testing Environment for Google Test $as_me 0.3.0, which was | 10470 | This file was extended by X.org Testing Environment for Google Test $as_me 0.7.0, which was |
3257 | 10595 | generated by GNU Autoconf 2.68. Invocation command line was | 10471 | generated by GNU Autoconf 2.69. Invocation command line was |
3258 | 10596 | 10472 | ||
3259 | 10597 | CONFIG_FILES = $CONFIG_FILES | 10473 | CONFIG_FILES = $CONFIG_FILES |
3260 | 10598 | CONFIG_HEADERS = $CONFIG_HEADERS | 10474 | CONFIG_HEADERS = $CONFIG_HEADERS |
3261 | @@ -10648,11 +10524,11 @@ | |||
3262 | 10648 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 10524 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
3263 | 10649 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 10525 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
3264 | 10650 | ac_cs_version="\\ | 10526 | ac_cs_version="\\ |
3267 | 10651 | Dummy X.org Testing Environment for Google Test config.status 0.3.0 | 10527 | X.org Testing Environment for Google Test config.status 0.7.0 |
3268 | 10652 | configured by $0, generated by GNU Autoconf 2.68, | 10528 | configured by $0, generated by GNU Autoconf 2.69, |
3269 | 10653 | with options \\"\$ac_cs_config\\" | 10529 | with options \\"\$ac_cs_config\\" |
3270 | 10654 | 10530 | ||
3272 | 10655 | Copyright (C) 2010 Free Software Foundation, Inc. | 10531 | Copyright (C) 2012 Free Software Foundation, Inc. |
3273 | 10656 | This config.status script is free software; the Free Software Foundation | 10532 | This config.status script is free software; the Free Software Foundation |
3274 | 10657 | gives unlimited permission to copy, distribute and modify it." | 10533 | gives unlimited permission to copy, distribute and modify it." |
3275 | 10658 | 10534 | ||
3276 | @@ -10732,7 +10608,7 @@ | |||
3277 | 10732 | _ACEOF | 10608 | _ACEOF |
3278 | 10733 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 10609 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
3279 | 10734 | if \$ac_cs_recheck; then | 10610 | if \$ac_cs_recheck; then |
3281 | 10735 | set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion | 10611 | set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
3282 | 10736 | shift | 10612 | shift |
3283 | 10737 | \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 | 10613 | \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 |
3284 | 10738 | CONFIG_SHELL='$SHELL' | 10614 | CONFIG_SHELL='$SHELL' |
3285 | @@ -10769,11 +10645,15 @@ | |||
3286 | 10769 | "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; | 10645 | "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; |
3287 | 10770 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; | 10646 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
3288 | 10771 | "aclocal/Makefile") CONFIG_FILES="$CONFIG_FILES aclocal/Makefile" ;; | 10647 | "aclocal/Makefile") CONFIG_FILES="$CONFIG_FILES aclocal/Makefile" ;; |
3289 | 10648 | "gtest/Makefile") CONFIG_FILES="$CONFIG_FILES gtest/Makefile" ;; | ||
3290 | 10649 | "gtest/include/Makefile") CONFIG_FILES="$CONFIG_FILES gtest/include/Makefile" ;; | ||
3291 | 10772 | "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; | 10650 | "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; |
3292 | 10651 | "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;; | ||
3293 | 10773 | "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; | 10652 | "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; |
3294 | 10774 | "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; | 10653 | "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; |
3295 | 10775 | "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; | 10654 | "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; |
3296 | 10776 | "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; | 10655 | "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; |
3297 | 10656 | "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; | ||
3298 | 10777 | "xorg-gtest.pc") CONFIG_FILES="$CONFIG_FILES xorg-gtest.pc" ;; | 10657 | "xorg-gtest.pc") CONFIG_FILES="$CONFIG_FILES xorg-gtest.pc" ;; |
3299 | 10778 | 10658 | ||
3300 | 10779 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; | 10659 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
3301 | 10780 | 10660 | ||
3302 | === modified file 'configure.ac' | |||
3303 | --- configure.ac 2012-06-08 12:39:52 +0000 | |||
3304 | +++ configure.ac 2013-01-21 00:48:20 +0000 | |||
3305 | @@ -1,14 +1,14 @@ | |||
3306 | 1 | # Initialize Autoconf | 1 | # Initialize Autoconf |
3307 | 2 | AC_PREREQ([2.60]) | 2 | AC_PREREQ([2.60]) |
3310 | 3 | AC_INIT([Dummy X.org Testing Environment for Google Test], | 3 | AC_INIT([X.org Testing Environment for Google Test], |
3311 | 4 | [0.3.0], | 4 | [0.7.0], |
3312 | 5 | [], | 5 | [], |
3313 | 6 | [xorg-gtest]) | 6 | [xorg-gtest]) |
3314 | 7 | AC_CONFIG_SRCDIR([Makefile.am]) | 7 | AC_CONFIG_SRCDIR([Makefile.am]) |
3315 | 8 | AC_CONFIG_MACRO_DIR([m4]) | 8 | AC_CONFIG_MACRO_DIR([m4]) |
3316 | 9 | 9 | ||
3317 | 10 | # Initialize Automake | 10 | # Initialize Automake |
3319 | 11 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) | 11 | AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip]) |
3320 | 12 | AM_MAINTAINER_MODE([enable]) | 12 | AM_MAINTAINER_MODE([enable]) |
3321 | 13 | 13 | ||
3322 | 14 | # Checks for programs. | 14 | # Checks for programs. |
3323 | @@ -23,34 +23,36 @@ | |||
3324 | 23 | XORG_MACROS_VERSION(1.17) | 23 | XORG_MACROS_VERSION(1.17) |
3325 | 24 | XORG_DEFAULT_OPTIONS | 24 | XORG_DEFAULT_OPTIONS |
3326 | 25 | XORG_ENABLE_INTEGRATION_TESTS([yes]) | 25 | XORG_ENABLE_INTEGRATION_TESTS([yes]) |
3329 | 26 | 26 | XORG_WITH_DOXYGEN | |
3330 | 27 | PKG_CHECK_MODULES(XSERVER, x11) | 27 | |
3331 | 28 | PKG_CHECK_MODULES(X11, x11 xi) | ||
3332 | 29 | |||
3333 | 30 | AC_ARG_WITH(logfile-dir, [AS_HELP_STRING([--with-logfile-dir=/tmp]), | ||
3334 | 31 | [Base path for log files used as defaults and during tests (default: /tmp)]], | ||
3335 | 32 | [LOGFILE_DIR="$withval"], [LOGFILE_DIR="/tmp"]) | ||
3336 | 33 | AC_DEFINE_DIR(LOGFILE_DIR, LOGFILE_DIR, [Log file path]) | ||
3337 | 34 | AC_SUBST(DUMMY_CONF_PATH, ['${LOGFILE_DIR}']) | ||
3338 | 28 | 35 | ||
3348 | 29 | # Check for Google Test | 36 | # Check if we should include support for evemu |
3340 | 30 | CHECK_GTEST | ||
3341 | 31 | |||
3342 | 32 | AS_IF([test "x$have_gtest" != xyes], | ||
3343 | 33 | AC_MSG_ERROR([package 'gtest' not found])) | ||
3344 | 34 | |||
3345 | 35 | AC_SUBST([GTEST_CPPFLAGS]) | ||
3346 | 36 | |||
3347 | 37 | # Check if we should include support for utouch-evemu | ||
3349 | 38 | AC_ARG_WITH([evemu], | 37 | AC_ARG_WITH([evemu], |
3350 | 39 | [AS_HELP_STRING([--with-evemu], | 38 | [AS_HELP_STRING([--with-evemu], |
3351 | 40 | [support Linux input device recording playback (default: enabled if available)])], | 39 | [support Linux input device recording playback (default: enabled if available)])], |
3352 | 41 | [], | 40 | [], |
3353 | 42 | [with_evemu=check]) | 41 | [with_evemu=check]) |
3354 | 43 | 42 | ||
3359 | 44 | AS_IF([test "x$with_evemu" == xyes], | 43 | PKG_CHECK_MODULES(EVEMU, [evemu >= 1.0.10] , [have_evemu=yes], [have_evemu=no]) |
3360 | 45 | [PKG_CHECK_MODULES(EVEMU, utouch-evemu, [have_evemu=yes])], | 44 | |
3361 | 46 | [test "x$with_evemu" == xcheck], | 45 | AS_IF([test "x$with_evemu" == xyes && test "x$have_evemu" != xyes], |
3362 | 47 | [PKG_CHECK_MODULES(EVEMU, utouch-evemu, [have_evemu=yes], [:])]) | 46 | AC_MSG_ERROR([package 'evemu' not found])) |
3363 | 47 | |||
3364 | 48 | AM_CONDITIONAL([HAVE_EVEMU], [test "x$have_evemu" = "xyes"]) | 48 | AM_CONDITIONAL([HAVE_EVEMU], [test "x$have_evemu" = "xyes"]) |
3365 | 49 | AS_IF([test "x$have_evemu" = xyes], [AC_DEFINE([HAVE_EVEMU])]) | 49 | AS_IF([test "x$have_evemu" = xyes], [AC_DEFINE([HAVE_EVEMU])]) |
3366 | 50 | 50 | ||
3367 | 51 | AC_SUBST(SOURCEDIR, ['${prefix}/src/xorg-gtest']) | 51 | AC_SUBST(SOURCEDIR, ['${prefix}/src/xorg-gtest']) |
3368 | 52 | AC_SUBST(DUMMY_CONF_PATH, ['${datarootdir}/xorg/gtest/dummy.conf']) | 52 | AC_SUBST(DUMMY_CONF_PATH, ['${datarootdir}/xorg/gtest/dummy.conf']) |
3369 | 53 | 53 | ||
3370 | 54 | AC_SUBST(BASE_CPPFLAGS, ['$(X11_CFLAGS) $(EVEMU_CFLAGS)']) | ||
3371 | 55 | |||
3372 | 54 | # Check if we can build integration tests | 56 | # Check if we can build integration tests |
3373 | 55 | AS_IF([test "x$enable_integration_tests" != xno], | 57 | AS_IF([test "x$enable_integration_tests" != xno], |
3374 | 56 | [AC_MSG_CHECKING([for X.org server])] | 58 | [AC_MSG_CHECKING([for X.org server])] |
3375 | @@ -75,11 +77,15 @@ | |||
3376 | 75 | 77 | ||
3377 | 76 | AC_CONFIG_FILES([Makefile | 78 | AC_CONFIG_FILES([Makefile |
3378 | 77 | aclocal/Makefile | 79 | aclocal/Makefile |
3379 | 80 | gtest/Makefile | ||
3380 | 81 | gtest/include/Makefile | ||
3381 | 78 | data/Makefile | 82 | data/Makefile |
3382 | 83 | doc/Doxyfile | ||
3383 | 79 | doc/Makefile | 84 | doc/Makefile |
3384 | 80 | examples/Makefile | 85 | examples/Makefile |
3385 | 81 | include/Makefile | 86 | include/Makefile |
3386 | 82 | src/Makefile | 87 | src/Makefile |
3387 | 88 | test/Makefile | ||
3388 | 83 | xorg-gtest.pc]) | 89 | xorg-gtest.pc]) |
3389 | 84 | 90 | ||
3390 | 85 | AC_OUTPUT | 91 | AC_OUTPUT |
3391 | 86 | 92 | ||
3392 | === modified file 'data/Makefile' | |||
3393 | --- data/Makefile 2012-06-08 12:39:52 +0000 | |||
3394 | +++ data/Makefile 2013-01-21 00:48:20 +0000 | |||
3395 | @@ -1,4 +1,4 @@ | |||
3397 | 1 | # Makefile.in generated by automake 1.11.3 from Makefile.am. | 1 | # Makefile.in generated by automake 1.11.6 from Makefile.am. |
3398 | 2 | # data/Makefile. Generated from Makefile.in by configure. | 2 | # data/Makefile. Generated from Makefile.in by configure. |
3399 | 3 | 3 | ||
3400 | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
3401 | @@ -41,6 +41,23 @@ | |||
3402 | 41 | # | 41 | # |
3403 | 42 | 42 | ||
3404 | 43 | 43 | ||
3405 | 44 | am__make_dryrun = \ | ||
3406 | 45 | { \ | ||
3407 | 46 | am__dry=no; \ | ||
3408 | 47 | case $$MAKEFLAGS in \ | ||
3409 | 48 | *\\[\ \ ]*) \ | ||
3410 | 49 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | ||
3411 | 50 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | ||
3412 | 51 | *) \ | ||
3413 | 52 | for am__flg in $$MAKEFLAGS; do \ | ||
3414 | 53 | case $$am__flg in \ | ||
3415 | 54 | *=*|--*) ;; \ | ||
3416 | 55 | *n*) am__dry=yes; break;; \ | ||
3417 | 56 | esac; \ | ||
3418 | 57 | done;; \ | ||
3419 | 58 | esac; \ | ||
3420 | 59 | test $$am__dry = yes; \ | ||
3421 | 60 | } | ||
3422 | 44 | pkgdatadir = $(datadir)/xorg-gtest | 61 | pkgdatadir = $(datadir)/xorg-gtest |
3423 | 45 | pkgincludedir = $(includedir)/xorg-gtest | 62 | pkgincludedir = $(includedir)/xorg-gtest |
3424 | 46 | pkglibdir = $(libdir)/xorg-gtest | 63 | pkglibdir = $(libdir)/xorg-gtest |
3425 | @@ -62,7 +79,7 @@ | |||
3426 | 62 | subdir = data | 79 | subdir = data |
3427 | 63 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | 80 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
3428 | 64 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 81 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
3430 | 65 | am__aclocal_m4_deps = $(top_srcdir)/m4/gtest.m4 \ | 82 | am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ |
3431 | 66 | $(top_srcdir)/configure.ac | 83 | $(top_srcdir)/configure.ac |
3432 | 67 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 84 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
3433 | 68 | $(ACLOCAL_M4) | 85 | $(ACLOCAL_M4) |
3434 | @@ -77,6 +94,11 @@ | |||
3435 | 77 | am__v_at_0 = @ | 94 | am__v_at_0 = @ |
3436 | 78 | SOURCES = | 95 | SOURCES = |
3437 | 79 | DIST_SOURCES = | 96 | DIST_SOURCES = |
3438 | 97 | am__can_run_installinfo = \ | ||
3439 | 98 | case $$AM_UPDATE_INFO_DIR in \ | ||
3440 | 99 | n|no|NO) false;; \ | ||
3441 | 100 | *) (install-info --version) >/dev/null 2>&1;; \ | ||
3442 | 101 | esac | ||
3443 | 80 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | 102 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
3444 | 81 | am__vpath_adj = case $$p in \ | 103 | am__vpath_adj = case $$p in \ |
3445 | 82 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | 104 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
3446 | @@ -107,17 +129,18 @@ | |||
3447 | 107 | am__installdirs = "$(DESTDIR)$(datadir)" | 129 | am__installdirs = "$(DESTDIR)$(datadir)" |
3448 | 108 | DATA = $(nobase_data_DATA) | 130 | DATA = $(nobase_data_DATA) |
3449 | 109 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | 131 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
3451 | 110 | ACLOCAL = ${SHELL} /home/cndougla/Canonical/upstream/xorg-gtest/missing --run aclocal-1.11 | 132 | ACLOCAL = ${SHELL} /home/stephenw/projects/xorg-gtest/xorg-gtest/missing --run aclocal-1.11 |
3452 | 111 | ADMIN_MAN_DIR = $(mandir)/man$(ADMIN_MAN_SUFFIX) | 133 | ADMIN_MAN_DIR = $(mandir)/man$(ADMIN_MAN_SUFFIX) |
3453 | 112 | ADMIN_MAN_SUFFIX = 8 | 134 | ADMIN_MAN_SUFFIX = 8 |
3454 | 113 | AMTAR = $${TAR-tar} | 135 | AMTAR = $${TAR-tar} |
3455 | 114 | AM_DEFAULT_VERBOSITY = 0 | 136 | AM_DEFAULT_VERBOSITY = 0 |
3456 | 115 | APP_MAN_DIR = $(mandir)/man$(APP_MAN_SUFFIX) | 137 | APP_MAN_DIR = $(mandir)/man$(APP_MAN_SUFFIX) |
3457 | 116 | APP_MAN_SUFFIX = 1 | 138 | APP_MAN_SUFFIX = 1 |
3461 | 117 | AUTOCONF = ${SHELL} /home/cndougla/Canonical/upstream/xorg-gtest/missing --run autoconf | 139 | AUTOCONF = ${SHELL} /home/stephenw/projects/xorg-gtest/xorg-gtest/missing --run autoconf |
3462 | 118 | AUTOHEADER = ${SHELL} /home/cndougla/Canonical/upstream/xorg-gtest/missing --run autoheader | 140 | AUTOHEADER = ${SHELL} /home/stephenw/projects/xorg-gtest/xorg-gtest/missing --run autoheader |
3463 | 119 | AUTOMAKE = ${SHELL} /home/cndougla/Canonical/upstream/xorg-gtest/missing --run automake-1.11 | 141 | AUTOMAKE = ${SHELL} /home/stephenw/projects/xorg-gtest/xorg-gtest/missing --run automake-1.11 |
3464 | 120 | AWK = gawk | 142 | AWK = gawk |
3465 | 143 | BASE_CPPFLAGS = $(X11_CFLAGS) $(EVEMU_CFLAGS) | ||
3466 | 121 | BASE_CXXFLAGS = -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wunused -Wuninitialized -Wshadow -Wcast-qual -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast | 144 | BASE_CXXFLAGS = -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wunused -Wuninitialized -Wshadow -Wcast-qual -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast |
3467 | 122 | CHANGELOG_CMD = (GIT_DIR=$(top_srcdir)/.git git log > $(top_srcdir)/.changelog.tmp && mv $(top_srcdir)/.changelog.tmp $(top_srcdir)/ChangeLog) || (rm -f $(top_srcdir)/.changelog.tmp; touch $(top_srcdir)/ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) | 145 | CHANGELOG_CMD = (GIT_DIR=$(top_srcdir)/.git git log > $(top_srcdir)/.changelog.tmp && mv $(top_srcdir)/.changelog.tmp $(top_srcdir)/ChangeLog) || (rm -f $(top_srcdir)/.changelog.tmp; touch $(top_srcdir)/ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) |
3468 | 123 | CPPFLAGS = | 146 | CPPFLAGS = |
3469 | @@ -127,8 +150,9 @@ | |||
3470 | 127 | CXXDEPMODE = depmode=gcc3 | 150 | CXXDEPMODE = depmode=gcc3 |
3471 | 128 | CXXFLAGS = -g -O2 | 151 | CXXFLAGS = -g -O2 |
3472 | 129 | CYGPATH_W = echo | 152 | CYGPATH_W = echo |
3474 | 130 | DEFS = -DPACKAGE_NAME=\"Dummy\ X.org\ Testing\ Environment\ for\ Google\ Test\" -DPACKAGE_TARNAME=\"xorg-gtest\" -DPACKAGE_VERSION=\"0.3.0\" -DPACKAGE_STRING=\"Dummy\ X.org\ Testing\ Environment\ for\ Google\ Test\ 0.3.0\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"xorg-gtest\" -DVERSION=\"0.3.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DPACKAGE_VERSION_MAJOR=0 -DPACKAGE_VERSION_MINOR=3 -DPACKAGE_VERSION_PATCHLEVEL=0 -DHAVE__USR_SRC_GTEST_SRC_GTEST_ALL_CC=1 -DHAVE__USR_SRC_GTEST_SRC_GTEST_MAIN_CC=1 -DHAVE_EVEMU=1 | 153 | DEFS = -DPACKAGE_NAME=\"X.org\ Testing\ Environment\ for\ Google\ Test\" -DPACKAGE_TARNAME=\"xorg-gtest\" -DPACKAGE_VERSION=\"0.7.0\" -DPACKAGE_STRING=\"X.org\ Testing\ Environment\ for\ Google\ Test\ 0.7.0\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"xorg-gtest\" -DVERSION=\"0.7.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DPACKAGE_VERSION_MAJOR=0 -DPACKAGE_VERSION_MINOR=7 -DPACKAGE_VERSION_PATCHLEVEL=0 -DLOGFILE_DIR=\"/tmp\" -DHAVE_EVEMU=1 |
3475 | 131 | DEPDIR = .deps | 154 | DEPDIR = .deps |
3476 | 155 | DOXYGEN = /usr/bin/doxygen | ||
3477 | 132 | DRIVER_MAN_DIR = $(mandir)/man$(DRIVER_MAN_SUFFIX) | 156 | DRIVER_MAN_DIR = $(mandir)/man$(DRIVER_MAN_SUFFIX) |
3478 | 133 | DRIVER_MAN_SUFFIX = 4 | 157 | DRIVER_MAN_SUFFIX = 4 |
3479 | 134 | DUMMY_CONF_PATH = ${datarootdir}/xorg/gtest/dummy.conf | 158 | DUMMY_CONF_PATH = ${datarootdir}/xorg/gtest/dummy.conf |
3480 | @@ -137,13 +161,11 @@ | |||
3481 | 137 | ECHO_T = | 161 | ECHO_T = |
3482 | 138 | EGREP = /bin/grep -E | 162 | EGREP = /bin/grep -E |
3483 | 139 | EVEMU_CFLAGS = | 163 | EVEMU_CFLAGS = |
3485 | 140 | EVEMU_LIBS = -lutouch-evemu | 164 | EVEMU_LIBS = -levemu |
3486 | 141 | EXEEXT = | 165 | EXEEXT = |
3487 | 142 | FILE_MAN_DIR = $(mandir)/man$(FILE_MAN_SUFFIX) | 166 | FILE_MAN_DIR = $(mandir)/man$(FILE_MAN_SUFFIX) |
3488 | 143 | FILE_MAN_SUFFIX = 5 | 167 | FILE_MAN_SUFFIX = 5 |
3489 | 144 | GREP = /bin/grep | 168 | GREP = /bin/grep |
3490 | 145 | GTEST_CPPFLAGS = -I/usr/src/gtest | ||
3491 | 146 | GTEST_SOURCE = /usr/src/gtest | ||
3492 | 147 | INSTALL = /usr/bin/install -c | 169 | INSTALL = /usr/bin/install -c |
3493 | 148 | INSTALL_CMD = (cp -f /usr/share/util-macros/INSTALL $(top_srcdir)/.INSTALL.tmp && mv $(top_srcdir)/.INSTALL.tmp $(top_srcdir)/INSTALL) || (rm -f $(top_srcdir)/.INSTALL.tmp; touch $(top_srcdir)/INSTALL; echo 'util-macros "pkgdatadir" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2) | 170 | INSTALL_CMD = (cp -f /usr/share/util-macros/INSTALL $(top_srcdir)/.INSTALL.tmp && mv $(top_srcdir)/.INSTALL.tmp $(top_srcdir)/INSTALL) || (rm -f $(top_srcdir)/.INSTALL.tmp; touch $(top_srcdir)/INSTALL; echo 'util-macros "pkgdatadir" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2) |
3494 | 149 | INSTALL_DATA = ${INSTALL} -m 644 | 171 | INSTALL_DATA = ${INSTALL} -m 644 |
3495 | @@ -155,9 +177,10 @@ | |||
3496 | 155 | LIBS = | 177 | LIBS = |
3497 | 156 | LIB_MAN_DIR = $(mandir)/man$(LIB_MAN_SUFFIX) | 178 | LIB_MAN_DIR = $(mandir)/man$(LIB_MAN_SUFFIX) |
3498 | 157 | LIB_MAN_SUFFIX = 3 | 179 | LIB_MAN_SUFFIX = 3 |
3499 | 180 | LOGFILE_DIR = /tmp | ||
3500 | 158 | LTLIBOBJS = | 181 | LTLIBOBJS = |
3501 | 159 | MAINT = | 182 | MAINT = |
3503 | 160 | MAKEINFO = ${SHELL} /home/cndougla/Canonical/upstream/xorg-gtest/missing --run makeinfo | 183 | MAKEINFO = ${SHELL} /home/stephenw/projects/xorg-gtest/xorg-gtest/missing --run makeinfo |
3504 | 161 | MAN_SUBSTS = -e 's|__vendorversion__|"$(PACKAGE_STRING)" "$(XORG_MAN_PAGE)"|' -e 's|__xorgversion__|"$(PACKAGE_STRING)" "$(XORG_MAN_PAGE)"|' -e 's|__xservername__|Xorg|g' -e 's|__xconfigfile__|xorg.conf|g' -e 's|__projectroot__|$(prefix)|g' -e 's|__apploaddir__|$(appdefaultdir)|g' -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' | 184 | MAN_SUBSTS = -e 's|__vendorversion__|"$(PACKAGE_STRING)" "$(XORG_MAN_PAGE)"|' -e 's|__xorgversion__|"$(PACKAGE_STRING)" "$(XORG_MAN_PAGE)"|' -e 's|__xservername__|Xorg|g' -e 's|__xconfigfile__|xorg.conf|g' -e 's|__projectroot__|$(prefix)|g' -e 's|__apploaddir__|$(appdefaultdir)|g' -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' |
3505 | 162 | MISC_MAN_DIR = $(mandir)/man$(MISC_MAN_SUFFIX) | 185 | MISC_MAN_DIR = $(mandir)/man$(MISC_MAN_SUFFIX) |
3506 | 163 | MISC_MAN_SUFFIX = 7 | 186 | MISC_MAN_SUFFIX = 7 |
3507 | @@ -165,11 +188,11 @@ | |||
3508 | 165 | OBJEXT = o | 188 | OBJEXT = o |
3509 | 166 | PACKAGE = xorg-gtest | 189 | PACKAGE = xorg-gtest |
3510 | 167 | PACKAGE_BUGREPORT = | 190 | PACKAGE_BUGREPORT = |
3513 | 168 | PACKAGE_NAME = Dummy X.org Testing Environment for Google Test | 191 | PACKAGE_NAME = X.org Testing Environment for Google Test |
3514 | 169 | PACKAGE_STRING = Dummy X.org Testing Environment for Google Test 0.3.0 | 192 | PACKAGE_STRING = X.org Testing Environment for Google Test 0.7.0 |
3515 | 170 | PACKAGE_TARNAME = xorg-gtest | 193 | PACKAGE_TARNAME = xorg-gtest |
3516 | 171 | PACKAGE_URL = | 194 | PACKAGE_URL = |
3518 | 172 | PACKAGE_VERSION = 0.3.0 | 195 | PACKAGE_VERSION = 0.7.0 |
3519 | 173 | PATH_SEPARATOR = : | 196 | PATH_SEPARATOR = : |
3520 | 174 | PKG_CONFIG = /usr/bin/pkg-config | 197 | PKG_CONFIG = /usr/bin/pkg-config |
3521 | 175 | PKG_CONFIG_LIBDIR = | 198 | PKG_CONFIG_LIBDIR = |
3522 | @@ -181,15 +204,15 @@ | |||
3523 | 181 | SOURCEDIR = ${prefix}/src/xorg-gtest | 204 | SOURCEDIR = ${prefix}/src/xorg-gtest |
3524 | 182 | STRICT_CXXFLAGS = -pedantic -Werror -Werror=attributes | 205 | STRICT_CXXFLAGS = -pedantic -Werror -Werror=attributes |
3525 | 183 | STRIP = | 206 | STRIP = |
3527 | 184 | VERSION = 0.3.0 | 207 | VERSION = 0.7.0 |
3528 | 208 | X11_CFLAGS = | ||
3529 | 209 | X11_LIBS = -lX11 -lXi | ||
3530 | 185 | XORG_MALLOC_DEBUG_ENV = MALLOC_PERTURB_=15 | 210 | XORG_MALLOC_DEBUG_ENV = MALLOC_PERTURB_=15 |
3531 | 186 | XORG_MAN_PAGE = X Version 11 | 211 | XORG_MAN_PAGE = X Version 11 |
3538 | 187 | XSERVER_CFLAGS = | 212 | abs_builddir = /home/stephenw/projects/xorg-gtest/xorg-gtest/data |
3539 | 188 | XSERVER_LIBS = -lX11 | 213 | abs_srcdir = /home/stephenw/projects/xorg-gtest/xorg-gtest/data |
3540 | 189 | abs_builddir = /home/cndougla/Canonical/upstream/xorg-gtest/data | 214 | abs_top_builddir = /home/stephenw/projects/xorg-gtest/xorg-gtest |
3541 | 190 | abs_srcdir = /home/cndougla/Canonical/upstream/xorg-gtest/data | 215 | abs_top_srcdir = /home/stephenw/projects/xorg-gtest/xorg-gtest |
3536 | 191 | abs_top_builddir = /home/cndougla/Canonical/upstream/xorg-gtest | ||
3537 | 192 | abs_top_srcdir = /home/cndougla/Canonical/upstream/xorg-gtest | ||
3542 | 193 | ac_ct_CXX = g++ | 216 | ac_ct_CXX = g++ |
3543 | 194 | am__include = include | 217 | am__include = include |
3544 | 195 | am__leading_dot = . | 218 | am__leading_dot = . |
3545 | @@ -216,7 +239,7 @@ | |||
3546 | 216 | htmldir = ${docdir} | 239 | htmldir = ${docdir} |
3547 | 217 | includedir = ${prefix}/include | 240 | includedir = ${prefix}/include |
3548 | 218 | infodir = ${datarootdir}/info | 241 | infodir = ${datarootdir}/info |
3550 | 219 | install_sh = ${SHELL} /home/cndougla/Canonical/upstream/xorg-gtest/install-sh | 242 | install_sh = ${SHELL} /home/stephenw/projects/xorg-gtest/xorg-gtest/install-sh |
3551 | 220 | libdir = ${exec_prefix}/lib | 243 | libdir = ${exec_prefix}/lib |
3552 | 221 | libexecdir = ${exec_prefix}/libexec | 244 | libexecdir = ${exec_prefix}/libexec |
3553 | 222 | localedir = ${datarootdir}/locale | 245 | localedir = ${datarootdir}/locale |
3554 | @@ -225,7 +248,7 @@ | |||
3555 | 225 | mkdir_p = /bin/mkdir -p | 248 | mkdir_p = /bin/mkdir -p |
3556 | 226 | oldincludedir = /usr/include | 249 | oldincludedir = /usr/include |
3557 | 227 | pdfdir = ${docdir} | 250 | pdfdir = ${docdir} |
3559 | 228 | prefix = /usr | 251 | prefix = /usr/local |
3560 | 229 | program_transform_name = s,x,x, | 252 | program_transform_name = s,x,x, |
3561 | 230 | psdir = ${docdir} | 253 | psdir = ${docdir} |
3562 | 231 | sbindir = ${exec_prefix}/sbin | 254 | sbindir = ${exec_prefix}/sbin |
3563 | @@ -275,15 +298,18 @@ | |||
3564 | 275 | $(am__aclocal_m4_deps): | 298 | $(am__aclocal_m4_deps): |
3565 | 276 | install-nobase_dataDATA: $(nobase_data_DATA) | 299 | install-nobase_dataDATA: $(nobase_data_DATA) |
3566 | 277 | @$(NORMAL_INSTALL) | 300 | @$(NORMAL_INSTALL) |
3567 | 278 | test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)" | ||
3568 | 279 | @list='$(nobase_data_DATA)'; test -n "$(datadir)" || list=; \ | 301 | @list='$(nobase_data_DATA)'; test -n "$(datadir)" || list=; \ |
3569 | 302 | if test -n "$$list"; then \ | ||
3570 | 303 | echo " $(MKDIR_P) '$(DESTDIR)$(datadir)'"; \ | ||
3571 | 304 | $(MKDIR_P) "$(DESTDIR)$(datadir)" || exit 1; \ | ||
3572 | 305 | fi; \ | ||
3573 | 280 | $(am__nobase_list) | while read dir files; do \ | 306 | $(am__nobase_list) | while read dir files; do \ |
3574 | 281 | xfiles=; for file in $$files; do \ | 307 | xfiles=; for file in $$files; do \ |
3575 | 282 | if test -f "$$file"; then xfiles="$$xfiles $$file"; \ | 308 | if test -f "$$file"; then xfiles="$$xfiles $$file"; \ |
3576 | 283 | else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ | 309 | else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ |
3577 | 284 | test -z "$$xfiles" || { \ | 310 | test -z "$$xfiles" || { \ |
3578 | 285 | test "x$$dir" = x. || { \ | 311 | test "x$$dir" = x. || { \ |
3580 | 286 | echo "$(MKDIR_P) '$(DESTDIR)$(datadir)/$$dir'"; \ | 312 | echo " $(MKDIR_P) '$(DESTDIR)$(datadir)/$$dir'"; \ |
3581 | 287 | $(MKDIR_P) "$(DESTDIR)$(datadir)/$$dir"; }; \ | 313 | $(MKDIR_P) "$(DESTDIR)$(datadir)/$$dir"; }; \ |
3582 | 288 | echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(datadir)/$$dir'"; \ | 314 | echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(datadir)/$$dir'"; \ |
3583 | 289 | $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(datadir)/$$dir" || exit $$?; }; \ | 315 | $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(datadir)/$$dir" || exit $$?; }; \ |
3584 | 290 | 316 | ||
3585 | === modified file 'data/Makefile.in' | |||
3586 | --- data/Makefile.in 2012-06-08 12:39:52 +0000 | |||
3587 | +++ data/Makefile.in 2013-01-21 00:48:20 +0000 | |||
3588 | @@ -1,4 +1,4 @@ | |||
3590 | 1 | # Makefile.in generated by automake 1.11.3 from Makefile.am. | 1 | # Makefile.in generated by automake 1.11.6 from Makefile.am. |
3591 | 2 | # @configure_input@ | 2 | # @configure_input@ |
3592 | 3 | 3 | ||
3593 | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | 4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
3594 | @@ -41,6 +41,23 @@ | |||
3595 | 41 | # | 41 | # |
3596 | 42 | 42 | ||
3597 | 43 | VPATH = @srcdir@ | 43 | VPATH = @srcdir@ |
3598 | 44 | am__make_dryrun = \ | ||
3599 | 45 | { \ | ||
3600 | 46 | am__dry=no; \ | ||
3601 | 47 | case $$MAKEFLAGS in \ | ||
3602 | 48 | *\\[\ \ ]*) \ | ||
3603 | 49 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | ||
3604 | 50 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | ||
3605 | 51 | *) \ | ||
3606 | 52 | for am__flg in $$MAKEFLAGS; do \ | ||
3607 | 53 | case $$am__flg in \ | ||
3608 | 54 | *=*|--*) ;; \ | ||
3609 | 55 | *n*) am__dry=yes; break;; \ | ||
3610 | 56 | esac; \ | ||
3611 | 57 | done;; \ | ||
3612 | 58 | esac; \ | ||
3613 | 59 | test $$am__dry = yes; \ | ||
3614 | 60 | } | ||
3615 | 44 | pkgdatadir = $(datadir)/@PACKAGE@ | 61 | pkgdatadir = $(datadir)/@PACKAGE@ |
3616 | 45 | pkgincludedir = $(includedir)/@PACKAGE@ | 62 | pkgincludedir = $(includedir)/@PACKAGE@ |
3617 | 46 | pkglibdir = $(libdir)/@PACKAGE@ | 63 | pkglibdir = $(libdir)/@PACKAGE@ |
3618 | @@ -62,7 +79,7 @@ | |||
3619 | 62 | subdir = data | 79 | subdir = data |
3620 | 63 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | 80 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
3621 | 64 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 81 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
3623 | 65 | am__aclocal_m4_deps = $(top_srcdir)/m4/gtest.m4 \ | 82 | am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ |
3624 | 66 | $(top_srcdir)/configure.ac | 83 | $(top_srcdir)/configure.ac |
3625 | 67 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 84 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
3626 | 68 | $(ACLOCAL_M4) | 85 | $(ACLOCAL_M4) |
3627 | @@ -77,6 +94,11 @@ | |||
3628 | 77 | am__v_at_0 = @ | 94 | am__v_at_0 = @ |
3629 | 78 | SOURCES = | 95 | SOURCES = |
3630 | 79 | DIST_SOURCES = | 96 | DIST_SOURCES = |
3631 | 97 | am__can_run_installinfo = \ | ||
3632 | 98 | case $$AM_UPDATE_INFO_DIR in \ | ||
3633 | 99 | n|no|NO) false;; \ | ||
3634 | 100 | *) (install-info --version) >/dev/null 2>&1;; \ | ||
3635 | 101 | esac | ||
3636 | 80 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | 102 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
3637 | 81 | am__vpath_adj = case $$p in \ | 103 | am__vpath_adj = case $$p in \ |
3638 | 82 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | 104 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
3639 | @@ -118,6 +140,7 @@ | |||
3640 | 118 | AUTOHEADER = @AUTOHEADER@ | 140 | AUTOHEADER = @AUTOHEADER@ |
3641 | 119 | AUTOMAKE = @AUTOMAKE@ | 141 | AUTOMAKE = @AUTOMAKE@ |
3642 | 120 | AWK = @AWK@ | 142 | AWK = @AWK@ |
3643 | 143 | BASE_CPPFLAGS = @BASE_CPPFLAGS@ | ||
3644 | 121 | BASE_CXXFLAGS = @BASE_CXXFLAGS@ | 144 | BASE_CXXFLAGS = @BASE_CXXFLAGS@ |
3645 | 122 | CHANGELOG_CMD = @CHANGELOG_CMD@ | 145 | CHANGELOG_CMD = @CHANGELOG_CMD@ |
3646 | 123 | CPPFLAGS = @CPPFLAGS@ | 146 | CPPFLAGS = @CPPFLAGS@ |
3647 | @@ -129,6 +152,7 @@ | |||
3648 | 129 | CYGPATH_W = @CYGPATH_W@ | 152 | CYGPATH_W = @CYGPATH_W@ |
3649 | 130 | DEFS = @DEFS@ | 153 | DEFS = @DEFS@ |
3650 | 131 | DEPDIR = @DEPDIR@ | 154 | DEPDIR = @DEPDIR@ |
3651 | 155 | DOXYGEN = @DOXYGEN@ | ||
3652 | 132 | DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ | 156 | DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ |
3653 | 133 | DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ | 157 | DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ |
3654 | 134 | DUMMY_CONF_PATH = @DUMMY_CONF_PATH@ | 158 | DUMMY_CONF_PATH = @DUMMY_CONF_PATH@ |
3655 | @@ -142,8 +166,6 @@ | |||
3656 | 142 | FILE_MAN_DIR = @FILE_MAN_DIR@ | 166 | FILE_MAN_DIR = @FILE_MAN_DIR@ |
3657 | 143 | FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ | 167 | FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ |
3658 | 144 | GREP = @GREP@ | 168 | GREP = @GREP@ |
3659 | 145 | GTEST_CPPFLAGS = @GTEST_CPPFLAGS@ | ||
3660 | 146 | GTEST_SOURCE = @GTEST_SOURCE@ | ||
3661 | 147 | INSTALL = @INSTALL@ | 169 | INSTALL = @INSTALL@ |
3662 | 148 | INSTALL_CMD = @INSTALL_CMD@ | 170 | INSTALL_CMD = @INSTALL_CMD@ |
3663 | 149 | INSTALL_DATA = @INSTALL_DATA@ | 171 | INSTALL_DATA = @INSTALL_DATA@ |
3664 | @@ -155,6 +177,7 @@ | |||
3665 | 155 | LIBS = @LIBS@ | 177 | LIBS = @LIBS@ |
3666 | 156 | LIB_MAN_DIR = @LIB_MAN_DIR@ | 178 | LIB_MAN_DIR = @LIB_MAN_DIR@ |
3667 | 157 | LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ | 179 | LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ |
3668 | 180 | LOGFILE_DIR = @LOGFILE_DIR@ | ||
3669 | 158 | LTLIBOBJS = @LTLIBOBJS@ | 181 | LTLIBOBJS = @LTLIBOBJS@ |
3670 | 159 | MAINT = @MAINT@ | 182 | MAINT = @MAINT@ |
3671 | 160 | MAKEINFO = @MAKEINFO@ | 183 | MAKEINFO = @MAKEINFO@ |
3672 | @@ -182,10 +205,10 @@ | |||
3673 | 182 | STRICT_CXXFLAGS = @STRICT_CXXFLAGS@ | 205 | STRICT_CXXFLAGS = @STRICT_CXXFLAGS@ |
3674 | 183 | STRIP = @STRIP@ | 206 | STRIP = @STRIP@ |
3675 | 184 | VERSION = @VERSION@ | 207 | VERSION = @VERSION@ |
3676 | 208 | X11_CFLAGS = @X11_CFLAGS@ | ||
3677 | 209 | X11_LIBS = @X11_LIBS@ | ||
3678 | 185 | XORG_MALLOC_DEBUG_ENV = @XORG_MALLOC_DEBUG_ENV@ | 210 | XORG_MALLOC_DEBUG_ENV = @XORG_MALLOC_DEBUG_ENV@ |
3679 | 186 | XORG_MAN_PAGE = @XORG_MAN_PAGE@ | 211 | XORG_MAN_PAGE = @XORG_MAN_PAGE@ |
3680 | 187 | XSERVER_CFLAGS = @XSERVER_CFLAGS@ | ||
3681 | 188 | XSERVER_LIBS = @XSERVER_LIBS@ | ||
3682 | 189 | abs_builddir = @abs_builddir@ | 212 | abs_builddir = @abs_builddir@ |
3683 | 190 | abs_srcdir = @abs_srcdir@ | 213 | abs_srcdir = @abs_srcdir@ |
3684 | 191 | abs_top_builddir = @abs_top_builddir@ | 214 | abs_top_builddir = @abs_top_builddir@ |
3685 | @@ -275,15 +298,18 @@ | |||
3686 | 275 | $(am__aclocal_m4_deps): | 298 | $(am__aclocal_m4_deps): |
3687 | 276 | install-nobase_dataDATA: $(nobase_data_DATA) | 299 | install-nobase_dataDATA: $(nobase_data_DATA) |
3688 | 277 | @$(NORMAL_INSTALL) | 300 | @$(NORMAL_INSTALL) |
3689 | 278 | test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)" | ||
3690 | 279 | @list='$(nobase_data_DATA)'; test -n "$(datadir)" || list=; \ | 301 | @list='$(nobase_data_DATA)'; test -n "$(datadir)" || list=; \ |
3691 | 302 | if test -n "$$list"; then \ | ||
3692 | 303 | echo " $(MKDIR_P) '$(DESTDIR)$(datadir)'"; \ | ||
3693 | 304 | $(MKDIR_P) "$(DESTDIR)$(datadir)" || exit 1; \ | ||
3694 | 305 | fi; \ | ||
3695 | 280 | $(am__nobase_list) | while read dir files; do \ | 306 | $(am__nobase_list) | while read dir files; do \ |
3696 | 281 | xfiles=; for file in $$files; do \ | 307 | xfiles=; for file in $$files; do \ |
3697 | 282 | if test -f "$$file"; then xfiles="$$xfiles $$file"; \ | 308 | if test -f "$$file"; then xfiles="$$xfiles $$file"; \ |
3698 | 283 | else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ | 309 | else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ |
3699 | 284 | test -z "$$xfiles" || { \ | 310 | test -z "$$xfiles" || { \ |
3700 | 285 | test "x$$dir" = x. || { \ | 311 | test "x$$dir" = x. || { \ |
3702 | 286 | echo "$(MKDIR_P) '$(DESTDIR)$(datadir)/$$dir'"; \ | 312 | echo " $(MKDIR_P) '$(DESTDIR)$(datadir)/$$dir'"; \ |
3703 | 287 | $(MKDIR_P) "$(DESTDIR)$(datadir)/$$dir"; }; \ | 313 | $(MKDIR_P) "$(DESTDIR)$(datadir)/$$dir"; }; \ |
3704 | 288 | echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(datadir)/$$dir'"; \ | 314 | echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(datadir)/$$dir'"; \ |
3705 | 289 | $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(datadir)/$$dir" || exit $$?; }; \ | 315 | $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(datadir)/$$dir" || exit $$?; }; \ |
3706 | 290 | 316 | ||
3707 | === modified file 'debian/changelog' | |||
3708 | --- debian/changelog 2012-08-22 11:18:40 +0000 | |||
3709 | +++ debian/changelog 2013-01-21 00:48:20 +0000 | |||
3710 | @@ -1,3 +1,14 @@ | |||
3711 | 1 | xorg-gtest (0.7.0-0ubuntu1) UNRELEASED; urgency=low | ||
3712 | 2 | |||
3713 | 3 | * New upstream release (lp: #1100382). | ||
3714 | 4 | * debian/control: added valgrind as a build dependency (for tests). | ||
3715 | 5 | * debian/source/format: changed to 3.0 (quilt) | ||
3716 | 6 | * fixed 'make check' target so it does not fail in Ubuntu | ||
3717 | 7 | * debian/control (Standards-Version): updated to 3.9.4 (no changes required) | ||
3718 | 8 | * debian/copyright: updated | ||
3719 | 9 | |||
3720 | 10 | -- Stephen M. Webb <stephen.webb@ubuntu.com> Fri, 18 Jan 2013 16:11:32 -0500 | ||
3721 | 11 | |||
3722 | 1 | xorg-gtest (0.3.0-0ubuntu2) quantal; urgency=low | 12 | xorg-gtest (0.3.0-0ubuntu2) quantal; urgency=low |
3723 | 2 | 13 | ||
3724 | 3 | * debian/control: Depends on xserver-xorg-video-dummy, it seems required | 14 | * debian/control: Depends on xserver-xorg-video-dummy, it seems required |
3725 | 4 | 15 | ||
3726 | === modified file 'debian/control' | |||
3727 | --- debian/control 2012-08-22 11:18:40 +0000 | |||
3728 | +++ debian/control 2013-01-21 00:48:20 +0000 | |||
3729 | @@ -9,13 +9,14 @@ | |||
3730 | 9 | libgtest-dev, | 9 | libgtest-dev, |
3731 | 10 | libtool, | 10 | libtool, |
3732 | 11 | libx11-dev, | 11 | libx11-dev, |
3733 | 12 | libxi-dev, | ||
3734 | 12 | pkg-config, | 13 | pkg-config, |
3736 | 13 | quilt, | 14 | valgrind, |
3737 | 14 | xserver-xorg-core, | 15 | xserver-xorg-core, |
3738 | 15 | xserver-xorg-dev, | 16 | xserver-xorg-dev, |
3739 | 16 | xserver-xorg-video-dummy, | 17 | xserver-xorg-video-dummy, |
3740 | 17 | xutils-dev (>= 1:7.7~1) | 18 | xutils-dev (>= 1:7.7~1) |
3742 | 18 | Standards-Version: 3.9.3 | 19 | Standards-Version: 3.9.4 |
3743 | 19 | Section: libs | 20 | Section: libs |
3744 | 20 | Vcs-Git: git://anongit.freedesktop.org/~cndougla/xorg-gtest | 21 | Vcs-Git: git://anongit.freedesktop.org/~cndougla/xorg-gtest |
3745 | 21 | Vcs-Browser: http://cgit.freedesktop.org/~cndougla/xorg-gtest | 22 | Vcs-Browser: http://cgit.freedesktop.org/~cndougla/xorg-gtest |
3746 | @@ -25,8 +26,8 @@ | |||
3747 | 25 | Architecture: all | 26 | Architecture: all |
3748 | 26 | Depends: libgtest-dev, | 27 | Depends: libgtest-dev, |
3749 | 27 | libxorg-gtest-data (= ${source:Version}), | 28 | libxorg-gtest-data (= ${source:Version}), |
3750 | 29 | xserver-xorg-video-dummy, | ||
3751 | 28 | xutils-dev (>= 1:7.7~1), | 30 | xutils-dev (>= 1:7.7~1), |
3752 | 29 | xserver-xorg-video-dummy, | ||
3753 | 30 | ${misc:Depends} | 31 | ${misc:Depends} |
3754 | 31 | Description: X.Org dummy testing environment for Google Test - headers | 32 | Description: X.Org dummy testing environment for Google Test - headers |
3755 | 32 | Provides a Google Test environment for starting and stopping | 33 | Provides a Google Test environment for starting and stopping |
3756 | 33 | 34 | ||
3757 | === modified file 'debian/copyright' | |||
3758 | --- debian/copyright 2012-02-24 09:44:47 +0000 | |||
3759 | +++ debian/copyright 2013-01-21 00:48:20 +0000 | |||
3760 | @@ -1,9 +1,10 @@ | |||
3762 | 1 | Format: http://dep.debian.net/deps/dep5 | 1 | Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 |
3763 | 2 | Upstream-Name: xorg-gtest | 2 | Upstream-Name: xorg-gtest |
3764 | 3 | Source: http://cgit.freedesktop.org/xorg/test/xorg-gtest | 3 | Source: http://cgit.freedesktop.org/xorg/test/xorg-gtest |
3765 | 4 | 4 | ||
3766 | 5 | Files: * | 5 | Files: * |
3767 | 6 | Copyright: 2011-2012 Canonical Ltd. | 6 | Copyright: 2011-2012 Canonical Ltd. |
3768 | 7 | 2012 Red Hat, Inc. | ||
3769 | 7 | License: GPL-3+ | 8 | License: GPL-3+ |
3770 | 8 | This program is free software: you can redistribute it and/or modify | 9 | This program is free software: you can redistribute it and/or modify |
3771 | 9 | it under the terms of the GNU General Public License as published by | 10 | it under the terms of the GNU General Public License as published by |
3772 | @@ -18,3 +19,33 @@ | |||
3773 | 18 | On Debian systems, the full text of the GNU General Public | 19 | On Debian systems, the full text of the GNU General Public |
3774 | 19 | License version 3 can be found in the file | 20 | License version 3 can be found in the file |
3775 | 20 | `/usr/share/common-licenses/GPL-3'. | 21 | `/usr/share/common-licenses/GPL-3'. |
3776 | 22 | |||
3777 | 23 | Files: gtest/* | ||
3778 | 24 | Copyright: 2005-2008 Google Inc | ||
3779 | 25 | License: BSD-3-clause | ||
3780 | 26 | Redistribution and use in source and binary forms, with or without | ||
3781 | 27 | modification, are permitted provided that the following conditions are | ||
3782 | 28 | met: | ||
3783 | 29 | . | ||
3784 | 30 | * Redistributions of source code must retain the above copyright | ||
3785 | 31 | notice, this list of conditions and the following disclaimer. | ||
3786 | 32 | * Redistributions in binary form must reproduce the above | ||
3787 | 33 | copyright notice, this list of conditions and the following disclaimer | ||
3788 | 34 | in the documentation and/or other materials provided with the | ||
3789 | 35 | distribution. | ||
3790 | 36 | * Neither the name of Google Inc. nor the names of its | ||
3791 | 37 | contributors may be used to endorse or promote products derived from | ||
3792 | 38 | this software without specific prior written permission. | ||
3793 | 39 | . | ||
3794 | 40 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
3795 | 41 | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
3796 | 42 | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
3797 | 43 | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
3798 | 44 | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
3799 | 45 | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
3800 | 46 | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
3801 | 47 | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
3802 | 48 | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
3803 | 49 | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
3804 | 50 | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
3805 | 51 | |||
3806 | 21 | 52 | ||
3807 | === modified file 'debian/libxorg-gtest-data.install' | |||
3808 | --- debian/libxorg-gtest-data.install 2012-06-08 12:39:52 +0000 | |||
3809 | +++ debian/libxorg-gtest-data.install 2013-01-21 00:48:20 +0000 | |||
3810 | @@ -1,2 +1,2 @@ | |||
3811 | 1 | usr/share/X11/xorg.conf.d/99-virtual-test-devices.conf | ||
3812 | 1 | usr/share/xorg/gtest | 2 | usr/share/xorg/gtest |
3813 | 2 | usr/share/X11/xorg.conf.d/99-virtual-test-devices.conf | ||
3814 | 3 | 3 | ||
3815 | === modified file 'debian/libxorg-gtest-doc.install' | |||
3816 | --- debian/libxorg-gtest-doc.install 2012-02-15 09:18:17 +0000 | |||
3817 | +++ debian/libxorg-gtest-doc.install 2013-01-21 00:48:20 +0000 | |||
3818 | @@ -1,2 +1,1 @@ | |||
3819 | 1 | usr/share/doc | 1 | usr/share/doc |
3820 | 2 | usr/share/man | ||
3821 | 3 | 2 | ||
3822 | === added file 'debian/patches/0001-fix-example-failures.patch' | |||
3823 | --- debian/patches/0001-fix-example-failures.patch 1970-01-01 00:00:00 +0000 | |||
3824 | +++ debian/patches/0001-fix-example-failures.patch 2013-01-21 00:48:20 +0000 | |||
3825 | @@ -0,0 +1,42 @@ | |||
3826 | 1 | Description: Fix 'make check' failures on some hardware due to timing issues. | ||
3827 | 2 | Author: Stephen M. Webb <stephen.webb@canonical.com> | ||
3828 | 3 | --- a/examples/Makefile.am | ||
3829 | 4 | +++ b/examples/Makefile.am | ||
3830 | 5 | @@ -59,7 +59,10 @@ | ||
3831 | 6 | TESTS = $(noinst_PROGRAMS) | ||
3832 | 7 | endif | ||
3833 | 8 | xorg_gtest_example_SOURCES = xorg-gtest-example.cpp | ||
3834 | 9 | -xorg_gtest_example_CPPFLAGS = -I$(top_srcdir)/include $(AM_CPPFLAGS) | ||
3835 | 10 | +xorg_gtest_example_CPPFLAGS = \ | ||
3836 | 11 | + -I$(top_srcdir)/include \ | ||
3837 | 12 | + $(AM_CPPFLAGS) \ | ||
3838 | 13 | + -DDUMMY_CONF_PATH="\"$(abs_top_srcdir)/data/xorg/gtest/dummy.conf\"" | ||
3839 | 14 | xorg_gtest_example_LDADD = \ | ||
3840 | 15 | libgtest.a \ | ||
3841 | 16 | libxorg-gtest.a \ | ||
3842 | 17 | --- a/examples/xorg-gtest-example.cpp | ||
3843 | 18 | +++ b/examples/xorg-gtest-example.cpp | ||
3844 | 19 | @@ -24,6 +24,7 @@ | ||
3845 | 20 | TEST(XServer, StartServer) { | ||
3846 | 21 | XServer server; | ||
3847 | 22 | server.SetOption("-logfile", LOGFILE_DIR "/xserver-startserver.log"); | ||
3848 | 23 | + server.SetOption("-config", DUMMY_CONF_PATH); | ||
3849 | 24 | server.Start(); | ||
3850 | 25 | |||
3851 | 26 | ASSERT_EQ(server.GetState(), Process::RUNNING); | ||
3852 | 27 | @@ -40,6 +41,7 @@ | ||
3853 | 28 | TEST(XServer, DisplayConnection) { | ||
3854 | 29 | XServer server; | ||
3855 | 30 | server.SetOption("-logfile", LOGFILE_DIR "/xserver-display-connection.log"); | ||
3856 | 31 | + server.SetOption("-config", DUMMY_CONF_PATH); | ||
3857 | 32 | server.Start(); | ||
3858 | 33 | |||
3859 | 34 | Display *dpy = XOpenDisplay(server.GetDisplayString().c_str()); | ||
3860 | 35 | @@ -69,6 +71,7 @@ | ||
3861 | 36 | log << ".log"; | ||
3862 | 37 | |||
3863 | 38 | server.SetOption("-logfile", log.str()); | ||
3864 | 39 | + server.SetOption("-config", DUMMY_CONF_PATH); | ||
3865 | 40 | server.Start(); | ||
3866 | 41 | |||
3867 | 42 | /* set up Display() */ | ||
3868 | 0 | 43 | ||
3869 | === added file 'debian/patches/0002-fix-valgrind-test-failure.patch' | |||
3870 | --- debian/patches/0002-fix-valgrind-test-failure.patch 1970-01-01 00:00:00 +0000 | |||
3871 | +++ debian/patches/0002-fix-valgrind-test-failure.patch 2013-01-21 00:48:20 +0000 | |||
3872 | @@ -0,0 +1,20 @@ | |||
3873 | 1 | Description: Accommodate the situation in which valgrind is a wrapper script. | ||
3874 | 2 | Author: Stephen M. Webb <stephen.webb@canonical.com> | ||
3875 | 3 | --- a/test/process-test.cpp | ||
3876 | 4 | +++ b/test/process-test.cpp | ||
3877 | 5 | @@ -355,6 +355,15 @@ | ||
3878 | 6 | } while(strstr(buff, program_invocation_short_name)); | ||
3879 | 7 | |||
3880 | 8 | const char * arg = buff + strlen(buff) + 1; | ||
3881 | 9 | + | ||
3882 | 10 | + /* accommodate the case that valgrind has a shell script wrapper */ | ||
3883 | 11 | + if (0 == strcmp(buff, "/bin/sh")) { | ||
3884 | 12 | + if (0 == strcmp(arg, "-e")) { | ||
3885 | 13 | + arg += strlen(arg) + 1; | ||
3886 | 14 | + } | ||
3887 | 15 | + arg += strlen(arg) + 1; | ||
3888 | 16 | + } | ||
3889 | 17 | + | ||
3890 | 18 | std::vector<std::string>::const_iterator it = valgrind_args.begin(); | ||
3891 | 19 | |||
3892 | 20 | it++; /* first one is "valgrind" */ | ||
3893 | 0 | 21 | ||
3894 | === modified file 'debian/patches/series' | |||
3895 | --- debian/patches/series 2012-02-24 09:44:47 +0000 | |||
3896 | +++ debian/patches/series 2013-01-21 00:48:20 +0000 | |||
3897 | @@ -1,1 +1,3 @@ | |||
3898 | 1 | # No patches | 1 | # No patches |
3899 | 2 | 0001-fix-example-failures.patch | ||
3900 | 3 | 0002-fix-valgrind-test-failure.patch | ||
3901 | 2 | 4 | ||
3902 | === modified file 'debian/rules' | |||
3903 | --- debian/rules 2012-03-19 18:39:04 +0000 | |||
3904 | +++ debian/rules 2013-01-21 00:48:20 +0000 | |||
3905 | @@ -4,7 +4,7 @@ | |||
3906 | 4 | #export DH_VERBOSE=1 | 4 | #export DH_VERBOSE=1 |
3907 | 5 | 5 | ||
3908 | 6 | %: | 6 | %: |
3910 | 7 | dh $@ --parallel --with quilt,autoreconf | 7 | dh $@ --parallel --with autoreconf |
3911 | 8 | 8 | ||
3912 | 9 | # Install xorg-gtest.pc file in architecture independent directory | 9 | # Install xorg-gtest.pc file in architecture independent directory |
3913 | 10 | override_dh_auto_configure: | 10 | override_dh_auto_configure: |
3914 | @@ -14,4 +14,4 @@ | |||
3915 | 14 | dh_auto_build -- all doc | 14 | dh_auto_build -- all doc |
3916 | 15 | 15 | ||
3917 | 16 | override_dh_install: | 16 | override_dh_install: |
3919 | 17 | dh_install --fail-missing | 17 | dh_install --fail-missing -Xjquery.js |
3920 | 18 | 18 | ||
3921 | === modified file 'debian/source/format' | |||
3922 | --- debian/source/format 2012-02-15 09:18:17 +0000 | |||
3923 | +++ debian/source/format 2013-01-21 00:48:20 +0000 | |||
3924 | @@ -1,1 +1,1 @@ | |||
3926 | 1 | 1.0 | 1 | 3.0 (quilt) |
3927 | 2 | 2 | ||
3928 | === modified file 'depcomp' | |||
3929 | --- depcomp 2012-02-15 09:18:17 +0000 | |||
3930 | +++ depcomp 2013-01-21 00:48:20 +0000 | |||
3931 | @@ -1,10 +1,10 @@ | |||
3932 | 1 | #! /bin/sh | 1 | #! /bin/sh |
3933 | 2 | # depcomp - compile a program generating dependencies as side-effects | 2 | # depcomp - compile a program generating dependencies as side-effects |
3934 | 3 | 3 | ||
3936 | 4 | scriptversion=2011-12-04.11; # UTC | 4 | scriptversion=2012-03-27.16; # UTC |
3937 | 5 | 5 | ||
3938 | 6 | # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, | 6 | # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, |
3940 | 7 | # 2011 Free Software Foundation, Inc. | 7 | # 2011, 2012 Free Software Foundation, Inc. |
3941 | 8 | 8 | ||
3942 | 9 | # This program is free software; you can redistribute it and/or modify | 9 | # This program is free software; you can redistribute it and/or modify |
3943 | 10 | # it under the terms of the GNU General Public License as published by | 10 | # it under the terms of the GNU General Public License as published by |
3944 | @@ -28,7 +28,7 @@ | |||
3945 | 28 | 28 | ||
3946 | 29 | case $1 in | 29 | case $1 in |
3947 | 30 | '') | 30 | '') |
3949 | 31 | echo "$0: No command. Try \`$0 --help' for more information." 1>&2 | 31 | echo "$0: No command. Try '$0 --help' for more information." 1>&2 |
3950 | 32 | exit 1; | 32 | exit 1; |
3951 | 33 | ;; | 33 | ;; |
3952 | 34 | -h | --h*) | 34 | -h | --h*) |
3953 | @@ -40,8 +40,8 @@ | |||
3954 | 40 | 40 | ||
3955 | 41 | Environment variables: | 41 | Environment variables: |
3956 | 42 | depmode Dependency tracking mode. | 42 | depmode Dependency tracking mode. |
3959 | 43 | source Source file read by `PROGRAMS ARGS'. | 43 | source Source file read by 'PROGRAMS ARGS'. |
3960 | 44 | object Object file output by `PROGRAMS ARGS'. | 44 | object Object file output by 'PROGRAMS ARGS'. |
3961 | 45 | DEPDIR directory where to store dependencies. | 45 | DEPDIR directory where to store dependencies. |
3962 | 46 | depfile Dependency file to output. | 46 | depfile Dependency file to output. |
3963 | 47 | tmpdepfile Temporary file to use when outputting dependencies. | 47 | tmpdepfile Temporary file to use when outputting dependencies. |
3964 | @@ -57,6 +57,12 @@ | |||
3965 | 57 | ;; | 57 | ;; |
3966 | 58 | esac | 58 | esac |
3967 | 59 | 59 | ||
3968 | 60 | # A tabulation character. | ||
3969 | 61 | tab=' ' | ||
3970 | 62 | # A newline character. | ||
3971 | 63 | nl=' | ||
3972 | 64 | ' | ||
3973 | 65 | |||
3974 | 60 | if test -z "$depmode" || test -z "$source" || test -z "$object"; then | 66 | if test -z "$depmode" || test -z "$source" || test -z "$object"; then |
3975 | 61 | echo "depcomp: Variables source, object and depmode must be set" 1>&2 | 67 | echo "depcomp: Variables source, object and depmode must be set" 1>&2 |
3976 | 62 | exit 1 | 68 | exit 1 |
3977 | @@ -102,6 +108,12 @@ | |||
3978 | 102 | depmode=msvc7 | 108 | depmode=msvc7 |
3979 | 103 | fi | 109 | fi |
3980 | 104 | 110 | ||
3981 | 111 | if test "$depmode" = xlc; then | ||
3982 | 112 | # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. | ||
3983 | 113 | gccflag=-qmakedep=gcc,-MF | ||
3984 | 114 | depmode=gcc | ||
3985 | 115 | fi | ||
3986 | 116 | |||
3987 | 105 | case "$depmode" in | 117 | case "$depmode" in |
3988 | 106 | gcc3) | 118 | gcc3) |
3989 | 107 | ## gcc 3 implements dependency tracking that does exactly what | 119 | ## gcc 3 implements dependency tracking that does exactly what |
3990 | @@ -156,15 +168,14 @@ | |||
3991 | 156 | ## The second -e expression handles DOS-style file names with drive letters. | 168 | ## The second -e expression handles DOS-style file names with drive letters. |
3992 | 157 | sed -e 's/^[^:]*: / /' \ | 169 | sed -e 's/^[^:]*: / /' \ |
3993 | 158 | -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" | 170 | -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" |
3995 | 159 | ## This next piece of magic avoids the `deleted header file' problem. | 171 | ## This next piece of magic avoids the "deleted header file" problem. |
3996 | 160 | ## The problem is that when a header file which appears in a .P file | 172 | ## The problem is that when a header file which appears in a .P file |
3997 | 161 | ## is deleted, the dependency causes make to die (because there is | 173 | ## is deleted, the dependency causes make to die (because there is |
3998 | 162 | ## typically no way to rebuild the header). We avoid this by adding | 174 | ## typically no way to rebuild the header). We avoid this by adding |
3999 | 163 | ## dummy dependencies for each header file. Too bad gcc doesn't do | 175 | ## dummy dependencies for each header file. Too bad gcc doesn't do |
4000 | 164 | ## this for us directly. | 176 | ## this for us directly. |
4004 | 165 | tr ' ' ' | 177 | tr ' ' "$nl" < "$tmpdepfile" | |
4005 | 166 | ' < "$tmpdepfile" | | 178 | ## Some versions of gcc put a space before the ':'. On the theory |
4003 | 167 | ## Some versions of gcc put a space before the `:'. On the theory | ||
4006 | 168 | ## that the space means something, we add a space to the output as | 179 | ## that the space means something, we add a space to the output as |
4007 | 169 | ## well. hp depmode also adds that space, but also prefixes the VPATH | 180 | ## well. hp depmode also adds that space, but also prefixes the VPATH |
4008 | 170 | ## to the object. Take care to not repeat it in the output. | 181 | ## to the object. Take care to not repeat it in the output. |
4009 | @@ -203,18 +214,15 @@ | |||
4010 | 203 | # clever and replace this with sed code, as IRIX sed won't handle | 214 | # clever and replace this with sed code, as IRIX sed won't handle |
4011 | 204 | # lines with more than a fixed number of characters (4096 in | 215 | # lines with more than a fixed number of characters (4096 in |
4012 | 205 | # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; | 216 | # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; |
4014 | 206 | # the IRIX cc adds comments like `#:fec' to the end of the | 217 | # the IRIX cc adds comments like '#:fec' to the end of the |
4015 | 207 | # dependency line. | 218 | # dependency line. |
4018 | 208 | tr ' ' ' | 219 | tr ' ' "$nl" < "$tmpdepfile" \ |
4017 | 209 | ' < "$tmpdepfile" \ | ||
4019 | 210 | | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ | 220 | | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ |
4022 | 211 | tr ' | 221 | tr "$nl" ' ' >> "$depfile" |
4021 | 212 | ' ' ' >> "$depfile" | ||
4023 | 213 | echo >> "$depfile" | 222 | echo >> "$depfile" |
4024 | 214 | 223 | ||
4025 | 215 | # The second pass generates a dummy entry for each header file. | 224 | # The second pass generates a dummy entry for each header file. |
4028 | 216 | tr ' ' ' | 225 | tr ' ' "$nl" < "$tmpdepfile" \ |
4027 | 217 | ' < "$tmpdepfile" \ | ||
4029 | 218 | | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ | 226 | | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ |
4030 | 219 | >> "$depfile" | 227 | >> "$depfile" |
4031 | 220 | else | 228 | else |
4032 | @@ -226,10 +234,17 @@ | |||
4033 | 226 | rm -f "$tmpdepfile" | 234 | rm -f "$tmpdepfile" |
4034 | 227 | ;; | 235 | ;; |
4035 | 228 | 236 | ||
4036 | 237 | xlc) | ||
4037 | 238 | # This case exists only to let depend.m4 do its work. It works by | ||
4038 | 239 | # looking at the text of this script. This case will never be run, | ||
4039 | 240 | # since it is checked for above. | ||
4040 | 241 | exit 1 | ||
4041 | 242 | ;; | ||
4042 | 243 | |||
4043 | 229 | aix) | 244 | aix) |
4044 | 230 | # The C for AIX Compiler uses -M and outputs the dependencies | 245 | # The C for AIX Compiler uses -M and outputs the dependencies |
4045 | 231 | # in a .u file. In older versions, this file always lives in the | 246 | # in a .u file. In older versions, this file always lives in the |
4047 | 232 | # current directory. Also, the AIX compiler puts `$object:' at the | 247 | # current directory. Also, the AIX compiler puts '$object:' at the |
4048 | 233 | # start of each line; $object doesn't have directory information. | 248 | # start of each line; $object doesn't have directory information. |
4049 | 234 | # Version 6 uses the directory in both cases. | 249 | # Version 6 uses the directory in both cases. |
4050 | 235 | dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` | 250 | dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
4051 | @@ -259,12 +274,11 @@ | |||
4052 | 259 | test -f "$tmpdepfile" && break | 274 | test -f "$tmpdepfile" && break |
4053 | 260 | done | 275 | done |
4054 | 261 | if test -f "$tmpdepfile"; then | 276 | if test -f "$tmpdepfile"; then |
4056 | 262 | # Each line is of the form `foo.o: dependent.h'. | 277 | # Each line is of the form 'foo.o: dependent.h'. |
4057 | 263 | # Do two passes, one to just change these to | 278 | # Do two passes, one to just change these to |
4059 | 264 | # `$object: dependent.h' and one to simply `dependent.h:'. | 279 | # '$object: dependent.h' and one to simply 'dependent.h:'. |
4060 | 265 | sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" | 280 | sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" |
4063 | 266 | # That's a tab and a space in the []. | 281 | sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
4062 | 267 | sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" | ||
4064 | 268 | else | 282 | else |
4065 | 269 | # The sourcefile does not contain any dependencies, so just | 283 | # The sourcefile does not contain any dependencies, so just |
4066 | 270 | # store a dummy comment line, to avoid errors with the Makefile | 284 | # store a dummy comment line, to avoid errors with the Makefile |
4067 | @@ -275,23 +289,26 @@ | |||
4068 | 275 | ;; | 289 | ;; |
4069 | 276 | 290 | ||
4070 | 277 | icc) | 291 | icc) |
4073 | 278 | # Intel's C compiler understands `-MD -MF file'. However on | 292 | # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. |
4074 | 279 | # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c | 293 | # However on |
4075 | 294 | # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c | ||
4076 | 280 | # ICC 7.0 will fill foo.d with something like | 295 | # ICC 7.0 will fill foo.d with something like |
4077 | 281 | # foo.o: sub/foo.c | 296 | # foo.o: sub/foo.c |
4078 | 282 | # foo.o: sub/foo.h | 297 | # foo.o: sub/foo.h |
4080 | 283 | # which is wrong. We want: | 298 | # which is wrong. We want |
4081 | 284 | # sub/foo.o: sub/foo.c | 299 | # sub/foo.o: sub/foo.c |
4082 | 285 | # sub/foo.o: sub/foo.h | 300 | # sub/foo.o: sub/foo.h |
4083 | 286 | # sub/foo.c: | 301 | # sub/foo.c: |
4084 | 287 | # sub/foo.h: | 302 | # sub/foo.h: |
4085 | 288 | # ICC 7.1 will output | 303 | # ICC 7.1 will output |
4086 | 289 | # foo.o: sub/foo.c sub/foo.h | 304 | # foo.o: sub/foo.c sub/foo.h |
4088 | 290 | # and will wrap long lines using \ : | 305 | # and will wrap long lines using '\': |
4089 | 291 | # foo.o: sub/foo.c ... \ | 306 | # foo.o: sub/foo.c ... \ |
4090 | 292 | # sub/foo.h ... \ | 307 | # sub/foo.h ... \ |
4091 | 293 | # ... | 308 | # ... |
4093 | 294 | 309 | # tcc 0.9.26 (FIXME still under development at the moment of writing) | |
4094 | 310 | # will emit a similar output, but also prepend the continuation lines | ||
4095 | 311 | # with horizontal tabulation characters. | ||
4096 | 295 | "$@" -MD -MF "$tmpdepfile" | 312 | "$@" -MD -MF "$tmpdepfile" |
4097 | 296 | stat=$? | 313 | stat=$? |
4098 | 297 | if test $stat -eq 0; then : | 314 | if test $stat -eq 0; then : |
4099 | @@ -300,15 +317,21 @@ | |||
4100 | 300 | exit $stat | 317 | exit $stat |
4101 | 301 | fi | 318 | fi |
4102 | 302 | rm -f "$depfile" | 319 | rm -f "$depfile" |
4105 | 303 | # Each line is of the form `foo.o: dependent.h', | 320 | # Each line is of the form 'foo.o: dependent.h', |
4106 | 304 | # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. | 321 | # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. |
4107 | 305 | # Do two passes, one to just change these to | 322 | # Do two passes, one to just change these to |
4114 | 306 | # `$object: dependent.h' and one to simply `dependent.h:'. | 323 | # '$object: dependent.h' and one to simply 'dependent.h:'. |
4115 | 307 | sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" | 324 | sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ |
4116 | 308 | # Some versions of the HPUX 10.20 sed can't process this invocation | 325 | < "$tmpdepfile" > "$depfile" |
4117 | 309 | # correctly. Breaking it into two sed invocations is a workaround. | 326 | sed ' |
4118 | 310 | sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | | 327 | s/[ '"$tab"'][ '"$tab"']*/ /g |
4119 | 311 | sed -e 's/$/ :/' >> "$depfile" | 328 | s/^ *// |
4120 | 329 | s/ *\\*$// | ||
4121 | 330 | s/^[^:]*: *// | ||
4122 | 331 | /^$/d | ||
4123 | 332 | /:$/d | ||
4124 | 333 | s/$/ :/ | ||
4125 | 334 | ' < "$tmpdepfile" >> "$depfile" | ||
4126 | 312 | rm -f "$tmpdepfile" | 335 | rm -f "$tmpdepfile" |
4127 | 313 | ;; | 336 | ;; |
4128 | 314 | 337 | ||
4129 | @@ -344,7 +367,7 @@ | |||
4130 | 344 | done | 367 | done |
4131 | 345 | if test -f "$tmpdepfile"; then | 368 | if test -f "$tmpdepfile"; then |
4132 | 346 | sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" | 369 | sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" |
4134 | 347 | # Add `dependent.h:' lines. | 370 | # Add 'dependent.h:' lines. |
4135 | 348 | sed -ne '2,${ | 371 | sed -ne '2,${ |
4136 | 349 | s/^ *// | 372 | s/^ *// |
4137 | 350 | s/ \\*$// | 373 | s/ \\*$// |
4138 | @@ -359,9 +382,9 @@ | |||
4139 | 359 | 382 | ||
4140 | 360 | tru64) | 383 | tru64) |
4141 | 361 | # The Tru64 compiler uses -MD to generate dependencies as a side | 384 | # The Tru64 compiler uses -MD to generate dependencies as a side |
4143 | 362 | # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. | 385 | # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. |
4144 | 363 | # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put | 386 | # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put |
4146 | 364 | # dependencies in `foo.d' instead, so we check for that too. | 387 | # dependencies in 'foo.d' instead, so we check for that too. |
4147 | 365 | # Subdirectories are respected. | 388 | # Subdirectories are respected. |
4148 | 366 | dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` | 389 | dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
4149 | 367 | test "x$dir" = "x$object" && dir= | 390 | test "x$dir" = "x$object" && dir= |
4150 | @@ -407,8 +430,7 @@ | |||
4151 | 407 | done | 430 | done |
4152 | 408 | if test -f "$tmpdepfile"; then | 431 | if test -f "$tmpdepfile"; then |
4153 | 409 | sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" | 432 | sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" |
4156 | 410 | # That's a tab and a space in the []. | 433 | sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
4155 | 411 | sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" | ||
4157 | 412 | else | 434 | else |
4158 | 413 | echo "#dummy" > "$depfile" | 435 | echo "#dummy" > "$depfile" |
4159 | 414 | fi | 436 | fi |
4160 | @@ -443,11 +465,11 @@ | |||
4161 | 443 | p | 465 | p |
4162 | 444 | }' | $cygpath_u | sort -u | sed -n ' | 466 | }' | $cygpath_u | sort -u | sed -n ' |
4163 | 445 | s/ /\\ /g | 467 | s/ /\\ /g |
4165 | 446 | s/\(.*\)/ \1 \\/p | 468 | s/\(.*\)/'"$tab"'\1 \\/p |
4166 | 447 | s/.\(.*\) \\/\1:/ | 469 | s/.\(.*\) \\/\1:/ |
4167 | 448 | H | 470 | H |
4168 | 449 | $ { | 471 | $ { |
4170 | 450 | s/.*/ / | 472 | s/.*/'"$tab"'/ |
4171 | 451 | G | 473 | G |
4172 | 452 | p | 474 | p |
4173 | 453 | }' >> "$depfile" | 475 | }' >> "$depfile" |
4174 | @@ -478,7 +500,7 @@ | |||
4175 | 478 | shift | 500 | shift |
4176 | 479 | fi | 501 | fi |
4177 | 480 | 502 | ||
4179 | 481 | # Remove `-o $object'. | 503 | # Remove '-o $object'. |
4180 | 482 | IFS=" " | 504 | IFS=" " |
4181 | 483 | for arg | 505 | for arg |
4182 | 484 | do | 506 | do |
4183 | @@ -498,15 +520,14 @@ | |||
4184 | 498 | done | 520 | done |
4185 | 499 | 521 | ||
4186 | 500 | test -z "$dashmflag" && dashmflag=-M | 522 | test -z "$dashmflag" && dashmflag=-M |
4188 | 501 | # Require at least two characters before searching for `:' | 523 | # Require at least two characters before searching for ':' |
4189 | 502 | # in the target name. This is to cope with DOS-style filenames: | 524 | # in the target name. This is to cope with DOS-style filenames: |
4191 | 503 | # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. | 525 | # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. |
4192 | 504 | "$@" $dashmflag | | 526 | "$@" $dashmflag | |
4194 | 505 | sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" | 527 | sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" |
4195 | 506 | rm -f "$depfile" | 528 | rm -f "$depfile" |
4196 | 507 | cat < "$tmpdepfile" > "$depfile" | 529 | cat < "$tmpdepfile" > "$depfile" |
4199 | 508 | tr ' ' ' | 530 | tr ' ' "$nl" < "$tmpdepfile" | \ |
4198 | 509 | ' < "$tmpdepfile" | \ | ||
4200 | 510 | ## Some versions of the HPUX 10.20 sed can't process this invocation | 531 | ## Some versions of the HPUX 10.20 sed can't process this invocation |
4201 | 511 | ## correctly. Breaking it into two sed invocations is a workaround. | 532 | ## correctly. Breaking it into two sed invocations is a workaround. |
4202 | 512 | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" | 533 | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
4203 | @@ -562,8 +583,7 @@ | |||
4204 | 562 | # makedepend may prepend the VPATH from the source file name to the object. | 583 | # makedepend may prepend the VPATH from the source file name to the object. |
4205 | 563 | # No need to regex-escape $object, excess matching of '.' is harmless. | 584 | # No need to regex-escape $object, excess matching of '.' is harmless. |
4206 | 564 | sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" | 585 | sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" |
4209 | 565 | sed '1,2d' "$tmpdepfile" | tr ' ' ' | 586 | sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ |
4208 | 566 | ' | \ | ||
4210 | 567 | ## Some versions of the HPUX 10.20 sed can't process this invocation | 587 | ## Some versions of the HPUX 10.20 sed can't process this invocation |
4211 | 568 | ## correctly. Breaking it into two sed invocations is a workaround. | 588 | ## correctly. Breaking it into two sed invocations is a workaround. |
4212 | 569 | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" | 589 | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
4213 | @@ -583,7 +603,7 @@ | |||
4214 | 583 | shift | 603 | shift |
4215 | 584 | fi | 604 | fi |
4216 | 585 | 605 | ||
4218 | 586 | # Remove `-o $object'. | 606 | # Remove '-o $object'. |
4219 | 587 | IFS=" " | 607 | IFS=" " |
4220 | 588 | for arg | 608 | for arg |
4221 | 589 | do | 609 | do |
4222 | @@ -652,8 +672,8 @@ | |||
4223 | 652 | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" | 672 | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" |
4224 | 653 | rm -f "$depfile" | 673 | rm -f "$depfile" |
4225 | 654 | echo "$object : \\" > "$depfile" | 674 | echo "$object : \\" > "$depfile" |
4228 | 655 | sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" | 675 | sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" |
4229 | 656 | echo " " >> "$depfile" | 676 | echo "$tab" >> "$depfile" |
4230 | 657 | sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" | 677 | sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" |
4231 | 658 | rm -f "$tmpdepfile" | 678 | rm -f "$tmpdepfile" |
4232 | 659 | ;; | 679 | ;; |
4233 | 660 | 680 | ||
4234 | === removed file 'doc/Doxyfile' | |||
4235 | --- doc/Doxyfile 2012-02-15 09:18:17 +0000 | |||
4236 | +++ doc/Doxyfile 1970-01-01 00:00:00 +0000 | |||
4237 | @@ -1,1720 +0,0 @@ | |||
4238 | 1 | # Doxyfile 1.7.3 | ||
4239 | 2 | |||
4240 | 3 | # This file describes the settings to be used by the documentation system | ||
4241 | 4 | # doxygen (www.doxygen.org) for a project | ||
4242 | 5 | # | ||
4243 | 6 | # All text after a hash (#) is considered a comment and will be ignored | ||
4244 | 7 | # The format is: | ||
4245 | 8 | # TAG = value [value, ...] | ||
4246 | 9 | # For lists items can also be appended using: | ||
4247 | 10 | # TAG += value [value, ...] | ||
4248 | 11 | # Values that contain spaces should be placed between quotes (" ") | ||
4249 | 12 | |||
4250 | 13 | #--------------------------------------------------------------------------- | ||
4251 | 14 | # Project related configuration options | ||
4252 | 15 | #--------------------------------------------------------------------------- | ||
4253 | 16 | |||
4254 | 17 | # This tag specifies the encoding used for all characters in the config file | ||
4255 | 18 | # that follow. The default is UTF-8 which is also the encoding used for all | ||
4256 | 19 | # text before the first occurrence of this tag. Doxygen uses libiconv (or the | ||
4257 | 20 | # iconv built into libc) for the transcoding. See | ||
4258 | 21 | # http://www.gnu.org/software/libiconv for the list of possible encodings. | ||
4259 | 22 | |||
4260 | 23 | DOXYFILE_ENCODING = UTF-8 | ||
4261 | 24 | |||
4262 | 25 | # The PROJECT_NAME tag is a single word (or a sequence of words surrounded | ||
4263 | 26 | # by quotes) that should identify the project. | ||
4264 | 27 | |||
4265 | 28 | PROJECT_NAME = xorg-gtest | ||
4266 | 29 | |||
4267 | 30 | # The PROJECT_NUMBER tag can be used to enter a project or revision number. | ||
4268 | 31 | # This could be handy for archiving the generated documentation or | ||
4269 | 32 | # if some version control system is used. | ||
4270 | 33 | |||
4271 | 34 | PROJECT_NUMBER = 0.1 | ||
4272 | 35 | |||
4273 | 36 | # Using the PROJECT_BRIEF tag one can provide an optional one line description | ||
4274 | 37 | # for a project that appears at the top of each page and should give viewer | ||
4275 | 38 | # a quick idea about the purpose of the project. Keep the description short. | ||
4276 | 39 | |||
4277 | 40 | PROJECT_BRIEF = "Xorg testing extension to Google Test" | ||
4278 | 41 | |||
4279 | 42 | # With the PROJECT_LOGO tag one can specify an logo or icon that is | ||
4280 | 43 | # included in the documentation. The maximum height of the logo should not | ||
4281 | 44 | # exceed 55 pixels and the maximum width should not exceed 200 pixels. | ||
4282 | 45 | # Doxygen will copy the logo to the output directory. | ||
4283 | 46 | |||
4284 | 47 | PROJECT_LOGO = | ||
4285 | 48 | |||
4286 | 49 | # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) | ||
4287 | 50 | # base path where the generated documentation will be put. | ||
4288 | 51 | # If a relative path is entered, it will be relative to the location | ||
4289 | 52 | # where doxygen was started. If left blank the current directory will be used. | ||
4290 | 53 | |||
4291 | 54 | OUTPUT_DIRECTORY = api | ||
4292 | 55 | |||
4293 | 56 | # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create | ||
4294 | 57 | # 4096 sub-directories (in 2 levels) under the output directory of each output | ||
4295 | 58 | # format and will distribute the generated files over these directories. | ||
4296 | 59 | # Enabling this option can be useful when feeding doxygen a huge amount of | ||
4297 | 60 | # source files, where putting all generated files in the same directory would | ||
4298 | 61 | # otherwise cause performance problems for the file system. | ||
4299 | 62 | |||
4300 | 63 | CREATE_SUBDIRS = NO | ||
4301 | 64 | |||
4302 | 65 | # The OUTPUT_LANGUAGE tag is used to specify the language in which all | ||
4303 | 66 | # documentation generated by doxygen is written. Doxygen will use this | ||
4304 | 67 | # information to generate all constant output in the proper language. | ||
4305 | 68 | # The default language is English, other supported languages are: | ||
4306 | 69 | # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, | ||
4307 | 70 | # Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, | ||
4308 | 71 | # Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English | ||
4309 | 72 | # messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, | ||
4310 | 73 | # Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, | ||
4311 | 74 | # Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. | ||
4312 | 75 | |||
4313 | 76 | OUTPUT_LANGUAGE = English | ||
4314 | 77 | |||
4315 | 78 | # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will | ||
4316 | 79 | # include brief member descriptions after the members that are listed in | ||
4317 | 80 | # the file and class documentation (similar to JavaDoc). | ||
4318 | 81 | # Set to NO to disable this. | ||
4319 | 82 | |||
4320 | 83 | BRIEF_MEMBER_DESC = YES | ||
4321 | 84 | |||
4322 | 85 | # If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend | ||
4323 | 86 | # the brief description of a member or function before the detailed description. | ||
4324 | 87 | # Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the | ||
4325 | 88 | # brief descriptions will be completely suppressed. | ||
4326 | 89 | |||
4327 | 90 | REPEAT_BRIEF = YES | ||
4328 | 91 | |||
4329 | 92 | # This tag implements a quasi-intelligent brief description abbreviator | ||
4330 | 93 | # that is used to form the text in various listings. Each string | ||
4331 | 94 | # in this list, if found as the leading text of the brief description, will be | ||
4332 | 95 | # stripped from the text and the result after processing the whole list, is | ||
4333 | 96 | # used as the annotated text. Otherwise, the brief description is used as-is. | ||
4334 | 97 | # If left blank, the following values are used ("$name" is automatically | ||
4335 | 98 | # replaced with the name of the entity): "The $name class" "The $name widget" | ||
4336 | 99 | # "The $name file" "is" "provides" "specifies" "contains" | ||
4337 | 100 | # "represents" "a" "an" "the" | ||
4338 | 101 | |||
4339 | 102 | ABBREVIATE_BRIEF = "The $name class" \ | ||
4340 | 103 | "The $name widget" \ | ||
4341 | 104 | "The $name file" \ | ||
4342 | 105 | is \ | ||
4343 | 106 | provides \ | ||
4344 | 107 | specifies \ | ||
4345 | 108 | contains \ | ||
4346 | 109 | represents \ | ||
4347 | 110 | a \ | ||
4348 | 111 | an \ | ||
4349 | 112 | the | ||
4350 | 113 | |||
4351 | 114 | # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then | ||
4352 | 115 | # Doxygen will generate a detailed section even if there is only a brief | ||
4353 | 116 | # description. | ||
4354 | 117 | |||
4355 | 118 | ALWAYS_DETAILED_SEC = YES | ||
4356 | 119 | |||
4357 | 120 | # If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all | ||
4358 | 121 | # inherited members of a class in the documentation of that class as if those | ||
4359 | 122 | # members were ordinary class members. Constructors, destructors and assignment | ||
4360 | 123 | # operators of the base classes will not be shown. | ||
4361 | 124 | |||
4362 | 125 | INLINE_INHERITED_MEMB = NO | ||
4363 | 126 | |||
4364 | 127 | # If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full | ||
4365 | 128 | # path before files name in the file list and in the header files. If set | ||
4366 | 129 | # to NO the shortest path that makes the file name unique will be used. | ||
4367 | 130 | |||
4368 | 131 | FULL_PATH_NAMES = YES | ||
4369 | 132 | |||
4370 | 133 | # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag | ||
4371 | 134 | # can be used to strip a user-defined part of the path. Stripping is | ||
4372 | 135 | # only done if one of the specified strings matches the left-hand part of | ||
4373 | 136 | # the path. The tag can be used to show relative paths in the file list. | ||
4374 | 137 | # If left blank the directory from which doxygen is run is used as the | ||
4375 | 138 | # path to strip. | ||
4376 | 139 | |||
4377 | 140 | STRIP_FROM_PATH = | ||
4378 | 141 | |||
4379 | 142 | # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of | ||
4380 | 143 | # the path mentioned in the documentation of a class, which tells | ||
4381 | 144 | # the reader which header file to include in order to use a class. | ||
4382 | 145 | # If left blank only the name of the header file containing the class | ||
4383 | 146 | # definition is used. Otherwise one should specify the include paths that | ||
4384 | 147 | # are normally passed to the compiler using the -I flag. | ||
4385 | 148 | |||
4386 | 149 | STRIP_FROM_INC_PATH = | ||
4387 | 150 | |||
4388 | 151 | # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter | ||
4389 | 152 | # (but less readable) file names. This can be useful if your file system | ||
4390 | 153 | # doesn't support long names like on DOS, Mac, or CD-ROM. | ||
4391 | 154 | |||
4392 | 155 | SHORT_NAMES = NO | ||
4393 | 156 | |||
4394 | 157 | # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen | ||
4395 | 158 | # will interpret the first line (until the first dot) of a JavaDoc-style | ||
4396 | 159 | # comment as the brief description. If set to NO, the JavaDoc | ||
4397 | 160 | # comments will behave just like regular Qt-style comments | ||
4398 | 161 | # (thus requiring an explicit @brief command for a brief description.) | ||
4399 | 162 | |||
4400 | 163 | JAVADOC_AUTOBRIEF = YES | ||
4401 | 164 | |||
4402 | 165 | # If the QT_AUTOBRIEF tag is set to YES then Doxygen will | ||
4403 | 166 | # interpret the first line (until the first dot) of a Qt-style | ||
4404 | 167 | # comment as the brief description. If set to NO, the comments | ||
4405 | 168 | # will behave just like regular Qt-style comments (thus requiring | ||
4406 | 169 | # an explicit \brief command for a brief description.) | ||
4407 | 170 | |||
4408 | 171 | QT_AUTOBRIEF = NO | ||
4409 | 172 | |||
4410 | 173 | # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen | ||
4411 | 174 | # treat a multi-line C++ special comment block (i.e. a block of //! or /// | ||
4412 | 175 | # comments) as a brief description. This used to be the default behaviour. | ||
4413 | 176 | # The new default is to treat a multi-line C++ comment block as a detailed | ||
4414 | 177 | # description. Set this tag to YES if you prefer the old behaviour instead. | ||
4415 | 178 | |||
4416 | 179 | MULTILINE_CPP_IS_BRIEF = NO | ||
4417 | 180 | |||
4418 | 181 | # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented | ||
4419 | 182 | # member inherits the documentation from any documented member that it | ||
4420 | 183 | # re-implements. | ||
4421 | 184 | |||
4422 | 185 | INHERIT_DOCS = YES | ||
4423 | 186 | |||
4424 | 187 | # If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce | ||
4425 | 188 | # a new page for each member. If set to NO, the documentation of a member will | ||
4426 | 189 | # be part of the file/class/namespace that contains it. | ||
4427 | 190 | |||
4428 | 191 | SEPARATE_MEMBER_PAGES = NO | ||
4429 | 192 | |||
4430 | 193 | # The TAB_SIZE tag can be used to set the number of spaces in a tab. | ||
4431 | 194 | # Doxygen uses this value to replace tabs by spaces in code fragments. | ||
4432 | 195 | |||
4433 | 196 | TAB_SIZE = 8 | ||
4434 | 197 | |||
4435 | 198 | # This tag can be used to specify a number of aliases that acts | ||
4436 | 199 | # as commands in the documentation. An alias has the form "name=value". | ||
4437 | 200 | # For example adding "sideeffect=\par Side Effects:\n" will allow you to | ||
4438 | 201 | # put the command \sideeffect (or @sideeffect) in the documentation, which | ||
4439 | 202 | # will result in a user-defined paragraph with heading "Side Effects:". | ||
4440 | 203 | # You can put \n's in the value part of an alias to insert newlines. | ||
4441 | 204 | |||
4442 | 205 | ALIASES = | ||
4443 | 206 | |||
4444 | 207 | # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C | ||
4445 | 208 | # sources only. Doxygen will then generate output that is more tailored for C. | ||
4446 | 209 | # For instance, some of the names that are used will be different. The list | ||
4447 | 210 | # of all members will be omitted, etc. | ||
4448 | 211 | |||
4449 | 212 | OPTIMIZE_OUTPUT_FOR_C = NO | ||
4450 | 213 | |||
4451 | 214 | # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java | ||
4452 | 215 | # sources only. Doxygen will then generate output that is more tailored for | ||
4453 | 216 | # Java. For instance, namespaces will be presented as packages, qualified | ||
4454 | 217 | # scopes will look different, etc. | ||
4455 | 218 | |||
4456 | 219 | OPTIMIZE_OUTPUT_JAVA = NO | ||
4457 | 220 | |||
4458 | 221 | # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran | ||
4459 | 222 | # sources only. Doxygen will then generate output that is more tailored for | ||
4460 | 223 | # Fortran. | ||
4461 | 224 | |||
4462 | 225 | OPTIMIZE_FOR_FORTRAN = NO | ||
4463 | 226 | |||
4464 | 227 | # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL | ||
4465 | 228 | # sources. Doxygen will then generate output that is tailored for | ||
4466 | 229 | # VHDL. | ||
4467 | 230 | |||
4468 | 231 | OPTIMIZE_OUTPUT_VHDL = NO | ||
4469 | 232 | |||
4470 | 233 | # Doxygen selects the parser to use depending on the extension of the files it | ||
4471 | 234 | # parses. With this tag you can assign which parser to use for a given extension. | ||
4472 | 235 | # Doxygen has a built-in mapping, but you can override or extend it using this | ||
4473 | 236 | # tag. The format is ext=language, where ext is a file extension, and language | ||
4474 | 237 | # is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, | ||
4475 | 238 | # C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make | ||
4476 | 239 | # doxygen treat .inc files as Fortran files (default is PHP), and .f files as C | ||
4477 | 240 | # (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions | ||
4478 | 241 | # you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. | ||
4479 | 242 | |||
4480 | 243 | EXTENSION_MAPPING = | ||
4481 | 244 | |||
4482 | 245 | # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want | ||
4483 | 246 | # to include (a tag file for) the STL sources as input, then you should | ||
4484 | 247 | # set this tag to YES in order to let doxygen match functions declarations and | ||
4485 | 248 | # definitions whose arguments contain STL classes (e.g. func(std::string); v.s. | ||
4486 | 249 | # func(std::string) {}). This also makes the inheritance and collaboration | ||
4487 | 250 | # diagrams that involve STL classes more complete and accurate. | ||
4488 | 251 | |||
4489 | 252 | BUILTIN_STL_SUPPORT = NO | ||
4490 | 253 | |||
4491 | 254 | # If you use Microsoft's C++/CLI language, you should set this option to YES to | ||
4492 | 255 | # enable parsing support. | ||
4493 | 256 | |||
4494 | 257 | CPP_CLI_SUPPORT = NO | ||
4495 | 258 | |||
4496 | 259 | # Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. | ||
4497 | 260 | # Doxygen will parse them like normal C++ but will assume all classes use public | ||
4498 | 261 | # instead of private inheritance when no explicit protection keyword is present. | ||
4499 | 262 | |||
4500 | 263 | SIP_SUPPORT = NO | ||
4501 | 264 | |||
4502 | 265 | # For Microsoft's IDL there are propget and propput attributes to indicate getter | ||
4503 | 266 | # and setter methods for a property. Setting this option to YES (the default) | ||
4504 | 267 | # will make doxygen replace the get and set methods by a property in the | ||
4505 | 268 | # documentation. This will only work if the methods are indeed getting or | ||
4506 | 269 | # setting a simple type. If this is not the case, or you want to show the | ||
4507 | 270 | # methods anyway, you should set this option to NO. | ||
4508 | 271 | |||
4509 | 272 | IDL_PROPERTY_SUPPORT = YES | ||
4510 | 273 | |||
4511 | 274 | # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC | ||
4512 | 275 | # tag is set to YES, then doxygen will reuse the documentation of the first | ||
4513 | 276 | # member in the group (if any) for the other members of the group. By default | ||
4514 | 277 | # all members of a group must be documented explicitly. | ||
4515 | 278 | |||
4516 | 279 | DISTRIBUTE_GROUP_DOC = NO | ||
4517 | 280 | |||
4518 | 281 | # Set the SUBGROUPING tag to YES (the default) to allow class member groups of | ||
4519 | 282 | # the same type (for instance a group of public functions) to be put as a | ||
4520 | 283 | # subgroup of that type (e.g. under the Public Functions section). Set it to | ||
4521 | 284 | # NO to prevent subgrouping. Alternatively, this can be done per class using | ||
4522 | 285 | # the \nosubgrouping command. | ||
4523 | 286 | |||
4524 | 287 | SUBGROUPING = YES | ||
4525 | 288 | |||
4526 | 289 | # When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum | ||
4527 | 290 | # is documented as struct, union, or enum with the name of the typedef. So | ||
4528 | 291 | # typedef struct TypeS {} TypeT, will appear in the documentation as a struct | ||
4529 | 292 | # with name TypeT. When disabled the typedef will appear as a member of a file, | ||
4530 | 293 | # namespace, or class. And the struct will be named TypeS. This can typically | ||
4531 | 294 | # be useful for C code in case the coding convention dictates that all compound | ||
4532 | 295 | # types are typedef'ed and only the typedef is referenced, never the tag name. | ||
4533 | 296 | |||
4534 | 297 | TYPEDEF_HIDES_STRUCT = NO | ||
4535 | 298 | |||
4536 | 299 | # The SYMBOL_CACHE_SIZE determines the size of the internal cache use to | ||
4537 | 300 | # determine which symbols to keep in memory and which to flush to disk. | ||
4538 | 301 | # When the cache is full, less often used symbols will be written to disk. | ||
4539 | 302 | # For small to medium size projects (<1000 input files) the default value is | ||
4540 | 303 | # probably good enough. For larger projects a too small cache size can cause | ||
4541 | 304 | # doxygen to be busy swapping symbols to and from disk most of the time | ||
4542 | 305 | # causing a significant performance penalty. | ||
4543 | 306 | # If the system has enough physical memory increasing the cache will improve the | ||
4544 | 307 | # performance by keeping more symbols in memory. Note that the value works on | ||
4545 | 308 | # a logarithmic scale so increasing the size by one will roughly double the | ||
4546 | 309 | # memory usage. The cache size is given by this formula: | ||
4547 | 310 | # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, | ||
4548 | 311 | # corresponding to a cache size of 2^16 = 65536 symbols | ||
4549 | 312 | |||
4550 | 313 | SYMBOL_CACHE_SIZE = 0 | ||
4551 | 314 | |||
4552 | 315 | #--------------------------------------------------------------------------- | ||
4553 | 316 | # Build related configuration options | ||
4554 | 317 | #--------------------------------------------------------------------------- | ||
4555 | 318 | |||
4556 | 319 | # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in | ||
4557 | 320 | # documentation are documented, even if no documentation was available. | ||
4558 | 321 | # Private class members and static file members will be hidden unless | ||
4559 | 322 | # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES | ||
4560 | 323 | |||
4561 | 324 | EXTRACT_ALL = NO | ||
4562 | 325 | |||
4563 | 326 | # If the EXTRACT_PRIVATE tag is set to YES all private members of a class | ||
4564 | 327 | # will be included in the documentation. | ||
4565 | 328 | |||
4566 | 329 | EXTRACT_PRIVATE = NO | ||
4567 | 330 | |||
4568 | 331 | # If the EXTRACT_STATIC tag is set to YES all static members of a file | ||
4569 | 332 | # will be included in the documentation. | ||
4570 | 333 | |||
4571 | 334 | EXTRACT_STATIC = NO | ||
4572 | 335 | |||
4573 | 336 | # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) | ||
4574 | 337 | # defined locally in source files will be included in the documentation. | ||
4575 | 338 | # If set to NO only classes defined in header files are included. | ||
4576 | 339 | |||
4577 | 340 | EXTRACT_LOCAL_CLASSES = YES | ||
4578 | 341 | |||
4579 | 342 | # This flag is only useful for Objective-C code. When set to YES local | ||
4580 | 343 | # methods, which are defined in the implementation section but not in | ||
4581 | 344 | # the interface are included in the documentation. | ||
4582 | 345 | # If set to NO (the default) only methods in the interface are included. | ||
4583 | 346 | |||
4584 | 347 | EXTRACT_LOCAL_METHODS = NO | ||
4585 | 348 | |||
4586 | 349 | # If this flag is set to YES, the members of anonymous namespaces will be | ||
4587 | 350 | # extracted and appear in the documentation as a namespace called | ||
4588 | 351 | # 'anonymous_namespace{file}', where file will be replaced with the base | ||
4589 | 352 | # name of the file that contains the anonymous namespace. By default | ||
4590 | 353 | # anonymous namespaces are hidden. | ||
4591 | 354 | |||
4592 | 355 | EXTRACT_ANON_NSPACES = NO | ||
4593 | 356 | |||
4594 | 357 | # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all | ||
4595 | 358 | # undocumented members of documented classes, files or namespaces. | ||
4596 | 359 | # If set to NO (the default) these members will be included in the | ||
4597 | 360 | # various overviews, but no documentation section is generated. | ||
4598 | 361 | # This option has no effect if EXTRACT_ALL is enabled. | ||
4599 | 362 | |||
4600 | 363 | HIDE_UNDOC_MEMBERS = NO | ||
4601 | 364 | |||
4602 | 365 | # If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all | ||
4603 | 366 | # undocumented classes that are normally visible in the class hierarchy. | ||
4604 | 367 | # If set to NO (the default) these classes will be included in the various | ||
4605 | 368 | # overviews. This option has no effect if EXTRACT_ALL is enabled. | ||
4606 | 369 | |||
4607 | 370 | HIDE_UNDOC_CLASSES = NO | ||
4608 | 371 | |||
4609 | 372 | # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all | ||
4610 | 373 | # friend (class|struct|union) declarations. | ||
4611 | 374 | # If set to NO (the default) these declarations will be included in the | ||
4612 | 375 | # documentation. | ||
4613 | 376 | |||
4614 | 377 | HIDE_FRIEND_COMPOUNDS = NO | ||
4615 | 378 | |||
4616 | 379 | # If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any | ||
4617 | 380 | # documentation blocks found inside the body of a function. | ||
4618 | 381 | # If set to NO (the default) these blocks will be appended to the | ||
4619 | 382 | # function's detailed documentation block. | ||
4620 | 383 | |||
4621 | 384 | HIDE_IN_BODY_DOCS = NO | ||
4622 | 385 | |||
4623 | 386 | # The INTERNAL_DOCS tag determines if documentation | ||
4624 | 387 | # that is typed after a \internal command is included. If the tag is set | ||
4625 | 388 | # to NO (the default) then the documentation will be excluded. | ||
4626 | 389 | # Set it to YES to include the internal documentation. | ||
4627 | 390 | |||
4628 | 391 | INTERNAL_DOCS = NO | ||
4629 | 392 | |||
4630 | 393 | # If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate | ||
4631 | 394 | # file names in lower-case letters. If set to YES upper-case letters are also | ||
4632 | 395 | # allowed. This is useful if you have classes or files whose names only differ | ||
4633 | 396 | # in case and if your file system supports case sensitive file names. Windows | ||
4634 | 397 | # and Mac users are advised to set this option to NO. | ||
4635 | 398 | |||
4636 | 399 | CASE_SENSE_NAMES = NO | ||
4637 | 400 | |||
4638 | 401 | # If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen | ||
4639 | 402 | # will show members with their full class and namespace scopes in the | ||
4640 | 403 | # documentation. If set to YES the scope will be hidden. | ||
4641 | 404 | |||
4642 | 405 | HIDE_SCOPE_NAMES = NO | ||
4643 | 406 | |||
4644 | 407 | # If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen | ||
4645 | 408 | # will put a list of the files that are included by a file in the documentation | ||
4646 | 409 | # of that file. | ||
4647 | 410 | |||
4648 | 411 | SHOW_INCLUDE_FILES = YES | ||
4649 | 412 | |||
4650 | 413 | # If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen | ||
4651 | 414 | # will list include files with double quotes in the documentation | ||
4652 | 415 | # rather than with sharp brackets. | ||
4653 | 416 | |||
4654 | 417 | FORCE_LOCAL_INCLUDES = NO | ||
4655 | 418 | |||
4656 | 419 | # If the INLINE_INFO tag is set to YES (the default) then a tag [inline] | ||
4657 | 420 | # is inserted in the documentation for inline members. | ||
4658 | 421 | |||
4659 | 422 | INLINE_INFO = YES | ||
4660 | 423 | |||
4661 | 424 | # If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen | ||
4662 | 425 | # will sort the (detailed) documentation of file and class members | ||
4663 | 426 | # alphabetically by member name. If set to NO the members will appear in | ||
4664 | 427 | # declaration order. | ||
4665 | 428 | |||
4666 | 429 | SORT_MEMBER_DOCS = YES | ||
4667 | 430 | |||
4668 | 431 | # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the | ||
4669 | 432 | # brief documentation of file, namespace and class members alphabetically | ||
4670 | 433 | # by member name. If set to NO (the default) the members will appear in | ||
4671 | 434 | # declaration order. | ||
4672 | 435 | |||
4673 | 436 | SORT_BRIEF_DOCS = NO | ||
4674 | 437 | |||
4675 | 438 | # If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen | ||
4676 | 439 | # will sort the (brief and detailed) documentation of class members so that | ||
4677 | 440 | # constructors and destructors are listed first. If set to NO (the default) | ||
4678 | 441 | # the constructors will appear in the respective orders defined by | ||
4679 | 442 | # SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. | ||
4680 | 443 | # This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO | ||
4681 | 444 | # and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. | ||
4682 | 445 | |||
4683 | 446 | SORT_MEMBERS_CTORS_1ST = NO | ||
4684 | 447 | |||
4685 | 448 | # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the | ||
4686 | 449 | # hierarchy of group names into alphabetical order. If set to NO (the default) | ||
4687 | 450 | # the group names will appear in their defined order. | ||
4688 | 451 | |||
4689 | 452 | SORT_GROUP_NAMES = NO | ||
4690 | 453 | |||
4691 | 454 | # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be | ||
4692 | 455 | # sorted by fully-qualified names, including namespaces. If set to | ||
4693 | 456 | # NO (the default), the class list will be sorted only by class name, | ||
4694 | 457 | # not including the namespace part. | ||
4695 | 458 | # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. | ||
4696 | 459 | # Note: This option applies only to the class list, not to the | ||
4697 | 460 | # alphabetical list. | ||
4698 | 461 | |||
4699 | 462 | SORT_BY_SCOPE_NAME = NO | ||
4700 | 463 | |||
4701 | 464 | # If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to | ||
4702 | 465 | # do proper type resolution of all parameters of a function it will reject a | ||
4703 | 466 | # match between the prototype and the implementation of a member function even | ||
4704 | 467 | # if there is only one candidate or it is obvious which candidate to choose | ||
4705 | 468 | # by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen | ||
4706 | 469 | # will still accept a match between prototype and implementation in such cases. | ||
4707 | 470 | |||
4708 | 471 | STRICT_PROTO_MATCHING = NO | ||
4709 | 472 | |||
4710 | 473 | # The GENERATE_TODOLIST tag can be used to enable (YES) or | ||
4711 | 474 | # disable (NO) the todo list. This list is created by putting \todo | ||
4712 | 475 | # commands in the documentation. | ||
4713 | 476 | |||
4714 | 477 | GENERATE_TODOLIST = YES | ||
4715 | 478 | |||
4716 | 479 | # The GENERATE_TESTLIST tag can be used to enable (YES) or | ||
4717 | 480 | # disable (NO) the test list. This list is created by putting \test | ||
4718 | 481 | # commands in the documentation. | ||
4719 | 482 | |||
4720 | 483 | GENERATE_TESTLIST = YES | ||
4721 | 484 | |||
4722 | 485 | # The GENERATE_BUGLIST tag can be used to enable (YES) or | ||
4723 | 486 | # disable (NO) the bug list. This list is created by putting \bug | ||
4724 | 487 | # commands in the documentation. | ||
4725 | 488 | |||
4726 | 489 | GENERATE_BUGLIST = YES | ||
4727 | 490 | |||
4728 | 491 | # The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or | ||
4729 | 492 | # disable (NO) the deprecated list. This list is created by putting | ||
4730 | 493 | # \deprecated commands in the documentation. | ||
4731 | 494 | |||
4732 | 495 | GENERATE_DEPRECATEDLIST= YES | ||
4733 | 496 | |||
4734 | 497 | # The ENABLED_SECTIONS tag can be used to enable conditional | ||
4735 | 498 | # documentation sections, marked by \if sectionname ... \endif. | ||
4736 | 499 | |||
4737 | 500 | ENABLED_SECTIONS = | ||
4738 | 501 | |||
4739 | 502 | # The MAX_INITIALIZER_LINES tag determines the maximum number of lines | ||
4740 | 503 | # the initial value of a variable or macro consists of for it to appear in | ||
4741 | 504 | # the documentation. If the initializer consists of more lines than specified | ||
4742 | 505 | # here it will be hidden. Use a value of 0 to hide initializers completely. | ||
4743 | 506 | # The appearance of the initializer of individual variables and macros in the | ||
4744 | 507 | # documentation can be controlled using \showinitializer or \hideinitializer | ||
4745 | 508 | # command in the documentation regardless of this setting. | ||
4746 | 509 | |||
4747 | 510 | MAX_INITIALIZER_LINES = 0 | ||
4748 | 511 | |||
4749 | 512 | # Set the SHOW_USED_FILES tag to NO to disable the list of files generated | ||
4750 | 513 | # at the bottom of the documentation of classes and structs. If set to YES the | ||
4751 | 514 | # list will mention the files that were used to generate the documentation. | ||
4752 | 515 | |||
4753 | 516 | SHOW_USED_FILES = YES | ||
4754 | 517 | |||
4755 | 518 | # If the sources in your project are distributed over multiple directories | ||
4756 | 519 | # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy | ||
4757 | 520 | # in the documentation. The default is NO. | ||
4758 | 521 | |||
4759 | 522 | SHOW_DIRECTORIES = NO | ||
4760 | 523 | |||
4761 | 524 | # Set the SHOW_FILES tag to NO to disable the generation of the Files page. | ||
4762 | 525 | # This will remove the Files entry from the Quick Index and from the | ||
4763 | 526 | # Folder Tree View (if specified). The default is YES. | ||
4764 | 527 | |||
4765 | 528 | SHOW_FILES = YES | ||
4766 | 529 | |||
4767 | 530 | # Set the SHOW_NAMESPACES tag to NO to disable the generation of the | ||
4768 | 531 | # Namespaces page. This will remove the Namespaces entry from the Quick Index | ||
4769 | 532 | # and from the Folder Tree View (if specified). The default is YES. | ||
4770 | 533 | |||
4771 | 534 | SHOW_NAMESPACES = YES | ||
4772 | 535 | |||
4773 | 536 | # The FILE_VERSION_FILTER tag can be used to specify a program or script that | ||
4774 | 537 | # doxygen should invoke to get the current version for each file (typically from | ||
4775 | 538 | # the version control system). Doxygen will invoke the program by executing (via | ||
4776 | 539 | # popen()) the command <command> <input-file>, where <command> is the value of | ||
4777 | 540 | # the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file | ||
4778 | 541 | # provided by doxygen. Whatever the program writes to standard output | ||
4779 | 542 | # is used as the file version. See the manual for examples. | ||
4780 | 543 | |||
4781 | 544 | FILE_VERSION_FILTER = | ||
4782 | 545 | |||
4783 | 546 | # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed | ||
4784 | 547 | # by doxygen. The layout file controls the global structure of the generated | ||
4785 | 548 | # output files in an output format independent way. The create the layout file | ||
4786 | 549 | # that represents doxygen's defaults, run doxygen with the -l option. | ||
4787 | 550 | # You can optionally specify a file name after the option, if omitted | ||
4788 | 551 | # DoxygenLayout.xml will be used as the name of the layout file. | ||
4789 | 552 | |||
4790 | 553 | LAYOUT_FILE = | ||
4791 | 554 | |||
4792 | 555 | #--------------------------------------------------------------------------- | ||
4793 | 556 | # configuration options related to warning and progress messages | ||
4794 | 557 | #--------------------------------------------------------------------------- | ||
4795 | 558 | |||
4796 | 559 | # The QUIET tag can be used to turn on/off the messages that are generated | ||
4797 | 560 | # by doxygen. Possible values are YES and NO. If left blank NO is used. | ||
4798 | 561 | |||
4799 | 562 | QUIET = NO | ||
4800 | 563 | |||
4801 | 564 | # The WARNINGS tag can be used to turn on/off the warning messages that are | ||
4802 | 565 | # generated by doxygen. Possible values are YES and NO. If left blank | ||
4803 | 566 | # NO is used. | ||
4804 | 567 | |||
4805 | 568 | WARNINGS = YES | ||
4806 | 569 | |||
4807 | 570 | # If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings | ||
4808 | 571 | # for undocumented members. If EXTRACT_ALL is set to YES then this flag will | ||
4809 | 572 | # automatically be disabled. | ||
4810 | 573 | |||
4811 | 574 | WARN_IF_UNDOCUMENTED = YES | ||
4812 | 575 | |||
4813 | 576 | # If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for | ||
4814 | 577 | # potential errors in the documentation, such as not documenting some | ||
4815 | 578 | # parameters in a documented function, or documenting parameters that | ||
4816 | 579 | # don't exist or using markup commands wrongly. | ||
4817 | 580 | |||
4818 | 581 | WARN_IF_DOC_ERROR = YES | ||
4819 | 582 | |||
4820 | 583 | # The WARN_NO_PARAMDOC option can be enabled to get warnings for | ||
4821 | 584 | # functions that are documented, but have no documentation for their parameters | ||
4822 | 585 | # or return value. If set to NO (the default) doxygen will only warn about | ||
4823 | 586 | # wrong or incomplete parameter documentation, but not about the absence of | ||
4824 | 587 | # documentation. | ||
4825 | 588 | |||
4826 | 589 | WARN_NO_PARAMDOC = NO | ||
4827 | 590 | |||
4828 | 591 | # The WARN_FORMAT tag determines the format of the warning messages that | ||
4829 | 592 | # doxygen can produce. The string should contain the $file, $line, and $text | ||
4830 | 593 | # tags, which will be replaced by the file and line number from which the | ||
4831 | 594 | # warning originated and the warning text. Optionally the format may contain | ||
4832 | 595 | # $version, which will be replaced by the version of the file (if it could | ||
4833 | 596 | # be obtained via FILE_VERSION_FILTER) | ||
4834 | 597 | |||
4835 | 598 | WARN_FORMAT = "$file:$line: $text" | ||
4836 | 599 | |||
4837 | 600 | # The WARN_LOGFILE tag can be used to specify a file to which warning | ||
4838 | 601 | # and error messages should be written. If left blank the output is written | ||
4839 | 602 | # to stderr. | ||
4840 | 603 | |||
4841 | 604 | WARN_LOGFILE = | ||
4842 | 605 | |||
4843 | 606 | #--------------------------------------------------------------------------- | ||
4844 | 607 | # configuration options related to the input files | ||
4845 | 608 | #--------------------------------------------------------------------------- | ||
4846 | 609 | |||
4847 | 610 | # The INPUT tag can be used to specify the files and/or directories that contain | ||
4848 | 611 | # documented source files. You may enter file names like "myfile.cpp" or | ||
4849 | 612 | # directories like "/usr/src/myproject". Separate the files or directories | ||
4850 | 613 | # with spaces. | ||
4851 | 614 | |||
4852 | 615 | INPUT = ../include \ | ||
4853 | 616 | ../examples | ||
4854 | 617 | |||
4855 | 618 | # This tag can be used to specify the character encoding of the source files | ||
4856 | 619 | # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is | ||
4857 | 620 | # also the default input encoding. Doxygen uses libiconv (or the iconv built | ||
4858 | 621 | # into libc) for the transcoding. See http://www.gnu.org/software/libiconv for | ||
4859 | 622 | # the list of possible encodings. | ||
4860 | 623 | |||
4861 | 624 | INPUT_ENCODING = UTF-8 | ||
4862 | 625 | |||
4863 | 626 | # If the value of the INPUT tag contains directories, you can use the | ||
4864 | 627 | # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp | ||
4865 | 628 | # and *.h) to filter out the source-files in the directories. If left | ||
4866 | 629 | # blank the following patterns are tested: | ||
4867 | 630 | # *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh | ||
4868 | 631 | # *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py | ||
4869 | 632 | # *.f90 *.f *.for *.vhd *.vhdl | ||
4870 | 633 | |||
4871 | 634 | FILE_PATTERNS = *.c \ | ||
4872 | 635 | *.cc \ | ||
4873 | 636 | *.cxx \ | ||
4874 | 637 | *.cpp \ | ||
4875 | 638 | *.c++ \ | ||
4876 | 639 | *.d \ | ||
4877 | 640 | *.java \ | ||
4878 | 641 | *.ii \ | ||
4879 | 642 | *.ixx \ | ||
4880 | 643 | *.ipp \ | ||
4881 | 644 | *.i++ \ | ||
4882 | 645 | *.inl \ | ||
4883 | 646 | *.h \ | ||
4884 | 647 | *.hh \ | ||
4885 | 648 | *.hxx \ | ||
4886 | 649 | *.hpp \ | ||
4887 | 650 | *.h++ \ | ||
4888 | 651 | *.idl \ | ||
4889 | 652 | *.odl \ | ||
4890 | 653 | *.cs \ | ||
4891 | 654 | *.php \ | ||
4892 | 655 | *.php3 \ | ||
4893 | 656 | *.inc \ | ||
4894 | 657 | *.m \ | ||
4895 | 658 | *.mm \ | ||
4896 | 659 | *.dox \ | ||
4897 | 660 | *.py \ | ||
4898 | 661 | *.f90 \ | ||
4899 | 662 | *.f \ | ||
4900 | 663 | *.vhd \ | ||
4901 | 664 | *.vhdl \ | ||
4902 | 665 | *.dox | ||
4903 | 666 | |||
4904 | 667 | # The RECURSIVE tag can be used to turn specify whether or not subdirectories | ||
4905 | 668 | # should be searched for input files as well. Possible values are YES and NO. | ||
4906 | 669 | # If left blank NO is used. | ||
4907 | 670 | |||
4908 | 671 | RECURSIVE = YES | ||
4909 | 672 | |||
4910 | 673 | # The EXCLUDE tag can be used to specify files and/or directories that should | ||
4911 | 674 | # excluded from the INPUT source files. This way you can easily exclude a | ||
4912 | 675 | # subdirectory from a directory tree whose root is specified with the INPUT tag. | ||
4913 | 676 | |||
4914 | 677 | EXCLUDE = | ||
4915 | 678 | |||
4916 | 679 | # The EXCLUDE_SYMLINKS tag can be used select whether or not files or | ||
4917 | 680 | # directories that are symbolic links (a Unix file system feature) are excluded | ||
4918 | 681 | # from the input. | ||
4919 | 682 | |||
4920 | 683 | EXCLUDE_SYMLINKS = NO | ||
4921 | 684 | |||
4922 | 685 | # If the value of the INPUT tag contains directories, you can use the | ||
4923 | 686 | # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude | ||
4924 | 687 | # certain files from those directories. Note that the wildcards are matched | ||
4925 | 688 | # against the file with absolute path, so to exclude all test directories | ||
4926 | 689 | # for example use the pattern */test/* | ||
4927 | 690 | |||
4928 | 691 | EXCLUDE_PATTERNS = | ||
4929 | 692 | |||
4930 | 693 | # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names | ||
4931 | 694 | # (namespaces, classes, functions, etc.) that should be excluded from the | ||
4932 | 695 | # output. The symbol name can be a fully qualified name, a word, or if the | ||
4933 | 696 | # wildcard * is used, a substring. Examples: ANamespace, AClass, | ||
4934 | 697 | # AClass::ANamespace, ANamespace::*Test | ||
4935 | 698 | |||
4936 | 699 | EXCLUDE_SYMBOLS = | ||
4937 | 700 | |||
4938 | 701 | # The EXAMPLE_PATH tag can be used to specify one or more files or | ||
4939 | 702 | # directories that contain example code fragments that are included (see | ||
4940 | 703 | # the \include command). | ||
4941 | 704 | |||
4942 | 705 | EXAMPLE_PATH = ../examples | ||
4943 | 706 | |||
4944 | 707 | # If the value of the EXAMPLE_PATH tag contains directories, you can use the | ||
4945 | 708 | # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp | ||
4946 | 709 | # and *.h) to filter out the source-files in the directories. If left | ||
4947 | 710 | # blank all files are included. | ||
4948 | 711 | |||
4949 | 712 | EXAMPLE_PATTERNS = | ||
4950 | 713 | |||
4951 | 714 | # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be | ||
4952 | 715 | # searched for input files to be used with the \include or \dontinclude | ||
4953 | 716 | # commands irrespective of the value of the RECURSIVE tag. | ||
4954 | 717 | # Possible values are YES and NO. If left blank NO is used. | ||
4955 | 718 | |||
4956 | 719 | EXAMPLE_RECURSIVE = NO | ||
4957 | 720 | |||
4958 | 721 | # The IMAGE_PATH tag can be used to specify one or more files or | ||
4959 | 722 | # directories that contain image that are included in the documentation (see | ||
4960 | 723 | # the \image command). | ||
4961 | 724 | |||
4962 | 725 | IMAGE_PATH = | ||
4963 | 726 | |||
4964 | 727 | # The INPUT_FILTER tag can be used to specify a program that doxygen should | ||
4965 | 728 | # invoke to filter for each input file. Doxygen will invoke the filter program | ||
4966 | 729 | # by executing (via popen()) the command <filter> <input-file>, where <filter> | ||
4967 | 730 | # is the value of the INPUT_FILTER tag, and <input-file> is the name of an | ||
4968 | 731 | # input file. Doxygen will then use the output that the filter program writes | ||
4969 | 732 | # to standard output. If FILTER_PATTERNS is specified, this tag will be | ||
4970 | 733 | # ignored. | ||
4971 | 734 | |||
4972 | 735 | INPUT_FILTER = | ||
4973 | 736 | |||
4974 | 737 | # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern | ||
4975 | 738 | # basis. Doxygen will compare the file name with each pattern and apply the | ||
4976 | 739 | # filter if there is a match. The filters are a list of the form: | ||
4977 | 740 | # pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further | ||
4978 | 741 | # info on how filters are used. If FILTER_PATTERNS is empty or if | ||
4979 | 742 | # non of the patterns match the file name, INPUT_FILTER is applied. | ||
4980 | 743 | |||
4981 | 744 | FILTER_PATTERNS = | ||
4982 | 745 | |||
4983 | 746 | # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using | ||
4984 | 747 | # INPUT_FILTER) will be used to filter the input files when producing source | ||
4985 | 748 | # files to browse (i.e. when SOURCE_BROWSER is set to YES). | ||
4986 | 749 | |||
4987 | 750 | FILTER_SOURCE_FILES = NO | ||
4988 | 751 | |||
4989 | 752 | # The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file | ||
4990 | 753 | # pattern. A pattern will override the setting for FILTER_PATTERN (if any) | ||
4991 | 754 | # and it is also possible to disable source filtering for a specific pattern | ||
4992 | 755 | # using *.ext= (so without naming a filter). This option only has effect when | ||
4993 | 756 | # FILTER_SOURCE_FILES is enabled. | ||
4994 | 757 | |||
4995 | 758 | FILTER_SOURCE_PATTERNS = | ||
4996 | 759 | |||
4997 | 760 | #--------------------------------------------------------------------------- | ||
4998 | 761 | # configuration options related to source browsing | ||
4999 | 762 | #--------------------------------------------------------------------------- | ||
5000 | 763 |
The diff has been truncated for viewing.
Thanks. Uploaded.