diff options
Diffstat (limited to 'xserver')
103 files changed, 9147 insertions, 7366 deletions
diff --git a/xserver/ChangeLog b/xserver/ChangeLog index e9af4f87f..082e971f8 100644 --- a/xserver/ChangeLog +++ b/xserver/ChangeLog @@ -1,3 +1,118 @@ +commit 6197bea02eec072c19aa5365962e89949e674099 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Wed Oct 25 11:05:28 2023 +1000 + + xserver 21.1.9 + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 3e290b3c7c3018acf1f08979d014fe3941c94f84 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu Oct 5 12:19:45 2023 +1000 + + mi: reset the PointerWindows reference on screen switch + + PointerWindows[] keeps a reference to the last window our sprite + entered - changes are usually handled by CheckMotion(). + + If we switch between screens via XWarpPointer our + dev->spriteInfo->sprite->win is set to the new screen's root window. + If there's another window at the cursor location CheckMotion() will + trigger the right enter/leave events later. If there is not, it skips + that process and we never trigger LeaveWindow() - PointerWindows[] for + the device still refers to the previous window. + + If that window is destroyed we have a dangling reference that will + eventually cause a use-after-free bug when checking the window hierarchy + later. + + To trigger this, we require: + - two protocol screens + - XWarpPointer to the other screen's root window + - XDestroyWindow before entering any other window + + This is a niche bug so we hack around it by making sure we reset the + PointerWindows[] entry so we cannot have a dangling pointer. This + doesn't handle Enter/Leave events correctly but the previous code didn't + either. + + CVE-2023-5380, ZDI-CAN-21608 + + This vulnerability was discovered by: + Sri working with Trend Micro Zero Day Initiative + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Adam Jackson <ajax@redhat.com> + (cherry picked from commit 564ccf2ce9616620456102727acb8b0256b7bbd7) + +commit f2922f6ffa871b0d549878303ca09bc53cdadcf8 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue Oct 3 11:53:05 2023 +1000 + + Xi/randr: fix handling of PropModeAppend/Prepend + + The handling of appending/prepending properties was incorrect, with at + least two bugs: the property length was set to the length of the new + part only, i.e. appending or prepending N elements to a property with P + existing elements always resulted in the property having N elements + instead of N + P. + + Second, when pre-pending a value to a property, the offset for the old + values was incorrect, leaving the new property with potentially + uninitalized values and/or resulting in OOB memory writes. + For example, prepending a 3 element value to a 5 element property would + result in this 8 value array: + [N, N, N, ?, ?, P, P, P ] P, P + ^OOB write + + The XI2 code is a copy/paste of the RandR code, so the bug exists in + both. + + CVE-2023-5367, ZDI-CAN-22153 + + This vulnerability was discovered by: + Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + (cherry picked from commit 541ab2ecd41d4d8689e71855d93e492bc554719a) + +commit 2c33ee9f1d6da648a5176795608eb3138ef46e49 +Author: Sam James <sam@gentoo.org> +Date: Wed Aug 2 12:33:19 2023 +0100 + + Switch to libbsd-overlay + + This is more portable than libbsd as everything Just Works, even on BSD systems, + and is the recommended method of consuming libbsd nowadays. + + It also helpfully lets things work with glibc-provided functions for new + enough glibc. + + [For the 21.1.x backport, take inspiration from @alanc's commit to libxdmcp + at https://gitlab.freedesktop.org/xorg/lib/libxdmcp/-/commit/c01da8ebd0969efd15388ce999e121127cc46f67.] + + Closes: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/973 + Co-authored-by: Guillem Jover <guillem@hadrons.org> + (cherry picked from commit 94945a52746ee2612c6cd394692f49e2ed5fc56b) + Signed-off-by: Sam James <sam@gentoo.org> + +commit b98fc07d3442a289c6bef82df50dd0a2d01de71a +Author: Adam Jackson <ajax@redhat.com> +Date: Thu Feb 2 12:26:27 2023 -0500 + + present: Send a PresentConfigureNotify event for destroyed windows + + This enables fixing a deadlock case on the client side, where the client + ends up blocked waiting for a Present event that will never come because + the window was destroyed. The new PresentWindowDestroyed flag allows the + client to avoid blocking indefinitely. + + Signed-off-by: Adam Jackson <ajax@redhat.com> + See-also: https://gitlab.freedesktop.org/mesa/mesa/-/issues/116 + See-also: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6685 + Reviewed-by: Michel Dänzer <mdaenzer@redhat.com> + (cherry picked from commit 462b06033e66a32308d940eb5fc47f5e4c914dc0) + commit 7c791b15504cc86a929acaa88161f012cdbba59f Author: Olivier Fourdan <ofourdan@redhat.com> Date: Wed Mar 29 13:58:30 2023 +0200 @@ -13019,7 +13134,7 @@ Date: Thu Jul 28 14:26:38 2016 +0100 Also add similar to meson.build commit 29a8baa031a87ef44d1e5320ecec5015d26fd385 -Merge: 2aec5c3c8 56c0a71fd +Merge: 2aec5c3c81 56c0a71fdd Author: Aaron Plattner <aplattner@nvidia.com> Date: Fri May 17 08:39:50 2019 -0700 @@ -31070,7 +31185,7 @@ Date: Fri Oct 28 09:28:32 2016 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 356db2340f5b473a7191c7969586ca5b0396c48f -Merge: 9ed5b2635 03d99ef72 +Merge: 9ed5b26354 03d99ef729 Author: Keith Packard <keithp@keithp.com> Date: Fri Oct 28 09:05:54 2016 -0700 @@ -33011,7 +33126,7 @@ Date: Sun Sep 11 03:07:44 2016 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 265c4e66533243b60d92cffc7769ecadb0292c8d -Merge: 3caf671ed f5f4d32ac +Merge: 3caf671ed2 f5f4d32ac7 Author: Keith Packard <keithp@keithp.com> Date: Thu Sep 15 21:32:46 2016 -0700 @@ -34196,7 +34311,7 @@ Date: Fri Jul 29 17:45:45 2016 -0700 Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com> commit 387d6b5df3e11de5cb88db8a559128fcb62e4e5a -Merge: d2558f063 8bb9d460f +Merge: d2558f063a 8bb9d460fb Author: Keith Packard <keithp@keithp.com> Date: Sat Aug 13 09:12:19 2016 -0700 @@ -36395,7 +36510,7 @@ Date: Tue May 10 00:29:58 2016 +0000 Signed-off-by: Guilherme Quentel Melo <gqmelo@gmail.com> commit 266cf39a8f108e2f365a9772f4ee4d9fca88eb36 -Merge: fa7b70a9b 848089e0d +Merge: fa7b70a9b8 848089e0dd Author: Adam Jackson <ajax@redhat.com> Date: Mon Jun 20 11:21:40 2016 -0400 @@ -37038,7 +37153,7 @@ Date: Wed Mar 9 10:31:13 2016 +0100 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit 3735ab965a4642273d070840bda4e827991e5219 -Merge: 7c77c42fe 43dbc556f +Merge: 7c77c42fe8 43dbc556f3 Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 2 07:47:16 2016 -0700 @@ -42803,7 +42918,7 @@ Date: Mon Sep 21 07:16:12 2015 +0100 Reviewed-by: Adam Jackson <ajax@redhat.com> commit 5b582a4a0350c253d729efb31b710851ae9a958e -Merge: 1d4aa6724 27ad21254 +Merge: 1d4aa67242 27ad21254f Author: Adam Jackson <ajax@redhat.com> Date: Mon Oct 19 12:23:22 2015 -0400 @@ -43414,7 +43529,7 @@ Date: Fri Sep 25 14:04:34 2015 +0100 Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> commit dca5770af9e20bb1148374ebfd60931a81b148a2 -Merge: a31bbc450 21f384b7b +Merge: a31bbc450a 21f384b7b8 Author: Adam Jackson <ajax@redhat.com> Date: Fri Sep 25 10:23:28 2015 -0400 @@ -44048,7 +44163,7 @@ Date: Mon Sep 21 15:23:23 2015 -0400 Signed-off-by: Adam Jackson <ajax@redhat.com> commit b25f7d0c165c4d32c73fbdf9080012503d319ba1 -Merge: db1089eaf 1ba4fde10 +Merge: db1089eafc 1ba4fde101 Author: Adam Jackson <ajax@redhat.com> Date: Mon Sep 21 17:34:48 2015 -0400 @@ -44671,7 +44786,7 @@ Date: Tue Jul 7 18:19:50 2015 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit 7ecdfbf0af3547295b245efa754123db65cabb43 -Merge: bca4f4b56 a0b4f30b1 +Merge: bca4f4b56c a0b4f30b1f Author: Keith Packard <keithp@keithp.com> Date: Mon Aug 17 18:53:25 2015 -0700 @@ -44918,7 +45033,7 @@ Date: Thu Jul 16 15:12:52 2015 -0700 Signed-off-by: Eric Anholt <eric@anholt.net> commit 2fcfa532532fbe4a7f668556808e6245ff4e36bc -Merge: cb695b0f3 7b0f94062 +Merge: cb695b0f3b 7b0f940625 Author: Eric Anholt <eric@anholt.net> Date: Fri Jul 17 10:15:01 2015 -0700 @@ -45525,7 +45640,7 @@ Date: Tue Jun 30 14:54:42 2015 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 991712f1e8deeb6289ee0abd9910e279d6396246 -Merge: 0cd228073 3c859112d +Merge: 0cd228073a 3c859112d3 Author: Keith Packard <keithp@keithp.com> Date: Wed Jul 8 10:43:31 2015 -0700 @@ -46077,28 +46192,28 @@ Date: Tue May 12 14:19:15 2015 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit 8a8d51358cea782147bb9b5b2e0902b1e47fcf4a -Merge: b22534d8e 13c7d53df +Merge: b22534d8e6 13c7d53df8 Author: Keith Packard <keithp@keithp.com> Date: Mon Jun 29 21:04:53 2015 -0700 Merge remote-tracking branch 'airlied/for-keithp' commit b22534d8e653575196180970292eaade33c090a8 -Merge: 0a625adee 780a69aff +Merge: 0a625adeec 780a69aff0 Author: Keith Packard <keithp@keithp.com> Date: Mon Jun 29 21:04:11 2015 -0700 Merge remote-tracking branch 'jwrdecoede/for-keith' commit 0a625adeec465d6c7dcdb8622c53157b4e932bb0 -Merge: 84128c10b 790311cec +Merge: 84128c10bb 790311cec3 Author: Keith Packard <keithp@keithp.com> Date: Mon Jun 29 21:01:34 2015 -0700 Merge remote-tracking branch 'anholt/glamor-next' commit 84128c10bb6d34f78f7a4148b3c640748efe58e1 -Merge: 9003a3e5c 8c86dd516 +Merge: 9003a3e5c5 8c86dd5160 Author: Keith Packard <keithp@keithp.com> Date: Mon Jun 29 20:59:31 2015 -0700 @@ -47122,14 +47237,14 @@ Date: Tue Mar 17 10:21:12 2015 +0900 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0409b6e6d63e9cfb5dc71bb27de4b1ed0152dd9b -Merge: c39c3a975 23702dd26 +Merge: c39c3a9750 23702dd268 Author: Keith Packard <keithp@keithp.com> Date: Mon May 11 16:50:43 2015 -0700 Merge remote-tracking branch 'evelikov/master' commit c39c3a97508dc384c0757a0990c07b5d7b2fe97a -Merge: 6b65e9618 747057852 +Merge: 6b65e96189 7470578520 Author: Keith Packard <keithp@keithp.com> Date: Mon May 11 16:34:48 2015 -0700 @@ -47148,7 +47263,7 @@ Date: Wed May 6 15:07:21 2015 +1200 Signed-off-by: Keith Packard <keithp@keithp.com> commit d7091a21d90cf463ae39ec5e8741123218ec5686 -Merge: c3ce9d8fd 8fb8bbb30 +Merge: c3ce9d8fd4 8fb8bbb306 Author: Keith Packard <keithp@keithp.com> Date: Mon May 11 15:49:34 2015 -0700 @@ -47216,7 +47331,7 @@ Date: Sat Apr 25 21:19:25 2015 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit 26e50e8b2cbd01d050b5ecc02d47488b53ecc08b -Merge: 28ff661e7 c7b49bdbb +Merge: 28ff661e73 c7b49bdbb9 Author: Keith Packard <keithp@keithp.com> Date: Mon May 11 15:36:53 2015 -0700 @@ -47880,7 +47995,7 @@ Date: Tue Dec 30 09:13:15 2014 -0800 Acked-by: Alex Deucher <alexander.deucher@amd.com> commit e608f3521eaaab972a3eea62aa04a65958351c1c -Merge: d3b9c47c8 5de138307 +Merge: d3b9c47c84 5de1383070 Author: Keith Packard <keithp@keithp.com> Date: Tue Mar 31 09:06:08 2015 -0700 @@ -47952,7 +48067,7 @@ Date: Tue Mar 31 11:18:44 2015 +1000 Signed-off-by: Dave Airlie <airlied@redhat.com> commit 7088816fee0ca7d609c7bca41ef8c3fc938556f5 -Merge: 95e83ff87 e977b404d +Merge: 95e83ff87a e977b404d7 Author: Keith Packard <keithp@keithp.com> Date: Fri Mar 27 06:45:56 2015 -0700 @@ -49441,7 +49556,7 @@ Date: Thu Jan 15 22:03:18 2015 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 5f2e8ac51ccbf7c02f25c8cb7617df0238418cd1 -Merge: 4e12d7b6f 430147950 +Merge: 4e12d7b6f4 4301479508 Author: Keith Packard <keithp@keithp.com> Date: Sat Jan 10 14:51:57 2015 +1300 @@ -49525,7 +49640,7 @@ Date: Sun Jan 4 19:13:35 2015 -0800 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit 1c01633877caa4239f901f02fbe113926318d030 -Merge: 357385551 e774663fa +Merge: 3573855514 e774663fa5 Author: Keith Packard <keithp@keithp.com> Date: Sun Jan 4 17:02:25 2015 -0800 @@ -50268,7 +50383,7 @@ Date: Mon Dec 1 16:06:17 2014 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit 6704bb0ed7a10dabe8ef3bb3adf8b8a7f29a78f0 -Merge: 8aa23f27c 1559a9439 +Merge: 8aa23f27c7 1559a94395 Author: Keith Packard <keithp@keithp.com> Date: Tue Dec 9 11:47:11 2014 -0800 @@ -50866,14 +50981,14 @@ Date: Fri Jan 17 18:54:03 2014 -0800 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit 3e7218a6c23354d66f508b18164cac98a346b3ee -Merge: 6f4c398a0 bc71081f0 +Merge: 6f4c398a0e bc71081f0e Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 8 18:07:55 2014 -0800 Merge remote-tracking branch 'jturney/indirect-glx-fixes' commit 6f4c398a0e632b0c92e3cb8ee03ca7f5b5cc018e -Merge: aae646069 5920433c3 +Merge: aae6460694 5920433c3a Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 8 18:04:08 2014 -0800 @@ -51191,7 +51306,7 @@ Date: Tue Nov 11 12:30:07 2014 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit ec0ac8970b508adcbc3d104b14a127118e4979d0 -Merge: 65cc0982a 0f88d4e79 +Merge: 65cc0982af 0f88d4e793 Author: Keith Packard <keithp@keithp.com> Date: Mon Nov 24 15:39:51 2014 -0800 @@ -51737,7 +51852,7 @@ Date: Tue Oct 21 15:03:55 2014 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 3a123fbdda56b24dc01a2308137144dc960e0d61 -Merge: 9b29fa957 7ea4a21fe +Merge: 9b29fa957a 7ea4a21fee Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 27 15:39:26 2014 -0700 @@ -51780,7 +51895,7 @@ Date: Mon Oct 27 15:28:14 2014 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 59b12c454d9c4b5a26c6ad87c53abc671b15ce37 -Merge: 5574a0a07 cac4b064f +Merge: 5574a0a07e cac4b064f9 Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 27 14:48:55 2014 -0700 @@ -52258,7 +52373,7 @@ Date: Thu Oct 9 09:58:06 2014 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit de55aafa8f6a9e0dec364bec920d6f91ef2b39f0 -Merge: 462bf87c4 c79f824bf +Merge: 462bf87c4d c79f824bf6 Author: Keith Packard <keithp@keithp.com> Date: Thu Oct 23 17:28:24 2014 -0700 @@ -52497,21 +52612,21 @@ Date: Thu Oct 9 15:17:17 2014 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit d634ecdf82f244ff8ce75d351fc175792d254e5c -Merge: 6622f0cb1 7ebf480f5 +Merge: 6622f0cb17 7ebf480f5e Author: Keith Packard <keithp@keithp.com> Date: Thu Oct 9 15:08:31 2014 +0200 Merge remote-tracking branch 'ajax/dead-code' commit 6622f0cb1761501f3287ffa8d3cbca3fd30f9f0c -Merge: f12e7f498 5ecd7866f +Merge: f12e7f4980 5ecd7866f7 Author: Keith Packard <keithp@keithp.com> Date: Thu Oct 9 15:05:26 2014 +0200 Merge remote-tracking branch 'ajax/mi-cleanup' commit f12e7f4980416b74988052a04d0f2487b2c4a7e9 -Merge: da887726e aaf5e2d64 +Merge: da887726ee aaf5e2d643 Author: Keith Packard <keithp@keithp.com> Date: Thu Oct 9 14:21:19 2014 +0200 @@ -52889,7 +53004,7 @@ Date: Thu Oct 2 10:26:53 2014 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit e9651e3dbc32650fcaf90888b4cbef81da77cfcd -Merge: 9bc01dfc7 4433bc6d5 +Merge: 9bc01dfc70 4433bc6d53 Author: Keith Packard <keithp@keithp.com> Date: Thu Oct 2 10:24:33 2014 -0700 @@ -52961,7 +53076,7 @@ Date: Thu Sep 25 15:27:22 2014 +0900 Signed-off-by: Keith Packard <keithp@keithp.com> commit 78c27d12e1f4857bfcfc92afbb69d5dd989232b9 -Merge: 6e50bfa70 1d6334dd0 +Merge: 6e50bfa706 1d6334dd0c Author: Keith Packard <keithp@keithp.com> Date: Mon Sep 29 13:04:49 2014 -0700 @@ -53418,7 +53533,7 @@ Date: Wed Sep 17 07:41:27 2014 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit eaee6572beefca240c42791f9a3a6e547bedd410 -Merge: e3aa13b8d b84d25fd5 +Merge: e3aa13b8d6 b84d25fd53 Author: Keith Packard <keithp@keithp.com> Date: Wed Sep 17 15:49:24 2014 -0700 @@ -54105,7 +54220,7 @@ Date: Wed Sep 10 16:20:45 2014 +0900 Signed-off-by: Keith Packard <keithp@keithp.com> commit 54a1d4db825be90fb7be138e3267a15922d62f03 -Merge: 8f8dcfee2 f92df22a0 +Merge: 8f8dcfee20 f92df22a03 Author: Keith Packard <keithp@keithp.com> Date: Thu Sep 11 18:27:41 2014 -0700 @@ -54404,7 +54519,7 @@ Date: Fri Jun 13 16:16:51 2014 +0100 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> commit 35dc7c75150733dbcef8a18b6796f49a7c48ebee -Merge: 3a51418b2 5f3485b06 +Merge: 3a51418b2d 5f3485b06e Author: Eric Anholt <eric@anholt.net> Date: Mon Aug 25 15:52:58 2014 -0700 @@ -54615,7 +54730,7 @@ Date: Mon Aug 11 15:23:02 2014 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit d09c9ddb866dea31e2adf82be329d5d3489718f5 -Merge: 606b701c5 ab32ee358 +Merge: 606b701c56 ab32ee3589 Author: Keith Packard <keithp@keithp.com> Date: Tue Aug 12 16:34:24 2014 -0700 @@ -55622,7 +55737,7 @@ Date: Tue Jul 22 17:55:25 2014 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit 556cdf8fe870bc23e0393c0eed15c86f49a0b9f8 -Merge: 83701c4ee 1faa76670 +Merge: 83701c4ee8 1faa766705 Author: Keith Packard <keithp@keithp.com> Date: Thu Jul 24 16:51:00 2014 -0700 @@ -55853,14 +55968,14 @@ Date: Fri Jul 18 09:13:54 2014 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit 5c2e9fa3d6c4bdf626fededce866056ba8eca502 -Merge: e678b4971 6d4954884 +Merge: e678b4971b 6d49548849 Author: Keith Packard <keithp@keithp.com> Date: Thu Jul 17 20:06:21 2014 -0700 Merge remote-tracking branch 'anholt/glamor-next' commit 6d4954884908ea9894fcfe9836db1ba7bb45be61 -Merge: 9ddcb20f4 55f5bfb57 +Merge: 9ddcb20f47 55f5bfb578 Author: Eric Anholt <eric@anholt.net> Date: Thu Jul 17 18:00:44 2014 -0700 @@ -56392,7 +56507,7 @@ Date: Mon Jul 7 08:27:44 2014 +1000 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 9de3cc8daa4c6e877d30a0e8ccfe0cc159f1dbe3 -Merge: 9308eafb7 a5499870e +Merge: 9308eafb7d a5499870e2 Author: Keith Packard <keithp@keithp.com> Date: Mon Jul 7 16:53:07 2014 -0700 @@ -56643,7 +56758,7 @@ Date: Mon Jun 16 08:06:53 2014 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 736bed2aaf4bb672b6c7b33146fe84700baf22bd -Merge: ce581ac3f d90b5f830 +Merge: ce581ac3fa d90b5f8301 Author: Keith Packard <keithp@keithp.com> Date: Mon Jun 23 14:18:03 2014 -0700 @@ -56682,7 +56797,7 @@ Date: Mon Feb 24 11:36:54 2014 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit ea47341792cf06eda5bbdf0aca48aacc024a5be0 -Merge: 334faabe6 a11bbd875 +Merge: 334faabe68 a11bbd875f Author: Keith Packard <keithp@keithp.com> Date: Mon Jun 23 13:50:54 2014 -0700 @@ -57413,7 +57528,7 @@ Date: Wed May 28 08:13:59 2014 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit b5526141f78df15bc5df2497bc4b4a17f1a6368d -Merge: dc8d06884 a205ec3ab +Merge: dc8d068847 a205ec3ab7 Author: Keith Packard <keithp@keithp.com> Date: Mon Jun 2 13:08:23 2014 -0700 @@ -57430,7 +57545,7 @@ Date: Mon Jun 2 01:17:31 2014 +0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit a6ffdc69c4ac45bc39924159c7fab5f02f720f1f -Merge: 63c48de63 1c10b3738 +Merge: 63c48de63b 1c10b37380 Author: Keith Packard <keithp@keithp.com> Date: Mon Jun 2 11:30:24 2014 -0700 @@ -57455,7 +57570,7 @@ Date: Fri May 30 16:50:35 2014 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit ab47ec9636b21a7f542d2e8612834915e7c8cc64 -Merge: 0df871cf3 cfaf2abba +Merge: 0df871cf34 cfaf2abbac Author: Keith Packard <keithp@keithp.com> Date: Mon Jun 2 11:22:48 2014 -0700 @@ -57835,7 +57950,7 @@ Date: Wed Apr 30 10:55:26 2014 +1000 Reviewed-by: Keith Packard <keithp@keithp.com> commit d60724b752613ce2ad11c6ae102bf4513f9768ff -Merge: a5b975714 15460eaed +Merge: a5b9757142 15460eaed2 Author: Keith Packard <keithp@keithp.com> Date: Thu May 8 12:58:41 2014 -0700 @@ -58047,7 +58162,7 @@ Date: Thu Apr 24 13:38:28 2014 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit 6bd7ad914470322ddd02b50078e159234ebec643 -Merge: b92a9289f e06fbe4dc +Merge: b92a9289fe e06fbe4dc8 Author: Keith Packard <keithp@keithp.com> Date: Tue Apr 29 09:37:37 2014 -0700 @@ -58830,7 +58945,7 @@ Date: Mon Apr 21 16:30:49 2014 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit ba5c2b6c876a15fe18bc1ff1ab4e773c46bc9009 -Merge: 9c86d5f4f 66b602474 +Merge: 9c86d5f4f6 66b6024740 Author: Keith Packard <keithp@keithp.com> Date: Mon Apr 21 14:59:51 2014 -0700 @@ -59250,7 +59365,7 @@ Date: Tue Apr 8 01:01:28 2014 -0700 Reviewed-by: Eric Anholt <eric@anholt.net> commit 3028ae6c9aa37168e249e0d847b29f8e3efb05b2 -Merge: bd3de10f8 ec6007e6f +Merge: bd3de10f86 ec6007e6f7 Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 9 21:59:17 2014 -0700 @@ -59344,7 +59459,7 @@ Date: Thu Apr 3 18:22:50 2014 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit b4d0bec22c15930abf13a7fb9d684208ccd56b1d -Merge: 3c34dd360 6e539d881 +Merge: 3c34dd3603 6e539d8817 Author: Keith Packard <keithp@keithp.com> Date: Thu Apr 3 15:35:01 2014 -0700 @@ -59613,7 +59728,7 @@ Date: Fri Mar 21 13:13:27 2014 -0700 Reviewed-by: Julien Cristau <jcristau@debian.org> commit 84f977467b514af88019ab2791bf7a74530b54df -Merge: 9d20d18fb 98924719d +Merge: 9d20d18fb9 98924719d5 Author: Keith Packard <keithp@keithp.com> Date: Thu Apr 3 10:44:28 2014 -0700 @@ -59774,7 +59889,7 @@ Date: Wed Mar 26 12:24:49 2014 +0100 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 9d20d18fb9dcc74bfa5392a2da40fd41b3e640d3 -Merge: 8468e2443 bc348bd2c +Merge: 8468e24430 bc348bd2c4 Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 31 23:24:56 2014 -0700 @@ -60297,7 +60412,7 @@ Date: Tue Mar 25 13:48:52 2014 -0400 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit bda6fdc71c25b0c3f3747f445103a1995a5713f4 -Merge: e46820fb8 78167a98a +Merge: e46820fb89 78167a98a8 Author: Keith Packard <keithp@keithp.com> Date: Tue Mar 25 16:06:03 2014 -0700 @@ -60416,7 +60531,7 @@ Date: Sat Mar 22 14:30:04 2014 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit d9fdae5f4a648a10653e18dbc602646f3e22e522 -Merge: 99bee6c05 0e5d2996a +Merge: 99bee6c054 0e5d2996ac Author: Keith Packard <keithp@keithp.com> Date: Sat Mar 22 14:09:00 2014 -0700 @@ -60450,7 +60565,7 @@ Date: Fri Jan 17 09:54:01 2014 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit 1782316744866a181ed92486bb4dca6ac46d40bd -Merge: 4fb31e482 2b77b208d +Merge: 4fb31e4824 2b77b208da Author: Keith Packard <keithp@keithp.com> Date: Sat Mar 22 13:46:15 2014 -0700 @@ -60684,7 +60799,7 @@ Date: Wed Mar 19 10:27:39 2014 -0700 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 4fb31e4824d46edc80bb49b4065152899faa5ac6 -Merge: d18d3f6d1 0e531fbb9 +Merge: d18d3f6d18 0e531fbb97 Author: Keith Packard <keithp@keithp.com> Date: Wed Mar 19 06:43:14 2014 -0700 @@ -60700,7 +60815,7 @@ Date: Wed Mar 12 16:31:25 2014 +1000 Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> commit d18d3f6d18aa7827748f7ba14efd405b525883d0 -Merge: 81a4952d3 6649d0059 +Merge: 81a4952d3d 6649d0059e Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 17 17:29:56 2014 -0700 @@ -61359,7 +61474,7 @@ Date: Fri Mar 7 14:32:28 2014 -0800 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 81a4952d3dcab9ca3a1ee399c773f5ac352036c4 -Merge: 96a28e9c9 795066477 +Merge: 96a28e9c91 795066477e Author: Keith Packard <keithp@keithp.com> Date: Tue Mar 11 22:04:36 2014 -0700 @@ -61719,7 +61834,7 @@ Date: Mon Mar 10 08:58:37 2014 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 1c61d38528a573caadee2468ee59ea558c822e09 -Merge: 5350ae1d3 bf3543739 +Merge: 5350ae1d38 bf3543739d Author: Keith Packard <keithp@keithp.com> Date: Fri Mar 7 22:07:19 2014 -0800 @@ -62258,7 +62373,7 @@ Date: Sun Feb 9 11:20:59 2014 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 1940508a4af33d44a7a8ef24bbdcd1e31e228dab -Merge: c85ea92af ddeca9274 +Merge: c85ea92af1 ddeca92749 Author: Keith Packard <keithp@keithp.com> Date: Mon Feb 24 16:27:52 2014 -0800 @@ -62273,7 +62388,7 @@ Date: Mon Feb 24 09:51:39 2014 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0840a303c47b9b10ba8e24e62956da0f1675e963 -Merge: 0f10cfd4b 3d71df48e +Merge: 0f10cfd4b9 3d71df48e7 Author: Keith Packard <keithp@keithp.com> Date: Mon Feb 24 09:40:23 2014 -0800 @@ -62639,7 +62754,7 @@ Date: Sun Feb 9 16:56:40 2014 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 5300212ce8e9364ba26497605f3edc089af20130 -Merge: ae796d43c 0b193b3ac +Merge: ae796d43c9 0b193b3ac9 Author: Keith Packard <keithp@keithp.com> Date: Sun Feb 9 16:05:42 2014 -0800 @@ -63202,14 +63317,14 @@ Date: Tue Jan 28 20:27:49 2014 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit da1660deeb9032ecca61f4bcdc9fc2eec2ada445 -Merge: 0fbb3d711 9fc19168e +Merge: 0fbb3d711e 9fc19168e7 Author: Keith Packard <keithp@keithp.com> Date: Mon Jan 27 19:02:15 2014 -0800 Merge remote-tracking branch 'whot/for-keith' commit 0fbb3d711efec5222a57b45a70d28fc98380f3a1 -Merge: 7ddef4f70 b98e49379 +Merge: 7ddef4f703 b98e49379c Author: Keith Packard <keithp@keithp.com> Date: Mon Jan 27 14:11:09 2014 -0800 @@ -63697,14 +63812,14 @@ Date: Wed Dec 11 11:55:37 2013 -0800 Reviewed-by: Eric Anholt <eric@anholt.net> commit 25ebb9dbc9df659dec2bf6c27654a5bad2d11f94 -Merge: 409e8e29f 71baa466b +Merge: 409e8e29fb 71baa466b1 Author: Keith Packard <keithp@keithp.com> Date: Wed Jan 22 11:33:53 2014 -0800 Merge remote-tracking branch 'whot/for-keith' commit 409e8e29fbe16122ba5a4249256fc56e2e68ea93 -Merge: 457bc8354 d6c8d7509 +Merge: 457bc83549 d6c8d75097 Author: Keith Packard <keithp@keithp.com> Date: Wed Jan 22 11:32:35 2014 -0800 @@ -63732,21 +63847,21 @@ Date: Sat Jan 4 00:09:45 2014 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 044a6ef2ff5f2c83a80b11e747f62f48830b526b -Merge: 0b932cf47 77df653ae +Merge: 0b932cf47a 77df653ae3 Author: Keith Packard <keithp@keithp.com> Date: Wed Jan 22 11:28:54 2014 -0800 Merge remote-tracking branch 'jeremyhu/master' commit 0b932cf47a4df8ea0f7488e285d218fe7c10dd77 -Merge: 1d76b02fa 295d41fa2 +Merge: 1d76b02fac 295d41fa2a Author: Keith Packard <keithp@keithp.com> Date: Wed Jan 22 11:27:36 2014 -0800 Merge remote-tracking branch 'anholt/xserver-unifdef' commit 1d76b02fac79c0360ae201e4d1a8ba0e9a00e810 -Merge: 771f390ef 4dd62d780 +Merge: 771f390efd 4dd62d7807 Author: Keith Packard <keithp@keithp.com> Date: Wed Jan 22 11:22:35 2014 -0800 @@ -64681,7 +64796,7 @@ Date: Thu Dec 19 14:31:07 2013 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 4b1ead9d3400acc3402c2480d7cc0527750c32f0 -Merge: 4d6264614 929795d50 +Merge: 4d62646142 929795d50d Author: Keith Packard <keithp@keithp.com> Date: Thu Dec 19 14:14:59 2013 -0800 @@ -67956,7 +68071,7 @@ Date: Wed Nov 2 13:44:50 2011 +0800 Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com> commit 2dbbe2565052cc024ce0e98918ed34c1239b780a -Merge: 4d6264614 7982eca62 +Merge: 4d62646142 7982eca622 Author: Eric Anholt <eric@anholt.net> Date: Wed Dec 18 11:21:07 2013 -0800 @@ -67974,7 +68089,7 @@ Date: Wed Dec 18 11:16:15 2013 -0800 support code outside of glamor for now. commit 4d62646142718024b0981eb4f1fd0131e829161f -Merge: f4bfb14f5 81ba89d67 +Merge: f4bfb14f53 81ba89d670 Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 16 09:27:57 2013 -0800 @@ -69041,7 +69156,7 @@ Date: Fri Nov 15 13:26:36 2013 +0900 Signed-off-by: Keith Packard <keithp@keithp.com> commit 29240e5cbf6e7f875b128fc7bfc4d56b2350835a -Merge: 0492deb8f 8ff7e32c3 +Merge: 0492deb8f8 8ff7e32c3e Author: Keith Packard <keithp@keithp.com> Date: Thu Nov 14 17:02:04 2013 +0900 @@ -69305,7 +69420,7 @@ Date: Thu Nov 7 15:18:28 2013 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit a239e6faf3fce848ac0d10c48f8e817db68a493c -Merge: 43e5a43fa f70a8bf37 +Merge: 43e5a43fa8 f70a8bf371 Author: Keith Packard <keithp@keithp.com> Date: Mon Nov 11 15:26:12 2013 -0800 @@ -69542,7 +69657,7 @@ Date: Fri Nov 1 01:43:59 2013 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 977e2644b1d9e13b44debcb9a372bbc832ee32a3 -Merge: 66c5ee0ff f36f5a65f +Merge: 66c5ee0ff4 f36f5a65f6 Author: Keith Packard <keithp@keithp.com> Date: Fri Nov 1 00:34:18 2013 -0700 @@ -69741,7 +69856,7 @@ Date: Tue Oct 8 17:45:40 2013 -0400 Reviewed-by: Adam Jackson <ajax@redhat.com> commit 95bf478b78e466002c382bcde7d4d62591e9215d -Merge: abf5d5ac1 bb745f2b4 +Merge: abf5d5ac12 bb745f2b45 Author: Keith Packard <keithp@keithp.com> Date: Thu Oct 31 18:18:19 2013 -0700 @@ -69763,7 +69878,7 @@ Date: Thu Oct 31 08:57:56 2013 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit e4636072949a76477fe7c9d54662a0b3536b1372 -Merge: 17ed7ac1f 5c5c1b779 +Merge: 17ed7ac1fe 5c5c1b7798 Author: Keith Packard <keithp@keithp.com> Date: Thu Oct 31 17:05:48 2013 -0700 @@ -70027,7 +70142,7 @@ Date: Wed Oct 30 13:33:49 2013 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit 1470c0a132806fb2ce817515ad4ddfe66eb7c98f -Merge: 04ab07ca1 9f4afe7e8 +Merge: 04ab07ca19 9f4afe7e83 Author: Keith Packard <keithp@keithp.com> Date: Tue Oct 29 21:00:13 2013 -0700 @@ -70075,7 +70190,7 @@ Date: Thu Oct 17 18:26:28 2013 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit b32a4c91ccd479638c2bd2c0143b6ea170c717d1 -Merge: be6680967 c671e935e +Merge: be6680967a c671e935e7 Author: Keith Packard <keithp@keithp.com> Date: Tue Oct 29 09:37:30 2013 -0700 @@ -70349,7 +70464,7 @@ Date: Fri Oct 18 17:31:01 2013 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit e3220d7bae4548bf64e5879c981ad070ac1f78f7 -Merge: 73b2660d7 2523a445a +Merge: 73b2660d72 2523a445a0 Author: Keith Packard <keithp@keithp.com> Date: Fri Oct 18 17:22:52 2013 -0700 @@ -70359,7 +70474,7 @@ Date: Fri Oct 18 17:22:52 2013 -0700 also merging in the spurious merge at the top of that branch. commit f8662a133690773692dfa392ecfa3b8b56af8fa9 -Merge: 7cf1b595c 2523a445a +Merge: 7cf1b595c8 2523a445a0 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Oct 18 16:50:12 2013 +1000 @@ -70742,7 +70857,7 @@ Date: Sun Oct 6 16:45:52 2013 +0100 Reviewed-by: Adam Jackson <ajax@redhat.com> commit 6a9bd103cb993e873cb82664b677ceed73c0bd85 -Merge: ea3b7db4b 8aae28e3c +Merge: ea3b7db4b7 8aae28e3cb Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 7 17:29:38 2013 -0700 @@ -70931,7 +71046,7 @@ Date: Sat Sep 28 15:26:33 2013 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit f3b529bf25db2700addbafc7aa4fc5b126ba9929 -Merge: 4399bd383 abc2bfca1 +Merge: 4399bd3832 abc2bfca16 Author: Keith Packard <keithp@keithp.com> Date: Fri Oct 4 14:04:48 2013 -0700 @@ -70948,14 +71063,14 @@ Date: Mon Sep 30 13:30:46 2013 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit 9ccb4a63982942fdce19609d2cadbd8e51708462 -Merge: 5d2ec6933 da5e20127 +Merge: 5d2ec6933f da5e20127a Author: Keith Packard <keithp@keithp.com> Date: Fri Oct 4 13:54:55 2013 -0700 Merge remote-tracking branch 'whot/for-keith' commit 5d2ec6933f6bb5116666ca1bfb07f0f20bf2a0b5 -Merge: 7d3d4ae55 6ee4d9f94 +Merge: 7d3d4ae55d 6ee4d9f94a Author: Keith Packard <keithp@keithp.com> Date: Fri Oct 4 13:50:04 2013 -0700 @@ -71613,7 +71728,7 @@ Date: Wed Aug 21 14:12:52 2013 -0400 Signed-off-by: Adam Jackson <ajax@redhat.com> commit 47ff382d1fce25a8b097d45b79489e891f1f1228 -Merge: 6f89ae3e6 3752a8158 +Merge: 6f89ae3e64 3752a81580 Author: Keith Packard <keithp@keithp.com> Date: Mon Sep 9 15:13:42 2013 -0700 @@ -72544,7 +72659,7 @@ Date: Sat Aug 17 12:17:36 2013 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit f67d022523c59a27f3bf8791aa9ca6624318b1fd -Merge: 5a36cdd91 9680f6a12 +Merge: 5a36cdd915 9680f6a12d Author: Keith Packard <keithp@keithp.com> Date: Tue Aug 6 07:12:12 2013 +0200 @@ -72669,7 +72784,7 @@ Date: Wed Jul 31 11:24:48 2013 +1000 Signed-off-by: Dave Airlie <airlied@redhat.com> commit ff38bbe81ace85bf675bbaa0a9ca5f3b32ede449 -Merge: bdd1e22cb 4360514d1 +Merge: bdd1e22cbd 4360514d1c Author: Keith Packard <keithp@keithp.com> Date: Thu Jul 25 22:50:27 2013 -0700 @@ -72972,7 +73087,7 @@ Date: Mon Sep 3 15:19:43 2012 +0100 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> commit d5ebe20f9ba9569351c4a41449866679fd60ba45 -Merge: 21ea7ebb6 33f7e6078 +Merge: 21ea7ebb6a 33f7e60785 Author: Keith Packard <keithp@keithp.com> Date: Mon Jul 22 20:34:41 2013 -0700 @@ -73321,7 +73436,7 @@ Date: Mon Jun 17 15:51:19 2013 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 227015d6544115258b74c31b700f9bd163540e24 -Merge: d9005d58c 80054fcaf +Merge: d9005d58c0 80054fcafb Author: Keith Packard <keithp@keithp.com> Date: Tue Jun 18 10:53:08 2013 -0700 @@ -73496,21 +73611,21 @@ Date: Mon May 27 13:46:49 2013 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit cb3018d8a15add48efb3335e1f79b66378166008 -Merge: c76a1b343 6589f3b55 +Merge: c76a1b343d 6589f3b55e Author: Keith Packard <keithp@keithp.com> Date: Thu May 23 19:58:46 2013 -0600 Merge remote-tracking branch 'whot/unreviewed' commit c76a1b343d6a56aa9529e87f0eda8d61355d562b -Merge: 891123ce9 9a5ad6533 +Merge: 891123ce9d 9a5ad65330 Author: Keith Packard <keithp@keithp.com> Date: Thu May 23 19:58:36 2013 -0600 Merge remote-tracking branch 'whot/touch-grab-race-condition-56578-v3' commit 891123ce9dac5e52685b9a921b33d8279ba52956 -Merge: 7e97166c4 49521edaf +Merge: 7e97166c4f 49521edaf8 Author: Keith Packard <keithp@keithp.com> Date: Thu May 23 10:30:15 2013 -0600 @@ -74283,14 +74398,14 @@ Date: Fri Feb 15 11:19:10 2013 +1000 Reviewed-by: Keith Packard <keithp@keithp.com> commit 2746c681639f9512e6e45fb8d0151b996b6aff7f -Merge: 1e6cf8ec2 9878e097a +Merge: 1e6cf8ec20 9878e097a7 Author: Keith Packard <keithp@keithp.com> Date: Mon May 6 10:52:40 2013 -0700 Merge remote-tracking branch 'alanc/master' commit 1e6cf8ec20d07b73a11116564aba71b4e4291dcd -Merge: dbfeaf706 5860408a1 +Merge: dbfeaf7062 5860408a19 Author: Keith Packard <keithp@keithp.com> Date: Mon May 6 10:20:21 2013 -0700 @@ -74657,21 +74772,21 @@ Date: Sun Feb 10 10:24:59 2013 -0800 Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> commit 7ab98bafc9a3426fd40f8ae693430491333ba4fc -Merge: 53da26afb 5ab260317 +Merge: 53da26afb7 5ab260317a Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 24 14:14:45 2013 -0700 Merge remote-tracking branch 'geertu/master' commit 53da26afb76bcce70b91c5df23d25e7e85c010cf -Merge: 5ece86e92 d8d3c78b6 +Merge: 5ece86e921 d8d3c78b6e Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 24 10:27:19 2013 -0700 Merge remote-tracking branch 'whot/for-keith' commit 5ece86e921a1df457a9baab6a2357ccda4ad6957 -Merge: ef0a726bc 22cab8a28 +Merge: ef0a726bc8 22cab8a28a Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 24 10:23:51 2013 -0700 @@ -75391,7 +75506,7 @@ Date: Sat Feb 23 13:14:45 2013 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit c2ede8f92f0d6f15b1b2a04889cb54cd1728780b -Merge: 190b03215 7050aae69 +Merge: 190b032151 7050aae69c Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 18 11:26:24 2013 -0700 @@ -75415,7 +75530,7 @@ Date: Thu Feb 14 15:06:57 2013 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 116f020102fd6c2a603069a639b113dfa31b48b7 -Merge: cf89aa537 0f537da72 +Merge: cf89aa5374 0f537da72d Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 18 11:18:58 2013 -0700 @@ -75684,7 +75799,7 @@ Date: Tue Mar 5 10:14:29 2013 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 604169af8b67afc74a292cdb9070a3a1f2d7c536 -Merge: 8f4640bdb 6ea59dc2d +Merge: 8f4640bdb9 6ea59dc2d8 Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 4 21:09:59 2013 -0800 @@ -75883,7 +75998,7 @@ Date: Mon Feb 27 16:43:10 2012 +1000 Reviewed-by: Chase Douglas <chase.douglas@canonical.com> commit 88517ced1fa2e621be2d05a319b522b3111da516 -Merge: 82425c66e 73974dd7e +Merge: 82425c66e7 73974dd7ea Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Feb 15 11:58:52 2013 +1000 @@ -76006,7 +76121,7 @@ Date: Thu Feb 14 10:02:02 2013 +1000 Reviewed-by: Mark Kettenis <kettenis@openbsd.org> commit 90642948cc78834d95f7a3bddaac7ff77b68ed7e -Merge: 9a35d4240 eda7dbff5 +Merge: 9a35d4240e eda7dbff5a Author: Keith Packard <keithp@keithp.com> Date: Thu Feb 14 11:05:48 2013 -0800 @@ -76242,7 +76357,7 @@ Date: Fri Jan 25 11:47:32 2013 +1000 Reviewed-by: Keith Packard <keithp@keithp.com> commit 0d5bb882600ee7734af034fbea935a79d21d1e70 -Merge: b33fcb149 61a99aff9 +Merge: b33fcb1497 61a99aff9d Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Feb 8 14:10:52 2013 +1000 @@ -76674,14 +76789,14 @@ Date: Tue Jan 22 07:39:53 2013 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 069d8ed3eb659c48dd2b0f8b7b8c11f092fdb362 -Merge: 591c06277 d6dcde7a0 +Merge: 591c06277b d6dcde7a03 Author: Keith Packard <keithp@keithp.com> Date: Sun Jan 20 15:58:38 2013 -0800 Merge remote-tracking branch 'jturney/xserver-next' commit 591c06277bb120ab9615633f2d28addbd3a2aa5f -Merge: 6703a7c7c fa6ab7d9b +Merge: 6703a7c7cf fa6ab7d9b2 Author: Keith Packard <keithp@keithp.com> Date: Sun Jan 20 15:52:26 2013 -0800 @@ -76864,7 +76979,7 @@ Date: Wed Oct 26 17:03:25 2011 -0500 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> commit fa6ab7d9b2d7fd8184f1e068360607845f5c33ab -Merge: adde4e644 0e1ab433f +Merge: adde4e6448 0e1ab433f4 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Jan 11 14:58:17 2013 +1000 @@ -77281,14 +77396,14 @@ Date: Wed Dec 19 12:47:35 2012 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 2a0b544f5c09f79e4ab04ea8103a5ecf59ee2e7b -Merge: 0eb1559eb ba4bb3bc1 +Merge: 0eb1559eb2 ba4bb3bc1b Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 19 12:26:00 2012 -0800 Merge remote-tracking branch 'jeremyhu/master' commit 0eb1559eb29d11e63c2b33e317590a88d86fe313 -Merge: 386e4d76b ea1d76d1b +Merge: 386e4d76ba ea1d76d1b6 Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 19 12:21:31 2012 -0800 @@ -77298,14 +77413,14 @@ Date: Wed Dec 19 12:21:31 2012 -0800 whitespace. commit 386e4d76baaffe226d2d561ff936509454eb0ac2 -Merge: 014a5c8a9 9ff2e8315 +Merge: 014a5c8a9d 9ff2e83151 Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 19 12:17:59 2012 -0800 Merge remote-tracking branch 'alanc/master' commit 014a5c8a9d86f2f992183bff9106354fac2c3b0e -Merge: f793b5fd3 2eefa5d6e +Merge: f793b5fd3e 2eefa5d6e8 Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 19 12:09:31 2012 -0800 @@ -77467,7 +77582,7 @@ Date: Wed Dec 12 11:02:19 2012 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 6d508b81857edaed03c7ee06410434ea56d9b701 -Merge: d982d8774 bb6f3514c +Merge: d982d87743 bb6f3514ca Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 17 11:45:45 2012 -0800 @@ -77477,7 +77592,7 @@ Date: Mon Dec 17 11:45:45 2012 -0800 reviewed them... commit d982d877436377597b8ed04bca1438d2edaf53ee -Merge: da3eaf6bd 6b4aa8a35 +Merge: da3eaf6bdb 6b4aa8a359 Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 17 10:56:12 2012 -0800 @@ -77827,14 +77942,14 @@ Date: Thu Nov 1 14:14:13 2012 -0400 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit bb6f3514ca17d993c1af380e8d4480d61e5bbcae -Merge: f961c3a3b 08da994a0 +Merge: f961c3a3b9 08da994a08 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Wed Dec 12 17:25:28 2012 +1000 Merge branch 'stack-smash-on-touchpoint' into for-keith commit f961c3a3b9dfbe1201da317c24797ba7f979731e -Merge: 36740d02b 39f19b3f3 +Merge: 36740d02b9 39f19b3f3b Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Wed Dec 12 17:25:23 2012 +1000 @@ -78035,7 +78150,7 @@ Date: Tue Dec 4 15:03:37 2012 +1000 Tested-by: Frank Roscher <Frank-Roscher@gmx.net> commit b51a1bd2766e7dc975ca8f1cacc3f8bd0e1a68a3 -Merge: e9ea96d6a ce6b65292 +Merge: e9ea96d6a8 ce6b652929 Author: Keith Packard <keithp@keithp.com> Date: Fri Nov 30 09:31:46 2012 -0800 @@ -78057,7 +78172,7 @@ Date: Fri Nov 30 20:54:38 2012 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit ce6b6529290f7d42717aad3fd8a83aaaaf8962de -Merge: 6e18599d6 3b9f1c701 +Merge: 6e18599d69 3b9f1c7017 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Nov 29 14:49:22 2012 +1000 @@ -78170,7 +78285,7 @@ Date: Thu Nov 8 14:28:09 2012 +0100 Signed-off-by: Dave Airlie <airlied@redhat.com> commit 1712a45422a63f11b2146541279616fcfda09ec6 -Merge: e54f71a2c 338bec300 +Merge: e54f71a2c7 338bec3005 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 28 07:54:13 2012 -0800 @@ -78303,7 +78418,7 @@ Date: Wed Oct 17 12:06:47 2012 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit d50a94568e06a06df682a0028579d37a7b209d15 -Merge: 87b60efb8 cf05db8dd +Merge: 87b60efb85 cf05db8dde Author: Keith Packard <keithp@keithp.com> Date: Tue Nov 27 15:14:26 2012 -0800 @@ -78708,7 +78823,7 @@ Date: Sat Oct 13 22:43:26 2012 -0400 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea -Merge: 14c9e245b 6f145084d +Merge: 14c9e245ba 6f145084d5 Author: Keith Packard <keithp@keithp.com> Date: Sun Nov 18 21:50:20 2012 -0800 @@ -78818,7 +78933,7 @@ Date: Sat Nov 17 11:52:10 2012 -0500 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> commit 011f8458805e443ac9130865d2840a929a00cabf -Merge: 54ba26cb1 b4e44b285 +Merge: 54ba26cb1f b4e44b285e Author: Keith Packard <keithp@keithp.com> Date: Mon Nov 5 17:16:07 2012 -0800 @@ -79145,7 +79260,7 @@ Date: Wed Oct 24 23:57:11 2012 -0500 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit 04f980ead5e9af066143a921e0a0e98f26f28ee5 -Merge: a194630f7 a4941ce49 +Merge: a194630f7f a4941ce496 Author: Keith Packard <keithp@keithp.com> Date: Mon Nov 5 08:45:21 2012 -0800 @@ -79195,7 +79310,7 @@ Date: Tue Sep 4 17:28:16 2012 +0100 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> commit a194630f7f7b287cb4ea4a459df0745f4c0d4c1a -Merge: 74a313042 d511a3016 +Merge: 74a3130426 d511a3016a Author: Keith Packard <keithp@keithp.com> Date: Thu Nov 1 13:38:54 2012 -0700 @@ -79230,7 +79345,7 @@ Date: Thu Oct 25 15:03:50 2012 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 74a3130426d7e1b456e45daa517769cd3e4b58c0 -Merge: 1ca096d5e f32ad6dd3 +Merge: 1ca096d5e0 f32ad6dd31 Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 29 09:09:16 2012 -0700 @@ -79384,14 +79499,14 @@ Date: Sun Oct 14 23:38:20 2012 -0500 Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> commit 53830281b4da096f9c13107d73ec9c76ff1d14cc -Merge: abc2ef590 9cbcb5bd6 +Merge: abc2ef590c 9cbcb5bd6a Author: Keith Packard <keithp@keithp.com> Date: Fri Oct 26 18:04:34 2012 -0700 Merge remote-tracking branch 'sandmann/for-keithp' commit abc2ef590c7cb33ebe21726f83b7347406975f95 -Merge: 0e85e5e62 c5396ec05 +Merge: 0e85e5e628 c5396ec05a Author: Keith Packard <keithp@keithp.com> Date: Fri Oct 26 17:11:58 2012 -0700 @@ -80202,7 +80317,7 @@ Date: Thu Oct 4 14:42:37 2012 -0700 Reviewed-by: Julien Cristau <jcristau@debian.org> commit 8367dd9736d74eca971da345c2bf559ce5bbf649 -Merge: 36c18bb81 7998e2615 +Merge: 36c18bb81b 7998e26159 Author: Keith Packard <keithp@keithp.com> Date: Thu Oct 4 13:08:35 2012 -0700 @@ -80266,7 +80381,7 @@ Date: Thu Oct 4 11:42:22 2012 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit f179b13b91c8891254d31345ee04e773839e6b87 -Merge: 4dd5989d1 3d2b768ef +Merge: 4dd5989d15 3d2b768efa Author: Keith Packard <keithp@keithp.com> Date: Thu Oct 4 11:39:46 2012 -0700 @@ -80418,7 +80533,7 @@ Date: Fri Sep 7 18:10:35 2012 +0100 Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> commit 4dd5989d15465f3f3480b521d4e36673972fa24a -Merge: 0b02150c2 506e3437c +Merge: 0b02150c27 506e3437c7 Author: Keith Packard <keithp@keithp.com> Date: Mon Sep 24 11:43:01 2012 -0700 @@ -80454,7 +80569,7 @@ Date: Mon Sep 24 14:03:31 2012 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit 7722bcbab2507d263c7685b15cccbfdd52fc3a24 -Merge: 4dc2a7674 f54987de9 +Merge: 4dc2a76740 f54987de97 Author: Keith Packard <keithp@keithp.com> Date: Sun Sep 23 16:04:13 2012 -0700 @@ -80700,7 +80815,7 @@ Date: Thu Jun 16 17:40:24 2011 -0400 Signed-off-by: Adam Jackson <ajax@redhat.com> commit d01921ec18c21f21d377b60626cc2d3418b84a7c -Merge: 70e576687 245e7e036 +Merge: 70e5766874 245e7e0361 Author: Keith Packard <keithp@keithp.com> Date: Thu Sep 20 17:26:48 2012 +0200 @@ -80887,7 +81002,7 @@ Date: Wed Sep 5 14:45:08 2012 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 856f80c8d7f22b979c72d9c70b70187df6004a03 -Merge: 0db936a5b b8ab93dfb +Merge: 0db936a5b7 b8ab93dfbc Author: Keith Packard <keithp@keithp.com> Date: Wed Sep 5 11:02:58 2012 -0700 @@ -81032,7 +81147,7 @@ Date: Mon Aug 27 17:15:19 2012 -0700 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit a557edca6152ad09c685a00e01534c35a1f00f2e -Merge: 6619f5c0e 24ffcfcde +Merge: 6619f5c0e1 24ffcfcded Author: Keith Packard <keithp@keithp.com> Date: Mon Aug 27 08:06:09 2012 -0700 @@ -81224,7 +81339,7 @@ Date: Thu Jul 19 22:15:10 2012 +0000 Signed-off-by: Adam Jackson <ajax@redhat.com> commit ad5fe2d9614959b68bf71e23abf7e5abac9c2734 -Merge: 16d8da5ca 99b94af1f +Merge: 16d8da5ca9 99b94af1ff Author: Keith Packard <keithp@keithp.com> Date: Wed Aug 15 13:29:17 2012 -0700 @@ -81365,21 +81480,21 @@ Date: Sat Jul 14 16:07:51 2012 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit 02f94b2d446f6700f791f318c551ac835af8445a -Merge: 360fa7736 7f09126e0 +Merge: 360fa7736b 7f09126e06 Author: Keith Packard <keithp@keithp.com> Date: Mon Aug 6 16:52:12 2012 -0700 Merge remote-tracking branch 'whot/for-keith' commit 360fa7736b214cae3ccd39feb4dc87b9e7e9734c -Merge: 2100e7238 ac09a4a09 +Merge: 2100e72388 ac09a4a091 Author: Keith Packard <keithp@keithp.com> Date: Mon Aug 6 16:42:34 2012 -0700 Merge remote-tracking branch 'airlied/for-keithp' commit 2100e72388a3dc174093d80c9723f021b4614d17 -Merge: 4a6f42dda c37c65052 +Merge: 4a6f42dda0 c37c65052f Author: Keith Packard <keithp@keithp.com> Date: Mon Aug 6 16:40:54 2012 -0700 @@ -81595,21 +81710,21 @@ Date: Tue Jul 10 23:29:53 2012 -0700 Reviewed-by: Keith Packard <keithp@keithp.com> commit 94b514d5e4b376d05e106eb3853da511256e8545 -Merge: 7d87545ba 732890004 +Merge: 7d87545ba7 7328900042 Author: Keith Packard <keithp@keithp.com> Date: Mon Aug 6 15:13:17 2012 -0700 Merge remote-tracking branch 'whot/for-keith' commit 7d87545ba7395ade507cca7bdca7052b26ed18d8 -Merge: ad707a7dc 988d7ace1 +Merge: ad707a7dcc 988d7ace19 Author: Keith Packard <keithp@keithp.com> Date: Mon Aug 6 15:11:13 2012 -0700 Merge remote-tracking branch 'jturney/master' commit ad707a7dcc65c30e030c7600b54f734090e56a91 -Merge: 5a51cb86f 884f51e97 +Merge: 5a51cb86f3 884f51e977 Author: Keith Packard <keithp@keithp.com> Date: Mon Aug 6 15:08:01 2012 -0700 @@ -82080,7 +82195,7 @@ Date: Thu Jul 19 15:00:03 2012 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit 20b4d90f32b3ca5def5be2fdf04a91ae6c47f125 -Merge: 83df16953 fd228d318 +Merge: 83df169538 fd228d3184 Author: Keith Packard <keithp@keithp.com> Date: Wed Jul 25 13:52:35 2012 -0700 @@ -82175,14 +82290,14 @@ Date: Tue Jul 17 15:47:39 2012 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit beeea70495a8d5c4afc1b1eb2cc06a24ab1a986d -Merge: 6e438a0e1 691028029 +Merge: 6e438a0e18 6910280297 Author: Keith Packard <keithp@keithp.com> Date: Tue Jul 17 12:17:39 2012 -0700 Merge remote-tracking branch 'alanc/master' commit 6e438a0e183f5a6c22070746c038af53d5b935ca -Merge: 5884e7ded 75966a418 +Merge: 5884e7dede 75966a4186 Author: Keith Packard <keithp@keithp.com> Date: Tue Jul 17 12:12:53 2012 -0700 @@ -82547,7 +82662,7 @@ Date: Fri Jul 13 00:47:24 2012 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 746193a7f10f11cccae05c98b933aadf58fc7375 -Merge: a2d082953 2b74949ad +Merge: a2d0829531 2b74949ad0 Author: Keith Packard <keithp@keithp.com> Date: Thu Jul 12 15:10:51 2012 -0700 @@ -82599,7 +82714,7 @@ Date: Thu Jul 12 00:36:43 2012 +0100 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> commit 656e5fea6c9ca15f932889edcc590dd01c881945 -Merge: 8b820f221 1720cd9ba +Merge: 8b820f221a 1720cd9bad Author: Keith Packard <keithp@keithp.com> Date: Thu Jul 12 08:26:35 2012 -0700 @@ -82801,7 +82916,7 @@ Date: Tue Jul 10 01:14:13 2012 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 6e12cb147da58bd12a158807b2cd5afac32ae70f -Merge: 532fbc29c 023127915 +Merge: 532fbc29c9 023127915e Author: Keith Packard <keithp@keithp.com> Date: Tue Jul 10 00:52:11 2012 -0700 @@ -84484,7 +84599,7 @@ Date: Thu Jul 5 21:11:16 2012 +0100 Signed-off-by: Dave Airlie <airlied@redhat.com> commit 4d24192bd24fb20d16d0054d77bffda883faeb79 -Merge: 7c9d8cbd3 74b786f7c +Merge: 7c9d8cbd36 74b786f7ce Author: Keith Packard <keithp@keithp.com> Date: Fri Jul 6 12:17:17 2012 -0700 @@ -85016,7 +85131,7 @@ Date: Thu Jun 28 17:17:12 2012 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit d84f0f823eeeecdf0498aadd3fbb1d11dabc0837 -Merge: 12bfb4cf1 d04dfe3f7 +Merge: 12bfb4cf1b d04dfe3f75 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Wed Jul 4 21:23:48 2012 +1000 @@ -85134,7 +85249,7 @@ Date: Fri Jun 22 13:02:40 2012 +1000 Reviewed-by: Keith Packard <keithp@keithp.com> commit 24525d96a3b9dba67eb75042500b2f208a2cc246 -Merge: 4cd91bd4c 35e3d2291 +Merge: 4cd91bd4c6 35e3d22915 Author: Keith Packard <keithp@keithp.com> Date: Mon Jul 2 22:35:39 2012 -0700 @@ -85454,14 +85569,14 @@ Date: Thu Jun 28 12:07:11 2012 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 8b4f0a4fdd6c15f49458bc3a8c3135b8c389240d -Merge: 59294a217 d642e7128 +Merge: 59294a2179 d642e71287 Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 28 10:38:26 2012 -0700 Merge remote-tracking branch 'jturney/master' commit 59294a2179bd5bb996693af004b470932df00ac6 -Merge: 855003c33 191b63065 +Merge: 855003c333 191b630656 Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 28 10:11:44 2012 -0700 @@ -85693,7 +85808,7 @@ Date: Fri Jun 24 13:32:10 2011 +0100 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> commit 3ef3ce069d52dcfa932c90ccd30854a8d9daa15a -Merge: a0c8716cd ff541e0a1 +Merge: a0c8716cdc ff541e0a1f Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 21 08:52:34 2012 -0700 @@ -85832,14 +85947,14 @@ Date: Thu Jun 7 16:52:20 2012 +1000 Reviewed-by: Chase Douglas <chase.douglas@canonical.com> commit 8dc70acbf3d82611ac9ec1ec2a52edcc01934850 -Merge: ffb47a123 b59adc9c2 +Merge: ffb47a123d b59adc9c24 Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 14 13:04:29 2012 -0700 Merge remote-tracking branch 'alanc/master' commit ffb47a123ddd1233fb4229cf23483652065c5e82 -Merge: db9d2b8a5 b840ba5f5 +Merge: db9d2b8a50 b840ba5f54 Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 14 13:01:17 2012 -0700 @@ -85858,7 +85973,7 @@ Date: Thu Jun 7 15:01:59 2012 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 6d86b64dbaef5a16712fd1fdc3157f716d238877 -Merge: 812786f4d 4c68f5d39 +Merge: 812786f4d4 4c68f5d395 Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 14 11:05:22 2012 -0700 @@ -86495,7 +86610,7 @@ Date: Fri Apr 6 12:44:07 2012 -0700 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit 3476eb38063473a7a5fcd78e2095e284118de839 -Merge: 78f0d9cdc 42ae2e819 +Merge: 78f0d9cdc4 42ae2e8199 Author: Keith Packard <keithp@keithp.com> Date: Sun Jun 3 20:24:24 2012 -0700 @@ -86806,7 +86921,7 @@ Date: Tue May 22 21:19:40 2012 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 457fc77691b2df66f6dd3ba10ce7c1b61b9b42a3 -Merge: 2e237c838 5a3a98fcb +Merge: 2e237c838f 5a3a98fcb7 Author: Keith Packard <keithp@keithp.com> Date: Tue May 22 10:32:29 2012 -0700 @@ -87026,7 +87141,7 @@ Date: Thu Jan 26 15:44:40 2012 -0800 Reviewed-by: Dave Airlie <airlied@redhat.com> commit ba883a0f3435d5da82a8134e696c4905eea70f23 -Merge: ae1c48ebc acdc4f54e +Merge: ae1c48ebc8 acdc4f54ee Author: Keith Packard <keithp@keithp.com> Date: Thu May 17 16:49:19 2012 -0700 @@ -87381,7 +87496,7 @@ Date: Tue Apr 24 18:11:16 2012 +0200 Signed-off-by: Dave Airlie <airlied@redhat.com> commit 3a94b338aaa48b656aae1bb3a5a9d64300c0a093 -Merge: afc153a5b c91d00e0f +Merge: afc153a5b4 c91d00e0f3 Author: Keith Packard <keithp@keithp.com> Date: Wed May 9 21:17:16 2012 -0700 @@ -87564,7 +87679,7 @@ Date: Wed Apr 18 17:51:50 2012 +0800 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 97041364a6acb2b66b5cfd06757c90a006ad50e9 -Merge: 19082726c ee542b855 +Merge: 19082726cb ee542b8559 Author: Keith Packard <keithp@keithp.com> Date: Wed May 2 20:47:25 2012 -0700 @@ -87956,7 +88071,7 @@ Date: Thu Apr 19 16:51:46 2012 -0700 Tested-By: Michal Suchanek <hramrach@gmail.com> commit d77eb7ee49ef19c2c4c7381d56e9d0f9c3fbc890 -Merge: 31e3c0ff7 c7b162555 +Merge: 31e3c0ff7f c7b1625558 Author: Keith Packard <keithp@keithp.com> Date: Thu Apr 19 15:48:34 2012 -0500 @@ -87975,7 +88090,7 @@ Date: Thu Apr 19 15:25:41 2012 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit e6308e32fe2b5f74133d4d238ffa512257f6327c -Merge: 3720aa33e 51a8d8dd1 +Merge: 3720aa33ee 51a8d8dd19 Author: Keith Packard <keithp@keithp.com> Date: Thu Apr 19 10:45:07 2012 -0500 @@ -87984,7 +88099,7 @@ Date: Thu Apr 19 10:45:07 2012 -0500 Touch input changes from Chase commit 51a8d8dd19d7496fe84b37a1f0a7a03658120539 -Merge: ebf214876 00cf1c40b +Merge: ebf214876a 00cf1c40b2 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Apr 19 17:03:54 2012 +1000 @@ -88392,7 +88507,7 @@ Date: Tue Apr 17 11:48:03 2012 +0100 cursor: hide cursors on LeaveVT commit 80fefc42f5e67e6b4a4b440d8991bee7e5f38359 -Merge: 9779b904c 12188c8a8 +Merge: 9779b904c7 12188c8a8a Author: Keith Packard <keithp@keithp.com> Date: Sun Apr 15 21:05:30 2012 -0700 @@ -88761,7 +88876,7 @@ Date: Fri Mar 23 08:20:22 2012 +1000 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 7f3997b01a8813c1d7055317eb06111aed8572c9 -Merge: 92d50c38b 31646d8fa +Merge: 92d50c38b2 31646d8fa9 Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 26 16:41:52 2012 -0700 @@ -89180,7 +89295,7 @@ Date: Fri Mar 23 14:54:05 2012 +0000 modesetting: fix build against older Xext commit a7eac500e652f30deffd9dc5e623fab701077738 -Merge: bf876c87a d645edd11 +Merge: bf876c87a9 d645edd11e Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Mar 22 13:13:07 2012 +1000 @@ -89314,7 +89429,7 @@ Date: Wed Mar 14 17:22:18 2012 -0700 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit bf876c87a9099fdfa63ed599f8ed9a954dd023d9 -Merge: 908ab3d58 c0b0a9bce +Merge: 908ab3d580 c0b0a9bce9 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Mar 22 11:34:43 2012 +1000 @@ -89946,7 +90061,7 @@ Date: Sun Feb 19 08:34:25 2012 -0500 Signed-off-by: Dave Airlie <airlied@redhat.com> commit 71594746c7da32e1c7986341a0da30f241a7a2be -Merge: d53235af8 eaba06a27 +Merge: d53235af85 eaba06a27c Author: Keith Packard <keithp@keithp.com> Date: Wed Feb 22 18:07:20 2012 +1300 @@ -90191,7 +90306,7 @@ Date: Sat Feb 11 16:13:44 2012 +1300 Signed-off-by: Keith Packard <keithp@keithp.com> commit 42b6756463ee0476340656707f1088dc6c2fd220 -Merge: 7674d00b0 ca64912c0 +Merge: 7674d00b04 ca64912c02 Author: Keith Packard <keithp@keithp.com> Date: Sat Feb 11 15:36:43 2012 +1300 @@ -90970,14 +91085,14 @@ Date: Thu Jan 12 12:09:34 2012 -0800 ABI change pended for 1.13 commit e722ad6c3efa57b806ca0f2dc13114bd3619a88c -Merge: e476af417 4e44580ef +Merge: e476af417d 4e44580efd Author: Keith Packard <keithp@keithp.com> Date: Mon Jan 9 13:22:28 2012 -0800 Merge remote-tracking branch 'jturney/rpavlik-xwin-fixes' commit e476af417d83730b11054f4e5b127ab5540bb332 -Merge: f4956faab 146008358 +Merge: f4956faab9 146008358e Author: Keith Packard <keithp@keithp.com> Date: Mon Jan 9 13:17:37 2012 -0800 @@ -91112,21 +91227,21 @@ Date: Fri Jan 6 07:21:37 2012 +0000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0b113f7cdf5228dccd51a749a339c8669e3f20ff -Merge: 0b2c6491c 777bf90ab +Merge: 0b2c6491c5 777bf90abe Author: Keith Packard <keithp@keithp.com> Date: Mon Jan 9 13:07:25 2012 -0800 Merge commit '777bf90abeac37087a3d0538b847742523d5acf2' commit 0b2c6491c5e5e1c9ba067299f3de61f5acee263b -Merge: 1f5587e14 6b1943653 +Merge: 1f5587e144 6b19436536 Author: Keith Packard <keithp@keithp.com> Date: Mon Jan 9 11:40:23 2012 -0800 Merge remote-tracking branch 'whot/for-keith' commit 1f5587e14406c083687203030db6a11691ac9d9f -Merge: a97252db2 6269977c9 +Merge: a97252db24 6269977c91 Author: Keith Packard <keithp@keithp.com> Date: Mon Jan 9 11:37:59 2012 -0800 @@ -91631,7 +91746,7 @@ Date: Tue Dec 27 14:02:01 2011 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 8dedf9831bd80514d800f0085213296a3726dba7 -Merge: cfc4c3d7f cf9618312 +Merge: cfc4c3d7fa cf96183122 Author: Keith Packard <keithp@keithp.com> Date: Tue Dec 27 13:13:48 2011 -0800 @@ -91730,7 +91845,7 @@ Date: Thu Dec 22 10:00:15 2011 +1000 Reviewed-by: Chase Douglas <chase.douglas@canonical.com> commit e395efc25f9fd60377f32c2bf1a9153d70908236 -Merge: 2bb282cd4 fcda98c48 +Merge: 2bb282cd45 fcda98c486 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Dec 22 09:29:59 2011 +1000 @@ -92168,14 +92283,14 @@ Date: Mon Dec 19 14:52:41 2011 +1000 Reviewed-by: Chase Douglas <chase.douglas@canonical.com> commit 2d34b34ed7547b829979756ccfb2cff79368d0a4 -Merge: e4b4d83fa 1deede3c4 +Merge: e4b4d83fad 1deede3c48 Author: Keith Packard <keithp@keithp.com> Date: Tue Dec 20 00:23:33 2011 -0800 Merge remote-tracking branch 'jeremyhu/master' commit e4b4d83fad37bb737e25f7226dbcd15b892f9528 -Merge: 4df65d247 d26cb7027 +Merge: 4df65d247b d26cb70272 Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 19 22:36:31 2011 -0800 @@ -92689,7 +92804,7 @@ Date: Wed Dec 14 10:34:19 2011 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 7da7aa96a0acb895e1fe57a9d3f2d093479cf2a2 -Merge: b79de3f42 7528a6b88 +Merge: b79de3f42f 7528a6b88e Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 14 11:40:10 2011 -0800 @@ -92707,7 +92822,7 @@ Date: Wed Dec 14 10:31:23 2011 +1000 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 7528a6b88eb32098af4369a8bd9d70a808fa6f1c -Merge: f0de5e399 898d97672 +Merge: f0de5e3990 898d976729 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Tue Dec 13 14:19:54 2011 +1000 @@ -93587,7 +93702,7 @@ Date: Thu Dec 8 21:52:07 2011 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 522f8bcc0360d6a117e929a004bc956ab92037e9 -Merge: 6369b5966 2abe83df6 +Merge: 6369b59668 2abe83df68 Author: Keith Packard <keithp@keithp.com> Date: Thu Dec 8 20:57:26 2011 -0800 @@ -93788,14 +93903,14 @@ Date: Thu Dec 1 16:24:32 2011 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit 3ab8ee32470f7cf1223e04238bb8c5f74ed52fc3 -Merge: 22a666f99 98c4a888a +Merge: 22a666f995 98c4a888a4 Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 7 12:42:17 2011 -0800 Merge remote-tracking branch 'airlied/reviewed-fixes' commit 22a666f9952feb7248e9bb2faf777edaaac8175f -Merge: 3824f558c e89b0324d +Merge: 3824f558cc e89b0324da Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 7 12:27:23 2011 -0800 @@ -94209,14 +94324,14 @@ Date: Tue Nov 8 10:13:15 2011 -0800 Reviewed-by: Jamey Sharp <jamey@minilop.net> commit 05f09354a30a4f5edd421220e1aa97be754c71bb -Merge: 3197b773c 08ec4da6a +Merge: 3197b773c8 08ec4da6a7 Author: Keith Packard <keithp@keithp.com> Date: Thu Dec 1 14:44:52 2011 +0000 Merge remote-tracking branch 'jcristau/for-keith' commit 3197b773c81e58cd4aa412eccaee49526012ed6f -Merge: 2dc5ba4a1 dfcec1d3f +Merge: 2dc5ba4a1b dfcec1d3f9 Author: Keith Packard <keithp@keithp.com> Date: Thu Dec 1 14:36:58 2011 +0000 @@ -95092,7 +95207,7 @@ Date: Fri Nov 4 23:26:25 2011 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit bfa2a1857a1efda7f171f10e855d200ca0dbcc1a -Merge: f0d50cc66 e7cb8f802 +Merge: f0d50cc665 e7cb8f802a Author: Keith Packard <keithp@keithp.com> Date: Mon Nov 14 09:07:06 2011 -0800 @@ -95255,7 +95370,7 @@ Date: Thu Nov 3 13:18:46 2011 +0000 Not needed in here commit 548c6fe044068ffba9b5306dc6b11f2ba22782a4 -Merge: 3881b0bf1 ffe8ec86d +Merge: 3881b0bf1c ffe8ec86db Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 2 21:35:31 2011 -0700 @@ -95274,14 +95389,14 @@ Date: Tue Nov 1 07:17:07 2011 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit d91aa0e6601bdf3e2cfa57b3412ab14ac486edc4 -Merge: 8df3a9ca5 401150d7d +Merge: 8df3a9ca5a 401150d7dc Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 2 21:20:07 2011 -0700 Merge remote-tracking branch 'whot/two-screen-coordinates' commit 8df3a9ca5abbd56eb2013fa65250d21a8f18865b -Merge: 8329afa59 ef895484c +Merge: 8329afa59d ef895484c8 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 2 21:18:16 2011 -0700 @@ -95436,7 +95551,7 @@ Date: Mon Oct 31 15:01:12 2011 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 132545ff576cc69ed63f5a08127151fe550de4c3 -Merge: d0c6732a9 d7c44a7c9 +Merge: d0c6732a99 d7c44a7c97 Author: Keith Packard <keithp@keithp.com> Date: Sun Oct 30 16:57:58 2011 -0700 @@ -95662,7 +95777,7 @@ Date: Tue Oct 25 23:48:16 2011 -0700 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> commit 5701ab4a441eb113abd0851b0d71b82d12112854 -Merge: 7d50211ab a41214bc9 +Merge: 7d50211ab5 a41214bc9a Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 24 22:09:00 2011 -0700 @@ -95887,7 +96002,7 @@ Date: Mon Oct 24 18:47:06 2011 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit d9d3a01ffca5e2de650d098231e16205781804c5 -Merge: 17416e88d fb55f8f79 +Merge: 17416e88dc fb55f8f790 Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 24 18:12:23 2011 -0700 @@ -96064,21 +96179,21 @@ Date: Thu Oct 20 14:28:56 2011 -0700 Reviewed-by: Julien Cristau <jcristau@debian.org> commit ff61592441916b83aeb778c74352bb5b26247f84 -Merge: af3f64fb7 525d4172b +Merge: af3f64fb77 525d4172b2 Author: Keith Packard <keithp@keithp.com> Date: Wed Oct 19 19:14:32 2011 -0700 Merge remote-tracking branch 'aplattner/for-master' commit af3f64fb77c13180e513ee99d1fd9a1b624fd8ea -Merge: 15bbdc103 df0dd36de +Merge: 15bbdc103b df0dd36dee Author: Keith Packard <keithp@keithp.com> Date: Wed Oct 19 17:33:07 2011 -0700 Merge remote-tracking branch 'hramrach/pull' commit 15bbdc103b34b6b374815698946e6c409421a644 -Merge: a5266dcb3 323869f32 +Merge: a5266dcb3a 323869f329 Author: Keith Packard <keithp@keithp.com> Date: Wed Oct 19 17:26:50 2011 -0700 @@ -96185,7 +96300,7 @@ Date: Tue Aug 23 15:19:59 2011 -0700 Signed-off-by: Aaron Plattner <aplattner@nvidia.com> commit c8413362049cee8c30e0a9d67f78f9ebefe8e71f -Merge: 64d2d1bef b67581cf8 +Merge: 64d2d1bef1 b67581cf82 Author: Keith Packard <keithp@keithp.com> Date: Tue Oct 18 07:45:24 2011 -0700 @@ -96332,14 +96447,14 @@ Date: Fri Sep 30 10:59:47 2011 +1000 Reviewed-by: Daniel Stone <daniel@fooishbar.org> commit 64d2d1bef14c7ec7156bb3aae64eff69f9f7be54 -Merge: fb84be47d 679c84bce +Merge: fb84be47db 679c84bce9 Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 17 14:36:34 2011 -0700 Merge remote-tracking branch 'jeremyhu/master' commit fb84be47db7cdaff406792c08e34670e8e0cbda9 -Merge: fae7ed62a 32b289e46 +Merge: fae7ed62ad 32b289e46c Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 17 13:50:25 2011 -0700 @@ -97101,14 +97216,14 @@ Date: Tue Aug 30 13:37:31 2011 +1000 Reviewed-by: Daniel Stone <daniel@fooishbar.org> commit 6378d0233d21088b6429755627b4253859892c72 -Merge: 6e965d8a1 98b230669 +Merge: 6e965d8a18 98b230669f Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 3 13:56:06 2011 -0700 Merge remote-tracking branch 'herrb/master' commit 6e965d8a185087a55b2100b817e18f05b3ce5a00 -Merge: 466e4b3f1 ac5881d6d +Merge: 466e4b3f17 ac5881d6d0 Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 3 13:47:49 2011 -0700 @@ -97244,14 +97359,14 @@ Date: Mon Sep 26 22:38:44 2011 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 9a55b3661b4172f9a32cd6fefb254e06edb1a88a -Merge: cf11ca360 84bb0207f +Merge: cf11ca360c 84bb0207f6 Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 3 11:49:23 2011 -0700 Merge remote-tracking branch 'alanc/master' commit cf11ca360c2ded5ca309faa9d039160947387bb8 -Merge: 463dd8706 6eae9fa28 +Merge: 463dd87062 6eae9fa284 Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 3 11:44:59 2011 -0700 @@ -97274,7 +97389,7 @@ Date: Thu Sep 22 18:38:53 2011 +0300 Signed-off-by: Keith Packard <keithp@keithp.com> commit f5d50b46ddeb039ab6564141f61261e94ee67637 -Merge: 57cd32e93 524e5445c +Merge: 57cd32e934 524e5445c0 Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 3 11:36:28 2011 -0700 @@ -97410,7 +97525,7 @@ Date: Sun Sep 25 20:44:26 2011 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 4c6bc0e76599dbe5ede2e1f48c9936a0e996b638 -Merge: 057cc92eb 3304bbff9 +Merge: 057cc92ebf 3304bbff9b Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Sep 30 09:24:56 2011 +1000 @@ -97619,7 +97734,7 @@ Date: Thu Sep 29 11:49:26 2011 +0100 server recycling. commit 057cc92ebfeebe81b7d01ff2c6aa2c066c8d1a64 -Merge: afb1fe695 52c9b59a9 +Merge: afb1fe695d 52c9b59a9f Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Sep 29 14:18:35 2011 +1000 @@ -98134,7 +98249,7 @@ Date: Thu Sep 22 18:55:19 2011 -0700 Reviewed-by: Aaron Plattner <aplattner@nvidia.com> commit afb1fe695d197187a301c19863a128a65389b15c -Merge: 7fb4bef03 c7163fdd3 +Merge: 7fb4bef039 c7163fdd30 Author: Keith Packard <keithp@keithp.com> Date: Mon Sep 26 20:24:15 2011 -0700 @@ -100453,21 +100568,21 @@ Date: Thu Sep 1 16:48:37 2011 -0700 Reviewed-by: Matt Dew <marcoz@osource.org> commit 7fb4bef0394a5d09680985d34bce8252b61493cb -Merge: 98f494009 c90903b4f +Merge: 98f4940093 c90903b4f7 Author: Keith Packard <keithp@keithp.com> Date: Wed Sep 21 14:34:27 2011 -0700 Merge remote-tracking branch 'mattst88/for-keith' commit 98f4940093dc90c3366d3e4d3ddceacbaee299dc -Merge: b018b8153 c8eacae4f +Merge: b018b81533 c8eacae4f8 Author: Keith Packard <keithp@keithp.com> Date: Wed Sep 21 14:30:19 2011 -0700 Merge remote-tracking branch 'alanc/master' commit b018b815333b256b5e06dd6251b2e539f09f89fa -Merge: 03d032991 0f380a500 +Merge: 03d032991d 0f380a5005 Author: Keith Packard <keithp@keithp.com> Date: Wed Sep 21 14:17:14 2011 -0700 @@ -100797,7 +100912,7 @@ Date: Wed Sep 7 17:47:56 2011 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit c92c83523ede8bc361526ac93d09d089fbbdae08 -Merge: 4ad271d06 24b2b43e8 +Merge: 4ad271d06c 24b2b43e85 Author: Keith Packard <keithp@keithp.com> Date: Wed Sep 21 13:32:06 2011 -0700 @@ -101847,7 +101962,7 @@ Date: Fri Jul 29 16:12:06 2011 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit b8f61c11c94708d4f17720a55945dee4621315a4 -Merge: 5596f10cc f51e42f58 +Merge: 5596f10cce f51e42f583 Author: Keith Packard <keithp@keithp.com> Date: Fri Jul 29 14:58:58 2011 -0700 @@ -102163,7 +102278,7 @@ Date: Wed Jul 13 12:08:03 2011 +0100 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 01dbf2514aa0cc8c40a876a24e3cb0737c41da19 -Merge: 5a801af68 af0fbc37e +Merge: 5a801af689 af0fbc37e3 Author: Keith Packard <keithp@keithp.com> Date: Wed Jul 13 11:44:15 2011 -0700 @@ -102329,7 +102444,7 @@ Date: Mon Oct 11 16:21:40 2010 +0100 Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> commit d4096abb591353405417e53816e5c46e904e7b25 -Merge: 61f87a75f 87d4f90bf +Merge: 61f87a75f2 87d4f90bfc Author: Keith Packard <keithp@keithp.com> Date: Fri Jul 1 15:45:45 2011 -0700 @@ -102567,14 +102682,14 @@ Date: Tue Jun 7 21:22:15 2011 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 61f87a75f2bcda939a1778d39be8cfa5c886e6d8 -Merge: 0d2153a46 72d914335 +Merge: 0d2153a46c 72d914335c Author: Keith Packard <keithp@keithp.com> Date: Wed Jun 29 20:14:51 2011 -0700 Merge remote-tracking branch 'jturney/master' commit 0d2153a46cc72d5f2e6a9081a3cf153aa3eb7787 -Merge: b631c39a2 932513e23 +Merge: b631c39a21 932513e23b Author: Keith Packard <keithp@keithp.com> Date: Wed Jun 29 20:08:32 2011 -0700 @@ -102595,7 +102710,7 @@ Date: Thu Jun 23 13:37:45 2011 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit d5ca33ca2dd08e8436439da926d2dedaabc268fa -Merge: 38d55f06c 4edf49d03 +Merge: 38d55f06cf 4edf49d032 Author: Keith Packard <keithp@keithp.com> Date: Wed Jun 29 18:54:33 2011 -0700 @@ -102758,7 +102873,7 @@ Date: Tue Jun 28 09:33:25 2011 -0700 after 'make clean' causing 'make distcheck' to fail. commit f968f4ace9410d827fb6b68c4e38ea9516641309 -Merge: 4dbed2625 163441fe5 +Merge: 4dbed26254 163441fe53 Author: Keith Packard <keithp@keithp.com> Date: Tue Jun 28 09:10:14 2011 -0700 @@ -102833,7 +102948,7 @@ Date: Tue Jun 14 17:21:48 2011 -0700 Tested-by: Peter Hutterer <peter.hutterer@who-t.net> commit 8ac651552bb70ba36238f430adab2f7a7f24db6e -Merge: 945b2ff81 47b6ba320 +Merge: 945b2ff814 47b6ba3204 Author: Keith Packard <keithp@keithp.com> Date: Wed Jun 22 11:03:37 2011 -0700 @@ -103408,14 +103523,14 @@ Date: Fri May 27 11:40:56 2011 +1000 Reviewed-by: Daniel Stone <daniel@fooishbar.org> commit 02d11af01211da55e9d93fe0e1851a0c6fe57472 -Merge: bf9fd0a83 ab0df72cd +Merge: bf9fd0a83e ab0df72cd3 Author: Keith Packard <keithp@keithp.com> Date: Tue Jun 7 12:31:15 2011 -0700 Merge remote-tracking branch 'kibi/master' commit bf9fd0a83eef771ee018438f05e2d9f20b43539b -Merge: 21eec367d 0d140567b +Merge: 21eec367d0 0d140567ba Author: Keith Packard <keithp@keithp.com> Date: Tue Jun 7 07:45:22 2011 -0700 @@ -103765,14 +103880,14 @@ Date: Wed Jun 1 11:20:10 2011 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0643c056512d10be8db223d18d6563292d57e916 -Merge: a2e6cfc18 d45f5b249 +Merge: a2e6cfc18a d45f5b2493 Author: Keith Packard <keithp@keithp.com> Date: Tue May 31 23:45:07 2011 -0700 Merge remote-tracking branch 'ajax/xserver-next' commit a2e6cfc18aec1c0027b51572b03ec9f2ab074b56 -Merge: bc04065b5 8d84fd256 +Merge: bc04065b5c 8d84fd2566 Author: Keith Packard <keithp@keithp.com> Date: Tue May 31 23:42:52 2011 -0700 @@ -103908,7 +104023,7 @@ Date: Tue May 24 16:02:42 2011 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 4725d6b0dbb6371af4a1b2fbef851dcfe155514a -Merge: 1b2d17748 b5d828789 +Merge: 1b2d17748f b5d828789c Author: Keith Packard <keithp@keithp.com> Date: Wed May 25 09:40:51 2011 -0600 @@ -104350,21 +104465,21 @@ Date: Fri May 6 18:18:15 2011 +0300 Signed-off-by: Keith Packard <keithp@keithp.com> commit ba5540221f2a46133371b4ff0d527b1a0a1443b1 -Merge: 6347a0b80 728d0bf20 +Merge: 6347a0b802 728d0bf20e Author: Keith Packard <keithp@keithp.com> Date: Fri May 13 13:59:36 2011 -0700 Merge remote-tracking branch 'whot/for-keith' commit 6347a0b802812bb185ada1bf0951add306935184 -Merge: 4d02c5397 f144fb771 +Merge: 4d02c53971 f144fb771f Author: Keith Packard <keithp@keithp.com> Date: Fri May 13 13:54:29 2011 -0700 Merge remote-tracking branch 'jeremyhu/master' commit 4d02c5397114ac4d15e794908f0708427e258261 -Merge: 043c17586 eac37f32b +Merge: 043c175865 eac37f32b8 Author: Keith Packard <keithp@keithp.com> Date: Fri May 13 13:52:18 2011 -0700 @@ -105066,7 +105181,7 @@ Date: Sat Apr 23 18:09:11 2011 -0700 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> commit 5cb31cd0cbf83fff5f17a475e7b0e45246b19bf3 -Merge: 0f284f0f4 4d8735d38 +Merge: 0f284f0f42 4d8735d388 Author: Keith Packard <keithp@keithp.com> Date: Fri Apr 29 09:59:49 2011 -0700 @@ -105121,14 +105236,14 @@ Date: Wed Apr 27 22:12:59 2011 -0700 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> commit f6d4e75ec55ac6812f9dead42ecdffb9614578c7 -Merge: ec9ea4017 4318e6a14 +Merge: ec9ea40178 4318e6a147 Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 27 12:08:51 2011 -0700 Merge remote-tracking branch 'jturney/master' commit ec9ea4017885cefe5519a4e890b0ff1a5518235a -Merge: c6cb70be1 6f29dbf5e +Merge: c6cb70be1e 6f29dbf5e3 Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 27 12:01:56 2011 -0700 @@ -105842,7 +105957,7 @@ Date: Mon Mar 28 11:38:11 2011 -0400 Signed-off-by: Søren Sandmann <ssp@redhat.com> commit 918a9c99cf2ebc73acb34b95f597904b93c690d9 -Merge: 88c4622b5 5f496bc91 +Merge: 88c4622b59 5f496bc919 Author: Keith Packard <keithp@keithp.com> Date: Fri Apr 22 11:20:16 2011 -0700 @@ -105872,7 +105987,7 @@ Date: Mon Apr 18 08:23:48 2011 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 302bdc3c9678c028bed71dbe9c5ba04997626b6b -Merge: 001b6b8b7 6f97fe5df +Merge: 001b6b8b70 6f97fe5df1 Author: Keith Packard <keithp@keithp.com> Date: Fri Apr 22 10:48:37 2011 -0700 @@ -106602,14 +106717,14 @@ Date: Wed Apr 6 14:51:45 2011 -0400 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 3085b178626c957854385c7a88a05ec3c7eb74f3 -Merge: c9d89cec1 3c45b59e6 +Merge: c9d89cec14 3c45b59e67 Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 6 08:34:10 2011 -0700 Merge remote-tracking branch 'jturney/master' commit c9d89cec1407550cb2568f4cef146c93607bbae6 -Merge: a52049de2 bc61787a2 +Merge: a52049de2f bc61787a20 Author: Keith Packard <keithp@keithp.com> Date: Mon Apr 4 11:57:39 2011 -0700 @@ -106856,7 +106971,7 @@ Date: Wed Mar 23 18:06:51 2011 +0200 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit a52049de2f846fe984d4db5ac8d2c1826c7b2d0b -Merge: d044d3675 266ea63bc +Merge: d044d36756 266ea63bc3 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Mon Apr 4 09:58:53 2011 +1000 @@ -107032,7 +107147,7 @@ Date: Tue Mar 29 14:27:41 2011 +1000 Reviewed-by: Keith Packard <keithp@keithp.com> commit e0a2ad51dfb7373aa602335490d9666d6101b5ea -Merge: 327e1d880 3d688316a +Merge: 327e1d8801 3d688316af Author: Keith Packard <keithp@keithp.com> Date: Wed Mar 30 10:51:27 2011 -0700 @@ -107261,14 +107376,14 @@ Date: Mon Mar 28 17:18:39 2011 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit a095a6d4e8f5090907e8d3d66018636216300846 -Merge: a22486f84 ef9d04f8a +Merge: a22486f848 ef9d04f8ad Author: Keith Packard <keithp@keithp.com> Date: Sun Mar 27 20:06:29 2011 -0700 Merge remote-tracking branch 'airlied/pwin-cleanup' commit a22486f848014000dc13dda470f77d4d8ea9e9f6 -Merge: 2ef4ff45e 633b81e8b +Merge: 2ef4ff45ef 633b81e8ba Author: Keith Packard <keithp@keithp.com> Date: Sun Mar 27 18:27:10 2011 -0700 @@ -107476,7 +107591,7 @@ Date: Tue Mar 22 19:01:48 2011 -0700 Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> commit 03f45df93469f6aef391e97007b9614e0770cc4c -Merge: efcb7275c 5fb329a04 +Merge: efcb7275ce 5fb329a04a Author: Keith Packard <keithp@keithp.com> Date: Wed Mar 23 13:38:37 2011 +0900 @@ -107665,7 +107780,7 @@ Date: Sun Mar 13 20:01:30 2011 +0000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0ac4931753a5d5925fc844c8cbec08585aea57a7 -Merge: a8146f6be d7f801141 +Merge: a8146f6bec d7f8011418 Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 14 13:06:41 2011 -0700 @@ -107985,7 +108100,7 @@ Date: Wed Mar 9 15:11:42 2011 +1000 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit c3c0e2fdd326214e271ce144e8fc2725cbd738ef -Merge: a19771e43 73555555a +Merge: a19771e433 73555555a4 Author: Keith Packard <keithp@keithp.com> Date: Wed Mar 9 14:25:54 2011 -0800 @@ -108354,28 +108469,28 @@ Date: Fri Mar 4 01:12:01 2011 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 6c90e839d9872a37d371578c9c423e8213922044 -Merge: 0bc95d5b0 edcceedbd +Merge: 0bc95d5b06 edcceedbd3 Author: Keith Packard <keithp@keithp.com> Date: Thu Mar 3 14:41:44 2011 -0800 Merge remote branch 'whot/for-keith' commit 0bc95d5b06dcea65a1aa193ea907b50f7dd168b5 -Merge: 3f41f4ade 69a9171db +Merge: 3f41f4adea 69a9171dbb Author: Keith Packard <keithp@keithp.com> Date: Thu Mar 3 14:33:08 2011 -0800 Merge remote branch 'jeremyhu/master' commit 3f41f4adea4bbb90d4bda4dab600595b655e3ed8 -Merge: 8e4c3ce55 dae24abcd +Merge: 8e4c3ce55b dae24abcd4 Author: Keith Packard <keithp@keithp.com> Date: Thu Mar 3 14:12:36 2011 -0800 Merge remote branch 'sandmann/for-keithp' commit 8e4c3ce55b0f186bc6ba4039e30629669b6087b7 -Merge: f3d19c0cf 296561506 +Merge: f3d19c0cf3 296561506a Author: Keith Packard <keithp@keithp.com> Date: Thu Mar 3 13:42:07 2011 -0800 @@ -108449,7 +108564,7 @@ Date: Mon Feb 28 12:32:53 2011 -0500 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit c2207d11f243900bc2f641e08d80da63d84e97a8 -Merge: 00779932d 579ee8f5d +Merge: 00779932de 579ee8f5d8 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Mon Feb 28 11:26:09 2011 +1000 @@ -108704,7 +108819,7 @@ Date: Fri Feb 25 11:08:19 2011 +1000 Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org> commit 229b055bdbc53370944401649234e8a38183f4fb -Merge: 6178959e3 b17fc99cb +Merge: 6178959e3d b17fc99cb9 Author: Keith Packard <keithp@keithp.com> Date: Thu Feb 24 19:44:35 2011 -0800 @@ -108758,7 +108873,7 @@ Date: Thu Feb 24 19:18:35 2011 -0800 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> commit 83861595782aaa05907f9cf7b236d50261d404d9 -Merge: a1cc0e52b 4102a0096 +Merge: a1cc0e52b0 4102a00962 Author: Keith Packard <keithp@keithp.com> Date: Thu Feb 24 18:59:07 2011 -0800 @@ -108778,7 +108893,7 @@ Date: Tue Nov 30 21:17:19 2010 +0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit 365ad68fb9f7029550505b7c276a808050cada9c -Merge: 0801afbd7 720c895db +Merge: 0801afbd7c 720c895db9 Author: Keith Packard <keithp@keithp.com> Date: Thu Feb 24 18:49:40 2011 -0800 @@ -109112,7 +109227,7 @@ Date: Wed Feb 23 14:44:23 2011 +0100 Signed-off-by: Cyril Brulebois <kibi@debian.org> commit 579ee8f5d84c3a523b7b3e3941eabb226d1d19e2 -Merge: b63689313 17265ccb0 +Merge: b636893137 17265ccb02 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Wed Feb 23 08:44:42 2011 +1000 @@ -109418,14 +109533,14 @@ Date: Fri Feb 18 14:46:33 2011 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 2c77aeb39f59f1a94cc603a2e6256a62ce785c36 -Merge: 816d67de2 402b329c3 +Merge: 816d67de2b 402b329c3a Author: Keith Packard <keithp@keithp.com> Date: Fri Feb 18 14:29:32 2011 -0800 Merge remote branch 'jcristau/for-keith' commit 816d67de2ba9bdfe652da32cb6447a3056342b98 -Merge: a73c28f0b 3bbb70a1a +Merge: a73c28f0bd 3bbb70a1a7 Author: Keith Packard <keithp@keithp.com> Date: Fri Feb 18 12:20:26 2011 -0800 @@ -109445,14 +109560,14 @@ Date: Thu Feb 10 16:27:29 2011 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0bc9b15a622377c57e617411ccd26c4b5bf8cba4 -Merge: d1123b66e 93cd4b103 +Merge: d1123b66eb 93cd4b1034 Author: Keith Packard <keithp@keithp.com> Date: Fri Feb 18 12:04:41 2011 -0800 Merge remote branch 'ajax/for-keithp' commit d1123b66ebbcf96dd816236f54befc568a5f7c68 -Merge: 5d020c313 f6e4ace9e +Merge: 5d020c3135 f6e4ace9ea Author: Keith Packard <keithp@keithp.com> Date: Fri Feb 18 11:59:25 2011 -0800 @@ -110167,7 +110282,7 @@ Date: Thu Jan 13 20:19:18 2011 +0200 Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com> commit ea1ffd3e60bdcedbec5a6f28929f8677bf45d450 -Merge: 12b0f7df2 53602c362 +Merge: 12b0f7df2c 53602c3621 Author: Keith Packard <keithp@keithp.com> Date: Wed Feb 2 15:19:55 2011 -0800 @@ -110258,21 +110373,21 @@ Date: Sun Jan 30 14:06:14 2011 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 246d40b685292fa6393ba22127152137494af2af -Merge: 70f2d39fb 8c1f75a1d +Merge: 70f2d39fbd 8c1f75a1d4 Author: Keith Packard <keithp@keithp.com> Date: Wed Feb 2 14:51:33 2011 -0800 Merge remote branch 'jeremyhu/master' commit 70f2d39fbde38d0baa687f1755b6c4c686f23052 -Merge: 3a91c2d21 a9d3c43a5 +Merge: 3a91c2d21c a9d3c43a57 Author: Keith Packard <keithp@keithp.com> Date: Wed Feb 2 14:43:19 2011 -0800 Merge remote branch 'jturney/master' commit 3a91c2d21c3231e2a011d95c3cfc01785430c1cf -Merge: ac0a00a84 82b1eaa6c +Merge: ac0a00a840 82b1eaa6ca Author: Keith Packard <keithp@keithp.com> Date: Wed Feb 2 14:37:00 2011 -0800 @@ -110525,21 +110640,21 @@ Date: Thu Jan 13 16:08:29 2011 -0800 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> commit be3be7580b6f6fd2f7fa4d4abfe5e1ab19470223 -Merge: 57a1d9b85 a1d885fdd +Merge: 57a1d9b853 a1d885fdd6 Author: Keith Packard <keithp@keithp.com> Date: Thu Jan 20 21:21:21 2011 -0800 Merge remote branch 'ajax/for-keithp' commit 57a1d9b85331f6fe19d5111f5163139572ffbf02 -Merge: 24ce650cf 642376979 +Merge: 24ce650cf4 6423769799 Author: Keith Packard <keithp@keithp.com> Date: Thu Jan 20 21:16:24 2011 -0800 Merge remote branch 'whot/for-keith' commit 24ce650cf4f0c6fa72faecd38c53d40703e6c959 -Merge: bbdf81a05 09fd01090 +Merge: bbdf81a056 09fd010902 Author: Keith Packard <keithp@keithp.com> Date: Thu Jan 20 21:11:53 2011 -0800 @@ -111047,14 +111162,14 @@ Date: Sat Jan 15 12:13:39 2011 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit abfea17342da774aa4e3a351a73c8f2af6e6fd28 -Merge: 361128389 e65c3f8bc +Merge: 361128389e e65c3f8bcc Author: Keith Packard <keithp@keithp.com> Date: Tue Jan 18 15:19:34 2011 -0800 Merge remote branch 'ajax/for-keithp' commit 361128389e5cb0101cbd091ff8de77cf34608f6c -Merge: 65ceaadbf d9225b960 +Merge: 65ceaadbf0 d9225b9602 Author: Keith Packard <keithp@keithp.com> Date: Tue Jan 18 15:18:08 2011 -0800 @@ -111392,7 +111507,7 @@ Date: Tue Nov 23 11:38:50 2010 -0800 Acked-by: Gaetan Nadon <memsize@videotron.ca> commit 8456625d64bb0013a496f3b56ea3aa20cf7a6142 -Merge: aa30a8658 ce74e7562 +Merge: aa30a86583 ce74e7562d Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Jan 7 09:35:07 2011 +1000 @@ -111737,14 +111852,14 @@ Date: Wed Jan 5 20:41:04 2011 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0dede200c9ac7adbe8b8c16efacc3edc1f183cd9 -Merge: 7714357f5 2e781457d +Merge: 7714357f50 2e781457d4 Author: Keith Packard <keithp@keithp.com> Date: Wed Jan 5 08:51:46 2011 -0800 Merge remote branch 'vsyrjala/misc_fixes' commit 7714357f506782973d25e270f85140b42507ed35 -Merge: 02e18c9fb b01dd9d33 +Merge: 02e18c9fb5 b01dd9d336 Author: Keith Packard <keithp@keithp.com> Date: Wed Jan 5 08:43:18 2011 -0800 @@ -112437,7 +112552,7 @@ Date: Wed Dec 15 14:59:13 2010 -0500 Signed-off-by: Adam Jackson <ajax@redhat.com> commit e7dc253452a1ba64718a08fdc070405b494f53cd -Merge: d1107918d d5b0d5857 +Merge: d1107918d4 d5b0d58573 Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 20 00:48:45 2010 -0800 @@ -112539,14 +112654,14 @@ Date: Fri Dec 10 00:08:24 2010 +0000 Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> commit f1542f1d716723cba7c323849086585635121893 -Merge: 9716d3124 8a8fdd762 +Merge: 9716d31247 8a8fdd762a Author: Keith Packard <keithp@keithp.com> Date: Tue Dec 14 15:04:12 2010 -0800 Merge remote branch 'whot/for-keith' commit 9716d3124799c6db0d1c782aa72c72f972d5a158 -Merge: 03ea0b772 f641e4b34 +Merge: 03ea0b7726 f641e4b34a Author: Keith Packard <keithp@keithp.com> Date: Tue Dec 14 15:01:36 2010 -0800 @@ -112723,7 +112838,7 @@ Date: Wed Dec 8 18:54:30 2010 +0000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 519d243f0c8e3c80226701f71d2cfa62e42dbff7 -Merge: 9f9c73231 446482efa +Merge: 9f9c732311 446482efaa Author: Keith Packard <keithp@keithp.com> Date: Tue Dec 7 13:39:58 2010 -0800 @@ -113181,14 +113296,14 @@ Date: Sun Jun 6 15:23:37 2010 -0700 Reviewed-by: Aaron Plattner <aplattner@nvidia.com> commit f5b8bd620f91214c0b87e9b04d57015655792352 -Merge: 01e9fa7da 8127c83c8 +Merge: 01e9fa7da3 8127c83c81 Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 6 19:51:06 2010 -0800 Merge remote branch 'jajones/for-keith' commit 01e9fa7da389fc7ab834b4234b8484514144b7f4 -Merge: 79870dbf7 68a1b0de9 +Merge: 79870dbf72 68a1b0de95 Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 6 19:45:11 2010 -0800 @@ -113211,14 +113326,14 @@ Date: Sat Dec 4 16:13:29 2010 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit c4a7a5917ab828d4a0bd825a98e4d641bcb378f1 -Merge: 5de312a60 714b68d9e +Merge: 5de312a60d 714b68d9e5 Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 6 19:28:07 2010 -0800 Merge remote branch 'jeremyhu/master' commit 5de312a60d8227ed670849ecf888ea878aa81430 -Merge: 311cad331 8f42b2b69 +Merge: 311cad3315 8f42b2b693 Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 6 19:22:52 2010 -0800 @@ -113569,7 +113684,7 @@ Date: Wed Nov 24 00:11:11 2010 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 3824417335ec00a87b51f8d05e592099b8507680 -Merge: dab064fa5 f4f41c812 +Merge: dab064fa5e f4f41c812d Author: Keith Packard <keithp@keithp.com> Date: Thu Dec 2 08:39:33 2010 -0800 @@ -113819,14 +113934,14 @@ Date: Sat Nov 27 00:14:51 2010 -0800 Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> commit 02449ee24b484c9fea501df5274d95a9f87cab23 -Merge: afd6eb66d b85f9063c +Merge: afd6eb66d5 b85f9063c2 Author: Keith Packard <keithp@keithp.com> Date: Tue Nov 30 13:30:59 2010 -0800 Merge remote branch 'ajax/for-keithp' commit afd6eb66d5ef6a59be4c03da4588aaa2ee47b9ad -Merge: b16964910 ffcbfa006 +Merge: b16964910d ffcbfa0063 Author: Keith Packard <keithp@keithp.com> Date: Tue Nov 30 13:28:13 2010 -0800 @@ -114344,14 +114459,14 @@ Date: Wed Nov 24 14:20:30 2010 +1000 Reviewed-by: Keith Packard <keithp@keithp.com> commit 4e0f8f666e61390206c42ad2087477a912525bc7 -Merge: 400ddf2f5 639600fa7 +Merge: 400ddf2f58 639600fa7e Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 24 11:47:33 2010 -0800 Merge remote branch 'whot/for-keith' commit 400ddf2f58ce673c74d4e8ee829729cd3c75f8c9 -Merge: 7250f078c e074f745a +Merge: 7250f078c1 e074f745a8 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 24 11:46:18 2010 -0800 @@ -114701,21 +114816,21 @@ Date: Tue Jun 22 19:45:26 2010 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 38c46ccf796462d068d95acb9022de2acfc3a1f7 -Merge: 3051dd513 c8998af3e +Merge: 3051dd5135 c8998af3eb Author: Keith Packard <keithp@keithp.com> Date: Mon Nov 15 09:06:33 2010 +0800 Merge remote branch 'whot/for-keith' commit 3051dd5135962283fc6c7de377a7c819d8a04e7f -Merge: ed547a9fc c5975722a +Merge: ed547a9fc8 c5975722a9 Author: Keith Packard <keithp@keithp.com> Date: Mon Nov 15 08:58:02 2010 +0800 Merge remote branch 'jeremyhu/master' commit ed547a9fc8a4f5cd95ef882b656a376c163eda6d -Merge: 78f94f19a 84e8de127 +Merge: 78f94f19aa 84e8de1271 Author: Keith Packard <keithp@keithp.com> Date: Mon Nov 15 08:51:27 2010 +0800 @@ -114986,7 +115101,7 @@ Date: Wed Nov 10 21:35:58 2010 -0800 Reviewed-by: Adam Jackson <ajax@redhat.com> commit 88cb61e1e55c54982b90e2a77465faaac6a0ba89 -Merge: 19f43836d 4ed4915bc +Merge: 19f43836d1 4ed4915bc0 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Nov 11 12:54:46 2010 +1000 @@ -114999,7 +115114,7 @@ Date: Thu Nov 11 12:54:46 2010 +1000 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 4ed4915bc0fbe9b4419ca4a0d4e43c2fee032ae9 -Merge: 291c39dfe ec1bfbc66 +Merge: 291c39dfef ec1bfbc669 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 10 16:58:21 2010 -0800 @@ -115059,14 +115174,14 @@ Date: Sat Sep 11 17:55:57 2010 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit c9c0f93f8ed42413a05193ee71c69fa6b41f6a03 -Merge: 73f6de1ad 4132b1c59 +Merge: 73f6de1ad8 4132b1c591 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 10 16:11:29 2010 -0800 Merge remote branch 'whot/for-keith' commit 73f6de1ad8b5e1641102b54ff48a36ebb99ccacb -Merge: 333b6ed26 3dc3aefb8 +Merge: 333b6ed26e 3dc3aefb88 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 10 16:02:22 2010 -0800 @@ -115227,7 +115342,7 @@ Date: Mon May 17 19:39:54 2010 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit acba00c0c1129fe4ef7655f018cd21dbb1ee9a1f -Merge: 383dfe23f 44e816541 +Merge: 383dfe23f1 44e8165414 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 10 14:41:08 2010 -0800 @@ -115421,7 +115536,7 @@ Date: Thu Nov 4 12:53:18 2010 +1000 Reviewed-by: Julien Cristau <jcristau@debian.org> commit a52efb096e166e325deb3d6b502671f339a4fa15 -Merge: fe8d122b1 f72aadd38 +Merge: fe8d122b13 f72aadd38b Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 3 06:50:45 2010 -0700 @@ -115823,7 +115938,7 @@ Date: Sun Oct 17 09:58:50 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit d738175eaf1098e29b8afb6de8e99b5098e366a7 -Merge: 8806a04f7 9872e0f01 +Merge: 8806a04f7f 9872e0f011 Author: Keith Packard <keithp@keithp.com> Date: Tue Oct 19 22:50:15 2010 -0700 @@ -116239,7 +116354,7 @@ Date: Tue Mar 23 16:34:26 2010 +0000 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> commit 5aff712a8d2eb9f965ecbb93216cc0bcdc327ae6 -Merge: 5b98c6267 e354ccac3 +Merge: 5b98c6267f e354ccac36 Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 18 17:16:23 2010 -0700 @@ -116450,7 +116565,7 @@ Date: Mon Sep 27 13:58:40 2010 -0400 Signed-off-by: Adam Jackson <ajax@redhat.com> commit eaf0b6a4d83d49930d21d5191f335fcac962632e -Merge: 693e92d40 23229c7ce +Merge: 693e92d404 23229c7ce5 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Oct 15 13:46:59 2010 +1000 @@ -116857,7 +116972,7 @@ Date: Sat Sep 25 10:05:10 2010 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit 5532687a929426c4b1c4667f4591ed362f097c9b -Merge: 9df4fb0ad 682a3ee60 +Merge: 9df4fb0adf 682a3ee608 Author: Keith Packard <keithp@keithp.com> Date: Tue Sep 28 08:15:07 2010 -0700 @@ -117033,7 +117148,7 @@ Date: Tue Sep 21 15:13:30 2010 +0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 98197d931b266674557b52b4a7099c6470114e55 -Merge: 01ad3725a 402942cdb +Merge: 01ad3725a8 402942cdbc Author: Keith Packard <keithp@keithp.com> Date: Thu Sep 23 15:30:37 2010 -0700 @@ -117285,7 +117400,7 @@ Date: Sun May 30 19:12:31 2010 +0300 Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> commit c768cdda92696b636c10bb2df64167d5274b4b99 -Merge: 5a725385f 207985363 +Merge: 5a725385fb 2079853632 Author: Keith Packard <keithp@keithp.com> Date: Mon Sep 13 16:48:33 2010 -0700 @@ -117675,7 +117790,7 @@ Date: Wed Sep 8 16:08:24 2010 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit bbffb85461eb63bfb1e01e2cb9674607b9221604 -Merge: 9a1a4ccbe 71972c253 +Merge: 9a1a4ccbe0 71972c2534 Author: Keith Packard <keithp@keithp.com> Date: Fri Sep 10 11:55:34 2010 -0700 @@ -117714,7 +117829,7 @@ Date: Mon Aug 30 21:24:30 2010 +0300 Signed-off-by: Keith Packard <keithp@keithp.com> commit ca0d578d29f37b61e62556fff59732741885625b -Merge: cf88363db 08adf41f6 +Merge: cf88363db0 08adf41f63 Author: Keith Packard <keithp@keithp.com> Date: Fri Sep 10 11:50:27 2010 -0700 @@ -117744,7 +117859,7 @@ Date: Fri Aug 27 10:20:29 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit fa22f97af65efc2a147e9be0b7f288848965ff60 -Merge: 6edbdb7f9 654666529 +Merge: 6edbdb7f9e 6546665293 Author: Keith Packard <keithp@keithp.com> Date: Fri Sep 10 11:47:41 2010 -0700 @@ -119369,7 +119484,7 @@ Date: Sat Jun 19 23:40:37 2010 -0700 Reviewed-by: Patrick E. Kane <pekane52@gmail.com> commit 9fbbff3c0456f1969d45cc957d3260723caf62d7 -Merge: 95756f410 9ac8e206f +Merge: 95756f410c 9ac8e206ff Author: Keith Packard <keithp@keithp.com> Date: Wed Jul 21 11:56:39 2010 -0700 @@ -119454,7 +119569,7 @@ Date: Wed Jul 14 12:57:29 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0fc02c0bf92f694889589e3648acc08d4684de37 -Merge: 0540c4606 9d8ec712a +Merge: 0540c46066 9d8ec712a6 Author: Keith Packard <keithp@keithp.com> Date: Tue Jul 13 15:05:36 2010 -0700 @@ -119551,7 +119666,7 @@ Date: Fri Jul 9 10:36:12 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 2307ab5bc9365ebbe04568edb7c7620a23689b70 -Merge: c65280ce8 fd4f5059f +Merge: c65280ce8d fd4f5059f0 Author: Keith Packard <keithp@keithp.com> Date: Tue Jul 6 23:54:54 2010 -0400 @@ -119714,7 +119829,7 @@ Date: Thu Jun 3 19:00:53 2010 -0700 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 69b2b5c85ec079ef49f84722daa5f148cedc2e1b -Merge: b90faa715 143278583 +Merge: b90faa7156 1432785839 Author: Keith Packard <keithp@keithp.com> Date: Thu Jul 1 23:46:53 2010 -0400 @@ -120531,7 +120646,7 @@ Date: Thu Jun 10 19:21:18 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit a41d6e9bffbe56cfa1c3b84388a3d9f5a982f1a9 -Merge: 7e8f10012 f4190feb2 +Merge: 7e8f100121 f4190feb25 Author: Keith Packard <keithp@keithp.com> Date: Fri Jun 11 10:08:13 2010 -0700 @@ -120684,7 +120799,7 @@ Date: Fri Jun 4 16:58:58 2010 +0700 Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> commit 620ca54aaa0b363fcf68cec1bd6c37e68c988352 -Merge: fd69234db 8ff9b502c +Merge: fd69234db0 8ff9b502cf Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 10 19:18:53 2010 -0700 @@ -120756,7 +120871,7 @@ Date: Thu Jun 3 19:17:14 2010 -0700 Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov> commit 07a093add0b7e40c4d9b9b59273e3ff9e14a88a7 -Merge: 84190d209 dc614484f +Merge: 84190d2095 dc614484f9 Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 10 18:39:10 2010 -0700 @@ -120908,7 +121023,7 @@ Date: Thu Jun 10 06:11:10 2010 -0700 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 84190d20954ef7888e4d96832c2a4b3225b4dfa2 -Merge: 4172aa137 5e1ef1f4d +Merge: 4172aa137c 5e1ef1f4dd Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 10 13:36:35 2010 -0700 @@ -121236,7 +121351,7 @@ Date: Fri Jun 4 14:22:06 2010 +0700 Reviewed-by: Daniel Stone <daniel@fooishbar.org> commit 5d4e2c594059ffb536c8e506c2623320d3c6a787 -Merge: eacc42132 793dd3994 +Merge: eacc42132e 793dd39946 Author: Keith Packard <keithp@keithp.com> Date: Sat Jun 5 22:20:28 2010 -0700 @@ -121641,7 +121756,7 @@ Date: Fri Jun 4 11:09:46 2010 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0f12e86e600522768f5f64eafc1230526e700ab7 -Merge: aa7c09f7d f114f5498 +Merge: aa7c09f7d0 f114f54986 Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 3 15:09:32 2010 -0700 @@ -121823,7 +121938,7 @@ Date: Wed Jun 2 14:31:56 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit b13d7a8e09c8e3eb5003420c3c0484431e5a052b -Merge: f0ab726d8 dcceb90b1 +Merge: f0ab726d89 dcceb90b1d Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 3 07:01:26 2010 -0700 @@ -122288,7 +122403,7 @@ Date: Mon May 24 09:14:27 2010 -0700 Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> commit b11465a6ecdc2b8373e6fc8af427edc4602bcaa1 -Merge: 7c085aebf 0abf065e3 +Merge: 7c085aebfe 0abf065e38 Author: Keith Packard <keithp@keithp.com> Date: Mon May 24 22:18:31 2010 -0700 @@ -122427,7 +122542,7 @@ Date: Tue May 18 19:35:10 2010 +0300 Reviewed-by: Alex Deucher <alexdeucher@gmail.com> commit 2ffffb4daf6161e6a22d81442ecf6209acc9e975 -Merge: b5e0f6d8f d5306084b +Merge: b5e0f6d8f4 d5306084b5 Author: Keith Packard <keithp@keithp.com> Date: Sun May 23 23:22:08 2010 -0700 @@ -122802,14 +122917,14 @@ Date: Fri May 14 19:31:56 2010 +0300 Signed-off-by: Keith Packard <keithp@keithp.com> commit 103507af0c0ce7d7482a67163249864af36a2374 -Merge: 8bd8d81dc 99fcf655b +Merge: 8bd8d81dc4 99fcf655bd Author: Keith Packard <keithp@keithp.com> Date: Wed May 19 22:27:53 2010 -0700 Merge remote branch 'vignatti/bus-cleanup' commit 8bd8d81dc473bf72ea108b1896a55e32defa02e2 -Merge: c620a1c0a 66d5ecc5f +Merge: c620a1c0a4 66d5ecc5fd Author: Keith Packard <keithp@keithp.com> Date: Wed May 19 22:27:20 2010 -0700 @@ -122829,7 +122944,7 @@ Date: Thu May 20 10:26:56 2010 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 8b6c1809c09f832051327d86e1a25dc0ec5cc878 -Merge: d88ba7721 c38552d11 +Merge: d88ba7721d c38552d115 Author: Keith Packard <keithp@keithp.com> Date: Wed May 19 12:58:02 2010 -0700 @@ -123305,7 +123420,7 @@ Date: Fri May 14 16:25:43 2010 +0300 Signed-off-by: Keith Packard <keithp@keithp.com> commit f87002cb7d8729b1da4cbefe7653f4cfd3a2d956 -Merge: a4fbc0fed 890f536f8 +Merge: a4fbc0feda 890f536f8d Author: Keith Packard <keithp@keithp.com> Date: Fri May 14 11:46:29 2010 -0700 @@ -123343,7 +123458,7 @@ Date: Thu May 13 07:12:43 2010 +0300 Reviewed-by: Keith Packard <keithp@keithp.com> commit 795432d4a92ed5b9fa4d9163e73c8e4fe4c74534 -Merge: f2a0c324e 92ed75ac5 +Merge: f2a0c324e3 92ed75ac59 Author: Keith Packard <keithp@keithp.com> Date: Thu May 13 18:22:49 2010 -0700 @@ -123625,7 +123740,7 @@ Date: Sat May 8 15:19:03 2010 -0700 Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov> commit 59857ee5da5f1f3f4900292581b9586477513211 -Merge: 21ceae900 432cbbec1 +Merge: 21ceae9002 432cbbec19 Author: Keith Packard <keithp@keithp.com> Date: Wed May 12 16:48:08 2010 -0700 @@ -123846,7 +123961,7 @@ Date: Tue May 11 09:08:40 2010 -0700 Reviewed-by: Adam Jackson <ajax@redhat.com> commit 3df22b293c1f1d27e7ce16662744c578d35b5aba -Merge: fa6c70125 9de0e3174 +Merge: fa6c701257 9de0e31746 Author: Keith Packard <keithp@keithp.com> Date: Tue May 11 08:38:44 2010 -0700 @@ -123976,7 +124091,7 @@ Date: Mon May 10 14:00:49 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 95074538cce93abc1739a4d9dd78b0500fb8fec9 -Merge: c0799779d 2160ff524 +Merge: c0799779df 2160ff5240 Author: Keith Packard <keithp@keithp.com> Date: Mon May 10 13:49:33 2010 -0700 @@ -124204,7 +124319,7 @@ Date: Fri Apr 30 12:18:09 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit a80b1f888f2f7674a715d512ab950eeadee20448 -Merge: 497109986 0efd7b8d8 +Merge: 4971099860 0efd7b8d82 Author: Keith Packard <keithp@keithp.com> Date: Sun May 2 16:35:17 2010 -0700 @@ -124313,7 +124428,7 @@ Date: Wed Apr 28 12:37:08 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 986d46144b183a36b4e98aed95eca0c55a8b4251 -Merge: a974c8e7c b5b8f91b8 +Merge: a974c8e7cb b5b8f91b82 Author: Keith Packard <keithp@keithp.com> Date: Fri Apr 30 12:40:53 2010 -0700 @@ -124323,21 +124438,21 @@ Date: Fri Apr 30 12:40:53 2010 -0700 hw/xfree86/common/xf86xv.c commit a974c8e7cba40c8d7d1b91e07de8c414627b71a2 -Merge: 6581bc459 02e86221b +Merge: 6581bc4591 02e86221b8 Author: Keith Packard <keithp@keithp.com> Date: Fri Apr 30 12:33:00 2010 -0700 Merge remote branch 'whot/for-keith' commit 6581bc4591746c906d97f8b868f946c47bc6d756 -Merge: 0e91e19f7 d073e51be +Merge: 0e91e19f78 d073e51bee Author: Keith Packard <keithp@keithp.com> Date: Fri Apr 30 12:29:52 2010 -0700 Merge remote branch 'yselkowitz/master' commit 0e91e19f783d21198fc2e210203e0f10040a9cd0 -Merge: 81a081c1f edbc56c08 +Merge: 81a081c1f0 edbc56c088 Author: Keith Packard <keithp@keithp.com> Date: Fri Apr 30 12:27:51 2010 -0700 @@ -124531,7 +124646,7 @@ Date: Sat Apr 17 21:36:23 2010 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 3f63db89191701139d45332ca80b9d6eb327c773 -Merge: 41bdb6c00 54e51de8c +Merge: 41bdb6c003 54e51de8cd Author: Keith Packard <keithp@keithp.com> Date: Mon Apr 26 20:18:13 2010 -0700 @@ -124928,7 +125043,7 @@ Date: Wed Apr 21 18:28:13 2010 +0300 Signed-off-by: Keith Packard <keithp@keithp.com> commit 7ac6a6b7d0dfc5e021270b2898accd3425aa008a -Merge: 0782894b5 f7ef6fd9a +Merge: 0782894b57 f7ef6fd9a1 Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 21 16:07:38 2010 -0700 @@ -125186,7 +125301,7 @@ Date: Mon Apr 19 09:26:10 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit b3ab978df861c08298f57529e3db980489055c35 -Merge: a92b2c2c8 0ad022a72 +Merge: a92b2c2c8d 0ad022a729 Author: Keith Packard <keithp@keithp.com> Date: Sun Apr 18 22:01:40 2010 -0700 @@ -125348,7 +125463,7 @@ Date: Wed Apr 14 17:27:51 2010 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit e424d5812300e82de375d83dc0b490a76d865016 -Merge: 5b0faf355 0e7703f9b +Merge: 5b0faf3554 0e7703f9b1 Author: Keith Packard <keithp@keithp.com> Date: Thu Apr 15 15:01:34 2010 -0700 @@ -125534,7 +125649,7 @@ Date: Fri Apr 9 10:58:48 2010 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit ab60975fe28cb135b4183c57b7f50d3615921c1f -Merge: adbbc6610 59edde7c2 +Merge: adbbc66108 59edde7c28 Author: Keith Packard <keithp@keithp.com> Date: Mon Apr 12 21:40:41 2010 -0700 @@ -125594,7 +125709,7 @@ Date: Tue Feb 16 08:11:41 2010 -0800 Reviewed-by: Keith Packard <keithp@keithp.com> commit d7c98c1c81ae272f66edb05fde20f4c616604add -Merge: 82cf3a4ae 03ccbd257 +Merge: 82cf3a4ae0 03ccbd2579 Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 7 22:25:51 2010 -0700 @@ -125762,14 +125877,14 @@ Date: Mon Apr 5 19:12:22 2010 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit cbda58c963af5bb9c4643e9017dd4eec589ceff3 -Merge: a7698a677 c983f40fe +Merge: a7698a6776 c983f40fe4 Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 7 15:51:38 2010 -0700 Merge remote branch 'yselkowitz/master' commit a7698a677682a32960b885c22fdba2add70f4658 -Merge: 495cec794 165a4a9c7 +Merge: 495cec794d 165a4a9c7d Author: Keith Packard <keithp@keithp.com> Date: Tue Apr 6 12:36:15 2010 -0700 @@ -125916,14 +126031,14 @@ Date: Fri Mar 26 09:33:20 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 57cb1a854a1b6d91d214b3fa250a7df2ed20d433 -Merge: 4b3d67a76 28a5f14b4 +Merge: 4b3d67a764 28a5f14b40 Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 29 11:46:00 2010 -0700 Merge remote branch 'jeremyhu/master' commit 4b3d67a7647f696957727948f9757a261e15d14e -Merge: 579715f83 aa9150835 +Merge: 579715f830 aa91508356 Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 29 11:44:07 2010 -0700 @@ -126340,7 +126455,7 @@ Date: Mon Mar 22 18:01:17 2010 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit b29220dc765cb6f878c5466e00e4bd21f3bd803d -Merge: c3da76643 ed31d50b5 +Merge: c3da76643a ed31d50b5f Author: Keith Packard <keithp@keithp.com> Date: Sun Mar 21 23:01:58 2010 -0700 @@ -126588,7 +126703,7 @@ Date: Sun Mar 21 17:23:46 2010 -0700 Bump to 1.7.99.902 -- 1.8 RC2 commit 235fa5030428084368e5be57fca695647b7b79c4 -Merge: 1c612acca fa5103a02 +Merge: 1c612acca8 fa5103a02b Author: Keith Packard <keithp@keithp.com> Date: Sun Mar 21 15:38:40 2010 -0700 @@ -126614,7 +126729,7 @@ Date: Wed Mar 17 14:32:38 2010 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 95ca39b981624df5338a16b506289014c431ae82 -Merge: e7ff95663 bf181915e +Merge: e7ff956638 bf181915e1 Author: Keith Packard <keithp@keithp.com> Date: Sun Mar 21 15:24:06 2010 -0700 @@ -126802,7 +126917,7 @@ Date: Fri Mar 12 16:52:56 2010 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit df9b6f16b27398545cd4cff8a56dd59a3813351d -Merge: 5f169f549 5172253ba +Merge: 5f169f5493 5172253bae Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 15 08:26:58 2010 -0700 @@ -127127,7 +127242,7 @@ Date: Wed Jan 27 20:38:38 2010 +0000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 780c95caf9888fa4548dfe4c1c78a7e7ce99a9ed -Merge: 018b17759 758f69717 +Merge: 018b177591 758f697175 Author: Keith Packard <keithp@keithp.com> Date: Wed Feb 24 09:59:19 2010 -0800 @@ -127295,7 +127410,7 @@ Date: Mon Feb 15 14:18:00 2010 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit ca9c2472d74c7107ccc117e2c9c723c168d2eccf -Merge: e40ba5798 02d1116e7 +Merge: e40ba5798c 02d1116e7e Author: Keith Packard <keithp@keithp.com> Date: Mon Feb 22 13:26:06 2010 -0800 @@ -127633,7 +127748,7 @@ Date: Fri Feb 12 13:46:03 2010 -0800 Bump to 1.7.99.901 -- 1.8 RC1 commit 57ffeb3f2b3313dcef92a396f1f55fdbc064b2c5 -Merge: c6d9bc092 c76248fda +Merge: c6d9bc092c c76248fda9 Author: Keith Packard <keithp@keithp.com> Date: Fri Feb 12 13:36:32 2010 -0800 @@ -128360,7 +128475,7 @@ Date: Wed Jan 27 11:34:45 2010 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0b21a0416b4cb2c32da5e3fda05a0682eb97d56e -Merge: 1e6fd65d0 837bd2bbc +Merge: 1e6fd65d0b 837bd2bbc0 Author: Keith Packard <keithp@keithp.com> Date: Wed Jan 27 14:14:15 2010 -0800 @@ -128679,7 +128794,7 @@ Date: Mon Jan 11 18:02:55 2010 -0800 Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> commit 44f9c3d16c9c9b3362306a9ba26ee52e7baafeca -Merge: 032f97808 84956ca43 +Merge: 032f97808c 84956ca43b Author: Keith Packard <keithp@keithp.com> Date: Wed Jan 13 10:19:21 2010 -0800 @@ -128835,7 +128950,7 @@ Date: Thu Jan 7 14:12:34 2010 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit 8ab4749aaefb3727b9fc58bb37b50a2d07eb1531 -Merge: 8d53d8448 9437504b2 +Merge: 8d53d84485 9437504b21 Author: Keith Packard <keithp@keithp.com> Date: Thu Jan 7 10:32:21 2010 -0800 @@ -129198,14 +129313,14 @@ Date: Wed Dec 23 16:05:16 2009 +1000 Signed-off-by: Julien Cristau <jcristau@debian.org> commit 9fad8f06fb89ac2ae05bea0fa24cab3df7677297 -Merge: 871bbe1d8 42e8c9224 +Merge: 871bbe1d87 42e8c9224e Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 30 09:28:19 2009 -0800 Merge remote branch 'dbn/inputclass' commit 871bbe1d87fa3c7ebd075e1d1eec33e45b08493d -Merge: db2c6f7c9 e1165632b +Merge: db2c6f7c91 e1165632bd Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 30 09:16:45 2009 -0800 @@ -129520,7 +129635,7 @@ Date: Tue Dec 22 15:40:40 2009 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 7dc78db79edd15b971110acaf16bbe7f69e40bdb -Merge: 81a623f03 b44c9be24 +Merge: 81a623f036 b44c9be244 Author: Keith Packard <keithp@keithp.com> Date: Tue Dec 22 21:25:18 2009 -0800 @@ -129701,14 +129816,14 @@ Date: Mon Dec 14 08:41:18 2009 +1000 Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com> commit 0cb638dc6822e54567a1731ea1cf588475a226e9 -Merge: 6a6a041c2 fbdf493a3 +Merge: 6a6a041c2d fbdf493a3e Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 16 21:58:44 2009 -0800 Merge remote branch 'alanc/master' commit 6a6a041c2d8d32f6355db77cd59cff371038c683 -Merge: 8127465f4 d50319550 +Merge: 8127465f44 d503195504 Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 16 21:57:32 2009 -0800 @@ -129975,7 +130090,7 @@ Date: Tue Dec 1 11:04:06 2009 -0800 Acked-by: Soeren Sandmann <sandmann@daimi.au.dk> commit d3e054ac07dae12a82ad764b0622fddbef4b9ec5 -Merge: 12fb31815 97a6454ea +Merge: 12fb31815d 97a6454ea5 Author: Keith Packard <keithp@keithp.com> Date: Fri Dec 11 09:22:22 2009 -0800 @@ -130194,7 +130309,7 @@ Date: Wed Dec 2 20:24:02 2009 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 98c8b752254a27ab1aaf881b36bfda0f74929d0a -Merge: 0e084d8c7 91c1bd78f +Merge: 0e084d8c71 91c1bd78f7 Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 2 15:28:07 2009 -0800 @@ -131192,7 +131307,7 @@ Date: Wed Nov 4 15:35:37 2009 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit 7442f3355ab8f0bb2b1a270da18c65d8d315d4dd -Merge: 0573042cd 7897b6c2d +Merge: 0573042cdd 7897b6c2d4 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 4 08:55:20 2009 -0800 @@ -131453,7 +131568,7 @@ Date: Wed Oct 28 11:44:27 2009 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit deb72fc61464250af8185dab2da8ee09f13c55d8 -Merge: 55f4c80a4 a60e676f1 +Merge: 55f4c80a4c a60e676f1f Author: Keith Packard <keithp@keithp.com> Date: Wed Oct 28 10:54:13 2009 -0700 @@ -131604,7 +131719,7 @@ Date: Thu Oct 22 00:00:35 2009 +0900 Signed-off-by: Keith Packard <keithp@keithp.com> commit 1228e2d052f0bb98175c55c194340773b5fedb40 -Merge: 08e7f62fa 52bc6d944 +Merge: 08e7f62faf 52bc6d9449 Author: Keith Packard <keithp@keithp.com> Date: Wed Oct 21 22:46:53 2009 +0900 @@ -132034,7 +132149,7 @@ Date: Tue Oct 13 20:14:58 2009 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit 6e158003e80534ce007290f75c89d698aec1d00b -Merge: 2b14e1420 5e762f0e2 +Merge: 2b14e14203 5e762f0e2f Author: Keith Packard <keithp@keithp.com> Date: Tue Oct 13 18:40:42 2009 -0700 @@ -132276,7 +132391,7 @@ Date: Wed Oct 7 09:07:03 2009 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 68304215e25876ee639015969b4f07e1c9c515e0 -Merge: 6676f49e3 315aaef55 +Merge: 6676f49e34 315aaef557 Author: Keith Packard <keithp@keithp.com> Date: Tue Oct 6 22:41:42 2009 -0700 @@ -139679,7 +139794,7 @@ Date: Thu Jun 4 17:33:25 2009 -0400 xace: fix a bad send access hook call. commit 993daf06497c85bb6a1e70592df380503d721dfb -Merge: 2bda50ee1 e1e8c7ddd +Merge: 2bda50ee14 e1e8c7ddd7 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Jun 4 15:11:36 2009 +1000 @@ -139742,7 +139857,7 @@ Date: Wed Jun 3 13:37:32 2009 -0400 s/MIN/min/, s/MAX/max/ (#2968) commit 6de67d3206f0a4e307070714564c19efc84da2ec -Merge: af4e65840 7f027d9dc +Merge: af4e658401 7f027d9dc0 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Wed Jun 3 16:11:33 2009 +1000 @@ -140137,7 +140252,7 @@ Date: Thu May 28 15:32:03 2009 -0400 These have been nops since 2006 and functionally void since 7.0. commit d7aef3f663f4b5d861799f8615dcd301d5ce2906 -Merge: a25f248fc e08c6a075 +Merge: a25f248fc3 e08c6a0752 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu May 28 17:20:58 2009 +1000 @@ -140189,7 +140304,7 @@ Date: Mon May 4 19:24:47 2009 -0500 Signed-off-by: Federico Mena Quintero <federico@novell.com> commit b12010e10f38951358b48ff1076c026f943b7cc3 -Merge: 6e6927247 f1441b835 +Merge: 6e69272473 f1441b8353 Author: Søren Sandmann Pedersen <sandmann@redhat.com> Date: Wed May 27 15:56:30 2009 -0400 @@ -142023,7 +142138,7 @@ Date: Thu Apr 23 08:42:38 2009 -0700 Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> commit 057fc9a4f89282e440b5e11458f1dd8655879dd8 -Merge: 95628b797 932d6bcbb +Merge: 95628b797e 932d6bcbb6 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Apr 24 16:15:47 2009 +1000 @@ -142199,7 +142314,7 @@ Date: Fri Apr 17 15:22:57 2009 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit d5ad14c8ed4d8360e1df8cd0bacf6a7c9c31df91 -Merge: 54716fd3d 0e0642ee9 +Merge: 54716fd3db 0e0642ee94 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Sun Apr 19 22:28:22 2009 +1000 @@ -143026,7 +143141,7 @@ Date: Thu Mar 26 22:22:32 2009 -0700 Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> commit 6c3b633299f12051fcf37fb8439f358de876cf03 -Merge: adf21dba7 0cfd48130 +Merge: adf21dba76 0cfd481308 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Tue Apr 7 19:36:27 2009 +1000 @@ -149527,7 +149642,7 @@ Date: Thu Dec 4 09:47:25 2008 +1000 Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> commit 22d4ddcc3d63b7fbf2a23f5162075e4ee06db781 -Merge: d2dad384f c3bf15ba8 +Merge: d2dad384f5 c3bf15ba85 Author: Matthieu Herrb <matthieu@crux.(none)> Date: Sun Dec 7 23:56:15 2008 +0100 @@ -150483,7 +150598,7 @@ Date: Tue Nov 25 23:15:35 2008 -0800 New version of dolt commit 4715f079b9c61362755c95c1ebf89c97cc6fff2b -Merge: 9ffc67193 ed597f19f +Merge: 9ffc671939 ed597f19fd Author: Keith Packard <keithp@keithp.com> Date: Tue Nov 25 22:19:08 2008 -0800 @@ -151364,7 +151479,7 @@ Date: Fri Nov 21 12:21:45 2008 +1000 Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> commit 387563b77743d92be83420d982eaf57f5459a883 -Merge: 85f650c9b f6e01fa1b +Merge: 85f650c9b7 f6e01fa1b8 Author: Matthieu Herrb <matthieu.herrb@laas.fr> Date: Sun Nov 23 13:15:46 2008 +0100 @@ -151766,7 +151881,7 @@ Date: Fri Nov 14 12:36:20 2008 -0500 Signed-off-by: James Cloos <cloos@jhcloos.com> commit ba4e08244ed3923eecf26842dfc1df17c696e053 -Merge: 81fd17f5f 5bad5d2ab +Merge: 81fd17f5f4 5bad5d2abe Author: Alex Deucher <alexdeucher@gmail.com> Date: Thu Nov 13 15:04:18 2008 -0500 @@ -158870,7 +158985,7 @@ Date: Mon May 26 17:56:08 2008 +0930 Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au> commit 26c1958c322be3ac4dfec9ba2c41c5202bd03709 -Merge: 5fe57787f 29586101d +Merge: 5fe57787fa 29586101dc Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Mon May 26 17:37:31 2008 +0930 @@ -159349,7 +159464,7 @@ Date: Wed May 21 21:51:27 2008 +0930 Big boss says UniSA isn't unique enough. Who am I to argue? commit 7509fb498c02fe1cebe4139612b8871ec877c130 -Merge: 2ae3bed33 dfb7de657 +Merge: 2ae3bed337 dfb7de6571 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Wed May 21 16:25:35 2008 +0930 @@ -159409,7 +159524,7 @@ Date: Tue May 20 10:54:32 2008 +0930 fb: shut up two compiler warnings. commit 99d28c3ef37aeffe7d8ec41e45a650ba248c6958 -Merge: fc7e2566c 0178b6a4a +Merge: fc7e2566cc 0178b6a4ab Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Tue May 20 10:20:14 2008 +0930 @@ -160009,7 +160124,7 @@ Date: Fri May 9 15:38:44 2008 -0700 <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258475> commit 7b3066d9b9099135d9c49e0682161d5568fc535b -Merge: 2a3d1421e 315f08905 +Merge: 2a3d1421e0 315f089056 Author: Drew Parsons <drew@emerall.com> Date: Sat May 10 00:01:15 2008 +1000 @@ -160109,7 +160224,7 @@ Date: Thu May 8 16:04:24 2008 -0400 Bug #13104: Remove broken XAA a1 glyph fast path. commit ddaecfa13cefee7c66b39b606c8640c6544d4943 -Merge: 9c2e0871c cf20df39c +Merge: 9c2e0871cf cf20df39cc Author: Adam Jackson <ajax@redhat.com> Date: Thu May 8 14:33:58 2008 -0400 @@ -160367,7 +160482,7 @@ Date: Fri May 2 14:56:58 2008 +0930 xfree86: don't try to repaint the cursor before cursors exist. commit 334456952930cb3e55c02fcdada2d0c074cd0520 -Merge: 8e56fd972 3b8d53452 +Merge: 8e56fd9728 3b8d53452c Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Fri May 2 11:00:14 2008 +0930 @@ -161276,7 +161391,7 @@ Date: Mon Apr 21 22:06:38 2008 -0700 (cherry picked from commit a033c0b3dbb3b963261faa39f0236457cb00ff44) commit 8190ef87547b704848231bde10b1cdffc6442790 -Merge: 179a082c2 2ddbfd345 +Merge: 179a082c26 2ddbfd3457 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Tue Apr 22 18:04:05 2008 +0930 @@ -161914,7 +162029,7 @@ Date: Mon Apr 14 09:58:49 2008 +0200 EXA: Teach exaCompositeFallbackPictDesc() about x8r8g8b8. commit 1a9d7205cd5640eb65f019336097d86301942ea7 -Merge: 90f491cf8 6866e84e3 +Merge: 90f491cf8e 6866e84e3c Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Mon Apr 14 16:25:58 2008 +0930 @@ -162099,7 +162214,7 @@ Date: Fri Feb 22 11:01:51 2008 +1030 X.Org Bug 14418 <http://bugs.freedesktop.org/show_bug.cgi?id=14418> commit 90f491cf8eb869f27c4278b26c1bb84432b12d63 -Merge: cbe01b308 b4380d803 +Merge: cbe01b3083 b4380d8030 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Fri Apr 11 08:29:52 2008 +0930 @@ -162292,7 +162407,7 @@ Date: Tue Apr 8 20:37:25 2008 -0700 (cherry picked from commit 126e9bc8c480b403dedc44c1e8c4fe1476340ed9) commit cbe01b3083eb65c9d4259b1071683febebf11600 -Merge: 5ffbcfec3 389dae73c +Merge: 5ffbcfec3d 389dae73cc Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Wed Apr 9 10:46:46 2008 +0930 @@ -162392,7 +162507,7 @@ Date: Thu Apr 3 14:50:05 2008 -0400 EXA: Fix TS origin computation when implementing RenderComposite with tiling. commit fd06e8f8c1d82a9d91931e8532bee0fd9c9ca9ab -Merge: b46a00918 6c0cfe3d4 +Merge: b46a009186 6c0cfe3d43 Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au> Date: Mon Apr 7 07:56:41 2008 +0930 @@ -162404,7 +162519,7 @@ Date: Mon Apr 7 07:56:41 2008 +0930 dix/dispatch.c commit 539bf3c2836727e7560c64144071b086f8ea32fe -Merge: 3ab33e7cd 6c0cfe3d4 +Merge: 3ab33e7cd4 6c0cfe3d43 Author: Sascha Hlusiak <saschahlusiak@arcor.de> Date: Mon Apr 7 00:10:16 2008 +0200 @@ -162865,7 +162980,7 @@ Date: Thu Mar 27 15:18:39 2008 +1000 RH BZ 435216 commit 9df915b84d45d39aed7557c98883b20a66da2e96 -Merge: 47eb658e8 333e7123d +Merge: 47eb658e80 333e7123dc Author: Sascha Hlusiak <saschahlusiak@arcor.de> Date: Tue Mar 25 17:50:50 2008 +0100 @@ -163407,7 +163522,7 @@ Date: Tue Mar 4 02:44:48 2008 -0500 XACE: Check the return value of the selection create hook call. commit 4f2cd0ed96d3b10c78774c721c2ffbfb0556dddd -Merge: 23ae68a4c 453661a9e +Merge: 23ae68a4c7 453661a9e1 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Tue Mar 4 18:11:10 2008 +1030 @@ -164866,7 +164981,7 @@ Date: Fri Feb 1 14:13:29 2008 +1030 Reviewed-by: Peter Hutterer <peter@cs.unisa.edu.au> commit e5e531ce96264518f278f572a4d0bfcd345aa618 -Merge: 6c3868208 1692dcf19 +Merge: 6c38682084 1692dcf197 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Thu Jan 31 16:36:17 2008 +1030 @@ -164983,14 +165098,14 @@ Date: Mon Jan 28 12:18:43 2008 -0800 (cherry picked from commit 116800279d2ec783c63f43d3902627edde6a4cff) commit 16b0614c8c441eb1692bde9e58fadf54a9c6f00f -Merge: 1a88aed5c e915a2639 +Merge: 1a88aed5c8 e915a26397 Author: David Nusinow <dnusinow@debian.org> Date: Sat Jan 26 16:13:25 2008 -0500 Merge commit 'upstream/master' commit 0ac175597712edfeae676f536746a4d26d625e30 -Merge: 210eeef49 e915a2639 +Merge: 210eeef495 e915a26397 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Sat Jan 26 13:55:07 2008 +1030 @@ -165444,7 +165559,7 @@ Date: Wed Jan 9 19:52:00 2008 -0800 More Xv extension byte swapping fixes commit 38bf01bd1c925614a6e67a38aa3cefc7b8fe3bca -Merge: 4e85c7c32 0883e838e +Merge: 4e85c7c322 0883e838e2 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Thu Jan 10 13:38:46 2008 +1030 @@ -165680,7 +165795,7 @@ Date: Thu Jan 3 18:09:56 2008 +1030 dix: free ClassesRec when a BadAlloc occurs during CoreKeyboardProc. commit 8da83836b60f7cdb75d08482f4311fa0e2ab4e1d -Merge: eace88989 ae869fc76 +Merge: eace88989c ae869fc766 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Thu Jan 3 17:04:54 2008 +1030 @@ -166319,7 +166434,7 @@ Date: Fri Dec 14 00:53:54 2007 -0500 Bump video driver ABI and extension ABI for devPrivates rework. commit 86b2e59bfb79bd042a13c35fbb4ccecec576f629 -Merge: 1c1a4bc97 cb0d7e2c2 +Merge: 1c1a4bc970 cb0d7e2c26 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Fri Dec 14 00:32:24 2007 -0500 @@ -166367,7 +166482,7 @@ Date: Thu Dec 13 15:55:28 2007 -0800 (cherry picked from commit fc04c9759b30d062111d4a7f3f411ed0f18cbde4) commit c8feb73f5841e7812d8dfdb91f1064e2033d028c -Merge: 9a7ce5736 a125ce4a8 +Merge: 9a7ce57363 a125ce4a84 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Thu Dec 13 18:38:25 2007 -0500 @@ -167834,7 +167949,7 @@ Date: Mon Nov 19 21:01:22 2007 -0500 during merge conflict resolution. commit 2d17f47cc7d6b174857617d31ad1b437d8e97d94 -Merge: 60be452c2 ea9c63e93 +Merge: 60be452c2e ea9c63e93b Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Mon Nov 19 18:10:46 2007 -0500 @@ -168162,7 +168277,7 @@ Date: Thu Nov 8 17:25:36 2007 -0500 Don't sleep(1) at server exit. commit 1603130236c55ddabc3854d4ba62d544debcf1f5 -Merge: f207e69d6 f7dd0c72b +Merge: f207e69d62 f7dd0c72b8 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Nov 14 13:35:50 2007 -0500 @@ -168539,7 +168654,7 @@ Date: Thu Nov 8 10:00:35 2007 +1030 Also clean up to return error codes instead of sending the error manually. commit 184a7b8917a15bb2c719153b9b016c03aab42101 -Merge: a8808ac3d 0b729051c +Merge: a8808ac3d0 0b729051c0 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Thu Nov 8 09:34:35 2007 +1030 @@ -168550,7 +168665,7 @@ Date: Thu Nov 8 09:34:35 2007 +1030 Xi/opendev.c commit e94ab0b502160376d1956345196f7e1c7e2e886f -Merge: 26e1fc7b4 9bee1c691 +Merge: 26e1fc7b42 9bee1c6912 Author: Dodji Seketeli <dodji@openedhand.com> Date: Wed Nov 7 19:04:24 2007 +0100 @@ -168589,7 +168704,7 @@ Date: Wed Nov 7 18:43:16 2007 +0100 XNEST_LIBS contains the right thing. commit 0b729051c04da7068f1e6dd319190bd0a362b2c0 -Merge: b7ee005d3 d7c5e8bfc +Merge: b7ee005d32 d7c5e8bfc1 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Wed Nov 7 15:37:23 2007 +1030 @@ -168688,7 +168803,7 @@ Date: Tue Nov 6 16:26:09 2007 -0500 on the x11perf benchmark. commit aaa50b64113b122aaebd46e3b78e3fb7a8d70500 -Merge: 868e30363 ddce48ede +Merge: 868e303630 ddce48ede0 Author: Dodji Seketeli <dodji@openedhand.com> Date: Tue Nov 6 16:25:40 2007 +0100 @@ -168715,7 +168830,7 @@ Date: Tue Nov 6 09:40:14 2007 +0000 to subsequent assertion failure in libdbus. commit a52c9b2a59f27266557ff9d5d2c08492e04135a6 -Merge: c7e18beb3 58332894c +Merge: c7e18beb3c 58332894c0 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Mon Nov 5 19:08:36 2007 -0500 @@ -168743,7 +168858,7 @@ Date: Mon Nov 5 15:01:13 2007 -0500 xselinux: Register SELinux extension protocol names. commit 632c33c5c18b3e091c4fce98280af4d583e99640 -Merge: 4113f040c dda10c906 +Merge: 4113f040c5 dda10c9066 Author: Dodji Seketeli <dodji@openedhand.com> Date: Mon Nov 5 17:52:33 2007 +0100 @@ -169413,7 +169528,7 @@ Date: Thu Oct 25 12:35:01 2007 -0400 xselinux: Label the default device directly with the process context. commit b633d54b94d746d26e13014634d9f63bbb7e8f7d -Merge: 4b05f19cb 48ca5961c +Merge: 4b05f19cb9 48ca5961ca Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Thu Oct 25 12:19:30 2007 -0400 @@ -169615,7 +169730,7 @@ Date: Fri Oct 19 16:34:54 2007 -0700 they should be. commit a3a95d3475dc91ed2e8a55bf484a6b3f2b5ac32a -Merge: a358b87f4 7e1cada6c +Merge: a358b87f45 7e1cada6c6 Author: Eric Anholt <eric@anholt.net> Date: Fri Oct 19 15:44:17 2007 -0700 @@ -169821,7 +169936,7 @@ Date: Wed Oct 17 16:09:40 2007 -0400 Need to merge so this type of thing stops happening. commit c3f7b862550fa8f46633162f83db8c27e46fc672 -Merge: af4dde0ac feac07595 +Merge: af4dde0ac1 feac075952 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Oct 17 15:00:54 2007 -0400 @@ -170401,7 +170516,7 @@ Date: Sun Oct 14 14:59:12 2007 -0400 Fix GLX byteswapping. commit 927757e1028f45f7fd94b9a2ab35567e0f34b2a8 -Merge: ccda4b66b 17ffc34ad +Merge: ccda4b66bd 17ffc34ad5 Author: Kristian Høgsberg <krh@redhat.com> Date: Fri Oct 12 19:28:39 2007 -0400 @@ -170681,7 +170796,7 @@ Date: Fri Oct 5 12:19:03 2007 +0930 regardless of who is the pairing client. commit 4611f9568cdadf9c00f4b7ca4c77c8c6f07e94f8 -Merge: ab11bad54 3549a1282 +Merge: ab11bad547 3549a12823 Author: Dodji Seketeli <dodji@openedhand.com> Date: Thu Oct 4 13:07:50 2007 +0200 @@ -170754,7 +170869,7 @@ Date: Thu Oct 4 11:38:01 2007 +0200 it for them completely. commit 604ebb5a6de372e6a8a96e0ee997db7929126860 -Merge: 1365aeff5 4ba76a7e2 +Merge: 1365aeff54 4ba76a7e2b Author: Dodji Seketeli <dodji@openedhand.com> Date: Wed Oct 3 16:13:16 2007 +0200 @@ -170892,7 +171007,7 @@ Date: Tue Oct 2 13:13:51 2007 -0700 Also fix incorrect library inclusion by kdrive which broke the build. commit 439edc768eea17667846ce573c843b8377e0dfb4 -Merge: c8ccf469d 93ae6fe18 +Merge: c8ccf469dc 93ae6fe18c Author: Eric Anholt <eric@anholt.net> Date: Tue Oct 2 12:14:04 2007 -0700 @@ -171825,7 +171940,7 @@ Date: Thu Sep 27 11:44:03 2007 +0930 This is hopefully better than hardcodey calling CoreProcessPointerEvent. commit 27612748e0ec20f3a23839f0a12e39f598dd722c -Merge: b61461425 3b114f260 +Merge: b61461425e 3b114f2603 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Sep 26 07:47:29 2007 -0400 @@ -172246,7 +172361,7 @@ Date: Wed Sep 19 04:46:10 2007 -0700 hey -- you have to start somewhere. ;) commit 97c150b61bbe436453b05d3c07cd2173870aac40 -Merge: 57907e094 547ad2125 +Merge: 57907e0943 547ad2125e Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Sep 19 07:25:55 2007 -0400 @@ -172371,7 +172486,7 @@ Date: Sat Sep 15 14:01:57 2007 +0200 Initialize output->pendingProperties. commit b9f7aeb20015290a8acf938a11bf9272bf3527cf -Merge: e4d11e58c 06d27f804 +Merge: e4d11e58ce 06d27f8045 Author: Eric Anholt <eric@anholt.net> Date: Thu Sep 13 00:15:45 2007 +0000 @@ -172785,7 +172900,7 @@ Date: Wed Sep 5 17:46:23 2007 -0700 broken uses. commit e332335241af28ef0ab66b102d0cbc4e5c73ac68 -Merge: 7381e9149 accd71bda +Merge: 7381e9149e accd71bda6 Author: Ben Byer <bbyer@bbyer.apple.com> Date: Wed Sep 5 15:51:23 2007 -0700 @@ -172830,7 +172945,7 @@ Date: Wed Sep 5 14:31:01 2007 -0700 so it doesn't make sense to require it when building on OSX/Darwin. commit ff01e44e33fd072958fb0157dae072f1b1c88944 -Merge: 8ba8c16af 47300ed2b +Merge: 8ba8c16af7 47300ed2be Author: Ben Byer <bbyer@bbyer.apple.com> Date: Wed Sep 5 13:56:08 2007 -0700 @@ -172980,7 +173095,7 @@ Date: Tue Sep 4 14:49:49 2007 -0700 Revert part of 529acb175440969af9d7fa38aab8d7dea0dc2661 because libtool is smart. commit bf5948518763b5e21eff806a0a9abc5f7757fa10 -Merge: 4062db402 735da3dcd +Merge: 4062db4020 735da3dcd0 Author: Matthieu Herrb <matthieu@bluenote.herrb.com> Date: Tue Sep 4 22:40:31 2007 +0200 @@ -173296,7 +173411,7 @@ Date: Tue Aug 28 09:28:25 2007 -0400 FontRec privates. commit 85547073265ae9bc4ae3af920a6d3214fd1ca0c5 -Merge: 860a09cfb 7d54399cf +Merge: 860a09cfb8 7d54399cfd Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Aug 28 07:25:21 2007 -0400 @@ -173396,7 +173511,7 @@ Date: Fri Aug 24 16:00:31 2007 -0700 Bump video driver ABI for pci-rework. commit 91f358336f77c0e4f577be65cca977d17298e36c -Merge: b9a806f0b 8b6b40b72 +Merge: b9a806f0b3 8b6b40b727 Author: Ian Romanick <idr@us.ibm.com> Date: Fri Aug 24 15:04:21 2007 -0700 @@ -173450,7 +173565,7 @@ Date: Fri Aug 24 13:04:48 2007 +0200 case. commit 8b6b40b7271acd81a9548f502c18f46f3b640640 -Merge: ab7a6d860 3305d1719 +Merge: ab7a6d860d 3305d17195 Author: Ian Romanick <idr@us.ibm.com> Date: Thu Aug 23 18:19:17 2007 -0700 @@ -173587,7 +173702,7 @@ Date: Wed Aug 22 16:54:29 2007 +0100 Fix <pixman.h> include to <pixman/pixman.h> commit b6a7c0112c42a3287e53647c38b2c0c5bf8fefa0 -Merge: 53941c8e6 6ef4ecd82 +Merge: 53941c8e68 6ef4ecd826 Author: Søren Sandmann Pedersen <sandmann@redhat.com> Date: Tue Aug 21 14:26:34 2007 -0400 @@ -173899,7 +174014,7 @@ Date: Mon Aug 13 10:43:48 2007 -0400 current interface. commit f367285fd5825e0adc271982a529c9904ad65c89 -Merge: b1272eefd ff4bd3add +Merge: b1272eefd9 ff4bd3addb Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Sun Aug 12 15:31:10 2007 +0930 @@ -174274,7 +174389,7 @@ Date: Wed Jul 25 14:57:13 2007 -0700 ProcRenderAddGlyphs: Convert while loops to for loops where more natural commit e34fcd2bf42dbd72ab6ce2df80f2dcaa13416e74 -Merge: 32c0dcc8c f3955c0a0 +Merge: 32c0dcc8c0 f3955c0a02 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Thu Aug 2 14:27:03 2007 -0400 @@ -175582,7 +175697,7 @@ Date: Wed Jun 20 18:42:00 2007 +0200 can't actually occur when swapped out. commit 1f97a7647606226cde61d6ad7a94f2b0b571a06c -Merge: 5dee64fc9 2e7fef7d0 +Merge: 5dee64fc99 2e7fef7d08 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Tue Jun 19 17:20:52 2007 +0930 @@ -175624,7 +175739,7 @@ Date: Tue Jun 19 11:28:07 2007 +0930 device to interact, so this seems like a reasonable solution. commit ab7a6d860d4a275a810a64b1ba7b13726ed10575 -Merge: e9130b8ba 2e7fef7d0 +Merge: e9130b8bac 2e7fef7d08 Author: Ian Romanick <idr@us.ibm.com> Date: Mon Jun 18 16:51:13 2007 -0700 @@ -175706,7 +175821,7 @@ Date: Mon Jun 11 21:25:42 2007 -0400 Delete fbBltmmx(). commit e2a720c9a17dc860ee0a858c2b21fd71e86cdcd0 -Merge: 878cac71a 3f9adb18f +Merge: 878cac71aa 3f9adb18f1 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Mon Jun 11 15:29:11 2007 -0400 @@ -176030,7 +176145,7 @@ Date: Tue May 29 14:54:27 2007 -0600 Remove wscons keyboard handling stuff that doesn't belong there anymore. commit 60de6c7ef9bdcee043f63e8e0d493e6feba6a9d0 -Merge: 3a6549a16 2f13b7c11 +Merge: 3a6549a163 2f13b7c113 Author: Matthieu Herrb <matthieu@deville.herrb.com> Date: Tue May 29 12:14:49 2007 -0600 @@ -176203,7 +176318,7 @@ Date: Wed May 23 12:56:04 2007 -0400 Add missing offsets for window coordinates - reported by Colin Harrison commit 2a4aa63a23ddd816b647b851a01865861827a7eb -Merge: 9cee4ec5e cc648e609 +Merge: 9cee4ec5e6 cc648e609d Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue May 22 14:50:26 2007 -0400 @@ -176754,7 +176869,7 @@ Date: Mon Apr 30 10:33:12 2007 -0600 fix __glXErrorCallBack() proto commit 6b33459bf5aac23c3ecc7002d091c02f327d907a -Merge: 18252a515 3c91a993e +Merge: 18252a515d 3c91a993e8 Author: Brian <brian@yutani.localnet.net> Date: Mon Apr 30 10:26:19 2007 -0600 @@ -176942,7 +177057,7 @@ Date: Fri Apr 27 08:13:08 2007 -0400 are both 0. commit f28eea0647f007c2e2415ecc6fceef46201faad4 -Merge: 339b73e71 ae04f2cb0 +Merge: 339b73e710 ae04f2cb0a Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Fri Apr 27 16:34:36 2007 +0930 @@ -177473,7 +177588,7 @@ Date: Tue Apr 17 13:46:55 2007 -0400 security: remove debugging code. commit 1f06d32ef58749d0f0c062193d237ee98f60e90f -Merge: cf962a849 fc162c6cf +Merge: cf962a849d fc162c6cfa Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Apr 17 12:10:22 2007 -0400 @@ -177644,7 +177759,7 @@ Date: Thu Apr 12 11:16:19 2007 +0930 This workaround is obsolete with 33a5d9605e3e282f6aa1921d7321a2a12ef02c42 commit d4dad6f84f82a4ade5005c3aa93511c1295875b8 -Merge: f1f8b562a 33a5d9605 +Merge: f1f8b562aa 33a5d9605e Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Thu Apr 12 11:11:03 2007 +0930 @@ -177898,7 +178013,7 @@ Date: Fri Apr 6 13:38:12 2007 +0300 GLcore: fix after moving xf86glx_util.[hc] to Mesa. commit cf962a849db2b259ca558c6265ea7e3328a4d312 -Merge: 5ad562565 5a804f2e9 +Merge: 5ad562565a 5a804f2e97 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Thu Apr 5 14:41:39 2007 -0400 @@ -178044,7 +178159,7 @@ Date: Tue Apr 3 09:27:57 2007 -0600 about setting the XFree86Server symbol. commit 1cc8db72816cd079f30255046e10043c350bf683 -Merge: 645d87cf8 a39f297ad +Merge: 645d87cf8e a39f297ada Author: Matthieu Herrb <matthieu@roadrock.(none)> Date: Tue Apr 3 16:04:45 2007 +0200 @@ -178063,7 +178178,7 @@ Date: Tue Apr 3 19:02:14 2007 +0930 Delete all grabs from all devices when deleting a window. commit 5f382c9c7fbda6eccf8e76c28a90b55ff2f0aef3 -Merge: 9b0b34066 f09ee168e +Merge: 9b0b340668 f09ee168e2 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Tue Apr 3 15:07:18 2007 +0930 @@ -178183,7 +178298,7 @@ Date: Mon Apr 2 12:26:27 2007 -0600 formatting fixes commit e8777a91f37d828b9df839bf3d9cf2f954bdddb0 -Merge: a12054757 96ce17aa9 +Merge: a12054757d 96ce17aa94 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Mon Apr 2 15:36:26 2007 +0930 @@ -178248,7 +178363,7 @@ Date: Fri Mar 30 16:05:46 2007 -0600 values of 1280 (my screen width). commit e9130b8bac73a0843d5ff6b2216eccfb3e094a48 -Merge: 2c6d47108 92e8cdbd3 +Merge: 2c6d471088 92e8cdbd32 Author: Ian Romanick <idr@us.ibm.com> Date: Fri Mar 30 13:39:15 2007 -0700 @@ -178385,7 +178500,7 @@ Date: Wed Mar 28 12:57:11 2007 -0400 xace: provide creation-time resource hook call in CreateWindow(). commit 99b220969f2f8ba829bc8294b27ca90fd9311be4 -Merge: 728ad64d9 82a8b99a6 +Merge: 728ad64d97 82a8b99a6c Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Mar 28 12:54:04 2007 -0400 @@ -178398,7 +178513,7 @@ Date: Wed Mar 28 12:03:19 2007 -0400 Refuse to create tiny modes from EDID detailed timing. commit 2c6d47108880584f1221ff86c6c8947627f9f607 -Merge: c4fe1bcce 852204463 +Merge: c4fe1bcce1 8522044635 Author: Ian Romanick <idr@us.ibm.com> Date: Wed Mar 28 08:08:04 2007 -0700 @@ -178468,7 +178583,7 @@ Date: Mon Mar 26 16:04:50 2007 -0700 Fix indentation of fakexa help text. commit 728ad64d979fd9e5cca28e8c15118c18d707c431 -Merge: 0331c6a8f 6a0bed16e +Merge: 0331c6a8fc 6a0bed16e8 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Mar 27 13:16:40 2007 -0400 @@ -178505,7 +178620,7 @@ Date: Mon Mar 26 12:44:58 2007 -0700 Update xorg.conf manpage for new RandR 1.2 monitor options. commit 0331c6a8fcba1dc27ef45aaf5f694799d0085413 -Merge: 84a066cc8 f7c5aa0dc +Merge: 84a066cc88 f7c5aa0dc0 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Mon Mar 26 10:28:05 2007 -0400 @@ -178870,7 +178985,7 @@ Date: Mon Mar 19 16:11:01 2007 +1030 by the evdev driver). commit 015d728bcde5b16a72a976579755421e3023626b -Merge: 65b0eb60b b167583fe +Merge: 65b0eb60b0 b167583fe2 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Mon Mar 19 09:42:56 2007 +1030 @@ -179177,7 +179292,7 @@ Date: Wed Mar 7 09:57:02 2007 -0500 devPrivates rework: move reset functions into a single call. commit bb111291d854b4329e47367ce3c67e8a2785e6e9 -Merge: 74175e0af e9bfb2b3d +Merge: 74175e0af7 e9bfb2b3d7 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Mar 7 09:03:46 2007 -0500 @@ -179249,7 +179364,7 @@ Date: Tue Mar 6 11:09:30 2007 -0800 updated todo list commit 81d581e655fc989da3be4256b83849a63b8607b7 -Merge: a05ffca8d d5aba03fe +Merge: a05ffca8dd d5aba03fef Author: Ben Byer <bbyer@bbyer.(none)> Date: Tue Mar 6 10:37:29 2007 -0800 @@ -179280,7 +179395,7 @@ Date: Tue Mar 6 02:31:59 2007 -0800 moved new event-handling code from X11Application.m to darwinEvents.c in preparation for making all Darwin servers use it commit 0ccd1443fd6db397b42e5b99ce733ce1316c785e -Merge: ec1ef8a56 9b6bb06f1 +Merge: ec1ef8a56d 9b6bb06f13 Author: Ben Byer <bbyer@bbyer.(none)> Date: Tue Mar 6 01:04:50 2007 -0800 @@ -179355,7 +179470,7 @@ Date: Mon Mar 5 12:34:37 2007 -0500 devPrivates rework: remove some debugging code from dixFreePrivates. commit 23fc429aad5b2721911862617772c314e1036bb0 -Merge: e68482470 fe7b8f423 +Merge: e684824709 fe7b8f4237 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Mon Mar 5 12:18:54 2007 -0500 @@ -179401,7 +179516,7 @@ Date: Mon Feb 26 09:40:00 2007 +1100 modes: add commit/prepare hooks commit 1f0075786fedde538a95e2f39681052e25021d88 -Merge: 57aa5e908 12175b668 +Merge: 57aa5e908d 12175b668a Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Mon Mar 5 12:37:17 2007 +1030 @@ -179602,7 +179717,7 @@ Date: Wed Feb 28 15:43:06 2007 +1030 between coordinates stored in device and coordinates sent by the event. commit d9bcb22d199e8444b9762a35754e04d327dd5915 -Merge: 272d9341d c16343ac2 +Merge: 272d9341d0 c16343ac2c Author: Ben Byer <bbyer@bbyer.apple.com> Date: Tue Feb 27 16:28:20 2007 -0800 @@ -180027,14 +180142,14 @@ Date: Thu Feb 15 17:07:42 2007 +0200 http://xorg.freedesktop.org/wiki/XDC2007Notes#head-2719037a1905516c45cf74f0e155c8703221e446 commit f452507ca9209598401d15da0039aaa4e1fed1a3 -Merge: 04632835b 811675733 +Merge: 04632835b7 811675733e Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Thu Feb 15 09:47:20 2007 -0500 Merge branch 'master' into my-XACE-SELINUX commit 04632835b7402456fdcf6c8fa01970cd2804e27c -Merge: 88f89b9ac 9ecf79ca0 +Merge: 88f89b9ac1 9ecf79ca01 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Thu Feb 15 09:27:05 2007 -0500 @@ -180082,7 +180197,7 @@ Date: Wed Feb 14 17:09:33 2007 +1030 fix: WarpCursor needs to send MotionNotify. commit c4fe1bcce1c1e4822e688959b331b47a051d6e0a -Merge: e540d572c d570ff7c8 +Merge: e540d572c5 d570ff7c81 Author: Ian Romanick <idr@us.ibm.com> Date: Wed Feb 14 15:39:52 2007 -0800 @@ -180146,7 +180261,7 @@ Date: Mon Feb 12 17:18:29 2007 -0500 Remove spurious LIBADD from xf4bpp commit 16eb7254f861465f988ae3861ac3449c2c966062 -Merge: 3814862a8 c4b7e9d1c +Merge: 3814862a86 c4b7e9d1c1 Author: Ian Romanick <idr@us.ibm.com> Date: Fri Feb 9 12:38:49 2007 -0800 @@ -180325,7 +180440,7 @@ Date: Mon Jan 29 17:30:59 2007 -0800 Typical results were failure to sync, and a black screen. commit 3814862a869ee83d307eb01225d5949039f435d8 -Merge: a216de9b7 31f2d4a57 +Merge: a216de9b7f 31f2d4a57e Author: Ian Romanick <idr@us.ibm.com> Date: Mon Jan 29 15:14:31 2007 -0800 @@ -180366,7 +180481,7 @@ Date: Mon Jan 29 16:10:03 2007 +1030 mi: Fix cursor rendering issues. commit 15a81b6325d359990017b8e9f17ce18a7eff1354 -Merge: 3759254c0 cc3d66d4a +Merge: 3759254c09 cc3d66d4a5 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Sun Jan 28 17:18:57 2007 +1030 @@ -180379,7 +180494,7 @@ Date: Wed Nov 15 17:50:02 2006 +1030 o fix minor error in comment for GetPointerEvents() commit 3759254c0967ae83bdcbf097d9e8a58733c8e6f9 -Merge: ba547d4f6 ca5ebe397 +Merge: ba547d4f6a ca5ebe3971 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Sun Jan 28 17:05:55 2007 +1030 @@ -180398,7 +180513,7 @@ Date: Fri Jan 26 13:00:45 2007 +0100 Xorg #9692 commit a216de9b7ff55e2b73c487d037f248f00bd2e63b -Merge: 24506ea65 cf7ca9d09 +Merge: 24506ea65b cf7ca9d09c Author: Ian Romanick <idr@us.ibm.com> Date: Thu Jan 25 10:17:32 2007 -0800 @@ -180433,7 +180548,7 @@ Date: Wed Jan 24 15:33:49 2007 -0800 read_legcay_BIOS, and delete all remnants of it from all other places. commit fdb3a0798f0d17e72ec7293d59a7a81b5ffdf95b -Merge: 39b51e1bf a53586eeb +Merge: 39b51e1bfc a53586eebc Author: Ian Romanick <idr@us.ibm.com> Date: Wed Jan 24 14:49:39 2007 -0800 @@ -180461,7 +180576,7 @@ Date: Thu Jan 25 00:29:20 2007 +0800 Make Xinearama screen information reflect CRTC rotation. commit 39b51e1bfc4924fc3bda4342ef9c6c0125d9f4fa -Merge: 637b19b3e 788cfce91 +Merge: 637b19b3ee 788cfce911 Author: Ian Romanick <idr@us.ibm.com> Date: Tue Jan 23 13:25:56 2007 -0800 @@ -180503,7 +180618,7 @@ Date: Mon Jan 22 09:13:59 2007 -0800 ARCH_PCI_OS_INIT mechanism useless. Remove it. commit 7dfb3cea913b02a6b36c308d1330bd40abe6b41f -Merge: c279d5fdc 2dc866252 +Merge: c279d5fdc5 2dc866252c Author: Ian Romanick <idr@us.ibm.com> Date: Mon Jan 22 08:44:36 2007 -0800 @@ -180541,7 +180656,7 @@ Date: Fri Jan 19 14:52:23 2007 -0800 -ardelay and -arinterval, respectively. commit c279d5fdc53612a90f33fafe9e9c59ced008dd51 -Merge: 88f248e67 14d6a9b32 +Merge: 88f248e671 14d6a9b327 Author: Ian Romanick <idr@us.ibm.com> Date: Fri Jan 19 12:59:54 2007 -0800 @@ -180834,7 +180949,7 @@ Date: Tue Jan 9 16:34:40 2007 -0800 Track rename of DamagePost -> DamageAdd. commit da09964a931cc64d05ab571bf545fdad35a6d395 -Merge: e1f73d220 e3aa6ad20 +Merge: e1f73d2208 e3aa6ad201 Author: Ian Romanick <idr@us.ibm.com> Date: Tue Jan 9 15:27:34 2007 -0800 @@ -180919,7 +181034,7 @@ Date: Thu Jan 4 15:37:33 2007 -0800 Incorporate new byte-order related configure changes. commit 8dd5771a1b91c331860b667fb18e484452000aad -Merge: 45aa26ccb 7d2ec9217 +Merge: 45aa26ccb4 7d2ec92170 Author: Ian Romanick <idr@us.ibm.com> Date: Thu Jan 4 15:01:38 2007 -0800 @@ -181085,7 +181200,7 @@ Date: Thu Dec 28 13:15:11 2006 -0800 Export exaMove{In,Out}Pixmap(). commit 683ca3f7afaf15fd3ca7918f6175b5a9e4a6f05b -Merge: 05f915050 9563b2eea +Merge: 05f915050c 9563b2eea2 Author: Eric Anholt <eric@anholt.net> Date: Wed Dec 27 16:11:31 2006 -0800 @@ -181126,7 +181241,7 @@ Date: Sat Dec 9 22:51:59 2006 +0200 Make sure we're not copying sym_interpret across from an empty source. commit 43a4376bd72ef1b6486cddb60ad57b2d6169292a -Merge: 4b1c9ac3d d9e079d2a +Merge: 4b1c9ac3d1 d9e079d2a3 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Fri Dec 22 13:53:55 2006 -0500 @@ -181188,7 +181303,7 @@ Date: Tue Dec 19 16:38:34 2006 -0800 xorg.conf man page should say "XFree86-DGA", not "Xorg-DGA" commit a81dbaae0597492f0245080c6f5af7158e05e2d0 -Merge: fb6d676de d442998e3 +Merge: fb6d676de5 d442998e39 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Dec 19 16:11:19 2006 -0500 @@ -181228,7 +181343,7 @@ Date: Tue Dec 19 18:45:25 2006 +0100 This affects drivers with no UploadToScreen or UploadToScreen failures. commit 4334860e69e7d5b156082bd05c7a86708e5bad4c -Merge: 7e4717683 fdcc22ca1 +Merge: 7e4717683d fdcc22ca17 Author: Michel Dänzer <michel@tungstengraphics.com> Date: Tue Dec 19 16:29:26 2006 +0100 @@ -181263,14 +181378,14 @@ Date: Tue Dec 19 15:24:19 2006 +0100 See https://bugs.freedesktop.org/show_bug.cgi?id=6772 . commit ca5ebe3971d8ebcfed00c5ebcd026cdd0ce0c6ba -Merge: 4d07b5037 1b029fd89 +Merge: 4d07b50372 1b029fd896 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Tue Dec 19 10:51:01 2006 +1030 Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver commit 2d0a63126b3d3a17005b7e122617ee0c5f44a55b -Merge: d8b5394ed 1b029fd89 +Merge: d8b5394eda 1b029fd896 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Tue Dec 19 10:31:40 2006 +1030 @@ -181497,7 +181612,7 @@ Date: Tue Dec 12 15:59:08 2006 -0500 Split AssignClientState() into two routines, new routine is server-specific. commit 62e7722ebd8d341a23eb56cb330eeb00e6a975a6 -Merge: e12480699 f3c60900e +Merge: e124806994 f3c60900e5 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Dec 12 13:54:33 2006 -0500 @@ -181601,7 +181716,7 @@ Date: Sun Dec 10 11:24:05 2006 -0500 Accept EDID > 1.3 but < 2.0 if we find it, assume it's compatible. commit e1f73d220873fa091695e46b7fcd008663a95a6f -Merge: 27d682fa0 d56249a15 +Merge: 27d682fa03 d56249a15e Author: Ian Romanick <idr@us.ibm.com> Date: Fri Dec 8 17:24:15 2006 -0800 @@ -181621,7 +181736,7 @@ Date: Fri Dec 8 17:24:15 2006 -0800 hw/xfree86/utils/scanpci/Makefile.am commit d56249a15ead51ad4d2117d5538ada24af05b693 -Merge: f1f8df188 ec84f72d0 +Merge: f1f8df1889 ec84f72d07 Author: Jeremy C. Reed <reed@glacier.reedmedia.net> Date: Fri Dec 8 15:52:37 2006 -0600 @@ -181783,7 +181898,7 @@ Date: Tue Dec 5 18:50:19 2006 +1030 Ironing some glitches caused by the merge commit 3c8f166022a2d19af14eb670fa382503ba1451cd -Merge: 2a511492f f9f7d7f3b +Merge: 2a511492f9 f9f7d7f3be Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Tue Dec 5 18:28:33 2006 +1030 @@ -181864,7 +181979,7 @@ Date: Fri Dec 1 15:56:52 2006 +1030 DeliverDeviceEvents() caters for MPX devices. commit ccd804c6c01cdfffe938fa5336be9b5668a6f0c0 -Merge: 9423ac134 82912ad77 +Merge: 9423ac134a 82912ad770 Author: Drew Parsons <drew@pug.localdomain> Date: Fri Dec 1 15:21:57 2006 +1100 @@ -181903,7 +182018,7 @@ Date: Wed Nov 29 22:19:57 2006 -0500 Add required root window context to config file. commit 143558500a89a5c887c75c03798bae68c953cac9 -Merge: e3d3d29db ee9bdd3f4 +Merge: e3d3d29db5 ee9bdd3f4a Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Nov 29 20:41:41 2006 -0500 @@ -182037,7 +182152,7 @@ Date: Mon Nov 27 16:21:31 2006 -0800 Move mode handling helpers from ddcProperty.c to xf86Mode.c. commit b4b0d901d98371a8aa7b17d195e18e83e2a6a618 -Merge: 64de3baf8 d6cd0313c +Merge: 64de3baf85 d6cd0313c7 Author: Eric Anholt <eric@anholt.net> Date: Mon Nov 27 15:43:15 2006 -0800 @@ -182256,7 +182371,7 @@ Date: Mon Nov 20 13:10:07 2006 +1030 bugfix in mipointer, semicolon after preprocessor statement commit ca2874b273232d9f51881b1cd754ed6847bfaf47 -Merge: c9a5f9d39 e2f6dacc7 +Merge: c9a5f9d391 e2f6dacc73 Author: Alan Hourihane <alanh@fairlite.demon.co.uk> Date: Sat Nov 18 19:56:32 2006 +0000 @@ -182429,7 +182544,7 @@ Date: Tue Nov 14 15:33:07 2006 +0100 Bug #9023: Only check mice for "mouse" or "void" if identifier is != NULL. commit a724b7f1302ba7a59f140b521f13d2ddf0fcf9bf -Merge: 6facd958c f80a8ae6e +Merge: 6facd958c2 f80a8ae6e6 Author: Jeremy C. Reed <reed@glacier.reedmedia.net> Date: Mon Nov 13 20:32:26 2006 -0600 @@ -182753,7 +182868,7 @@ Date: Tue Nov 7 15:48:05 2006 -0800 A couple more cases of error message before freeing strings. commit 05f1c302460a14c8fa9a943a12d69adcd3c30d58 -Merge: 3e7e0e350 46af6d1e9 +Merge: 3e7e0e3509 46af6d1e95 Author: Adam Jackson <ajax@benzedrine.nwnk.net> Date: Tue Nov 7 18:42:54 2006 -0500 @@ -182799,7 +182914,7 @@ Date: Tue Nov 7 01:29:51 2006 -0800 getevents.c commit c20d3bf7533da0bf26beaf7d8c359d18edbd70e8 -Merge: 028bbdc04 3d39c02fe +Merge: 028bbdc041 3d39c02fe6 Author: Keith Packard <keithp@neko.keithp.com> Date: Tue Nov 7 01:21:28 2006 -0800 @@ -182838,14 +182953,14 @@ Date: Mon Nov 6 00:30:09 2006 +0100 Fix typo in Xvesa: incorrect reporting of DAC capabilities. commit 028bbdc0417173803695808ba9f48498519273a3 -Merge: 50504c68e 8deaaa312 +Merge: 50504c68e1 8deaaa312a Author: Keith Packard <keithp@neko.keithp.com> Date: Sat Nov 4 17:46:26 2006 -0800 Merge master back to randr-1.2 commit 50504c68e1d407232cf83465981b235e542ef31f -Merge: 8b87ce197 cde8806c2 +Merge: 8b87ce1974 cde8806c29 Author: Keith Packard <keithp@neko.keithp.com> Date: Sat Nov 4 17:43:19 2006 -0800 @@ -182925,7 +183040,7 @@ Date: Fri Oct 27 12:36:56 2006 -0700 and 1024x768@75 modes. commit 22ee2e4e1f1d9fd9ca9f25c9bf25370034b771d4 -Merge: 49a26681b bd0c82965 +Merge: 49a26681b2 bd0c829654 Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Fri Nov 3 12:54:56 2006 -0800 @@ -183038,7 +183153,7 @@ Date: Thu Nov 2 12:25:03 2006 +0100 Build with -D_PC on ix86 only. commit 543b397277d1f03b8091e44812010abcd5d80102 -Merge: 4056e6e79 645d05762 +Merge: 4056e6e79a 645d057620 Author: Keith Packard <keithp@neko.keithp.com> Date: Thu Nov 2 19:00:35 2006 -0800 @@ -183109,14 +183224,14 @@ Date: Thu Nov 2 03:22:09 2006 +0200 bump to 1.2.99.0 commit 18c246a13b887b865de6a17e6cd1c259b9bc383d -Merge: 794f2e729 4843d823f +Merge: 794f2e7291 4843d823f4 Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Nov 2 03:21:37 2006 +0200 Merge branch 'input-hotplug' commit 4843d823f4d38d8bd468ce3a8feddbff229ed416 -Merge: ba9f5138f a7b944f0d +Merge: ba9f5138fc a7b944f0d9 Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Nov 2 03:18:13 2006 +0200 @@ -183132,7 +183247,7 @@ Date: Thu Nov 2 03:16:10 2006 +0200 config file. commit be291a6d9764cf29a7d9a8114d47d9f41ce856e9 -Merge: a2d624210 6fdfd9dad +Merge: a2d6242106 6fdfd9dad9 Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Nov 2 03:15:25 2006 +0200 @@ -183249,7 +183364,7 @@ Date: Sun Oct 29 17:49:46 2006 +0100 kill GNU-make'ism. commit 0107320fac0913aae2cb169992e31c670b4bd2f7 -Merge: 06b6b971d a34446f5b +Merge: 06b6b971d0 a34446f5b3 Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> Date: Sun Oct 29 15:23:35 2006 +0100 @@ -183320,7 +183435,7 @@ Date: Fri Oct 27 18:26:30 2006 +0200 Import libdrm functions for the drm memory manager. commit e3d3d29db5eef057b4e8294377c9c3147436bc2f -Merge: 92387e99d 004d00e66 +Merge: 92387e99d0 004d00e668 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Thu Oct 26 20:21:16 2006 -0400 @@ -183371,7 +183486,7 @@ Date: Thu Oct 26 20:38:58 2006 +0300 lnx_ia64.c. commit 8c0556e7cb1de8c387ddd886a03a8f8afff1fd0e -Merge: cdc8a4b7b 004d00e66 +Merge: cdc8a4b7b2 004d00e668 Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Oct 26 15:21:22 2006 +0300 @@ -183389,7 +183504,7 @@ Date: Thu Oct 26 01:10:08 2006 +0300 The fallthrough to gettimeofday() is preserved. commit cdc8a4b7b2f099b8860a54c5c9f488e6f7c4913a -Merge: 3da918a16 d28583329 +Merge: 3da918a16c d285833290 Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Oct 26 00:28:30 2006 +0300 @@ -183430,14 +183545,14 @@ Date: Wed Oct 25 11:39:27 2006 +0200 without pretending it's always on. commit 59511974db843fa7e11133894cfc10c20fdaf60f -Merge: 054f8cd26 598ac7a83 +Merge: 054f8cd267 598ac7a836 Author: Keith Packard <keithp@neko.keithp.com> Date: Tue Oct 24 17:26:20 2006 -0700 Merge branch 'master' into randr-1.2 commit 598ac7a83698327b607084abaebcbd22f8d25fbb -Merge: 828c34e83 948a97b97 +Merge: 828c34e83c 948a97b97e Author: Keith Packard <keithp@neko.keithp.com> Date: Tue Oct 24 17:23:12 2006 -0700 @@ -183536,7 +183651,7 @@ Date: Tue Oct 24 09:04:14 2006 -0700 Fix from HEAD accidentally reverted during merge. commit 8b909135664abb69ada522e8e39495d9eca717ac -Merge: 21291d6ca 948a97b97 +Merge: 21291d6ca7 948a97b97e Author: Ian Romanick <idr@us.ibm.com> Date: Tue Oct 24 08:57:59 2006 -0700 @@ -183593,7 +183708,7 @@ Date: Mon Oct 23 05:12:15 2006 +0300 Remove unused xf86CheckButton. commit c5b5b046e86b159a9d32451308f38246cc4587f7 -Merge: fab1d37ec 948a97b97 +Merge: fab1d37ecb 948a97b97e Author: Daniel Stone <daniel@fooishbar.org> Date: Mon Oct 23 02:58:30 2006 +0300 @@ -183779,7 +183894,7 @@ Date: Sat Oct 21 22:06:43 2006 +1000 Minor typos in Xserver man page. commit e26a494f417c3c700636ee68892c3015b2e0f27a -Merge: 736b0d507 aeba855b0 +Merge: 736b0d5078 aeba855b07 Author: Zephaniah E. Hull <warp@agamemnon.b5> Date: Sat Oct 21 04:26:14 2006 -0400 @@ -184093,7 +184208,7 @@ Date: Fri Oct 13 17:34:53 2006 -0700 Separate configuration from layout changes to send correct events. commit 335b503c5e7041bb0c44611e496d1c46f554e630 -Merge: bd3d93be8 cf948b7b0 +Merge: bd3d93be82 cf948b7b04 Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Oct 13 18:10:45 2006 +0300 @@ -184107,7 +184222,7 @@ Date: Fri Oct 13 14:48:10 2006 +0100 to avoid cursor movements signalling io. commit 4b53a5e4b147ab748b28dffc1d330b7148d8efa6 -Merge: 23f6f08b7 042d4a407 +Merge: 23f6f08b7b 042d4a407d Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Oct 11 20:50:31 2006 -0400 @@ -184321,7 +184436,7 @@ Date: Sat Oct 7 14:16:51 2006 +0300 layer. commit 4c342246300e06bdf5c9c62cc1d2f6aa57a524db -Merge: 8382234a7 49a70c857 +Merge: 8382234a7f 49a70c8570 Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Fri Oct 6 18:01:13 2006 -0700 @@ -184374,14 +184489,14 @@ Date: Thu Oct 5 16:07:26 2006 -0400 Improve error handling, messages during initialization. commit de63a469dcd0a8ae98554bca540ac0106cccf2a5 -Merge: 9c7440bdf 8382234a7 +Merge: 9c7440bdf5 8382234a7f Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Oct 5 20:29:19 2006 +0300 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug commit b4659faf9b455b44ac8e691cc7a8fc00a967c80b -Merge: c4f30c635 8382234a7 +Merge: c4f30c6353 8382234a7f Author: Keith Packard <keithp@neko.keithp.com> Date: Wed Oct 4 14:46:04 2006 -0700 @@ -184417,7 +184532,7 @@ Date: Tue Oct 3 17:48:50 2006 -0700 Don't insert RCS tag into generated pci id header files commit 75e0cc41b201b9ceb2615e7cec0dd5b4c136b343 -Merge: 6926776f0 20c0ceedf +Merge: 6926776f0e 20c0ceedfb Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Oct 3 13:58:03 2006 -0400 @@ -184451,7 +184566,7 @@ Date: Mon Oct 2 02:17:14 2006 +0300 Use XkbCharToInt as that's what we're doing. commit 3c98cebb6e954855528794fec46830f456cbdec1 -Merge: fa1ac9417 2cf109843 +Merge: fa1ac94178 2cf1098436 Author: Daniel Stone <daniel@fooishbar.org> Date: Mon Oct 2 02:18:17 2006 +0300 @@ -184479,21 +184594,21 @@ Date: Sat Sep 30 17:05:46 2006 +0300 if built with --enable-debug. commit 20c0ceedfbce9ae5c70703900b52973917ac4cd0 -Merge: 49a70c857 84eb2c0a0 +Merge: 49a70c8570 84eb2c0a06 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Fri Sep 29 15:37:00 2006 -0400 Merge branch 'master' into my-XACE-modular commit 518db35ca3f569e7cb95dbddeddb93f3691de498 -Merge: 5d99e05f0 84eb2c0a0 +Merge: 5d99e05f05 84eb2c0a06 Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Sep 29 00:35:21 2006 +0300 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug commit 5d99e05f05a42a82a9f02844df9bfebaa673759d -Merge: ad631afcf 589337578 +Merge: ad631afcf3 5893375786 Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Sep 29 00:35:07 2006 +0300 @@ -184517,7 +184632,7 @@ Date: Thu Sep 28 15:09:40 2006 -0600 Patch by Dan Nicholson. commit 4bc5dc2854e33bf343cdea44a3c3b4c41f6f4145 -Merge: cf6e9687f f9542e749 +Merge: cf6e9687ff f9542e7495 Author: Aaron Plattner <aplattner@nvidia.com> Date: Thu Sep 28 13:27:13 2006 -0700 @@ -184557,7 +184672,7 @@ Date: Wed Aug 30 19:12:17 2006 +0200 Add wrapper for new ioctl to update drawable information in the DRM. commit ad321fad4b9ab3a2c70cfff37ca6c8faaa5cce9c -Merge: 5e9d33fe8 f7c1d9424 +Merge: 5e9d33fe87 f7c1d94241 Author: Daniel Stone <daniel@fooishbar.org> Date: Sun Sep 24 17:56:43 2006 +0300 @@ -184761,14 +184876,14 @@ Date: Sat Sep 16 03:49:11 2006 -0400 Thanks, automake. commit 6926776f0ecd1e8e81c5c40ccd3a97227bc44dcb -Merge: 6950267dd 49a70c857 +Merge: 6950267dd6 49a70c8570 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Fri Sep 15 15:28:13 2006 -0400 Merge branch 'my-XACE-modular' into my-XACE-SELINUX commit 49a70c8570b03aff8239324a2474918a6fbc52a0 -Merge: d1110c5c8 05231e336 +Merge: d1110c5c83 05231e336d Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Fri Sep 15 15:26:57 2006 -0400 @@ -184996,7 +185111,7 @@ Date: Sun Sep 10 11:13:18 2006 -0700 so I think we can tolerate the extra #ifdef for the next release. commit 60db190ecfce52cbfa888c0af3210634f9186bed -Merge: 5e9d33fe8 65256109b +Merge: 5e9d33fe87 65256109bb Author: Zephaniah E. Hull <warp@agamemnon.b5> Date: Sun Sep 10 03:49:17 2006 -0400 @@ -185021,7 +185136,7 @@ Date: Fri Sep 8 15:31:18 2006 -0400 Add SELinux extension configure-time support. commit fb34c02861ab3629c1c85c156e73b158518db7c7 -Merge: 9c503f09c d1110c5c8 +Merge: 9c503f09ce d1110c5c83 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Fri Sep 8 15:30:12 2006 -0400 @@ -185089,7 +185204,7 @@ Date: Thu Sep 7 15:35:16 2006 -0400 DRI locking between 2D and 3D drivers around VT switch. commit 5e9d33fe87f9d24e55c468d4b2bb761c9efdb26a -Merge: 629798c73 64479fffa +Merge: 629798c73a 64479fffa2 Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Sep 7 15:43:31 2006 +0300 @@ -185141,7 +185256,7 @@ Date: Tue Sep 5 15:23:54 2006 -0700 (unsigned long)(1 << 31) = bad news on x86_64. commit 0b81fccd2ee4e054e5cffb739de07460ff2c13f7 -Merge: 20c4ac6e0 c2813514c +Merge: 20c4ac6e03 c2813514cf Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Sep 5 18:03:25 2006 -0400 @@ -185207,7 +185322,7 @@ Date: Tue Aug 29 16:35:32 2006 -0700 appear in the server's string. commit 1c8851ad491dd02d1c79e620b46384956838ed42 -Merge: d59b52fc0 5ddbf4bcd +Merge: d59b52fc08 5ddbf4bcd4 Author: Ian Romanick <idr@us.ibm.com> Date: Tue Aug 29 16:34:04 2006 -0700 @@ -185243,7 +185358,7 @@ Date: Tue Aug 29 23:49:26 2006 +0300 Yeah. That was dumb. commit 942b4369990a255257f66835caf8671432c405a3 -Merge: 77d315bd2 393dc0a33 +Merge: 77d315bd2f 393dc0a338 Author: Ian Romanick <idr@us.ibm.com> Date: Tue Aug 29 13:30:37 2006 -0700 @@ -185303,7 +185418,7 @@ Date: Tue Aug 29 13:19:12 2006 +0300 couple of range-related thinkos in level name copying. commit 7fa3383e3c8eea7d1eb0e556393f2431cf8e6ed2 -Merge: 8d77d44fd ebbdc1342 +Merge: 8d77d44fda ebbdc1342a Author: Daniel Stone <daniel@fooishbar.org> Date: Tue Aug 29 15:16:01 2006 +0300 @@ -185316,14 +185431,14 @@ Date: Mon Aug 28 18:17:32 2006 -0400 Remove calls to LoaderCheckUnresolved(), since it's now a stub. commit 8d77d44fda3aacbae62864a3620e09095b79e92d -Merge: d6f36bd28 2fde560bb +Merge: d6f36bd280 2fde560bbb Author: Daniel Stone <daniel@fooishbar.org> Date: Sun Aug 27 23:08:49 2006 +0300 Merge branch 'origin' into input-hotplug commit 20c4ac6e038607ebbf6c04639670514c016d8597 -Merge: 13c6713c8 8d4f21ab5 +Merge: 13c6713c82 8d4f21ab53 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Fri Aug 25 18:49:46 2006 -0400 @@ -185356,7 +185471,7 @@ Date: Fri Aug 25 12:05:16 2006 -0700 GL_NV_{vertex,fragment}_program, and related extensions can be enabled. commit 21291d6ca7188e5733ed0c93215ee0f1f0f90cc9 -Merge: 1a5561c4e cd2da4e41 +Merge: 1a5561c4ec cd2da4e41e Author: Ian Romanick <idr@umwelt.(none)> Date: Fri Aug 25 09:34:21 2006 -0700 @@ -185371,7 +185486,7 @@ Date: Fri Aug 25 12:43:17 2006 +0300 best-effort attempt to keep configs working. commit 7c4167f0d6b33c9c602b04fcfd246fd3aeddd709 -Merge: 393f8347e cd2da4e41 +Merge: 393f8347ed cd2da4e41e Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Aug 25 11:15:33 2006 +0300 @@ -185413,7 +185528,7 @@ Date: Thu Aug 24 17:58:52 2006 -0700 Add some missing bits of GL_SGI_color_table. commit ae608b2071d882966e9c7ede71f846b1ecec0b23 -Merge: 2c865277f b879356ce +Merge: 2c865277fe b879356ce9 Author: Ian Romanick <idr@umwelt.(none)> Date: Thu Aug 24 14:56:33 2006 -0700 @@ -185436,7 +185551,7 @@ Date: Thu Aug 24 14:49:46 2006 -0700 Regenerate from gl_API.xml 1.62. Functions move, no real changes. commit 3a36b0a24aa9e9e238faa7f00100f59800f5142b -Merge: db1ab1bdb b879356ce +Merge: db1ab1bdb2 b879356ce9 Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Aug 24 23:35:28 2006 +0300 @@ -185474,7 +185589,7 @@ Date: Thu Aug 24 15:50:15 2006 -0400 More #ifdef USE_DEPRECATED_KEYBOARD_DRIVER. commit 4ed311cf1c29090c53e474a3001c5702ff8409df -Merge: 73e58adda b29b236d8 +Merge: 73e58adda9 b29b236d88 Author: Matthias Hopf <mhopf@suse.de> Date: Thu Aug 24 20:17:10 2006 +0200 @@ -185507,7 +185622,7 @@ Date: Thu Aug 24 14:51:26 2006 +0300 Fix horrendous thinko. Indicators now work perfectly. commit 4adf9af313c9f63b6ad734e174efe1d36ddb5813 -Merge: 33af05d58 67bd672c8 +Merge: 33af05d58f 67bd672c88 Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Aug 24 10:59:33 2006 +0300 @@ -185526,7 +185641,7 @@ Date: Wed Aug 23 22:39:42 2006 +0000 Add xorg.conf IgnoreABI option which does the same thing as -ignoreABI commit b983773d446cef6a0948ca264ed48126e404ae9a -Merge: 0623d3643 d9a86566c +Merge: 0623d3643f d9a86566c2 Author: Ian Romanick <idr@umwelt.(none)> Date: Wed Aug 23 17:16:50 2006 -0700 @@ -185648,14 +185763,14 @@ Date: Wed Aug 23 14:33:41 2006 +0300 the moment), and use that instead of nasty pointer assignments. commit 52ba722e4c89c052609b4fc62e965d92778aa2dd -Merge: 9138d5a51 05541259b +Merge: 9138d5a51e 05541259bd Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Mon Aug 21 18:49:31 2006 -0400 Merge branch 'XACE-modular' into my-XACE-modular commit 05541259bdb0dfaab015a01caa3722b7a1b782e2 -Merge: c2535f679 a1ac0440b +Merge: c2535f6792 a1ac0440bb Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Mon Aug 21 13:07:41 2006 -0700 @@ -185671,7 +185786,7 @@ Date: Fri Aug 18 18:03:41 2006 +0300 configure time. commit 0704bb298cc826cd117815898c6bc015a693c2c9 -Merge: c14036977 a1ac0440b +Merge: c14036977f a1ac0440bb Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Aug 18 17:30:14 2006 +0300 @@ -185691,14 +185806,14 @@ Date: Fri Aug 18 17:24:34 2006 +0300 input.h: add InitCoreDevices prototype commit 1c2cb30cd88ba4453f9da339025f8ff39f7f5412 -Merge: 633b6a69f 70ddd0f39 +Merge: 633b6a69f5 70ddd0f39d Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Aug 18 17:05:50 2006 +0300 Merge branch 'origin' into input-hotplug commit 19f673b7788d32c220e7e06734f1074b0e4a999c -Merge: cb0a565d2 70ddd0f39 +Merge: cb0a565d2b 70ddd0f39d Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Aug 18 17:05:41 2006 +0300 @@ -185721,7 +185836,7 @@ Date: Fri Aug 18 14:43:10 2006 +0100 (Brett Stahlman & Colin Harrison) commit 708b225689b5a4ba9ffe3372b584b715ef9eacdc -Merge: e1f4565be ee5e2cbd2 +Merge: e1f4565be5 ee5e2cbd2b Author: Alan Hourihane <alanh@fairlite.demon.co.uk> Date: Fri Aug 18 09:13:52 2006 +0100 @@ -185766,7 +185881,7 @@ Date: Thu Aug 17 16:22:07 2006 -0400 It would be really nice if we only did this in one place instead of 40. commit 633b6a69f560c0a77dcff78fdef5fcf0041e2e04 -Merge: 95dbfcf88 7da51447e +Merge: 95dbfcf882 7da51447ea Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Aug 17 21:25:14 2006 +0300 @@ -185874,21 +185989,21 @@ Date: Tue Aug 15 15:23:53 2006 +0300 Fix debug_events prototype. commit d003bada3352ec7d734498c4c732904876a9d1e2 -Merge: d6433be3c a815b9b99 +Merge: d6433be3cc a815b9b990 Author: Daniel Stone <daniel@fooishbar.org> Date: Sat Aug 12 22:48:55 2006 +0300 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug commit a815b9b990e068f02d9cbba2b17f2cc3a30a9310 -Merge: 37943e2f1 984babe86 +Merge: 37943e2f1a 984babe86b Author: George Sapountzis <gsap7@yahoo.gr> Date: Sat Aug 12 21:58:33 2006 +0300 Merge branch 'master' of git+ssh://gsap7@git.freedesktop.org/git/xorg/xserver commit d6433be3cca807dd78fbb1f45d9ba0212283083d -Merge: 2bf9e3dc1 984babe86 +Merge: 2bf9e3dc1e 984babe86b Author: Daniel Stone <daniel@fooishbar.org> Date: Sat Aug 12 21:50:52 2006 +0300 @@ -185947,7 +186062,7 @@ Date: Sat Aug 12 19:25:06 2006 +0300 Define HAVE_EXECINFO_H as well as HAVE_BACKTRACE, when we find execinfo.h. commit 26c3cd1c9e3f52548389817a6d89a377e20c4269 -Merge: 008aa7eb6 c4951e0a6 +Merge: 008aa7eb6e c4951e0a6b Author: Daniel Stone <daniel@fooishbar.org> Date: Sat Aug 12 18:58:18 2006 +0300 @@ -185976,7 +186091,7 @@ Date: Thu Aug 10 20:43:15 2006 -0400 mode. Also add M_T_PREFERRED bit, to select a 'best' mode out of a set. commit c2535f67923bde0bfb0e72363467110806e2f40f -Merge: c0cb8d1fb db82e12fa +Merge: c0cb8d1fb8 db82e12fac Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Thu Aug 10 10:37:59 2006 -0700 @@ -185998,7 +186113,7 @@ Date: Thu Aug 10 20:28:06 2006 +0300 auto. commit 1a5561c4ecccaf32b03c41373adf376100d457aa -Merge: 190f229ed db82e12fa +Merge: 190f229ed7 db82e12fac Author: Ian Romanick <idr@umwelt.(none)> Date: Thu Aug 10 10:20:37 2006 -0700 @@ -186019,7 +186134,7 @@ Date: Thu Aug 10 18:02:47 2006 +0300 XKB (and thus don't need to count the extra repeat events). commit 172d45b9b75f95c997d1e9358040eead496e2a06 -Merge: 3832a3d7d db82e12fa +Merge: 3832a3d7db db82e12fac Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Aug 10 14:14:54 2006 +0300 @@ -186064,7 +186179,7 @@ Date: Wed Aug 9 14:48:51 2006 -0400 Remove the bc flag from the -help text, since it's gone. commit 767f372dd02232469f9fd804b811a17eaf762e1e -Merge: c4f5de6cc 462bb61b0 +Merge: c4f5de6cc3 462bb61b0f Author: Tilman Sauerbeck <tilman@code-monkey.de> Date: Wed Aug 9 20:23:30 2006 +0200 @@ -186082,7 +186197,7 @@ Date: Wed Aug 9 20:21:52 2006 +0200 hooks. commit 5506b4ad200745236f997c121e8200179c47b749 -Merge: 4be9abb85 462bb61b0 +Merge: 4be9abb850 462bb61b0f Author: Daniel Stone <daniel@fooishbar.org> Date: Wed Aug 9 07:21:01 2006 +0300 @@ -186143,7 +186258,7 @@ Date: Tue Aug 8 14:54:10 2006 +0300 Sending MapNotify is more correct in this case than NKN, so do that. commit 31089816317f27c668b12a15c74fdd226a8df9f7 -Merge: ab3ebfefd 12dbd8a02 +Merge: ab3ebfefdb 12dbd8a02f Author: Daniel Stone <daniel@fooishbar.org> Date: Tue Aug 8 12:01:12 2006 +0300 @@ -186267,7 +186382,7 @@ Date: Mon Aug 7 16:51:09 2006 +0300 memcpy events into our event structure instead of doing pointer assignment. commit c85e64cba1d2d88f676ca7cf23b52a6f8219e90e -Merge: a406f6bfe f54b71b77 +Merge: a406f6bfea f54b71b772 Author: Daniel Stone <daniel@fooishbar.org> Date: Mon Aug 7 15:54:55 2006 +0300 @@ -186354,7 +186469,7 @@ Date: Wed Aug 2 09:55:32 2006 -0700 Remove pciConfigPtr and all of the associated cruft. commit 966ebd3d2d84b440e89504d055a0e937303ed11d -Merge: a94176627 39169fd37 +Merge: a94176627c 39169fd373 Author: Ian Romanick <idr@umwelt.(none)> Date: Wed Aug 2 08:14:58 2006 -0700 @@ -186409,14 +186524,14 @@ Date: Mon Jul 31 13:54:36 2006 -0700 Build fixes for last pull from HEAD. commit 65dc25d8f86b962f2adc765a9ff327419f98092b -Merge: 69533fc04 b74c845a1 +Merge: 69533fc04f b74c845a12 Author: Ian Romanick <idr@umwelt.(none)> Date: Mon Jul 31 12:30:30 2006 -0700 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework commit b74c845a1233f78b841ff8840272c50873300c20 -Merge: 3112a6c4f 02daa6bb1 +Merge: 3112a6c4f2 02daa6bb10 Author: Ian Romanick <idr@umwelt.(none)> Date: Mon Jul 31 10:26:06 2006 -0700 @@ -186440,7 +186555,7 @@ Date: Mon Jul 31 17:32:05 2006 +0100 and GC stripple and tile pixmaps. commit 69533fc04f38c67fd424776c5191a4ba57ba8c8f -Merge: ef1aecaaf 24051ef97 +Merge: ef1aecaaf6 24051ef974 Author: Ian Romanick <idr@umwelt.(none)> Date: Mon Jul 31 09:26:04 2006 -0700 @@ -186488,7 +186603,7 @@ Date: Sun Jul 30 11:08:47 2006 +0300 remove README (which doesn't exist) from EXTRA_DIST commit 87fe85f38b6f781bf0e2eb555526e3d77779f9fa -Merge: 3518e2d0d 654619d76 +Merge: 3518e2d0de 654619d76c Author: Daniel Stone <daniel@fooishbar.org> Date: Sun Jul 30 10:51:34 2006 +0300 @@ -186586,7 +186701,7 @@ Date: Wed Jul 26 13:25:13 2006 -0700 Pass correct pointer to xf86MapLegacyIO. commit 3518e2d0debc97e2bacdefe604b280e7fdfdd216 -Merge: eb7733a48 3821f6aea +Merge: eb7733a48a 3821f6aeaa Author: Daniel Stone <daniel@fooishbar.org> Date: Wed Jul 26 11:29:21 2006 +0300 @@ -186613,7 +186728,7 @@ Date: Tue Jul 25 15:38:09 2006 -0700 pci_device_get_bridge_buses can be used. commit 380b51d605a82c98082a2cebd70a0d1d0735eaa7 -Merge: 82f6b7e75 8977b0743 +Merge: 82f6b7e75e 8977b07434 Author: Ian Romanick <idr@umwelt.(none)> Date: Tue Jul 25 11:30:04 2006 -0700 @@ -186711,7 +186826,7 @@ Date: Sun Jul 23 19:02:12 2006 -0400 Allow XOpenDevice on closed devices. commit e73e5e2a4d8f22889d840a7719479f9af686cb9c -Merge: a73cef1f0 8977b0743 +Merge: a73cef1f00 8977b07434 Author: Daniel Stone <daniel@fooishbar.org> Date: Sat Jul 22 13:56:30 2006 -0400 @@ -186724,7 +186839,7 @@ Date: Sun Jul 23 03:36:47 2006 +1000 glx: fix typo from tag removal commit a73cef1f005ca66db18e952e676ee5a21b829700 -Merge: 672ca156b 70869fc67 +Merge: 672ca156bf 70869fc677 Author: Daniel Stone <daniel@fooishbar.org> Date: Sat Jul 22 12:07:22 2006 -0400 @@ -186767,7 +186882,7 @@ Date: Fri Jul 21 19:16:38 2006 -0700 Fix stupid typos. commit 672ca156bfb11440e6e234650bfba9d38e1edb52 -Merge: d14d91f09 6cf844ab6 +Merge: d14d91f094 6cf844ab69 Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Jul 21 19:58:42 2006 -0400 @@ -186800,7 +186915,7 @@ Date: Fri Jul 21 16:47:45 2006 -0700 which in turn allows the elimination of hw/xfree86/int10/pci.c. commit 87a6346bf7f086b5f98b2b2ecd52f27efe864e56 -Merge: b73fb2ae3 0486d3966 +Merge: b73fb2ae35 0486d3966d Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Jul 21 19:36:25 2006 -0400 @@ -186815,7 +186930,7 @@ Date: Fri Jul 21 19:35:04 2006 -0400 XkbSA_XFree86Private. commit b73fb2ae35a82e0bdd48f01132e971fb84946ff1 -Merge: e7ac27ad8 aff404f29 +Merge: e7ac27ad81 aff404f293 Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Jul 21 19:30:26 2006 -0400 @@ -186837,7 +186952,7 @@ Date: Fri Jul 21 19:10:26 2006 -0400 Ugh. commit 7465010d59ec435bd00b738f0cef766b352dc7eb -Merge: 1d31ed778 0aaac95b0 +Merge: 1d31ed7782 0aaac95b0d Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Jul 21 19:05:41 2006 -0400 @@ -186863,7 +186978,7 @@ Date: Fri Jul 21 18:41:46 2006 -0400 Remove the loader's required and referenced symbol lists, dead code. commit 07ad92d2c4cb07db8487d76efc822fd7b88137cb -Merge: 18624a9b7 22db3fdb5 +Merge: 18624a9b7c 22db3fdb54 Author: Ian Romanick <idr@umwelt.(none)> Date: Fri Jul 21 15:25:35 2006 -0700 @@ -186894,7 +187009,7 @@ Date: Thu Jul 20 18:19:07 2006 -0700 Fix the RandR failure path for rotated screens. commit 22db3fdb54d2f7f6b72638b46c186af6db04e214 -Merge: 2f98841fd 93cd53860 +Merge: 2f98841fde 93cd53860c Author: Ian Romanick <idr@umwelt.(none)> Date: Fri Jul 21 13:55:37 2006 -0700 @@ -187137,7 +187252,7 @@ Date: Thu Jul 20 17:33:13 2006 -0400 Remove the DDXTIME conditional, for being unused. commit c69c00d6523a35232a32e54a533811fc2b37815a -Merge: 46369350d 84683f19b +Merge: 46369350d4 84683f19b4 Author: Ian Romanick <idr@umwelt.(none)> Date: Thu Jul 20 12:08:38 2006 -0700 @@ -187211,7 +187326,7 @@ Date: Thu Jul 13 21:10:48 2006 -0700 Modify linuxGetSizesStruct to use pci_device instead of pciConfigPtr. commit 12595a77d6c2f037f48dfe751bdc10505b3317df -Merge: 37838de62 4c225a3a8 +Merge: 37838de62e 4c225a3a8b Author: Ian Romanick <idr@umwelt.(none)> Date: Thu Jul 13 12:48:03 2006 -0700 @@ -187252,7 +187367,7 @@ Date: Sat Jul 8 21:57:07 2006 +0100 Fix crash in Xephyr when running on host X with keymap width < 4 ( i.e xvnc ) commit 21e3e3ca298dce22e5fad6ef38aa6fe9736a1d3b -Merge: e80562189 39b2f7b21 +Merge: e805621894 39b2f7b218 Author: Matthew Allum <mallum@polystyrene.(none)> Date: Sat Jul 8 21:13:52 2006 +0100 @@ -187339,7 +187454,7 @@ Date: Thu Jul 6 17:39:14 2006 -0400 Switch the default mouse device on Linux to /dev/input/mice. commit 37838de62edc474f44c0a48bd56470a6c23f8956 -Merge: fd49a0dcc 8d07ee070 +Merge: fd49a0dcc1 8d07ee070e Author: Ian Romanick <idr@umwelt.(none)> Date: Thu Jul 6 13:01:57 2006 -0700 @@ -187365,7 +187480,7 @@ Date: Thu Jul 6 14:22:33 2006 -0400 Spotted by Aaron Plattner. commit fd49a0dcc13280cf195bd6c7ee0f23d0840cb665 -Merge: e66e7b48e 28b95fd9d +Merge: e66e7b48e1 28b95fd9d1 Author: Ian Romanick <idr@umwelt.(none)> Date: Thu Jul 6 09:52:15 2006 -0700 @@ -187423,7 +187538,7 @@ Date: Wed Jun 28 15:59:01 2006 -0400 DoGetDrawableAttributes and __glXQueryContextInfoEXT. commit e66e7b48e15543f3753951a19376f0446759963a -Merge: a9d484289 eb35f812a +Merge: a9d4842893 eb35f812a5 Author: Ian Romanick <idr@umwelt.(none)> Date: Wed Jul 5 15:21:36 2006 -0700 @@ -187537,7 +187652,7 @@ Date: Sat Jul 1 12:34:36 2006 -0700 Missing close parenthesis in one of the setuid() fixes. commit 124a81eb389dfa510ac07ca93ee17c4c9d6e56ea -Merge: d3d6c5f4d 179737d4a +Merge: d3d6c5f4d0 179737d4a0 Author: Keith Packard <keithp@neko.keithp.com> Date: Sat Jul 1 11:12:50 2006 -0700 @@ -187565,7 +187680,7 @@ Date: Wed Jun 7 01:46:00 2006 -0700 Move variable declarations to start of blocks as required by c89 commit a9d4842893b65232d61fe4c63f074d30e81021d2 -Merge: 66cac9b17 6bd4c2543 +Merge: 66cac9b174 6bd4c25439 Author: Ian Romanick <idr@umwelt.(none)> Date: Fri Jun 30 11:49:29 2006 -0700 @@ -187579,7 +187694,7 @@ Date: Mon Jun 26 01:52:24 2006 +0200 Updated for Solaris 10 changes to DDI commit 66cac9b17498497d939bfb7a4075bcee5a485e5f -Merge: 7c4e54025 54d9acd51 +Merge: 7c4e540253 54d9acd511 Author: Ian Romanick <idr@umwelt.(none)> Date: Wed Jun 28 14:11:49 2006 -0700 @@ -187616,14 +187731,14 @@ Date: Tue Jun 27 04:11:47 2006 +0200 cairo's clip-operator test. commit 7c4e54025345455f420cd2abaa7a40679689d3cb -Merge: 9d0a15dca ff6b59a0d +Merge: 9d0a15dca5 ff6b59a0db Author: Ian Romanick <idr@umwelt.(none)> Date: Mon Jun 26 14:39:44 2006 -0700 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework commit ff6b59a0dbadbe61a53e48c23965d3073d95791b -Merge: b3c869304 48c871564 +Merge: b3c869304c 48c871564d Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Mon Jun 26 13:02:33 2006 -0700 @@ -187706,7 +187821,7 @@ Date: Wed Jun 21 09:30:59 2006 -0700 Add a manpage for EXA. commit 9d0a15dca56b14821cad474f9db9c332acb3b1e6 -Merge: 6c514ca14 d67fd1069 +Merge: 6c514ca14c d67fd10696 Author: Ian Romanick <idr@umwelt.(none)> Date: Thu Jun 22 16:21:10 2006 -0700 @@ -187742,7 +187857,7 @@ Date: Wed Jun 21 18:12:41 2006 -0700 Use XACE, not XCSECURITY to decide if SecurityLookup* are exported commit 3177dc498a955cd58cd6054a7c7e69724db4a59b -Merge: 3f19803e0 91dcac529 +Merge: 3f19803e0b 91dcac5295 Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Wed Jun 21 18:06:06 2006 -0700 @@ -187755,7 +187870,7 @@ Date: Wed Jun 21 18:05:51 2006 -0700 APPGROUP requires both X-ACE & XC-SECURITY now commit 91dcac5295486cc55a34ad91704bfa483bd31eeb -Merge: d8135eb9e 77c947b90 +Merge: d8135eb9e4 77c947b900 Author: Adam Jackson <ajax@benzedrine.nwnk.net> Date: Wed Jun 21 20:49:30 2006 -0400 @@ -187782,7 +187897,7 @@ Date: Wed Jun 21 16:24:20 2006 -0700 Correct ifdef - should be XACE, not XSECURITY commit 90af38fa0c46c2081d2becac262a614c26ba6ef1 -Merge: 3e098efa3 77c947b90 +Merge: 3e098efa35 77c947b900 Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Wed Jun 21 16:23:31 2006 -0700 @@ -187809,7 +187924,7 @@ Date: Wed Jun 21 16:18:41 2006 -0700 of updates.) commit aa131c51e06e735d7b54cadf51205f703a3de4ef -Merge: 1708b0c7d 77aa701e8 +Merge: 1708b0c7d9 77aa701e89 Author: Ian Romanick <idr@umwelt.(none)> Date: Wed Jun 21 14:39:52 2006 -0700 @@ -187877,7 +187992,7 @@ Date: Tue Jun 20 19:01:34 2006 -0700 - Added X-ACE sources to Xext/Makefile.am commit a46c06dab8392cf8012c7cc0b916de9a9e569671 -Merge: 49b368c0b d44b2a0a5 +Merge: 49b368c0bb d44b2a0a57 Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Tue Jun 20 18:40:18 2006 -0700 @@ -187909,7 +188024,7 @@ Date: Tue Jun 20 18:14:27 2006 -0700 Move Xserver API for security extension to securitysrv.h commit 49b368c0bb04816c4a3579071c596b2398cae3ec -Merge: 63f6e6bbf 481d4012e +Merge: 63f6e6bbfd 481d4012e7 Author: Alan Coopersmith <alanc@alf.(none)> Date: Tue Jun 20 16:22:39 2006 -0700 @@ -187922,7 +188037,7 @@ Date: Tue Jun 20 16:16:19 2006 -0700 Don't add -ldl to XORG_LIBS if it's not needed for dlopen commit 63f6e6bbfd0d3677e29621af982c9392ead98dd7 -Merge: 88ede2cec 6df52fb77 +Merge: 88ede2cec7 6df52fb774 Author: Alan Coopersmith <alanc@alf.(none)> Date: Tue Jun 20 16:03:34 2006 -0700 @@ -187935,7 +188050,7 @@ Date: Tue Jun 20 16:02:55 2006 -0700 Delete code that's been inside #if 0 since X11R6.7. commit 75398cff82b56c0a8fc301e84e2087f59a61a360 -Merge: 1f91b5726 2b5868540 +Merge: 1f91b5726c 2b58685402 Author: Ian Romanick <idr@umwelt.(none)> Date: Tue Jun 20 15:49:47 2006 -0700 @@ -187947,7 +188062,7 @@ Date: Tue Jun 20 15:49:47 2006 -0700 hw/xfree86/loader/xf86sym.c commit 88ede2cec79281a43cecb43ee6dec65770f82530 -Merge: 227a31934 2b5868540 +Merge: 227a319340 2b58685402 Author: Alan Coopersmith <alanc@alf.(none)> Date: Tue Jun 20 15:29:55 2006 -0700 @@ -187997,7 +188112,7 @@ Date: Wed May 5 20:07:37 2004 +0000 (cherry picked from 0106715000196c7b349a0b4494b61545f0f5e138 commit) commit 0707eb33d6826e1300a905edea28c12134600b12 -Merge: 37f0ae024 98d17bba7 +Merge: 37f0ae0245 98d17bba71 Author: Alan Coopersmith <alanc@alf.(none)> Date: Mon Jun 19 17:09:51 2006 -0700 @@ -188162,7 +188277,7 @@ Date: Fri Jun 16 10:14:30 2006 -0700 hadn't been bumped. commit 72ac20c0e878ad48ff61f7e846cbf1005a4eb435 -Merge: fc3e81473 b90088321 +Merge: fc3e81473a b90088321e Author: Ian Romanick <idr@localhost.localdomain> Date: Tue Jun 13 21:13:02 2006 -0700 @@ -188189,7 +188304,7 @@ Date: Mon Jun 12 20:12:31 2006 +0200 Provide option to report damage after operation is complete. commit fc3e81473a98d3b932faa73c0c01c21366a48a9e -Merge: 4bedaad17 041ef2319 +Merge: 4bedaad17d 041ef23192 Author: Ian Romanick <idr@localhost.localdomain> Date: Mon Jun 12 09:41:06 2006 -0700 @@ -188226,7 +188341,7 @@ Date: Fri Jun 9 16:08:06 2006 -0700 another function that was already in that file. commit 7810d87cd6ae9316d88f6a2e7696deb8837cec27 -Merge: dcfaa9f4f caad8b724 +Merge: dcfaa9f4f8 caad8b724b Author: Ian Romanick <idr@localhost.localdomain> Date: Fri Jun 9 15:16:50 2006 -0700 @@ -188298,7 +188413,7 @@ Date: Fri Jun 9 09:51:28 2006 -0700 based on FIXME in mi/miinitext.c commit dcfaa9f4f8fb10b75be50c9a49ccd88caf6d0f6a -Merge: af9afe4cc 576e6fb11 +Merge: af9afe4cc5 576e6fb112 Author: Ian Romanick <idr@localhost.localdomain> Date: Thu Jun 8 15:03:00 2006 -0700 @@ -188318,7 +188433,7 @@ Date: Thu Jun 8 17:46:53 2006 -0400 Bug #7121: fix clipboard handling in Xming (Colin Harrison) commit af9afe4cc50df973bea2293a803f7dfdefaa6411 -Merge: caffac384 3930da3f6 +Merge: caffac3843 3930da3f62 Author: Ian Romanick <idr@localhost.localdomain> Date: Thu Jun 8 11:37:09 2006 -0700 @@ -188395,7 +188510,7 @@ Date: Thu Jun 8 10:40:24 2006 -0700 if anyone really cares about this code. commit caffac38432009e8dc01e7d3e72a7fa6fba2f078 -Merge: c5b3aa120 9fa73721f +Merge: c5b3aa120b 9fa73721f0 Author: Ian Romanick <idr@localhost.localdomain> Date: Thu Jun 8 10:38:43 2006 -0700 @@ -188506,7 +188621,7 @@ Date: Wed Jun 7 17:44:06 2006 -0700 when the symbol PCI_DOM_FROM_TAG couldn't be resolved at run-time. commit 23182315f34e3a0065739b43b15d4560e75b41a1 -Merge: bc05158a5 757f40fca +Merge: bc05158a5a 757f40fca5 Author: Ian Romanick <idr@localhost.localdomain> Date: Wed Jun 7 17:03:48 2006 -0700 @@ -188543,7 +188658,7 @@ Date: Wed Jun 7 14:09:13 2006 -0700 updated the .gitignore file with more auto-generated files commit bc05158a5ab00c548e4b04b5638afe07bc702260 -Merge: 46f55f5de cc465800d +Merge: 46f55f5dea cc465800dd Author: Ian Romanick <idr@localhost.localdomain> Date: Wed Jun 7 14:09:12 2006 -0700 @@ -188563,7 +188678,7 @@ Date: Wed Jun 7 14:03:35 2006 -0700 Fix compiler warnings about SetVendorRelease and SetVendorString commit 785c9789704ed142fe98cd17b5995e4a95b7141f -Merge: 21ebcfd70 36d786e9f +Merge: 21ebcfd702 36d786e9f0 Author: Greg Kroah-Hartman <gregkh@suse.de> Date: Wed Jun 7 13:20:21 2006 -0700 diff --git a/xserver/Makefile.in b/xserver/Makefile.in index 529104101..800883059 100644 --- a/xserver/Makefile.in +++ b/xserver/Makefile.in @@ -294,6 +294,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/Xext/Makefile.in b/xserver/Xext/Makefile.in index 6c42e6c1c..c94fa6bad 100644 --- a/xserver/Xext/Makefile.in +++ b/xserver/Xext/Makefile.in @@ -325,6 +325,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/Xi/Makefile.in b/xserver/Xi/Makefile.in index f7b310427..7b17d6ee9 100644 --- a/xserver/Xi/Makefile.in +++ b/xserver/Xi/Makefile.in @@ -249,6 +249,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/aclocal.m4 b/xserver/aclocal.m4 index f434549b5..0696df07a 100644 --- a/xserver/aclocal.m4 +++ b/xserver/aclocal.m4 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, +[m4_warning([this file was generated for autoconf 2.71. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) @@ -3448,7 +3448,7 @@ XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wuninitialized]) XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wshadow]) XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-noreturn]) XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-format-attribute]) -XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op]) # These are currently disabled because they are noisy. They will be enabled @@ -3682,7 +3682,7 @@ AC_SUBST([CHANGELOG_CMD]) ]) # XORG_CHANGELOG dnl -dnl Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +dnl Copyright (c) 2005, Oracle and/or its affiliates. dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the "Software"), @@ -3805,7 +3805,7 @@ AC_DEFUN([XTRANS_CONNECTION_FLAGS],[ XTRANS_TCP_FLAGS fi [case $host_os in - solaris*|sco*|sysv4*) localdef="yes" ;; + solaris*) localdef="yes" ;; *) localdef="no" ;; esac] AC_ARG_ENABLE(local-transport, diff --git a/xserver/composite/Makefile.in b/xserver/composite/Makefile.in index 288c394e4..b3b39d5be 100644 --- a/xserver/composite/Makefile.in +++ b/xserver/composite/Makefile.in @@ -267,6 +267,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/config/Makefile.in b/xserver/config/Makefile.in index 108bf4100..e9a83e982 100644 --- a/xserver/config/Makefile.in +++ b/xserver/config/Makefile.in @@ -288,6 +288,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/configure b/xserver/configure index fab7c8b97..ca0f71a30 100644 --- a/xserver/configure +++ b/xserver/configure @@ -1,11 +1,12 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xorg-server 21.1.8. +# Generated by GNU Autoconf 2.71 for xorg-server 21.1.9. # # Report bugs to <https://gitlab.freedesktop.org/xorg/xserver/issues>. # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -16,14 +17,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -33,46 +36,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi +if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -81,13 +84,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -96,8 +92,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -109,30 +109,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -154,20 +134,22 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else +else \$as_nop case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -187,12 +169,15 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : -else +else \$as_nop exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO @@ -207,30 +192,38 @@ test \$(( 1 + 1 )) = 2 || exit 1 PATH=/empty FPATH=/empty; export PATH FPATH test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" - if (eval "$as_required") 2>/dev/null; then : + if (eval "$as_required") 2>/dev/null +then : as_have_required=yes -else +else $as_nop as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : -else +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : break 2 fi fi @@ -238,14 +231,21 @@ fi esac as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS +if $as_found +then : +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi +fi - if test "x$CONFIG_SHELL" != x; then : + + if test "x$CONFIG_SHELL" != x +then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -263,18 +263,19 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and $0: https://gitlab.freedesktop.org/xorg/xserver/issues $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or @@ -303,6 +304,7 @@ as_fn_unset () } as_unset=as_fn_unset + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -320,6 +322,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -334,7 +344,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -343,7 +353,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -382,12 +392,13 @@ as_fn_executable_p () # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -399,18 +410,27 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -422,9 +442,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -451,7 +471,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -495,7 +515,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -509,6 +529,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -522,6 +546,13 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -651,48 +682,44 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='xorg-server' PACKAGE_TARNAME='xorg-server' -PACKAGE_VERSION='21.1.8' -PACKAGE_STRING='xorg-server 21.1.8' +PACKAGE_VERSION='21.1.9' +PACKAGE_STRING='xorg-server 21.1.9' PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues' PACKAGE_URL='' ac_unique_file="Makefile.am" # Factoring default headers for most tests. ac_includes_default="\ -#include <stdio.h> -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> +#include <stddef.h> +#ifdef HAVE_STDIO_H +# include <stdio.h> #endif -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include <stdlib.h> -# include <stddef.h> -#else -# ifdef HAVE_STDLIB_H -# include <stdlib.h> -# endif #endif #ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include <memory.h> -# endif # include <string.h> #endif -#ifdef HAVE_STRINGS_H -# include <strings.h> -#endif #ifdef HAVE_INTTYPES_H # include <inttypes.h> #endif #ifdef HAVE_STDINT_H # include <stdint.h> #endif +#ifdef HAVE_STRINGS_H +# include <strings.h> +#endif +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif" +ac_header_c_list= ac_config_libobj_dir=os ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE @@ -1033,6 +1060,8 @@ FBDEVHW_FALSE FBDEVHW_TRUE AGP_FALSE AGP_TRUE +LIBBSD_LIBS +LIBBSD_CFLAGS POLL_FALSE POLL_TRUE LIBOBJS @@ -1045,6 +1074,7 @@ DTRACE TRADITIONALCPPFLAGS RAWCPPFLAGS RAWCPP +CPP YFLAGS YACC LEXLIB @@ -1064,6 +1094,8 @@ ac_ct_DUMPBIN DUMPBIN LD FGREP +EGREP +GREP LIBTOOL OBJDUMP DLLTOOL @@ -1144,9 +1176,6 @@ BASE_CFLAGS MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE -EGREP -GREP -CPP am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE @@ -1362,7 +1391,6 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR @@ -1376,6 +1404,9 @@ CCAS CCASFLAGS YACC YFLAGS +CPP +LIBBSD_CFLAGS +LIBBSD_LIBS PIXMAN_CFLAGS PIXMAN_LIBS SYSTEMD_DAEMON_CFLAGS @@ -1504,8 +1535,6 @@ do *) ac_optarg=yes ;; esac - # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -1546,9 +1575,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1572,9 +1601,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1785,9 +1814,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1801,9 +1830,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1847,9 +1876,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1865,7 +1894,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1929,7 +1958,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1986,7 +2015,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xorg-server 21.1.8 to adapt to many kinds of systems. +\`configure' configures xorg-server 21.1.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2057,7 +2086,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorg-server 21.1.8:";; + short | recursive ) echo "Configuration of xorg-server 21.1.9:";; esac cat <<\_ACEOF @@ -2246,10 +2275,10 @@ Optional Packages: org.x) --with-bundle-version=VERSION Version to use for X11.app's CFBundleVersion - (default: 21.1.8) + (default: 21.1.9) --with-bundle-version-string=VERSION Version to use for X11.app's - CFBundleShortVersionString (default: 21.1.8) + CFBundleShortVersionString (default: 21.1.9) --with-sparkle-feed-url=URL URL for the Sparkle feed (default: https://www.xquartz.org/releases/sparkle/release.xml) @@ -2270,7 +2299,6 @@ Some influential environment variables: LIBS libraries to pass to the linker, e.g. -l<library> CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> - CPP C preprocessor PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH directories to add to pkg-config's search path @@ -2291,6 +2319,10 @@ Some influential environment variables: YFLAGS The list of arguments that will be passed by default to $YACC. This script will default YFLAGS to the empty string to avoid a default value of `-d' given by some make applications. + CPP C preprocessor + LIBBSD_CFLAGS + C compiler flags for LIBBSD, overriding pkg-config + LIBBSD_LIBS linker flags for LIBBSD, overriding pkg-config PIXMAN_CFLAGS C compiler flags for PIXMAN, overriding pkg-config PIXMAN_LIBS linker flags for PIXMAN, overriding pkg-config @@ -2413,9 +2445,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -2443,7 +2475,8 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -2451,7 +2484,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -2460,10 +2493,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorg-server configure 21.1.8 -generated by GNU Autoconf 2.69 +xorg-server configure 21.1.9 +generated by GNU Autoconf 2.71 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2480,14 +2513,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2495,14 +2528,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -2512,176 +2546,6 @@ fi } # ac_fn_c_try_compile -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ----------------------------------------------------------------- ## -## Report this to https://gitlab.freedesktop.org/xorg/xserver/issues ## -## ----------------------------------------------------------------- ##" - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_mongrel - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists and can be compiled using the include files in @@ -2689,49 +2553,54 @@ fi ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile -# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES -# --------------------------------------------- +# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR +# ------------------------------------------------------------------ # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. -ac_fn_c_check_decl () +# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR. +ac_fn_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack as_decl_name=`echo $2|sed 's/ *(.*//'` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +printf %s "checking whether $as_decl_name is declared... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -$as_echo_n "checking whether $as_decl_name is declared... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + eval ac_save_FLAGS=\$$6 + as_fn_append $6 " $5" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { #ifndef $as_decl_name #ifdef __cplusplus @@ -2745,19 +2614,22 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + eval $6=\$ac_save_FLAGS + fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -} # ac_fn_c_check_decl +} # ac_fn_check_decl # ac_fn_c_try_link LINENO # ----------------------- @@ -2765,14 +2637,14 @@ $as_echo "$ac_res" >&6; } ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext + rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2780,17 +2652,18 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -2811,11 +2684,12 @@ fi ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case <limits.h> declares $2. @@ -2823,16 +2697,9 @@ else #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif + which can conflict with char $2 (); below. */ +#include <limits.h> #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -2850,28 +2717,110 @@ choke me #endif int -main () +main (void) { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + } +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that +# executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: program exited with status $ac_status" >&5 + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES # -------------------------------------------- # Tries to find the compile-time value of EXPR in a program that includes @@ -2886,7 +2835,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) >= 0)]; test_array [0] = 0; @@ -2896,14 +2845,15 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_lo=0 ac_mid=0 while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; test_array [0] = 0; @@ -2913,9 +2863,10 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_hi=$ac_mid; break -else +else $as_nop as_fn_arith $ac_mid + 1 && ac_lo=$as_val if test $ac_lo -le $ac_mid; then ac_lo= ac_hi= @@ -2923,14 +2874,14 @@ else fi as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) < 0)]; test_array [0] = 0; @@ -2940,14 +2891,15 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_hi=-1 ac_mid=-1 while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; test_array [0] = 0; @@ -2957,9 +2909,10 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_lo=$ac_mid; break -else +else $as_nop as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val if test $ac_mid -le $ac_hi; then ac_lo= ac_hi= @@ -2967,14 +2920,14 @@ else fi as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done -else +else $as_nop ac_lo= ac_hi= fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val @@ -2982,7 +2935,7 @@ while test "x$ac_lo" != "x$ac_hi"; do /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; test_array [0] = 0; @@ -2992,12 +2945,13 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_hi=$ac_mid -else +else $as_nop as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done case $ac_lo in #(( ?*) eval "$3=\$ac_lo"; ac_retval=0 ;; @@ -3007,12 +2961,12 @@ esac cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 -static long int longval () { return $2; } -static unsigned long int ulongval () { return $2; } +static long int longval (void) { return $2; } +static unsigned long int ulongval (void) { return $2; } #include <stdio.h> #include <stdlib.h> int -main () +main (void) { FILE *f = fopen ("conftest.val", "w"); @@ -3040,9 +2994,10 @@ main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : echo >>conftest.val; read $3 <conftest.val; ac_retval=0 -else +else $as_nop ac_retval=1 fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -3062,17 +3017,18 @@ rm -f conftest.val ac_fn_c_check_type () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof ($2)) return 0; @@ -3080,12 +3036,13 @@ if (sizeof ($2)) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof (($2))) return 0; @@ -3093,18 +3050,19 @@ if (sizeof (($2))) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop eval "$3=yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type @@ -3116,16 +3074,17 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_member () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 -$as_echo_n "checking for $2.$3... " >&6; } -if eval \${$4+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +printf %s "checking for $2.$3... " >&6; } +if eval test \${$4+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int -main () +main (void) { static $2 ac_aggr; if (ac_aggr.$3) @@ -3134,14 +3093,15 @@ return 0; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$4=yes" -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int -main () +main (void) { static $2 ac_aggr; if (sizeof ac_aggr.$3) @@ -3150,29 +3110,50 @@ return 0; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$4=yes" -else +else $as_nop eval "$4=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$4 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_member +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done + +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +esac + cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorg-server $as_me 21.1.8, which was -generated by GNU Autoconf 2.69. Invocation command line was +It was created by xorg-server $as_me 21.1.9, which was +generated by GNU Autoconf 2.71. Invocation command line was - $ $0 $@ + $ $0$ac_configure_args_raw _ACEOF exec 5>>config.log @@ -3205,8 +3186,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS @@ -3241,7 +3226,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -3276,11 +3261,13 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - $as_echo "## ---------------- ## + printf "%s\n" "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -3291,8 +3278,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -3316,7 +3303,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -3324,14 +3311,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + printf "%s\n" "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -3339,15 +3326,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - $as_echo "## ----------- ## + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -3355,8 +3342,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -3370,63 +3357,48 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -$as_echo "/* confdefs.h */" > confdefs.h +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" + +for ac_site_file in $ac_site_files do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -3436,19 +3408,436 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif + +#include <stddef.h> +#include <stdarg.h> +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) '\''x'\'' +int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), + int, int);' + +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' + +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +// Does the compiler advertise C99 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif + +#include <stdbool.h> +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + #error "your preprocessor is broken" +#endif +#if BIG_OK +#else + #error "your preprocessor is broken" +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case '\''s'\'': // string + str = va_arg (args_copy, const char *); + break; + case '\''d'\'': // int + number = va_arg (args_copy, int); + break; + case '\''f'\'': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +' + +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' + // Check bool. + _Bool success = false; + success |= (argc != 0); + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' + +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +// Does the compiler advertise C11 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif + +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' + +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" + +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" + +# Auxiliary files required by this configure script. +ac_aux_files="ltmain.sh config.guess config.sub missing install-sh" + +# Locations in which to look for auxiliary files. +ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." + +# Search for a directory containing all of the required auxiliary files, +# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. +# If we don't find one directory that contains all the files we need, +# we report the set of missing files from the *first* directory in +# $ac_aux_dir_candidates and give up. +ac_missing_aux_files="" +ac_first_candidate=: +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" + break + fi + ac_first_candidate=false + + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +fi + + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +if test -f "${ac_aux_dir}config.guess"; then + ac_config_guess="$SHELL ${ac_aux_dir}config.guess" +fi +if test -f "${ac_aux_dir}config.sub"; then + ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_configure="$SHELL ${ac_aux_dir}configure" +fi + # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -3459,12 +3848,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -3473,24 +3862,24 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -3500,11 +3889,12 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -3517,42 +3907,15 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -RELEASE_DATE="2023-03-29" +RELEASE_DATE="2023-10-25" RELEASE_NAME="Caramel Ice Cream" am__api_version='1.12' -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - -# Find a good install program. We prefer a C program (faster), + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: # SysV /etc/install, /usr/sbin/install @@ -3566,20 +3929,25 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +printf %s "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${ac_cv_path_install+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + # Account for fact that we put trailing slashes in our PATH walk. +case $as_dir in #(( + ./ | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; @@ -3589,13 +3957,13 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # program-specific install script used by HP pwplus--don't use. : else @@ -3603,12 +3971,12 @@ case $as_dir/ in #(( echo one > conftest.one echo two > conftest.two mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && test -s conftest.one && test -s conftest.two && test -s conftest.dir/conftest.one && test -s conftest.dir/conftest.two then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" break 3 fi fi @@ -3624,7 +3992,7 @@ IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir fi - if test "${ac_cv_path_install+set}" = set; then + if test ${ac_cv_path_install+y}; then INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. Don't cache a @@ -3634,8 +4002,8 @@ fi INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +printf "%s\n" "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -3645,8 +4013,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +printf %s "checking whether build environment is sane... " >&6; } # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -3700,8 +4068,8 @@ else as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } # If we didn't sleep, we still need to ensure time stamps of config.status and # generated files are strictly newer. am_sleep_pid= @@ -3720,12 +4088,13 @@ test "$program_suffix" != NONE && # Double any \ or $. # By default was `s,x,x', remove it if useless. ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` +program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` -if test x"${MISSING+set}" != xset; then + + if test x"${MISSING+set}" != xset; then case $am_aux_dir in *\ * | *\ *) MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; @@ -3738,8 +4107,8 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -3759,11 +4128,12 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -3771,11 +4141,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3786,11 +4160,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3799,11 +4173,12 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -3811,11 +4186,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3826,11 +4205,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -3838,8 +4217,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -3851,25 +4230,31 @@ fi fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 +printf %s "checking for a race-free mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${ac_cv_path_mkdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ + as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue + case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir ('*'coreutils) '* | \ + 'BusyBox '* | \ 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext break 3;; esac done @@ -3880,7 +4265,7 @@ IFS=$as_save_IFS fi test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then + if test ${ac_cv_path_mkdir+y}; then MKDIR_P="$ac_cv_path_mkdir -p" else # As a last resort, use the slow shell script. Don't cache a @@ -3890,18 +4275,19 @@ fi MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +printf "%s\n" "$MKDIR_P" >&6; } for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AWK+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -3909,11 +4295,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3924,24 +4314,25 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +printf "%s\n" "$AWK" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -n "$AWK" && break done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else +ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval test \${ac_cv_prog_make_${ac_make}_set+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @@ -3957,12 +4348,12 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -3997,17 +4388,13 @@ fi # Define the identity of the package. PACKAGE='xorg-server' - VERSION='21.1.8' + VERSION='21.1.9' -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF +printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF +printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h # Some tools Automake needs. @@ -4043,6 +4430,15 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + + + + + + + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -4055,8 +4451,8 @@ am__doit: .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +printf %s "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= _am_result=none @@ -4083,12 +4479,13 @@ if test "$am__include" = "#"; then fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +printf "%s\n" "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : +if test ${enable_dependency_tracking+y} +then : enableval=$enable_dependency_tracking; fi @@ -4114,11 +4511,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -4126,11 +4524,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4141,11 +4543,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4154,11 +4556,12 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -4166,11 +4569,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4181,11 +4588,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -4193,8 +4600,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -4207,11 +4614,12 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -4219,11 +4627,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4234,11 +4646,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4247,11 +4659,12 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -4260,15 +4673,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4284,18 +4701,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4306,11 +4723,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -4318,11 +4736,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4333,11 +4755,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4350,11 +4772,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -4362,11 +4785,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4377,11 +4804,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4393,34 +4820,138 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC fi +else + CC="$ac_cv_prog_CC" fi fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -4430,7 +4961,7 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -4438,7 +4969,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -4450,9 +4981,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -4473,11 +5004,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -4494,7 +5026,7 @@ do # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -4510,44 +5042,46 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else +else $as_nop ac_file='' fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -4561,15 +5095,15 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -4578,7 +5112,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> int -main () +main (void) { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -4590,8 +5124,8 @@ _ACEOF ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -4599,10 +5133,10 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -4610,39 +5144,40 @@ $as_echo "$ac_try_echo"; } >&5 *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details" "$LINENO" 5; } fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -4656,11 +5191,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -4669,31 +5205,32 @@ $as_echo "$ac_try_echo"; } >&5 break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -4703,29 +5240,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -4734,57 +5275,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else +else $as_nop CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -4799,94 +5343,144 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <stdarg.h> -#include <stdio.h> -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi fi ac_ext=c @@ -4897,11 +5491,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_CC_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -5008,8 +5603,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -5024,463 +5619,175 @@ fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes +ac_header= ac_cache= +for ac_item in $ac_header_c_list do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ac_nonexistent.h> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - done - ac_cv_prog_CPP=$CPP -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ac_nonexistent.h> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <float.h> +# define __EXTENSIONS__ 1 + $ac_includes_default int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <string.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else $as_nop + ac_cv_safe_to_define___extensions__=no fi -rm -f conftest* - +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <stdlib.h> -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* + #include <wchar.h> + mbstate_t x; +int +main (void) +{ -fi + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <ctype.h> -#include <stdlib.h> -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) + #define _XOPEN_SOURCE 500 + #include <wchar.h> + mbstate_t x; int -main () +main (void) { - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; + + ; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h -fi + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h -done + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h - ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" -if test "x$ac_cv_header_minix_config_h" = xyes; then : - MINIX=yes -else - MINIX= -fi + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h - if test "$MINIX" = yes; then + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h -$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h -$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h -$as_echo "#define _MINIX 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h - fi + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 -$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if ${ac_cv_safe_to_define___extensions__+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h -# define __EXTENSIONS__ 1 - $ac_includes_default -int -main () -{ + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_safe_to_define___extensions__=yes -else - ac_cv_safe_to_define___extensions__=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else $as_nop + MINIX= fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 -$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } - test $ac_cv_safe_to_define___extensions__ = yes && - $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h - $as_echo "#define _ALL_SOURCE 1" >>confdefs.h - - $as_echo "#define _GNU_SOURCE 1" >>confdefs.h - - $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h - - $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h +fi # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS @@ -5495,17 +5802,18 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then : +if test ${enable_maintainer_mode+y} +then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else +else $as_nop USE_MAINTAINER_MODE=no fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +printf "%s\n" "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' @@ -5518,205 +5826,109 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 -$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } -if ${ac_cv_prog_cc_c99+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5 +printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; } +if test ${ac_cv_c_undeclared_builtin_options+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_save_CFLAGS=$CFLAGS + ac_cv_c_undeclared_builtin_options='cannot detect' + for ac_arg in '' -fno-builtin; do + CFLAGS="$ac_save_CFLAGS $ac_arg" + # This test program should *not* compile successfully. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <stdarg.h> -#include <stdbool.h> -#include <stdlib.h> -#include <wchar.h> -#include <stdio.h> - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -#define debug(...) fprintf (stderr, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - your preprocessor is broken; -#endif -#if BIG_OK -#else - your preprocessor is broken; -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) +int +main (void) { - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\0'; ++i) - continue; +(void) strchr; + ; return 0; } +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : -// Check varargs and va_copy. -static void -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - - const char *str; - int number; - float fnumber; - - while (*format) - { - switch (*format++) - { - case 's': // string - str = va_arg (args_copy, const char *); - break; - case 'd': // int - number = va_arg (args_copy, int); - break; - case 'f': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); -} +else $as_nop + # This test program should compile successfully. + # No library function is consistently available on + # freestanding implementations, so test against a dummy + # declaration. Include always-available headers on the + # off chance that they somehow elicit warnings. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <float.h> +#include <limits.h> +#include <stdarg.h> +#include <stddef.h> +extern void ac_decl (int, char *); int -main () +main (void) { - - // Check bool. - _Bool success = false; - - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - - // Check varargs. - test_varargs ("s, d' f .", "string", 65, 34.234); - test_varargs_macros (); - - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - - ni.number = 58; - - int dynamic_array[ni.number]; - dynamic_array[ni.number - 1] = 543; - - // work around unused variable warnings - return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' - || dynamic_array[ni.number - 1] != 543); +(void) ac_decl (0, (char *) 0); + (void) ac_decl; ; return 0; } _ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c99=$ac_arg +if ac_fn_c_try_compile "$LINENO" +then : + if test x"$ac_arg" = x +then : + ac_cv_c_undeclared_builtin_options='none needed' +else $as_nop + ac_cv_c_undeclared_builtin_options=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c99" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - + break fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c99" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c99" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c99" != xno; then : - +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + done + CFLAGS=$ac_save_CFLAGS + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5 +printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; } + case $ac_cv_c_undeclared_builtin_options in #( + 'cannot detect') : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot make $CC report undeclared builtins +See \`config.log' for more details" "$LINENO" 5; } ;; #( + 'none needed') : + ac_c_undeclared_builtin_options='' ;; #( + *) : + ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;; +esac - -ac_fn_c_check_decl "$LINENO" "__clang__" "ac_cv_have_decl___clang__" "$ac_includes_default" -if test "x$ac_cv_have_decl___clang__" = xyes; then : +ac_fn_check_decl "$LINENO" "__clang__" "ac_cv_have_decl___clang__" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl___clang__" = xyes +then : CLANGCC="yes" -else +else $as_nop CLANGCC="no" fi - -ac_fn_c_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default" -if test "x$ac_cv_have_decl___INTEL_COMPILER" = xyes; then : +ac_fn_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl___INTEL_COMPILER" = xyes +then : INTELCC="yes" -else +else $as_nop INTELCC="no" fi - -ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" -if test "x$ac_cv_have_decl___SUNPRO_C" = xyes; then : +ac_fn_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl___SUNPRO_C" = xyes +then : SUNCC="yes" -else +else $as_nop SUNCC="no" fi @@ -5727,16 +5939,16 @@ fi - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -5746,11 +5958,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5762,11 +5978,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5775,11 +5991,12 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. @@ -5789,11 +6006,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5805,11 +6026,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -5817,8 +6038,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -5830,37 +6051,40 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else + + # Make sure we can run config.sub. +$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +printf %s "checking build system type... " >&6; } +if test ${ac_cv_build+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 +ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -5879,21 +6103,22 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +printf %s "checking host system type... " >&6; } +if test ${ac_cv_host+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -5912,11 +6137,12 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +printf %s "checking for a sed that does not truncate output... " >&6; } +if test ${ac_cv_path_SED+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" @@ -5930,10 +6156,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in sed gsed + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + ac_path_SED="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED @@ -5942,13 +6173,13 @@ case `"$ac_path_SED" --version 2>&1` in ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" + printf "%s\n" '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -5976,8 +6207,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +printf "%s\n" "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -5987,9 +6218,10 @@ $as_echo "$ac_cv_path_SED" >&6; } # Check whether --enable-selective-werror was given. -if test "${enable_selective_werror+set}" = set; then : +if test ${enable_selective_werror+y} +then : enableval=$enable_selective_werror; SELECTIVE_WERROR=$enableval -else +else $as_nop SELECTIVE_WERROR=yes fi @@ -6022,24 +6254,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6049,24 +6283,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6084,29 +6320,31 @@ found="no" CFLAGS="$CFLAGS -Wall" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall" >&5 -$as_echo_n "checking if $CC supports -Wall... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall" >&5 +printf %s "checking if $CC supports -Wall... " >&6; } cacheid=xorg_cv_cc_flag__Wall - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6114,8 +6352,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wall" found="yes" @@ -6140,24 +6378,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6167,24 +6407,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6202,29 +6444,31 @@ found="no" CFLAGS="$CFLAGS -Wpointer-arith" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-arith" >&5 -$as_echo_n "checking if $CC supports -Wpointer-arith... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-arith" >&5 +printf %s "checking if $CC supports -Wpointer-arith... " >&6; } cacheid=xorg_cv_cc_flag__Wpointer_arith - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6232,8 +6476,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wpointer-arith" found="yes" @@ -6258,24 +6502,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6285,24 +6531,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6320,29 +6568,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-declarations" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations" >&5 -$as_echo_n "checking if $CC supports -Wmissing-declarations... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations" >&5 +printf %s "checking if $CC supports -Wmissing-declarations... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_declarations - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6350,8 +6600,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-declarations" found="yes" @@ -6376,24 +6626,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6403,24 +6655,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6438,29 +6692,31 @@ found="no" CFLAGS="$CFLAGS -Wformat=2" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat=2" >&5 -$as_echo_n "checking if $CC supports -Wformat=2... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat=2" >&5 +printf %s "checking if $CC supports -Wformat=2... " >&6; } cacheid=xorg_cv_cc_flag__Wformat_2 - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6468,8 +6724,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wformat=2" found="yes" @@ -6487,29 +6743,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -Wformat" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat" >&5 -$as_echo_n "checking if $CC supports -Wformat... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat" >&5 +printf %s "checking if $CC supports -Wformat... " >&6; } cacheid=xorg_cv_cc_flag__Wformat - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6517,8 +6775,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wformat" found="yes" @@ -6545,24 +6803,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6572,24 +6832,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6607,29 +6869,31 @@ found="no" CFLAGS="$CFLAGS -Wstrict-prototypes" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wstrict-prototypes" >&5 -$as_echo_n "checking if $CC supports -Wstrict-prototypes... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wstrict-prototypes" >&5 +printf %s "checking if $CC supports -Wstrict-prototypes... " >&6; } cacheid=xorg_cv_cc_flag__Wstrict_prototypes - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6637,8 +6901,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wstrict-prototypes" found="yes" @@ -6663,24 +6927,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6690,24 +6956,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6725,29 +6993,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-prototypes" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-prototypes" >&5 -$as_echo_n "checking if $CC supports -Wmissing-prototypes... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-prototypes" >&5 +printf %s "checking if $CC supports -Wmissing-prototypes... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_prototypes - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6755,8 +7025,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-prototypes" found="yes" @@ -6781,24 +7051,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6808,24 +7080,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6843,29 +7117,31 @@ found="no" CFLAGS="$CFLAGS -Wnested-externs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnested-externs" >&5 -$as_echo_n "checking if $CC supports -Wnested-externs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnested-externs" >&5 +printf %s "checking if $CC supports -Wnested-externs... " >&6; } cacheid=xorg_cv_cc_flag__Wnested_externs - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6873,8 +7149,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wnested-externs" found="yes" @@ -6899,24 +7175,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6926,24 +7204,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6961,29 +7241,31 @@ found="no" CFLAGS="$CFLAGS -Wbad-function-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wbad-function-cast" >&5 -$as_echo_n "checking if $CC supports -Wbad-function-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wbad-function-cast" >&5 +printf %s "checking if $CC supports -Wbad-function-cast... " >&6; } cacheid=xorg_cv_cc_flag__Wbad_function_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6991,8 +7273,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wbad-function-cast" found="yes" @@ -7017,24 +7299,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7044,24 +7328,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7079,29 +7365,31 @@ found="no" CFLAGS="$CFLAGS -Wold-style-definition" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wold-style-definition" >&5 -$as_echo_n "checking if $CC supports -Wold-style-definition... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wold-style-definition" >&5 +printf %s "checking if $CC supports -Wold-style-definition... " >&6; } cacheid=xorg_cv_cc_flag__Wold_style_definition - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7109,8 +7397,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wold-style-definition" found="yes" @@ -7128,29 +7416,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -fd" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fd" >&5 -$as_echo_n "checking if $CC supports -fd... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fd" >&5 +printf %s "checking if $CC supports -fd... " >&6; } cacheid=xorg_cv_cc_flag__fd - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7158,8 +7448,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -fd" found="yes" @@ -7184,24 +7474,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7211,24 +7503,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7246,29 +7540,31 @@ found="no" CFLAGS="$CFLAGS -Wdeclaration-after-statement" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wdeclaration-after-statement" >&5 -$as_echo_n "checking if $CC supports -Wdeclaration-after-statement... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wdeclaration-after-statement" >&5 +printf %s "checking if $CC supports -Wdeclaration-after-statement... " >&6; } cacheid=xorg_cv_cc_flag__Wdeclaration_after_statement - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7276,8 +7572,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wdeclaration-after-statement" found="yes" @@ -7306,24 +7602,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7333,24 +7631,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7368,29 +7668,31 @@ found="no" CFLAGS="$CFLAGS -Wunused" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused" >&5 -$as_echo_n "checking if $CC supports -Wunused... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused" >&5 +printf %s "checking if $CC supports -Wunused... " >&6; } cacheid=xorg_cv_cc_flag__Wunused - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7398,8 +7700,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wunused" found="yes" @@ -7424,24 +7726,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7451,24 +7755,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7486,29 +7792,31 @@ found="no" CFLAGS="$CFLAGS -Wuninitialized" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wuninitialized" >&5 -$as_echo_n "checking if $CC supports -Wuninitialized... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wuninitialized" >&5 +printf %s "checking if $CC supports -Wuninitialized... " >&6; } cacheid=xorg_cv_cc_flag__Wuninitialized - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7516,8 +7824,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wuninitialized" found="yes" @@ -7542,24 +7850,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7569,24 +7879,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7604,29 +7916,31 @@ found="no" CFLAGS="$CFLAGS -Wshadow" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wshadow" >&5 -$as_echo_n "checking if $CC supports -Wshadow... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wshadow" >&5 +printf %s "checking if $CC supports -Wshadow... " >&6; } cacheid=xorg_cv_cc_flag__Wshadow - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7634,8 +7948,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wshadow" found="yes" @@ -7660,24 +7974,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7687,24 +8003,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7722,29 +8040,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-noreturn" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5 -$as_echo_n "checking if $CC supports -Wmissing-noreturn... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5 +printf %s "checking if $CC supports -Wmissing-noreturn... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_noreturn - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7752,8 +8072,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-noreturn" found="yes" @@ -7778,24 +8098,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7805,24 +8127,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7840,29 +8164,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-format-attribute" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5 -$as_echo_n "checking if $CC supports -Wmissing-format-attribute... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5 +printf %s "checking if $CC supports -Wmissing-format-attribute... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_format_attribute - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7870,8 +8196,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-format-attribute" found="yes" @@ -7879,6 +8205,7 @@ $as_echo "$supported" >&6; } fi +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) @@ -7896,142 +8223,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int i; -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_cc_flag_unknown_warning_option=yes -else - xorg_cv_cc_flag_unknown_warning_option=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } - xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option - CFLAGS="$xorg_testset_save_CFLAGS" -fi - -if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then - if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then - CFLAGS="$CFLAGS -Werror=unknown-warning-option" - fi - CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int i; -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_cc_flag_unused_command_line_argument=yes -else - xorg_cv_cc_flag_unused_command_line_argument=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } - xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument - CFLAGS="$xorg_testset_save_CFLAGS" -fi - -found="no" - - if test $found = "no" ; then - if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then - CFLAGS="$CFLAGS -Werror=unknown-warning-option" - fi - - if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then - CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - fi - - CFLAGS="$CFLAGS -Wredundant-decls" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wredundant-decls" >&5 -$as_echo_n "checking if $CC supports -Wredundant-decls... " >&6; } - cacheid=xorg_cv_cc_flag__Wredundant_decls - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int i; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval $cacheid=yes -else - eval $cacheid=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi - - - CFLAGS="$xorg_testset_save_CFLAGS" - - eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } - if test "$supported" = "yes" ; then - BASE_CFLAGS="$BASE_CFLAGS -Wredundant-decls" - found="yes" - fi - fi - - - - - - - - - - - - - - - -xorg_testset_save_CFLAGS="$CFLAGS" - -if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then - CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8041,24 +8252,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8076,29 +8289,31 @@ found="no" CFLAGS="$CFLAGS -Wlogical-op" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wlogical-op" >&5 -$as_echo_n "checking if $CC supports -Wlogical-op... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wlogical-op" >&5 +printf %s "checking if $CC supports -Wlogical-op... " >&6; } cacheid=xorg_cv_cc_flag__Wlogical_op - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8106,8 +8321,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wlogical-op" found="yes" @@ -8144,24 +8359,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8171,24 +8388,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8206,29 +8425,31 @@ found="no" CFLAGS="$CFLAGS -Werror=implicit" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=implicit" >&5 -$as_echo_n "checking if $CC supports -Werror=implicit... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=implicit" >&5 +printf %s "checking if $CC supports -Werror=implicit... " >&6; } cacheid=xorg_cv_cc_flag__Werror_implicit - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8236,8 +8457,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=implicit" found="yes" @@ -8255,29 +8476,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5 -$as_echo_n "checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5 +printf %s "checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; } cacheid=xorg_cv_cc_flag__errwarn_E_NO_EXPLICIT_TYPE_GIVEN__errwarn_E_NO_IMPLICIT_DECL_ALLOWED - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8285,8 +8508,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" found="yes" @@ -8311,24 +8534,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8338,24 +8563,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8373,29 +8600,31 @@ found="no" CFLAGS="$CFLAGS -Werror=nonnull" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=nonnull" >&5 -$as_echo_n "checking if $CC supports -Werror=nonnull... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=nonnull" >&5 +printf %s "checking if $CC supports -Werror=nonnull... " >&6; } cacheid=xorg_cv_cc_flag__Werror_nonnull - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8403,8 +8632,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=nonnull" found="yes" @@ -8429,24 +8658,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8456,24 +8687,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8491,29 +8724,31 @@ found="no" CFLAGS="$CFLAGS -Werror=init-self" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=init-self" >&5 -$as_echo_n "checking if $CC supports -Werror=init-self... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=init-self" >&5 +printf %s "checking if $CC supports -Werror=init-self... " >&6; } cacheid=xorg_cv_cc_flag__Werror_init_self - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8521,8 +8756,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=init-self" found="yes" @@ -8547,24 +8782,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8574,24 +8811,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8609,29 +8848,31 @@ found="no" CFLAGS="$CFLAGS -Werror=main" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=main" >&5 -$as_echo_n "checking if $CC supports -Werror=main... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=main" >&5 +printf %s "checking if $CC supports -Werror=main... " >&6; } cacheid=xorg_cv_cc_flag__Werror_main - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8639,8 +8880,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=main" found="yes" @@ -8665,24 +8906,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8692,24 +8935,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8727,29 +8972,31 @@ found="no" CFLAGS="$CFLAGS -Werror=missing-braces" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=missing-braces" >&5 -$as_echo_n "checking if $CC supports -Werror=missing-braces... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=missing-braces" >&5 +printf %s "checking if $CC supports -Werror=missing-braces... " >&6; } cacheid=xorg_cv_cc_flag__Werror_missing_braces - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8757,8 +9004,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=missing-braces" found="yes" @@ -8783,24 +9030,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8810,24 +9059,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8845,29 +9096,31 @@ found="no" CFLAGS="$CFLAGS -Werror=sequence-point" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=sequence-point" >&5 -$as_echo_n "checking if $CC supports -Werror=sequence-point... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=sequence-point" >&5 +printf %s "checking if $CC supports -Werror=sequence-point... " >&6; } cacheid=xorg_cv_cc_flag__Werror_sequence_point - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8875,8 +9128,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=sequence-point" found="yes" @@ -8901,24 +9154,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8928,24 +9183,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8963,29 +9220,31 @@ found="no" CFLAGS="$CFLAGS -Werror=return-type" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=return-type" >&5 -$as_echo_n "checking if $CC supports -Werror=return-type... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=return-type" >&5 +printf %s "checking if $CC supports -Werror=return-type... " >&6; } cacheid=xorg_cv_cc_flag__Werror_return_type - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8993,8 +9252,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=return-type" found="yes" @@ -9012,29 +9271,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5 -$as_echo_n "checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5 +printf %s "checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; } cacheid=xorg_cv_cc_flag__errwarn_E_FUNC_HAS_NO_RETURN_STMT - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9042,8 +9303,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT" found="yes" @@ -9068,24 +9329,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9095,24 +9358,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9130,29 +9395,31 @@ found="no" CFLAGS="$CFLAGS -Werror=trigraphs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=trigraphs" >&5 -$as_echo_n "checking if $CC supports -Werror=trigraphs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=trigraphs" >&5 +printf %s "checking if $CC supports -Werror=trigraphs... " >&6; } cacheid=xorg_cv_cc_flag__Werror_trigraphs - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9160,8 +9427,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=trigraphs" found="yes" @@ -9186,24 +9453,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9213,24 +9482,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9248,29 +9519,31 @@ found="no" CFLAGS="$CFLAGS -Werror=array-bounds" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=array-bounds" >&5 -$as_echo_n "checking if $CC supports -Werror=array-bounds... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=array-bounds" >&5 +printf %s "checking if $CC supports -Werror=array-bounds... " >&6; } cacheid=xorg_cv_cc_flag__Werror_array_bounds - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9278,8 +9551,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=array-bounds" found="yes" @@ -9304,24 +9577,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9331,24 +9606,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9366,29 +9643,31 @@ found="no" CFLAGS="$CFLAGS -Werror=write-strings" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=write-strings" >&5 -$as_echo_n "checking if $CC supports -Werror=write-strings... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=write-strings" >&5 +printf %s "checking if $CC supports -Werror=write-strings... " >&6; } cacheid=xorg_cv_cc_flag__Werror_write_strings - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9396,8 +9675,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=write-strings" found="yes" @@ -9422,24 +9701,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9449,24 +9730,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9484,29 +9767,31 @@ found="no" CFLAGS="$CFLAGS -Werror=address" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=address" >&5 -$as_echo_n "checking if $CC supports -Werror=address... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=address" >&5 +printf %s "checking if $CC supports -Werror=address... " >&6; } cacheid=xorg_cv_cc_flag__Werror_address - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9514,8 +9799,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=address" found="yes" @@ -9540,24 +9825,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9567,24 +9854,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9602,29 +9891,31 @@ found="no" CFLAGS="$CFLAGS -Werror=int-to-pointer-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=int-to-pointer-cast" >&5 -$as_echo_n "checking if $CC supports -Werror=int-to-pointer-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=int-to-pointer-cast" >&5 +printf %s "checking if $CC supports -Werror=int-to-pointer-cast... " >&6; } cacheid=xorg_cv_cc_flag__Werror_int_to_pointer_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9632,8 +9923,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=int-to-pointer-cast" found="yes" @@ -9651,29 +9942,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION" >&5 -$as_echo_n "checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION" >&5 +printf %s "checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; } cacheid=xorg_cv_cc_flag__errwarn_E_BAD_PTR_INT_COMBINATION - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9681,8 +9974,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION" found="yes" @@ -9707,24 +10000,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9734,24 +10029,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9769,29 +10066,31 @@ found="no" CFLAGS="$CFLAGS -Werror=pointer-to-int-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=pointer-to-int-cast" >&5 -$as_echo_n "checking if $CC supports -Werror=pointer-to-int-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=pointer-to-int-cast" >&5 +printf %s "checking if $CC supports -Werror=pointer-to-int-cast... " >&6; } cacheid=xorg_cv_cc_flag__Werror_pointer_to_int_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9799,8 +10098,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=pointer-to-int-cast" found="yes" @@ -9809,8 +10108,8 @@ $as_echo "$supported" >&6; } # Also -errwarn=E_BAD_PTR_INT_COMBINATION else -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&5 -$as_echo "$as_me: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&5 +printf "%s\n" "$as_me: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&2;} @@ -9828,24 +10127,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9855,24 +10156,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9890,29 +10193,31 @@ found="no" CFLAGS="$CFLAGS -Wimplicit" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wimplicit" >&5 -$as_echo_n "checking if $CC supports -Wimplicit... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wimplicit" >&5 +printf %s "checking if $CC supports -Wimplicit... " >&6; } cacheid=xorg_cv_cc_flag__Wimplicit - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9920,8 +10225,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wimplicit" found="yes" @@ -9946,24 +10251,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9973,24 +10280,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10008,29 +10317,31 @@ found="no" CFLAGS="$CFLAGS -Wnonnull" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnonnull" >&5 -$as_echo_n "checking if $CC supports -Wnonnull... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnonnull" >&5 +printf %s "checking if $CC supports -Wnonnull... " >&6; } cacheid=xorg_cv_cc_flag__Wnonnull - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -10038,8 +10349,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wnonnull" found="yes" @@ -10064,24 +10375,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10091,24 +10404,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10126,29 +10441,31 @@ found="no" CFLAGS="$CFLAGS -Winit-self" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Winit-self" >&5 -$as_echo_n "checking if $CC supports -Winit-self... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Winit-self" >&5 +printf %s "checking if $CC supports -Winit-self... " >&6; } cacheid=xorg_cv_cc_flag__Winit_self - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -10156,8 +10473,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Winit-self" found="yes" @@ -10182,24 +10499,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10209,24 +10528,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10244,29 +10565,31 @@ found="no" CFLAGS="$CFLAGS -Wmain" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmain" >&5 -$as_echo_n "checking if $CC supports -Wmain... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmain" >&5 +printf %s "checking if $CC supports -Wmain... " >&6; } cacheid=xorg_cv_cc_flag__Wmain - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -10274,8 +10597,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmain" found="yes" @@ -10300,24 +10623,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10327,24 +10652,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10362,29 +10689,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-braces" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-braces" >&5 -$as_echo_n "checking if $CC supports -Wmissing-braces... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-braces" >&5 +printf %s "checking if $CC supports -Wmissing-braces... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_braces - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -10392,8 +10721,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-braces" found="yes" @@ -10418,24 +10747,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10445,24 +10776,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10480,29 +10813,31 @@ found="no" CFLAGS="$CFLAGS -Wsequence-point" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wsequence-point" >&5 -$as_echo_n "checking if $CC supports -Wsequence-point... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wsequence-point" >&5 +printf %s "checking if $CC supports -Wsequence-point... " >&6; } cacheid=xorg_cv_cc_flag__Wsequence_point - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -10510,8 +10845,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wsequence-point" found="yes" @@ -10536,24 +10871,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10563,24 +10900,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10598,29 +10937,31 @@ found="no" CFLAGS="$CFLAGS -Wreturn-type" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wreturn-type" >&5 -$as_echo_n "checking if $CC supports -Wreturn-type... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wreturn-type" >&5 +printf %s "checking if $CC supports -Wreturn-type... " >&6; } cacheid=xorg_cv_cc_flag__Wreturn_type - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -10628,8 +10969,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wreturn-type" found="yes" @@ -10654,24 +10995,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10681,24 +11024,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10716,29 +11061,31 @@ found="no" CFLAGS="$CFLAGS -Wtrigraphs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wtrigraphs" >&5 -$as_echo_n "checking if $CC supports -Wtrigraphs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wtrigraphs" >&5 +printf %s "checking if $CC supports -Wtrigraphs... " >&6; } cacheid=xorg_cv_cc_flag__Wtrigraphs - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -10746,8 +11093,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wtrigraphs" found="yes" @@ -10772,24 +11119,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10799,24 +11148,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10834,29 +11185,31 @@ found="no" CFLAGS="$CFLAGS -Warray-bounds" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Warray-bounds" >&5 -$as_echo_n "checking if $CC supports -Warray-bounds... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Warray-bounds" >&5 +printf %s "checking if $CC supports -Warray-bounds... " >&6; } cacheid=xorg_cv_cc_flag__Warray_bounds - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -10864,8 +11217,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Warray-bounds" found="yes" @@ -10890,24 +11243,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10917,24 +11272,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10952,29 +11309,31 @@ found="no" CFLAGS="$CFLAGS -Wwrite-strings" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wwrite-strings" >&5 -$as_echo_n "checking if $CC supports -Wwrite-strings... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wwrite-strings" >&5 +printf %s "checking if $CC supports -Wwrite-strings... " >&6; } cacheid=xorg_cv_cc_flag__Wwrite_strings - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -10982,8 +11341,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wwrite-strings" found="yes" @@ -11008,24 +11367,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -11035,24 +11396,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -11070,29 +11433,31 @@ found="no" CFLAGS="$CFLAGS -Waddress" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Waddress" >&5 -$as_echo_n "checking if $CC supports -Waddress... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Waddress" >&5 +printf %s "checking if $CC supports -Waddress... " >&6; } cacheid=xorg_cv_cc_flag__Waddress - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -11100,8 +11465,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Waddress" found="yes" @@ -11126,24 +11491,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -11153,24 +11520,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -11188,29 +11557,31 @@ found="no" CFLAGS="$CFLAGS -Wint-to-pointer-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wint-to-pointer-cast" >&5 -$as_echo_n "checking if $CC supports -Wint-to-pointer-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wint-to-pointer-cast" >&5 +printf %s "checking if $CC supports -Wint-to-pointer-cast... " >&6; } cacheid=xorg_cv_cc_flag__Wint_to_pointer_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -11218,8 +11589,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wint-to-pointer-cast" found="yes" @@ -11244,24 +11615,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -11271,24 +11644,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -11306,29 +11681,31 @@ found="no" CFLAGS="$CFLAGS -Wpointer-to-int-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-to-int-cast" >&5 -$as_echo_n "checking if $CC supports -Wpointer-to-int-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-to-int-cast" >&5 +printf %s "checking if $CC supports -Wpointer-to-int-cast... " >&6; } cacheid=xorg_cv_cc_flag__Wpointer_to_int_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -11336,8 +11713,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wpointer-to-int-cast" found="yes" @@ -11366,9 +11743,10 @@ fi # Check whether --enable-strict-compilation was given. -if test "${enable_strict_compilation+set}" = set; then : +if test ${enable_strict_compilation+y} +then : enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval -else +else $as_nop STRICT_COMPILE=no fi @@ -11395,24 +11773,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -11422,24 +11802,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -11457,29 +11839,31 @@ found="no" CFLAGS="$CFLAGS -pedantic" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -pedantic" >&5 -$as_echo_n "checking if $CC supports -pedantic... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -pedantic" >&5 +printf %s "checking if $CC supports -pedantic... " >&6; } cacheid=xorg_cv_cc_flag__pedantic - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -11487,8 +11871,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -pedantic" found="yes" @@ -11513,24 +11897,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -11540,24 +11926,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -11575,29 +11963,31 @@ found="no" CFLAGS="$CFLAGS -Werror" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5 -$as_echo_n "checking if $CC supports -Werror... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5 +printf %s "checking if $CC supports -Werror... " >&6; } cacheid=xorg_cv_cc_flag__Werror - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -11605,8 +11995,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -Werror" found="yes" @@ -11624,29 +12014,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -errwarn" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn" >&5 -$as_echo_n "checking if $CC supports -errwarn... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn" >&5 +printf %s "checking if $CC supports -errwarn... " >&6; } cacheid=xorg_cv_cc_flag__errwarn - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -11654,8 +12046,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -errwarn" found="yes" @@ -11683,24 +12075,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -11710,24 +12104,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -11745,29 +12141,31 @@ found="no" CFLAGS="$CFLAGS -Werror=attributes" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5 -$as_echo_n "checking if $CC supports -Werror=attributes... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5 +printf %s "checking if $CC supports -Werror=attributes... " >&6; } cacheid=xorg_cv_cc_flag__Werror_attributes - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -11775,8 +12173,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes" found="yes" @@ -11806,18 +12204,14 @@ _ACEOF PVM="0" fi -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION_MINOR $PVM -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION_MINOR $PVM" >>confdefs.h PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` if test "x$PVP" = "x"; then PVP="0" fi -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION_PATCHLEVEL $PVP -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION_PATCHLEVEL $PVP" >>confdefs.h @@ -11847,11 +12241,12 @@ case $host_os in # Solaris 2.0 - 11.3 use SysV man page section numbers, so we # check for a man page file found in later versions that use # traditional section numbers instead - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5 -$as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; } -if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5 +printf %s "checking for /usr/share/man/man7/attributes.7... " >&6; } +if test ${ac_cv_file__usr_share_man_man7_attributes_7+y} +then : + printf %s "(cached) " >&6 +else $as_nop test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/usr/share/man/man7/attributes.7"; then @@ -11860,11 +12255,12 @@ else ac_cv_file__usr_share_man_man7_attributes_7=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5 -$as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } -if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5 +printf "%s\n" "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } +if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes +then : SYSV_MAN_SECTIONS=false -else +else $as_nop SYSV_MAN_SECTIONS=true fi @@ -11959,7 +12355,8 @@ MAN_SUBSTS="\ # Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : +if test ${enable_silent_rules+y} +then : enableval=$enable_silent_rules; fi @@ -11969,12 +12366,13 @@ case $enable_silent_rules in # ((( *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +printf %s "checking whether $am_make supports nested variables... " >&6; } +if test ${am_cv_make_support_nested_variables+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if printf "%s\n" 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -11986,8 +12384,8 @@ else am_cv_make_support_nested_variables=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -12005,9 +12403,10 @@ AM_BACKSLASH='\' # Check whether --with-doxygen was given. -if test "${with_doxygen+set}" = set; then : +if test ${with_doxygen+y} +then : withval=$with_doxygen; use_doxygen=$withval -else +else $as_nop use_doxygen=auto fi @@ -12016,11 +12415,12 @@ fi if test "x$use_doxygen" = x"auto"; then # Extract the first word of "doxygen", so it can be a program name with args. set dummy doxygen; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_DOXYGEN+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_DOXYGEN+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $DOXYGEN in [\\/]* | ?:[\\/]*) ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path. @@ -12030,11 +12430,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_DOXYGEN="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12046,17 +12450,17 @@ esac fi DOXYGEN=$ac_cv_path_DOXYGEN if test -n "$DOXYGEN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 -$as_echo "$DOXYGEN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 +printf "%s\n" "$DOXYGEN" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$DOXYGEN" = "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: doxygen not found - documentation targets will be skipped" >&5 -$as_echo "$as_me: WARNING: doxygen not found - documentation targets will be skipped" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: doxygen not found - documentation targets will be skipped" >&5 +printf "%s\n" "$as_me: WARNING: doxygen not found - documentation targets will be skipped" >&2;} have_doxygen=no else have_doxygen=yes @@ -12064,11 +12468,12 @@ $as_echo "$as_me: WARNING: doxygen not found - documentation targets will be ski elif test "x$use_doxygen" = x"yes" ; then # Extract the first word of "doxygen", so it can be a program name with args. set dummy doxygen; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_DOXYGEN+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_DOXYGEN+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $DOXYGEN in [\\/]* | ?:[\\/]*) ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path. @@ -12078,11 +12483,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_DOXYGEN="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12094,11 +12503,11 @@ esac fi DOXYGEN=$ac_cv_path_DOXYGEN if test -n "$DOXYGEN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 -$as_echo "$DOXYGEN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 +printf "%s\n" "$DOXYGEN" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -12108,8 +12517,8 @@ fi have_doxygen=yes elif test "x$use_doxygen" = x"no" ; then if test "x$DOXYGEN" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring DOXYGEN environment variable since --with-doxygen=no was specified" >&5 -$as_echo "$as_me: WARNING: ignoring DOXYGEN environment variable since --with-doxygen=no was specified" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ignoring DOXYGEN environment variable since --with-doxygen=no was specified" >&5 +printf "%s\n" "$as_me: WARNING: ignoring DOXYGEN environment variable since --with-doxygen=no was specified" >&2;} fi have_doxygen=no else @@ -12117,19 +12526,19 @@ else fi if test "$have_doxygen" = yes; then # scrape the doxygen version - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the doxygen version" >&5 -$as_echo_n "checking the doxygen version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the doxygen version" >&5 +printf %s "checking the doxygen version... " >&6; } doxygen_version=`$DOXYGEN --version 2>/dev/null` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $doxygen_version" >&5 -$as_echo "$doxygen_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $doxygen_version" >&5 +printf "%s\n" "$doxygen_version" >&6; } as_arg_v1=$doxygen_version as_arg_v2=1.6.1 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null case $? in #( 1) : if test "x$use_doxygen" = xauto; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: doxygen version $doxygen_version found, but 1.6.1 needed" >&5 -$as_echo "$as_me: WARNING: doxygen version $doxygen_version found, but 1.6.1 needed" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: doxygen version $doxygen_version found, but 1.6.1 needed" >&5 +printf "%s\n" "$as_me: WARNING: doxygen version $doxygen_version found, but 1.6.1 needed" >&2;} have_doxygen=no else as_fn_error $? "doxygen version $doxygen_version found, but 1.6.1 needed" "$LINENO" 5 @@ -12147,11 +12556,12 @@ HAVE_DOT=no if test "x$have_doxygen" = "xyes"; then # Extract the first word of "dot", so it can be a program name with args. set dummy dot; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_DOT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_DOT+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $DOT in [\\/]* | ?:[\\/]*) ac_cv_path_DOT="$DOT" # Let the user override the test with a path. @@ -12161,11 +12571,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_DOT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12177,11 +12591,11 @@ esac fi DOT=$ac_cv_path_DOT if test -n "$DOT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOT" >&5 -$as_echo "$DOT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DOT" >&5 +printf "%s\n" "$DOT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -12209,14 +12623,14 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X.Org SGML entities >= 1.8" >&5 -$as_echo_n "checking for X.Org SGML entities >= 1.8... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X.Org SGML entities >= 1.8" >&5 +printf %s "checking for X.Org SGML entities >= 1.8... " >&6; } XORG_SGML_PATH= if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-sgml-doctools >= 1.8\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-sgml-doctools >= 1.8\""; } >&5 ($PKG_CONFIG --exists --print-errors "xorg-sgml-doctools >= 1.8") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools` else @@ -12227,13 +12641,13 @@ fi # Define variables STYLESHEET_SRCDIR and XSL_STYLESHEET containing # the path and the name of the doc stylesheet if test "x$XORG_SGML_PATH" != "x" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XORG_SGML_PATH" >&5 -$as_echo "$XORG_SGML_PATH" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XORG_SGML_PATH" >&5 +printf "%s\n" "$XORG_SGML_PATH" >&6; } STYLESHEET_SRCDIR=$XORG_SGML_PATH/X11 XSL_STYLESHEET=$STYLESHEET_SRCDIR/xorg.xsl else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -12251,9 +12665,10 @@ fi # Check whether --enable-docs was given. -if test "${enable_docs+set}" = set; then : +if test ${enable_docs+y} +then : enableval=$enable_docs; build_docs=$enableval -else +else $as_nop build_docs=yes fi @@ -12266,17 +12681,18 @@ else ENABLE_DOCS_FALSE= fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build documentation" >&5 -$as_echo_n "checking whether to build documentation... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $build_docs" >&5 -$as_echo "$build_docs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build documentation" >&5 +printf %s "checking whether to build documentation... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $build_docs" >&5 +printf "%s\n" "$build_docs" >&6; } # Check whether --enable-devel-docs was given. -if test "${enable_devel_docs+set}" = set; then : +if test ${enable_devel_docs+y} +then : enableval=$enable_devel_docs; build_devel_docs=$enableval -else +else $as_nop build_devel_docs=yes fi @@ -12289,19 +12705,20 @@ else ENABLE_DEVEL_DOCS_FALSE= fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build developer documentation" >&5 -$as_echo_n "checking whether to build developer documentation... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $build_devel_docs" >&5 -$as_echo "$build_devel_docs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build developer documentation" >&5 +printf %s "checking whether to build developer documentation... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $build_devel_docs" >&5 +printf "%s\n" "$build_devel_docs" >&6; } # Check whether --with-xmlto was given. -if test "${with_xmlto+set}" = set; then : +if test ${with_xmlto+y} +then : withval=$with_xmlto; use_xmlto=$withval -else +else $as_nop use_xmlto=auto fi @@ -12310,11 +12727,12 @@ fi if test "x$use_xmlto" = x"auto"; then # Extract the first word of "xmlto", so it can be a program name with args. set dummy xmlto; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XMLTO+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_XMLTO+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $XMLTO in [\\/]* | ?:[\\/]*) ac_cv_path_XMLTO="$XMLTO" # Let the user override the test with a path. @@ -12324,11 +12742,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XMLTO="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_XMLTO="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12340,17 +12762,17 @@ esac fi XMLTO=$ac_cv_path_XMLTO if test -n "$XMLTO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5 -$as_echo "$XMLTO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5 +printf "%s\n" "$XMLTO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$XMLTO" = "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto not found - documentation targets will be skipped" >&5 -$as_echo "$as_me: WARNING: xmlto not found - documentation targets will be skipped" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: xmlto not found - documentation targets will be skipped" >&5 +printf "%s\n" "$as_me: WARNING: xmlto not found - documentation targets will be skipped" >&2;} have_xmlto=no else have_xmlto=yes @@ -12358,11 +12780,12 @@ $as_echo "$as_me: WARNING: xmlto not found - documentation targets will be skipp elif test "x$use_xmlto" = x"yes" ; then # Extract the first word of "xmlto", so it can be a program name with args. set dummy xmlto; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XMLTO+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_XMLTO+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $XMLTO in [\\/]* | ?:[\\/]*) ac_cv_path_XMLTO="$XMLTO" # Let the user override the test with a path. @@ -12372,11 +12795,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XMLTO="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_XMLTO="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12388,11 +12815,11 @@ esac fi XMLTO=$ac_cv_path_XMLTO if test -n "$XMLTO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5 -$as_echo "$XMLTO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5 +printf "%s\n" "$XMLTO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -12402,8 +12829,8 @@ fi have_xmlto=yes elif test "x$use_xmlto" = x"no" ; then if test "x$XMLTO" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&5 -$as_echo "$as_me: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&5 +printf "%s\n" "$as_me: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&2;} fi have_xmlto=no else @@ -12413,19 +12840,19 @@ fi # Test for a minimum version of xmlto, if provided. if test "$have_xmlto" = yes; then # scrape the xmlto version - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the xmlto version" >&5 -$as_echo_n "checking the xmlto version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the xmlto version" >&5 +printf %s "checking the xmlto version... " >&6; } xmlto_version=`$XMLTO --version 2>/dev/null | cut -d' ' -f3` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xmlto_version" >&5 -$as_echo "$xmlto_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xmlto_version" >&5 +printf "%s\n" "$xmlto_version" >&6; } as_arg_v1=$xmlto_version as_arg_v2=0.0.20 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null case $? in #( 1) : if test "x$use_xmlto" = xauto; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto version $xmlto_version found, but 0.0.20 needed" >&5 -$as_echo "$as_me: WARNING: xmlto version $xmlto_version found, but 0.0.20 needed" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: xmlto version $xmlto_version found, but 0.0.20 needed" >&5 +printf "%s\n" "$as_me: WARNING: xmlto version $xmlto_version found, but 0.0.20 needed" >&2;} have_xmlto=no else as_fn_error $? "xmlto version $xmlto_version found, but 0.0.20 needed" "$LINENO" 5 @@ -12448,19 +12875,22 @@ fi have_xmlto_text=no cat > conftest.xml << "EOF" EOF -if test "$have_xmlto" = yes; then : - if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1; then : +if test "$have_xmlto" = yes +then : + if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1 +then : have_xmlto_text=yes -else +else $as_nop # Try it again with a non-empty XML file. cat > conftest.xml << "EOF" <x></x> EOF - if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1; then : + if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1 +then : have_xmlto_text=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto cannot generate text format, this format skipped" >&5 -$as_echo "$as_me: WARNING: xmlto cannot generate text format, this format skipped" >&2;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: xmlto cannot generate text format, this format skipped" >&5 +printf "%s\n" "$as_me: WARNING: xmlto cannot generate text format, this format skipped" >&2;} fi fi fi @@ -12487,9 +12917,10 @@ fi # Check whether --with-fop was given. -if test "${with_fop+set}" = set; then : +if test ${with_fop+y} +then : withval=$with_fop; use_fop=$withval -else +else $as_nop use_fop=auto fi @@ -12498,11 +12929,12 @@ fi if test "x$use_fop" = x"auto"; then # Extract the first word of "fop", so it can be a program name with args. set dummy fop; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_FOP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_FOP+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $FOP in [\\/]* | ?:[\\/]*) ac_cv_path_FOP="$FOP" # Let the user override the test with a path. @@ -12512,11 +12944,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_FOP="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_FOP="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12528,17 +12964,17 @@ esac fi FOP=$ac_cv_path_FOP if test -n "$FOP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5 -$as_echo "$FOP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5 +printf "%s\n" "$FOP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$FOP" = "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: fop not found - documentation targets will be skipped" >&5 -$as_echo "$as_me: WARNING: fop not found - documentation targets will be skipped" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: fop not found - documentation targets will be skipped" >&5 +printf "%s\n" "$as_me: WARNING: fop not found - documentation targets will be skipped" >&2;} have_fop=no else have_fop=yes @@ -12546,11 +12982,12 @@ $as_echo "$as_me: WARNING: fop not found - documentation targets will be skipped elif test "x$use_fop" = x"yes" ; then # Extract the first word of "fop", so it can be a program name with args. set dummy fop; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_FOP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_FOP+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $FOP in [\\/]* | ?:[\\/]*) ac_cv_path_FOP="$FOP" # Let the user override the test with a path. @@ -12560,11 +12997,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_FOP="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_FOP="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12576,11 +13017,11 @@ esac fi FOP=$ac_cv_path_FOP if test -n "$FOP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5 -$as_echo "$FOP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5 +printf "%s\n" "$FOP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -12590,8 +13031,8 @@ fi have_fop=yes elif test "x$use_fop" = x"no" ; then if test "x$FOP" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring FOP environment variable since --with-fop=no was specified" >&5 -$as_echo "$as_me: WARNING: ignoring FOP environment variable since --with-fop=no was specified" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ignoring FOP environment variable since --with-fop=no was specified" >&5 +printf "%s\n" "$as_me: WARNING: ignoring FOP environment variable since --with-fop=no was specified" >&2;} fi have_fop=no else @@ -12616,9 +13057,10 @@ fi # Check whether --with-xsltproc was given. -if test "${with_xsltproc+set}" = set; then : +if test ${with_xsltproc+y} +then : withval=$with_xsltproc; use_xsltproc=$withval -else +else $as_nop use_xsltproc=auto fi @@ -12627,11 +13069,12 @@ fi if test "x$use_xsltproc" = x"auto"; then # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XSLTPROC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_XSLTPROC+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $XSLTPROC in [\\/]* | ?:[\\/]*) ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. @@ -12641,11 +13084,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_XSLTPROC="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12657,17 +13104,17 @@ esac fi XSLTPROC=$ac_cv_path_XSLTPROC if test -n "$XSLTPROC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 -$as_echo "$XSLTPROC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 +printf "%s\n" "$XSLTPROC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$XSLTPROC" = "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xsltproc not found - cannot transform XML documents" >&5 -$as_echo "$as_me: WARNING: xsltproc not found - cannot transform XML documents" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: xsltproc not found - cannot transform XML documents" >&5 +printf "%s\n" "$as_me: WARNING: xsltproc not found - cannot transform XML documents" >&2;} have_xsltproc=no else have_xsltproc=yes @@ -12675,11 +13122,12 @@ $as_echo "$as_me: WARNING: xsltproc not found - cannot transform XML documents" elif test "x$use_xsltproc" = x"yes" ; then # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XSLTPROC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_XSLTPROC+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $XSLTPROC in [\\/]* | ?:[\\/]*) ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. @@ -12689,11 +13137,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_XSLTPROC="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12705,11 +13157,11 @@ esac fi XSLTPROC=$ac_cv_path_XSLTPROC if test -n "$XSLTPROC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 -$as_echo "$XSLTPROC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 +printf "%s\n" "$XSLTPROC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -12719,8 +13171,8 @@ fi have_xsltproc=yes elif test "x$use_xsltproc" = x"no" ; then if test "x$XSLTPROC" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&5 -$as_echo "$as_me: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&5 +printf "%s\n" "$as_me: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&2;} fi have_xsltproc=no else @@ -12744,11 +13196,12 @@ fi # Check for different types of support on different platforms case $host_os in solaris*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for umem_alloc in -lumem" >&5 -$as_echo_n "checking for umem_alloc in -lumem... " >&6; } -if ${ac_cv_lib_umem_umem_alloc+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for umem_alloc in -lumem" >&5 +printf %s "checking for umem_alloc in -lumem... " >&6; } +if test ${ac_cv_lib_umem_umem_alloc+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lumem $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12757,30 +13210,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char umem_alloc (); int -main () +main (void) { return umem_alloc (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_umem_umem_alloc=yes -else +else $as_nop ac_cv_lib_umem_umem_alloc=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_umem_umem_alloc" >&5 -$as_echo "$ac_cv_lib_umem_umem_alloc" >&6; } -if test "x$ac_cv_lib_umem_umem_alloc" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_umem_umem_alloc" >&5 +printf "%s\n" "$ac_cv_lib_umem_umem_alloc" >&6; } +if test "x$ac_cv_lib_umem_umem_alloc" = xyes +then : malloc_debug_env='LD_PRELOAD=libumem.so UMEM_DEBUG=default' fi @@ -12811,9 +13263,10 @@ XORG_MALLOC_DEBUG_ENV=$malloc_debug_env # Check whether --enable-unit-tests was given. -if test "${enable_unit_tests+set}" = set; then : +if test ${enable_unit_tests+y} +then : enableval=$enable_unit_tests; enable_unit_tests=$enableval -else +else $as_nop enable_unit_tests=auto fi @@ -12826,17 +13279,18 @@ else ENABLE_UNIT_TESTS_FALSE= fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build unit test cases" >&5 -$as_echo_n "checking whether to build unit test cases... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_unit_tests" >&5 -$as_echo "$enable_unit_tests" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build unit test cases" >&5 +printf %s "checking whether to build unit test cases... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_unit_tests" >&5 +printf "%s\n" "$enable_unit_tests" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-wrap,exit" >&5 -$as_echo_n "checking whether the linker accepts -Wl,-wrap,exit... " >&6; } -if ${xorg_cv_linker_flags__Wl__wrap_exit+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-wrap,exit" >&5 +printf %s "checking whether the linker accepts -Wl,-wrap,exit... " >&6; } +if test ${xorg_cv_linker_flags__Wl__wrap_exit+y} +then : + printf %s "(cached) " >&6 +else $as_nop ax_save_FLAGS=$LDFLAGS LDFLAGS="-Wl,-wrap,exit" @@ -12845,26 +13299,27 @@ else #include <stdlib.h> void __wrap_exit(int status) { return; } int -main () +main (void) { exit(0); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : xorg_cv_linker_flags__Wl__wrap_exit=yes -else +else $as_nop xorg_cv_linker_flags__Wl__wrap_exit=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$ax_save_FLAGS fi eval xorg_check_linker_flags=$xorg_cv_linker_flags__Wl__wrap_exit -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_check_linker_flags" >&5 -$as_echo "$xorg_check_linker_flags" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_check_linker_flags" >&5 +printf "%s\n" "$xorg_check_linker_flags" >&6; } if test "x$xorg_check_linker_flags" = xyes; then have_ld_wrap=yes else @@ -12924,11 +13379,12 @@ test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS depcc="$CCAS" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CCAS_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_CCAS_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -13033,8 +13489,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CCAS_dependencies_compiler_type" >&6; } CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type if @@ -13048,22 +13504,23 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +printf %s "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +printf "%s\n" "no, using $LN_S" >&6; } fi + case `pwd` in *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac @@ -13083,6 +13540,7 @@ macro_revision='1.3337' + ltmain="$ac_aux_dir/ltmain.sh" # Backslashify metacharacters that are still active within @@ -13106,8 +13564,8 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +printf %s "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -13133,12 +13591,12 @@ func_echo_all () } case "$ECHO" in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; + printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +printf "%s\n" "printf" >&6; } ;; + print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +printf "%s\n" "print -r" >&6; } ;; + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +printf "%s\n" "cat" >&6; } ;; esac @@ -13154,11 +13612,12 @@ esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +printf %s "checking for a sed that does not truncate output... " >&6; } +if test ${ac_cv_path_SED+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" @@ -13172,10 +13631,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in sed gsed + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + ac_path_SED="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED @@ -13184,13 +13648,13 @@ case `"$ac_path_SED" --version 2>&1` in ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" + printf "%s\n" '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -13218,8 +13682,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +printf "%s\n" "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -13236,11 +13700,154 @@ Xsed="$SED -e 1s/^X//" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : - $as_echo_n "(cached) " >&6 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +printf %s "checking for grep that handles long lines and -e... " >&6; } +if test ${ac_cv_path_GREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in grep ggrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +printf "%s\n" "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +printf %s "checking for egrep... " >&6; } +if test ${ac_cv_path_EGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in egrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +printf %s "checking for fgrep... " >&6; } +if test ${ac_cv_path_FGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 then ac_cv_path_FGREP="$GREP -F" else @@ -13251,10 +13858,15 @@ else for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in fgrep + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP @@ -13263,13 +13875,13 @@ case `"$ac_path_FGREP" --version 2>&1` in ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" + printf "%s\n" 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -13298,8 +13910,8 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +printf "%s\n" "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -13324,17 +13936,18 @@ test -z "$GREP" && GREP=grep # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : +if test ${with_gnu_ld+y} +then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else +else $as_nop with_gnu_ld=no fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +printf %s "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -13363,15 +13976,16 @@ $as_echo_n "checking for ld used by $CC... " >&6; } ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +printf %s "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +printf %s "checking for non-GNU ld... " >&6; } fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${lt_cv_path_LD+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do @@ -13400,18 +14014,19 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -$as_echo "$LD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +printf "%s\n" "$LD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +printf %s "checking if the linker ($LD) is GNU ld... " >&6; } +if test ${lt_cv_prog_gnu_ld+y} +then : + printf %s "(cached) " >&6 +else $as_nop # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) @@ -13422,8 +14037,8 @@ case `$LD -v 2>&1 </dev/null` in ;; esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -13434,11 +14049,12 @@ with_gnu_ld=$lt_cv_prog_gnu_ld -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 -$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if ${lt_cv_path_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if test ${lt_cv_path_NM+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM="$NM" @@ -13483,8 +14099,8 @@ else : ${lt_cv_path_NM=no} fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -$as_echo "$lt_cv_path_NM" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +printf "%s\n" "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else @@ -13497,11 +14113,12 @@ else do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DUMPBIN+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DUMPBIN"; then ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. else @@ -13509,11 +14126,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -13524,11 +14145,11 @@ fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -$as_echo "$DUMPBIN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +printf "%s\n" "$DUMPBIN" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -13541,11 +14162,12 @@ if test -z "$DUMPBIN"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DUMPBIN+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DUMPBIN"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. else @@ -13553,11 +14175,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -13568,11 +14194,11 @@ fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -$as_echo "$ac_ct_DUMPBIN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +printf "%s\n" "$ac_ct_DUMPBIN" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -13584,8 +14210,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DUMPBIN=$ac_ct_DUMPBIN @@ -13613,11 +14239,12 @@ test -z "$NM" && NM=nm -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 -$as_echo_n "checking the name lister ($NM) interface... " >&6; } -if ${lt_cv_nm_interface+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +printf %s "checking the name lister ($NM) interface... " >&6; } +if test ${lt_cv_nm_interface+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) @@ -13633,15 +14260,16 @@ else fi rm -f conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -$as_echo "$lt_cv_nm_interface" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +printf "%s\n" "$lt_cv_nm_interface" >&6; } # find the maximum length of command line arguments -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -$as_echo_n "checking the maximum length of command line arguments... " >&6; } -if ${lt_cv_sys_max_cmd_len+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +printf %s "checking the maximum length of command line arguments... " >&6; } +if test ${lt_cv_sys_max_cmd_len+y} +then : + printf %s "(cached) " >&6 +else $as_nop i=0 teststring="ABCD" @@ -13767,11 +14395,11 @@ else fi if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 +printf "%s\n" "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -13784,8 +14412,8 @@ max_cmd_len=$lt_cv_sys_max_cmd_len : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +printf %s "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -13794,18 +14422,18 @@ xsi_shell=no && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +printf "%s\n" "$xsi_shell" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +printf %s "checking whether the shell understands \"+=\"... " >&6; } lt_shell_append=no ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ >/dev/null 2>&1 \ && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +printf "%s\n" "$lt_shell_append" >&6; } if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -13839,11 +14467,12 @@ esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -if ${lt_cv_to_host_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +printf %s "checking how to convert $build file names to $host format... " >&6; } +if test ${lt_cv_to_host_file_cmd+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $host in *-*-mingw* ) case $build in @@ -13879,18 +14508,19 @@ esac fi to_host_file_cmd=$lt_cv_to_host_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -$as_echo "$lt_cv_to_host_file_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -if ${lt_cv_to_tool_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +printf %s "checking how to convert $build file names to toolchain format... " >&6; } +if test ${lt_cv_to_tool_file_cmd+y} +then : + printf %s "(cached) " >&6 +else $as_nop #assume ordinary cross tools, or native build. lt_cv_to_tool_file_cmd=func_convert_file_noop case $host in @@ -13906,22 +14536,23 @@ esac fi to_tool_file_cmd=$lt_cv_to_tool_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if ${lt_cv_ld_reload_flag+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +printf %s "checking for $LD option to reload object files... " >&6; } +if test ${lt_cv_ld_reload_flag+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ld_reload_flag='-r' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +printf "%s\n" "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -13954,11 +14585,12 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OBJDUMP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else @@ -13966,11 +14598,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -13981,11 +14617,11 @@ fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +printf "%s\n" "$OBJDUMP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -13994,11 +14630,12 @@ if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OBJDUMP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. else @@ -14006,11 +14643,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14021,11 +14662,11 @@ fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +printf "%s\n" "$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OBJDUMP" = x; then @@ -14033,8 +14674,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OBJDUMP=$ac_ct_OBJDUMP @@ -14050,11 +14691,12 @@ test -z "$OBJDUMP" && OBJDUMP=objdump -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 -$as_echo_n "checking how to recognize dependent libraries... " >&6; } -if ${lt_cv_deplibs_check_method+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +printf %s "checking how to recognize dependent libraries... " >&6; } +if test ${lt_cv_deplibs_check_method+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= lt_cv_deplibs_check_method='unknown' @@ -14252,8 +14894,8 @@ tpf*) esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -$as_echo "$lt_cv_deplibs_check_method" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +printf "%s\n" "$lt_cv_deplibs_check_method" >&6; } file_magic_glob= want_nocaseglob=no @@ -14297,11 +14939,12 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DLLTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else @@ -14309,11 +14952,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14324,11 +14971,11 @@ fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +printf "%s\n" "$DLLTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -14337,11 +14984,12 @@ if test -z "$ac_cv_prog_DLLTOOL"; then ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DLLTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DLLTOOL"; then ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. else @@ -14349,11 +14997,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14364,11 +15016,11 @@ fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +printf "%s\n" "$ac_ct_DLLTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_DLLTOOL" = x; then @@ -14376,8 +15028,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DLLTOOL=$ac_ct_DLLTOOL @@ -14394,11 +15046,12 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +printf %s "checking how to associate runtime and link libraries... " >&6; } +if test ${lt_cv_sharedlib_from_linklib_cmd+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in @@ -14421,8 +15074,8 @@ cygwin* | mingw* | pw32* | cegcc*) esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; } sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO @@ -14437,11 +15090,12 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else @@ -14449,11 +15103,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14464,11 +15122,11 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +printf "%s\n" "$AR" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -14481,11 +15139,12 @@ if test -z "$AR"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else @@ -14493,11 +15152,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14508,11 +15171,11 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +printf "%s\n" "$ac_ct_AR" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -14524,8 +15187,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -14545,30 +15208,32 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -$as_echo_n "checking for archiver @FILE support... " >&6; } -if ${lt_cv_ar_at_file+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +printf %s "checking for archiver @FILE support... " >&6; } +if test ${lt_cv_ar_at_file+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ar_at_file=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 (eval $lt_ar_try) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if test "$ac_status" -eq 0; then # Ensure the archiver fails upon bogus file names. @@ -14576,7 +15241,7 @@ if ac_fn_c_try_compile "$LINENO"; then : { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 (eval $lt_ar_try) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if test "$ac_status" -ne 0; then lt_cv_ar_at_file=@ @@ -14585,11 +15250,11 @@ if ac_fn_c_try_compile "$LINENO"; then : rm -f conftest.* libconftest.a fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -$as_echo "$lt_cv_ar_at_file" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +printf "%s\n" "$lt_cv_ar_at_file" >&6; } if test "x$lt_cv_ar_at_file" = xno; then archiver_list_spec= @@ -14606,11 +15271,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -14618,11 +15284,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14633,11 +15303,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -14646,11 +15316,12 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -14658,11 +15329,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14673,11 +15348,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -14685,8 +15360,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -14705,11 +15380,12 @@ test -z "$STRIP" && STRIP=: if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else @@ -14717,11 +15393,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14732,11 +15412,11 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +printf "%s\n" "$RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -14745,11 +15425,12 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else @@ -14757,11 +15438,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14772,11 +15457,11 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +printf "%s\n" "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -14784,8 +15469,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -14874,11 +15559,12 @@ compiler=$CC # Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 -$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if ${lt_cv_sys_global_symbol_pipe+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +printf %s "checking command to parse $NM output from $compiler object... " >&6; } +if test ${lt_cv_sys_global_symbol_pipe+y} +then : + printf %s "(cached) " >&6 +else $as_nop # These are sane defaults that work on at least a few old systems. # [They come from Ultrix. What could be older than Ultrix?!! ;)] @@ -14997,14 +15683,14 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -15073,7 +15759,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -15108,11 +15794,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -$as_echo "failed" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +printf "%s\n" "failed" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +printf "%s\n" "ok" >&6; } fi # Response file support. @@ -15148,13 +15834,14 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -$as_echo_n "checking for sysroot... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +printf %s "checking for sysroot... " >&6; } # Check whether --with-sysroot was given. -if test "${with_sysroot+set}" = set; then : +if test ${with_sysroot+y} +then : withval=$with_sysroot; -else +else $as_nop with_sysroot=no fi @@ -15172,21 +15859,22 @@ case ${with_sysroot} in #( no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +printf "%s\n" "${with_sysroot}" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -$as_echo "${lt_sysroot:-no}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +printf "%s\n" "${lt_sysroot:-no}" >&6; } # Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then : +if test ${enable_libtool_lock+y} +then : enableval=$enable_libtool_lock; fi @@ -15201,7 +15889,7 @@ ia64-*-hpux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) @@ -15220,7 +15908,7 @@ ia64-*-hpux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in @@ -15258,7 +15946,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *32-bit*) @@ -15308,11 +15996,12 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if ${lt_cv_cc_needs_belf+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +printf %s "checking whether the C compiler needs -belf... " >&6; } +if test ${lt_cv_cc_needs_belf+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -15323,19 +16012,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_cc_needs_belf=yes -else +else $as_nop lt_cv_cc_needs_belf=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -15344,8 +16034,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -$as_echo "$lt_cv_cc_needs_belf" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -15357,7 +16047,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *64-bit*) @@ -15394,11 +16084,12 @@ need_locks="$enable_libtool_lock" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. set dummy ${ac_tool_prefix}mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_MANIFEST_TOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$MANIFEST_TOOL"; then ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. else @@ -15406,11 +16097,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15421,11 +16116,11 @@ fi fi MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL if test -n "$MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -$as_echo "$MANIFEST_TOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +printf "%s\n" "$MANIFEST_TOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15434,11 +16129,12 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL # Extract the first word of "mt", so it can be a program name with args. set dummy mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_MANIFEST_TOOL"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. else @@ -15446,11 +16142,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15461,11 +16161,11 @@ fi fi ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL if test -n "$ac_ct_MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_MANIFEST_TOOL" = x; then @@ -15473,8 +16173,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL @@ -15484,11 +16184,12 @@ else fi test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if ${lt_cv_path_mainfest_tool+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if test ${lt_cv_path_mainfest_tool+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_path_mainfest_tool=no echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out @@ -15498,8 +16199,8 @@ else fi rm -f conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -$as_echo "$lt_cv_path_mainfest_tool" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; } if test "x$lt_cv_path_mainfest_tool" != xyes; then MANIFEST_TOOL=: fi @@ -15514,11 +16215,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DSYMUTIL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. else @@ -15526,11 +16228,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15541,11 +16247,11 @@ fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +printf "%s\n" "$DSYMUTIL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15554,11 +16260,12 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DSYMUTIL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. else @@ -15566,11 +16273,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15581,11 +16292,11 @@ fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +printf "%s\n" "$ac_ct_DSYMUTIL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_DSYMUTIL" = x; then @@ -15593,8 +16304,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL @@ -15606,11 +16317,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_NMEDIT+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. else @@ -15618,11 +16330,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15633,11 +16349,11 @@ fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +printf "%s\n" "$NMEDIT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15646,11 +16362,12 @@ if test -z "$ac_cv_prog_NMEDIT"; then ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_NMEDIT+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. else @@ -15658,11 +16375,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15673,11 +16394,11 @@ fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +printf "%s\n" "$ac_ct_NMEDIT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_NMEDIT" = x; then @@ -15685,8 +16406,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT @@ -15698,11 +16419,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_LIPO+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. else @@ -15710,11 +16432,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15725,11 +16451,11 @@ fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +printf "%s\n" "$LIPO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15738,11 +16464,12 @@ if test -z "$ac_cv_prog_LIPO"; then ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_LIPO+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_LIPO"; then ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. else @@ -15750,11 +16477,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15765,11 +16496,11 @@ fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -$as_echo "$ac_ct_LIPO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +printf "%s\n" "$ac_ct_LIPO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_LIPO" = x; then @@ -15777,8 +16508,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac LIPO=$ac_ct_LIPO @@ -15790,11 +16521,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OTOOL"; then ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. else @@ -15802,11 +16534,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15817,11 +16553,11 @@ fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +printf "%s\n" "$OTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15830,11 +16566,12 @@ if test -z "$ac_cv_prog_OTOOL"; then ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OTOOL"; then ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. else @@ -15842,11 +16579,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15857,11 +16598,11 @@ fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -$as_echo "$ac_ct_OTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +printf "%s\n" "$ac_ct_OTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OTOOL" = x; then @@ -15869,8 +16610,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL=$ac_ct_OTOOL @@ -15882,11 +16623,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OTOOL64+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OTOOL64"; then ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. else @@ -15894,11 +16636,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15909,11 +16655,11 @@ fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -$as_echo "$OTOOL64" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +printf "%s\n" "$OTOOL64" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15922,11 +16668,12 @@ if test -z "$ac_cv_prog_OTOOL64"; then ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OTOOL64+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OTOOL64"; then ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. else @@ -15934,11 +16681,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15949,11 +16700,11 @@ fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -$as_echo "$ac_ct_OTOOL64" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +printf "%s\n" "$ac_ct_OTOOL64" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OTOOL64" = x; then @@ -15961,8 +16712,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL64=$ac_ct_OTOOL64 @@ -15997,11 +16748,12 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -$as_echo_n "checking for -single_module linker flag... " >&6; } -if ${lt_cv_apple_cc_single_mod+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +printf %s "checking for -single_module linker flag... " >&6; } +if test ${lt_cv_apple_cc_single_mod+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_apple_cc_single_mod=no if test -z "${LT_MULTI_MODULE}"; then # By default we will add the -single_module flag. You can override @@ -16030,14 +16782,15 @@ else rm -f conftest.* fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if ${lt_cv_ld_exported_symbols_list+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +printf %s "checking for -exported_symbols_list linker flag... " >&6; } +if test ${lt_cv_ld_exported_symbols_list+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym @@ -16046,31 +16799,33 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_ld_exported_symbols_list=yes -else +else $as_nop lt_cv_ld_exported_symbols_list=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -$as_echo_n "checking for -force_load linker flag... " >&6; } -if ${lt_cv_ld_force_load+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +printf %s "checking for -force_load linker flag... " >&6; } +if test ${lt_cv_ld_force_load+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF int forced_loaded() { return 2;} @@ -16098,8 +16853,8 @@ _LT_EOF rm -rf conftest.dSYM fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -$as_echo "$lt_cv_ld_force_load" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +printf "%s\n" "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -16135,26 +16890,22 @@ $as_echo "$lt_cv_ld_force_load" >&6; } ;; esac -for ac_header in dlfcn.h -do : - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " -if test "x$ac_cv_header_dlfcn_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF +if test "x$ac_cv_header_dlfcn_h" = xyes +then : + printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h fi -done - # Set options # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : +if test ${enable_static+y} +then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -16172,7 +16923,7 @@ if test "${enable_static+set}" = set; then : IFS="$lt_save_ifs" ;; esac -else +else $as_nop enable_static=no fi @@ -16189,11 +16940,12 @@ case $host in if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AS+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AS+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. else @@ -16201,11 +16953,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AS="${ac_tool_prefix}as" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16216,11 +16972,11 @@ fi fi AS=$ac_cv_prog_AS if test -n "$AS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 -$as_echo "$AS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 +printf "%s\n" "$AS" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -16229,11 +16985,12 @@ if test -z "$ac_cv_prog_AS"; then ac_ct_AS=$AS # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AS+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_AS+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_AS"; then ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. else @@ -16241,11 +16998,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AS="as" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16256,11 +17017,11 @@ fi fi ac_ct_AS=$ac_cv_prog_ac_ct_AS if test -n "$ac_ct_AS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 -$as_echo "$ac_ct_AS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 +printf "%s\n" "$ac_ct_AS" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_AS" = x; then @@ -16268,8 +17029,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AS=$ac_ct_AS @@ -16281,11 +17042,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DLLTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else @@ -16293,11 +17055,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16308,11 +17074,11 @@ fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +printf "%s\n" "$DLLTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -16321,11 +17087,12 @@ if test -z "$ac_cv_prog_DLLTOOL"; then ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DLLTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DLLTOOL"; then ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. else @@ -16333,11 +17100,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16348,11 +17119,11 @@ fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +printf "%s\n" "$ac_ct_DLLTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_DLLTOOL" = x; then @@ -16360,8 +17131,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DLLTOOL=$ac_ct_DLLTOOL @@ -16373,11 +17144,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OBJDUMP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else @@ -16385,11 +17157,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16400,11 +17176,11 @@ fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +printf "%s\n" "$OBJDUMP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -16413,11 +17189,12 @@ if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OBJDUMP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. else @@ -16425,11 +17202,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16440,11 +17221,11 @@ fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +printf "%s\n" "$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OBJDUMP" = x; then @@ -16452,8 +17233,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OBJDUMP=$ac_ct_OBJDUMP @@ -16490,7 +17271,8 @@ test -z "$OBJDUMP" && OBJDUMP=objdump # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : +if test ${enable_shared+y} +then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -16508,7 +17290,7 @@ if test "${enable_shared+set}" = set; then : IFS="$lt_save_ifs" ;; esac -else +else $as_nop enable_shared=yes fi @@ -16523,7 +17305,8 @@ fi # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then : +if test ${with_pic+y} +then : withval=$with_pic; lt_p=${PACKAGE-default} case $withval in yes|no) pic_mode=$withval ;; @@ -16540,7 +17323,7 @@ if test "${with_pic+set}" = set; then : IFS="$lt_save_ifs" ;; esac -else +else $as_nop pic_mode=default fi @@ -16554,7 +17337,8 @@ test -z "$pic_mode" && pic_mode=default # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then : +if test ${enable_fast_install+y} +then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -16572,7 +17356,7 @@ if test "${enable_fast_install+set}" = set; then : IFS="$lt_save_ifs" ;; esac -else +else $as_nop enable_fast_install=yes fi @@ -16640,11 +17424,12 @@ if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } -if ${lt_cv_objdir+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +printf %s "checking for objdir... " >&6; } +if test ${lt_cv_objdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then @@ -16655,17 +17440,15 @@ else fi rmdir .libs 2>/dev/null fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +printf "%s\n" "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir -cat >>confdefs.h <<_ACEOF -#define LT_OBJDIR "$lt_cv_objdir/" -_ACEOF +printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h @@ -16718,11 +17501,12 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +printf %s "checking for ${ac_tool_prefix}file... " >&6; } +if test ${lt_cv_path_MAGIC_CMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. @@ -16771,11 +17555,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +printf "%s\n" "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -16784,11 +17568,12 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -$as_echo_n "checking for file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +printf %s "checking for file... " >&6; } +if test ${lt_cv_path_MAGIC_CMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. @@ -16837,11 +17622,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +printf "%s\n" "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -16926,11 +17711,12 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if test ${lt_cv_prog_compiler_rtti_exceptions+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -16961,8 +17747,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -17288,26 +18074,28 @@ case $host_os in ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +printf %s "checking for $compiler option to produce PIC... " >&6; } +if test ${lt_cv_prog_compiler_pic+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_pic=$lt_prog_compiler_pic fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -$as_echo "$lt_cv_prog_compiler_pic" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; } lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if ${lt_cv_prog_compiler_pic_works+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if test ${lt_cv_prog_compiler_pic_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -17338,8 +18126,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -17367,11 +18155,12 @@ fi # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if test ${lt_cv_prog_compiler_static_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" @@ -17395,8 +18184,8 @@ else LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then : @@ -17410,11 +18199,12 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -17457,19 +18247,20 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -17512,8 +18303,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } @@ -17521,19 +18312,19 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +printf %s "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +printf "%s\n" "$hard_links" >&6; } if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +printf "%s\n" "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -17545,8 +18336,8 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= allow_undefined_flag= @@ -18030,21 +18821,23 @@ _LT_EOF if test "${lt_cv_aix_libpath+set}" = set; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_aix_libpath_+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -18059,7 +18852,7 @@ if ac_fn_c_try_link "$LINENO"; then : lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_="/usr/lib:/lib" @@ -18083,21 +18876,23 @@ fi if test "${lt_cv_aix_libpath+set}" = set; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_aix_libpath_+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -18112,7 +18907,7 @@ if ac_fn_c_try_link "$LINENO"; then : lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_="/usr/lib:/lib" @@ -18350,11 +19145,12 @@ fi # Older versions of the 11.00 compiler do not understand -b yet # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -$as_echo_n "checking if $CC understands -b... " >&6; } -if ${lt_cv_prog_compiler__b+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +printf %s "checking if $CC understands -b... " >&6; } +if test ${lt_cv_prog_compiler__b+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler__b=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -b" @@ -18378,8 +19174,8 @@ else LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -$as_echo "$lt_cv_prog_compiler__b" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +printf "%s\n" "$lt_cv_prog_compiler__b" >&6; } if test x"$lt_cv_prog_compiler__b" = xyes; then archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' @@ -18419,28 +19215,30 @@ fi # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if ${lt_cv_irix_exported_symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if test ${lt_cv_irix_exported_symbol+y} +then : + printf %s "(cached) " >&6 +else $as_nop save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_irix_exported_symbol=yes -else +else $as_nop lt_cv_irix_exported_symbol=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -$as_echo "$lt_cv_irix_exported_symbol" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } if test "$lt_cv_irix_exported_symbol" = yes; then archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' fi @@ -18698,8 +19496,8 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +printf "%s\n" "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -18735,18 +19533,19 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +printf %s "checking whether -lc should be explicitly linked in... " >&6; } +if test ${lt_cv_archive_cmds_need_lc+y} +then : + printf %s "(cached) " >&6 +else $as_nop $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest @@ -18764,7 +19563,7 @@ else if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then lt_cv_archive_cmds_need_lc=no @@ -18778,8 +19577,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; } archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ;; esac @@ -18938,8 +19737,8 @@ esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +printf %s "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then case $host_os in @@ -19430,9 +20229,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_shlibpath_overrides_runpath+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_shlibpath_overrides_runpath=no save_LDFLAGS=$LDFLAGS save_libdir=$libdir @@ -19442,19 +20242,21 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : +if ac_fn_c_try_link "$LINENO" +then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null +then : lt_cv_shlibpath_overrides_runpath=yes fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -19671,8 +20473,8 @@ uts4*) dynamic_linker=no ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +printf "%s\n" "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -19778,8 +20580,8 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +printf %s "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || @@ -19803,8 +20605,8 @@ else # directories. hardcode_action=unsupported fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +printf "%s\n" "$hardcode_action" >&6; } if test "$hardcode_action" = relink || test "$inherit_rpath" = yes; then @@ -19848,11 +20650,12 @@ else darwin*) # if libdl is installed we need to link against it - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +printf %s "checking for dlopen in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19861,32 +20664,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes -else +else $as_nop ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else +else $as_nop lt_cv_dlopen="dyld" lt_cv_dlopen_libs= @@ -19898,14 +20700,16 @@ fi *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes; then : +if test "x$ac_cv_func_shl_load" = xyes +then : lt_cv_dlopen="shl_load" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -$as_echo_n "checking for shl_load in -ldld... " >&6; } -if ${ac_cv_lib_dld_shl_load+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +printf %s "checking for shl_load in -ldld... " >&6; } +if test ${ac_cv_lib_dld_shl_load+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19914,41 +20718,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char shl_load (); int -main () +main (void) { return shl_load (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dld_shl_load=yes -else +else $as_nop ac_cv_lib_dld_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes +then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else +else $as_nop ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes; then : +if test "x$ac_cv_func_dlopen" = xyes +then : lt_cv_dlopen="dlopen" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +printf %s "checking for dlopen in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19957,37 +20762,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes -else +else $as_nop ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -$as_echo_n "checking for dlopen in -lsvld... " >&6; } -if ${ac_cv_lib_svld_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +printf %s "checking for dlopen in -lsvld... " >&6; } +if test ${ac_cv_lib_svld_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19996,37 +20801,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_svld_dlopen=yes -else +else $as_nop ac_cv_lib_svld_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes +then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -$as_echo_n "checking for dld_link in -ldld... " >&6; } -if ${ac_cv_lib_dld_dld_link+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +printf %s "checking for dld_link in -ldld... " >&6; } +if test ${ac_cv_lib_dld_dld_link+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -20035,30 +20840,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dld_link (); int -main () +main (void) { return dld_link (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dld_dld_link=yes -else +else $as_nop ac_cv_lib_dld_dld_link=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 -$as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes +then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -20097,11 +20901,12 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 -$as_echo_n "checking whether a program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +printf %s "checking whether a program can dlopen itself... " >&6; } +if test ${lt_cv_dlopen_self+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "$cross_compiling" = yes; then : lt_cv_dlopen_self=cross else @@ -20180,7 +20985,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -20198,16 +21003,17 @@ rm -fr conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -$as_echo "$lt_cv_dlopen_self" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +printf "%s\n" "$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 -$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self_static+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +printf %s "checking whether a statically linked program can dlopen itself... " >&6; } +if test ${lt_cv_dlopen_self_static+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "$cross_compiling" = yes; then : lt_cv_dlopen_self_static=cross else @@ -20286,7 +21092,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -20304,8 +21110,8 @@ rm -fr conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +printf "%s\n" "$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -20343,13 +21149,13 @@ fi striplib= old_striplib= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +printf %s "checking whether stripping libraries is possible... " >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in @@ -20357,16 +21163,16 @@ else if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi @@ -20383,13 +21189,13 @@ fi # Report which library types will actually be built - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +printf %s "checking if libtool supports shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +printf "%s\n" "$can_build_shared" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +printf %s "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -20409,15 +21215,15 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } fi ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +printf "%s\n" "$enable_shared" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +printf %s "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +printf "%s\n" "$enable_static" >&6; } @@ -20464,11 +21270,12 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -20478,11 +21285,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20494,11 +21305,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -20507,11 +21318,12 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. @@ -20521,11 +21333,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20537,11 +21353,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -20549,8 +21365,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -20562,14 +21378,14 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi @@ -20577,11 +21393,12 @@ for ac_prog in flex lex do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LEX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_LEX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$LEX"; then ac_cv_prog_LEX="$LEX" # Let the user override the test. else @@ -20589,11 +21406,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_LEX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20604,11 +21425,11 @@ fi fi LEX=$ac_cv_prog_LEX if test -n "$LEX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 -$as_echo "$LEX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 +printf "%s\n" "$LEX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -20616,15 +21437,26 @@ fi done test -n "$LEX" || LEX=":" -if test "x$LEX" != "x:"; then - cat >conftest.l <<_ACEOF + if test "x$LEX" != "x:"; then + cat >conftest.l <<_ACEOF +%{ +#ifdef __cplusplus +extern "C" +#endif +int yywrap(void); +%} %% a { ECHO; } b { REJECT; } c { yymore (); } d { yyless (1); } e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */ - yyless ((input () != 0)); } +#ifdef __cplusplus + yyless ((yyinput () != 0)); +#else + yyless ((input () != 0)); +#endif + } f { unput (yytext[0]); } . { BEGIN INITIAL; } %% @@ -20632,101 +21464,205 @@ f { unput (yytext[0]); } extern char *yytext; #endif int +yywrap (void) +{ + return 1; +} +int main (void) { - return ! yylex () + ! yywrap (); + return ! yylex (); } _ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lex output file root" >&5 +printf %s "checking for lex output file root... " >&6; } +if test ${ac_cv_prog_lex_root+y} +then : + printf %s "(cached) " >&6 +else $as_nop + +ac_cv_prog_lex_root=unknown { { ac_try="$LEX conftest.l" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$LEX conftest.l") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5 -$as_echo_n "checking lex output file root... " >&6; } -if ${ac_cv_prog_lex_root+:} false; then : - $as_echo_n "(cached) " >&6 -else - + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && if test -f lex.yy.c; then ac_cv_prog_lex_root=lex.yy elif test -f lexyy.c; then ac_cv_prog_lex_root=lexyy -else - as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 -$as_echo "$ac_cv_prog_lex_root" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 +printf "%s\n" "$ac_cv_prog_lex_root" >&6; } +if test "$ac_cv_prog_lex_root" = unknown +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot find output from $LEX; giving up on $LEX" >&5 +printf "%s\n" "$as_me: WARNING: cannot find output from $LEX; giving up on $LEX" >&2;} + LEX=: LEXLIB= +fi LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root -if test -z "${LEXLIB+set}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5 -$as_echo_n "checking lex library... " >&6; } -if ${ac_cv_lib_lex+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${LEXLIB+y} +then : + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lex library" >&5 +printf %s "checking for lex library... " >&6; } +if test ${ac_cv_lib_lex+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + ac_save_LIBS="$LIBS" + ac_found=false + for ac_cv_lib_lex in 'none needed' -lfl -ll 'not found'; do + case $ac_cv_lib_lex in #( + 'none needed') : + ;; #( + 'not found') : + break ;; #( + *) : + LIBS="$ac_cv_lib_lex $ac_save_LIBS" ;; #( + *) : + ;; +esac - ac_save_LIBS=$LIBS - ac_cv_lib_lex='none needed' - for ac_lib in '' -lfl -ll; do - LIBS="$ac_lib $ac_save_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ `cat $LEX_OUTPUT_ROOT.c` _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_lex=$ac_lib +if ac_fn_c_try_link "$LINENO" +then : + ac_found=: fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - test "$ac_cv_lib_lex" != 'none needed' && break + if $ac_found; then + break + fi done - LIBS=$ac_save_LIBS + LIBS="$ac_save_LIBS" + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5 +printf "%s\n" "$ac_cv_lib_lex" >&6; } + if test "$ac_cv_lib_lex" = 'not found' +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: required lex library not found; giving up on $LEX" >&5 +printf "%s\n" "$as_me: WARNING: required lex library not found; giving up on $LEX" >&2;} + LEX=: LEXLIB= +elif test "$ac_cv_lib_lex" = 'none needed' +then : + LEXLIB='' +else $as_nop + LEXLIB=$ac_cv_lib_lex +fi + ac_save_LIBS="$LIBS" + LIBS= + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing yywrap" >&5 +printf %s "checking for library containing yywrap... " >&6; } +if test ${ac_cv_search_yywrap+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char yywrap (); +int +main (void) +{ +return yywrap (); + ; + return 0; +} +_ACEOF +for ac_lib in '' fl l +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_yywrap=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_yywrap+y} +then : + break +fi +done +if test ${ac_cv_search_yywrap+y} +then : + +else $as_nop + ac_cv_search_yywrap=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_yywrap" >&5 +printf "%s\n" "$ac_cv_search_yywrap" >&6; } +ac_res=$ac_cv_search_yywrap +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + LEXLIB="$LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5 -$as_echo "$ac_cv_lib_lex" >&6; } - test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex + + LIBS="$ac_save_LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 -$as_echo_n "checking whether yytext is a pointer... " >&6; } -if ${ac_cv_prog_lex_yytext_pointer+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test "$LEX" != : +then : + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 +printf %s "checking whether yytext is a pointer... " >&6; } +if test ${ac_cv_prog_lex_yytext_pointer+y} +then : + printf %s "(cached) " >&6 +else $as_nop # POSIX says lex can declare yytext either as a pointer or an array; the # default is implementation-dependent. Figure out which it is, since # not all implementations provide the %pointer and %array declarations. ac_cv_prog_lex_yytext_pointer=no -ac_save_LIBS=$LIBS -LIBS="$LEXLIB $ac_save_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define YYTEXT_POINTER 1 `cat $LEX_OUTPUT_ROOT.c` _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_lex_yytext_pointer=yes fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_save_LIBS +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5 -$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5 +printf "%s\n" "$ac_cv_prog_lex_yytext_pointer" >&6; } if test $ac_cv_prog_lex_yytext_pointer = yes; then -$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h +printf "%s\n" "#define YYTEXT_POINTER 1" >>confdefs.h + +fi fi rm -f conftest.l $LEX_OUTPUT_ROOT.c @@ -20736,11 +21672,12 @@ for ac_prog in 'bison -y' byacc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_YACC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_YACC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else @@ -20748,11 +21685,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_YACC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20763,11 +21704,11 @@ fi fi YACC=$ac_cv_prog_YACC if test -n "$YACC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 -$as_echo "$YACC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 +printf "%s\n" "$YACC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -20776,17 +21717,19 @@ done test -n "$YACC" || YACC="yacc" # Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then : +if test ${enable_largefile+y} +then : enableval=$enable_largefile; fi if test "$enable_largefile" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if ${ac_cv_sys_largefile_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +printf %s "checking for special C compiler options needed for large files... " >&6; } +if test ${ac_cv_sys_largefile_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then ac_save_CC=$CC @@ -20800,44 +21743,47 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : break fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_largefile_CC=' -n32'; break fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam break done CC=$ac_save_CC rm -f conftest.$ac_ext fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -$as_echo "$ac_cv_sys_largefile_CC" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if ${ac_cv_sys_file_offset_bits+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if test ${ac_cv_sys_file_offset_bits+y} +then : + printf %s "(cached) " >&6 +else $as_nop while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -20846,22 +21792,23 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_file_offset_bits=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 @@ -20870,43 +21817,43 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_file_offset_bits=64; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_sys_file_offset_bits=unknown break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; *) -cat >>confdefs.h <<_ACEOF -#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -_ACEOF +printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h ;; esac rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if ${ac_cv_sys_large_files+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } +if test ${ac_cv_sys_large_files+y} +then : + printf %s "(cached) " >&6 +else $as_nop while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -20915,22 +21862,23 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_large_files=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _LARGE_FILES 1 @@ -20939,52 +21887,182 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_large_files=1; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_sys_large_files=unknown break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -$as_echo "$ac_cv_sys_large_files" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +printf "%s\n" "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; *) -cat >>confdefs.h <<_ACEOF -#define _LARGE_FILES $ac_cv_sys_large_files -_ACEOF +printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h ;; esac rm -rf conftest* fi +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +printf %s "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test ${ac_cv_prog_CPP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + # Double quotes because $CC needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <limits.h> + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + +else $as_nop + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <ac_nonexistent.h> +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + # Broken: success on invalid input. +continue +else $as_nop + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok +then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +printf "%s\n" "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <limits.h> + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + +else $as_nop + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <ac_nonexistent.h> +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + # Broken: success on invalid input. +continue +else $as_nop + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok +then : +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cpp", so it can be a program name with args. set dummy ${ac_tool_prefix}cpp; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_RAWCPP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_RAWCPP+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $RAWCPP in [\\/]* | ?:[\\/]*) ac_cv_path_RAWCPP="$RAWCPP" # Let the user override the test with a path. @@ -20995,11 +22073,15 @@ as_dummy="$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/ for as_dir in $as_dummy do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_RAWCPP="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_RAWCPP="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -21011,11 +22093,11 @@ esac fi RAWCPP=$ac_cv_path_RAWCPP if test -n "$RAWCPP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RAWCPP" >&5 -$as_echo "$RAWCPP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RAWCPP" >&5 +printf "%s\n" "$RAWCPP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -21024,11 +22106,12 @@ if test -z "$ac_cv_path_RAWCPP"; then ac_pt_RAWCPP=$RAWCPP # Extract the first word of "cpp", so it can be a program name with args. set dummy cpp; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_RAWCPP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_RAWCPP+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $ac_pt_RAWCPP in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_RAWCPP="$ac_pt_RAWCPP" # Let the user override the test with a path. @@ -21039,11 +22122,15 @@ as_dummy="$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/ for as_dir in $as_dummy do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_RAWCPP="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_RAWCPP="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -21055,11 +22142,11 @@ esac fi ac_pt_RAWCPP=$ac_cv_path_ac_pt_RAWCPP if test -n "$ac_pt_RAWCPP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_RAWCPP" >&5 -$as_echo "$ac_pt_RAWCPP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_RAWCPP" >&5 +printf "%s\n" "$ac_pt_RAWCPP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_RAWCPP" = x; then @@ -21067,8 +22154,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RAWCPP=$ac_pt_RAWCPP @@ -21081,46 +22168,46 @@ fi # Check for flag to avoid builtin definitions - assumes unix is predefined, # which is not the best choice for supporting other OS'es, but covers most # of the ones we need for now. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -undef" >&5 -$as_echo_n "checking if $RAWCPP requires -undef... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -undef" >&5 +printf %s "checking if $RAWCPP requires -undef... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ Does cpp redefine unix ? _ACEOF if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then RAWCPPFLAGS=-undef - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } # under Cygwin unix is still defined even with -undef elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then RAWCPPFLAGS="-undef -ansi" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, with -ansi" >&5 -$as_echo "yes, with -ansi" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, with -ansi" >&5 +printf "%s\n" "yes, with -ansi" >&6; } else as_fn_error $? "${RAWCPP} defines unix with or without -undef. I don't know what to do." "$LINENO" 5 fi fi rm -f conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -traditional" >&5 -$as_echo_n "checking if $RAWCPP requires -traditional... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -traditional" >&5 +printf %s "checking if $RAWCPP requires -traditional... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ Does cpp preserve "whitespace"? _ACEOF if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then TRADITIONALCPPFLAGS="-traditional" RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else as_fn_error $? "${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do." "$LINENO" 5 fi @@ -21140,20 +22227,22 @@ fi # Check whether --with-dtrace was given. -if test "${with_dtrace+set}" = set; then : +if test ${with_dtrace+y} +then : withval=$with_dtrace; WDTRACE=$withval -else +else $as_nop WDTRACE=auto fi if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; then # Extract the first word of "dtrace", so it can be a program name with args. set dummy dtrace; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_DTRACE+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_DTRACE+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $DTRACE in [\\/]* | ?:[\\/]*) ac_cv_path_DTRACE="$DTRACE" # Let the user override the test with a path. @@ -21164,11 +22253,15 @@ as_dummy="$PATH:/usr/sbin" for as_dir in $as_dummy do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_DTRACE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_DTRACE="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -21181,31 +22274,31 @@ esac fi DTRACE=$ac_cv_path_DTRACE if test -n "$DTRACE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DTRACE" >&5 -$as_echo "$DTRACE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DTRACE" >&5 +printf "%s\n" "$DTRACE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$DTRACE" = "xnot_found" ; then if test "x$WDTRACE" = "xyes" ; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "dtrace requested but not found See \`config.log' for more details" "$LINENO" 5; } fi WDTRACE="no" else - ac_fn_c_check_header_mongrel "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_sdt_h" = xyes; then : + ac_fn_c_check_header_compile "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_sdt_h" = xyes +then : HAS_SDT_H="yes" -else +else $as_nop HAS_SDT_H="no" fi - if test "x$WDTRACE" = "xauto" -a "x$HAS_SDT_H" = "xno" ; then WDTRACE="no" fi @@ -21213,7 +22306,7 @@ fi fi if test "x$WDTRACE" != "xno" ; then -$as_echo "#define XSERVER_DTRACE 1" >>confdefs.h +printf "%s\n" "#define XSERVER_DTRACE 1" >>confdefs.h # Solaris/OpenSolaris require dtrace -G to build dtrace probe information into @@ -21246,19 +22339,20 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 -$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } -if eval \${$as_ac_Header+:} false; then : - $as_echo_n "(cached) " >&6 -else + as_ac_Header=`printf "%s\n" "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 +printf %s "checking for $ac_hdr that defines DIR... " >&6; } +if eval test \${$as_ac_Header+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <$ac_hdr> int -main () +main (void) { if ((DIR *) 0) return 0; @@ -21266,19 +22360,21 @@ return 0; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$as_ac_Header=yes" -else +else $as_nop eval "$as_ac_Header=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$as_ac_Header - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Header"\" = x"yes" +then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +#define `printf "%s\n" "HAVE_$ac_hdr" | $as_tr_cpp` 1 _ACEOF ac_header_dirent=$ac_hdr; break @@ -21287,11 +22383,12 @@ fi done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 -$as_echo_n "checking for library containing opendir... " >&6; } -if ${ac_cv_search_opendir+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +printf %s "checking for library containing opendir... " >&6; } +if test ${ac_cv_search_opendir+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -21299,56 +22396,59 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char opendir (); int -main () +main (void) { return opendir (); ; return 0; } _ACEOF -for ac_lib in '' dir; do +for ac_lib in '' dir +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_opendir=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_opendir+:} false; then : + if test ${ac_cv_search_opendir+y} +then : break fi done -if ${ac_cv_search_opendir+:} false; then : +if test ${ac_cv_search_opendir+y} +then : -else +else $as_nop ac_cv_search_opendir=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 -$as_echo "$ac_cv_search_opendir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +printf "%s\n" "$ac_cv_search_opendir" >&6; } ac_res=$ac_cv_search_opendir -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 -$as_echo_n "checking for library containing opendir... " >&6; } -if ${ac_cv_search_opendir+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +printf %s "checking for library containing opendir... " >&6; } +if test ${ac_cv_search_opendir+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -21356,189 +22456,204 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char opendir (); int -main () +main (void) { return opendir (); ; return 0; } _ACEOF -for ac_lib in '' x; do +for ac_lib in '' x +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_opendir=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_opendir+:} false; then : + if test ${ac_cv_search_opendir+y} +then : break fi done -if ${ac_cv_search_opendir+:} false; then : +if test ${ac_cv_search_opendir+y} +then : -else +else $as_nop ac_cv_search_opendir=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 -$as_echo "$ac_cv_search_opendir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +printf "%s\n" "$ac_cv_search_opendir" >&6; } ac_res=$ac_cv_search_opendir -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <float.h> +# Autoupdate added the next two lines to ensure that your configure +# script's behavior did not change. They are probably safe to remove. -int -main () -{ +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +printf %s "checking for egrep... " >&6; } +if test ${ac_cv_path_EGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in egrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else - ac_cv_header_stdc=no + ac_cv_path_EGREP=$EGREP fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <string.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no + fi fi -rm -f conftest* +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" -fi -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : +ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default" +if test "x$ac_cv_header_fcntl_h" = xyes +then : + printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h -else - ac_cv_header_stdc=no fi -rm -f conftest* +ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes +then : + printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" +if test "x$ac_cv_header_string_h" = xyes +then : + printf "%s\n" "#define HAVE_STRING_H 1" >>confdefs.h -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ctype.h> -#include <stdlib.h> -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext fi +ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" +if test "x$ac_cv_header_unistd_h" = xyes +then : + printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" +if test "x$ac_cv_header_dlfcn_h" = xyes +then : + printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then +ac_fn_c_check_header_compile "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$ac_includes_default" +if test "x$ac_cv_header_stropts_h" = xyes +then : + printf "%s\n" "#define HAVE_STROPTS_H 1" >>confdefs.h -$as_echo "#define STDC_HEADERS 1" >>confdefs.h +fi +ac_fn_c_check_header_compile "$LINENO" "fnmatch.h" "ac_cv_header_fnmatch_h" "$ac_includes_default" +if test "x$ac_cv_header_fnmatch_h" = xyes +then : + printf "%s\n" "#define HAVE_FNMATCH_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_mkdev_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_MKDEV_H 1" >>confdefs.h -for ac_header in fcntl.h stdlib.h string.h unistd.h dlfcn.h stropts.h \ - fnmatch.h sys/mkdev.h sys/sysmacros.h sys/utsname.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +fi +ac_fn_c_check_header_compile "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_sysmacros_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_SYSMACROS_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "sys/utsname.h" "ac_cv_header_sys_utsname_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_utsname_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_UTSNAME_H 1" >>confdefs.h -done +fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if ${ac_cv_c_const+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +printf %s "checking for an ANSI C-conforming const... " >&6; } +if test ${ac_cv_c_const+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __cplusplus @@ -21551,7 +22666,7 @@ main () /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. + /* IBM XL C 1.02.0.0 rejects this. It does not let you subtract one const X* pointer from another in an arm of an if-expression whose if-part is not a constant expression */ @@ -21579,7 +22694,7 @@ main () iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying + { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ struct s { int j; const int *ap[3]; } bx; struct s *b = &bx; b->j = 5; @@ -21595,27 +22710,29 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_const=yes -else +else $as_nop ac_cv_c_const=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -$as_echo "$ac_cv_c_const" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +printf "%s\n" "$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then -$as_echo "#define const /**/" >>confdefs.h +printf "%s\n" "#define const /**/" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for typeof syntax and keyword spelling" >&5 -$as_echo_n "checking for typeof syntax and keyword spelling... " >&6; } -if ${ac_cv_c_typeof+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for typeof syntax and keyword spelling" >&5 +printf %s "checking for typeof syntax and keyword spelling... " >&6; } +if test ${ac_cv_c_typeof+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_c_typeof=no for ac_kw in typeof __typeof__ no; do test $ac_kw = no && break @@ -21623,7 +22740,7 @@ else /* end confdefs.h. */ int -main () +main (void) { int value; @@ -21642,33 +22759,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_typeof=$ac_kw fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext test $ac_cv_c_typeof != no && break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_typeof" >&5 -$as_echo "$ac_cv_c_typeof" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_typeof" >&5 +printf "%s\n" "$ac_cv_c_typeof" >&6; } if test $ac_cv_c_typeof != no; then -$as_echo "#define HAVE_TYPEOF 1" >>confdefs.h +printf "%s\n" "#define HAVE_TYPEOF 1" >>confdefs.h if test $ac_cv_c_typeof != typeof; then -cat >>confdefs.h <<_ACEOF -#define typeof $ac_cv_c_typeof -_ACEOF +printf "%s\n" "#define typeof $ac_cv_c_typeof" >>confdefs.h fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -$as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if ${ac_cv_c_bigendian+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +printf %s "checking whether byte ordering is bigendian... " >&6; } +if test ${ac_cv_c_bigendian+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_c_bigendian=unknown # See if we're dealing with a universal compiler. cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -21679,7 +22796,8 @@ else typedef int dummy; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : # Check for potential -arch flags. It is not universal unless # there are at least two -arch flags with different values. @@ -21703,7 +22821,7 @@ if ac_fn_c_try_compile "$LINENO"; then : fi done fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then # See if sys/param.h defines the BYTE_ORDER macro. cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -21712,7 +22830,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext #include <sys/param.h> int -main () +main (void) { #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ @@ -21724,7 +22842,8 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : # It does; now see whether it defined to BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -21732,7 +22851,7 @@ if ac_fn_c_try_compile "$LINENO"; then : #include <sys/param.h> int -main () +main (void) { #if BYTE_ORDER != BIG_ENDIAN not big endian @@ -21742,14 +22861,15 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_bigendian=yes -else +else $as_nop ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). @@ -21758,7 +22878,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext #include <limits.h> int -main () +main (void) { #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) bogus endian macros @@ -21768,14 +22888,15 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : # It does; now see whether it defined to _BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <limits.h> int -main () +main (void) { #ifndef _BIG_ENDIAN not big endian @@ -21785,31 +22906,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_bigendian=yes -else +else $as_nop ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # Compile a test program. - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : # Try to guess by grepping values from an object file. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -short int ascii_mm[] = +unsigned short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; - short int ascii_ii[] = + unsigned short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; int use_ascii (int i) { return ascii_mm[i] + ascii_ii[i]; } - short int ebcdic_ii[] = + unsigned short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; - short int ebcdic_mm[] = + unsigned short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; int use_ebcdic (int i) { return ebcdic_mm[i] + ebcdic_ii[i]; @@ -21817,14 +22940,15 @@ short int ascii_mm[] = extern int foo; int -main () +main (void) { return use_ascii (foo) == use_ebcdic (foo); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi @@ -21837,13 +22961,13 @@ if ac_fn_c_try_compile "$LINENO"; then : fi fi fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int -main () +main (void) { /* Are we little or big endian? From Harbison&Steele. */ @@ -21859,9 +22983,10 @@ main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : ac_cv_c_bigendian=no -else +else $as_nop ac_cv_c_bigendian=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -21870,20 +22995,20 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 -$as_echo "$ac_cv_c_bigendian" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +printf "%s\n" "$ac_cv_c_bigendian" >&6; } case $ac_cv_c_bigendian in #( yes) -$as_echo "#define X_BYTE_ORDER X_BIG_ENDIAN" >>confdefs.h +printf "%s\n" "#define X_BYTE_ORDER X_BIG_ENDIAN" >>confdefs.h ;; #( no) -$as_echo "#define X_BYTE_ORDER X_LITTLE_ENDIAN" >>confdefs.h +printf "%s\n" "#define X_BYTE_ORDER X_LITTLE_ENDIAN" >>confdefs.h ;; #( universal) -$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h +printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) @@ -21896,17 +23021,19 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5 -$as_echo_n "checking size of unsigned long... " >&6; } -if ${ac_cv_sizeof_unsigned_long+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long" "$ac_includes_default"; then : - -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5 +printf %s "checking size of unsigned long... " >&6; } +if test ${ac_cv_sizeof_unsigned_long+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long" "$ac_includes_default" +then : + +else $as_nop if test "$ac_cv_type_unsigned_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (unsigned long) See \`config.log' for more details" "$LINENO" 5; } else @@ -21915,43 +23042,69 @@ See \`config.log' for more details" "$LINENO" 5; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long" >&5 -$as_echo "$ac_cv_sizeof_unsigned_long" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long" >&5 +printf "%s\n" "$ac_cv_sizeof_unsigned_long" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long -_ACEOF +printf "%s\n" "#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long" >>confdefs.h if test "$ac_cv_sizeof_unsigned_long" = 8; then -$as_echo "#define _XSERVER64 1" >>confdefs.h +printf "%s\n" "#define _XSERVER64 1" >>confdefs.h fi -ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" -if test "x$ac_cv_type_pid_t" = xyes; then : -else + ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default +" +if test "x$ac_cv_type_pid_t" = xyes +then : + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #if defined _WIN64 && !defined __CYGWIN__ + LLP64 + #endif + +int +main (void) +{ + + ; + return 0; +} -cat >>confdefs.h <<_ACEOF -#define pid_t int _ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_pid_type='int' +else $as_nop + ac_pid_type='__int64' +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h + fi -ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes; then : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else +ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = xyes +then : + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +printf %s "checking for dlopen in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -21960,30 +23113,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes -else +else $as_nop ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : DLOPEN_LIBS="-ldl" fi @@ -21991,28 +23143,170 @@ fi -for ac_func in backtrace geteuid getuid issetugid getresuid \ - getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \ - mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \ - walkcontext setitimer poll epoll_create1 mkostemp memfd_create \ - sigprocmask isastream -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_func "$LINENO" "backtrace" "ac_cv_func_backtrace" +if test "x$ac_cv_func_backtrace" = xyes +then : + printf "%s\n" "#define HAVE_BACKTRACE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "geteuid" "ac_cv_func_geteuid" +if test "x$ac_cv_func_geteuid" = xyes +then : + printf "%s\n" "#define HAVE_GETEUID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getuid" "ac_cv_func_getuid" +if test "x$ac_cv_func_getuid" = xyes +then : + printf "%s\n" "#define HAVE_GETUID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "issetugid" "ac_cv_func_issetugid" +if test "x$ac_cv_func_issetugid" = xyes +then : + printf "%s\n" "#define HAVE_ISSETUGID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getresuid" "ac_cv_func_getresuid" +if test "x$ac_cv_func_getresuid" = xyes +then : + printf "%s\n" "#define HAVE_GETRESUID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getdtablesize" "ac_cv_func_getdtablesize" +if test "x$ac_cv_func_getdtablesize" = xyes +then : + printf "%s\n" "#define HAVE_GETDTABLESIZE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getifaddrs" "ac_cv_func_getifaddrs" +if test "x$ac_cv_func_getifaddrs" = xyes +then : + printf "%s\n" "#define HAVE_GETIFADDRS 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getpeereid" "ac_cv_func_getpeereid" +if test "x$ac_cv_func_getpeereid" = xyes +then : + printf "%s\n" "#define HAVE_GETPEEREID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getpeerucred" "ac_cv_func_getpeerucred" +if test "x$ac_cv_func_getpeerucred" = xyes +then : + printf "%s\n" "#define HAVE_GETPEERUCRED 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getprogname" "ac_cv_func_getprogname" +if test "x$ac_cv_func_getprogname" = xyes +then : + printf "%s\n" "#define HAVE_GETPROGNAME 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getzoneid" "ac_cv_func_getzoneid" +if test "x$ac_cv_func_getzoneid" = xyes +then : + printf "%s\n" "#define HAVE_GETZONEID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" +if test "x$ac_cv_func_mmap" = xyes +then : + printf "%s\n" "#define HAVE_MMAP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "posix_fallocate" "ac_cv_func_posix_fallocate" +if test "x$ac_cv_func_posix_fallocate" = xyes +then : + printf "%s\n" "#define HAVE_POSIX_FALLOCATE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "seteuid" "ac_cv_func_seteuid" +if test "x$ac_cv_func_seteuid" = xyes +then : + printf "%s\n" "#define HAVE_SETEUID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "shmctl64" "ac_cv_func_shmctl64" +if test "x$ac_cv_func_shmctl64" = xyes +then : + printf "%s\n" "#define HAVE_SHMCTL64 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp" +if test "x$ac_cv_func_strncasecmp" = xyes +then : + printf "%s\n" "#define HAVE_STRNCASECMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf" +if test "x$ac_cv_func_vasprintf" = xyes +then : + printf "%s\n" "#define HAVE_VASPRINTF 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" +if test "x$ac_cv_func_vsnprintf" = xyes +then : + printf "%s\n" "#define HAVE_VSNPRINTF 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "walkcontext" "ac_cv_func_walkcontext" +if test "x$ac_cv_func_walkcontext" = xyes +then : + printf "%s\n" "#define HAVE_WALKCONTEXT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setitimer" "ac_cv_func_setitimer" +if test "x$ac_cv_func_setitimer" = xyes +then : + printf "%s\n" "#define HAVE_SETITIMER 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll" +if test "x$ac_cv_func_poll" = xyes +then : + printf "%s\n" "#define HAVE_POLL 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "epoll_create1" "ac_cv_func_epoll_create1" +if test "x$ac_cv_func_epoll_create1" = xyes +then : + printf "%s\n" "#define HAVE_EPOLL_CREATE1 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "mkostemp" "ac_cv_func_mkostemp" +if test "x$ac_cv_func_mkostemp" = xyes +then : + printf "%s\n" "#define HAVE_MKOSTEMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "memfd_create" "ac_cv_func_memfd_create" +if test "x$ac_cv_func_memfd_create" = xyes +then : + printf "%s\n" "#define HAVE_MEMFD_CREATE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask" +if test "x$ac_cv_func_sigprocmask" = xyes +then : + printf "%s\n" "#define HAVE_SIGPROCMASK 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "isastream" "ac_cv_func_isastream" +if test "x$ac_cv_func_isastream" = xyes +then : + printf "%s\n" "#define HAVE_ISASTREAM 1" >>confdefs.h fi -done ac_fn_c_check_func "$LINENO" "reallocarray" "ac_cv_func_reallocarray" -if test "x$ac_cv_func_reallocarray" = xyes; then : - $as_echo "#define HAVE_REALLOCARRAY 1" >>confdefs.h +if test "x$ac_cv_func_reallocarray" = xyes +then : + printf "%s\n" "#define HAVE_REALLOCARRAY 1" >>confdefs.h -else +else $as_nop case " $LIBOBJS " in *" reallocarray.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS reallocarray.$ac_objext" @@ -22020,12 +23314,12 @@ else esac fi - ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" -if test "x$ac_cv_func_strcasecmp" = xyes; then : - $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h +if test "x$ac_cv_func_strcasecmp" = xyes +then : + printf "%s\n" "#define HAVE_STRCASECMP 1" >>confdefs.h -else +else $as_nop case " $LIBOBJS " in *" strcasecmp.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext" @@ -22033,12 +23327,12 @@ else esac fi - ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr" -if test "x$ac_cv_func_strcasestr" = xyes; then : - $as_echo "#define HAVE_STRCASESTR 1" >>confdefs.h +if test "x$ac_cv_func_strcasestr" = xyes +then : + printf "%s\n" "#define HAVE_STRCASESTR 1" >>confdefs.h -else +else $as_nop case " $LIBOBJS " in *" strcasestr.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strcasestr.$ac_objext" @@ -22046,12 +23340,12 @@ else esac fi - ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat" -if test "x$ac_cv_func_strlcat" = xyes; then : - $as_echo "#define HAVE_STRLCAT 1" >>confdefs.h +if test "x$ac_cv_func_strlcat" = xyes +then : + printf "%s\n" "#define HAVE_STRLCAT 1" >>confdefs.h -else +else $as_nop case " $LIBOBJS " in *" strlcat.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strlcat.$ac_objext" @@ -22059,12 +23353,12 @@ else esac fi - ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy" -if test "x$ac_cv_func_strlcpy" = xyes; then : - $as_echo "#define HAVE_STRLCPY 1" >>confdefs.h +if test "x$ac_cv_func_strlcpy" = xyes +then : + printf "%s\n" "#define HAVE_STRLCPY 1" >>confdefs.h -else +else $as_nop case " $LIBOBJS " in *" strlcpy.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strlcpy.$ac_objext" @@ -22072,12 +23366,12 @@ else esac fi - ac_fn_c_check_func "$LINENO" "strndup" "ac_cv_func_strndup" -if test "x$ac_cv_func_strndup" = xyes; then : - $as_echo "#define HAVE_STRNDUP 1" >>confdefs.h +if test "x$ac_cv_func_strndup" = xyes +then : + printf "%s\n" "#define HAVE_STRNDUP 1" >>confdefs.h -else +else $as_nop case " $LIBOBJS " in *" strndup.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS strndup.$ac_objext" @@ -22085,12 +23379,12 @@ else esac fi - ac_fn_c_check_func "$LINENO" "timingsafe_memcmp" "ac_cv_func_timingsafe_memcmp" -if test "x$ac_cv_func_timingsafe_memcmp" = xyes; then : - $as_echo "#define HAVE_TIMINGSAFE_MEMCMP 1" >>confdefs.h +if test "x$ac_cv_func_timingsafe_memcmp" = xyes +then : + printf "%s\n" "#define HAVE_TIMINGSAFE_MEMCMP 1" >>confdefs.h -else +else $as_nop case " $LIBOBJS " in *" timingsafe_memcmp.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS timingsafe_memcmp.$ac_objext" @@ -22099,7 +23393,6 @@ esac fi - if test "x$ac_cv_func_poll" = "xyes"; then POLL_TRUE= POLL_FALSE='#' @@ -22109,81 +23402,135 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for arc4random_buf in -lbsd" >&5 -$as_echo_n "checking for arc4random_buf in -lbsd... " >&6; } -if ${ac_cv_lib_bsd_arc4random_buf+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" +# Checks for non-standard functions and fallback to libbsd if we can +# We only check for arc4random_buf, because if we have that, we don't +# need/use getentropy. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char arc4random_buf (); int -main () +main (void) { return arc4random_buf (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_bsd_arc4random_buf=yes -else - ac_cv_lib_bsd_arc4random_buf=no +if ac_fn_c_try_link "$LINENO" +then : + TRY_LIBBSD="no" +else $as_nop + TRY_LIBBSD="yes" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +if test "x$TRY_LIBBSD" = "xyes" +then : + +pkg_failed=no +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libbsd-overlay" >&5 +printf %s "checking for libbsd-overlay... " >&6; } + +if test -n "$LIBBSD_CFLAGS"; then + pkg_cv_LIBBSD_CFLAGS="$LIBBSD_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbsd-overlay\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libbsd-overlay") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBBSD_CFLAGS=`$PKG_CONFIG --cflags "libbsd-overlay" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_arc4random_buf" >&5 -$as_echo "$ac_cv_lib_bsd_arc4random_buf" >&6; } -if test "x$ac_cv_lib_bsd_arc4random_buf" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBBSD 1 -_ACEOF + else + pkg_failed=untried +fi +if test -n "$LIBBSD_LIBS"; then + pkg_cv_LIBBSD_LIBS="$LIBBSD_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbsd-overlay\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libbsd-overlay") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBBSD_LIBS=`$PKG_CONFIG --libs "libbsd-overlay" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + - LIBS="-lbsd $LIBS" +if test $pkg_failed = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + LIBBSD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbsd-overlay" 2>&1` + else + LIBBSD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbsd-overlay" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBBSD_PKG_ERRORS" >&5 -for ac_func in arc4random_buf -do : - ac_fn_c_check_func "$LINENO" "arc4random_buf" "ac_cv_func_arc4random_buf" -if test "x$ac_cv_func_arc4random_buf" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ARC4RANDOM_BUF 1 -_ACEOF + : +elif test $pkg_failed = untried; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + : +else + LIBBSD_CFLAGS=$pkg_cv_LIBBSD_CFLAGS + LIBBSD_LIBS=$pkg_cv_LIBBSD_LIBS + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + + CFLAGS="$CFLAGS $LIBBSD_CFLAGS" + LIBS="$LIBS $LIBBSD_LIBS" fi -done +fi +ac_fn_c_check_func "$LINENO" "arc4random_buf" "ac_cv_func_arc4random_buf" +if test "x$ac_cv_func_arc4random_buf" = xyes +then : + printf "%s\n" "#define HAVE_ARC4RANDOM_BUF 1" >>confdefs.h +fi -ac_fn_c_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h> -" -if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes; then : + +ac_fn_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes +then : ac_have_decl=1 -else +else $as_nop ac_have_decl=0 fi +printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl -_ACEOF -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SO_PEERCRED in sys/socket.h" >&5 -$as_echo_n "checking for SO_PEERCRED in sys/socket.h... " >&6; } -if ${xorg_cv_sys_have_so_peercred+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SO_PEERCRED in sys/socket.h" >&5 +printf %s "checking for SO_PEERCRED in sys/socket.h... " >&6; } +if test ${xorg_cv_sys_have_so_peercred+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -22195,28 +23542,30 @@ yes_have_so_peercred _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes_have_so_peercred" >/dev/null 2>&1; then : + $EGREP "yes_have_so_peercred" >/dev/null 2>&1 +then : xorg_cv_sys_have_so_peercred=yes -else +else $as_nop xorg_cv_sys_have_so_peercred=no fi -rm -f conftest* +rm -rf conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_sys_have_so_peercred" >&5 -$as_echo "$xorg_cv_sys_have_so_peercred" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_sys_have_so_peercred" >&5 +printf "%s\n" "$xorg_cv_sys_have_so_peercred" >&6; } if test "x$ac_cv_func_getpeereid" = xno && test "x$ac_cv_func_getpeerucred" = xno && test "x$xorg_cv_sys_have_so_peercred" = xno ; then -$as_echo "#define NO_LOCAL_CLIENT_CRED 1" >>confdefs.h +printf "%s\n" "#define NO_LOCAL_CLIENT_CRED 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 -$as_echo_n "checking for sqrt in -lm... " >&6; } -if ${ac_cv_lib_m_sqrt+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 +printf %s "checking for sqrt in -lm... " >&6; } +if test ${ac_cv_lib_m_sqrt+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -22225,71 +23574,65 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char sqrt (); int -main () +main (void) { return sqrt (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_m_sqrt=yes -else +else $as_nop ac_cv_lib_m_sqrt=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5 -$as_echo "$ac_cv_lib_m_sqrt" >&6; } -if test "x$ac_cv_lib_m_sqrt" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5 +printf "%s\n" "$ac_cv_lib_m_sqrt" >&6; } +if test "x$ac_cv_lib_m_sqrt" = xyes +then : + printf "%s\n" "#define HAVE_LIBM 1" >>confdefs.h LIBS="-lm $LIBS" fi -for ac_func in cbrt -do : - ac_fn_c_check_func "$LINENO" "cbrt" "ac_cv_func_cbrt" -if test "x$ac_cv_func_cbrt" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_CBRT 1 -_ACEOF +ac_fn_c_check_func "$LINENO" "cbrt" "ac_cv_func_cbrt" +if test "x$ac_cv_func_cbrt" = xyes +then : + printf "%s\n" "#define HAVE_CBRT 1" >>confdefs.h fi -done # Check whether --enable-agp was given. -if test "${enable_agp+set}" = set; then : +if test ${enable_agp+y} +then : enableval=$enable_agp; AGP=$enableval -else +else $as_nop AGP=auto fi if test "x$AGP" = "xauto" ; then - for ac_header in linux/agpgart.h sys/agpio.h sys/agpgart.h + for ac_header in linux/agpgart.h sys/agpio.h sys/agpgart.h do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes" +then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF AGP=yes fi done - fi if test "x$AGP" = xyes; then AGP_TRUE= @@ -22300,18 +23643,16 @@ else fi -for ac_header in linux/fb.h + for ac_header in linux/fb.h do : - ac_fn_c_check_header_mongrel "$LINENO" "linux/fb.h" "ac_cv_header_linux_fb_h" "$ac_includes_default" -if test "x$ac_cv_header_linux_fb_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LINUX_FB_H 1 -_ACEOF + ac_fn_c_check_header_compile "$LINENO" "linux/fb.h" "ac_cv_header_linux_fb_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_fb_h" = xyes +then : + printf "%s\n" "#define HAVE_LINUX_FB_H 1" >>confdefs.h FBDEV=yes fi done - if test "x$FBDEV" = xyes; then FBDEVHW_TRUE= FBDEVHW_FALSE='#' @@ -22321,21 +23662,19 @@ else fi -for ac_header in sys/linker.h + for ac_header in sys/linker.h do : ac_fn_c_check_header_compile "$LINENO" "sys/linker.h" "ac_cv_header_sys_linker_h" "#include <sys/param.h> " -if test "x$ac_cv_header_sys_linker_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_LINKER_H 1 -_ACEOF +if test "x$ac_cv_header_sys_linker_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_LINKER_H 1" >>confdefs.h ac_cv_sys_linker_h=yes -else +else $as_nop ac_cv_sys_linker_h=no fi done - if test "x$ac_cv_sys_linker_h" = xyes; then FREEBSD_KLDLOAD_TRUE= FREEBSD_KLDLOAD_FALSE='#' @@ -22345,11 +23684,12 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSV IPC" >&5 -$as_echo_n "checking for SYSV IPC... " >&6; } -if ${ac_cv_sysv_ipc+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSV IPC" >&5 +printf %s "checking for SYSV IPC... " >&6; } +if test ${ac_cv_sysv_ipc+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -22359,7 +23699,7 @@ else #include <sys/stat.h> int -main () +main (void) { { @@ -22372,36 +23712,39 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_sysv_ipc=yes -else +else $as_nop ac_cv_sysv_ipc=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sysv_ipc" >&5 -$as_echo "$ac_cv_sysv_ipc" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sysv_ipc" >&5 +printf "%s\n" "$ac_cv_sysv_ipc" >&6; } if test "x$ac_cv_sysv_ipc" = xyes; then -$as_echo "#define HAVE_SYSV_IPC 1" >>confdefs.h +printf "%s\n" "#define HAVE_SYSV_IPC 1" >>confdefs.h fi if test -c /dev/xf86 ; then -$as_echo "#define HAS_APERTURE_DRV 1" >>confdefs.h +printf "%s\n" "#define HAS_APERTURE_DRV 1" >>confdefs.h fi -ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default" -if test "x$ac_cv_header_execinfo_h" = xyes; then : +ac_fn_c_check_header_compile "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default" +if test "x$ac_cv_header_execinfo_h" = xyes +then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace in -lc" >&5 -$as_echo_n "checking for backtrace in -lc... " >&6; } -if ${ac_cv_lib_c_backtrace+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for backtrace in -lc" >&5 +printf %s "checking for backtrace in -lc... " >&6; } +if test ${ac_cv_lib_c_backtrace+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lc $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -22410,36 +23753,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char backtrace (); int -main () +main (void) { return backtrace (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_c_backtrace=yes -else +else $as_nop ac_cv_lib_c_backtrace=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_backtrace" >&5 -$as_echo "$ac_cv_lib_c_backtrace" >&6; } -if test "x$ac_cv_lib_c_backtrace" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_backtrace" >&5 +printf "%s\n" "$ac_cv_lib_c_backtrace" >&6; } +if test "x$ac_cv_lib_c_backtrace" = xyes +then : -$as_echo "#define HAVE_BACKTRACE 1" >>confdefs.h +printf "%s\n" "#define HAVE_BACKTRACE 1" >>confdefs.h -$as_echo "#define HAVE_EXECINFO_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_EXECINFO_H 1" >>confdefs.h fi @@ -22448,7 +23790,6 @@ fi fi - DEFAULT_INT10="x86emu" @@ -22462,7 +23803,7 @@ case $host_cpu in case $host_os in *freebsd*) SYS_LIBS=-lio ;; *netbsd*) -$as_echo "#define USE_ALPHA_PIO 1" >>confdefs.h +printf "%s\n" "#define USE_ALPHA_PIO 1" >>confdefs.h ;; *openbsd*) SYS_LIBS=-lalpha ;; esac @@ -22475,15 +23816,15 @@ $as_echo "#define USE_ALPHA_PIO 1" >>confdefs.h i*86) I386_VIDEO=yes case $host_os in - *freebsd*) $as_echo "#define USE_DEV_IO 1" >>confdefs.h + *freebsd*) printf "%s\n" "#define USE_DEV_IO 1" >>confdefs.h ;; - *dragonfly*) $as_echo "#define USE_DEV_IO 1" >>confdefs.h + *dragonfly*) printf "%s\n" "#define USE_DEV_IO 1" >>confdefs.h ;; - *netbsd*) $as_echo "#define USE_I386_IOPL 1" >>confdefs.h + *netbsd*) printf "%s\n" "#define USE_I386_IOPL 1" >>confdefs.h SYS_LIBS=-li386 ;; - *openbsd*) $as_echo "#define USE_I386_IOPL 1" >>confdefs.h + *openbsd*) printf "%s\n" "#define USE_I386_IOPL 1" >>confdefs.h SYS_LIBS=-li386 ;; @@ -22517,18 +23858,18 @@ $as_echo "#define USE_ALPHA_PIO 1" >>confdefs.h I386_VIDEO=yes case $host_os in *freebsd*) -$as_echo "#define USE_DEV_IO 1" >>confdefs.h +printf "%s\n" "#define USE_DEV_IO 1" >>confdefs.h ;; *dragonfly*) -$as_echo "#define USE_DEV_IO 1" >>confdefs.h +printf "%s\n" "#define USE_DEV_IO 1" >>confdefs.h ;; *netbsd*) -$as_echo "#define USE_I386_IOPL 1" >>confdefs.h +printf "%s\n" "#define USE_I386_IOPL 1" >>confdefs.h SYS_LIBS=-lx86_64 ;; *openbsd*) -$as_echo "#define USE_AMD64_IOPL 1" >>confdefs.h +printf "%s\n" "#define USE_AMD64_IOPL 1" >>confdefs.h SYS_LIBS=-lamd64 ;; @@ -22637,41 +23978,41 @@ case $host_os in case $host_os in kfreebsd*-gnu) ;; *) -$as_echo "#define CSRG_BASED 1" >>confdefs.h +printf "%s\n" "#define CSRG_BASED 1" >>confdefs.h ;; esac -$as_echo "#define PCCONS_SUPPORT 1" >>confdefs.h +printf "%s\n" "#define PCCONS_SUPPORT 1" >>confdefs.h -$as_echo "#define PCVT_SUPPORT 1" >>confdefs.h +printf "%s\n" "#define PCVT_SUPPORT 1" >>confdefs.h -$as_echo "#define SYSCONS_SUPPORT 1" >>confdefs.h +printf "%s\n" "#define SYSCONS_SUPPORT 1" >>confdefs.h DRI=yes ;; *netbsd*) -$as_echo "#define CSRG_BASED 1" >>confdefs.h +printf "%s\n" "#define CSRG_BASED 1" >>confdefs.h -$as_echo "#define PCCONS_SUPPORT 1" >>confdefs.h +printf "%s\n" "#define PCCONS_SUPPORT 1" >>confdefs.h -$as_echo "#define PCVT_SUPPORT 1" >>confdefs.h +printf "%s\n" "#define PCVT_SUPPORT 1" >>confdefs.h -$as_echo "#define WSCONS_SUPPORT 1" >>confdefs.h +printf "%s\n" "#define WSCONS_SUPPORT 1" >>confdefs.h DRI=yes ;; *openbsd*) -$as_echo "#define CSRG_BASED 1" >>confdefs.h +printf "%s\n" "#define CSRG_BASED 1" >>confdefs.h -$as_echo "#define WSCONS_SUPPORT 1" >>confdefs.h +printf "%s\n" "#define WSCONS_SUPPORT 1" >>confdefs.h # Disable use of SIGIO by default; it breaks multi-card # configurations. We don't want to run thousands of lines of @@ -22686,7 +24027,7 @@ $as_echo "#define WSCONS_SUPPORT 1" >>confdefs.h ;; darwin*) -$as_echo "#define CSRG_BASED 1" >>confdefs.h +printf "%s\n" "#define CSRG_BASED 1" >>confdefs.h ;; cygwin*|mingw*) @@ -22704,94 +24045,107 @@ VENDOR_NAME_SHORT="X.Org" VENDOR_WEB="http://wiki.x.org" # Check whether --enable-werror was given. -if test "${enable_werror+set}" = set; then : +if test ${enable_werror+y} +then : enableval=$enable_werror; as_fn_error $? "--enable-werror has been replaced by --enable-strict-compilation" "$LINENO" 5 fi # Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then : +if test ${enable_debug+y} +then : enableval=$enable_debug; DEBUGGING=$enableval -else +else $as_nop DEBUGGING=no fi # Check whether --with-int10 was given. -if test "${with_int10+set}" = set; then : +if test ${with_int10+y} +then : withval=$with_int10; INT10="$withval" -else +else $as_nop INT10="$DEFAULT_INT10" fi # Check whether --with-vendor-name was given. -if test "${with_vendor_name+set}" = set; then : +if test ${with_vendor_name+y} +then : withval=$with_vendor_name; VENDOR_NAME="$withval" fi # Check whether --with-vendor-name-short was given. -if test "${with_vendor_name_short+set}" = set; then : +if test ${with_vendor_name_short+y} +then : withval=$with_vendor_name_short; VENDOR_NAME_SHORT="$withval" fi # Check whether --with-vendor-web was given. -if test "${with_vendor_web+set}" = set; then : +if test ${with_vendor_web+y} +then : withval=$with_vendor_web; VENDOR_WEB="$withval" fi # Check whether --with-module-dir was given. -if test "${with_module_dir+set}" = set; then : +if test ${with_module_dir+y} +then : withval=$with_module_dir; moduledir="$withval" -else +else $as_nop moduledir="${libdir}/xorg/modules" fi # Check whether --with-log-dir was given. -if test "${with_log_dir+set}" = set; then : +if test ${with_log_dir+y} +then : withval=$with_log_dir; logdir="$withval" -else +else $as_nop logdir="$localstatedir/log" fi # Check whether --with-builder-addr was given. -if test "${with_builder_addr+set}" = set; then : +if test ${with_builder_addr+y} +then : withval=$with_builder_addr; BUILDERADDR="$withval" -else +else $as_nop BUILDERADDR="xorg@lists.freedesktop.org" fi # Check whether --with-builderstring was given. -if test "${with_builderstring+set}" = set; then : +if test ${with_builderstring+y} +then : withval=$with_builderstring; BUILDERSTRING="$withval" fi # Check whether --enable-listen-tcp was given. -if test "${enable_listen_tcp+set}" = set; then : +if test ${enable_listen_tcp+y} +then : enableval=$enable_listen_tcp; LISTEN_TCP=$enableval -else +else $as_nop LISTEN_TCP=no fi # Check whether --enable-listen-unix was given. -if test "${enable_listen_unix+set}" = set; then : +if test ${enable_listen_unix+y} +then : enableval=$enable_listen_unix; LISTEN_UNIX=$enableval -else +else $as_nop LISTEN_UNIX=yes fi # Check whether --enable-listen-local was given. -if test "${enable_listen_local+set}" = set; then : +if test ${enable_listen_local+y} +then : enableval=$enable_listen_local; LISTEN_LOCAL=$enableval -else +else $as_nop LISTEN_LOCAL=yes fi @@ -22806,31 +24160,31 @@ case $host_os in esac # Check whether --with-fallback-input-driver was given. -if test "${with_fallback_input_driver+set}" = set; then : +if test ${with_fallback_input_driver+y} +then : withval=$with_fallback_input_driver; FALLBACK_INPUT_DRIVER=$withval fi if test "x$FALLBACK_INPUT_DRIVER" = "xno"; then FALLBACK_INPUT_DRIVER="" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fallback input driver" >&5 -$as_echo_n "checking for fallback input driver... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FALLBACK_INPUT_DRIVER" >&5 -$as_echo "$FALLBACK_INPUT_DRIVER" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fallback input driver" >&5 +printf %s "checking for fallback input driver... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FALLBACK_INPUT_DRIVER" >&5 +printf "%s\n" "$FALLBACK_INPUT_DRIVER" >&6; } -cat >>confdefs.h <<_ACEOF -#define FALLBACK_INPUT_DRIVER "$FALLBACK_INPUT_DRIVER" -_ACEOF +printf "%s\n" "#define FALLBACK_INPUT_DRIVER \"$FALLBACK_INPUT_DRIVER\"" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for root directory for font files" >&5 -$as_echo_n "checking for root directory for font files... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for root directory for font files" >&5 +printf %s "checking for root directory for font files... " >&6; } # Check whether --with-fontrootdir was given. -if test "${with_fontrootdir+set}" = set; then : +if test ${with_fontrootdir+y} +then : withval=$with_fontrootdir; FONTROOTDIR="$withval" fi @@ -22843,110 +24197,116 @@ fi FONTROOTDIR="${datadir}/fonts/X11" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${FONTROOTDIR}" >&5 -$as_echo "${FONTROOTDIR}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${FONTROOTDIR}" >&5 +printf "%s\n" "${FONTROOTDIR}" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for directory for misc files" >&5 -$as_echo_n "checking for directory for misc files... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for directory for misc files" >&5 +printf %s "checking for directory for misc files... " >&6; } # Check whether --with-fontmiscdir was given. -if test "${with_fontmiscdir+set}" = set; then : +if test ${with_fontmiscdir+y} +then : withval=$with_fontmiscdir; FONTMISCDIR="${withval}" -else +else $as_nop FONTMISCDIR='${FONTROOTDIR}/misc' fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${FONTMISCDIR}" >&5 -$as_echo "${FONTMISCDIR}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${FONTMISCDIR}" >&5 +printf "%s\n" "${FONTMISCDIR}" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for directory for OTF files" >&5 -$as_echo_n "checking for directory for OTF files... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for directory for OTF files" >&5 +printf %s "checking for directory for OTF files... " >&6; } # Check whether --with-fontotfdir was given. -if test "${with_fontotfdir+set}" = set; then : +if test ${with_fontotfdir+y} +then : withval=$with_fontotfdir; FONTOTFDIR="${withval}" -else +else $as_nop FONTOTFDIR='${FONTROOTDIR}/OTF' fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${FONTOTFDIR}" >&5 -$as_echo "${FONTOTFDIR}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${FONTOTFDIR}" >&5 +printf "%s\n" "${FONTOTFDIR}" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for directory for TTF files" >&5 -$as_echo_n "checking for directory for TTF files... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for directory for TTF files" >&5 +printf %s "checking for directory for TTF files... " >&6; } # Check whether --with-fontttfdir was given. -if test "${with_fontttfdir+set}" = set; then : +if test ${with_fontttfdir+y} +then : withval=$with_fontttfdir; FONTTTFDIR="${withval}" -else +else $as_nop FONTTTFDIR='${FONTROOTDIR}/TTF' fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${FONTTTFDIR}" >&5 -$as_echo "${FONTTTFDIR}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${FONTTTFDIR}" >&5 +printf "%s\n" "${FONTTTFDIR}" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for directory for Type1 files" >&5 -$as_echo_n "checking for directory for Type1 files... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for directory for Type1 files" >&5 +printf %s "checking for directory for Type1 files... " >&6; } # Check whether --with-fonttype1dir was given. -if test "${with_fonttype1dir+set}" = set; then : +if test ${with_fonttype1dir+y} +then : withval=$with_fonttype1dir; FONTTYPE1DIR="${withval}" -else +else $as_nop FONTTYPE1DIR='${FONTROOTDIR}/Type1' fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${FONTTYPE1DIR}" >&5 -$as_echo "${FONTTYPE1DIR}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${FONTTYPE1DIR}" >&5 +printf "%s\n" "${FONTTYPE1DIR}" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for directory for 75dpi files" >&5 -$as_echo_n "checking for directory for 75dpi files... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for directory for 75dpi files" >&5 +printf %s "checking for directory for 75dpi files... " >&6; } # Check whether --with-font75dpidir was given. -if test "${with_font75dpidir+set}" = set; then : +if test ${with_font75dpidir+y} +then : withval=$with_font75dpidir; FONT75DPIDIR="${withval}" -else +else $as_nop FONT75DPIDIR='${FONTROOTDIR}/75dpi' fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${FONT75DPIDIR}" >&5 -$as_echo "${FONT75DPIDIR}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${FONT75DPIDIR}" >&5 +printf "%s\n" "${FONT75DPIDIR}" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for directory for 100dpi files" >&5 -$as_echo_n "checking for directory for 100dpi files... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for directory for 100dpi files" >&5 +printf %s "checking for directory for 100dpi files... " >&6; } # Check whether --with-font100dpidir was given. -if test "${with_font100dpidir+set}" = set; then : +if test ${with_font100dpidir+y} +then : withval=$with_font100dpidir; FONT100DPIDIR="${withval}" -else +else $as_nop FONT100DPIDIR='${FONTROOTDIR}/100dpi' fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${FONT100DPIDIR}" >&5 -$as_echo "${FONT100DPIDIR}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${FONT100DPIDIR}" >&5 +printf "%s\n" "${FONT100DPIDIR}" >&6; } DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" @@ -22956,175 +24316,192 @@ esac # Check whether --with-default-font-path was given. -if test "${with_default_font_path+set}" = set; then : +if test ${with_default_font_path+y} +then : withval=$with_default_font_path; FONTPATH="$withval" -else +else $as_nop FONTPATH="${DEFAULT_FONT_PATH}" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for default font path" >&5 -$as_echo_n "checking for default font path... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTPATH" >&5 -$as_echo "$FONTPATH" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for default font path" >&5 +printf %s "checking for default font path... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FONTPATH" >&5 +printf "%s\n" "$FONTPATH" >&6; } # Check whether --with-xkb-path was given. -if test "${with_xkb_path+set}" = set; then : +if test ${with_xkb_path+y} +then : withval=$with_xkb_path; XKBPATH="$withval" -else +else $as_nop XKBPATH="auto" fi # Check whether --with-xkb-output was given. -if test "${with_xkb_output+set}" = set; then : +if test ${with_xkb_output+y} +then : withval=$with_xkb_output; XKBOUTPUT="$withval" -else +else $as_nop XKBOUTPUT="compiled" fi # Check whether --with-default-xkb-rules was given. -if test "${with_default_xkb_rules+set}" = set; then : +if test ${with_default_xkb_rules+y} +then : withval=$with_default_xkb_rules; XKB_DFLT_RULES="$withval" -else +else $as_nop XKB_DFLT_RULES="" fi # Check whether --with-default-xkb-model was given. -if test "${with_default_xkb_model+set}" = set; then : +if test ${with_default_xkb_model+y} +then : withval=$with_default_xkb_model; XKB_DFLT_MODEL="$withval" -else +else $as_nop XKB_DFLT_MODEL="pc105" fi # Check whether --with-default-xkb-layout was given. -if test "${with_default_xkb_layout+set}" = set; then : +if test ${with_default_xkb_layout+y} +then : withval=$with_default_xkb_layout; XKB_DFLT_LAYOUT="$withval" -else +else $as_nop XKB_DFLT_LAYOUT="us" fi # Check whether --with-default-xkb-variant was given. -if test "${with_default_xkb_variant+set}" = set; then : +if test ${with_default_xkb_variant+y} +then : withval=$with_default_xkb_variant; XKB_DFLT_VARIANT="$withval" -else +else $as_nop XKB_DFLT_VARIANT="" fi # Check whether --with-default-xkb-options was given. -if test "${with_default_xkb_options+set}" = set; then : +if test ${with_default_xkb_options+y} +then : withval=$with_default_xkb_options; XKB_DFLT_OPTIONS="$withval" -else +else $as_nop XKB_DFLT_OPTIONS="" fi # Check whether --with-serverconfig-path was given. -if test "${with_serverconfig_path+set}" = set; then : +if test ${with_serverconfig_path+y} +then : withval=$with_serverconfig_path; SERVERCONFIG="$withval" -else +else $as_nop SERVERCONFIG="${libdir}/xorg" fi # Check whether --with-apple-applications-dir was given. -if test "${with_apple_applications_dir+set}" = set; then : +if test ${with_apple_applications_dir+y} +then : withval=$with_apple_applications_dir; APPLE_APPLICATIONS_DIR="${withval}" -else +else $as_nop APPLE_APPLICATIONS_DIR="/Applications/Utilities" fi # Check whether --with-apple-application-name was given. -if test "${with_apple_application_name+set}" = set; then : +if test ${with_apple_application_name+y} +then : withval=$with_apple_application_name; APPLE_APPLICATION_NAME="${withval}" -else +else $as_nop APPLE_APPLICATION_NAME="X11" fi # Check whether --with-bundle-id-prefix was given. -if test "${with_bundle_id_prefix+set}" = set; then : +if test ${with_bundle_id_prefix+y} +then : withval=$with_bundle_id_prefix; BUNDLE_ID_PREFIX="${withval}" fi -cat >>confdefs.h <<_ACEOF -#define BUNDLE_ID_PREFIX "$BUNDLE_ID_PREFIX" -_ACEOF +printf "%s\n" "#define BUNDLE_ID_PREFIX \"$BUNDLE_ID_PREFIX\"" >>confdefs.h # Check whether --with-bundle-version was given. -if test "${with_bundle_version+set}" = set; then : +if test ${with_bundle_version+y} +then : withval=$with_bundle_version; BUNDLE_VERSION="${withval}" -else - BUNDLE_VERSION="21.1.8" +else $as_nop + BUNDLE_VERSION="21.1.9" fi # Check whether --with-bundle-version-string was given. -if test "${with_bundle_version_string+set}" = set; then : +if test ${with_bundle_version_string+y} +then : withval=$with_bundle_version_string; BUNDLE_VERSION_STRING="${withval}" -else +else $as_nop BUNDLE_VERSION_STRING="${PACKAGE_VERSION}" fi # Check whether --enable-sparkle was given. -if test "${enable_sparkle+set}" = set; then : +if test ${enable_sparkle+y} +then : enableval=$enable_sparkle; XQUARTZ_SPARKLE="${enableval}" -else +else $as_nop XQUARTZ_SPARKLE="no" fi # Check whether --with-sparkle-feed-url was given. -if test "${with_sparkle_feed_url+set}" = set; then : +if test ${with_sparkle_feed_url+y} +then : withval=$with_sparkle_feed_url; XQUARTZ_SPARKLE_FEED_URL="${withval}" -else +else $as_nop XQUARTZ_SPARKLE_FEED_URL="https://www.xquartz.org/releases/sparkle/release.xml" fi # Check whether --enable-visibility was given. -if test "${enable_visibility+set}" = set; then : +if test ${enable_visibility+y} +then : enableval=$enable_visibility; SYMBOL_VISIBILITY=$enableval -else +else $as_nop SYMBOL_VISIBILITY=auto fi # Check whether --with-khronos-spec-dir was given. -if test "${with_khronos_spec_dir+set}" = set; then : +if test ${with_khronos_spec_dir+y} +then : withval=$with_khronos_spec_dir; KHRONOS_SPEC_DIR="${withval}" -else +else $as_nop KHRONOS_SPEC_DIR=auto fi # Check whether --enable-privsep was given. -if test "${enable_privsep+set}" = set; then : +if test ${enable_privsep+y} +then : enableval=$enable_privsep; ENABLE_PRIVSEP="$enableval" -else +else $as_nop ENABLE_PRIVSEP="no" fi if test x$ENABLE_PRIVSEP = xyes ; then -$as_echo "#define X_PRIVSEP 1" >>confdefs.h +printf "%s\n" "#define X_PRIVSEP 1" >>confdefs.h fi if test x$ENABLE_PRIVSEP = xyes; then @@ -23137,372 +24514,424 @@ fi # Check whether --enable-composite was given. -if test "${enable_composite+set}" = set; then : +if test ${enable_composite+y} +then : enableval=$enable_composite; COMPOSITE=$enableval -else +else $as_nop COMPOSITE=yes fi # Check whether --enable-mitshm was given. -if test "${enable_mitshm+set}" = set; then : +if test ${enable_mitshm+y} +then : enableval=$enable_mitshm; MITSHM=$enableval -else +else $as_nop MITSHM=auto fi # Check whether --enable-xres was given. -if test "${enable_xres+set}" = set; then : +if test ${enable_xres+y} +then : enableval=$enable_xres; RES=$enableval -else +else $as_nop RES=yes fi # Check whether --enable-record was given. -if test "${enable_record+set}" = set; then : +if test ${enable_record+y} +then : enableval=$enable_record; RECORD=$enableval -else +else $as_nop RECORD=yes fi # Check whether --enable-xv was given. -if test "${enable_xv+set}" = set; then : +if test ${enable_xv+y} +then : enableval=$enable_xv; XV=$enableval -else +else $as_nop XV=yes fi # Check whether --enable-xvmc was given. -if test "${enable_xvmc+set}" = set; then : +if test ${enable_xvmc+y} +then : enableval=$enable_xvmc; XVMC=$enableval -else +else $as_nop XVMC=yes fi # Check whether --enable-dga was given. -if test "${enable_dga+set}" = set; then : +if test ${enable_dga+y} +then : enableval=$enable_dga; DGA=$enableval -else +else $as_nop DGA=auto fi # Check whether --enable-screensaver was given. -if test "${enable_screensaver+set}" = set; then : +if test ${enable_screensaver+y} +then : enableval=$enable_screensaver; SCREENSAVER=$enableval -else +else $as_nop SCREENSAVER=yes fi # Check whether --enable-xdmcp was given. -if test "${enable_xdmcp+set}" = set; then : +if test ${enable_xdmcp+y} +then : enableval=$enable_xdmcp; XDMCP=$enableval -else +else $as_nop XDMCP=auto fi # Check whether --enable-xdm-auth-1 was given. -if test "${enable_xdm_auth_1+set}" = set; then : +if test ${enable_xdm_auth_1+y} +then : enableval=$enable_xdm_auth_1; XDMAUTH=$enableval -else +else $as_nop XDMAUTH=auto fi # Check whether --enable-glx was given. -if test "${enable_glx+set}" = set; then : +if test ${enable_glx+y} +then : enableval=$enable_glx; GLX=$enableval -else +else $as_nop GLX=yes fi # Check whether --enable-dri was given. -if test "${enable_dri+set}" = set; then : +if test ${enable_dri+y} +then : enableval=$enable_dri; DRI=$enableval fi # Check whether --enable-dri2 was given. -if test "${enable_dri2+set}" = set; then : +if test ${enable_dri2+y} +then : enableval=$enable_dri2; DRI2=$enableval -else +else $as_nop DRI2=auto fi # Check whether --enable-dri3 was given. -if test "${enable_dri3+set}" = set; then : +if test ${enable_dri3+y} +then : enableval=$enable_dri3; DRI3=$enableval -else +else $as_nop DRI3=auto fi # Check whether --enable-present was given. -if test "${enable_present+set}" = set; then : +if test ${enable_present+y} +then : enableval=$enable_present; PRESENT=$enableval -else +else $as_nop PRESENT=yes fi # Check whether --enable-xinerama was given. -if test "${enable_xinerama+set}" = set; then : +if test ${enable_xinerama+y} +then : enableval=$enable_xinerama; XINERAMA=$enableval -else +else $as_nop XINERAMA=yes fi # Check whether --enable-xf86vidmode was given. -if test "${enable_xf86vidmode+set}" = set; then : +if test ${enable_xf86vidmode+y} +then : enableval=$enable_xf86vidmode; XF86VIDMODE=$enableval -else +else $as_nop XF86VIDMODE=auto fi # Check whether --enable-xace was given. -if test "${enable_xace+set}" = set; then : +if test ${enable_xace+y} +then : enableval=$enable_xace; XACE=$enableval -else +else $as_nop XACE=yes fi # Check whether --enable-xselinux was given. -if test "${enable_xselinux+set}" = set; then : +if test ${enable_xselinux+y} +then : enableval=$enable_xselinux; XSELINUX=$enableval -else +else $as_nop XSELINUX=no fi # Check whether --enable-xcsecurity was given. -if test "${enable_xcsecurity+set}" = set; then : +if test ${enable_xcsecurity+y} +then : enableval=$enable_xcsecurity; XCSECURITY=$enableval -else +else $as_nop XCSECURITY=no fi # Check whether --enable-dbe was given. -if test "${enable_dbe+set}" = set; then : +if test ${enable_dbe+y} +then : enableval=$enable_dbe; DBE=$enableval -else +else $as_nop DBE=yes fi # Check whether --enable-xf86bigfont was given. -if test "${enable_xf86bigfont+set}" = set; then : +if test ${enable_xf86bigfont+y} +then : enableval=$enable_xf86bigfont; XF86BIGFONT=$enableval -else +else $as_nop XF86BIGFONT=no fi # Check whether --enable-dpms was given. -if test "${enable_dpms+set}" = set; then : +if test ${enable_dpms+y} +then : enableval=$enable_dpms; DPMSExtension=$enableval -else +else $as_nop DPMSExtension=yes fi # Check whether --enable-config-udev was given. -if test "${enable_config_udev+set}" = set; then : +if test ${enable_config_udev+y} +then : enableval=$enable_config_udev; CONFIG_UDEV=$enableval -else +else $as_nop CONFIG_UDEV=auto fi # Check whether --enable-config-udev-kms was given. -if test "${enable_config_udev_kms+set}" = set; then : +if test ${enable_config_udev_kms+y} +then : enableval=$enable_config_udev_kms; CONFIG_UDEV_KMS=$enableval -else +else $as_nop CONFIG_UDEV_KMS=auto fi # Check whether --enable-config-kevent-kms was given. -if test "${enable_config_kevent_kms+set}" = set; then : +if test ${enable_config_kevent_kms+y} +then : enableval=$enable_config_kevent_kms; CONFIG_KEVENT_KMS=$enableval -else +else $as_nop CONFIG_KEVENT_KMS=auto fi # Check whether --enable-config-hal was given. -if test "${enable_config_hal+set}" = set; then : +if test ${enable_config_hal+y} +then : enableval=$enable_config_hal; CONFIG_HAL=$enableval -else +else $as_nop CONFIG_HAL=auto fi # Check whether --enable-config-wscons was given. -if test "${enable_config_wscons+set}" = set; then : +if test ${enable_config_wscons+y} +then : enableval=$enable_config_wscons; CONFIG_WSCONS=$enableval -else +else $as_nop CONFIG_WSCONS=auto fi # Check whether --enable-xfree86-utils was given. -if test "${enable_xfree86_utils+set}" = set; then : +if test ${enable_xfree86_utils+y} +then : enableval=$enable_xfree86_utils; XF86UTILS=$enableval -else +else $as_nop XF86UTILS=yes fi # Check whether --enable-vgahw was given. -if test "${enable_vgahw+set}" = set; then : +if test ${enable_vgahw+y} +then : enableval=$enable_vgahw; VGAHW=$enableval -else +else $as_nop VGAHW=yes fi # Check whether --enable-int10-module was given. -if test "${enable_int10_module+set}" = set; then : +if test ${enable_int10_module+y} +then : enableval=$enable_int10_module; INT10MODULE=$enableval -else +else $as_nop INT10MODULE=yes fi # Check whether --enable-windowsdri was given. -if test "${enable_windowsdri+set}" = set; then : +if test ${enable_windowsdri+y} +then : enableval=$enable_windowsdri; WINDOWSDRI=$enableval -else +else $as_nop WINDOWSDRI=auto fi # Check whether --enable-libdrm was given. -if test "${enable_libdrm+set}" = set; then : +if test ${enable_libdrm+y} +then : enableval=$enable_libdrm; DRM=$enableval -else +else $as_nop DRM=yes fi # Check whether --enable-clientids was given. -if test "${enable_clientids+set}" = set; then : +if test ${enable_clientids+y} +then : enableval=$enable_clientids; CLIENTIDS=$enableval -else +else $as_nop CLIENTIDS=yes fi # Check whether --enable-pciaccess was given. -if test "${enable_pciaccess+set}" = set; then : +if test ${enable_pciaccess+y} +then : enableval=$enable_pciaccess; PCI=$enableval -else +else $as_nop PCI=yes fi # Check whether --enable-linux_acpi was given. -if test "${enable_linux_acpi+set}" = set; then : +if test ${enable_linux_acpi+y} +then : enableval=$enable_linux_acpi; enable_linux_acpi=$enableval -else +else $as_nop enable_linux_acpi=yes fi # Check whether --enable-linux_apm was given. -if test "${enable_linux_apm+set}" = set; then : +if test ${enable_linux_apm+y} +then : enableval=$enable_linux_apm; enable_linux_apm=$enableval -else +else $as_nop enable_linux_apm=yes fi # Check whether --enable-systemd-logind was given. -if test "${enable_systemd_logind+set}" = set; then : +if test ${enable_systemd_logind+y} +then : enableval=$enable_systemd_logind; SYSTEMD_LOGIND=$enableval -else +else $as_nop SYSTEMD_LOGIND=auto fi # Check whether --enable-suid-wrapper was given. -if test "${enable_suid_wrapper+set}" = set; then : +if test ${enable_suid_wrapper+y} +then : enableval=$enable_suid_wrapper; SUID_WRAPPER=$enableval -else +else $as_nop SUID_WRAPPER=no fi # Check whether --enable-xorg was given. -if test "${enable_xorg+set}" = set; then : +if test ${enable_xorg+y} +then : enableval=$enable_xorg; XORG=$enableval -else +else $as_nop XORG=auto fi # Check whether --enable-xvfb was given. -if test "${enable_xvfb+set}" = set; then : +if test ${enable_xvfb+y} +then : enableval=$enable_xvfb; XVFB=$enableval -else +else $as_nop XVFB=yes fi # Check whether --enable-xnest was given. -if test "${enable_xnest+set}" = set; then : +if test ${enable_xnest+y} +then : enableval=$enable_xnest; XNEST=$enableval -else +else $as_nop XNEST=auto fi # Check whether --enable-xquartz was given. -if test "${enable_xquartz+set}" = set; then : +if test ${enable_xquartz+y} +then : enableval=$enable_xquartz; XQUARTZ=$enableval -else +else $as_nop XQUARTZ=auto fi # Check whether --enable-standalone-xpbproxy was given. -if test "${enable_standalone_xpbproxy+set}" = set; then : +if test ${enable_standalone_xpbproxy+y} +then : enableval=$enable_standalone_xpbproxy; STANDALONE_XPBPROXY=$enableval -else +else $as_nop STANDALONE_XPBPROXY=no fi # Check whether --enable-xwin was given. -if test "${enable_xwin+set}" = set; then : +if test ${enable_xwin+y} +then : enableval=$enable_xwin; XWIN=$enableval -else +else $as_nop XWIN=auto fi # Check whether --enable-glamor was given. -if test "${enable_glamor+set}" = set; then : +if test ${enable_glamor+y} +then : enableval=$enable_glamor; GLAMOR=$enableval -else +else $as_nop GLAMOR=auto fi # Check whether --enable-xf86-input-inputtest was given. -if test "${enable_xf86_input_inputtest+set}" = set; then : +if test ${enable_xf86_input_inputtest+y} +then : enableval=$enable_xf86_input_inputtest; XORG_DRIVER_INPUT_INPUTTEST=$enableval -else +else $as_nop XORG_DRIVER_INPUT_INPUTTEST=yes fi # Check whether --enable-kdrive was given. -if test "${enable_kdrive+set}" = set; then : +if test ${enable_kdrive+y} +then : enableval=$enable_kdrive; KDRIVE=$enableval -else +else $as_nop KDRIVE=no fi # Check whether --enable-xephyr was given. -if test "${enable_xephyr+set}" = set; then : +if test ${enable_xephyr+y} +then : enableval=$enable_xephyr; XEPHYR=$enableval -else +else $as_nop XEPHYR=auto fi # Check whether --enable-libunwind was given. -if test "${enable_libunwind+set}" = set; then : +if test ${enable_libunwind+y} +then : enableval=$enable_libunwind; LIBUNWIND="$enableval" -else +else $as_nop LIBUNWIND="auto" fi # Check whether --enable-xshmfence was given. -if test "${enable_xshmfence+set}" = set; then : +if test ${enable_xshmfence+y} +then : enableval=$enable_xshmfence; XSHMFENCE="$enableval" -else +else $as_nop XSHMFENCE="auto" fi # Check whether --enable-install-setuid was given. -if test "${enable_install_setuid+set}" = set; then : +if test ${enable_install_setuid+y} +then : enableval=$enable_install_setuid; SETUID=$enableval -else +else $as_nop SETUID=auto fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if we can install the Xorg server as root" >&5 -$as_echo_n "checking to see if we can install the Xorg server as root... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking to see if we can install the Xorg server as root" >&5 +printf %s "checking to see if we can install the Xorg server as root... " >&6; } if test "x$SETUID" = "xauto" ; then case $host_os in cygwin*) SETUID="no" ;; @@ -23520,8 +24949,8 @@ if test "x$SETUID" = "xauto" ; then rm -f testfile fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SETUID" >&5 -$as_echo "$SETUID" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SETUID" >&5 +printf "%s\n" "$SETUID" >&6; } if test "x$SETUID" = "xyes"; then INSTALL_SETUID_TRUE= INSTALL_SETUID_FALSE='#' @@ -23541,43 +24970,46 @@ fi *) unixdef="yes" ;; esac # Check whether --enable-unix-transport was given. -if test "${enable_unix_transport+set}" = set; then : +if test ${enable_unix_transport+y} +then : enableval=$enable_unix_transport; UNIXCONN=$enableval -else +else $as_nop UNIXCONN=$unixdef fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support UNIX socket connections" >&5 -$as_echo_n "checking if Xtrans should support UNIX socket connections... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support UNIX socket connections" >&5 +printf %s "checking if Xtrans should support UNIX socket connections... " >&6; } if test "$UNIXCONN" = "yes"; then -$as_echo "#define UNIXCONN 1" >>confdefs.h +printf "%s\n" "#define UNIXCONN 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNIXCONN" >&5 -$as_echo "$UNIXCONN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $UNIXCONN" >&5 +printf "%s\n" "$UNIXCONN" >&6; } # Check whether --enable-tcp-transport was given. -if test "${enable_tcp_transport+set}" = set; then : +if test ${enable_tcp_transport+y} +then : enableval=$enable_tcp_transport; TCPCONN=$enableval -else +else $as_nop TCPCONN=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support TCP socket connections" >&5 -$as_echo_n "checking if Xtrans should support TCP socket connections... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCPCONN" >&5 -$as_echo "$TCPCONN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support TCP socket connections" >&5 +printf %s "checking if Xtrans should support TCP socket connections... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TCPCONN" >&5 +printf "%s\n" "$TCPCONN" >&6; } if test "$TCPCONN" = "yes"; then -$as_echo "#define TCPCONN 1" >>confdefs.h +printf "%s\n" "#define TCPCONN 1" >>confdefs.h # SVR4 hides these in libraries other than libc - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5 -$as_echo_n "checking for library containing socket... " >&6; } -if ${ac_cv_search_socket+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5 +printf %s "checking for library containing socket... " >&6; } +if test ${ac_cv_search_socket+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -23585,55 +25017,58 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char socket (); int -main () +main (void) { return socket (); ; return 0; } _ACEOF -for ac_lib in '' socket; do +for ac_lib in '' socket +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_socket=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_socket+:} false; then : + if test ${ac_cv_search_socket+y} +then : break fi done -if ${ac_cv_search_socket+:} false; then : +if test ${ac_cv_search_socket+y} +then : -else +else $as_nop ac_cv_search_socket=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5 -$as_echo "$ac_cv_search_socket" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5 +printf "%s\n" "$ac_cv_search_socket" >&6; } ac_res=$ac_cv_search_socket -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 -$as_echo_n "checking for library containing gethostbyname... " >&6; } -if ${ac_cv_search_gethostbyname+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 +printf %s "checking for library containing gethostbyname... " >&6; } +if test ${ac_cv_search_gethostbyname+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -23641,56 +25076,59 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char gethostbyname (); int -main () +main (void) { return gethostbyname (); ; return 0; } _ACEOF -for ac_lib in '' nsl; do +for ac_lib in '' nsl +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_gethostbyname=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_gethostbyname+:} false; then : + if test ${ac_cv_search_gethostbyname+y} +then : break fi done -if ${ac_cv_search_gethostbyname+:} false; then : +if test ${ac_cv_search_gethostbyname+y} +then : -else +else $as_nop ac_cv_search_gethostbyname=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5 -$as_echo "$ac_cv_search_gethostbyname" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5 +printf "%s\n" "$ac_cv_search_gethostbyname" >&6; } ac_res=$ac_cv_search_gethostbyname -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi if test "$ac_cv_search_socket$ac_cv_search_gethostbyname" = "nono"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lws2_32" >&5 -$as_echo_n "checking for main in -lws2_32... " >&6; } -if ${ac_cv_lib_ws2_32_main+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lws2_32" >&5 +printf %s "checking for main in -lws2_32... " >&6; } +if test ${ac_cv_lib_ws2_32_main+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lws2_32 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -23698,28 +25136,28 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int -main () +main (void) { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_ws2_32_main=yes -else +else $as_nop ac_cv_lib_ws2_32_main=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_main" >&5 -$as_echo "$ac_cv_lib_ws2_32_main" >&6; } -if test "x$ac_cv_lib_ws2_32_main" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBWS2_32 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_main" >&5 +printf "%s\n" "$ac_cv_lib_ws2_32_main" >&6; } +if test "x$ac_cv_lib_ws2_32_main" = xyes +then : + printf "%s\n" "#define HAVE_LIBWS2_32 1" >>confdefs.h LIBS="-lws2_32 $LIBS" @@ -23729,27 +25167,29 @@ fi # Needs to come after above checks for libsocket & libnsl for SVR4 systems # Check whether --enable-ipv6 was given. -if test "${enable_ipv6+set}" = set; then : +if test ${enable_ipv6+y} +then : enableval=$enable_ipv6; IPV6CONN=$enableval -else +else $as_nop ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" -if test "x$ac_cv_func_getaddrinfo" = xyes; then : +if test "x$ac_cv_func_getaddrinfo" = xyes +then : IPV6CONN=yes -else +else $as_nop IPV6CONN=no fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if IPv6 support should be built" >&5 -$as_echo_n "checking if IPv6 support should be built... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if IPv6 support should be built" >&5 +printf %s "checking if IPv6 support should be built... " >&6; } if test "$IPV6CONN" = "yes"; then -$as_echo "#define IPv6 1" >>confdefs.h +printf "%s\n" "#define IPv6 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IPV6CONN" >&5 -$as_echo "$IPV6CONN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $IPV6CONN" >&5 +printf "%s\n" "$IPV6CONN" >&6; } # 4.3BSD-Reno added a new member to struct sockaddr_in ac_fn_c_check_member "$LINENO" "struct sockaddr_in" "sin_len" "ac_cv_member_struct_sockaddr_in_sin_len" " @@ -23758,9 +25198,10 @@ $as_echo "$IPV6CONN" >&6; } #include <netinet/in.h> " -if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = xyes; then : +if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = xyes +then : -$as_echo "#define BSD44SOCKETS 1" >>confdefs.h +printf "%s\n" "#define BSD44SOCKETS 1" >>confdefs.h fi @@ -23770,11 +25211,10 @@ fi $ac_includes_default #include <sys/socket.h> " -if test "x$ac_cv_type_socklen_t" = xyes; then : +if test "x$ac_cv_type_socklen_t" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_SOCKLEN_T 1 -_ACEOF +printf "%s\n" "#define HAVE_SOCKLEN_T 1" >>confdefs.h fi @@ -23787,24 +25227,26 @@ $ac_includes_default #include <sys/socket.h> " -if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes; then : +if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes +then : fi # First try for Solaris in C99 compliant mode, which requires XPG6/UNIX03 if test "x$ac_cv_member_struct_msghdr_msg_control" = xno; then unset ac_cv_member_struct_msghdr_msg_control - { $as_echo "$as_me:${as_lineno-$LINENO}: trying again with _XOPEN_SOURCE=600" >&5 -$as_echo "$as_me: trying again with _XOPEN_SOURCE=600" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying again with _XOPEN_SOURCE=600" >&5 +printf "%s\n" "$as_me: trying again with _XOPEN_SOURCE=600" >&6;} ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_control" "ac_cv_member_struct_msghdr_msg_control" " #define _XOPEN_SOURCE 600 $ac_includes_default #include <sys/socket.h> " -if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes; then : +if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes +then : -$as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h +printf "%s\n" "#define _XOPEN_SOURCE 600" >>confdefs.h fi @@ -23813,17 +25255,18 @@ fi # If that didn't work, fall back to XPG5/UNIX98 with C89 if test "x$ac_cv_member_struct_msghdr_msg_control" = xno; then unset ac_cv_member_struct_msghdr_msg_control - { $as_echo "$as_me:${as_lineno-$LINENO}: trying again with _XOPEN_SOURCE=500" >&5 -$as_echo "$as_me: trying again with _XOPEN_SOURCE=500" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying again with _XOPEN_SOURCE=500" >&5 +printf "%s\n" "$as_me: trying again with _XOPEN_SOURCE=500" >&6;} ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_control" "ac_cv_member_struct_msghdr_msg_control" " #define _XOPEN_SOURCE 500 $ac_includes_default #include <sys/socket.h> " -if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes; then : +if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes +then : -$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h +printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h fi @@ -23834,38 +25277,40 @@ fi fi case $host_os in - solaris*|sco*|sysv4*) localdef="yes" ;; + solaris*) localdef="yes" ;; *) localdef="no" ;; esac # Check whether --enable-local-transport was given. -if test "${enable_local_transport+set}" = set; then : +if test ${enable_local_transport+y} +then : enableval=$enable_local_transport; LOCALCONN=$enableval -else +else $as_nop LOCALCONN=$localdef fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support os-specific local connections" >&5 -$as_echo_n "checking if Xtrans should support os-specific local connections... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCALCONN" >&5 -$as_echo "$LOCALCONN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support os-specific local connections" >&5 +printf %s "checking if Xtrans should support os-specific local connections... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LOCALCONN" >&5 +printf "%s\n" "$LOCALCONN" >&6; } if test "$LOCALCONN" = "yes"; then -$as_echo "#define LOCALCONN 1" >>confdefs.h +printf "%s\n" "#define LOCALCONN 1" >>confdefs.h fi # Other functions Xtrans may need - for ac_func in strcasecmp strlcpy -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" +if test "x$ac_cv_func_strcasecmp" = xyes +then : + printf "%s\n" "#define HAVE_STRCASECMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy" +if test "x$ac_cv_func_strlcpy" = xyes +then : + printf "%s\n" "#define HAVE_STRLCPY 1" >>confdefs.h fi -done @@ -23873,38 +25318,42 @@ done # Secure RPC detection macro from xtrans.m4 # Check whether --enable-secure-rpc was given. -if test "${enable_secure_rpc+set}" = set; then : +if test ${enable_secure_rpc+y} +then : enableval=$enable_secure_rpc; SECURE_RPC=$enableval -else +else $as_nop SECURE_RPC="try" fi if test "x$SECURE_RPC" = "xyes" -o "x$SECURE_RPC" = "xtry" ; then FOUND_SECURE_RPC="no" - for ac_func in authdes_seccreate authdes_create + + for ac_func in authdes_seccreate authdes_create do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +if eval test \"x\$"$as_ac_var"\" = x"yes" +then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `printf "%s\n" "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF FOUND_SECURE_RPC="yes" fi -done +done if test "x$FOUND_SECURE_RPC" = "xno" ; then if test "x$SECURE_RPC" = "xyes" ; then as_fn_error $? "Secure RPC requested, but required functions not found" "$LINENO" 5 fi SECURE_RPC="no" else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getsecretkey" >&5 -$as_echo_n "checking for library containing getsecretkey... " >&6; } -if ${ac_cv_search_getsecretkey+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing getsecretkey" >&5 +printf %s "checking for library containing getsecretkey... " >&6; } +if test ${ac_cv_search_getsecretkey+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -23912,46 +25361,48 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char getsecretkey (); int -main () +main (void) { return getsecretkey (); ; return 0; } _ACEOF -for ac_lib in '' rpcsvc; do +for ac_lib in '' rpcsvc +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_getsecretkey=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_getsecretkey+:} false; then : + if test ${ac_cv_search_getsecretkey+y} +then : break fi done -if ${ac_cv_search_getsecretkey+:} false; then : +if test ${ac_cv_search_getsecretkey+y} +then : -else +else $as_nop ac_cv_search_getsecretkey=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getsecretkey" >&5 -$as_echo "$ac_cv_search_getsecretkey" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getsecretkey" >&5 +printf "%s\n" "$ac_cv_search_getsecretkey" >&6; } ac_res=$ac_cv_search_getsecretkey -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -23959,15 +25410,15 @@ fi SECURE_RPC="yes" fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Secure RPC authentication (\"SUN-DES-1\") should be supported" >&5 -$as_echo_n "checking if Secure RPC authentication (\"SUN-DES-1\") should be supported... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Secure RPC authentication (\"SUN-DES-1\") should be supported" >&5 +printf %s "checking if Secure RPC authentication (\"SUN-DES-1\") should be supported... " >&6; } if test "x$SECURE_RPC" = "xyes" ; then -$as_echo "#define SECURE_RPC 1" >>confdefs.h +printf "%s\n" "#define SECURE_RPC 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SECURE_RPC" >&5 -$as_echo "$SECURE_RPC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SECURE_RPC" >&5 +printf "%s\n" "$SECURE_RPC" >&6; } if test "x$SECURE_RPC" = xyes; then SECURE_RPC_TRUE= @@ -24029,11 +25480,12 @@ case $host_os in DRI3=no if test x$XQUARTZ = xauto; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xquartz" >&5 -$as_echo_n "checking whether to build Xquartz... " >&6; } -if ${xorg_cv_Carbon_framework+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build Xquartz" >&5 +printf %s "checking whether to build Xquartz... " >&6; } +if test ${xorg_cv_Carbon_framework+y} +then : + printf %s "(cached) " >&6 +else $as_nop save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -framework Carbon" @@ -24041,17 +25493,18 @@ else /* end confdefs.h. */ char FSFindFolder(); int main() { FSFindFolder(); return 0;} _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : xorg_cv_Carbon_framework=yes -else +else $as_nop xorg_cv_Carbon_framework=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_Carbon_framework" >&5 -$as_echo "$xorg_cv_Carbon_framework" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_Carbon_framework" >&5 +printf "%s\n" "$xorg_cv_Carbon_framework" >&6; } if test "X$xorg_cv_Carbon_framework" = Xyes; then XQUARTZ=yes @@ -24130,17 +25583,17 @@ LIBXCVT="libxcvt" pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBPIXMAN" >&5 -$as_echo_n "checking for $LIBPIXMAN... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LIBPIXMAN" >&5 +printf %s "checking for $LIBPIXMAN... " >&6; } if test -n "$PIXMAN_CFLAGS"; then pkg_cv_PIXMAN_CFLAGS="$PIXMAN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPIXMAN\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPIXMAN\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBPIXMAN") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PIXMAN_CFLAGS=`$PKG_CONFIG --cflags "$LIBPIXMAN" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24154,10 +25607,10 @@ if test -n "$PIXMAN_LIBS"; then pkg_cv_PIXMAN_LIBS="$PIXMAN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPIXMAN\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPIXMAN\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBPIXMAN") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PIXMAN_LIBS=`$PKG_CONFIG --libs "$LIBPIXMAN" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24171,8 +25624,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -24198,10 +25651,10 @@ Alternatively, you may set the environment variables PIXMAN_CFLAGS and PIXMAN_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -24215,8 +25668,8 @@ See \`config.log' for more details" "$LINENO" 5; } else PIXMAN_CFLAGS=$pkg_cv_PIXMAN_CFLAGS PIXMAN_LIBS=$pkg_cv_PIXMAN_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau" @@ -24225,15 +25678,15 @@ SDK_REQUIRED_MODULES="$XPROTO $RANDRPROTO $RENDERPROTO $XEXTPROTO $INPUTPROTO $K # Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc -ac_fn_c_check_decl "$LINENO" "PTHREAD_MUTEX_RECURSIVE" "ac_cv_have_decl_PTHREAD_MUTEX_RECURSIVE" "#include <pthread.h> -" -if test "x$ac_cv_have_decl_PTHREAD_MUTEX_RECURSIVE" = xyes; then : +ac_fn_check_decl "$LINENO" "PTHREAD_MUTEX_RECURSIVE" "ac_cv_have_decl_PTHREAD_MUTEX_RECURSIVE" "#include <pthread.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_PTHREAD_MUTEX_RECURSIVE" = xyes +then : HAVE_RECURSIVE_MUTEX=yes -else +else $as_nop HAVE_RECURSIVE_MUTEX=no fi - THREAD_DEFAULT=no if test "x$HAVE_RECURSIVE_MUTEX" = "xyes" ; then @@ -24246,9 +25699,10 @@ case $host_os in esac # Check whether --enable-input-thread was given. -if test "${enable_input_thread+set}" = set; then : +if test ${enable_input_thread+y} +then : enableval=$enable_input_thread; INPUTTHREAD=$enableval -else +else $as_nop INPUTTHREAD=$THREAD_DEFAULT fi @@ -24276,33 +25730,31 @@ if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then CFLAGS="$CFLAGS $PTHREAD_CFLAGS" save_LIBS="$LIBS" LIBS="$PTHREAD_LIBS $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 -$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 +printf %s "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char pthread_join (); int -main () +main (void) { return pthread_join (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ax_pthread_ok=yes fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 -$as_echo "$ax_pthread_ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 +printf "%s\n" "$ax_pthread_ok" >&6; } if test x"$ax_pthread_ok" = xno; then PTHREAD_LIBS="" PTHREAD_CFLAGS="" @@ -24371,8 +25823,8 @@ esac # -Werror. We throw in some extra Clang-specific options to ensure that # this doesn't happen for GCC, which also accepts -Werror. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler needs -Werror to reject unknown flags" >&5 -$as_echo_n "checking if compiler needs -Werror to reject unknown flags... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler needs -Werror to reject unknown flags" >&5 +printf %s "checking if compiler needs -Werror to reject unknown flags... " >&6; } save_CFLAGS="$CFLAGS" ax_pthread_extra_flags="-Werror" CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument" @@ -24380,22 +25832,23 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo(void); int -main () +main (void) { foo() ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop ax_pthread_extra_flags= - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS="$save_CFLAGS" if test x"$ax_pthread_ok" = xno; then @@ -24403,24 +25856,25 @@ for flag in $ax_pthread_flags; do case $flag in none) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 -$as_echo_n "checking whether pthreads work without any flags... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 +printf %s "checking whether pthreads work without any flags... " >&6; } ;; -*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 -$as_echo_n "checking whether pthreads work with $flag... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 +printf %s "checking whether pthreads work with $flag... " >&6; } PTHREAD_CFLAGS="$flag" ;; pthread-config) # Extract the first word of "pthread-config", so it can be a program name with args. set dummy pthread-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ax_pthread_config+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ax_pthread_config+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ax_pthread_config"; then ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test. else @@ -24428,11 +25882,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ax_pthread_config="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -24444,11 +25902,11 @@ fi fi ax_pthread_config=$ac_cv_prog_ax_pthread_config if test -n "$ax_pthread_config"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5 -$as_echo "$ax_pthread_config" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5 +printf "%s\n" "$ax_pthread_config" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -24458,8 +25916,8 @@ fi ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 -$as_echo_n "checking for the pthreads library -l$flag... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 +printf %s "checking for the pthreads library -l$flag... " >&6; } PTHREAD_LIBS="-l$flag" ;; esac @@ -24484,7 +25942,7 @@ $as_echo_n "checking for the pthreads library -l$flag... " >&6; } static void routine(void *a) { a = 0; } static void *start_routine(void *a) { return a; } int -main () +main (void) { pthread_t th; pthread_attr_t attr; pthread_create(&th, 0, start_routine, 0); @@ -24496,17 +25954,18 @@ pthread_t th; pthread_attr_t attr; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ax_pthread_ok=yes fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 -$as_echo "$ax_pthread_ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 +printf "%s\n" "$ax_pthread_ok" >&6; } if test "x$ax_pthread_ok" = xyes; then break; fi @@ -24524,39 +25983,38 @@ if test "x$ax_pthread_ok" = xyes; then CFLAGS="$CFLAGS $PTHREAD_CFLAGS" # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 -$as_echo_n "checking for joinable pthread attribute... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 +printf %s "checking for joinable pthread attribute... " >&6; } attr_name=unknown for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> int -main () +main (void) { int attr = $attr; return attr /* ; */ ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : attr_name=$attr; break fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 -$as_echo "$attr_name" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 +printf "%s\n" "$attr_name" >&6; } if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then -cat >>confdefs.h <<_ACEOF -#define PTHREAD_CREATE_JOINABLE $attr_name -_ACEOF +printf "%s\n" "#define PTHREAD_CREATE_JOINABLE $attr_name" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 -$as_echo_n "checking if more special flags are required for pthreads... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 +printf %s "checking if more special flags are required for pthreads... " >&6; } flag=no case ${host_os} in aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; @@ -24570,43 +26028,46 @@ $as_echo_n "checking if more special flags are required for pthreads... " >&6; } fi ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag" >&5 -$as_echo "$flag" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $flag" >&5 +printf "%s\n" "$flag" >&6; } if test "x$flag" != xno; then PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5 -$as_echo_n "checking for PTHREAD_PRIO_INHERIT... " >&6; } -if ${ax_cv_PTHREAD_PRIO_INHERIT+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5 +printf %s "checking for PTHREAD_PRIO_INHERIT... " >&6; } +if test ${ax_cv_PTHREAD_PRIO_INHERIT+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> int -main () +main (void) { int i = PTHREAD_PRIO_INHERIT; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ax_cv_PTHREAD_PRIO_INHERIT=yes -else +else $as_nop ax_cv_PTHREAD_PRIO_INHERIT=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5 -$as_echo "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; } - if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5 +printf "%s\n" "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; } + if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" +then : -$as_echo "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h +printf "%s\n" "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h fi @@ -24622,7 +26083,8 @@ fi #handle absolute path differently from PATH based program lookup case "x$CC" in #( x/*) : - if as_fn_executable_p ${CC}_r; then : + if as_fn_executable_p ${CC}_r +then : PTHREAD_CC="${CC}_r" fi ;; #( *) : @@ -24630,11 +26092,12 @@ fi ;; #( do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_PTHREAD_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_PTHREAD_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$PTHREAD_CC"; then ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. else @@ -24642,11 +26105,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_PTHREAD_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -24657,11 +26124,11 @@ fi fi PTHREAD_CC=$ac_cv_prog_PTHREAD_CC if test -n "$PTHREAD_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 -$as_echo "$PTHREAD_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 +printf "%s\n" "$PTHREAD_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -24687,7 +26154,7 @@ test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: if test x"$ax_pthread_ok" = xyes; then -$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h +printf "%s\n" "#define HAVE_PTHREAD 1" >>confdefs.h : else @@ -24704,60 +26171,62 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu SYS_LIBS="$SYS_LIBS $PTHREAD_LIBS" CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -$as_echo "#define INPUTTHREAD 1" >>confdefs.h +printf "%s\n" "#define INPUTTHREAD 1" >>confdefs.h save_LIBS="$LIBS" LIBS="$LIBS $SYS_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_setname_np(const char*)" >&5 -$as_echo_n "checking for pthread_setname_np(const char*)... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_setname_np(const char*)" >&5 +printf %s "checking for pthread_setname_np(const char*)... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> int -main () +main (void) { pthread_setname_np("example") ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } -$as_echo "#define HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID 1" >>confdefs.h +printf "%s\n" "#define HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_setname_np(pthread_t, const char*)" >&5 -$as_echo_n "checking for pthread_setname_np(pthread_t, const char*)... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_setname_np(pthread_t, const char*)" >&5 +printf %s "checking for pthread_setname_np(pthread_t, const char*)... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> int -main () +main (void) { pthread_setname_np(pthread_self(), "example") ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } -$as_echo "#define HAVE_PTHREAD_SETNAME_NP_WITH_TID 1" >>confdefs.h +printf "%s\n" "#define HAVE_PTHREAD_SETNAME_NP_WITH_TID 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS="$save_LIBS" fi @@ -24767,26 +26236,27 @@ REQUIRED_MODULES="$FIXESPROTO $DAMAGEPROTO $XCMISCPROTO $XTRANS $BIGREQSPROTO $S LIBSYSTEMD="libsystemd >= 209" # Check whether --with-systemd-daemon was given. -if test "${with_systemd_daemon+set}" = set; then : +if test ${with_systemd_daemon+y} +then : withval=$with_systemd_daemon; WITH_SYSTEMD_DAEMON=$withval -else +else $as_nop WITH_SYSTEMD_DAEMON=auto fi if test "x$WITH_SYSTEMD_DAEMON" = "xyes" -o "x$WITH_SYSTEMD_DAEMON" = "xauto" ; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBSYSTEMD" >&5 -$as_echo_n "checking for $LIBSYSTEMD... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LIBSYSTEMD" >&5 +printf %s "checking for $LIBSYSTEMD... " >&6; } if test -n "$SYSTEMD_DAEMON_CFLAGS"; then pkg_cv_SYSTEMD_DAEMON_CFLAGS="$SYSTEMD_DAEMON_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBSYSTEMD\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBSYSTEMD\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBSYSTEMD") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "$LIBSYSTEMD" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24800,10 +26270,10 @@ if test -n "$SYSTEMD_DAEMON_LIBS"; then pkg_cv_SYSTEMD_DAEMON_LIBS="$SYSTEMD_DAEMON_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBSYSTEMD\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBSYSTEMD\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBSYSTEMD") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_DAEMON_LIBS=`$PKG_CONFIG --libs "$LIBSYSTEMD" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24817,8 +26287,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -24835,17 +26305,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsystemd-daemon" >&5 -$as_echo_n "checking for libsystemd-daemon... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd-daemon" >&5 +printf %s "checking for libsystemd-daemon... " >&6; } if test -n "$SYSTEMD_DAEMON_CFLAGS"; then pkg_cv_SYSTEMD_DAEMON_CFLAGS="$SYSTEMD_DAEMON_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24859,10 +26329,10 @@ if test -n "$SYSTEMD_DAEMON_LIBS"; then pkg_cv_SYSTEMD_DAEMON_LIBS="$SYSTEMD_DAEMON_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_DAEMON_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24876,8 +26346,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -24894,33 +26364,33 @@ fi HAVE_SYSTEMD_DAEMON=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } HAVE_SYSTEMD_DAEMON=no else SYSTEMD_DAEMON_CFLAGS=$pkg_cv_SYSTEMD_DAEMON_CFLAGS SYSTEMD_DAEMON_LIBS=$pkg_cv_SYSTEMD_DAEMON_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } HAVE_SYSTEMD_DAEMON=yes; LIBSYSTEMD_DAEMON=libsystemd-daemon fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsystemd-daemon" >&5 -$as_echo_n "checking for libsystemd-daemon... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd-daemon" >&5 +printf %s "checking for libsystemd-daemon... " >&6; } if test -n "$SYSTEMD_DAEMON_CFLAGS"; then pkg_cv_SYSTEMD_DAEMON_CFLAGS="$SYSTEMD_DAEMON_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24934,10 +26404,10 @@ if test -n "$SYSTEMD_DAEMON_LIBS"; then pkg_cv_SYSTEMD_DAEMON_LIBS="$SYSTEMD_DAEMON_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_DAEMON_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24951,8 +26421,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -24969,28 +26439,28 @@ fi HAVE_SYSTEMD_DAEMON=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } HAVE_SYSTEMD_DAEMON=no else SYSTEMD_DAEMON_CFLAGS=$pkg_cv_SYSTEMD_DAEMON_CFLAGS SYSTEMD_DAEMON_LIBS=$pkg_cv_SYSTEMD_DAEMON_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } HAVE_SYSTEMD_DAEMON=yes; LIBSYSTEMD_DAEMON=libsystemd-daemon fi else SYSTEMD_DAEMON_CFLAGS=$pkg_cv_SYSTEMD_DAEMON_CFLAGS SYSTEMD_DAEMON_LIBS=$pkg_cv_SYSTEMD_DAEMON_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } HAVE_SYSTEMD_DAEMON=yes; LIBSYSTEMD_DAEMON="$LIBSYSTEMD" fi if test "x$HAVE_SYSTEMD_DAEMON" = xyes; then -$as_echo "#define HAVE_SYSTEMD_DAEMON 1" >>confdefs.h +printf "%s\n" "#define HAVE_SYSTEMD_DAEMON 1" >>confdefs.h REQUIRED_LIBS="$REQUIRED_LIBS $LIBSYSTEMD_DAEMON" elif test "x$WITH_SYSTEMD_DAEMON" = xyes; then @@ -25008,9 +26478,10 @@ fi if test "x$CONFIG_KEVENT_KMS" != xno; then ac_fn_c_check_func "$LINENO" "kevent" "ac_cv_func_kevent" -if test "x$ac_cv_func_kevent" = xyes; then : +if test "x$ac_cv_func_kevent" = xyes +then : -$as_echo "#define CONFIG_KEVENT_KMS 1" >>confdefs.h +printf "%s\n" "#define CONFIG_KEVENT_KMS 1" >>confdefs.h fi @@ -25022,17 +26493,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBUDEV" >&5 -$as_echo_n "checking for $LIBUDEV... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LIBUDEV" >&5 +printf %s "checking for $LIBUDEV... " >&6; } if test -n "$UDEV_CFLAGS"; then pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBUDEV\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBUDEV\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBUDEV") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "$LIBUDEV" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25046,10 +26517,10 @@ if test -n "$UDEV_LIBS"; then pkg_cv_UDEV_LIBS="$UDEV_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBUDEV\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBUDEV\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBUDEV") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "$LIBUDEV" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25063,8 +26534,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -25081,14 +26552,14 @@ fi HAVE_LIBUDEV=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } HAVE_LIBUDEV=no else UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS UDEV_LIBS=$pkg_cv_UDEV_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } HAVE_LIBUDEV=yes fi if test "x$CONFIG_UDEV" = xauto; then @@ -25111,38 +26582,30 @@ if test "x$CONFIG_UDEV" = xyes; then as_fn_error $? "udev configuration API requested, but libudev is not installed" "$LINENO" 5 fi -$as_echo "#define CONFIG_UDEV 1" >>confdefs.h +printf "%s\n" "#define CONFIG_UDEV 1" >>confdefs.h if test "x$CONFIG_UDEV_KMS" = xyes; then -$as_echo "#define CONFIG_UDEV_KMS 1" >>confdefs.h +printf "%s\n" "#define CONFIG_UDEV_KMS 1" >>confdefs.h fi SAVE_LIBS=$LIBS SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $UDEV_CFLAGS" LIBS=$UDEV_LIBS - for ac_func in udev_monitor_filter_add_match_tag -do : - ac_fn_c_check_func "$LINENO" "udev_monitor_filter_add_match_tag" "ac_cv_func_udev_monitor_filter_add_match_tag" -if test "x$ac_cv_func_udev_monitor_filter_add_match_tag" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_UDEV_MONITOR_FILTER_ADD_MATCH_TAG 1 -_ACEOF + ac_fn_c_check_func "$LINENO" "udev_monitor_filter_add_match_tag" "ac_cv_func_udev_monitor_filter_add_match_tag" +if test "x$ac_cv_func_udev_monitor_filter_add_match_tag" = xyes +then : + printf "%s\n" "#define HAVE_UDEV_MONITOR_FILTER_ADD_MATCH_TAG 1" >>confdefs.h fi -done - for ac_func in udev_enumerate_add_match_tag -do : - ac_fn_c_check_func "$LINENO" "udev_enumerate_add_match_tag" "ac_cv_func_udev_enumerate_add_match_tag" -if test "x$ac_cv_func_udev_enumerate_add_match_tag" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_UDEV_ENUMERATE_ADD_MATCH_TAG 1 -_ACEOF + ac_fn_c_check_func "$LINENO" "udev_enumerate_add_match_tag" "ac_cv_func_udev_enumerate_add_match_tag" +if test "x$ac_cv_func_udev_enumerate_add_match_tag" = xyes +then : + printf "%s\n" "#define HAVE_UDEV_ENUMERATE_ADD_MATCH_TAG 1" >>confdefs.h fi -done LIBS=$SAVE_LIBS CFLAGS=$SAVE_CFLAGS @@ -25158,17 +26621,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBDBUS" >&5 -$as_echo_n "checking for $LIBDBUS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LIBDBUS" >&5 +printf %s "checking for $LIBDBUS... " >&6; } if test -n "$DBUS_CFLAGS"; then pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDBUS\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDBUS\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBDBUS") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "$LIBDBUS" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25182,10 +26645,10 @@ if test -n "$DBUS_LIBS"; then pkg_cv_DBUS_LIBS="$DBUS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDBUS\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDBUS\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBDBUS") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "$LIBDBUS" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25199,8 +26662,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -25217,19 +26680,19 @@ fi HAVE_DBUS=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } HAVE_DBUS=no else DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS DBUS_LIBS=$pkg_cv_DBUS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } HAVE_DBUS=yes fi if test "x$HAVE_DBUS" = xyes; then -$as_echo "#define HAVE_DBUS 1" >>confdefs.h +printf "%s\n" "#define HAVE_DBUS 1" >>confdefs.h fi if test "x$HAVE_DBUS" = xyes; then @@ -25243,17 +26706,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hal" >&5 -$as_echo_n "checking for hal... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for hal" >&5 +printf %s "checking for hal... " >&6; } if test -n "$HAL_CFLAGS"; then pkg_cv_HAL_CFLAGS="$HAL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5 ($PKG_CONFIG --exists --print-errors "hal") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25267,10 +26730,10 @@ if test -n "$HAL_LIBS"; then pkg_cv_HAL_LIBS="$HAL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5 ($PKG_CONFIG --exists --print-errors "hal") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25284,8 +26747,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -25302,14 +26765,14 @@ fi HAVE_HAL=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } HAVE_HAL=no else HAL_CFLAGS=$pkg_cv_HAL_CFLAGS HAL_LIBS=$pkg_cv_HAL_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } HAVE_HAL=yes fi if test "x$CONFIG_HAL" = xauto; then @@ -25321,7 +26784,7 @@ if test "x$CONFIG_HAL" = xyes; then fi -$as_echo "#define CONFIG_HAL 1" >>confdefs.h +printf "%s\n" "#define CONFIG_HAL 1" >>confdefs.h NEED_DBUS="yes" fi @@ -25350,7 +26813,7 @@ if test "x$SYSTEMD_LOGIND" = xyes; then fi -$as_echo "#define SYSTEMD_LOGIND 1" >>confdefs.h +printf "%s\n" "#define SYSTEMD_LOGIND 1" >>confdefs.h NEED_DBUS="yes" fi @@ -25374,9 +26837,7 @@ if test "x$SUID_WRAPPER" = xyes; then SUID_WRAPPER_DIR="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define SUID_WRAPPER_DIR "$ac_define_dir" -_ACEOF +printf "%s\n" "#define SUID_WRAPPER_DIR \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -25394,7 +26855,7 @@ fi if test "x$NEED_DBUS" = xyes; then -$as_echo "#define NEED_DBUS 1" >>confdefs.h +printf "%s\n" "#define NEED_DBUS 1" >>confdefs.h fi if test "x$NEED_DBUS" = xyes; then @@ -25426,13 +26887,13 @@ fi if test "x$CONFIG_WSCONS" = xyes; then -$as_echo "#define CONFIG_WSCONS 1" >>confdefs.h +printf "%s\n" "#define CONFIG_WSCONS 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glibc..." >&5 -$as_echo_n "checking for glibc...... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glibc..." >&5 +printf %s "checking for glibc...... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -25442,29 +26903,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : glibc=yes -else +else $as_nop glibc=no fi rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibc" >&5 -$as_echo "$glibc" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $glibc" >&5 +printf "%s\n" "$glibc" >&6; } + -for ac_func in clock_gettime + for ac_func in clock_gettime do : ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" -if test "x$ac_cv_func_clock_gettime" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_CLOCK_GETTIME 1 -_ACEOF +if test "x$ac_cv_func_clock_gettime" = xyes +then : + printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h have_clock_gettime=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 -$as_echo_n "checking for clock_gettime in -lrt... " >&6; } -if ${ac_cv_lib_rt_clock_gettime+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 +printf %s "checking for clock_gettime in -lrt... " >&6; } +if test ${ac_cv_lib_rt_clock_gettime+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lrt $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -25473,41 +26936,40 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char clock_gettime (); int -main () +main (void) { return clock_gettime (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_rt_clock_gettime=yes -else +else $as_nop ac_cv_lib_rt_clock_gettime=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 -$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } -if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 +printf "%s\n" "$ac_cv_lib_rt_clock_gettime" >&6; } +if test "x$ac_cv_lib_rt_clock_gettime" = xyes +then : have_clock_gettime=-lrt -else +else $as_nop have_clock_gettime=no fi fi -done +done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a useful monotonic clock ..." >&5 -$as_echo_n "checking for a useful monotonic clock ...... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a useful monotonic clock ..." >&5 +printf %s "checking for a useful monotonic clock ...... " >&6; } if ! test "x$have_clock_gettime" = xno; then if ! test "x$have_clock_gettime" = xyes; then @@ -25524,9 +26986,10 @@ if ! test "x$have_clock_gettime" = xno; then CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L" fi - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : MONOTONIC_CLOCK="cross compiling" -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -25542,9 +27005,10 @@ int main(int argc, char *argv[]) { } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : MONOTONIC_CLOCK=yes -else +else $as_nop MONOTONIC_CLOCK=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -25553,14 +27017,14 @@ fi if test "$MONOTONIC_CLOCK" = "cross compiling"; then - ac_fn_c_check_decl "$LINENO" "CLOCK_MONOTONIC" "ac_cv_have_decl_CLOCK_MONOTONIC" "#include <time.h> -" -if test "x$ac_cv_have_decl_CLOCK_MONOTONIC" = xyes; then : + ac_fn_check_decl "$LINENO" "CLOCK_MONOTONIC" "ac_cv_have_decl_CLOCK_MONOTONIC" "#include <time.h> +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_CLOCK_MONOTONIC" = xyes +then : MONOTONIC_CLOCK="guessing yes" -else +else $as_nop MONOTONIC_CLOCK=no fi - fi LIBS="$LIBS_SAVE" @@ -25569,15 +27033,15 @@ else MONOTONIC_CLOCK=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MONOTONIC_CLOCK" >&5 -$as_echo "$MONOTONIC_CLOCK" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MONOTONIC_CLOCK" >&5 +printf "%s\n" "$MONOTONIC_CLOCK" >&6; } if test "$MONOTONIC_CLOCK" = "guessing yes"; then MONOTONIC_CLOCK=yes fi if test "x$MONOTONIC_CLOCK" = xyes; then -$as_echo "#define MONOTONIC_CLOCK 1" >>confdefs.h +printf "%s\n" "#define MONOTONIC_CLOCK 1" >>confdefs.h LIBS="$LIBS $CLOCK_LIBS" fi @@ -25592,10 +27056,10 @@ fi if test "x$XV" = xyes; then -$as_echo "#define XV 1" >>confdefs.h +printf "%s\n" "#define XV 1" >>confdefs.h -$as_echo "#define XvExtension 1" >>confdefs.h +printf "%s\n" "#define XvExtension 1" >>confdefs.h REQUIRED_MODULES="$REQUIRED_MODULES $VIDEOPROTO" SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $VIDEOPROTO" @@ -25613,7 +27077,7 @@ fi if test "x$XVMC" = xyes; then -$as_echo "#define XvMCExtension 1" >>confdefs.h +printf "%s\n" "#define XvMCExtension 1" >>confdefs.h fi @@ -25627,7 +27091,7 @@ fi if test "x$COMPOSITE" = xyes; then -$as_echo "#define COMPOSITE 1" >>confdefs.h +printf "%s\n" "#define COMPOSITE 1" >>confdefs.h REQUIRED_MODULES="$REQUIRED_MODULES $COMPOSITEPROTO" COMPOSITE_LIB='$(top_builddir)/composite/libcomposite.la' @@ -25647,10 +27111,10 @@ fi if test "x$MITSHM" = xyes; then -$as_echo "#define MITSHM 1" >>confdefs.h +printf "%s\n" "#define MITSHM 1" >>confdefs.h -$as_echo "#define HAS_SHM 1" >>confdefs.h +printf "%s\n" "#define HAS_SHM 1" >>confdefs.h fi @@ -25664,7 +27128,7 @@ fi if test "x$RECORD" = xyes; then -$as_echo "#define XRECORD 1" >>confdefs.h +printf "%s\n" "#define XRECORD 1" >>confdefs.h REQUIRED_MODULES="$REQUIRED_MODULES $RECORDPROTO" RECORD_LIB='$(top_builddir)/record/librecord.la' @@ -25680,7 +27144,7 @@ fi if test "x$SCREENSAVER" = xyes; then -$as_echo "#define SCREENSAVER 1" >>confdefs.h +printf "%s\n" "#define SCREENSAVER 1" >>confdefs.h REQUIRED_MODULES="$REQUIRED_MODULES $SCRNSAVERPROTO" SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $SCRNSAVERPROTO" @@ -25697,7 +27161,7 @@ fi if test "x$RES" = xyes; then -$as_echo "#define RES 1" >>confdefs.h +printf "%s\n" "#define RES 1" >>confdefs.h HASHTABLE=yes REQUIRED_MODULES="$REQUIRED_MODULES $RESOURCEPROTO" @@ -25706,28 +27170,28 @@ fi if test "x$LISTEN_TCP" = xyes; then -$as_echo "#define LISTEN_TCP 1" >>confdefs.h +printf "%s\n" "#define LISTEN_TCP 1" >>confdefs.h fi if test "x$LISTEN_UNIX" = xyes; then -$as_echo "#define LISTEN_UNIX 1" >>confdefs.h +printf "%s\n" "#define LISTEN_UNIX 1" >>confdefs.h fi if test "x$LISTEN_LOCAL" = xyes; then -$as_echo "#define LISTEN_LOCAL 1" >>confdefs.h +printf "%s\n" "#define LISTEN_LOCAL 1" >>confdefs.h fi # The XRes extension may support client ID tracking only if it has # been specifically enabled. Client ID tracking is implicitly not # supported if XRes extension is disabled. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to track client ids" >&5 -$as_echo_n "checking whether to track client ids... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to track client ids" >&5 +printf %s "checking whether to track client ids... " >&6; } if test "x$RES" = xyes && test "x$CLIENTIDS" = xyes; then -$as_echo "#define CLIENTIDS 1" >>confdefs.h +printf "%s\n" "#define CLIENTIDS 1" >>confdefs.h else CLIENTIDS=no @@ -25739,8 +27203,8 @@ if test "x$CLIENTIDS" = xyes; then ;; esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLIENTIDS" >&5 -$as_echo "$CLIENTIDS" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CLIENTIDS" >&5 +printf "%s\n" "$CLIENTIDS" >&6; } if test "x$CLIENTIDS" = xyes; then CLIENTIDS_TRUE= CLIENTIDS_FALSE='#' @@ -25760,7 +27224,7 @@ fi if test "x$DRI" = xyes; then -$as_echo "#define XF86DRI 1" >>confdefs.h +printf "%s\n" "#define XF86DRI 1" >>confdefs.h REQUIRED_MODULES="$REQUIRED_MODULES $DRIPROTO $GLPROTO $LIBDRI" SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRIPROTO $GLPROTO $LIBDRI" @@ -25768,17 +27232,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DRI2PROTO" >&5 -$as_echo_n "checking for $DRI2PROTO... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $DRI2PROTO" >&5 +printf %s "checking for $DRI2PROTO... " >&6; } if test -n "$DRI2PROTO_CFLAGS"; then pkg_cv_DRI2PROTO_CFLAGS="$DRI2PROTO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DRI2PROTO_CFLAGS=`$PKG_CONFIG --cflags "$DRI2PROTO" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25792,10 +27256,10 @@ if test -n "$DRI2PROTO_LIBS"; then pkg_cv_DRI2PROTO_LIBS="$DRI2PROTO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DRI2PROTO_LIBS=`$PKG_CONFIG --libs "$DRI2PROTO" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25809,8 +27273,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -25827,14 +27291,14 @@ fi HAVE_DRI2PROTO=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } HAVE_DRI2PROTO=no else DRI2PROTO_CFLAGS=$pkg_cv_DRI2PROTO_CFLAGS DRI2PROTO_LIBS=$pkg_cv_DRI2PROTO_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } HAVE_DRI2PROTO=yes fi case "$DRI2,$HAVE_DRI2PROTO" in @@ -25843,7 +27307,7 @@ case "$DRI2,$HAVE_DRI2PROTO" in ;; yes,yes | auto,yes) -$as_echo "#define DRI2 1" >>confdefs.h +printf "%s\n" "#define DRI2 1" >>confdefs.h DRI2=yes LIBGL="gl >= 1.2" @@ -25860,9 +27324,10 @@ fi # Check whether --enable-xtrans-send-fds was given. -if test "${enable_xtrans_send_fds+set}" = set; then : +if test ${enable_xtrans_send_fds+y} +then : enableval=$enable_xtrans_send_fds; XTRANS_SEND_FDS=$enableval -else +else $as_nop XTRANS_SEND_FDS=auto fi @@ -25882,7 +27347,7 @@ esac case "x$XTRANS_SEND_FDS" in xyes) -$as_echo "#define XTRANS_SEND_FDS 1" >>confdefs.h +printf "%s\n" "#define XTRANS_SEND_FDS 1" >>confdefs.h ;; esac @@ -25897,25 +27362,25 @@ case "$DRI3,$XTRANS_SEND_FDS" in no,*) ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: DRI3 disabled because xtrans fd passing support not found." >&5 -$as_echo "$as_me: DRI3 disabled because xtrans fd passing support not found." >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: DRI3 disabled because xtrans fd passing support not found." >&5 +printf "%s\n" "$as_me: DRI3 disabled because xtrans fd passing support not found." >&6;} DRI3=no ;; esac pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DRI3PROTO" >&5 -$as_echo_n "checking for $DRI3PROTO... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $DRI3PROTO" >&5 +printf %s "checking for $DRI3PROTO... " >&6; } if test -n "$DRI3PROTO_CFLAGS"; then pkg_cv_DRI3PROTO_CFLAGS="$DRI3PROTO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI3PROTO\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI3PROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$DRI3PROTO") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DRI3PROTO_CFLAGS=`$PKG_CONFIG --cflags "$DRI3PROTO" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25929,10 +27394,10 @@ if test -n "$DRI3PROTO_LIBS"; then pkg_cv_DRI3PROTO_LIBS="$DRI3PROTO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI3PROTO\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI3PROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$DRI3PROTO") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DRI3PROTO_LIBS=`$PKG_CONFIG --libs "$DRI3PROTO" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25946,8 +27411,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -25964,14 +27429,14 @@ fi HAVE_DRI3PROTO=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } HAVE_DRI3PROTO=no else DRI3PROTO_CFLAGS=$pkg_cv_DRI3PROTO_CFLAGS DRI3PROTO_LIBS=$pkg_cv_DRI3PROTO_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } HAVE_DRI3PROTO=yes fi @@ -25986,22 +27451,18 @@ case "$DRI3,$HAVE_DRI3PROTO" in no,*) ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: DRI3 disabled because dri3proto not found." >&5 -$as_echo "$as_me: DRI3 disabled because dri3proto not found." >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: DRI3 disabled because dri3proto not found." >&5 +printf "%s\n" "$as_me: DRI3 disabled because dri3proto not found." >&6;} DRI3=no ;; esac -for ac_func in sigaction -do : - ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" -if test "x$ac_cv_func_sigaction" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SIGACTION 1 -_ACEOF +ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" +if test "x$ac_cv_func_sigaction" = xyes +then : + printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h fi -done BUSFAULT=no @@ -26009,7 +27470,7 @@ BUSFAULT=no case x"$ac_cv_func_sigaction" in xyes) -$as_echo "#define HAVE_SIGACTION 1" >>confdefs.h +printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h BUSFAULT=yes ;; @@ -26018,7 +27479,7 @@ esac case x"$BUSFAULT" in xyes) -$as_echo "#define BUSFAULT 1" >>confdefs.h +printf "%s\n" "#define BUSFAULT 1" >>confdefs.h ;; esac @@ -26035,17 +27496,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBXSHMFENCE" >&5 -$as_echo_n "checking for $LIBXSHMFENCE... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LIBXSHMFENCE" >&5 +printf %s "checking for $LIBXSHMFENCE... " >&6; } if test -n "$XSHMFENCE_CFLAGS"; then pkg_cv_XSHMFENCE_CFLAGS="$XSHMFENCE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXSHMFENCE\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXSHMFENCE\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBXSHMFENCE") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XSHMFENCE_CFLAGS=`$PKG_CONFIG --cflags "$LIBXSHMFENCE" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26059,10 +27520,10 @@ if test -n "$XSHMFENCE_LIBS"; then pkg_cv_XSHMFENCE_LIBS="$XSHMFENCE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXSHMFENCE\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXSHMFENCE\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBXSHMFENCE") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XSHMFENCE_LIBS=`$PKG_CONFIG --libs "$LIBXSHMFENCE" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26076,8 +27537,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -26094,14 +27555,14 @@ fi HAVE_XSHMFENCE=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } HAVE_XSHMFENCE=no else XSHMFENCE_CFLAGS=$pkg_cv_XSHMFENCE_CFLAGS XSHMFENCE_LIBS=$pkg_cv_XSHMFENCE_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } HAVE_XSHMFENCE=yes fi if test "x$XSHMFENCE" = "xauto"; then @@ -26113,7 +27574,7 @@ if test "x$XSHMFENCE" = "xyes"; then as_fn_error $? "xshmfence requested but not installed." "$LINENO" 5 fi -$as_echo "#define HAVE_XSHMFENCE 1" >>confdefs.h +printf "%s\n" "#define HAVE_XSHMFENCE 1" >>confdefs.h REQUIRED_LIBS="$REQUIRED_LIBS $LIBXSHMFENCE" fi @@ -26137,8 +27598,8 @@ case "$DRI3,$XSHMFENCE" in no,*) ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: DRI3 disabled because xshmfence not found." >&5 -$as_echo "$as_me: DRI3 disabled because xshmfence not found." >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: DRI3 disabled because xshmfence not found." >&5 +printf "%s\n" "$as_me: DRI3 disabled because xshmfence not found." >&6;} DRI3=no ;; esac @@ -26147,12 +27608,12 @@ case x"$DRI3" in xyes|xauto) DRI3=yes -$as_echo "#define DRI3 1" >>confdefs.h +printf "%s\n" "#define DRI3 1" >>confdefs.h DRI3_LIB='$(top_builddir)/dri3/libdri3.la' SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI3PROTO" - { $as_echo "$as_me:${as_lineno-$LINENO}: DRI3 enabled" >&5 -$as_echo "$as_me: DRI3 enabled" >&6;}; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: DRI3 enabled" >&5 +printf "%s\n" "$as_me: DRI3 enabled" >&6;}; ;; esac @@ -26168,21 +27629,21 @@ fi if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes || test "x$XORG" = xyes; then if test "x$DRM" = xyes; then -$as_echo "#define WITH_LIBDRM 1" >>confdefs.h +printf "%s\n" "#define WITH_LIBDRM 1" >>confdefs.h pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBDRM" >&5 -$as_echo_n "checking for $LIBDRM... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LIBDRM" >&5 +printf %s "checking for $LIBDRM... " >&6; } if test -n "$LIBDRM_CFLAGS"; then pkg_cv_LIBDRM_CFLAGS="$LIBDRM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBDRM_CFLAGS=`$PKG_CONFIG --cflags "$LIBDRM" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26196,10 +27657,10 @@ if test -n "$LIBDRM_LIBS"; then pkg_cv_LIBDRM_LIBS="$LIBDRM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBDRM_LIBS=`$PKG_CONFIG --libs "$LIBDRM" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26213,8 +27674,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -26240,10 +27701,10 @@ Alternatively, you may set the environment variables LIBDRM_CFLAGS and LIBDRM_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -26257,8 +27718,8 @@ See \`config.log' for more details" "$LINENO" 5; } else LIBDRM_CFLAGS=$pkg_cv_LIBDRM_CFLAGS LIBDRM_LIBS=$pkg_cv_LIBDRM_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi fi @@ -26267,17 +27728,17 @@ fi if test "x$GLX" = xyes; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x11" >&5 -$as_echo_n "checking for x11... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x11" >&5 +printf %s "checking for x11... " >&6; } if test -n "$XLIB_CFLAGS"; then pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "x11") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26291,10 +27752,10 @@ if test -n "$XLIB_LIBS"; then pkg_cv_XLIB_LIBS="$XLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "x11") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26308,8 +27769,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -26335,10 +27796,10 @@ Alternatively, you may set the environment variables XLIB_CFLAGS and XLIB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -26352,23 +27813,23 @@ See \`config.log' for more details" "$LINENO" 5; } else XLIB_CFLAGS=$pkg_cv_XLIB_CFLAGS XLIB_LIBS=$pkg_cv_XLIB_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $GLPROTO $LIBGL" >&5 -$as_echo_n "checking for $GLPROTO $LIBGL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $GLPROTO $LIBGL" >&5 +printf %s "checking for $GLPROTO $LIBGL... " >&6; } if test -n "$GL_CFLAGS"; then pkg_cv_GL_CFLAGS="$GL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\""; } >&5 ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "$GLPROTO $LIBGL" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26382,10 +27843,10 @@ if test -n "$GL_LIBS"; then pkg_cv_GL_LIBS="$GL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\""; } >&5 ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "$GLPROTO $LIBGL" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26399,8 +27860,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -26426,10 +27887,10 @@ Alternatively, you may set the environment variables GL_CFLAGS and GL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -26443,13 +27904,13 @@ See \`config.log' for more details" "$LINENO" 5; } else GL_CFLAGS=$pkg_cv_GL_CFLAGS GL_LIBS=$pkg_cv_GL_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi -$as_echo "#define GLXEXT 1" >>confdefs.h +printf "%s\n" "#define GLXEXT 1" >>confdefs.h HASHTABLE=yes GLX_LIBS='$(top_builddir)/glx/libglx.la $(top_builddir)/glx/libglxvnd.la' @@ -26488,7 +27949,7 @@ fi if test "x$PRESENT" = xyes; then -$as_echo "#define PRESENT 1" >>confdefs.h +printf "%s\n" "#define PRESENT 1" >>confdefs.h REQUIRED_MODULES="$REQUIRED_MODULES $PRESENTPROTO" SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $PRESENTPROTO" @@ -26515,10 +27976,10 @@ fi if test "x$XINERAMA" = xyes; then -$as_echo "#define XINERAMA 1" >>confdefs.h +printf "%s\n" "#define XINERAMA 1" >>confdefs.h -$as_echo "#define PANORAMIX 1" >>confdefs.h +printf "%s\n" "#define PANORAMIX 1" >>confdefs.h REQUIRED_MODULES="$REQUIRED_MODULES $XINERAMAPROTO" SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $XINERAMAPROTO" @@ -26534,7 +27995,7 @@ fi if test "x$XACE" = xyes; then -$as_echo "#define XACE 1" >>confdefs.h +printf "%s\n" "#define XACE 1" >>confdefs.h fi @@ -26550,25 +28011,24 @@ if test "x$XSELINUX" = xyes; then if test "x$XACE" != xyes; then as_fn_error $? "cannot build SELinux extension without X-ACE" "$LINENO" 5 fi - for ac_header in libaudit.h + for ac_header in libaudit.h do : - ac_fn_c_check_header_mongrel "$LINENO" "libaudit.h" "ac_cv_header_libaudit_h" "$ac_includes_default" -if test "x$ac_cv_header_libaudit_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBAUDIT_H 1 -_ACEOF + ac_fn_c_check_header_compile "$LINENO" "libaudit.h" "ac_cv_header_libaudit_h" "$ac_includes_default" +if test "x$ac_cv_header_libaudit_h" = xyes +then : + printf "%s\n" "#define HAVE_LIBAUDIT_H 1" >>confdefs.h -else +else $as_nop as_fn_error $? "SELinux extension requires audit system headers" "$LINENO" 5 fi done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for audit_open in -laudit" >&5 -$as_echo_n "checking for audit_open in -laudit... " >&6; } -if ${ac_cv_lib_audit_audit_open+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for audit_open in -laudit" >&5 +printf %s "checking for audit_open in -laudit... " >&6; } +if test ${ac_cv_lib_audit_audit_open+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-laudit $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26577,53 +28037,50 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char audit_open (); int -main () +main (void) { return audit_open (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_audit_audit_open=yes -else +else $as_nop ac_cv_lib_audit_audit_open=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audit_audit_open" >&5 -$as_echo "$ac_cv_lib_audit_audit_open" >&6; } -if test "x$ac_cv_lib_audit_audit_open" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBAUDIT 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audit_audit_open" >&5 +printf "%s\n" "$ac_cv_lib_audit_audit_open" >&6; } +if test "x$ac_cv_lib_audit_audit_open" = xyes +then : + printf "%s\n" "#define HAVE_LIBAUDIT 1" >>confdefs.h LIBS="-laudit $LIBS" -else +else $as_nop as_fn_error $? "SELinux extension requires audit system library" "$LINENO" 5 fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBSELINUX" >&5 -$as_echo_n "checking for $LIBSELINUX... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LIBSELINUX" >&5 +printf %s "checking for $LIBSELINUX... " >&6; } if test -n "$SELINUX_CFLAGS"; then pkg_cv_SELINUX_CFLAGS="$SELINUX_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBSELINUX\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBSELINUX\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBSELINUX") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SELINUX_CFLAGS=`$PKG_CONFIG --cflags "$LIBSELINUX" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26637,10 +28094,10 @@ if test -n "$SELINUX_LIBS"; then pkg_cv_SELINUX_LIBS="$SELINUX_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBSELINUX\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBSELINUX\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBSELINUX") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SELINUX_LIBS=`$PKG_CONFIG --libs "$LIBSELINUX" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26654,8 +28111,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -26681,10 +28138,10 @@ Alternatively, you may set the environment variables SELINUX_CFLAGS and SELINUX_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -26698,13 +28155,13 @@ See \`config.log' for more details" "$LINENO" 5; } else SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS SELINUX_LIBS=$pkg_cv_SELINUX_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi SELINUX_LIBS="$SELINUX_LIBS -laudit" -$as_echo "#define XSELINUX 1" >>confdefs.h +printf "%s\n" "#define XSELINUX 1" >>confdefs.h fi @@ -26721,7 +28178,7 @@ if test "x$XCSECURITY" = xyes; then as_fn_error $? "cannot build Security extension without X-ACE" "$LINENO" 5 fi -$as_echo "#define XCSECURITY 1" >>confdefs.h +printf "%s\n" "#define XCSECURITY 1" >>confdefs.h fi @@ -26735,7 +28192,7 @@ fi if test "x$DBE" = xyes; then -$as_echo "#define DBE 1" >>confdefs.h +printf "%s\n" "#define DBE 1" >>confdefs.h DBE_LIB='$(top_builddir)/dbe/libdbe.la' DBE_INC='-I$(top_srcdir)/dbe' @@ -26751,7 +28208,7 @@ fi if test "x$XF86BIGFONT" = xyes; then -$as_echo "#define XF86BIGFONT 1" >>confdefs.h +printf "%s\n" "#define XF86BIGFONT 1" >>confdefs.h REQUIRED_MODULES="$REQUIRED_MODULES $BIGFONTPROTO" SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $BIGFONTPROTO" @@ -26767,30 +28224,30 @@ fi if test "x$DPMSExtension" = xyes; then -$as_echo "#define DPMSExtension 1" >>confdefs.h +printf "%s\n" "#define DPMSExtension 1" >>confdefs.h fi -$as_echo "#define RENDER 1" >>confdefs.h +printf "%s\n" "#define RENDER 1" >>confdefs.h RENDER_LIB='$(top_builddir)/render/librender.la' RENDER_INC='-I$(top_srcdir)/render' -$as_echo "#define RANDR 1" >>confdefs.h +printf "%s\n" "#define RANDR 1" >>confdefs.h RANDR_LIB='$(top_builddir)/randr/librandr.la' RANDR_INC='-I$(top_srcdir)/randr' -$as_echo "#define XFIXES 1" >>confdefs.h +printf "%s\n" "#define XFIXES 1" >>confdefs.h FIXES_LIB='$(top_builddir)/xfixes/libxfixes.la' FIXES_INC='-I$(top_srcdir)/xfixes' -$as_echo "#define DAMAGE 1" >>confdefs.h +printf "%s\n" "#define DAMAGE 1" >>confdefs.h DAMAGE_LIB='$(top_builddir)/damageext/libdamageext.la' DAMAGE_INC='-I$(top_srcdir)/damageext' @@ -26799,7 +28256,7 @@ MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage' # XINPUT extension is integral part of the server -$as_echo "#define XINPUT 1" >>confdefs.h +printf "%s\n" "#define XINPUT 1" >>confdefs.h XI_LIB='$(top_builddir)/Xi/libXi.la' XI_INC='-I$(top_srcdir)/Xi' @@ -26830,7 +28287,7 @@ fi -$as_echo "#define SHAPE 1" >>confdefs.h +printf "%s\n" "#define SHAPE 1" >>confdefs.h if test "x$XKBPATH" = "xauto"; then @@ -26847,18 +28304,17 @@ fi XKB_BASE_DIRECTORY="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define XKB_BASE_DIRECTORY "$ac_define_dir" -_ACEOF +printf "%s\n" "#define XKB_BASE_DIRECTORY \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE # Check whether --with-xkb-bin-directory was given. -if test "${with_xkb_bin_directory+set}" = set; then : +if test ${with_xkb_bin_directory+y} +then : withval=$with_xkb_bin_directory; XKB_BIN_DIRECTORY="$withval" -else +else $as_nop XKB_BIN_DIRECTORY="auto" fi @@ -26880,9 +28336,7 @@ fi XKB_BIN_DIRECTORY="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define XKB_BIN_DIRECTORY "$ac_define_dir" -_ACEOF +printf "%s\n" "#define XKB_BIN_DIRECTORY \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -26906,9 +28360,7 @@ XKB_COMPILED_DIR=`echo $XKBOUTPUT | $SED 's|/*$||'` XKM_OUTPUT_DIR="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define XKM_OUTPUT_DIR "$ac_define_dir" -_ACEOF +printf "%s\n" "#define XKM_OUTPUT_DIR \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -26926,29 +28378,19 @@ if test "x$XKB_DFLT_RULES" = x; then esac fi -cat >>confdefs.h <<_ACEOF -#define XKB_DFLT_RULES "$XKB_DFLT_RULES" -_ACEOF +printf "%s\n" "#define XKB_DFLT_RULES \"$XKB_DFLT_RULES\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define XKB_DFLT_MODEL "$XKB_DFLT_MODEL" -_ACEOF +printf "%s\n" "#define XKB_DFLT_MODEL \"$XKB_DFLT_MODEL\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define XKB_DFLT_LAYOUT "$XKB_DFLT_LAYOUT" -_ACEOF +printf "%s\n" "#define XKB_DFLT_LAYOUT \"$XKB_DFLT_LAYOUT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define XKB_DFLT_VARIANT "$XKB_DFLT_VARIANT" -_ACEOF +printf "%s\n" "#define XKB_DFLT_VARIANT \"$XKB_DFLT_VARIANT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define XKB_DFLT_OPTIONS "$XKB_DFLT_OPTIONS" -_ACEOF +printf "%s\n" "#define XKB_DFLT_OPTIONS \"$XKB_DFLT_OPTIONS\"" >>confdefs.h @@ -26962,17 +28404,17 @@ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xdmcp" >&5 -$as_echo_n "checking for xdmcp... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xdmcp" >&5 +printf %s "checking for xdmcp... " >&6; } if test -n "$XDMCP_CFLAGS"; then pkg_cv_XDMCP_CFLAGS="$XDMCP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xdmcp\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xdmcp\""; } >&5 ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XDMCP_CFLAGS=`$PKG_CONFIG --cflags "xdmcp" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26986,10 +28428,10 @@ if test -n "$XDMCP_LIBS"; then pkg_cv_XDMCP_LIBS="$XDMCP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xdmcp\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xdmcp\""; } >&5 ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XDMCP_LIBS=`$PKG_CONFIG --libs "xdmcp" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27003,8 +28445,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -27021,14 +28463,14 @@ fi have_libxdmcp="no" elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_libxdmcp="no" else XDMCP_CFLAGS=$pkg_cv_XDMCP_CFLAGS XDMCP_LIBS=$pkg_cv_XDMCP_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_libxdmcp="yes" fi if test "x$XDMCP" = xauto; then @@ -27056,7 +28498,7 @@ fi if test "x$XDMCP" = xyes; then -$as_echo "#define XDMCP 1" >>confdefs.h +printf "%s\n" "#define XDMCP 1" >>confdefs.h REQUIRED_LIBS="$REQUIRED_LIBS xdmcp" XDMCP_MODULES="xdmcp" @@ -27072,7 +28514,7 @@ fi if test "x$XDMAUTH" = xyes; then -$as_echo "#define HASXDMAUTH 1" >>confdefs.h +printf "%s\n" "#define HASXDMAUTH 1" >>confdefs.h if ! test "x$XDMCP" = xyes; then REQUIRED_LIBS="$REQUIRED_LIBS xdmcp" @@ -27082,10 +28524,10 @@ fi if test "x$XF86VIDMODE" = xauto; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then XF86VIDMODE=yes else @@ -27094,7 +28536,7 @@ fi fi if test "x$XF86VIDMODE" = xyes; then -$as_echo "#define XF86VIDMODE 1" >>confdefs.h +printf "%s\n" "#define XF86VIDMODE 1" >>confdefs.h fi if test "x$XF86VIDMODE" = xyes; then @@ -27116,9 +28558,7 @@ fi COMPILEDDEFAULTFONTPATH="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define COMPILEDDEFAULTFONTPATH "$ac_define_dir" -_ACEOF +printf "%s\n" "#define COMPILEDDEFAULTFONTPATH \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -27133,9 +28573,7 @@ _ACEOF SERVER_MISC_CONFIG_PATH="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define SERVER_MISC_CONFIG_PATH "$ac_define_dir" -_ACEOF +printf "%s\n" "#define SERVER_MISC_CONFIG_PATH \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -27150,9 +28588,7 @@ _ACEOF BASE_FONT_PATH="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define BASE_FONT_PATH "$ac_define_dir" -_ACEOF +printf "%s\n" "#define BASE_FONT_PATH \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -27168,65 +28604,45 @@ dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri` DRI_DRIVER_PATH="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define DRI_DRIVER_PATH "$ac_define_dir" -_ACEOF +printf "%s\n" "#define DRI_DRIVER_PATH \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE -cat >>confdefs.h <<_ACEOF -#define XVENDORNAME "$VENDOR_NAME" -_ACEOF +printf "%s\n" "#define XVENDORNAME \"$VENDOR_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define XVENDORNAMESHORT "$VENDOR_NAME_SHORT" -_ACEOF +printf "%s\n" "#define XVENDORNAMESHORT \"$VENDOR_NAME_SHORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define XORG_MAN_VERSION "$VENDOR_MAN_VERSION" -_ACEOF +printf "%s\n" "#define XORG_MAN_VERSION \"$VENDOR_MAN_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define BUILDERADDR "$BUILDERADDR" -_ACEOF +printf "%s\n" "#define BUILDERADDR \"$BUILDERADDR\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define BUILDERSTRING "$BUILDERSTRING" -_ACEOF +printf "%s\n" "#define BUILDERSTRING \"$BUILDERSTRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VENDOR_NAME "$VENDOR_NAME" -_ACEOF +printf "%s\n" "#define VENDOR_NAME \"$VENDOR_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VENDOR_NAME_SHORT "$VENDOR_NAME_SHORT" -_ACEOF +printf "%s\n" "#define VENDOR_NAME_SHORT \"$VENDOR_NAME_SHORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VENDOR_RELEASE $VENDOR_RELEASE -_ACEOF +printf "%s\n" "#define VENDOR_RELEASE $VENDOR_RELEASE" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VENDOR_MAN_VERSION "$VENDOR_MAN_VERSION" -_ACEOF +printf "%s\n" "#define VENDOR_MAN_VERSION \"$VENDOR_MAN_VERSION\"" >>confdefs.h if test "x$DEBUGGING" = xyes; then -$as_echo "#define DEBUG 1" >>confdefs.h +printf "%s\n" "#define DEBUG 1" >>confdefs.h fi if test "x$DEBUGGING" = xyes; then @@ -27239,16 +28655,16 @@ fi -$as_echo "#define XTEST 1" >>confdefs.h +printf "%s\n" "#define XTEST 1" >>confdefs.h -$as_echo "#define XSYNC 1" >>confdefs.h +printf "%s\n" "#define XSYNC 1" >>confdefs.h -$as_echo "#define XCMISC 1" >>confdefs.h +printf "%s\n" "#define XCMISC 1" >>confdefs.h -$as_echo "#define BIGREQS 1" >>confdefs.h +printf "%s\n" "#define BIGREQS 1" >>confdefs.h if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then @@ -27278,12 +28694,14 @@ CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include' # SHA1 hashing # Check whether --with-sha1 was given. -if test "${with_sha1+set}" = set; then : +if test ${with_sha1+y} +then : withval=$with_sha1; fi ac_fn_c_check_func "$LINENO" "SHA1Init" "ac_cv_func_SHA1Init" -if test "x$ac_cv_func_SHA1Init" = xyes; then : +if test "x$ac_cv_func_SHA1Init" = xyes +then : HAVE_SHA1_IN_LIBC=yes fi @@ -27295,12 +28713,13 @@ if test "x$with_sha1" = xlibc && test "x$HAVE_SHA1_IN_LIBC" != xyes; then fi if test "x$with_sha1" = xlibc; then -$as_echo "#define HAVE_SHA1_IN_LIBC 1" >>confdefs.h +printf "%s\n" "#define HAVE_SHA1_IN_LIBC 1" >>confdefs.h SHA1_LIBS="" fi ac_fn_c_check_func "$LINENO" "CC_SHA1_Init" "ac_cv_func_CC_SHA1_Init" -if test "x$ac_cv_func_CC_SHA1_Init" = xyes; then : +if test "x$ac_cv_func_CC_SHA1_Init" = xyes +then : HAVE_SHA1_IN_COMMONCRYPTO=yes fi @@ -27312,17 +28731,17 @@ if test "x$with_sha1" = xCommonCrypto && test "x$HAVE_SHA1_IN_COMMONCRYPTO" != x fi if test "x$with_sha1" = xCommonCrypto; then -$as_echo "#define HAVE_SHA1_IN_COMMONCRYPTO 1" >>confdefs.h +printf "%s\n" "#define HAVE_SHA1_IN_COMMONCRYPTO 1" >>confdefs.h SHA1_LIBS="" fi ac_fn_c_check_header_compile "$LINENO" "wincrypt.h" "ac_cv_header_wincrypt_h" "#include <windows.h> " -if test "x$ac_cv_header_wincrypt_h" = xyes; then : +if test "x$ac_cv_header_wincrypt_h" = xyes +then : HAVE_SHA1_IN_CRYPTOAPI=yes fi - if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_CRYPTOAPI" = xyes; then with_sha1=CryptoAPI fi @@ -27331,15 +28750,16 @@ if test "x$with_sha1" = xCryptoAPI && test "x$HAVE_SHA1_IN_CRYPTOAPI" != xyes; t fi if test "x$with_sha1" = xCryptoAPI; then -$as_echo "#define HAVE_SHA1_IN_CRYPTOAPI 1" >>confdefs.h +printf "%s\n" "#define HAVE_SHA1_IN_CRYPTOAPI 1" >>confdefs.h SHA1_LIBS="" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA1Init in -lmd" >&5 -$as_echo_n "checking for SHA1Init in -lmd... " >&6; } -if ${ac_cv_lib_md_SHA1Init+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SHA1Init in -lmd" >&5 +printf %s "checking for SHA1Init in -lmd... " >&6; } +if test ${ac_cv_lib_md_SHA1Init+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lmd $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27348,30 +28768,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char SHA1Init (); int -main () +main (void) { return SHA1Init (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_md_SHA1Init=yes -else +else $as_nop ac_cv_lib_md_SHA1Init=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_md_SHA1Init" >&5 -$as_echo "$ac_cv_lib_md_SHA1Init" >&6; } -if test "x$ac_cv_lib_md_SHA1Init" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_md_SHA1Init" >&5 +printf "%s\n" "$ac_cv_lib_md_SHA1Init" >&6; } +if test "x$ac_cv_lib_md_SHA1Init" = xyes +then : HAVE_LIBMD=yes fi @@ -27383,23 +28802,23 @@ if test "x$with_sha1" = xlibmd && test "x$HAVE_LIBMD" != xyes; then fi if test "x$with_sha1" = xlibmd; then -$as_echo "#define HAVE_SHA1_IN_LIBMD 1" >>confdefs.h +printf "%s\n" "#define HAVE_SHA1_IN_LIBMD 1" >>confdefs.h SHA1_LIBS=-lmd fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsha1" >&5 -$as_echo_n "checking for libsha1... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsha1" >&5 +printf %s "checking for libsha1... " >&6; } if test -n "$LIBSHA1_CFLAGS"; then pkg_cv_LIBSHA1_CFLAGS="$LIBSHA1_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsha1\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsha1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsha1") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBSHA1_CFLAGS=`$PKG_CONFIG --cflags "libsha1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27413,10 +28832,10 @@ if test -n "$LIBSHA1_LIBS"; then pkg_cv_LIBSHA1_LIBS="$LIBSHA1_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsha1\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsha1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsha1") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBSHA1_LIBS=`$PKG_CONFIG --libs "libsha1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27430,8 +28849,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -27448,14 +28867,14 @@ fi HAVE_LIBSHA1=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } HAVE_LIBSHA1=no else LIBSHA1_CFLAGS=$pkg_cv_LIBSHA1_CFLAGS LIBSHA1_LIBS=$pkg_cv_LIBSHA1_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } HAVE_LIBSHA1=yes fi if test "x$with_sha1" = x && test "x$HAVE_LIBSHA1" = xyes; then @@ -27466,15 +28885,16 @@ if test "x$with_sha1" = xlibsha1 && test "x$HAVE_LIBSHA1" != xyes; then fi if test "x$with_sha1" = xlibsha1; then -$as_echo "#define HAVE_SHA1_IN_LIBSHA1 1" >>confdefs.h +printf "%s\n" "#define HAVE_SHA1_IN_LIBSHA1 1" >>confdefs.h SHA1_LIBS=-lsha1 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nettle_sha1_init in -lnettle" >&5 -$as_echo_n "checking for nettle_sha1_init in -lnettle... " >&6; } -if ${ac_cv_lib_nettle_nettle_sha1_init+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nettle_sha1_init in -lnettle" >&5 +printf %s "checking for nettle_sha1_init in -lnettle... " >&6; } +if test ${ac_cv_lib_nettle_nettle_sha1_init+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lnettle $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27483,30 +28903,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char nettle_sha1_init (); int -main () +main (void) { return nettle_sha1_init (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_nettle_nettle_sha1_init=yes -else +else $as_nop ac_cv_lib_nettle_nettle_sha1_init=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nettle_nettle_sha1_init" >&5 -$as_echo "$ac_cv_lib_nettle_nettle_sha1_init" >&6; } -if test "x$ac_cv_lib_nettle_nettle_sha1_init" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nettle_nettle_sha1_init" >&5 +printf "%s\n" "$ac_cv_lib_nettle_nettle_sha1_init" >&6; } +if test "x$ac_cv_lib_nettle_nettle_sha1_init" = xyes +then : HAVE_LIBNETTLE=yes fi @@ -27518,15 +28937,16 @@ if test "x$with_sha1" = xlibnettle && test "x$HAVE_LIBNETTLE" != xyes; then fi if test "x$with_sha1" = xlibnettle; then -$as_echo "#define HAVE_SHA1_IN_LIBNETTLE 1" >>confdefs.h +printf "%s\n" "#define HAVE_SHA1_IN_LIBNETTLE 1" >>confdefs.h SHA1_LIBS=-lnettle fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcry_md_open in -lgcrypt" >&5 -$as_echo_n "checking for gcry_md_open in -lgcrypt... " >&6; } -if ${ac_cv_lib_gcrypt_gcry_md_open+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gcry_md_open in -lgcrypt" >&5 +printf %s "checking for gcry_md_open in -lgcrypt... " >&6; } +if test ${ac_cv_lib_gcrypt_gcry_md_open+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lgcrypt $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27535,30 +28955,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char gcry_md_open (); int -main () +main (void) { return gcry_md_open (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_gcrypt_gcry_md_open=yes -else +else $as_nop ac_cv_lib_gcrypt_gcry_md_open=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcrypt_gcry_md_open" >&5 -$as_echo "$ac_cv_lib_gcrypt_gcry_md_open" >&6; } -if test "x$ac_cv_lib_gcrypt_gcry_md_open" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcrypt_gcry_md_open" >&5 +printf "%s\n" "$ac_cv_lib_gcrypt_gcry_md_open" >&6; } +if test "x$ac_cv_lib_gcrypt_gcry_md_open" = xyes +then : HAVE_LIBGCRYPT=yes fi @@ -27570,16 +28989,17 @@ if test "x$with_sha1" = xlibgcrypt && test "x$HAVE_LIBGCRYPT" != xyes; then fi if test "x$with_sha1" = xlibgcrypt; then -$as_echo "#define HAVE_SHA1_IN_LIBGCRYPT 1" >>confdefs.h +printf "%s\n" "#define HAVE_SHA1_IN_LIBGCRYPT 1" >>confdefs.h SHA1_LIBS=-lgcrypt fi # We don't need all of the OpenSSL libraries, just libcrypto -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA1_Init in -lcrypto" >&5 -$as_echo_n "checking for SHA1_Init in -lcrypto... " >&6; } -if ${ac_cv_lib_crypto_SHA1_Init+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SHA1_Init in -lcrypto" >&5 +printf %s "checking for SHA1_Init in -lcrypto... " >&6; } +if test ${ac_cv_lib_crypto_SHA1_Init+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypto $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27588,46 +29008,45 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char SHA1_Init (); int -main () +main (void) { return SHA1_Init (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_crypto_SHA1_Init=yes -else +else $as_nop ac_cv_lib_crypto_SHA1_Init=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SHA1_Init" >&5 -$as_echo "$ac_cv_lib_crypto_SHA1_Init" >&6; } -if test "x$ac_cv_lib_crypto_SHA1_Init" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SHA1_Init" >&5 +printf "%s\n" "$ac_cv_lib_crypto_SHA1_Init" >&6; } +if test "x$ac_cv_lib_crypto_SHA1_Init" = xyes +then : HAVE_LIBCRYPTO=yes fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5 -$as_echo_n "checking for openssl... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5 +printf %s "checking for openssl... " >&6; } if test -n "$OPENSSL_CFLAGS"; then pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27641,10 +29060,10 @@ if test -n "$OPENSSL_LIBS"; then pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27658,8 +29077,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -27676,14 +29095,14 @@ fi HAVE_OPENSSL_PKC=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } HAVE_OPENSSL_PKC=no else OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } HAVE_OPENSSL_PKC=yes fi if test "x$HAVE_LIBCRYPTO" = xyes || test "x$HAVE_OPENSSL_PKC" = xyes; then @@ -27703,29 +29122,29 @@ if test "x$with_sha1" = xlibcrypto; then SHA1_CFLAGS="$OPENSSL_CFLAGS" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA1 implementation" >&5 -$as_echo_n "checking for SHA1 implementation... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SHA1 implementation" >&5 +printf %s "checking for SHA1 implementation... " >&6; } if test "x$with_sha1" = x; then as_fn_error $? "No suitable SHA1 implementation found" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sha1" >&5 -$as_echo "$with_sha1" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sha1" >&5 +printf "%s\n" "$with_sha1" >&6; } pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $REQUIRED_MODULES $REQUIRED_LIBS" >&5 -$as_echo_n "checking for $REQUIRED_MODULES $REQUIRED_LIBS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $REQUIRED_MODULES $REQUIRED_LIBS" >&5 +printf %s "checking for $REQUIRED_MODULES $REQUIRED_LIBS... " >&6; } if test -n "$XSERVERCFLAGS_CFLAGS"; then pkg_cv_XSERVERCFLAGS_CFLAGS="$XSERVERCFLAGS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\""; } >&5 ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XSERVERCFLAGS_CFLAGS=`$PKG_CONFIG --cflags "$REQUIRED_MODULES $REQUIRED_LIBS" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27739,10 +29158,10 @@ if test -n "$XSERVERCFLAGS_LIBS"; then pkg_cv_XSERVERCFLAGS_LIBS="$XSERVERCFLAGS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\""; } >&5 ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XSERVERCFLAGS_LIBS=`$PKG_CONFIG --libs "$REQUIRED_MODULES $REQUIRED_LIBS" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27756,8 +29175,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -27783,10 +29202,10 @@ Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -27800,23 +29219,23 @@ See \`config.log' for more details" "$LINENO" 5; } else XSERVERCFLAGS_CFLAGS=$pkg_cv_XSERVERCFLAGS_CFLAGS XSERVERCFLAGS_LIBS=$pkg_cv_XSERVERCFLAGS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $REQUIRED_LIBS" >&5 -$as_echo_n "checking for $REQUIRED_LIBS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $REQUIRED_LIBS" >&5 +printf %s "checking for $REQUIRED_LIBS... " >&6; } if test -n "$XSERVERLIBS_CFLAGS"; then pkg_cv_XSERVERLIBS_CFLAGS="$XSERVERLIBS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\""; } >&5 ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XSERVERLIBS_CFLAGS=`$PKG_CONFIG --cflags "$REQUIRED_LIBS" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27830,10 +29249,10 @@ if test -n "$XSERVERLIBS_LIBS"; then pkg_cv_XSERVERLIBS_LIBS="$XSERVERLIBS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\""; } >&5 ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XSERVERLIBS_LIBS=`$PKG_CONFIG --libs "$REQUIRED_LIBS" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27847,8 +29266,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -27874,10 +29293,10 @@ Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS and XSERVERLIBS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -27891,24 +29310,24 @@ See \`config.log' for more details" "$LINENO" 5; } else XSERVERLIBS_CFLAGS=$pkg_cv_XSERVERLIBS_CFLAGS XSERVERLIBS_LIBS=$pkg_cv_XSERVERLIBS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libunwind" >&5 -$as_echo_n "checking for libunwind... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libunwind" >&5 +printf %s "checking for libunwind... " >&6; } if test -n "$LIBUNWIND_CFLAGS"; then pkg_cv_LIBUNWIND_CFLAGS="$LIBUNWIND_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libunwind\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libunwind\""; } >&5 ($PKG_CONFIG --exists --print-errors "libunwind") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBUNWIND_CFLAGS=`$PKG_CONFIG --cflags "libunwind" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27922,10 +29341,10 @@ if test -n "$LIBUNWIND_LIBS"; then pkg_cv_LIBUNWIND_LIBS="$LIBUNWIND_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libunwind\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libunwind\""; } >&5 ($PKG_CONFIG --exists --print-errors "libunwind") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBUNWIND_LIBS=`$PKG_CONFIG --libs "libunwind" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -27939,8 +29358,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -27957,14 +29376,14 @@ fi HAVE_LIBUNWIND=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } HAVE_LIBUNWIND=no else LIBUNWIND_CFLAGS=$pkg_cv_LIBUNWIND_CFLAGS LIBUNWIND_LIBS=$pkg_cv_LIBUNWIND_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } HAVE_LIBUNWIND=yes fi if test "x$LIBUNWIND" = "xauto"; then @@ -27976,7 +29395,7 @@ if test "x$LIBUNWIND" = "xyes"; then as_fn_error $? "libunwind requested but not installed." "$LINENO" 5 fi -$as_echo "#define HAVE_LIBUNWIND 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBUNWIND 1" >>confdefs.h fi @@ -28048,13 +29467,15 @@ case "$host_os" in /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : mv conftest$EXEEXT conftest.parent - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-z,parent=conftest.parent -G" >&5 -$as_echo_n "checking whether the linker accepts -Wl,-z,parent=conftest.parent -G... " >&6; } -if ${xorg_cv_linker_flags__Wl__z_parent_conftest_parent__G+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-z,parent=conftest.parent -G" >&5 +printf %s "checking whether the linker accepts -Wl,-z,parent=conftest.parent -G... " >&6; } +if test ${xorg_cv_linker_flags__Wl__z_parent_conftest_parent__G+y} +then : + printf %s "(cached) " >&6 +else $as_nop ax_save_FLAGS=$LDFLAGS LDFLAGS="-Wl,-z,parent=conftest.parent -G" @@ -28063,19 +29484,20 @@ else extern int main(int argc, char **argv); int call_main(void) { return main(0, (void *)0); } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : xorg_cv_linker_flags__Wl__z_parent_conftest_parent__G=yes -else +else $as_nop xorg_cv_linker_flags__Wl__z_parent_conftest_parent__G=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$ax_save_FLAGS fi eval xorg_check_linker_flags=$xorg_cv_linker_flags__Wl__z_parent_conftest_parent__G -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_check_linker_flags" >&5 -$as_echo "$xorg_check_linker_flags" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_check_linker_flags" >&5 +printf "%s\n" "$xorg_check_linker_flags" >&6; } if test "x$xorg_check_linker_flags" = xyes; then LD_NO_UNDEFINED_FLAG="-Wl,-z,defs -Wl,-z,parent=\$(top_builddir)/hw/xfree86/Xorg" # Not set yet, since this gets exported in xorg-server.pc to all the drivers, @@ -28089,7 +29511,7 @@ fi rm -f conftest.parent fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext ;; esac @@ -28113,8 +29535,8 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if SVR4 needs to be defined" >&5 -$as_echo_n "checking if SVR4 needs to be defined... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if SVR4 needs to be defined" >&5 +printf %s "checking if SVR4 needs to be defined... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -28124,28 +29546,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "I_AM_SVR4" >/dev/null 2>&1; then : + $EGREP "I_AM_SVR4" >/dev/null 2>&1 +then : -$as_echo "#define SVR4 1" >>confdefs.h +printf "%s\n" "#define SVR4 1" >>confdefs.h -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f conftest* +rm -rf conftest* XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SYNC_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC $DBE_INC $PRESENT_INC" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xvfb DDX" >&5 -$as_echo_n "checking whether to build Xvfb DDX... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XVFB" >&5 -$as_echo "$XVFB" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build Xvfb DDX" >&5 +printf %s "checking whether to build Xvfb DDX... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XVFB" >&5 +printf "%s\n" "$XVFB" >&6; } if test "x$XVFB" = xyes; then XVFB_TRUE= XVFB_FALSE='#' @@ -28166,17 +29589,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBXEXT x11 xau $XDMCP_MODULES" >&5 -$as_echo_n "checking for $LIBXEXT x11 xau $XDMCP_MODULES... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LIBXEXT x11 xau $XDMCP_MODULES" >&5 +printf %s "checking for $LIBXEXT x11 xau $XDMCP_MODULES... " >&6; } if test -n "$XNESTMODULES_CFLAGS"; then pkg_cv_XNESTMODULES_CFLAGS="$XNESTMODULES_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11 xau \$XDMCP_MODULES\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11 xau \$XDMCP_MODULES\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBXEXT x11 xau $XDMCP_MODULES") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XNESTMODULES_CFLAGS=`$PKG_CONFIG --cflags "$LIBXEXT x11 xau $XDMCP_MODULES" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28190,10 +29613,10 @@ if test -n "$XNESTMODULES_LIBS"; then pkg_cv_XNESTMODULES_LIBS="$XNESTMODULES_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11 xau \$XDMCP_MODULES\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11 xau \$XDMCP_MODULES\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBXEXT x11 xau $XDMCP_MODULES") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XNESTMODULES_LIBS=`$PKG_CONFIG --libs "$LIBXEXT x11 xau $XDMCP_MODULES" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28207,8 +29630,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -28225,23 +29648,23 @@ fi have_xnest=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_xnest=no else XNESTMODULES_CFLAGS=$pkg_cv_XNESTMODULES_CFLAGS XNESTMODULES_LIBS=$pkg_cv_XNESTMODULES_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_xnest=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xnest DDX" >&5 -$as_echo_n "checking whether to build Xnest DDX... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build Xnest DDX" >&5 +printf %s "checking whether to build Xnest DDX... " >&6; } if test "x$XNEST" = xauto; then XNEST="$have_xnest" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XNEST" >&5 -$as_echo "$XNEST" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XNEST" >&5 +printf "%s\n" "$XNEST" >&6; } if test "x$XNEST" = xyes; then XNEST_TRUE= XNEST_FALSE='#' @@ -28263,8 +29686,8 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xorg DDX" >&5 -$as_echo_n "checking whether to build Xorg DDX... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build Xorg DDX" >&5 +printf %s "checking whether to build Xorg DDX... " >&6; } if test "x$XORG" = xauto; then XORG="yes" case $host_os in @@ -28273,23 +29696,23 @@ if test "x$XORG" = xauto; then darwin*) XORG="no" ;; esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XORG" >&5 -$as_echo "$XORG" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XORG" >&5 +printf "%s\n" "$XORG" >&6; } if test "x$XORG" = xyes; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBXCVT" >&5 -$as_echo_n "checking for $LIBXCVT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LIBXCVT" >&5 +printf %s "checking for $LIBXCVT... " >&6; } if test -n "$LIBXCVT_CFLAGS"; then pkg_cv_LIBXCVT_CFLAGS="$LIBXCVT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXCVT\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXCVT\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBXCVT") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXCVT_CFLAGS=`$PKG_CONFIG --cflags "$LIBXCVT" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28303,10 +29726,10 @@ if test -n "$LIBXCVT_LIBS"; then pkg_cv_LIBXCVT_LIBS="$LIBXCVT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXCVT\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXCVT\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBXCVT") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXCVT_LIBS=`$PKG_CONFIG --libs "$LIBXCVT" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28320,8 +29743,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -28347,10 +29770,10 @@ Alternatively, you may set the environment variables LIBXCVT_CFLAGS and LIBXCVT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -28364,8 +29787,8 @@ See \`config.log' for more details" "$LINENO" 5; } else LIBXCVT_CFLAGS=$pkg_cv_LIBXCVT_CFLAGS LIBXCVT_LIBS=$pkg_cv_LIBXCVT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -28379,8 +29802,8 @@ fi symbol_visibility= have_visibility=disabled if test x$SYMBOL_VISIBILITY != xno; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbol visibility support" >&5 -$as_echo_n "checking for symbol visibility support... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for symbol visibility support" >&5 +printf %s "checking for symbol visibility support... " >&6; } if test x$GCC = xyes; then VISIBILITY_CFLAGS="-fvisibility=hidden" else @@ -28403,23 +29826,24 @@ $as_echo_n "checking for symbol visibility support... " >&6; } extern _X_HIDDEN int hidden_int_func(void); extern _X_EXPORT int public_int_func(void); int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : have_visibility=yes -else +else $as_nop have_visibility=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS=$save_CFLAGS fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_visibility" >&5 -$as_echo "$have_visibility" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_visibility" >&5 +printf "%s\n" "$have_visibility" >&6; } if test x$have_visibility != xno; then symbol_visibility=$VISIBILITY_CFLAGS XORG_CFLAGS="$XORG_CFLAGS $VISIBILITY_CFLAGS" @@ -28431,22 +29855,22 @@ $as_echo "$have_visibility" >&6; } xorg_bus_bsdpci=no xorg_bus_sparc=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Xorg PCI functions" >&5 -$as_echo_n "checking whether to build Xorg PCI functions... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build Xorg PCI functions" >&5 +printf %s "checking whether to build Xorg PCI functions... " >&6; } if test "x$PCI" = xyes; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBPCIACCESS" >&5 -$as_echo_n "checking for $LIBPCIACCESS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LIBPCIACCESS" >&5 +printf %s "checking for $LIBPCIACCESS... " >&6; } if test -n "$PCIACCESS_CFLAGS"; then pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "$LIBPCIACCESS" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28460,10 +29884,10 @@ if test -n "$PCIACCESS_LIBS"; then pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\""; } >&5 ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "$LIBPCIACCESS" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28477,8 +29901,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -28504,10 +29928,10 @@ Alternatively, you may set the environment variables PCIACCESS_CFLAGS and PCIACCESS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -28521,8 +29945,8 @@ See \`config.log' for more details" "$LINENO" 5; } else PCIACCESS_CFLAGS=$pkg_cv_PCIACCESS_CFLAGS PCIACCESS_LIBS=$pkg_cv_PCIACCESS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $LIBPCIACCESS" @@ -28530,7 +29954,7 @@ fi XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS $LIBDRM_CFLAGS" -$as_echo "#define XSERVER_LIBPCIACCESS 1" >>confdefs.h +printf "%s\n" "#define XSERVER_LIBPCIACCESS 1" >>confdefs.h prefix_NONE= @@ -28542,9 +29966,7 @@ $as_echo "#define XSERVER_LIBPCIACCESS 1" >>confdefs.h PCI_TXT_IDS_PATH="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define PCI_TXT_IDS_PATH "$ac_define_dir" -_ACEOF +printf "%s\n" "#define PCI_TXT_IDS_PATH \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -28574,16 +29996,16 @@ _ACEOF as_fn_error $? "Cannot build int10 without libpciaccess" "$LINENO" 5 fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCI" >&5 -$as_echo "$PCI" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PCI" >&5 +printf "%s\n" "$PCI" >&6; } if test "x$CONFIG_UDEV_KMS" = xyes; then -$as_echo "#define XSERVER_PLATFORM_BUS 1" >>confdefs.h +printf "%s\n" "#define XSERVER_PLATFORM_BUS 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSERVER_PLATFORM_BUS" >&5 -$as_echo "$XSERVER_PLATFORM_BUS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XSERVER_PLATFORM_BUS" >&5 +printf "%s\n" "$XSERVER_PLATFORM_BUS" >&6; } case $host_os in linux*) @@ -28596,18 +30018,16 @@ $as_echo "$XSERVER_PLATFORM_BUS" >&6; } *) ;; esac - for ac_header in linux/apm_bios.h + for ac_header in linux/apm_bios.h do : - ac_fn_c_check_header_mongrel "$LINENO" "linux/apm_bios.h" "ac_cv_header_linux_apm_bios_h" "$ac_includes_default" -if test "x$ac_cv_header_linux_apm_bios_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LINUX_APM_BIOS_H 1 -_ACEOF + ac_fn_c_check_header_compile "$LINENO" "linux/apm_bios.h" "ac_cv_header_linux_apm_bios_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_apm_bios_h" = xyes +then : + printf "%s\n" "#define HAVE_LINUX_APM_BIOS_H 1" >>confdefs.h linux_apm=$enable_linux_apm fi done - ;; freebsd* | kfreebsd*-gnu | dragonfly*) XORG_OS_SUBDIR="bsd" @@ -28620,54 +30040,47 @@ done ;; solaris*) XORG_OS_SUBDIR="solaris" - for ac_header in sys/kd.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/kd.h" "ac_cv_header_sys_kd_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_kd_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_KD_H 1 -_ACEOF + ac_fn_c_check_header_compile "$LINENO" "sys/kd.h" "ac_cv_header_sys_kd_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_kd_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_KD_H 1" >>confdefs.h fi -done - - for ac_header in sys/vt.h + for ac_header in sys/vt.h do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/vt.h" "ac_cv_header_sys_vt_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_vt_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_VT_H 1 -_ACEOF + ac_fn_c_check_header_compile "$LINENO" "sys/vt.h" "ac_cv_header_sys_vt_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_vt_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_VT_H 1" >>confdefs.h solaris_vt=yes -else +else $as_nop solaris_vt=no fi done - # Check for minimum supported release - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Solaris version" >&5 -$as_echo_n "checking Solaris version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Solaris version" >&5 +printf %s "checking Solaris version... " >&6; } OS_MINOR=`echo ${host_os}|$SED -e 's/^.*solaris2\.//' -e s'/\..*$//'` if test "${OS_MINOR}" -ge 7 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Solaris ${OS_MINOR}" >&5 -$as_echo "Solaris ${OS_MINOR}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Solaris ${OS_MINOR}" >&5 +printf "%s\n" "Solaris ${OS_MINOR}" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Solaris \`echo ${host_os}|$SED -e 's/^.*solaris//\`" >&5 -$as_echo "Solaris \`echo ${host_os}|$SED -e 's/^.*solaris//\`" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Solaris \`echo ${host_os}|$SED -e 's/^.*solaris//\`" >&5 +printf "%s\n" "Solaris \`echo ${host_os}|$SED -e 's/^.*solaris//\`" >&6; } fi if test "${OS_MINOR}" -lt 8 ; then as_fn_error $? "This release no longer supports Solaris versions older than Solaris 8." "$LINENO" 5 fi - ac_fn_c_check_decl "$LINENO" "_LP64" "ac_cv_have_decl__LP64" "$ac_includes_default" -if test "x$ac_cv_have_decl__LP64" = xyes; then : + ac_fn_check_decl "$LINENO" "_LP64" "ac_cv_have_decl__LP64" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl__LP64" = xyes +then : SOLARIS_64="yes" -else +else $as_nop SOLARIS_64="no" fi - case $host_cpu in sparc*) SOLARIS_INOUT_ARCH="sparcv8plus" @@ -28695,9 +30108,9 @@ fi ;; *) XORG_OS_SUBDIR="stub" - { $as_echo "$as_me:${as_lineno-$LINENO}: Your OS is unknown. If you are interested in porting Xorg to your platform, + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Your OS is unknown. If you are interested in porting Xorg to your platform, please email xorg@lists.freedesktop.org." >&5 -$as_echo "$as_me: Your OS is unknown. If you are interested in porting Xorg to your platform, +printf "%s\n" "$as_me: Your OS is unknown. If you are interested in porting Xorg to your platform, please email xorg@lists.freedesktop.org." >&6;} ;; esac @@ -28705,17 +30118,17 @@ please email xorg@lists.freedesktop.org." >&6;} if test "x$DGA" = xauto; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DGAPROTO" >&5 -$as_echo_n "checking for $DGAPROTO... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $DGAPROTO" >&5 +printf %s "checking for $DGAPROTO... " >&6; } if test -n "$DGA_CFLAGS"; then pkg_cv_DGA_CFLAGS="$DGA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DGA_CFLAGS=`$PKG_CONFIG --cflags "$DGAPROTO" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28729,10 +30142,10 @@ if test -n "$DGA_LIBS"; then pkg_cv_DGA_LIBS="$DGA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DGA_LIBS=`$PKG_CONFIG --libs "$DGAPROTO" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28746,8 +30159,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -28764,14 +30177,14 @@ fi DGA=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } DGA=no else DGA_CFLAGS=$pkg_cv_DGA_CFLAGS DGA_LIBS=$pkg_cv_DGA_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } DGA=yes fi fi @@ -28779,17 +30192,17 @@ fi XORG_MODULES="$XORG_MODULES $DGAPROTO" pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DGAPROTO" >&5 -$as_echo_n "checking for $DGAPROTO... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $DGAPROTO" >&5 +printf %s "checking for $DGAPROTO... " >&6; } if test -n "$DGA_CFLAGS"; then pkg_cv_DGA_CFLAGS="$DGA_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DGA_CFLAGS=`$PKG_CONFIG --cflags "$DGAPROTO" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28803,10 +30216,10 @@ if test -n "$DGA_LIBS"; then pkg_cv_DGA_LIBS="$DGA_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5 ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DGA_LIBS=`$PKG_CONFIG --libs "$DGAPROTO" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28820,8 +30233,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -28847,10 +30260,10 @@ Alternatively, you may set the environment variables DGA_CFLAGS and DGA_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -28864,15 +30277,15 @@ See \`config.log' for more details" "$LINENO" 5; } else DGA_CFLAGS=$pkg_cv_DGA_CFLAGS DGA_LIBS=$pkg_cv_DGA_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi -$as_echo "#define DGA 1" >>confdefs.h +printf "%s\n" "#define DGA 1" >>confdefs.h -$as_echo "#define XFreeXDGA 1" >>confdefs.h +printf "%s\n" "#define XFreeXDGA 1" >>confdefs.h fi @@ -28883,17 +30296,17 @@ $as_echo "#define XFreeXDGA 1" >>confdefs.h if test -n "$XORG_MODULES"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $XORG_MODULES" >&5 -$as_echo_n "checking for $XORG_MODULES... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $XORG_MODULES" >&5 +printf %s "checking for $XORG_MODULES... " >&6; } if test -n "$XORG_MODULES_CFLAGS"; then pkg_cv_XORG_MODULES_CFLAGS="$XORG_MODULES_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\""; } >&5 ($PKG_CONFIG --exists --print-errors "$XORG_MODULES") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XORG_MODULES_CFLAGS=`$PKG_CONFIG --cflags "$XORG_MODULES" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28907,10 +30320,10 @@ if test -n "$XORG_MODULES_LIBS"; then pkg_cv_XORG_MODULES_LIBS="$XORG_MODULES_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\""; } >&5 ($PKG_CONFIG --exists --print-errors "$XORG_MODULES") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XORG_MODULES_LIBS=`$PKG_CONFIG --libs "$XORG_MODULES" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -28924,8 +30337,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -28951,10 +30364,10 @@ Alternatively, you may set the environment variables XORG_MODULES_CFLAGS and XORG_MODULES_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -28968,8 +30381,8 @@ See \`config.log' for more details" "$LINENO" 5; } else XORG_MODULES_CFLAGS=$pkg_cv_XORG_MODULES_CFLAGS XORG_MODULES_LIBS=$pkg_cv_XORG_MODULES_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi XORG_CFLAGS="$XORG_CFLAGS $XORG_MODULES_CFLAGS" @@ -28993,27 +30406,25 @@ fi XDG_DATA_HOME=".local/share" XDG_DATA_HOME_LOGDIR="xorg" -$as_echo "#define XORG_SERVER 1" >>confdefs.h +printf "%s\n" "#define XORG_SERVER 1" >>confdefs.h -$as_echo "#define XORGSERVER 1" >>confdefs.h +printf "%s\n" "#define XORGSERVER 1" >>confdefs.h -$as_echo "#define XFree86Server 1" >>confdefs.h +printf "%s\n" "#define XFree86Server 1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define XORG_VERSION_CURRENT $VENDOR_RELEASE -_ACEOF +printf "%s\n" "#define XORG_VERSION_CURRENT $VENDOR_RELEASE" >>confdefs.h -$as_echo "#define NEED_XF86_TYPES 1" >>confdefs.h +printf "%s\n" "#define NEED_XF86_TYPES 1" >>confdefs.h -$as_echo "#define NEED_XF86_PROTOTYPES 1" >>confdefs.h +printf "%s\n" "#define NEED_XF86_PROTOTYPES 1" >>confdefs.h -$as_echo "#define __XSERVERNAME__ \"Xorg\"" >>confdefs.h +printf "%s\n" "#define __XSERVERNAME__ \"Xorg\"" >>confdefs.h prefix_NONE= @@ -29025,9 +30436,7 @@ $as_echo "#define __XSERVERNAME__ \"Xorg\"" >>confdefs.h XCONFIGFILE="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define XCONFIGFILE "$ac_define_dir" -_ACEOF +printf "%s\n" "#define XCONFIGFILE \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -29042,9 +30451,7 @@ _ACEOF XF86CONFIGFILE="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define XF86CONFIGFILE "$ac_define_dir" -_ACEOF +printf "%s\n" "#define XF86CONFIGFILE \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -29059,9 +30466,7 @@ _ACEOF XCONFIGDIR="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define XCONFIGDIR "$ac_define_dir" -_ACEOF +printf "%s\n" "#define XCONFIGDIR \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -29076,9 +30481,7 @@ _ACEOF DEFAULT_MODULE_PATH="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define DEFAULT_MODULE_PATH "$ac_define_dir" -_ACEOF +printf "%s\n" "#define DEFAULT_MODULE_PATH \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -29093,9 +30496,7 @@ _ACEOF DEFAULT_LIBRARY_PATH="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define DEFAULT_LIBRARY_PATH "$ac_define_dir" -_ACEOF +printf "%s\n" "#define DEFAULT_LIBRARY_PATH \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -29110,9 +30511,7 @@ _ACEOF DEFAULT_LOGDIR="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define DEFAULT_LOGDIR "$ac_define_dir" -_ACEOF +printf "%s\n" "#define DEFAULT_LOGDIR \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -29127,9 +30526,7 @@ _ACEOF DEFAULT_LOGPREFIX="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define DEFAULT_LOGPREFIX "$ac_define_dir" -_ACEOF +printf "%s\n" "#define DEFAULT_LOGPREFIX \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -29144,9 +30541,7 @@ _ACEOF DEFAULT_XDG_DATA_HOME="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define DEFAULT_XDG_DATA_HOME "$ac_define_dir" -_ACEOF +printf "%s\n" "#define DEFAULT_XDG_DATA_HOME \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -29161,21 +30556,17 @@ _ACEOF DEFAULT_XDG_DATA_HOME_LOGDIR="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define DEFAULT_XDG_DATA_HOME_LOGDIR "$ac_define_dir" -_ACEOF +printf "%s\n" "#define DEFAULT_XDG_DATA_HOME_LOGDIR \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE -cat >>confdefs.h <<_ACEOF -#define __VENDORDWEBSUPPORT__ "$VENDOR_WEB" -_ACEOF +printf "%s\n" "#define __VENDORDWEBSUPPORT__ \"$VENDOR_WEB\"" >>confdefs.h if test "x$VGAHW" = xyes; then -$as_echo "#define WITH_VGAHW 1" >>confdefs.h +printf "%s\n" "#define WITH_VGAHW 1" >>confdefs.h fi @@ -29309,21 +30700,21 @@ fi if test "x$GLAMOR" = xyes; then -$as_echo "#define GLAMOR 1" >>confdefs.h +printf "%s\n" "#define GLAMOR 1" >>confdefs.h pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoxy" >&5 -$as_echo_n "checking for epoxy... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for epoxy" >&5 +printf %s "checking for epoxy... " >&6; } if test -n "$GLAMOR_CFLAGS"; then pkg_cv_GLAMOR_CFLAGS="$GLAMOR_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"epoxy\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"epoxy\""; } >&5 ($PKG_CONFIG --exists --print-errors "epoxy") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLAMOR_CFLAGS=`$PKG_CONFIG --cflags "epoxy" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -29337,10 +30728,10 @@ if test -n "$GLAMOR_LIBS"; then pkg_cv_GLAMOR_LIBS="$GLAMOR_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"epoxy\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"epoxy\""; } >&5 ($PKG_CONFIG --exists --print-errors "epoxy") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLAMOR_LIBS=`$PKG_CONFIG --libs "epoxy" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -29354,8 +30745,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -29381,10 +30772,10 @@ Alternatively, you may set the environment variables GLAMOR_CFLAGS and GLAMOR_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -29398,46 +30789,46 @@ See \`config.log' for more details" "$LINENO" 5; } else GLAMOR_CFLAGS=$pkg_cv_GLAMOR_CFLAGS GLAMOR_LIBS=$pkg_cv_GLAMOR_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"epoxy >= 1.4.4\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"epoxy >= 1.4.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "epoxy >= 1.4.4") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then -$as_echo "#define GLAMOR_HAS_EGL_QUERY_DMABUF 1" >>confdefs.h +printf "%s\n" "#define GLAMOR_HAS_EGL_QUERY_DMABUF 1" >>confdefs.h fi if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"epoxy >= 1.5.4\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"epoxy >= 1.5.4\""; } >&5 ($PKG_CONFIG --exists --print-errors "epoxy >= 1.5.4") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then -$as_echo "#define GLAMOR_HAS_EGL_QUERY_DRIVER 1" >>confdefs.h +printf "%s\n" "#define GLAMOR_HAS_EGL_QUERY_DRIVER 1" >>confdefs.h fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"$LIBGBM\"" >&5 -$as_echo_n "checking for \"$LIBGBM\"... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for \"$LIBGBM\"" >&5 +printf %s "checking for \"$LIBGBM\"... " >&6; } if test -n "$GBM_CFLAGS"; then pkg_cv_GBM_CFLAGS="$GBM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"\$LIBGBM\"\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"\$LIBGBM\"\""; } >&5 ($PKG_CONFIG --exists --print-errors ""$LIBGBM"") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GBM_CFLAGS=`$PKG_CONFIG --cflags ""$LIBGBM"" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -29451,10 +30842,10 @@ if test -n "$GBM_LIBS"; then pkg_cv_GBM_LIBS="$GBM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"\$LIBGBM\"\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"\$LIBGBM\"\""; } >&5 ($PKG_CONFIG --exists --print-errors ""$LIBGBM"") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GBM_LIBS=`$PKG_CONFIG --libs ""$LIBGBM"" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -29468,8 +30859,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -29486,37 +30877,37 @@ fi GBM=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } GBM=no else GBM_CFLAGS=$pkg_cv_GBM_CFLAGS GBM_LIBS=$pkg_cv_GBM_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } GBM=yes fi if test "x$GBM" = xyes; then -$as_echo "#define GLAMOR_HAS_GBM 1" >>confdefs.h +printf "%s\n" "#define GLAMOR_HAS_GBM 1" >>confdefs.h - ac_fn_c_check_decl "$LINENO" "GBM_BO_USE_LINEAR" "ac_cv_have_decl_GBM_BO_USE_LINEAR" "#include <stdlib.h> + ac_fn_check_decl "$LINENO" "GBM_BO_USE_LINEAR" "ac_cv_have_decl_GBM_BO_USE_LINEAR" "#include <stdlib.h> #include <gbm.h> -" -if test "x$ac_cv_have_decl_GBM_BO_USE_LINEAR" = xyes; then : +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_GBM_BO_USE_LINEAR" = xyes +then : -$as_echo "#define GLAMOR_HAS_GBM_LINEAR 1" >>confdefs.h +printf "%s\n" "#define GLAMOR_HAS_GBM_LINEAR 1" >>confdefs.h fi - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gbm >= 17.1.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gbm >= 17.1.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gbm >= 17.1.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then -$as_echo "#define GBM_BO_WITH_MODIFIERS 1" >>confdefs.h +printf "%s\n" "#define GBM_BO_WITH_MODIFIERS 1" >>confdefs.h fi else @@ -29535,8 +30926,8 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build XWin DDX" >&5 -$as_echo_n "checking whether to build XWin DDX... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build XWin DDX" >&5 +printf %s "checking whether to build XWin DDX... " >&6; } if test "x$XWIN" = xauto; then case $host_os in cygwin*) XWIN="yes" ;; @@ -29544,8 +30935,8 @@ if test "x$XWIN" = xauto; then *) XWIN="no" ;; esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XWIN" >&5 -$as_echo "$XWIN" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XWIN" >&5 +printf "%s\n" "$XWIN" >&6; } if test "x$XWIN" = xyes; then @@ -29558,31 +30949,26 @@ if test "x$XWIN" = xyes; then DEFAULT_LOGDIR="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define DEFAULT_LOGDIR "$ac_define_dir" -_ACEOF +printf "%s\n" "#define DEFAULT_LOGDIR \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE -cat >>confdefs.h <<_ACEOF -#define XORG_VERSION_CURRENT $VENDOR_RELEASE -_ACEOF +printf "%s\n" "#define XORG_VERSION_CURRENT $VENDOR_RELEASE" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define __VENDORDWEBSUPPORT__ "$VENDOR_WEB" -_ACEOF +printf "%s\n" "#define __VENDORDWEBSUPPORT__ \"$VENDOR_WEB\"" >>confdefs.h if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. set dummy ${ac_tool_prefix}windres; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_WINDRES+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_WINDRES+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$WINDRES"; then ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. else @@ -29590,11 +30976,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_WINDRES="${ac_tool_prefix}windres" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -29605,11 +30995,11 @@ fi fi WINDRES=$ac_cv_prog_WINDRES if test -n "$WINDRES"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5 -$as_echo "$WINDRES" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5 +printf "%s\n" "$WINDRES" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -29618,11 +31008,12 @@ if test -z "$ac_cv_prog_WINDRES"; then ac_ct_WINDRES=$WINDRES # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_WINDRES+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_WINDRES+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_WINDRES"; then ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. else @@ -29630,11 +31021,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_WINDRES="windres" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -29645,11 +31040,11 @@ fi fi ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES if test -n "$ac_ct_WINDRES"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5 -$as_echo "$ac_ct_WINDRES" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5 +printf "%s\n" "$ac_ct_WINDRES" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_WINDRES" = x; then @@ -29657,8 +31052,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac WINDRES=$ac_ct_WINDRES @@ -29670,17 +31065,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes" >&5 -$as_echo_n "checking for xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes" >&5 +printf %s "checking for xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes... " >&6; } if test -n "$XWINMODULES_CFLAGS"; then pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XWINMODULES_CFLAGS=`$PKG_CONFIG --cflags "xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -29694,10 +31089,10 @@ if test -n "$XWINMODULES_LIBS"; then pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes\""; } >&5 ($PKG_CONFIG --exists --print-errors "xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XWINMODULES_LIBS=`$PKG_CONFIG --libs "xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -29711,8 +31106,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -29738,10 +31133,10 @@ Alternatively, you may set the environment variables XWINMODULES_CFLAGS and XWINMODULES_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -29755,17 +31150,17 @@ See \`config.log' for more details" "$LINENO" 5; } else XWINMODULES_CFLAGS=$pkg_cv_XWINMODULES_CFLAGS XWINMODULES_LIBS=$pkg_cv_XWINMODULES_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi if test "x$WINDOWSDRI" = xauto; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"windowsdriproto\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"windowsdriproto\""; } >&5 ($PKG_CONFIG --exists --print-errors "windowsdriproto") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then WINDOWSDRI=yes else @@ -29775,17 +31170,17 @@ fi if test "x$WINDOWSDRI" = xyes ; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for windowsdriproto" >&5 -$as_echo_n "checking for windowsdriproto... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for windowsdriproto" >&5 +printf %s "checking for windowsdriproto... " >&6; } if test -n "$WINDOWSDRI_CFLAGS"; then pkg_cv_WINDOWSDRI_CFLAGS="$WINDOWSDRI_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"windowsdriproto\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"windowsdriproto\""; } >&5 ($PKG_CONFIG --exists --print-errors "windowsdriproto") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WINDOWSDRI_CFLAGS=`$PKG_CONFIG --cflags "windowsdriproto" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -29799,10 +31194,10 @@ if test -n "$WINDOWSDRI_LIBS"; then pkg_cv_WINDOWSDRI_LIBS="$WINDOWSDRI_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"windowsdriproto\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"windowsdriproto\""; } >&5 ($PKG_CONFIG --exists --print-errors "windowsdriproto") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WINDOWSDRI_LIBS=`$PKG_CONFIG --libs "windowsdriproto" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -29816,8 +31211,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -29843,10 +31238,10 @@ Alternatively, you may set the environment variables WINDOWSDRI_CFLAGS and WINDOWSDRI_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -29860,8 +31255,8 @@ See \`config.log' for more details" "$LINENO" 5; } else WINDOWSDRI_CFLAGS=$pkg_cv_WINDOWSDRI_CFLAGS WINDOWSDRI_LIBS=$pkg_cv_WINDOWSDRI_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi fi @@ -29870,16 +31265,16 @@ fi cygwin*) XWIN_SERVER_NAME=XWin -$as_echo "#define HAS_DEVWINDOWS 1" >>confdefs.h +printf "%s\n" "#define HAS_DEVWINDOWS 1" >>confdefs.h ;; mingw*) XWIN_SERVER_NAME=Xming -$as_echo "#define RELOCATE_PROJECTROOT 1" >>confdefs.h +printf "%s\n" "#define RELOCATE_PROJECTROOT 1" >>confdefs.h -$as_echo "#define HAS_WINSOCK 1" >>confdefs.h +printf "%s\n" "#define HAS_WINSOCK 1" >>confdefs.h XWIN_SYS_LIBS="-lpthread -lws2_32" ;; @@ -29893,31 +31288,32 @@ $as_echo "#define HAS_WINSOCK 1" >>confdefs.h if test "x$DEBUGGING" = xyes; then -$as_echo "#define CYGDEBUG 1" >>confdefs.h +printf "%s\n" "#define CYGDEBUG 1" >>confdefs.h -$as_echo "#define CYGWINDOWING_DEBUG 1" >>confdefs.h +printf "%s\n" "#define CYGWINDOWING_DEBUG 1" >>confdefs.h -$as_echo "#define CYGMULTIWINDOW_DEBUG 1" >>confdefs.h +printf "%s\n" "#define CYGMULTIWINDOW_DEBUG 1" >>confdefs.h fi -$as_echo "#define DDXOSVERRORF 1" >>confdefs.h +printf "%s\n" "#define DDXOSVERRORF 1" >>confdefs.h -$as_echo "#define DDXBEFORERESET 1" >>confdefs.h +printf "%s\n" "#define DDXBEFORERESET 1" >>confdefs.h if test "x$XWIN" = xyes && test "x$GLX" = xyes ; then # Extract the first word of "python3", so it can be a program name with args. set dummy python3; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_PYTHON3+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_PYTHON3+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$PYTHON3"; then ac_cv_prog_PYTHON3="$PYTHON3" # Let the user override the test. else @@ -29925,11 +31321,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_PYTHON3="python3" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -29940,39 +31340,39 @@ fi fi PYTHON3=$ac_cv_prog_PYTHON3 if test -n "$PYTHON3"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON3" >&5 -$as_echo "$PYTHON3" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON3" >&5 +printf "%s\n" "$PYTHON3" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test -z "$PYTHON3"; then as_fn_error $? "python3 not found" "$LINENO" 5 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module lxml" >&5 -$as_echo_n "checking for python module lxml... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python module lxml" >&5 +printf %s "checking for python module lxml... " >&6; } $PYTHON3 -c "import lxml;" if test $? -ne 0 ; then as_fn_error $? "not found" "$LINENO" 5 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } if test "x$KHRONOS_SPEC_DIR" = "xauto" ; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for khronos-opengl-registry" >&5 -$as_echo_n "checking for khronos-opengl-registry... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for khronos-opengl-registry" >&5 +printf %s "checking for khronos-opengl-registry... " >&6; } if test -n "$KHRONOS_OPENGL_REGISTRY_CFLAGS"; then pkg_cv_KHRONOS_OPENGL_REGISTRY_CFLAGS="$KHRONOS_OPENGL_REGISTRY_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"khronos-opengl-registry\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"khronos-opengl-registry\""; } >&5 ($PKG_CONFIG --exists --print-errors "khronos-opengl-registry") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_KHRONOS_OPENGL_REGISTRY_CFLAGS=`$PKG_CONFIG --cflags "khronos-opengl-registry" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -29986,10 +31386,10 @@ if test -n "$KHRONOS_OPENGL_REGISTRY_LIBS"; then pkg_cv_KHRONOS_OPENGL_REGISTRY_LIBS="$KHRONOS_OPENGL_REGISTRY_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"khronos-opengl-registry\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"khronos-opengl-registry\""; } >&5 ($PKG_CONFIG --exists --print-errors "khronos-opengl-registry") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_KHRONOS_OPENGL_REGISTRY_LIBS=`$PKG_CONFIG --libs "khronos-opengl-registry" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -30003,8 +31403,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -30030,10 +31430,10 @@ Alternatively, you may set the environment variables KHRONOS_OPENGL_REGISTRY_CFL and KHRONOS_OPENGL_REGISTRY_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -30047,8 +31447,8 @@ See \`config.log' for more details" "$LINENO" 5; } else KHRONOS_OPENGL_REGISTRY_CFLAGS=$pkg_cv_KHRONOS_OPENGL_REGISTRY_CFLAGS KHRONOS_OPENGL_REGISTRY_LIBS=$pkg_cv_KHRONOS_OPENGL_REGISTRY_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi KHRONOS_SPEC_DIR=`pkg-config khronos-opengl-registry --variable=specdir` @@ -30084,20 +31484,21 @@ fi if test "x$XQUARTZ" = xyes; then -$as_echo "#define XQUARTZ 1" >>confdefs.h +printf "%s\n" "#define XQUARTZ 1" >>confdefs.h -$as_echo "#define ROOTLESS 1" >>confdefs.h +printf "%s\n" "#define ROOTLESS 1" >>confdefs.h XQUARTZ_LIBS="$COMPOSITE_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $PRESENT_LIB" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xp_init in -lXplugin" >&5 -$as_echo_n "checking for xp_init in -lXplugin... " >&6; } -if ${ac_cv_lib_Xplugin_xp_init+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xp_init in -lXplugin" >&5 +printf %s "checking for xp_init in -lXplugin... " >&6; } +if test ${ac_cv_lib_Xplugin_xp_init+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lXplugin $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -30106,30 +31507,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char xp_init (); int -main () +main (void) { return xp_init (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_Xplugin_xp_init=yes -else +else $as_nop ac_cv_lib_Xplugin_xp_init=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xplugin_xp_init" >&5 -$as_echo "$ac_cv_lib_Xplugin_xp_init" >&6; } -if test "x$ac_cv_lib_Xplugin_xp_init" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xplugin_xp_init" >&5 +printf "%s\n" "$ac_cv_lib_Xplugin_xp_init" >&6; } +if test "x$ac_cv_lib_Xplugin_xp_init" = xyes +then : : fi @@ -30138,17 +31538,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $APPLEWMPROTO $LIBAPPLEWM xfixes x11" >&5 -$as_echo_n "checking for $APPLEWMPROTO $LIBAPPLEWM xfixes x11... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $APPLEWMPROTO $LIBAPPLEWM xfixes x11" >&5 +printf %s "checking for $APPLEWMPROTO $LIBAPPLEWM xfixes x11... " >&6; } if test -n "$XPBPROXY_CFLAGS"; then pkg_cv_XPBPROXY_CFLAGS="$XPBPROXY_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XPBPROXY_CFLAGS=`$PKG_CONFIG --cflags "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -30162,10 +31562,10 @@ if test -n "$XPBPROXY_LIBS"; then pkg_cv_XPBPROXY_LIBS="$XPBPROXY_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\""; } >&5 ($PKG_CONFIG --exists --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XPBPROXY_LIBS=`$PKG_CONFIG --libs "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -30179,8 +31579,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -30206,10 +31606,10 @@ Alternatively, you may set the environment variables XPBPROXY_CFLAGS and XPBPROXY_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -30223,20 +31623,20 @@ See \`config.log' for more details" "$LINENO" 5; } else XPBPROXY_CFLAGS=$pkg_cv_XPBPROXY_CFLAGS XPBPROXY_LIBS=$pkg_cv_XPBPROXY_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi if test "x$XQUARTZ_SPARKLE" = xyes ; then -$as_echo "#define XQUARTZ_SPARKLE 1" >>confdefs.h +printf "%s\n" "#define XQUARTZ_SPARKLE 1" >>confdefs.h fi if test "x$STANDALONE_XPBPROXY" = xyes ; then -$as_echo "#define STANDALONE_XPBPROXY 1" >>confdefs.h +printf "%s\n" "#define STANDALONE_XPBPROXY 1" >>confdefs.h fi fi @@ -30263,11 +31663,12 @@ OBJCFLAGS='$(CFLAGS)' depcc="$OBJC" am_compiler_list='gcc3 gcc' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_OBJC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_OBJC_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -30372,8 +31773,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_OBJC_dependencies_compiler_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJC_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_OBJC_dependencies_compiler_type" >&6; } OBJCDEPMODE=depmode=$am_cv_OBJC_dependencies_compiler_type if @@ -30440,17 +31841,17 @@ if test "$KDRIVE" = yes; then if test "x$XEPHYR" = xauto; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $XEPHYR_REQUIRED_LIBS" >&5 -$as_echo_n "checking for $XEPHYR_REQUIRED_LIBS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $XEPHYR_REQUIRED_LIBS" >&5 +printf %s "checking for $XEPHYR_REQUIRED_LIBS... " >&6; } if test -n "$XEPHYR_CFLAGS"; then pkg_cv_XEPHYR_CFLAGS="$XEPHYR_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5 ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XEPHYR_CFLAGS=`$PKG_CONFIG --cflags "$XEPHYR_REQUIRED_LIBS" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -30464,10 +31865,10 @@ if test -n "$XEPHYR_LIBS"; then pkg_cv_XEPHYR_LIBS="$XEPHYR_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5 ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XEPHYR_LIBS=`$PKG_CONFIG --libs "$XEPHYR_REQUIRED_LIBS" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -30481,8 +31882,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -30499,30 +31900,30 @@ fi XEPHYR="no" elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } XEPHYR="no" else XEPHYR_CFLAGS=$pkg_cv_XEPHYR_CFLAGS XEPHYR_LIBS=$pkg_cv_XEPHYR_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } XEPHYR="yes" fi elif test "x$XEPHYR" = xyes ; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $XEPHYR_REQUIRED_LIBS" >&5 -$as_echo_n "checking for $XEPHYR_REQUIRED_LIBS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $XEPHYR_REQUIRED_LIBS" >&5 +printf %s "checking for $XEPHYR_REQUIRED_LIBS... " >&6; } if test -n "$XEPHYR_CFLAGS"; then pkg_cv_XEPHYR_CFLAGS="$XEPHYR_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5 ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XEPHYR_CFLAGS=`$PKG_CONFIG --cflags "$XEPHYR_REQUIRED_LIBS" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -30536,10 +31937,10 @@ if test -n "$XEPHYR_LIBS"; then pkg_cv_XEPHYR_LIBS="$XEPHYR_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5 ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XEPHYR_LIBS=`$PKG_CONFIG --libs "$XEPHYR_REQUIRED_LIBS" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -30553,8 +31954,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -30580,10 +31981,10 @@ Alternatively, you may set the environment variables XEPHYR_CFLAGS and XEPHYR_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -30597,22 +31998,24 @@ See \`config.log' for more details" "$LINENO" 5; } else XEPHYR_CFLAGS=$pkg_cv_XEPHYR_CFLAGS XEPHYR_LIBS=$pkg_cv_XEPHYR_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi fi # Xephyr needs nanosleep() which is in librt on Solaris ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep" -if test "x$ac_cv_func_nanosleep" = xyes; then : - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5 -$as_echo_n "checking for nanosleep in -lrt... " >&6; } -if ${ac_cv_lib_rt_nanosleep+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test "x$ac_cv_func_nanosleep" = xyes +then : + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5 +printf %s "checking for nanosleep in -lrt... " >&6; } +if test ${ac_cv_lib_rt_nanosleep+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lrt $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -30621,30 +32024,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char nanosleep (); int -main () +main (void) { return nanosleep (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_rt_nanosleep=yes -else +else $as_nop ac_cv_lib_rt_nanosleep=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_nanosleep" >&5 -$as_echo "$ac_cv_lib_rt_nanosleep" >&6; } -if test "x$ac_cv_lib_rt_nanosleep" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_nanosleep" >&5 +printf "%s\n" "$ac_cv_lib_rt_nanosleep" >&6; } +if test "x$ac_cv_lib_rt_nanosleep" = xyes +then : XEPHYR_LIBS="$XEPHYR_LIBS -lrt" fi @@ -30697,19 +32099,20 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -$as_echo "#define _GNU_SOURCE 1" >>confdefs.h +printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext prefix_NONE= @@ -30721,9 +32124,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext PROJECTROOT="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define PROJECTROOT "$ac_define_dir" -_ACEOF +printf "%s\n" "#define PROJECTROOT \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -30738,9 +32139,7 @@ _ACEOF SYSCONFDIR="$ac_define_dir" -cat >>confdefs.h <<_ACEOF -#define SYSCONFDIR "$ac_define_dir" -_ACEOF +printf "%s\n" "#define SYSCONFDIR \"$ac_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -30760,12 +32159,12 @@ ac_config_commands="$ac_config_commands sdksyms" if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *********************************************** Neither HAL nor udev backend will be enabled. Input device hotplugging will not be available! ***********************************************" >&5 -$as_echo "$as_me: WARNING: +printf "%s\n" "$as_me: WARNING: *********************************************** Neither HAL nor udev backend will be enabled. Input device hotplugging will not be available! @@ -30801,8 +32200,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -30832,15 +32231,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -30854,8 +32253,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;} fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -30872,7 +32271,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -30883,14 +32282,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 -$as_echo_n "checking that generated files are newer than configure... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +printf %s "checking that generated files are newer than configure... " >&6; } if test -n "$am_sleep_pid"; then # Hide warnings about reused PIDs. wait $am_sleep_pid 2>/dev/null fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 -$as_echo "done" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 +printf "%s\n" "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -31321,8 +32720,8 @@ fi ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -31345,14 +32744,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -31362,46 +32763,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi +if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -31410,13 +32811,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -31425,8 +32819,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -31438,30 +32836,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -31474,13 +32852,14 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -31507,18 +32886,20 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset + # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -31530,12 +32911,13 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -31566,7 +32948,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -31588,6 +32970,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -31601,6 +32987,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -31642,7 +33034,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -31651,7 +33043,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -31713,8 +33105,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorg-server $as_me 21.1.8, which was -generated by GNU Autoconf 2.69. Invocation command line was +This file was extended by xorg-server $as_me 21.1.9, which was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -31776,14 +33168,16 @@ $config_commands Report bugs to <https://gitlab.freedesktop.org/xorg/xserver/issues>." _ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -xorg-server config.status 21.1.8 -configured by $0, generated by GNU Autoconf 2.69, +xorg-server config.status 21.1.9 +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -31823,15 +33217,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -31839,7 +33233,7 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -31848,7 +33242,7 @@ do as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -31876,7 +33270,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -31890,7 +33284,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF @@ -32302,9 +33696,9 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files + test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers + test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree @@ -32640,7 +34034,7 @@ do esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -32648,17 +34042,17 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -32675,7 +34069,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -32699,9 +34093,9 @@ $as_echo X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -32763,8 +34157,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -32808,9 +34202,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -32826,20 +34220,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} # if test x"$ac_file" != x-; then { - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi @@ -32859,7 +34253,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$_am_arg" : 'X\(//\)[^/]' \| \ X"$_am_arg" : 'X\(//\)$' \| \ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$_am_arg" | +printf "%s\n" X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -32879,8 +34273,8 @@ $as_echo X"$_am_arg" | s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} + :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +printf "%s\n" "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -32912,7 +34306,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | +printf "%s\n" X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -32954,7 +34348,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | +printf "%s\n" X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -33438,6 +34832,7 @@ _LT_EOF esac + ltmain="$ac_aux_dir/ltmain.sh" @@ -33602,8 +34997,8 @@ else fi if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +printf "%s\n" "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} fi @@ -33647,7 +35042,7 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi diff --git a/xserver/configure.ac b/xserver/configure.ac index 7107603c6..6d52f28bb 100644 --- a/xserver/configure.ac +++ b/xserver/configure.ac @@ -26,8 +26,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 21.1.8, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server) -RELEASE_DATE="2023-03-29" +AC_INIT([xorg-server], 21.1.9, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server) +RELEASE_DATE="2023-10-25" RELEASE_NAME="Caramel Ice Cream" AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_MACRO_DIR([m4]) @@ -164,7 +164,16 @@ AC_REPLACE_FUNCS([reallocarray strcasecmp strcasestr strlcat strlcpy strndup\ timingsafe_memcmp]) AM_CONDITIONAL(POLL, [test "x$ac_cv_func_poll" = "xyes"]) -AC_CHECK_LIB([bsd], [arc4random_buf]) +# Checks for non-standard functions and fallback to libbsd if we can +# We only check for arc4random_buf, because if we have that, we don't +# need/use getentropy. +AC_LINK_IFELSE([AC_LANG_CALL([], [arc4random_buf])], + [TRY_LIBBSD="no"], [TRY_LIBBSD="yes"]) +AS_IF([test "x$TRY_LIBBSD" = "xyes"], + [PKG_CHECK_MODULES([LIBBSD], [libbsd-overlay], [ + CFLAGS="$CFLAGS $LIBBSD_CFLAGS" + LIBS="$LIBS $LIBBSD_LIBS" +], [:])]) AC_CHECK_FUNCS([arc4random_buf]) AC_CHECK_DECLS([program_invocation_short_name], [], [], [[#include <errno.h>]]) diff --git a/xserver/damageext/Makefile.in b/xserver/damageext/Makefile.in index f09b1b68b..8e586e415 100644 --- a/xserver/damageext/Makefile.in +++ b/xserver/damageext/Makefile.in @@ -235,6 +235,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/dbe/Makefile.in b/xserver/dbe/Makefile.in index d272aef12..f01d23ffd 100644 --- a/xserver/dbe/Makefile.in +++ b/xserver/dbe/Makefile.in @@ -266,6 +266,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/dix/Makefile.in b/xserver/dix/Makefile.in index c53093cd6..2eeb587ca 100644 --- a/xserver/dix/Makefile.in +++ b/xserver/dix/Makefile.in @@ -281,6 +281,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/doc/Makefile.in b/xserver/doc/Makefile.in index 7987c2f37..dba8c092c 100644 --- a/xserver/doc/Makefile.in +++ b/xserver/doc/Makefile.in @@ -264,6 +264,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/doc/dtrace/Makefile.in b/xserver/doc/dtrace/Makefile.in index fc304e0d9..3422a1628 100644 --- a/xserver/doc/dtrace/Makefile.in +++ b/xserver/doc/dtrace/Makefile.in @@ -255,6 +255,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/dri3/Makefile.in b/xserver/dri3/Makefile.in index f1e89b9d7..ec5a14d5d 100644 --- a/xserver/dri3/Makefile.in +++ b/xserver/dri3/Makefile.in @@ -265,6 +265,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/exa/Makefile.in b/xserver/exa/Makefile.in index dd1cb9af1..d630745d3 100644 --- a/xserver/exa/Makefile.in +++ b/xserver/exa/Makefile.in @@ -268,6 +268,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/fb/Makefile.in b/xserver/fb/Makefile.in index 0a6bfbac3..b93ca67e3 100644 --- a/xserver/fb/Makefile.in +++ b/xserver/fb/Makefile.in @@ -296,6 +296,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/glamor/Makefile.in b/xserver/glamor/Makefile.in index 4fa7f3a6e..19b994b82 100644 --- a/xserver/glamor/Makefile.in +++ b/xserver/glamor/Makefile.in @@ -299,6 +299,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/glx/Makefile.in b/xserver/glx/Makefile.in index ceacec99d..c5ea1fb5e 100644 --- a/xserver/glx/Makefile.in +++ b/xserver/glx/Makefile.in @@ -288,6 +288,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/Makefile.in b/xserver/hw/Makefile.in index b39abbdaa..ab33287ab 100644 --- a/xserver/hw/Makefile.in +++ b/xserver/hw/Makefile.in @@ -240,6 +240,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/kdrive/Makefile.in b/xserver/hw/kdrive/Makefile.in index 50b700327..b539e5652 100644 --- a/xserver/hw/kdrive/Makefile.in +++ b/xserver/hw/kdrive/Makefile.in @@ -240,6 +240,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/kdrive/ephyr/Makefile.in b/xserver/hw/kdrive/ephyr/Makefile.in index 6383c9c11..01262707e 100644 --- a/xserver/hw/kdrive/ephyr/Makefile.in +++ b/xserver/hw/kdrive/ephyr/Makefile.in @@ -310,6 +310,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/kdrive/ephyr/man/Makefile.in b/xserver/hw/kdrive/ephyr/man/Makefile.in index b7c60f2b5..c5feb0478 100644 --- a/xserver/hw/kdrive/ephyr/man/Makefile.in +++ b/xserver/hw/kdrive/ephyr/man/Makefile.in @@ -233,6 +233,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/kdrive/src/Makefile.in b/xserver/hw/kdrive/src/Makefile.in index 70268ab01..ca5f5bd62 100644 --- a/xserver/hw/kdrive/src/Makefile.in +++ b/xserver/hw/kdrive/src/Makefile.in @@ -242,6 +242,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/vfb/Makefile.in b/xserver/hw/vfb/Makefile.in index 1f7494481..2a0137364 100644 --- a/xserver/hw/vfb/Makefile.in +++ b/xserver/hw/vfb/Makefile.in @@ -282,6 +282,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/vfb/man/Makefile.in b/xserver/hw/vfb/man/Makefile.in index c884d904f..c53e9d38c 100644 --- a/xserver/hw/vfb/man/Makefile.in +++ b/xserver/hw/vfb/man/Makefile.in @@ -233,6 +233,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/Makefile.in b/xserver/hw/xfree86/Makefile.in index 2a8a13fc7..540810816 100644 --- a/xserver/hw/xfree86/Makefile.in +++ b/xserver/hw/xfree86/Makefile.in @@ -292,6 +292,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/common/Makefile.in b/xserver/hw/xfree86/common/Makefile.in index c75ddce9e..2fce2762a 100644 --- a/xserver/hw/xfree86/common/Makefile.in +++ b/xserver/hw/xfree86/common/Makefile.in @@ -297,6 +297,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/ddc/Makefile.in b/xserver/hw/xfree86/ddc/Makefile.in index 0588f1fa0..ca114ed25 100644 --- a/xserver/hw/xfree86/ddc/Makefile.in +++ b/xserver/hw/xfree86/ddc/Makefile.in @@ -266,6 +266,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/dixmods/Makefile.in b/xserver/hw/xfree86/dixmods/Makefile.in index 0422dd32b..25e64849f 100644 --- a/xserver/hw/xfree86/dixmods/Makefile.in +++ b/xserver/hw/xfree86/dixmods/Makefile.in @@ -296,6 +296,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/doc/Makefile.in b/xserver/hw/xfree86/doc/Makefile.in index 8a9f46e79..6e49cb98c 100644 --- a/xserver/hw/xfree86/doc/Makefile.in +++ b/xserver/hw/xfree86/doc/Makefile.in @@ -224,6 +224,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/dri/Makefile.in b/xserver/hw/xfree86/dri/Makefile.in index a836e3925..5d5a6cc5b 100644 --- a/xserver/hw/xfree86/dri/Makefile.in +++ b/xserver/hw/xfree86/dri/Makefile.in @@ -265,6 +265,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/dri2/Makefile.in b/xserver/hw/xfree86/dri2/Makefile.in index ee8fb6b07..d22890db6 100644 --- a/xserver/hw/xfree86/dri2/Makefile.in +++ b/xserver/hw/xfree86/dri2/Makefile.in @@ -303,6 +303,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/dri2/pci_ids/Makefile.in b/xserver/hw/xfree86/dri2/pci_ids/Makefile.in index 5d086215e..95b5765fa 100644 --- a/xserver/hw/xfree86/dri2/pci_ids/Makefile.in +++ b/xserver/hw/xfree86/dri2/pci_ids/Makefile.in @@ -201,6 +201,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/drivers/Makefile.in b/xserver/hw/xfree86/drivers/Makefile.in index 50879950b..3374fb013 100644 --- a/xserver/hw/xfree86/drivers/Makefile.in +++ b/xserver/hw/xfree86/drivers/Makefile.in @@ -243,6 +243,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/drivers/inputtest/Makefile.in b/xserver/hw/xfree86/drivers/inputtest/Makefile.in index 12a9eae24..2034155bf 100644 --- a/xserver/hw/xfree86/drivers/inputtest/Makefile.in +++ b/xserver/hw/xfree86/drivers/inputtest/Makefile.in @@ -300,6 +300,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/drivers/modesetting/Makefile.in b/xserver/hw/xfree86/drivers/modesetting/Makefile.in index f203ff516..0c8c6835c 100644 --- a/xserver/hw/xfree86/drivers/modesetting/Makefile.in +++ b/xserver/hw/xfree86/drivers/modesetting/Makefile.in @@ -299,6 +299,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/exa/Makefile.in b/xserver/hw/xfree86/exa/Makefile.in index 45c576394..0dc37c13d 100644 --- a/xserver/hw/xfree86/exa/Makefile.in +++ b/xserver/hw/xfree86/exa/Makefile.in @@ -305,6 +305,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/exa/man/Makefile.in b/xserver/hw/xfree86/exa/man/Makefile.in index c31ef9dcb..85ae34ad2 100644 --- a/xserver/hw/xfree86/exa/man/Makefile.in +++ b/xserver/hw/xfree86/exa/man/Makefile.in @@ -233,6 +233,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/fbdevhw/Makefile.in b/xserver/hw/xfree86/fbdevhw/Makefile.in index f77cc92db..fe1ca4a22 100644 --- a/xserver/hw/xfree86/fbdevhw/Makefile.in +++ b/xserver/hw/xfree86/fbdevhw/Makefile.in @@ -308,6 +308,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/fbdevhw/man/Makefile.in b/xserver/hw/xfree86/fbdevhw/man/Makefile.in index 7c202567e..387366d97 100644 --- a/xserver/hw/xfree86/fbdevhw/man/Makefile.in +++ b/xserver/hw/xfree86/fbdevhw/man/Makefile.in @@ -233,6 +233,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/glamor_egl/Makefile.in b/xserver/hw/xfree86/glamor_egl/Makefile.in index 77f2bf26a..fa21944d0 100644 --- a/xserver/hw/xfree86/glamor_egl/Makefile.in +++ b/xserver/hw/xfree86/glamor_egl/Makefile.in @@ -289,6 +289,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/i2c/Makefile.in b/xserver/hw/xfree86/i2c/Makefile.in index 7c157f784..1cce30d73 100644 --- a/xserver/hw/xfree86/i2c/Makefile.in +++ b/xserver/hw/xfree86/i2c/Makefile.in @@ -265,6 +265,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/int10/Makefile.in b/xserver/hw/xfree86/int10/Makefile.in index b0e786d74..0813d25b7 100644 --- a/xserver/hw/xfree86/int10/Makefile.in +++ b/xserver/hw/xfree86/int10/Makefile.in @@ -284,6 +284,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/loader/Makefile.in b/xserver/hw/xfree86/loader/Makefile.in index 6cfc9b33c..b1fe1b10c 100644 --- a/xserver/hw/xfree86/loader/Makefile.in +++ b/xserver/hw/xfree86/loader/Makefile.in @@ -236,6 +236,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/man/Makefile.in b/xserver/hw/xfree86/man/Makefile.in index 68907333c..0767fb6b6 100644 --- a/xserver/hw/xfree86/man/Makefile.in +++ b/xserver/hw/xfree86/man/Makefile.in @@ -236,6 +236,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/modes/Makefile.in b/xserver/hw/xfree86/modes/Makefile.in index f9354eda9..38e8a84ad 100644 --- a/xserver/hw/xfree86/modes/Makefile.in +++ b/xserver/hw/xfree86/modes/Makefile.in @@ -271,6 +271,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/os-support/Makefile.in b/xserver/hw/xfree86/os-support/Makefile.in index acc1bddca..a152ad910 100644 --- a/xserver/hw/xfree86/os-support/Makefile.in +++ b/xserver/hw/xfree86/os-support/Makefile.in @@ -300,6 +300,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/os-support/bsd/Makefile.in b/xserver/hw/xfree86/os-support/bsd/Makefile.in index 2936deacf..5a916030e 100644 --- a/xserver/hw/xfree86/os-support/bsd/Makefile.in +++ b/xserver/hw/xfree86/os-support/bsd/Makefile.in @@ -270,6 +270,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/os-support/bus/Makefile.in b/xserver/hw/xfree86/os-support/bus/Makefile.in index 8f78187d9..87dc5e193 100644 --- a/xserver/hw/xfree86/os-support/bus/Makefile.in +++ b/xserver/hw/xfree86/os-support/bus/Makefile.in @@ -274,6 +274,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/os-support/hurd/Makefile.in b/xserver/hw/xfree86/os-support/hurd/Makefile.in index caba404c6..ca29e2cf0 100644 --- a/xserver/hw/xfree86/os-support/hurd/Makefile.in +++ b/xserver/hw/xfree86/os-support/hurd/Makefile.in @@ -237,6 +237,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/os-support/linux/Makefile.in b/xserver/hw/xfree86/os-support/linux/Makefile.in index 9a495c292..2388629d4 100644 --- a/xserver/hw/xfree86/os-support/linux/Makefile.in +++ b/xserver/hw/xfree86/os-support/linux/Makefile.in @@ -254,6 +254,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/os-support/misc/Makefile.in b/xserver/hw/xfree86/os-support/misc/Makefile.in index fd5a1aa57..c0f2c7c80 100644 --- a/xserver/hw/xfree86/os-support/misc/Makefile.in +++ b/xserver/hw/xfree86/os-support/misc/Makefile.in @@ -235,6 +235,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/os-support/solaris/Makefile.in b/xserver/hw/xfree86/os-support/solaris/Makefile.in index 0e2e5a991..ff3c20f1e 100644 --- a/xserver/hw/xfree86/os-support/solaris/Makefile.in +++ b/xserver/hw/xfree86/os-support/solaris/Makefile.in @@ -290,6 +290,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/os-support/stub/Makefile.in b/xserver/hw/xfree86/os-support/stub/Makefile.in index ac25ab041..f9e9db1c6 100644 --- a/xserver/hw/xfree86/os-support/stub/Makefile.in +++ b/xserver/hw/xfree86/os-support/stub/Makefile.in @@ -237,6 +237,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/parser/Makefile.in b/xserver/hw/xfree86/parser/Makefile.in index f7c10e97d..f577f64ba 100644 --- a/xserver/hw/xfree86/parser/Makefile.in +++ b/xserver/hw/xfree86/parser/Makefile.in @@ -269,6 +269,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/ramdac/Makefile.in b/xserver/hw/xfree86/ramdac/Makefile.in index c56e0afa7..f05ed9ab9 100644 --- a/xserver/hw/xfree86/ramdac/Makefile.in +++ b/xserver/hw/xfree86/ramdac/Makefile.in @@ -265,6 +265,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/shadowfb/Makefile.in b/xserver/hw/xfree86/shadowfb/Makefile.in index 7be5a8f62..cd3d916a4 100644 --- a/xserver/hw/xfree86/shadowfb/Makefile.in +++ b/xserver/hw/xfree86/shadowfb/Makefile.in @@ -270,6 +270,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/utils/Makefile.in b/xserver/hw/xfree86/utils/Makefile.in index e3627633d..3cfb257c7 100644 --- a/xserver/hw/xfree86/utils/Makefile.in +++ b/xserver/hw/xfree86/utils/Makefile.in @@ -241,6 +241,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/utils/gtf/Makefile.in b/xserver/hw/xfree86/utils/gtf/Makefile.in index ff5003695..2da628122 100644 --- a/xserver/hw/xfree86/utils/gtf/Makefile.in +++ b/xserver/hw/xfree86/utils/gtf/Makefile.in @@ -262,6 +262,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/utils/man/Makefile.in b/xserver/hw/xfree86/utils/man/Makefile.in index ae97b0e0d..7da3e0bd5 100644 --- a/xserver/hw/xfree86/utils/man/Makefile.in +++ b/xserver/hw/xfree86/utils/man/Makefile.in @@ -233,6 +233,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/vgahw/Makefile.in b/xserver/hw/xfree86/vgahw/Makefile.in index f82ed2008..731e2387f 100644 --- a/xserver/hw/xfree86/vgahw/Makefile.in +++ b/xserver/hw/xfree86/vgahw/Makefile.in @@ -269,6 +269,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/x86emu/Makefile.in b/xserver/hw/xfree86/x86emu/Makefile.in index ed8ac4249..d21217e4a 100644 --- a/xserver/hw/xfree86/x86emu/Makefile.in +++ b/xserver/hw/xfree86/x86emu/Makefile.in @@ -237,6 +237,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xfree86/xkb/Makefile.in b/xserver/hw/xfree86/xkb/Makefile.in index 89fdab960..1ecbdce42 100644 --- a/xserver/hw/xfree86/xkb/Makefile.in +++ b/xserver/hw/xfree86/xkb/Makefile.in @@ -235,6 +235,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xnest/Makefile.in b/xserver/hw/xnest/Makefile.in index 9b16ba97d..89a7b61d0 100644 --- a/xserver/hw/xnest/Makefile.in +++ b/xserver/hw/xnest/Makefile.in @@ -285,6 +285,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xnest/man/Makefile.in b/xserver/hw/xnest/man/Makefile.in index 24ac73a8b..fe7b32c70 100644 --- a/xserver/hw/xnest/man/Makefile.in +++ b/xserver/hw/xnest/man/Makefile.in @@ -233,6 +233,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xquartz/GL/Makefile.in b/xserver/hw/xquartz/GL/Makefile.in index 4b89e9594..699147ef5 100644 --- a/xserver/hw/xquartz/GL/Makefile.in +++ b/xserver/hw/xquartz/GL/Makefile.in @@ -236,6 +236,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xquartz/Makefile.in b/xserver/hw/xquartz/Makefile.in index 0029711d2..acf9fa68c 100644 --- a/xserver/hw/xquartz/Makefile.in +++ b/xserver/hw/xquartz/Makefile.in @@ -292,6 +292,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xquartz/bundle/Makefile.in b/xserver/hw/xquartz/bundle/Makefile.in index 46b0f6507..21f19dd8c 100644 --- a/xserver/hw/xquartz/bundle/Makefile.in +++ b/xserver/hw/xquartz/bundle/Makefile.in @@ -212,6 +212,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xquartz/mach-startup/Makefile.in b/xserver/hw/xquartz/mach-startup/Makefile.in index 59558d20b..e5d91b02c 100644 --- a/xserver/hw/xquartz/mach-startup/Makefile.in +++ b/xserver/hw/xquartz/mach-startup/Makefile.in @@ -277,6 +277,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xquartz/man/Makefile.in b/xserver/hw/xquartz/man/Makefile.in index 46ce92925..b76671cce 100644 --- a/xserver/hw/xquartz/man/Makefile.in +++ b/xserver/hw/xquartz/man/Makefile.in @@ -233,6 +233,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xquartz/pbproxy/Makefile.in b/xserver/hw/xquartz/pbproxy/Makefile.in index 9236b8c39..e5a9db3bc 100644 --- a/xserver/hw/xquartz/pbproxy/Makefile.in +++ b/xserver/hw/xquartz/pbproxy/Makefile.in @@ -268,6 +268,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xquartz/xpr/Makefile.in b/xserver/hw/xquartz/xpr/Makefile.in index aabb45791..a55a45c69 100644 --- a/xserver/hw/xquartz/xpr/Makefile.in +++ b/xserver/hw/xquartz/xpr/Makefile.in @@ -237,6 +237,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xwin/Makefile.in b/xserver/hw/xwin/Makefile.in index 75dca08c9..d4151aafa 100644 --- a/xserver/hw/xwin/Makefile.in +++ b/xserver/hw/xwin/Makefile.in @@ -356,6 +356,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xwin/dri/Makefile.in b/xserver/hw/xwin/dri/Makefile.in index 9df4b0419..c21f90b8b 100644 --- a/xserver/hw/xwin/dri/Makefile.in +++ b/xserver/hw/xwin/dri/Makefile.in @@ -235,6 +235,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xwin/glx/Makefile.in b/xserver/hw/xwin/glx/Makefile.in index 12ad7be8e..13bbf333d 100644 --- a/xserver/hw/xwin/glx/Makefile.in +++ b/xserver/hw/xwin/glx/Makefile.in @@ -282,6 +282,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xwin/man/Makefile.in b/xserver/hw/xwin/man/Makefile.in index c2e1d0c9e..427223062 100644 --- a/xserver/hw/xwin/man/Makefile.in +++ b/xserver/hw/xwin/man/Makefile.in @@ -233,6 +233,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/hw/xwin/winclipboard/Makefile.in b/xserver/hw/xwin/winclipboard/Makefile.in index 263519cc9..25b99c3cf 100644 --- a/xserver/hw/xwin/winclipboard/Makefile.in +++ b/xserver/hw/xwin/winclipboard/Makefile.in @@ -283,6 +283,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/include/Makefile.in b/xserver/include/Makefile.in index f6636d7a3..e56647b9f 100644 --- a/xserver/include/Makefile.in +++ b/xserver/include/Makefile.in @@ -244,6 +244,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/include/do-not-use-config.h.in b/xserver/include/do-not-use-config.h.in index 0e525c82d..363fd47f9 100644 --- a/xserver/include/do-not-use-config.h.in +++ b/xserver/include/do-not-use-config.h.in @@ -233,9 +233,6 @@ /* Define to 1 if you have the <libaudit.h> header file. */ #undef HAVE_LIBAUDIT_H -/* Define to 1 if you have the `bsd' library (-lbsd). */ -#undef HAVE_LIBBSD - /* Define to 1 if you have the `m' library (-lm). */ #undef HAVE_LIBM @@ -257,8 +254,8 @@ /* Define to 1 if you have the `memfd_create' function. */ #undef HAVE_MEMFD_CREATE -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H +/* Define to 1 if you have the <minix/config.h> header file. */ +#undef HAVE_MINIX_CONFIG_H /* Define to 1 if you have the `mkostemp' function. */ #undef HAVE_MKOSTEMP @@ -332,6 +329,9 @@ /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the <stdio.h> header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H @@ -431,6 +431,9 @@ /* Define to 1 if you have the `walkcontext' function. */ #undef HAVE_WALKCONTEXT +/* Define to 1 if you have the <wchar.h> header file. */ +#undef HAVE_WCHAR_H + /* Have xshmfence support */ #undef HAVE_XSHMFENCE @@ -559,7 +562,9 @@ /* Build a standalone xpbproxy */ #undef STANDALONE_XPBPROXY -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS /* Where to install the Xorg binary and Xorg.wrap */ @@ -599,21 +604,87 @@ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # undef _GNU_SOURCE #endif -/* Enable threading extensions on Solaris. */ +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif /* Enable extensions on HP NonStop. */ #ifndef _TANDEM_SOURCE # undef _TANDEM_SOURCE #endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE #endif @@ -789,11 +860,6 @@ `char[]'. */ #undef YYTEXT_POINTER -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS @@ -803,16 +869,6 @@ /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES -/* Define to 1 if on MINIX. */ -#undef _MINIX - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -#undef _POSIX_1_SOURCE - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -#undef _POSIX_SOURCE - /* Defined if needed to expose struct msghdr.msg_control */ #undef _XOPEN_SOURCE @@ -828,7 +884,7 @@ /* Define to empty if `const' does not conform to ANSI C. */ #undef const -/* Define to `int' if <sys/types.h> does not define. */ +/* Define as a signed integer type capable of holding a process identifier. */ #undef pid_t /* Define to __typeof__ if your compiler spells it that way. */ diff --git a/xserver/include/os.h b/xserver/include/os.h index 38536a60c..e5635f899 100644 --- a/xserver/include/os.h +++ b/xserver/include/os.h @@ -50,16 +50,13 @@ SOFTWARE. #include "misc.h" #include <stdarg.h> #include <stdint.h> +#if defined(HAVE_REALLOCARRAY) +#include <stdlib.h> /* for reallocarray */ +#endif #include <string.h> #ifdef MONOTONIC_CLOCK #include <time.h> #endif -#if defined(HAVE_LIBBSD) && defined(HAVE_REALLOCARRAY) -#include <bsd/stdlib.h> /* for reallocarray */ -#endif -#if defined(HAVE_LIBBSD) && defined(HAVE_STRLCPY) -#include <bsd/string.h> /* for strlcpy, strlcat */ -#endif #define SCREEN_SAVER_ON 0 #define SCREEN_SAVER_OFF 1 diff --git a/xserver/install-sh b/xserver/install-sh index 377bb8687..ec298b537 100644 --- a/xserver/install-sh +++ b/xserver/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,22 +64,16 @@ mvprog=${MVPROG-mv} rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -97,7 +87,7 @@ dir_arg= dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -114,18 +104,28 @@ Options: --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake@gnu.org. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,46 +137,62 @@ while test $# -ne 0; do -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; + + -p) cpprog="$cpprog -p";; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -S) backupsuffix="$2" + shift;; - -T) no_target_directory=true;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; + + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +224,15 @@ if test $# -eq 0; then fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +248,16 @@ if test -z "$dir_arg"; then *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -250,6 +275,10 @@ do dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -266,178 +295,148 @@ do fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else - mkdir_mode= + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + trap '' 0;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -450,14 +449,25 @@ do else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -472,20 +482,24 @@ do # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -493,24 +507,24 @@ do # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 @@ -519,9 +533,9 @@ do done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/xserver/man/Makefile.in b/xserver/man/Makefile.in index 19dbbb419..c1a1367e6 100644 --- a/xserver/man/Makefile.in +++ b/xserver/man/Makefile.in @@ -237,6 +237,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/meson.build b/xserver/meson.build index 637938a1b..e69c9140d 100644 --- a/xserver/meson.build +++ b/xserver/meson.build @@ -3,10 +3,10 @@ project('xserver', 'c', 'buildtype=debugoptimized', 'c_std=gnu99', ], - version: '21.1.8', + version: '21.1.9', meson_version: '>= 0.47.0', ) -release_date = '2023-03-29' +release_date = '2023-10-25' add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc']) cc = meson.get_compiler('c') @@ -96,7 +96,7 @@ applewmproto_dep = dependency('applewmproto', version: '>= 1.4', fallback: ['xor xshmfence_dep = dependency('xshmfence', version: '>= 1.1', required: false) pixman_dep = dependency('pixman-1') -libbsd_dep = dependency('libbsd', required: false) +libbsd_dep = dependency('libbsd-overlay', required: false) xkbcomp_dep = dependency('xkbcomp', required: false) xkbfile_dep = dependency('xkbfile') xfont2_dep = dependency('xfont2', version: '>= 2.0') diff --git a/xserver/mi/Makefile.in b/xserver/mi/Makefile.in index 7462fd3c1..9fa8d4620 100644 --- a/xserver/mi/Makefile.in +++ b/xserver/mi/Makefile.in @@ -273,6 +273,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/miext/Makefile.in b/xserver/miext/Makefile.in index bf0bfd72d..8ad968a01 100644 --- a/xserver/miext/Makefile.in +++ b/xserver/miext/Makefile.in @@ -241,6 +241,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/miext/damage/Makefile.in b/xserver/miext/damage/Makefile.in index 2ea078a72..cb50c4595 100644 --- a/xserver/miext/damage/Makefile.in +++ b/xserver/miext/damage/Makefile.in @@ -266,6 +266,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/miext/rootless/Makefile.in b/xserver/miext/rootless/Makefile.in index 3d2cdcc0e..a2594e365 100644 --- a/xserver/miext/rootless/Makefile.in +++ b/xserver/miext/rootless/Makefile.in @@ -236,6 +236,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/miext/shadow/Makefile.in b/xserver/miext/shadow/Makefile.in index 2665db20e..bd7835cf2 100644 --- a/xserver/miext/shadow/Makefile.in +++ b/xserver/miext/shadow/Makefile.in @@ -272,6 +272,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/miext/sync/Makefile.in b/xserver/miext/sync/Makefile.in index 899a6f18e..1814fdb19 100644 --- a/xserver/miext/sync/Makefile.in +++ b/xserver/miext/sync/Makefile.in @@ -271,6 +271,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/os/Makefile.in b/xserver/os/Makefile.in index 652ae6cbe..e59ba8248 100644 --- a/xserver/os/Makefile.in +++ b/xserver/os/Makefile.in @@ -273,6 +273,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/os/auth.c b/xserver/os/auth.c index 611e4efb1..243d3c5a8 100644 --- a/xserver/os/auth.c +++ b/xserver/os/auth.c @@ -46,9 +46,7 @@ from The Open Group. #ifdef WIN32 #include <X11/Xw32defs.h> #endif -#ifdef HAVE_LIBBSD -#include <bsd/stdlib.h> /* for arc4random_buf() */ -#endif +#include <stdlib.h> /* for arc4random_buf() */ struct protocol { unsigned short name_length; diff --git a/xserver/present/Makefile.in b/xserver/present/Makefile.in index ac82eef02..ad9e47245 100644 --- a/xserver/present/Makefile.in +++ b/xserver/present/Makefile.in @@ -268,6 +268,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/present/present_event.c b/xserver/present/present_event.c index 435b26b70..849732dc8 100644 --- a/xserver/present/present_event.c +++ b/xserver/present/present_event.c @@ -102,7 +102,8 @@ present_event_swap(xGenericEvent *from, xGenericEvent *to) } void -present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw, WindowPtr sibling) +present_send_config_notify(WindowPtr window, int x, int y, int w, int h, + int bw, WindowPtr sibling, CARD32 flags) { present_window_priv_ptr window_priv = present_window_priv(window); @@ -122,7 +123,7 @@ present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw, .off_y = 0, .pixmap_width = w, .pixmap_height = h, - .pixmap_flags = 0 + .pixmap_flags = flags }; present_event_ptr event; diff --git a/xserver/present/present_priv.h b/xserver/present/present_priv.h index 6ebd009a2..4ad729864 100644 --- a/xserver/present/present_priv.h +++ b/xserver/present/present_priv.h @@ -43,6 +43,11 @@ #define DebugPresent(x) #endif +/* XXX this belongs in presentproto */ +#ifndef PresentWindowDestroyed +#define PresentWindowDestroyed (1 << 0) +#endif + extern int present_request; extern DevPrivateKeyRec present_screen_private_key; @@ -307,7 +312,7 @@ void present_free_events(WindowPtr window); void -present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw, WindowPtr sibling); +present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw, WindowPtr sibling, CARD32 flags); void present_send_complete_notify(WindowPtr window, CARD8 kind, CARD8 mode, CARD32 serial, uint64_t ust, uint64_t msc); diff --git a/xserver/present/present_screen.c b/xserver/present/present_screen.c index 15684eda4..2c29aafd2 100644 --- a/xserver/present/present_screen.c +++ b/xserver/present/present_screen.c @@ -93,6 +93,15 @@ present_destroy_window(WindowPtr window) present_screen_priv_ptr screen_priv = present_screen_priv(screen); present_window_priv_ptr window_priv = present_window_priv(window); + present_send_config_notify(window, + window->drawable.x, + window->drawable.y, + window->drawable.width, + window->drawable.height, + window->borderWidth, + window->nextSib, + PresentWindowDestroyed); + if (window_priv) { present_clear_window_notifies(window); present_free_events(window); @@ -123,7 +132,7 @@ present_config_notify(WindowPtr window, ScreenPtr screen = window->drawable.pScreen; present_screen_priv_ptr screen_priv = present_screen_priv(screen); - present_send_config_notify(window, x, y, w, h, bw, sibling); + present_send_config_notify(window, x, y, w, h, bw, sibling, 0); unwrap(screen_priv, screen, ConfigNotify); if (screen->ConfigNotify) diff --git a/xserver/pseudoramiX/Makefile.in b/xserver/pseudoramiX/Makefile.in index 1abec6c10..92ad434bf 100644 --- a/xserver/pseudoramiX/Makefile.in +++ b/xserver/pseudoramiX/Makefile.in @@ -237,6 +237,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/randr/Makefile.in b/xserver/randr/Makefile.in index 81909b71c..a9f16891c 100644 --- a/xserver/randr/Makefile.in +++ b/xserver/randr/Makefile.in @@ -277,6 +277,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/record/Makefile.in b/xserver/record/Makefile.in index 9bb5f3f28..169f2bb44 100644 --- a/xserver/record/Makefile.in +++ b/xserver/record/Makefile.in @@ -235,6 +235,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/render/Makefile.in b/xserver/render/Makefile.in index a55f0ac55..ab464a1f7 100644 --- a/xserver/render/Makefile.in +++ b/xserver/render/Makefile.in @@ -268,6 +268,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/test/Makefile.in b/xserver/test/Makefile.in index c15c2bd1e..67c317edf 100644 --- a/xserver/test/Makefile.in +++ b/xserver/test/Makefile.in @@ -426,6 +426,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/xfixes/Makefile.in b/xserver/xfixes/Makefile.in index e7cf58dc1..e52e7aee0 100644 --- a/xserver/xfixes/Makefile.in +++ b/xserver/xfixes/Makefile.in @@ -236,6 +236,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/xserver/xkb/Makefile.in b/xserver/xkb/Makefile.in index 375347efa..de8ff5621 100644 --- a/xserver/xkb/Makefile.in +++ b/xserver/xkb/Makefile.in @@ -275,6 +275,8 @@ LD_NO_UNDEFINED_FLAG = @LD_NO_UNDEFINED_FLAG@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBSD_CFLAGS = @LIBBSD_CFLAGS@ +LIBBSD_LIBS = @LIBBSD_LIBS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBOBJS = @LIBOBJS@ |