diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2024-05-04 09:53:36 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2024-05-04 09:53:36 +0000 |
| commit | 4aee1dfe48599aa35e8c060a981e593624676da4 (patch) | |
| tree | 34e5ea33e2133249d05ab854ba5520021d53740f /app/xkbcomp | |
| parent | d8ed9f2d52e8459079947e2f774e3e37022c49af (diff) | |
Revert to xkbcomp 1.4.6. for now.
version 1.4.7 has memory management issues found by mbuhl@
Diffstat (limited to 'app/xkbcomp')
33 files changed, 5150 insertions, 5965 deletions
diff --git a/app/xkbcomp/ChangeLog b/app/xkbcomp/ChangeLog index c4d8751c7..a5d629c7b 100644 --- a/app/xkbcomp/ChangeLog +++ b/app/xkbcomp/ChangeLog @@ -1,396 +1,3 @@ -commit e26102f28f08e5432b1ad44bbaef7f32aff199f6 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Feb 3 14:23:58 2024 -0800 - - xkbcomp 1.4.7 - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit ff32f542c94f1b30ba2ba58193adb3774a5c50e6 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Oct 7 11:09:44 2023 -0700 - - GenerateListing: close outFile before returning - - Found by Oracle Parfait static analyzer: - - Error: File Leak - File Leak [file-ptr-leak]: - Leaked File outFile - at line 497 of app/xkbcomp/listing.c in function 'GenerateListing'. - outFile initialized at line 432 with fopen - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 1f1ea56ca22a85164c4362650b004e202f4007fd -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Mon Feb 6 13:13:21 2023 -0800 - - configure: raise minimum autoconf requirement to 2.70 - - Needed for builds on NetBSD to work correctly, since it depends on - AC_USE_SYSTEM_EXTENSIONS defining _OPENBSD_SOURCE to expose the - prototype for reallocarray() in the system headers. - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 6ce2c46869ced346839eb7e0c3f83170025495c6 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Fri Jan 27 09:02:26 2023 -0800 - - xkbcomp.h: include config.h before any other headers - - Ensures flags set by AC_USE_SYSTEM_EXTENSIONS are correctly - propogated when including system headers. - - Closes: #22 xkbcomp from git compile error - Fixes: 81e46ca ("Use asprintf() if the platform supports it") - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 772470d0e4fef8e0a3d6eaf4c563fa7b1f6d6d19 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun Dec 11 15:32:03 2022 -0800 - - Replace calloc(strlen())+strcpy() pairs with strdup() calls - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 6db8fd556e2562e9a0a821c0d6fd4f7cdcf6266c -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun Dec 11 15:18:26 2022 -0800 - - Mark more pointers as const - - Some suggested by cppcheck, others by manual code inspection - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 299c9762b1dbe53f3297c54e5526aeae767d1a10 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun Dec 11 10:24:13 2022 -0800 - - Use unsigned ints when shifting to create bitmasks - - symbols.c:1057:28: portability: Shifting signed 32-bit value by 31 bits - is implementation-defined behaviour. See condition at line 1049. - [shiftTooManyBitsSigned] - radio_groups |= (1 << (tmp.uval - 1)); - ^ - symbols.c:1049:41: note: Assuming that condition 'tmp.uval>32' is not redundant - if ((tmp.uval < 1) || (tmp.uval > XkbMaxRadioGroups)) - ^ - symbols.c:1057:28: note: Shift - radio_groups |= (1 << (tmp.uval - 1)); - ^ - symbols.c:1057:28: warning: Either the condition 'tmp.uval>32' is redundant - or there is signed integer overflow for expression '1<<(tmp.uval-1)'. - [integerOverflowCond] - radio_groups |= (1 << (tmp.uval - 1)); - ^ - symbols.c:1049:41: note: Assuming that condition 'tmp.uval>32' is not redundant - if ((tmp.uval < 1) || (tmp.uval > XkbMaxRadioGroups)) - ^ - symbols.c:1057:28: note: Integer overflow - radio_groups |= (1 << (tmp.uval - 1)); - ^ - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit e4cba31313b44e40efcc0c260a33c3ec83e4b772 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun Dec 11 10:20:05 2022 -0800 - - Stop building more unused functions - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 3e486c4578f3f6a81fc0f9afba6551dfa8c7b63b -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun Dec 11 10:02:13 2022 -0800 - - Only build debug infrastructure if DEBUG is defined - - It's only used when DEBUG is defined, so don't build it when - we're not using it. - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit a3bbf780252e55bb1dcab717289ef09e00d11223 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun Dec 11 09:55:55 2022 -0800 - - Remove unused "no indent" (NOI) debug functions - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 0493c7216dd39baeb420583be71af095576dbf74 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun Dec 11 09:50:55 2022 -0800 - - Mark more functions and variables static - - Stop exporting things that aren't used outside the file - that defines them. - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 4119707089b5c14f53bd5ff0b86ee7e575ac9316 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun Dec 11 09:22:57 2022 -0800 - - XkbAddDirectoryToPath: don't leak existing paths on realloc() failure - - Found by cppcheck: - - xkbpath.c:217:9: error: Common realloc mistake: 'includePath' nulled - but not freed upon failure [memleakOnRealloc] - includePath = (char **) realloc(includePath, szPath * sizeof(char *)); - ^ - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 0d22aac7bb50ff1f7588f78ec25e9fb62a7b2e5e -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun Dec 11 09:17:56 2022 -0800 - - FindKeypadVMod: check xkb is not NULL before dereference, not after - - As found by cppcheck: - - vmod.c:232:26: warning: Either the condition 'xkb' is redundant or there - is possible null pointer dereference: xkb. [nullPointerRedundantCheck] - name = XkbInternAtom(xkb->dpy, "NumLock", False); - ^ - vmod.c:233:10: note: Assuming that condition 'xkb' is not redundant - if ((xkb) && LookupVModIndex((XPointer) xkb, None, name, TypeInt, &rtrn)) - ^ - vmod.c:232:26: note: Null pointer dereference - name = XkbInternAtom(xkb->dpy, "NumLock", False); - ^ - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit c7a5d1468c75adb2139d2c2facc73854f13b5ba3 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun Dec 11 08:57:56 2022 -0800 - - Remove #ifdef sgi sections - - They just included an additional malloc.h header, but SGI Irix - has been unsupported for a decade now. - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit e6821a8a7b16e5a8e4c478c9544798fae59a21d1 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 16:20:58 2022 -0800 - - Handle -Wstringop-truncation warning in HandleOverlayDef() - - In function ‘HandleOverlayDef’, - inlined from ‘HandleSectionBody’ at geometry.c:2778:18, - inlined from ‘HandleSectionDef’ at geometry.c:2818:10, - inlined from ‘HandleGeometryFile’ at geometry.c:2864:18: - geometry.c:2573:9: warning: ‘strncpy’ output may be truncated copying - 4 bytes from a string of length 4 [-Wstringop-truncation] - 2573 | strncpy(key->over, keyDef->over, XkbKeyNameLength); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - geometry.c:2574:9: warning: ‘strncpy’ output may be truncated copying - 4 bytes from a string of length 4 [-Wstringop-truncation] - 2574 | strncpy(key->under, keyDef->under, XkbKeyNameLength); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 81e46cab5f4bdd69fa0a644dba86f6902cece175 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 16:10:01 2022 -0800 - - Use asprintf() if the platform supports it - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit a1551b78e9ac0e2075ca241c0e8ae361758f26b4 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 15:39:39 2022 -0800 - - Replace && with & for bitwise comparison - - Clears up gcc warning: - - keytypes.c: In function ‘SetPreserve’: - keytypes.c:757:26: warning: promoted ~unsigned is always non-zero - [-Wsign-compare] - || (new.preVMods && (~new.indexVMods))) - ^~ - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit e4e821d5083072e796d6489ddcacf895a43c66f1 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 15:37:56 2022 -0800 - - Fix 106 missing-field-initializers warnings in misc.c - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 1fb639c97fc28b8ed66b5553eafbbeed07e4cb09 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 15:33:17 2022 -0800 - - Replace malloc()+bzero() pairs with calloc() calls - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 8e58b7949ab96180d60fb13f7820d6cc01c228ae -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 15:21:49 2022 -0800 - - Remove unnecessary casts from bzero() calls - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit bdbfa354dd4d93657104ccd7c9e892ed45197dd8 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 15:16:05 2022 -0800 - - Remove unnecessary casts from memcpy() calls - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit f1757a005f471044da3f8e946a091b067996d270 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 14:30:21 2022 -0800 - - Replace Opaque with direct usage of void * - - Only one use was left after deleting the *alloc/free() wrappers - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 5655379ce89ab55f25a536972aaa310480de9432 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 14:23:11 2022 -0800 - - Remove unnecessary checks for NULL pointers before calling free() - - Not needed in C89 and later - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 2ac6a7f029d8855fbb4e8024aab0511727ac3a67 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 14:10:32 2022 -0800 - - Replace uFree() with direct free() calls - - All these wrappers did was mess with types and add a test for - NULL pointers that isn't needed in C89 and later. - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 8d85bd1e2f9473958b235caf7af9913b518f73dd -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 14:07:18 2022 -0800 - - Replace uTypedRecalloc() with direct recallocarray() calls - - Retains uRecalloc() as a fallback for platforms without recallocarray() - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit e02e32f71f6c24fcc69bdaf58f6f9e973a017896 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 13:49:56 2022 -0800 - - Replace uTypedRealloc() with direct reallocarray() calls - - Falls back to realloc() if platform doesn't offer reallocarray(). - Also removes uRealloc() since it had no other uses. - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 75af06f5f8ffc41fabd100253aad222cb4ab8662 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 13:44:17 2022 -0800 - - Replace uCalloc() and uTypedCalloc() with direct calloc() calls - - All these wrappers did was mess with types. - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 265ea3a77418df2744575f1168f89a33f01e72d4 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 13:39:10 2022 -0800 - - Replace uAlloc() and uTypedAlloc() with direct malloc() calls - - All these wrappers did was mess with types. - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 81e51cf1ff494131827df487a0f538c3b07e0407 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 13:34:09 2022 -0800 - - Delete unused uTmpAlloc/uTmpFree wrappers around alloca() - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 77b1efa1c83ad64d49d1e9c085d2a496580ce6f9 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 13:26:39 2022 -0800 - - Use C99 struct initializers - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 64761ee9424f755b84ab0ce02d13eda32d215a14 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 11:38:04 2022 -0800 - - Variable scope reductions - - Some found by cppcheck, some found by manual code inspection - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 9737af15196380a1687d18a17d297ee17b45a83f -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 11:03:40 2022 -0800 - - Remove register keyword from variable declarations - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit b67c058e2ccc27472b238a6b5dc5e4cd20f6d2bd -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat Dec 10 09:08:33 2022 -0800 - - Eliminate 20 -Wimplicit-fallthrough warnings - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 634f60a9b25b5d03c78e90574adce3e38f378333 -Author: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Thu Jul 28 17:30:21 2022 -0700 - - gitlab CI: stop requiring Signed-off-by in commits - - Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> - -commit 931c469b2b91603c5c196abf65a39c7dab8609d7 -Author: Leandro Nini <drfiemost@email.it> -Date: Sat Dec 10 07:49:56 2022 +0000 - - Avoid possibly dereferencing null pointer - - This addresses issue #21 - - Signed-off-by: Leandro Nini <drfiemost@email.it> - commit 7bac6a25bb44d39710f1b2b5fdad56d7f4c01c39 Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Wed Dec 7 17:53:16 2022 -0800 @@ -562,7 +169,7 @@ Date: Thu Nov 5 14:24:24 2020 +1000 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit a0a4f112c5858ac2b932247dba2d85061bb59145 -Author: Miroslav Koškár <mk@mkoskar.com> +Author: Miroslav Koškár < <mk@mkoskar.com> Date: Mon Jul 6 07:48:48 2020 +0200 Fix lockdevbtn to be XkbSA_LockDeviceBtn action @@ -658,7 +265,7 @@ Date: Sat Feb 15 17:34:41 2014 +0100 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> commit 9edd61b91a02bda31fc6edd2c32c553e872b6ea2 -Author: Miroslav Koškár <mk@mkoskar.com> +Author: Miroslav Koškár < <mk@mkoskar.com> Date: Fri Jan 18 20:01:01 2019 +0100 Fix invalid error report on F_Accel field @@ -2349,7 +1956,7 @@ Date: Fri Oct 14 00:25:46 2005 +0000 Use sed to fill in variables in man page commit 8c0d310c1acccc424dae29554a5075f9b339e95f -Author: Kristian Høgsberg <krh@redhat.com> +Author: Kristian Høgsberg <krh@redhat.com> Date: Thu Sep 1 19:37:02 2005 +0000 Define DFLT_XKB_CONFIG_ROOT to $(datadir)/X11/xkb so we look in the right @@ -2390,13 +1997,13 @@ Date: Wed Jul 20 19:31:57 2005 +0000 configure cache, you cache it, and the cached value is probably wrong. commit 8335e5fa471e25675c6a369ec2348883953fcdd0 -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> Date: Sat Jul 16 20:56:47 2005 +0000 Add xkbcomp data to symlink.sh. Some fixes to xkbcomp/Makefile.am commit d7b3354575f31caa9044b6c5f7aee4f010f6192a -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> Date: Fri Jul 15 18:02:35 2005 +0000 Build system for xkbcomp diff --git a/app/xkbcomp/action.c b/app/xkbcomp/action.c index c629eb6ae..a984bc716 100644 --- a/app/xkbcomp/action.c +++ b/app/xkbcomp/action.c @@ -38,8 +38,6 @@ static Bool actionsInitialized; static ExprDef constTrue; static ExprDef constFalse; -static void ActionsInit(void); - /***====================================================================***/ static Bool @@ -335,15 +333,16 @@ ReportNotFound(unsigned action, unsigned field, const char *what, char *bad) } static Bool -HandleNoAction(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, - const ExprDef *array_ndx, const ExprDef *value) +HandleNoAction(XkbDescPtr xkb, + XkbAnyAction * action, + unsigned field, ExprDef * array_ndx, ExprDef * value) { return ReportIllegal(action->type, field); } static Bool -CheckLatchLockFlags(unsigned action, unsigned field, - const ExprDef *value, unsigned *flags_inout) +CheckLatchLockFlags(unsigned action, + unsigned field, ExprDef * value, unsigned *flags_inout) { unsigned tmp; ExprResult result; @@ -364,14 +363,16 @@ CheckLatchLockFlags(unsigned action, unsigned field, } static Bool -CheckModifierField(XkbDescPtr xkb, unsigned action, const ExprDef *value, +CheckModifierField(XkbDescPtr xkb, + unsigned action, + ExprDef * value, unsigned *flags_inout, unsigned *mods_rtrn) { ExprResult rtrn; if (value->op == ExprIdent) { - char *valStr; + register char *valStr; valStr = XkbAtomGetString(NULL, value->value.str); if (valStr && ((uStrCaseCmp(valStr, "usemodmapmods") == 0) || (uStrCaseCmp(valStr, "modmapmods") == 0))) @@ -390,10 +391,13 @@ CheckModifierField(XkbDescPtr xkb, unsigned action, const ExprDef *value, } static Bool -HandleSetLatchMods(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, - const ExprDef *array_ndx, const ExprDef *value) +HandleSetLatchMods(XkbDescPtr xkb, + XkbAnyAction * action, + unsigned field, ExprDef * array_ndx, ExprDef * value) { XkbModAction *act; + unsigned rtrn; + unsigned t1, t2; act = (XkbModAction *) action; if (array_ndx != NULL) @@ -410,18 +414,15 @@ HandleSetLatchMods(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, { case F_ClearLocks: case F_LatchToLock: - { - unsigned rtrn = act->flags; + rtrn = act->flags; if (CheckLatchLockFlags(action->type, field, value, &rtrn)) { act->flags = rtrn; return True; } return False; - } case F_Modifiers: - { - unsigned t1 = act->flags, t2; + t1 = act->flags; if (CheckModifierField(xkb, action->type, value, &t1, &t2)) { act->flags = t1; @@ -432,7 +433,6 @@ HandleSetLatchMods(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, } return False; } - } return ReportIllegal(action->type, field); } @@ -445,10 +445,13 @@ static LookupEntry lockWhich[] = { }; static Bool -HandleLockMods(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, - const ExprDef *array_ndx, const ExprDef *value) +HandleLockMods(XkbDescPtr xkb, + XkbAnyAction * action, + unsigned field, ExprDef * array_ndx, ExprDef * value) { XkbModAction *act; + unsigned t1, t2; + ExprResult rtrn; act = (XkbModAction *) action; if ((array_ndx != NULL) && (field == F_Modifiers || field == F_Affect)) @@ -456,17 +459,13 @@ HandleLockMods(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, switch (field) { case F_Affect: - { - ExprResult rtrn; if (!ExprResolveEnum(value, &rtrn, lockWhich)) return ReportMismatch(action->type, field, "lock or unlock"); act->flags &= ~(XkbSA_LockNoLock | XkbSA_LockNoUnlock); act->flags |= rtrn.uval; return True; - } case F_Modifiers: - { - unsigned t1 = act->flags, t2; + t1 = act->flags; if (CheckModifierField(xkb, action->type, value, &t1, &t2)) { act->flags = t1; @@ -477,7 +476,6 @@ HandleLockMods(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, } return False; } - } return ReportIllegal(action->type, field); } @@ -494,10 +492,10 @@ static LookupEntry groupNames[] = { }; static Bool -CheckGroupField(unsigned action, const ExprDef *value, - unsigned *flags_inout, int *grp_rtrn) +CheckGroupField(unsigned action, + ExprDef * value, unsigned *flags_inout, int *grp_rtrn) { - const ExprDef *spec; + ExprDef *spec; ExprResult rtrn; if ((value->op == OpNegate) || (value->op == OpUnaryPlus)) @@ -531,10 +529,14 @@ CheckGroupField(unsigned action, const ExprDef *value, } static Bool -HandleSetLatchGroup(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, - const ExprDef *array_ndx, const ExprDef *value) +HandleSetLatchGroup(XkbDescPtr xkb, + XkbAnyAction * action, + unsigned field, ExprDef * array_ndx, ExprDef * value) { XkbGroupAction *act; + unsigned rtrn; + unsigned t1; + int t2; act = (XkbGroupAction *) action; if (array_ndx != NULL) @@ -551,19 +553,15 @@ HandleSetLatchGroup(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, { case F_ClearLocks: case F_LatchToLock: - { - unsigned rtrn = act->flags; + rtrn = act->flags; if (CheckLatchLockFlags(action->type, field, value, &rtrn)) { act->flags = rtrn; return True; } return False; - } case F_Group: - { - unsigned t1 = act->flags; - int t2; + t1 = act->flags; if (CheckGroupField(action->type, value, &t1, &t2)) { act->flags = t1; @@ -572,23 +570,24 @@ HandleSetLatchGroup(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, } return False; } - } return ReportIllegal(action->type, field); } static Bool -HandleLockGroup(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, - const ExprDef * array_ndx, const ExprDef *value) +HandleLockGroup(XkbDescPtr xkb, + XkbAnyAction * action, + unsigned field, ExprDef * array_ndx, ExprDef * value) { XkbGroupAction *act; + unsigned t1; + int t2; act = (XkbGroupAction *) action; if ((array_ndx != NULL) && (field == F_Group)) return ReportActionNotArray(action->type, field); if (field == F_Group) { - unsigned t1 = act->flags; - int t2; + t1 = act->flags; if (CheckGroupField(action->type, value, &t1, &t2)) { act->flags = t1; @@ -601,11 +600,13 @@ HandleLockGroup(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, } static Bool -HandleMovePtr(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, - const ExprDef *array_ndx, const ExprDef *value) +HandleMovePtr(XkbDescPtr xkb, + XkbAnyAction * action, + unsigned field, ExprDef * array_ndx, ExprDef * value) { ExprResult rtrn; XkbPtrAction *act; + Bool absolute; act = (XkbPtrAction *) action; if ((array_ndx != NULL) && ((field == F_X) || (field == F_Y))) @@ -613,8 +614,6 @@ HandleMovePtr(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, if ((field == F_X) || (field == F_Y)) { - Bool absolute; - if ((value->op == OpNegate) || (value->op == OpUnaryPlus)) absolute = False; else @@ -659,8 +658,9 @@ static LookupEntry btnNames[] = { }; static Bool -HandlePtrBtn(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, - const ExprDef *array_ndx, const ExprDef *value) +HandlePtrBtn(XkbDescPtr xkb, + XkbAnyAction * action, + unsigned field, ExprDef * array_ndx, ExprDef * value) { ExprResult rtrn; XkbPtrBtnAction *act; @@ -720,8 +720,9 @@ static LookupEntry ptrDflts[] = { }; static Bool -HandleSetPtrDflt(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, - const ExprDef *array_ndx, const ExprDef *value) +HandleSetPtrDflt(XkbDescPtr xkb, + XkbAnyAction * action, + unsigned field, ExprDef * array_ndx, ExprDef * value) { ExprResult rtrn; XkbPtrDfltAction *act; @@ -738,7 +739,7 @@ HandleSetPtrDflt(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, } else if ((field == F_Button) || (field == F_Value)) { - const ExprDef *btn; + ExprDef *btn; if (array_ndx != NULL) return ReportActionNotArray(action->type, field); if ((value->op == OpNegate) || (value->op == OpUnaryPlus)) @@ -796,19 +797,19 @@ static LookupEntry isoNames[] = { }; static Bool -HandleISOLock(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, - const ExprDef *array_ndx, const ExprDef *value) +HandleISOLock(XkbDescPtr xkb, + XkbAnyAction * action, + unsigned field, ExprDef * array_ndx, ExprDef * value) { ExprResult rtrn; XkbISOAction *act; - unsigned flags; + unsigned flags, mods; + int group; act = (XkbISOAction *) action; switch (field) { case F_Modifiers: - { - unsigned mods; if (array_ndx != NULL) return ReportActionNotArray(action->type, field); flags = act->flags; @@ -821,10 +822,7 @@ HandleISOLock(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, return True; } return False; - } case F_Group: - { - int group; if (array_ndx != NULL) return ReportActionNotArray(action->type, field); flags = act->flags; @@ -835,7 +833,6 @@ HandleISOLock(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, return True; } return False; - } case F_Affect: if (array_ndx != NULL) return ReportActionNotArray(action->type, field); @@ -850,8 +847,9 @@ HandleISOLock(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, } static Bool -HandleSwitchScreen(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, - const ExprDef *array_ndx, const ExprDef *value) +HandleSwitchScreen(XkbDescPtr xkb, + XkbAnyAction * action, + unsigned field, ExprDef * array_ndx, ExprDef * value) { ExprResult rtrn; XkbSwitchScreenAction *act; @@ -859,7 +857,7 @@ HandleSwitchScreen(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, act = (XkbSwitchScreenAction *) action; if (field == F_Screen) { - const ExprDef *scrn; + ExprDef *scrn; if (array_ndx != NULL) return ReportActionNotArray(action->type, field); if ((value->op == OpNegate) || (value->op == OpUnaryPlus)) @@ -941,8 +939,9 @@ LookupEntry ctrlNames[] = { }; static Bool -HandleSetLockControls(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, - const ExprDef *array_ndx, const ExprDef *value) +HandleSetLockControls(XkbDescPtr xkb, + XkbAnyAction * action, + unsigned field, ExprDef * array_ndx, ExprDef * value) { ExprResult rtrn; XkbCtrlsAction *act; @@ -981,8 +980,9 @@ static LookupEntry evNames[] = { }; static Bool -HandleActionMessage(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, - const ExprDef *array_ndx, const ExprDef *value) +HandleActionMessage(XkbDescPtr xkb, + XkbAnyAction * action, + unsigned field, ExprDef * array_ndx, ExprDef * value) { ExprResult rtrn; XkbMessageAction *act; @@ -1058,11 +1058,14 @@ HandleActionMessage(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, } static Bool -HandleRedirectKey(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, - const ExprDef *array_ndx, const ExprDef *value) +HandleRedirectKey(XkbDescPtr xkb, + XkbAnyAction * action, + unsigned field, ExprDef * array_ndx, ExprDef * value) { ExprResult rtrn; XkbRedirectKeyAction *act; + unsigned t1, t2, vmods, vmask; + unsigned long tmp; if (array_ndx != NULL) return ReportActionNotArray(action->type, field); @@ -1071,10 +1074,6 @@ HandleRedirectKey(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, switch (field) { case F_Keycode: - { - unsigned int t1; - unsigned long tmp; - if (!ExprResolveKeyName(value, &rtrn, NULL, NULL)) return ReportMismatch(action->type, field, "key name"); tmp = KeyNameToLong(rtrn.keyName.name); @@ -1086,16 +1085,11 @@ HandleRedirectKey(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, } act->new_key = t1; return True; - } case F_ModsToClear: case F_Modifiers: - { - unsigned t1 = 0, t2; - + t1 = 0; if (CheckModifierField(xkb, action->type, value, &t1, &t2)) { - unsigned vmods, vmask; - act->mods_mask |= (t2 & 0xff); if (field == F_Modifiers) act->mods |= (t2 & 0xff); @@ -1116,13 +1110,13 @@ HandleRedirectKey(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, } return True; } - } return ReportIllegal(action->type, field); } static Bool -HandleDeviceBtn(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, - const ExprDef *array_ndx, const ExprDef *value) +HandleDeviceBtn(XkbDescPtr xkb, + XkbAnyAction * action, + unsigned field, ExprDef * array_ndx, ExprDef * value) { ExprResult rtrn; XkbDeviceBtnAction *act; @@ -1190,8 +1184,9 @@ HandleDeviceBtn(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, } static Bool -HandleDeviceValuator(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, - const ExprDef *array_ndx, const ExprDef *value) +HandleDeviceValuator(XkbDescPtr xkb, + XkbAnyAction * action, + unsigned field, ExprDef * array_ndx, ExprDef * value) { #if 0 ExprResult rtrn; @@ -1204,8 +1199,9 @@ HandleDeviceValuator(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, } static Bool -HandlePrivate(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, - const ExprDef *array_ndx, const ExprDef *value) +HandlePrivate(XkbDescPtr xkb, + XkbAnyAction * action, + unsigned field, ExprDef * array_ndx, ExprDef * value) { ExprResult rtrn; @@ -1274,8 +1270,8 @@ HandlePrivate(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, typedef Bool(*actionHandler) (XkbDescPtr /* xkb */ , XkbAnyAction * /* action */ , unsigned /* field */ , - const ExprDef * /* array_ndx */ , - const ExprDef * /* value */ + ExprDef * /* array_ndx */ , + ExprDef * /* value */ ); static actionHandler handleAction[XkbSA_NumActions + 1] = { @@ -1323,11 +1319,12 @@ ApplyActionFactoryDefaults(XkbAction * action) int -HandleActionDef(const ExprDef *def, XkbDescPtr xkb, XkbAnyAction *action, - unsigned mergeMode, const ActionInfo *info) +HandleActionDef(ExprDef * def, + XkbDescPtr xkb, + XkbAnyAction * action, unsigned mergeMode, ActionInfo * info) { ExprDef *arg; - const char *str; + register char *str; unsigned tmp, hndlrType; if (!actionsInitialized) @@ -1422,15 +1419,17 @@ HandleActionDef(const ExprDef *def, XkbDescPtr xkb, XkbAnyAction *action, /***====================================================================***/ int -SetActionField(XkbDescPtr xkb, const char *elem, const char *field, - ExprDef *array_ndx, ExprDef *value, ActionInfo **info_rtrn) +SetActionField(XkbDescPtr xkb, + const char *elem, + const char *field, + ExprDef * array_ndx, ExprDef * value, ActionInfo ** info_rtrn) { ActionInfo *new, *old; if (!actionsInitialized) ActionsInit(); - new = malloc(sizeof(ActionInfo)); + new = uTypedAlloc(ActionInfo); if (new == NULL) { WSGO("Couldn't allocate space for action default\n"); @@ -1469,27 +1468,23 @@ SetActionField(XkbDescPtr xkb, const char *elem, const char *field, /***====================================================================***/ -static void +void ActionsInit(void) { if (!actionsInitialized) { - bzero(&constTrue, sizeof(constTrue)); - constTrue = (ExprDef) { - .common.stmtType = StmtExpr, - .common.next = NULL, - .op = ExprIdent, - .type = TypeBoolean, - .value.str = XkbInternAtom(NULL, "true", False) - }; - bzero(&constFalse, sizeof(constFalse)); - constFalse = (ExprDef) { - .common.stmtType = StmtExpr, - .common.next = NULL, - .op = ExprIdent, - .type = TypeBoolean, - .value.str = XkbInternAtom(NULL, "false", False) - }; + bzero((char *) &constTrue, sizeof(constTrue)); + bzero((char *) &constFalse, sizeof(constFalse)); + constTrue.common.stmtType = StmtExpr; + constTrue.common.next = NULL; + constTrue.op = ExprIdent; + constTrue.type = TypeBoolean; + constTrue.value.str = XkbInternAtom(NULL, "true", False); + constFalse.common.stmtType = StmtExpr; + constFalse.common.next = NULL; + constFalse.op = ExprIdent; + constFalse.type = TypeBoolean; + constFalse.value.str = XkbInternAtom(NULL, "false", False); actionsInitialized = 1; } return; diff --git a/app/xkbcomp/action.h b/app/xkbcomp/action.h index c6a73c050..bd9273d8c 100644 --- a/app/xkbcomp/action.h +++ b/app/xkbcomp/action.h @@ -64,11 +64,11 @@ typedef struct _ActionInfo struct _ActionInfo *next; } ActionInfo; -extern int HandleActionDef(const ExprDef * /* def */ , +extern int HandleActionDef(ExprDef * /* def */ , XkbDescPtr /* xkb */ , XkbAnyAction * /* action */ , unsigned /* mergeMode */ , - const ActionInfo * /* info */ + ActionInfo * /* info */ ); extern int SetActionField(XkbDescPtr /* xkb */ , @@ -79,6 +79,8 @@ extern int SetActionField(XkbDescPtr /* xkb */ , ActionInfo ** /* info_rtrn */ ); +extern void ActionsInit(void); + extern LookupEntry ctrlNames[]; #endif /* ACTION_H */ diff --git a/app/xkbcomp/alias.c b/app/xkbcomp/alias.c index c914cbc45..b9d44ef65 100644 --- a/app/xkbcomp/alias.c +++ b/app/xkbcomp/alias.c @@ -76,8 +76,8 @@ HandleCollision(AliasInfo * old, AliasInfo * new) } static void -InitAliasInfo(AliasInfo *info, unsigned merge, unsigned file_id, - const char *alias, const char *real) +InitAliasInfo(AliasInfo * info, + unsigned merge, unsigned file_id, char *alias, char *real) { bzero(info, sizeof(AliasInfo)); info->def.merge = merge; @@ -88,8 +88,8 @@ InitAliasInfo(AliasInfo *info, unsigned merge, unsigned file_id, } int -HandleAliasDef(const KeyAliasDef *def, - unsigned merge, unsigned file_id, AliasInfo **info_in) +HandleAliasDef(KeyAliasDef * def, + unsigned merge, unsigned file_id, AliasInfo ** info_in) { AliasInfo *info; @@ -103,7 +103,7 @@ HandleAliasDef(const KeyAliasDef *def, return True; } } - info = calloc(1, sizeof(AliasInfo)); + info = uTypedCalloc(1, AliasInfo); if (info == NULL) { WSGO("Allocation failure in HandleAliasDef\n"); @@ -140,7 +140,7 @@ MergeAliases(AliasInfo ** into, AliasInfo ** merge, unsigned how_merge) *merge = NULL; return True; } - bzero(&def, sizeof(KeyAliasDef)); + bzero((char *) &def, sizeof(KeyAliasDef)); for (tmp = *merge; tmp != NULL; tmp = (AliasInfo *) tmp->def.next) { if (how_merge == MergeDefault) @@ -158,7 +158,7 @@ MergeAliases(AliasInfo ** into, AliasInfo ** merge, unsigned how_merge) int ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** info_in) { - int i; + register int i; XkbKeyAliasPtr old, a; AliasInfo *info; int nNew, nOld; @@ -237,10 +237,10 @@ ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** info_in) { if (!xkb->geom) { - XkbGeometrySizesRec sizes = { - .which = XkbGeomKeyAliasesMask, - .num_key_aliases = nOld + nNew - }; + XkbGeometrySizesRec sizes; + bzero((char *) &sizes, sizeof(XkbGeometrySizesRec)); + sizes.which = XkbGeomKeyAliasesMask; + sizes.num_key_aliases = nOld + nNew; status = XkbAllocGeometry(xkb, &sizes); } else diff --git a/app/xkbcomp/alias.h b/app/xkbcomp/alias.h index 13404c651..93e05275e 100644 --- a/app/xkbcomp/alias.h +++ b/app/xkbcomp/alias.h @@ -34,7 +34,7 @@ typedef struct _AliasInfo char real[XkbKeyNameLength + 1]; } AliasInfo; -extern int HandleAliasDef(const KeyAliasDef * /* def */ , +extern int HandleAliasDef(KeyAliasDef * /* def */ , unsigned /* merge */ , unsigned /* file_id */ , AliasInfo ** /* info */ diff --git a/app/xkbcomp/compat.c b/app/xkbcomp/compat.c index 26f4249c4..757ef42f0 100644 --- a/app/xkbcomp/compat.c +++ b/app/xkbcomp/compat.c @@ -81,7 +81,7 @@ typedef struct _CompatInfo /***====================================================================***/ static char * -siText(const SymInterpInfo *si, const CompatInfo *info) +siText(SymInterpInfo * si, CompatInfo * info) { static char buf[128]; @@ -102,6 +102,8 @@ siText(const SymInterpInfo *si, const CompatInfo *info) static void InitCompatInfo(CompatInfo * info, XkbDescPtr xkb) { + register int i; + info->xkb = xkb; info->name = NULL; info->fileID = 0; @@ -115,7 +117,7 @@ InitCompatInfo(CompatInfo * info, XkbDescPtr xkb) info->dflt.interp.flags = 0; info->dflt.interp.virtual_mod = XkbNoModifier; info->dflt.interp.act.type = XkbSA_NoAction; - for (int i = 0; i < XkbAnyActionDataSize; i++) + for (i = 0; i < XkbAnyActionDataSize; i++) { info->dflt.interp.act.data[i] = 0; } @@ -123,7 +125,8 @@ InitCompatInfo(CompatInfo * info, XkbDescPtr xkb) info->ledDflt.defs.fileID = info->fileID; info->ledDflt.defs.defined = 0; info->ledDflt.defs.merge = MergeOverride; - bzero(&info->groupCompat[0], XkbNumKbdGroups * sizeof(GroupCompatInfo)); + bzero((char *) &info->groupCompat[0], + XkbNumKbdGroups * sizeof(GroupCompatInfo)); info->leds = NULL; InitVModInfo(&info->vmods, xkb); return; @@ -132,21 +135,25 @@ InitCompatInfo(CompatInfo * info, XkbDescPtr xkb) static void ClearCompatInfo(CompatInfo * info, XkbDescPtr xkb) { - free(info->name); + register int i; + + if (info->name != NULL) + uFree(info->name); info->name = NULL; info->dflt.defs.defined = 0; info->dflt.defs.merge = MergeAugment; info->dflt.interp.flags = 0; info->dflt.interp.virtual_mod = XkbNoModifier; info->dflt.interp.act.type = XkbSA_NoAction; - for (int i = 0; i < XkbAnyActionDataSize; i++) + for (i = 0; i < XkbAnyActionDataSize; i++) { info->dflt.interp.act.data[i] = 0; } ClearIndicatorMapInfo(xkb->dpy, &info->ledDflt); info->nInterps = 0; info->interps = (SymInterpInfo *) ClearCommonInfo(&info->interps->defs); - bzero(&info->groupCompat[0], XkbNumKbdGroups * sizeof(GroupCompatInfo)); + bzero((char *) &info->groupCompat[0], + XkbNumKbdGroups * sizeof(GroupCompatInfo)); info->leds = (LEDInfo *) ClearCommonInfo(&info->leds->defs); /* 3/30/94 (ef) -- XXX! Should free action info here */ ClearVModInfo(&info->vmods, xkb); @@ -158,9 +165,10 @@ NextInterp(CompatInfo * info) { SymInterpInfo *si; - si = calloc(1, sizeof(SymInterpInfo)); + si = uTypedAlloc(SymInterpInfo); if (si) { + bzero((char *) si, sizeof(SymInterpInfo)); info->interps = (SymInterpInfo *) AddCommonInfo(&info->interps->defs, (CommonInfo *) si); @@ -170,7 +178,7 @@ NextInterp(CompatInfo * info) } static SymInterpInfo * -FindMatchingInterp(CompatInfo *info, const SymInterpInfo *new) +FindMatchingInterp(CompatInfo * info, SymInterpInfo * new) { SymInterpInfo *old; @@ -190,13 +198,13 @@ FindMatchingInterp(CompatInfo *info, const SymInterpInfo *new) static Bool AddInterp(CompatInfo * info, SymInterpInfo * new) { + unsigned collide; SymInterpInfo *old; + collide = 0; old = FindMatchingInterp(info, new); if (old != NULL) { - unsigned collide = 0; - if (new->defs.merge == MergeReplace) { SymInterpInfo *next = (SymInterpInfo *) old->defs.next; @@ -255,7 +263,7 @@ AddInterp(CompatInfo * info, SymInterpInfo * new) } static Bool -AddGroupCompat(CompatInfo *info, unsigned group, const GroupCompatInfo *newGC) +AddGroupCompat(CompatInfo * info, unsigned group, GroupCompatInfo * newGC) { GroupCompatInfo *gc; unsigned merge; @@ -281,9 +289,9 @@ AddGroupCompat(CompatInfo *info, unsigned group, const GroupCompatInfo *newGC) /***====================================================================***/ static Bool -ResolveStateAndPredicate(const ExprDef *expr, - unsigned *pred_rtrn, unsigned *mods_rtrn, - const CompatInfo *info) +ResolveStateAndPredicate(ExprDef * expr, + unsigned *pred_rtrn, + unsigned *mods_rtrn, CompatInfo * info) { ExprResult result; @@ -341,9 +349,10 @@ ResolveStateAndPredicate(const ExprDef *expr, static void MergeIncludedCompatMaps(CompatInfo * into, CompatInfo * from, unsigned merge) { - LEDInfo *next; + SymInterpInfo *si; + LEDInfo *led, *rtrn, *next; GroupCompatInfo *gcm; - int i; + register int i; if (from->errorCount > 0) { @@ -355,8 +364,7 @@ MergeIncludedCompatMaps(CompatInfo * into, CompatInfo * from, unsigned merge) into->name = from->name; from->name = NULL; } - for (SymInterpInfo *si = from->interps; si; - si = (SymInterpInfo *) si->defs.next) + for (si = from->interps; si; si = (SymInterpInfo *) si->defs.next) { if (merge != MergeDefault) si->defs.merge = merge; @@ -370,10 +378,8 @@ MergeIncludedCompatMaps(CompatInfo * into, CompatInfo * from, unsigned merge) if (!AddGroupCompat(into, i, gcm)) into->errorCount++; } - for (LEDInfo *led = from->leds; led != NULL; led = next) + for (led = from->leds; led != NULL; led = next) { - LEDInfo *rtrn; - next = (LEDInfo *) led->defs.next; if (merge != MergeDefault) led->defs.merge = merge; @@ -386,14 +392,14 @@ MergeIncludedCompatMaps(CompatInfo * into, CompatInfo * from, unsigned merge) return; } -typedef void (*FileHandler) (const XkbFile * /* rtrn */ , +typedef void (*FileHandler) (XkbFile * /* rtrn */ , XkbDescPtr /* xkb */ , unsigned /* merge */ , CompatInfo * /* info */ ); static Bool -HandleIncludeCompatMap(IncludeStmt *stmt, +HandleIncludeCompatMap(IncludeStmt * stmt, XkbDescPtr xkb, CompatInfo * info, FileHandler hndlr) { unsigned newMerge; @@ -421,7 +427,8 @@ HandleIncludeCompatMap(IncludeStmt *stmt, (*hndlr) (rtrn, xkb, MergeOverride, &included); if (stmt->stmt != NULL) { - free(included.name); + if (included.name != NULL) + uFree(included.name); included.name = stmt->stmt; stmt->stmt = NULL; } @@ -485,9 +492,10 @@ static LookupEntry useModMapValues[] = { }; static int -SetInterpField(SymInterpInfo *si, XkbDescPtr xkb, const char *field, - const ExprDef *arrayNdx, const ExprDef *value, - const CompatInfo *info) +SetInterpField(SymInterpInfo * si, + XkbDescPtr xkb, + const char *field, + ExprDef * arrayNdx, ExprDef * value, CompatInfo * info) { int ok = 1; ExprResult tmp; @@ -596,7 +604,7 @@ LookupEntry groupNames[] = { }; static int -HandleInterpVar(const VarDef *stmt, XkbDescPtr xkb, CompatInfo *info) +HandleInterpVar(VarDef * stmt, XkbDescPtr xkb, CompatInfo * info) { ExprResult elem, field; ExprDef *ndx; @@ -616,8 +624,8 @@ HandleInterpVar(const VarDef *stmt, XkbDescPtr xkb, CompatInfo *info) } static int -HandleInterpBody(const VarDef *def, XkbDescPtr xkb, SymInterpInfo *si, - CompatInfo *info) +HandleInterpBody(VarDef * def, XkbDescPtr xkb, SymInterpInfo * si, + CompatInfo * info) { int ok = 1; ExprResult tmp, field; @@ -639,8 +647,8 @@ HandleInterpBody(const VarDef *def, XkbDescPtr xkb, SymInterpInfo *si, } static int -HandleInterpDef(const InterpDef *def, XkbDescPtr xkb, unsigned merge, - CompatInfo *info) +HandleInterpDef(InterpDef * def, XkbDescPtr xkb, unsigned merge, + CompatInfo * info) { unsigned pred, mods; SymInterpInfo si; @@ -681,8 +689,8 @@ HandleInterpDef(const InterpDef *def, XkbDescPtr xkb, unsigned merge, } static int -HandleGroupCompatDef(const GroupCompatDef *def, - XkbDescPtr xkb, unsigned merge, CompatInfo *info) +HandleGroupCompatDef(GroupCompatDef * def, + XkbDescPtr xkb, unsigned merge, CompatInfo * info) { ExprResult val; GroupCompatInfo tmp; @@ -713,8 +721,8 @@ HandleGroupCompatDef(const GroupCompatDef *def, } static void -HandleCompatMapFile(const XkbFile *file, - XkbDescPtr xkb, unsigned merge, CompatInfo *info) +HandleCompatMapFile(XkbFile * file, + XkbDescPtr xkb, unsigned merge, CompatInfo * info) { ParseCommon *stmt; @@ -783,11 +791,12 @@ HandleCompatMapFile(const XkbFile *file, } static void -CopyInterps(const CompatInfo *info, +CopyInterps(CompatInfo * info, XkbCompatMapPtr compat, Bool needSymbol, unsigned pred) { - for (SymInterpInfo *si = info->interps; si; - si = (SymInterpInfo *) si->defs.next) + SymInterpInfo *si; + + for (si = info->interps; si; si = (SymInterpInfo *) si->defs.next) { if (((si->interp.match & XkbSI_OpMask) != pred) || (needSymbol && (si->interp.sym == NoSymbol)) || @@ -805,11 +814,13 @@ CopyInterps(const CompatInfo *info, } Bool -CompileCompatMap(const XkbFile *file, - XkbFileInfo *result, unsigned merge, LEDInfo **unboundLEDs) +CompileCompatMap(XkbFile * file, + XkbFileInfo * result, unsigned merge, LEDInfo ** unboundLEDs) { + int i; CompatInfo info; XkbDescPtr xkb; + GroupCompatInfo *gcm; xkb = result->xkb; InitCompatInfo(&info, xkb); @@ -819,9 +830,7 @@ CompileCompatMap(const XkbFile *file, if (info.errorCount == 0) { - int size, i; - GroupCompatInfo *gcm; - + int size; if (XkbAllocCompatMap(xkb, XkbAllCompatMask, info.nInterps) != Success) { @@ -874,6 +883,7 @@ CompileCompatMap(const XkbFile *file, ClearCompatInfo(&info, xkb); return True; } - free(info.interps); + if (info.interps != NULL) + uFree(info.interps); return False; } diff --git a/app/xkbcomp/config.h.in b/app/xkbcomp/config.h.in index a16d7ba45..cd229231b 100644 --- a/app/xkbcomp/config.h.in +++ b/app/xkbcomp/config.h.in @@ -1,20 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Define to 1 if you have the `asprintf' function. */ -#undef HAVE_ASPRINTF - /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_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 `reallocarray' function. */ -#undef HAVE_REALLOCARRAY - -/* Define to 1 if you have the `recallocarray' function. */ -#undef HAVE_RECALLOCARRAY - /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H @@ -45,9 +33,6 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the <wchar.h> header file. */ -#undef HAVE_WCHAR_H - /* Name of package */ #undef PACKAGE @@ -83,94 +68,6 @@ backward compatibility; new code need not use it. */ #undef STDC_HEADERS -/* Enable extensions on AIX 3, Interix. */ -#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 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 X/Open extensions. Define to 500 only if necessary - to make mbstate_t available. */ -#ifndef _XOPEN_SOURCE -# undef _XOPEN_SOURCE -#endif - - /* Version number of package */ #undef VERSION diff --git a/app/xkbcomp/configure b/app/xkbcomp/configure index a15402682..04d784361 100644 --- a/app/xkbcomp/configure +++ b/app/xkbcomp/configure @@ -1,12 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for xkbcomp 1.4.7. +# Generated by GNU Autoconf 2.69 for xkbcomp 1.4.6. # # Report bugs to <https://gitlab.freedesktop.org/xorg/app/xkbcomp/-/issues>. # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, -# Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -17,16 +16,14 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: -if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : +if test -n "${ZSH_VERSION+set}" && (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 $as_nop +else case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -36,46 +33,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 -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 +# 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 # The user is always right. -if ${PATH_SEPARATOR+false} :; then +if test "${PATH_SEPARATOR+set}" != set; 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 || @@ -84,6 +81,13 @@ if ${PATH_SEPARATOR+false} :; 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 #(( @@ -92,12 +96,8 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - test -r "$as_dir$0" && as_myself=$as_dir$0 && break + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done IFS=$as_save_IFS @@ -109,10 +109,30 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$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. @@ -134,22 +154,20 @@ 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'. -printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_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="as_nop=: -if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (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 \$as_nop +else case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -169,53 +187,42 @@ 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 \$as_nop +else 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 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null -then : + if (eval "$as_required") 2>/dev/null; then : as_have_required=yes -else $as_nop +else 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 $as_nop +else 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 - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. 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_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null -then : + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : CONFIG_SHELL=$as_shell as_have_required=yes - if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null -then : + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : break 2 fi fi @@ -223,21 +230,14 @@ fi esac as_found=false done -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 : +$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 -fi +fi; } +IFS=$as_save_IFS - 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 @@ -255,19 +255,18 @@ 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'. -printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - 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." + 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." else - printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and + $as_echo "$0: Please tell bug-autoconf@gnu.org and $0: https://gitlab.freedesktop.org/xorg/app/xkbcomp/-/issues $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or @@ -296,7 +295,6 @@ as_fn_unset () } as_unset=as_fn_unset - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -314,14 +312,6 @@ 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 # ------------- @@ -336,7 +326,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -345,7 +335,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -384,13 +374,12 @@ 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 $as_nop +else as_fn_append () { eval $1=\$$1\$2 @@ -402,27 +391,18 @@ 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 $as_nop +else 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] # ---------------------------------------- @@ -434,9 +414,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 - printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - printf "%s\n" "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -463,7 +443,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -507,7 +487,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { $as_echo "$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 @@ -521,10 +501,6 @@ 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*) @@ -538,13 +514,6 @@ 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 @@ -612,44 +581,48 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='xkbcomp' PACKAGE_TARNAME='xkbcomp' -PACKAGE_VERSION='1.4.7' -PACKAGE_STRING='xkbcomp 1.4.7' +PACKAGE_VERSION='1.4.6' +PACKAGE_STRING='xkbcomp 1.4.6' PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xkbcomp/-/issues' PACKAGE_URL='' ac_unique_file="Makefile.am" # Factoring default headers for most tests. ac_includes_default="\ -#include <stddef.h> -#ifdef HAVE_STDIO_H -# include <stdio.h> +#include <stdio.h> +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> #endif -#ifdef HAVE_STDLIB_H +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif +#ifdef STDC_HEADERS # 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_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -695,9 +668,9 @@ CHANGELOG_CMD STRICT_CFLAGS CWARNFLAGS BASE_CFLAGS -MAINT -MAINTAINER_MODE_FALSE -MAINTAINER_MODE_TRUE +EGREP +GREP +CPP am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE @@ -708,6 +681,16 @@ AMDEP_TRUE am__quote am__include DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE am__untar am__tar AMTAR @@ -731,13 +714,6 @@ am__isrc INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -OBJEXT -EXEEXT -ac_ct_CC -CPPFLAGS -LDFLAGS -CFLAGS -CC target_alias host_alias build_alias @@ -780,8 +756,8 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_dependency_tracking enable_maintainer_mode +enable_dependency_tracking enable_selective_werror enable_strict_compilation enable_silent_rules @@ -796,6 +772,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS +CPP PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR @@ -871,6 +848,8 @@ 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 ;; @@ -911,9 +890,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=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -937,9 +916,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=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1150,9 +1129,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=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1166,9 +1145,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=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1212,9 +1191,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1230,7 +1209,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1294,7 +1273,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_myself" | +$as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1351,7 +1330,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 xkbcomp 1.4.7 to adapt to many kinds of systems. +\`configure' configures xkbcomp 1.4.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1422,7 +1401,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xkbcomp 1.4.7:";; + short | recursive ) echo "Configuration of xkbcomp 1.4.6:";; esac cat <<\_ACEOF @@ -1430,13 +1409,13 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer --enable-dependency-tracking do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build - --enable-maintainer-mode - enable make rules and dependencies not useful (and - sometimes confusing) to the casual installer --disable-selective-werror Turn off selective compiler errors. (default: enabled) @@ -1462,6 +1441,7 @@ 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 @@ -1497,9 +1477,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=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`$as_echo "$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/ ;; @@ -1527,8 +1507,7 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for configure.gnu first; this name is used for a wrapper for - # Metaconfig's "Configure" on case-insensitive file systems. + # Check for guested configure. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -1536,7 +1515,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1545,10 +1524,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xkbcomp configure 1.4.7 -generated by GNU Autoconf 2.71 +xkbcomp configure 1.4.6 +generated by GNU Autoconf 2.69 -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1565,14 +1544,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 conftest.beam + rm -f conftest.$ac_objext 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\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1580,15 +1559,14 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$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_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1598,61 +1576,25 @@ fi } # ac_fn_c_try_compile -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { 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 : - eval "$3=yes" -else $as_nop - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -eval ac_res=\$$3 - { 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_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR -# ------------------------------------------------------------------ +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR. -ac_fn_check_decl () +# accordingly. +ac_fn_c_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'` - eval ac_save_FLAGS=\$$6 - as_fn_append $6 " $5" + { $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 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { #ifndef $as_decl_name #ifdef __cplusplus @@ -1666,22 +1608,129 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$3=yes" -else $as_nop +else eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - eval $6=\$ac_save_FLAGS +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_decl + +# 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_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 +# INCLUDES, setting the cache variable VAR accordingly. +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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -} # ac_fn_check_decl +} # ac_fn_c_check_header_compile # ac_fn_c_try_link LINENO # ----------------------- @@ -1689,14 +1738,14 @@ printf "%s\n" "$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.beam conftest$ac_exeext + rm -f conftest.$ac_objext 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\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1704,18 +1753,17 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$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_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1736,12 +1784,11 @@ fi ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { 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 + { $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 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case <limits.h> declares $2. @@ -1749,9 +1796,16 @@ else $as_nop #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. */ + 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 -#include <limits.h> #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -1769,56 +1823,35 @@ choke me #endif int -main (void) +main () { 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 $as_nop +else eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func -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 xkbcomp $as_me 1.4.7, which was -generated by GNU Autoconf 2.71. Invocation command line was +It was created by xkbcomp $as_me 1.4.6, which was +generated by GNU Autoconf 2.69. Invocation command line was - $ $0$ac_configure_args_raw + $ $0 $@ _ACEOF exec 5>>config.log @@ -1851,12 +1884,8 @@ 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 - printf "%s\n" "PATH: $as_dir" + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" done IFS=$as_save_IFS @@ -1891,7 +1920,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -1926,13 +1955,11 @@ 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 - printf "%s\n" "## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -1943,8 +1970,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_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;} ;; + *_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;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -1968,7 +1995,7 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ) echo - printf "%s\n" "## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -1976,14 +2003,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - printf "%s\n" "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - printf "%s\n" "## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -1991,15 +2018,15 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - printf "%s\n" "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - printf "%s\n" "## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -2007,8 +2034,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} echo fi test "$ac_signal" != 0 && - printf "%s\n" "$as_me: caught signal $ac_signal" - printf "%s\n" "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -2022,48 +2049,63 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -printf "%s\n" "/* confdefs.h */" > confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF -printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF -printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF -printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF -printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF -printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF # 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 - ac_site_files="$CONFIG_SITE" + # 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 elif test "x$prefix" != xNONE; then - ac_site_files="$prefix/share/config.site $prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi - -for ac_site_file in $ac_site_files +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do - 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;} + 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;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$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 @@ -2073,519 +2115,711 @@ 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -printf "%s\n" "$as_me: loading cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -printf "%s\n" "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$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 +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + 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;} + 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;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + 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;} + 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;} + 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;} + 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=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + 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 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## -#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; -} +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 -/* 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);' +ac_config_headers="$ac_config_headers config.h" -# 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 +# Initialize Automake +am__api_version='1.12' -#include <stdbool.h> -extern int puts (const char *); -extern int printf (const char *, ...); -extern int dprintf (int, const char *, ...); -extern void *malloc (size_t); +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 -// 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); -} +# 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. -// 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[]; -}; +# 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 +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# 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; } +if test -z "$INSTALL"; then +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else + 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]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # 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 test $ac_prog = install && + 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 + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + 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" && + 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" + break 3 + fi + fi + fi + done + done + ;; +esac -struct named_init { - int number; - const wchar_t *name; - double average; -}; + done +IFS=$as_save_IFS -typedef const char *ccp; +rm -rf conftest.one conftest.two conftest.dir -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; -} +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } -// 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); +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - const char *str = ""; - int number = 0; - float fnumber = 0; +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - 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); +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - return *str && number && fnumber; -} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "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=' ' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; +esac -# 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; +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then - // work around unused variable warnings - ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' - || dynamic_array[ni.number - 1] != 543); -' + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$2" = conftest.file + ) +then + # Ok. + : +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; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi -# 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 +rm -f conftest.file -// 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; +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# 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"` -// 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"); +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` -// Check _Noreturn. -int _Noreturn does_not_return (void) { for (;;) continue; } +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +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;} +fi -// 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; -}; +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi -// Check UTF-8 literals. -#define u8 syntax error! -char const utf8_literal[] = u8"happens to be ASCII" "another string"; +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +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 + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + 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_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -// Check duplicate typedefs. -typedef long *long_ptr; -typedef long int *long_ptr; -typedef long_ptr long_ptr; +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; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -// 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; -' +fi +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 + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + 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_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -# 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} +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; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -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; -} -" + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + 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;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi -# 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} +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - ${ac_c_conftest_c99_main} - return ok; -} -" +{ $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; } +if test -z "$MKDIR_P"; then + if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + 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=. + 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) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS -# Test code for whether the C compiler supports C89 (complete). -ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} +fi -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - return ok; -} -" + test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + MKDIR_P="$ac_install_sh -d" + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } -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="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 +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 + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in $ac_aux_dir_candidates +for as_dir in $PATH 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 + test -z "$as_dir" && as_dir=. + 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_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi - ac_first_candidate=false - - as_found=false done + 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 +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; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } 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" + 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; } +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 + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make fi -if test -f "${ac_aux_dir}config.sub"; then - ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +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; } + SET_MAKE= +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ fi -if test -f "$ac_aux_dir/configure"; then - ac_configure="$SHELL ${ac_aux_dir}configure" +rmdir .tst 2>/dev/null + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi fi -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { 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) - { 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=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - 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 - { 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 - { 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 - { 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=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo fi -done -if $ac_cache_corrupted; then - { 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. ## -## -------------------- ## -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 +# Define the identity of the package. + PACKAGE='xkbcomp' + VERSION='1.4.6' -ac_config_headers="$ac_config_headers config.h" +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF -# Set common system defines for POSIX extensions, such as _GNU_SOURCE -# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL) -# to avoid autoconf errors. +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF +# Some tools Automake needs. + +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> +mkdir_p='$(MKDIR_P)' + +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + + + + +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS + + + + + + + + + + + +{ $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; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + + +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.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; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; +fi +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi ac_ext=c @@ -2596,12 +2830,11 @@ 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 -{ 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 +{ $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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2609,15 +2842,11 @@ 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 + test -z "$as_dir" && as_dir=. 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" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2628,11 +2857,11 @@ 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2641,12 +2870,11 @@ 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 -{ 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 +{ $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 if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -2654,15 +2882,11 @@ 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 + test -z "$as_dir" && as_dir=. 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" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2673,11 +2897,11 @@ 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2685,8 +2909,8 @@ fi 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;} +{ $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;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2699,12 +2923,11 @@ 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 -{ 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 +{ $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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2712,15 +2935,11 @@ 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 + test -z "$as_dir" && as_dir=. 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" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2731,11 +2950,11 @@ 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2744,12 +2963,11 @@ 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 -{ 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 +{ $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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2758,19 +2976,15 @@ 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 + test -z "$as_dir" && as_dir=. 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" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2786,18 +3000,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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2808,12 +3022,11 @@ 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 -{ 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 +{ $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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2821,15 +3034,11 @@ 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 + test -z "$as_dir" && as_dir=. 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" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2840,11 +3049,11 @@ 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2857,12 +3066,11 @@ 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 -{ 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 +{ $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 if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -2870,15 +3078,11 @@ 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 + test -z "$as_dir" && as_dir=. 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" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2889,11 +3093,11 @@ 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2905,8 +3109,8 @@ done 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;} +{ $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;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2914,129 +3118,25 @@ esac 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" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$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. -printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +$as_echo "$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 -version; do +for ac_option in --version -v -V -qversion; 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\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3046,7 +3146,7 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -3054,7 +3154,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; @@ -3066,9 +3166,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. -{ 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[^ ]*//'` +{ $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[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -3089,12 +3189,11 @@ case "(($ac_try" in *) 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 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : + $as_echo "$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, @@ -3111,7 +3210,7 @@ do # certainly right. break;; *.* ) - if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3127,46 +3226,44 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else $as_nop +else ac_file='' fi -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 +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 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$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_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; } +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; } 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 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -printf %s "checking for suffix of executables... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "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\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$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; } -then : + $as_echo "$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 @@ -3180,15 +3277,15 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -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;} +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 compute suffix of executables: cannot compile and link See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -printf "%s\n" "$ac_cv_exeext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -3197,7 +3294,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> int -main (void) +main () { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -3209,8 +3306,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. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -printf %s "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -3218,10 +3315,10 @@ case "(($ac_try" in *) 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 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -3229,40 +3326,39 @@ printf "%s\n" "$ac_try_echo"; } >&5 *) 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 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$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 - { { 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. + { { $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. If you meant to cross compile, use \`--host'. See \`config.log' for more details" "$LINENO" 5; } fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -printf "%s\n" "$cross_compiling" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ 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 +{ $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 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; @@ -3276,12 +3372,11 @@ case "(($ac_try" in *) 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 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : + $as_echo "$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 @@ -3290,32 +3385,31 @@ then : break;; esac done -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $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 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 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -printf "%s\n" "$ac_cv_objext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ 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 +{ $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 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { #ifndef __GNUC__ choke me @@ -3325,33 +3419,29 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes -else $as_nop +else ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ 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 - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+y} +ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ 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 +{ $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 ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -3360,60 +3450,57 @@ else $as_nop /* end confdefs.h. */ int -main (void) +main () { ; 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 $as_nop +else CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -else $as_nop +else ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; 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.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ 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 +{ $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 CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -3428,915 +3515,109 @@ else CFLAGS= fi fi -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. */ -$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 - -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 - -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 +{ $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_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__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c89=$ac_arg -fi -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 - -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 -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 - - -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - 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 - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi - - - - - - - { 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. */ - -# define __EXTENSIONS__ 1 - $ac_includes_default -int -main (void) +#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 0; + return p[i]; } -_ACEOF -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 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; } - - { 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 <wchar.h> - mbstate_t x; -int -main (void) +static char *f (char * (*g) (char **, int), char **p, ...) { - - ; - return 0; + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; } -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +/* 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]; - #define _XOPEN_SOURCE 500 - #include <wchar.h> - mbstate_t x; +/* 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 **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; int -main (void) +main () { - +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_should_define__xopen_source=yes -fi -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 -{ 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; } - - printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h - - printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h - - printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h - - 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 - - printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h - - printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h - - printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 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 - - printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h - - printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h - - printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h - - 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 - - printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h - - printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h - -else $as_nop - MINIX= -fi - if test $ac_cv_safe_to_define___extensions__ = yes -then : - printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h - -fi - if test $ac_cv_should_define__xopen_source = yes -then : - printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h - -fi - - -# Initialize Automake -am__api_version='1.12' - - - - # 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 -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# 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. -{ 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 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 +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do - IFS=$as_save_IFS - 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/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # 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 test $ac_prog = install && - 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 - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - 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/" && - 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" - break 3 - fi - fi - fi - done - done - ;; -esac - - done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - 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 - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ 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. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -{ 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=' -' -case `pwd` in - *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; -esac -case $srcdir in - *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; -esac - -# Do 'set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - am_has_slept=no - for am_try in 1 2; do - echo "timestamp, slept: $am_has_slept" > conftest.file - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken - alias in your environment" "$LINENO" 5 - fi - if test "$2" = conftest.file || test $am_try -eq 2; then - break - fi - # Just in case. - sleep 1 - am_has_slept=yes - done - test "$2" = conftest.file - ) -then - # Ok. - : -else - as_fn_error $? "newly created file is older than distributed files! -Check your system clock" "$LINENO" 5 -fi -{ 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= -if grep 'slept: no' conftest.file >/dev/null 2>&1; then - ( sleep 1 ) & - am_sleep_pid=$! -fi - -rm -f conftest.file - -test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. -# By default was `s,x,x', remove it if useless. -ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -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 - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - { 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 - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi - -# Installed binaries are usually stripped using 'strip' when the user -# run "make install-strip". However 'strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the 'STRIP' environment variable to overrule this program. -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 -{ 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 -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_STRIP="${ac_tool_prefix}strip" - 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 -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -printf "%s\n" "$STRIP" >&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_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 -{ 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 -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_STRIP="strip" - 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_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -printf "%s\n" "$ac_ct_STRIP" >&6; } -else - { 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 - STRIP=":" - 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 - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - - - { 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 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 - 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 ('*'coreutils) '* | \ - 'BusyBox '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext - break 3;; - esac - done - done - done -IFS=$as_save_IFS - -fi - - test -d ./--version && rmdir ./--version - 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 - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - MKDIR_P="$ac_install_sh -d" - fi + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg fi -{ 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 -{ 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 -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_AWK="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done - done -IFS=$as_save_IFS +rm -f conftest.$ac_ext +CC=$ac_save_CC fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -printf "%s\n" "$AWK" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$AWK" && break -done - -{ 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=`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: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; +# 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; } ;; *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - SET_MAKE= -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi - -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null - -DEPDIR="${am__leading_dot}deps" - -ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -{ 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 -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; + 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 -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi +if test "x$ac_cv_prog_cc_c89" != xno; then : - -{ 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+y} -then : - enableval=$enable_dependency_tracking; -fi - -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 - fi fi -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi - - -# Define the identity of the package. - PACKAGE='xkbcomp' - VERSION='1.4.7' - - -printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h - - -printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h - -# Some tools Automake needs. - -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - - -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - - -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} - - -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -# For better backward compatibility. To be removed once Automake 1.9.x -# dies out for good. For more background, see: -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> -mkdir_p='$(MKDIR_P)' - -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AMTAR='$${TAR-tar}' - -am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' - - - +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 depcc="$CC" am_compiler_list= -{ 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 +{ $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 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 @@ -4443,8 +3724,8 @@ else fi fi -{ 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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -4458,147 +3739,603 @@ else 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 +/* 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); +} -# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +// 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) +{ + // 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 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); +} +int +main () +{ + // Check bool. + _Bool success = false; + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; -{ 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+y} -then : - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else $as_nop - USE_MAINTAINER_MODE=no + // 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); + + ; + 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 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 - { 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='#' +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 : + +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 - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= + # 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 +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 - MAINT=$MAINTAINER_MODE_TRUE + # 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 : + 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 -{ 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 + # 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 + + $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 +{ $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 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stdlib.h> +#include <stdarg.h> +#include <string.h> +#include <float.h> int -main (void) +main () { -(void) strchr; + ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +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 -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 +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 <float.h> -#include <limits.h> -#include <stdarg.h> -#include <stddef.h> -extern void ac_decl (int, char *); +#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 +rm -f conftest* + +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 : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +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 (void) +main () { -(void) ac_decl (0, (char *) 0); - (void) ac_decl; - - ; + 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_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 +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no fi - break +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -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 +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 +$as_echo "#define STDC_HEADERS 1" >>confdefs.h +fi + +# 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 + +fi + +done -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 : + + + +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 : CLANGCC="yes" -else $as_nop +else CLANGCC="no" fi -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 : + +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 : INTELCC="yes" -else $as_nop +else INTELCC="no" fi -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 : + +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 : SUNCC="yes" -else $as_nop +else SUNCC="no" fi @@ -4609,16 +4346,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 -{ 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 +{ $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 case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -4628,15 +4365,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. 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" - printf "%s\n" "$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" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4648,11 +4381,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -printf "%s\n" "$PKG_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4661,12 +4394,11 @@ 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 -{ 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 +{ $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 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. @@ -4676,15 +4408,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. 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" - printf "%s\n" "$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" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4696,11 +4424,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -4708,8 +4436,8 @@ fi 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;} +{ $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;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -4721,40 +4449,37 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { 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; } + { $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; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "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 - - # 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 +{ $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 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 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -printf "%s\n" "$ac_cv_build" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -4773,22 +4498,21 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ 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 +{ $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 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 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -printf "%s\n" "$ac_cv_host" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -4807,12 +4531,11 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ 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 +{ $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 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" @@ -4826,15 +4549,10 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_prog in sed gsed - do + test -z "$as_dir" && as_dir=. + 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 @@ -4843,13 +4561,13 @@ case `"$ac_path_SED" --version 2>&1` in ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - printf %s 0123456789 >"conftest.in" + $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" - printf "%s\n" '' >> "conftest.nl" + $as_echo '' >> "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 @@ -4877,8 +4595,8 @@ else fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -printf "%s\n" "$ac_cv_path_SED" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -4888,10 +4606,9 @@ printf "%s\n" "$ac_cv_path_SED" >&6; } # Check whether --enable-selective-werror was given. -if test ${enable_selective_werror+y} -then : +if test "${enable_selective_werror+set}" = set; then : enableval=$enable_selective_werror; SELECTIVE_WERROR=$enableval -else $as_nop +else SELECTIVE_WERROR=yes fi @@ -4924,26 +4641,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -4953,26 +4668,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -4990,31 +4703,29 @@ found="no" CFLAGS="$CFLAGS -Wall" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall" >&5 -printf %s "checking if $CC supports -Wall... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall" >&5 +$as_echo_n "checking if $CC supports -Wall... " >&6; } cacheid=xorg_cv_cc_flag__Wall - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -5022,8 +4733,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wall" found="yes" @@ -5048,26 +4759,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -5077,26 +4786,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -5114,31 +4821,29 @@ found="no" CFLAGS="$CFLAGS -Wpointer-arith" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-arith" >&5 -printf %s "checking if $CC supports -Wpointer-arith... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-arith" >&5 +$as_echo_n "checking if $CC supports -Wpointer-arith... " >&6; } cacheid=xorg_cv_cc_flag__Wpointer_arith - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -5146,8 +4851,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wpointer-arith" found="yes" @@ -5172,26 +4877,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -5201,26 +4904,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -5238,31 +4939,29 @@ found="no" CFLAGS="$CFLAGS -Wmissing-declarations" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations" >&5 -printf %s "checking if $CC supports -Wmissing-declarations... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations" >&5 +$as_echo_n "checking if $CC supports -Wmissing-declarations... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_declarations - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -5270,8 +4969,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-declarations" found="yes" @@ -5296,26 +4995,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -5325,26 +5022,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -5362,31 +5057,29 @@ found="no" CFLAGS="$CFLAGS -Wformat=2" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat=2" >&5 -printf %s "checking if $CC supports -Wformat=2... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat=2" >&5 +$as_echo_n "checking if $CC supports -Wformat=2... " >&6; } cacheid=xorg_cv_cc_flag__Wformat_2 - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -5394,8 +5087,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wformat=2" found="yes" @@ -5413,31 +5106,29 @@ printf "%s\n" "$supported" >&6; } CFLAGS="$CFLAGS -Wformat" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat" >&5 -printf %s "checking if $CC supports -Wformat... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat" >&5 +$as_echo_n "checking if $CC supports -Wformat... " >&6; } cacheid=xorg_cv_cc_flag__Wformat - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -5445,8 +5136,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wformat" found="yes" @@ -5473,26 +5164,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -5502,26 +5191,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -5539,31 +5226,29 @@ found="no" CFLAGS="$CFLAGS -Wstrict-prototypes" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wstrict-prototypes" >&5 -printf %s "checking if $CC supports -Wstrict-prototypes... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wstrict-prototypes" >&5 +$as_echo_n "checking if $CC supports -Wstrict-prototypes... " >&6; } cacheid=xorg_cv_cc_flag__Wstrict_prototypes - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -5571,8 +5256,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wstrict-prototypes" found="yes" @@ -5597,26 +5282,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -5626,26 +5309,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -5663,31 +5344,29 @@ found="no" CFLAGS="$CFLAGS -Wmissing-prototypes" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-prototypes" >&5 -printf %s "checking if $CC supports -Wmissing-prototypes... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-prototypes" >&5 +$as_echo_n "checking if $CC supports -Wmissing-prototypes... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_prototypes - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -5695,8 +5374,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-prototypes" found="yes" @@ -5721,26 +5400,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -5750,26 +5427,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -5787,31 +5462,29 @@ found="no" CFLAGS="$CFLAGS -Wnested-externs" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnested-externs" >&5 -printf %s "checking if $CC supports -Wnested-externs... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnested-externs" >&5 +$as_echo_n "checking if $CC supports -Wnested-externs... " >&6; } cacheid=xorg_cv_cc_flag__Wnested_externs - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -5819,8 +5492,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wnested-externs" found="yes" @@ -5845,26 +5518,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -5874,26 +5545,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -5911,31 +5580,29 @@ found="no" CFLAGS="$CFLAGS -Wbad-function-cast" - { 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; } + { $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; } cacheid=xorg_cv_cc_flag__Wbad_function_cast - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -5943,8 +5610,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wbad-function-cast" found="yes" @@ -5969,26 +5636,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -5998,26 +5663,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -6035,31 +5698,29 @@ found="no" CFLAGS="$CFLAGS -Wold-style-definition" - { 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; } + { $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; } cacheid=xorg_cv_cc_flag__Wold_style_definition - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -6067,8 +5728,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wold-style-definition" found="yes" @@ -6086,31 +5747,29 @@ printf "%s\n" "$supported" >&6; } CFLAGS="$CFLAGS -fd" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fd" >&5 -printf %s "checking if $CC supports -fd... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fd" >&5 +$as_echo_n "checking if $CC supports -fd... " >&6; } cacheid=xorg_cv_cc_flag__fd - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -6118,8 +5777,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -fd" found="yes" @@ -6144,26 +5803,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -6173,26 +5830,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -6210,31 +5865,29 @@ found="no" CFLAGS="$CFLAGS -Wdeclaration-after-statement" - { 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; } + { $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; } cacheid=xorg_cv_cc_flag__Wdeclaration_after_statement - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -6242,8 +5895,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wdeclaration-after-statement" found="yes" @@ -6272,26 +5925,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -6301,26 +5952,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -6338,31 +5987,29 @@ found="no" CFLAGS="$CFLAGS -Wunused" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused" >&5 -printf %s "checking if $CC supports -Wunused... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused" >&5 +$as_echo_n "checking if $CC supports -Wunused... " >&6; } cacheid=xorg_cv_cc_flag__Wunused - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -6370,8 +6017,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wunused" found="yes" @@ -6396,26 +6043,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -6425,26 +6070,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -6462,31 +6105,29 @@ found="no" CFLAGS="$CFLAGS -Wuninitialized" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wuninitialized" >&5 -printf %s "checking if $CC supports -Wuninitialized... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wuninitialized" >&5 +$as_echo_n "checking if $CC supports -Wuninitialized... " >&6; } cacheid=xorg_cv_cc_flag__Wuninitialized - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -6494,8 +6135,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wuninitialized" found="yes" @@ -6520,26 +6161,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -6549,26 +6188,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -6586,31 +6223,29 @@ found="no" CFLAGS="$CFLAGS -Wshadow" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wshadow" >&5 -printf %s "checking if $CC supports -Wshadow... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wshadow" >&5 +$as_echo_n "checking if $CC supports -Wshadow... " >&6; } cacheid=xorg_cv_cc_flag__Wshadow - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -6618,8 +6253,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wshadow" found="yes" @@ -6644,26 +6279,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -6673,26 +6306,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -6710,31 +6341,29 @@ found="no" CFLAGS="$CFLAGS -Wmissing-noreturn" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5 -printf %s "checking if $CC supports -Wmissing-noreturn... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5 +$as_echo_n "checking if $CC supports -Wmissing-noreturn... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_noreturn - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -6742,8 +6371,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-noreturn" found="yes" @@ -6768,26 +6397,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -6797,26 +6424,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -6834,31 +6459,29 @@ found="no" CFLAGS="$CFLAGS -Wmissing-format-attribute" - { 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; } + { $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; } cacheid=xorg_cv_cc_flag__Wmissing_format_attribute - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -6866,8 +6489,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-format-attribute" found="yes" @@ -6875,7 +6498,6 @@ printf "%s\n" "$supported" >&6; } fi -# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) @@ -6893,26 +6515,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -6922,26 +6542,142 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 + 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 @@ -6959,31 +6695,29 @@ found="no" CFLAGS="$CFLAGS -Wlogical-op" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wlogical-op" >&5 -printf %s "checking if $CC supports -Wlogical-op... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wlogical-op" >&5 +$as_echo_n "checking if $CC supports -Wlogical-op... " >&6; } cacheid=xorg_cv_cc_flag__Wlogical_op - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -6991,8 +6725,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wlogical-op" found="yes" @@ -7029,26 +6763,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -7058,26 +6790,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -7095,31 +6825,29 @@ found="no" CFLAGS="$CFLAGS -Werror=implicit" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=implicit" >&5 -printf %s "checking if $CC supports -Werror=implicit... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=implicit" >&5 +$as_echo_n "checking if $CC supports -Werror=implicit... " >&6; } cacheid=xorg_cv_cc_flag__Werror_implicit - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -7127,8 +6855,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=implicit" found="yes" @@ -7146,31 +6874,29 @@ printf "%s\n" "$supported" >&6; } CFLAGS="$CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" - { 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; } + { $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; } cacheid=xorg_cv_cc_flag__errwarn_E_NO_EXPLICIT_TYPE_GIVEN__errwarn_E_NO_IMPLICIT_DECL_ALLOWED - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -7178,8 +6904,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$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" @@ -7204,26 +6930,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -7233,26 +6957,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -7270,31 +6992,29 @@ found="no" CFLAGS="$CFLAGS -Werror=nonnull" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=nonnull" >&5 -printf %s "checking if $CC supports -Werror=nonnull... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=nonnull" >&5 +$as_echo_n "checking if $CC supports -Werror=nonnull... " >&6; } cacheid=xorg_cv_cc_flag__Werror_nonnull - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -7302,8 +7022,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=nonnull" found="yes" @@ -7328,26 +7048,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -7357,26 +7075,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -7394,31 +7110,29 @@ found="no" CFLAGS="$CFLAGS -Werror=init-self" - { 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; } + { $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; } cacheid=xorg_cv_cc_flag__Werror_init_self - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -7426,8 +7140,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=init-self" found="yes" @@ -7452,26 +7166,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -7481,26 +7193,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -7518,31 +7228,29 @@ found="no" CFLAGS="$CFLAGS -Werror=main" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=main" >&5 -printf %s "checking if $CC supports -Werror=main... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=main" >&5 +$as_echo_n "checking if $CC supports -Werror=main... " >&6; } cacheid=xorg_cv_cc_flag__Werror_main - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -7550,8 +7258,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=main" found="yes" @@ -7576,26 +7284,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -7605,26 +7311,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -7642,31 +7346,29 @@ found="no" CFLAGS="$CFLAGS -Werror=missing-braces" - { 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; } + { $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; } cacheid=xorg_cv_cc_flag__Werror_missing_braces - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -7674,8 +7376,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=missing-braces" found="yes" @@ -7700,26 +7402,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -7729,26 +7429,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -7766,31 +7464,29 @@ found="no" CFLAGS="$CFLAGS -Werror=sequence-point" - { 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; } + { $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; } cacheid=xorg_cv_cc_flag__Werror_sequence_point - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -7798,8 +7494,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=sequence-point" found="yes" @@ -7824,26 +7520,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -7853,26 +7547,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -7890,31 +7582,29 @@ found="no" CFLAGS="$CFLAGS -Werror=return-type" - { 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; } + { $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; } cacheid=xorg_cv_cc_flag__Werror_return_type - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -7922,8 +7612,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=return-type" found="yes" @@ -7941,31 +7631,29 @@ printf "%s\n" "$supported" >&6; } CFLAGS="$CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT" - { 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; } + { $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; } cacheid=xorg_cv_cc_flag__errwarn_E_FUNC_HAS_NO_RETURN_STMT - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -7973,8 +7661,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT" found="yes" @@ -7999,26 +7687,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -8028,26 +7714,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -8065,31 +7749,29 @@ found="no" CFLAGS="$CFLAGS -Werror=trigraphs" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=trigraphs" >&5 -printf %s "checking if $CC supports -Werror=trigraphs... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=trigraphs" >&5 +$as_echo_n "checking if $CC supports -Werror=trigraphs... " >&6; } cacheid=xorg_cv_cc_flag__Werror_trigraphs - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -8097,8 +7779,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=trigraphs" found="yes" @@ -8123,26 +7805,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -8152,26 +7832,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -8189,31 +7867,29 @@ found="no" CFLAGS="$CFLAGS -Werror=array-bounds" - { 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; } + { $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; } cacheid=xorg_cv_cc_flag__Werror_array_bounds - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -8221,8 +7897,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=array-bounds" found="yes" @@ -8247,26 +7923,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -8276,26 +7950,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -8313,31 +7985,29 @@ found="no" CFLAGS="$CFLAGS -Werror=write-strings" - { 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; } + { $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; } cacheid=xorg_cv_cc_flag__Werror_write_strings - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -8345,8 +8015,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=write-strings" found="yes" @@ -8371,26 +8041,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -8400,26 +8068,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -8437,31 +8103,29 @@ found="no" CFLAGS="$CFLAGS -Werror=address" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=address" >&5 -printf %s "checking if $CC supports -Werror=address... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=address" >&5 +$as_echo_n "checking if $CC supports -Werror=address... " >&6; } cacheid=xorg_cv_cc_flag__Werror_address - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -8469,8 +8133,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=address" found="yes" @@ -8495,26 +8159,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -8524,26 +8186,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -8561,31 +8221,29 @@ found="no" CFLAGS="$CFLAGS -Werror=int-to-pointer-cast" - { 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; } + { $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; } cacheid=xorg_cv_cc_flag__Werror_int_to_pointer_cast - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -8593,8 +8251,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=int-to-pointer-cast" found="yes" @@ -8612,31 +8270,29 @@ printf "%s\n" "$supported" >&6; } CFLAGS="$CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION" - { 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; } + { $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; } cacheid=xorg_cv_cc_flag__errwarn_E_BAD_PTR_INT_COMBINATION - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -8644,8 +8300,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION" found="yes" @@ -8670,26 +8326,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -8699,26 +8353,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -8736,31 +8388,29 @@ found="no" CFLAGS="$CFLAGS -Werror=pointer-to-int-cast" - { 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; } + { $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; } cacheid=xorg_cv_cc_flag__Werror_pointer_to_int_cast - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -8768,8 +8418,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=pointer-to-int-cast" found="yes" @@ -8778,8 +8428,8 @@ printf "%s\n" "$supported" >&6; } # Also -errwarn=E_BAD_PTR_INT_COMBINATION else -{ 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;} +{ $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;} @@ -8797,26 +8447,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -8826,26 +8474,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -8863,31 +8509,29 @@ found="no" CFLAGS="$CFLAGS -Wimplicit" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wimplicit" >&5 -printf %s "checking if $CC supports -Wimplicit... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wimplicit" >&5 +$as_echo_n "checking if $CC supports -Wimplicit... " >&6; } cacheid=xorg_cv_cc_flag__Wimplicit - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -8895,8 +8539,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wimplicit" found="yes" @@ -8921,26 +8565,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -8950,26 +8592,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -8987,31 +8627,29 @@ found="no" CFLAGS="$CFLAGS -Wnonnull" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnonnull" >&5 -printf %s "checking if $CC supports -Wnonnull... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnonnull" >&5 +$as_echo_n "checking if $CC supports -Wnonnull... " >&6; } cacheid=xorg_cv_cc_flag__Wnonnull - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -9019,8 +8657,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wnonnull" found="yes" @@ -9045,26 +8683,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -9074,26 +8710,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -9111,31 +8745,29 @@ found="no" CFLAGS="$CFLAGS -Winit-self" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Winit-self" >&5 -printf %s "checking if $CC supports -Winit-self... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Winit-self" >&5 +$as_echo_n "checking if $CC supports -Winit-self... " >&6; } cacheid=xorg_cv_cc_flag__Winit_self - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -9143,8 +8775,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Winit-self" found="yes" @@ -9169,26 +8801,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -9198,26 +8828,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -9235,31 +8863,29 @@ found="no" CFLAGS="$CFLAGS -Wmain" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmain" >&5 -printf %s "checking if $CC supports -Wmain... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmain" >&5 +$as_echo_n "checking if $CC supports -Wmain... " >&6; } cacheid=xorg_cv_cc_flag__Wmain - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -9267,8 +8893,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmain" found="yes" @@ -9293,26 +8919,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -9322,26 +8946,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -9359,31 +8981,29 @@ found="no" CFLAGS="$CFLAGS -Wmissing-braces" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-braces" >&5 -printf %s "checking if $CC supports -Wmissing-braces... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-braces" >&5 +$as_echo_n "checking if $CC supports -Wmissing-braces... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_braces - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -9391,8 +9011,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-braces" found="yes" @@ -9417,26 +9037,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -9446,26 +9064,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -9483,31 +9099,29 @@ found="no" CFLAGS="$CFLAGS -Wsequence-point" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wsequence-point" >&5 -printf %s "checking if $CC supports -Wsequence-point... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wsequence-point" >&5 +$as_echo_n "checking if $CC supports -Wsequence-point... " >&6; } cacheid=xorg_cv_cc_flag__Wsequence_point - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -9515,8 +9129,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wsequence-point" found="yes" @@ -9541,26 +9155,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -9570,26 +9182,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -9607,31 +9217,29 @@ found="no" CFLAGS="$CFLAGS -Wreturn-type" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wreturn-type" >&5 -printf %s "checking if $CC supports -Wreturn-type... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wreturn-type" >&5 +$as_echo_n "checking if $CC supports -Wreturn-type... " >&6; } cacheid=xorg_cv_cc_flag__Wreturn_type - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -9639,8 +9247,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wreturn-type" found="yes" @@ -9665,26 +9273,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -9694,26 +9300,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -9731,31 +9335,29 @@ found="no" CFLAGS="$CFLAGS -Wtrigraphs" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wtrigraphs" >&5 -printf %s "checking if $CC supports -Wtrigraphs... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wtrigraphs" >&5 +$as_echo_n "checking if $CC supports -Wtrigraphs... " >&6; } cacheid=xorg_cv_cc_flag__Wtrigraphs - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -9763,8 +9365,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wtrigraphs" found="yes" @@ -9789,26 +9391,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -9818,26 +9418,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -9855,31 +9453,29 @@ found="no" CFLAGS="$CFLAGS -Warray-bounds" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Warray-bounds" >&5 -printf %s "checking if $CC supports -Warray-bounds... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Warray-bounds" >&5 +$as_echo_n "checking if $CC supports -Warray-bounds... " >&6; } cacheid=xorg_cv_cc_flag__Warray_bounds - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -9887,8 +9483,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Warray-bounds" found="yes" @@ -9913,26 +9509,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -9942,26 +9536,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -9979,31 +9571,29 @@ found="no" CFLAGS="$CFLAGS -Wwrite-strings" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wwrite-strings" >&5 -printf %s "checking if $CC supports -Wwrite-strings... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wwrite-strings" >&5 +$as_echo_n "checking if $CC supports -Wwrite-strings... " >&6; } cacheid=xorg_cv_cc_flag__Wwrite_strings - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -10011,8 +9601,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wwrite-strings" found="yes" @@ -10037,26 +9627,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -10066,26 +9654,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -10103,31 +9689,29 @@ found="no" CFLAGS="$CFLAGS -Waddress" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Waddress" >&5 -printf %s "checking if $CC supports -Waddress... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Waddress" >&5 +$as_echo_n "checking if $CC supports -Waddress... " >&6; } cacheid=xorg_cv_cc_flag__Waddress - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -10135,8 +9719,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Waddress" found="yes" @@ -10161,26 +9745,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -10190,26 +9772,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -10227,31 +9807,29 @@ found="no" CFLAGS="$CFLAGS -Wint-to-pointer-cast" - { 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; } + { $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; } cacheid=xorg_cv_cc_flag__Wint_to_pointer_cast - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -10259,8 +9837,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wint-to-pointer-cast" found="yes" @@ -10285,26 +9863,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -10314,26 +9890,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -10351,31 +9925,29 @@ found="no" CFLAGS="$CFLAGS -Wpointer-to-int-cast" - { 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; } + { $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; } cacheid=xorg_cv_cc_flag__Wpointer_to_int_cast - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -10383,8 +9955,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wpointer-to-int-cast" found="yes" @@ -10413,10 +9985,9 @@ fi # Check whether --enable-strict-compilation was given. -if test ${enable_strict_compilation+y} -then : +if test "${enable_strict_compilation+set}" = set; then : enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval -else $as_nop +else STRICT_COMPILE=no fi @@ -10443,26 +10014,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -10472,26 +10041,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -10509,31 +10076,29 @@ found="no" CFLAGS="$CFLAGS -pedantic" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -pedantic" >&5 -printf %s "checking if $CC supports -pedantic... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -pedantic" >&5 +$as_echo_n "checking if $CC supports -pedantic... " >&6; } cacheid=xorg_cv_cc_flag__pedantic - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -10541,8 +10106,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -pedantic" found="yes" @@ -10567,26 +10132,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -10596,26 +10159,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -10633,31 +10194,29 @@ found="no" CFLAGS="$CFLAGS -Werror" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5 -printf %s "checking if $CC supports -Werror... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5 +$as_echo_n "checking if $CC supports -Werror... " >&6; } cacheid=xorg_cv_cc_flag__Werror - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -10665,8 +10224,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -Werror" found="yes" @@ -10684,31 +10243,29 @@ printf "%s\n" "$supported" >&6; } CFLAGS="$CFLAGS -errwarn" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn" >&5 -printf %s "checking if $CC supports -errwarn... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn" >&5 +$as_echo_n "checking if $CC supports -errwarn... " >&6; } cacheid=xorg_cv_cc_flag__errwarn - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -10716,8 +10273,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -errwarn" found="yes" @@ -10745,26 +10302,24 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unknown_warning_option=yes -else $as_nop +else xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -10774,26 +10329,24 @@ 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" - { 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 + { $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 : +if ac_fn_c_try_compile "$LINENO"; then : xorg_cv_cc_flag_unused_command_line_argument=yes -else $as_nop +else xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ 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; } +{ $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 @@ -10811,31 +10364,29 @@ found="no" CFLAGS="$CFLAGS -Werror=attributes" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5 -printf %s "checking if $CC supports -Werror=attributes... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5 +$as_echo_n "checking if $CC supports -Werror=attributes... " >&6; } cacheid=xorg_cv_cc_flag__Werror_attributes - if eval test \${$cacheid+y} -then : - printf %s "(cached) " >&6 -else $as_nop + 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 (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval $cacheid=yes -else $as_nop +else eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -10843,8 +10394,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -printf "%s\n" "$supported" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes" found="yes" @@ -10874,14 +10425,18 @@ _ACEOF PVM="0" fi -printf "%s\n" "#define PACKAGE_VERSION_MINOR $PVM" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MINOR $PVM +_ACEOF PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` if test "x$PVP" = "x"; then PVP="0" fi -printf "%s\n" "#define PACKAGE_VERSION_PATCHLEVEL $PVP" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_PATCHLEVEL $PVP +_ACEOF @@ -10911,12 +10466,11 @@ 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 - { 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 + { $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 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 @@ -10925,12 +10479,11 @@ else ac_cv_file__usr_share_man_man7_attributes_7=no fi fi -{ 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 : +{ $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 : SYSV_MAN_SECTIONS=false -else $as_nop +else SYSV_MAN_SECTIONS=true fi @@ -11025,8 +10578,7 @@ MAN_SUBSTS="\ # Check whether --enable-silent-rules was given. -if test ${enable_silent_rules+y} -then : +if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; fi @@ -11036,13 +10588,12 @@ case $enable_silent_rules in # ((( *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} -{ 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)) +{ $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)) BAR0=false BAR1=true V=1 @@ -11054,8 +10605,8 @@ else am_cv_make_support_nested_variables=no fi fi -{ 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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$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)' @@ -11073,12 +10624,11 @@ 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 -{ 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 +{ $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 if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else @@ -11086,15 +10636,11 @@ 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 + test -z "$as_dir" && as_dir=. 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" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -11105,11 +10651,11 @@ fi fi YACC=$ac_cv_prog_YACC if test -n "$YACC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 -printf "%s\n" "$YACC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 +$as_echo "$YACC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -11119,12 +10665,11 @@ test -n "$YACC" || YACC="yacc" # Extract the first word of "$YACC", so it can be a program name with args. set dummy $YACC; 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_path_YACC_INST+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_YACC_INST+:} false; then : + $as_echo_n "(cached) " >&6 +else case $YACC_INST in [\\/]* | ?:[\\/]*) ac_cv_path_YACC_INST="$YACC_INST" # Let the user override the test with a path. @@ -11134,15 +10679,11 @@ else $as_nop for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. 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_YACC_INST="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$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_YACC_INST="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -11154,11 +10695,11 @@ esac fi YACC_INST=$ac_cv_path_YACC_INST if test -n "$YACC_INST"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACC_INST" >&5 -printf "%s\n" "$YACC_INST" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC_INST" >&5 +$as_echo "$YACC_INST" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -11168,52 +10709,33 @@ if test ! -f "$srcdir/xkbparse.c"; then fi fi -ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf" -if test "x$ac_cv_func_asprintf" = xyes -then : - printf "%s\n" "#define HAVE_ASPRINTF 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "reallocarray" "ac_cv_func_reallocarray" -if test "x$ac_cv_func_reallocarray" = xyes -then : - printf "%s\n" "#define HAVE_REALLOCARRAY 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "recallocarray" "ac_cv_func_recallocarray" -if test "x$ac_cv_func_recallocarray" = xyes -then : - printf "%s\n" "#define HAVE_RECALLOCARRAY 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup" -if test "x$ac_cv_func_strdup" = xyes -then : - printf "%s\n" "#define HAVE_STRDUP 1" >>confdefs.h - -fi -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 +for ac_func in strdup strcasecmp +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 fi +done # Checks for pkg-config packages pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x11 xkbfile xproto >= 7.0.17" >&5 -printf %s "checking for x11 xkbfile xproto >= 7.0.17... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x11 xkbfile xproto >= 7.0.17" >&5 +$as_echo_n "checking for x11 xkbfile xproto >= 7.0.17... " >&6; } if test -n "$XKBCOMP_CFLAGS"; then pkg_cv_XKBCOMP_CFLAGS="$XKBCOMP_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 \"x11 xkbfile xproto >= 7.0.17\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xkbfile xproto >= 7.0.17\""; } >&5 ($PKG_CONFIG --exists --print-errors "x11 xkbfile xproto >= 7.0.17") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XKBCOMP_CFLAGS=`$PKG_CONFIG --cflags "x11 xkbfile xproto >= 7.0.17" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -11227,10 +10749,10 @@ if test -n "$XKBCOMP_LIBS"; then pkg_cv_XKBCOMP_LIBS="$XKBCOMP_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 \"x11 xkbfile xproto >= 7.0.17\""; } >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xkbfile xproto >= 7.0.17\""; } >&5 ($PKG_CONFIG --exists --print-errors "x11 xkbfile xproto >= 7.0.17") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XKBCOMP_LIBS=`$PKG_CONFIG --libs "x11 xkbfile xproto >= 7.0.17" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -11244,8 +10766,8 @@ fi if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -11271,10 +10793,10 @@ Alternatively, you may set the environment variables XKBCOMP_CFLAGS and XKBCOMP_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 - { 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_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;} 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. @@ -11288,26 +10810,24 @@ See \`config.log' for more details" "$LINENO" 5; } else XKBCOMP_CFLAGS=$pkg_cv_XKBCOMP_CFLAGS XKBCOMP_LIBS=$pkg_cv_XKBCOMP_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi # Checks for typedefs, structures, and compiler characteristics. # Check whether --enable-largefile was given. -if test ${enable_largefile+y} -then : +if test "${enable_largefile+set}" = set; then : enableval=$enable_largefile; fi if test "$enable_largefile" != no; then - { 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 + { $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 ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then ac_save_CC=$CC @@ -11321,47 +10841,44 @@ else $as_nop 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 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main (void) +main () { ; 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 conftest.beam +rm -f core conftest.err conftest.$ac_objext 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 conftest.beam +rm -f core conftest.err conftest.$ac_objext break done CC=$ac_save_CC rm -f conftest.$ac_ext fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +$as_echo "$ac_cv_sys_largefile_CC" >&6; } if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - { 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 + { $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 while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11370,23 +10887,22 @@ else $as_nop 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 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main (void) +main () { ; 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.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 @@ -11395,43 +10911,43 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam 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 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main (void) +main () { ; 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.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_sys_file_offset_bits=unknown break done fi -{ 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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +$as_echo "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; *) -printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +_ACEOF ;; esac rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then - { 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 + { $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 while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11440,23 +10956,22 @@ else $as_nop 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 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main (void) +main () { ; 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.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _LARGE_FILES 1 @@ -11465,46 +10980,48 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam 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 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main (void) +main () { ; 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.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_sys_large_files=unknown break done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -printf "%s\n" "$ac_cv_sys_large_files" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +$as_echo "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; *) -printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define _LARGE_FILES $ac_cv_sys_large_files +_ACEOF ;; esac rm -rf conftest* fi + + fi # Check whether --with-xkb_config_root was given. -if test ${with_xkb_config_root+y} -then : +if test "${with_xkb_config_root+set}" = set; then : withval=$with_xkb_config_root; XKBCONFIGROOT="$withval" -else $as_nop +else XKBCONFIGROOT='${datadir}/X11/xkb' fi @@ -11540,8 +11057,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_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;} ;; + *_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;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -11571,15 +11088,15 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -printf "%s\n" "$as_me: updating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -11593,8 +11110,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;} fi fi else - { 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;} + { $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;} fi fi rm -f confcache @@ -11611,7 +11128,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=`printf "%s\n" "$ac_i" | sed "$ac_script"` + ac_i=`$as_echo "$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" @@ -11622,22 +11139,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs -{ 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; } +{ $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; } if test -n "$am_sleep_pid"; then # Hide warnings about reused PIDs. wait $am_sleep_pid 2>/dev/null fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 -printf "%s\n" "done" >&6; } -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error $? "conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -11650,13 +11159,21 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -11679,16 +11196,14 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: -if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : +if test -n "${ZSH_VERSION+set}" && (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 $as_nop +else case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -11698,46 +11213,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 -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 +# 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 # The user is always right. -if ${PATH_SEPARATOR+false} :; then +if test "${PATH_SEPARATOR+set}" != set; 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 || @@ -11746,6 +11261,13 @@ if ${PATH_SEPARATOR+false} :; 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 #(( @@ -11754,12 +11276,8 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - test -r "$as_dir$0" && as_myself=$as_dir$0 && break + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done IFS=$as_save_IFS @@ -11771,10 +11289,30 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$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] @@ -11787,14 +11325,13 @@ 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 - printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - printf "%s\n" "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -11821,20 +11358,18 @@ 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 $as_nop +else as_fn_append () { eval $1=\$$1\$2 @@ -11846,13 +11381,12 @@ 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 $as_nop +else as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -11883,7 +11417,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -11905,10 +11439,6 @@ 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*) @@ -11922,12 +11452,6 @@ 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 @@ -11969,7 +11493,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -11978,7 +11502,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -12040,8 +11564,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 xkbcomp $as_me 1.4.7, which was -generated by GNU Autoconf 2.71. Invocation command line was +This file was extended by xkbcomp $as_me 1.4.6, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -12103,16 +11627,14 @@ $config_commands Report bugs to <https://gitlab.freedesktop.org/xorg/app/xkbcomp/-/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='$ac_cs_config_escaped' +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xkbcomp config.status 1.4.7 -configured by $0, generated by GNU Autoconf 2.71, +xkbcomp config.status 1.4.6 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -12152,15 +11674,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - printf "%s\n" "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - printf "%s\n" "$ac_cs_config"; exit ;; + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -12168,7 +11690,7 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -12177,7 +11699,7 @@ do as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - printf "%s\n" "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -12205,7 +11727,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 - \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -12219,7 +11741,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - printf "%s\n" "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF @@ -12253,9 +11775,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+y} || CONFIG_FILES=$config_files - test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers - test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands + 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 fi # Have a temporary directory for convenience. Make it in the build tree @@ -12591,7 +12113,7 @@ do esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -12599,17 +12121,17 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -printf "%s\n" "$as_me: creating $ac_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`printf "%s\n" "$configure_input" | + ac_sed_conf_input=`$as_echo "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -12626,7 +12148,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$ac_file" | +$as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -12650,9 +12172,9 @@ printf "%s\n" X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`$as_echo "$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/ ;; @@ -12714,8 +12236,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@*) - { 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;} + { $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;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -12759,9 +12281,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"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$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 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +$as_echo "$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" @@ -12777,20 +12299,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} # if test x"$ac_file" != x-; then { - printf "%s\n" "/* $configure_input */" >&1 \ + $as_echo "/* $configure_input */" \ && 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 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$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 - printf "%s\n" "/* $configure_input */" >&1 \ + $as_echo "/* $configure_input */" \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi @@ -12810,7 +12332,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$_am_arg" : 'X\(//\)[^/]' \| \ X"$_am_arg" : 'X\(//\)$' \| \ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$_am_arg" | +$as_echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -12830,8 +12352,8 @@ printf "%s\n" X"$_am_arg" | s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -printf "%s\n" "$as_me: executing $ac_file commands" >&6;} + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -12863,7 +12385,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$mf" | +$as_echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -12905,7 +12427,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ X"$file" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$file" | +$as_echo X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -12964,7 +12486,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 - { 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;} + { $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;} fi diff --git a/app/xkbcomp/configure.ac b/app/xkbcomp/configure.ac index 7a7350946..3aedf484b 100644 --- a/app/xkbcomp/configure.ac +++ b/app/xkbcomp/configure.ac @@ -21,17 +21,12 @@ dnl dnl Process this file with autoconf to create configure. # Initialize Autoconf -AC_PREREQ([2.70]) -AC_INIT([xkbcomp], [1.4.7], +AC_PREREQ([2.60]) +AC_INIT([xkbcomp], [1.4.6], [https://gitlab.freedesktop.org/xorg/app/xkbcomp/-/issues], [xkbcomp]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) -# Set common system defines for POSIX extensions, such as _GNU_SOURCE -# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL) -# to avoid autoconf errors. -AC_USE_SYSTEM_EXTENSIONS - # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-xz]) @@ -50,7 +45,7 @@ if test ! -f "$srcdir/xkbparse.c"; then fi fi -AC_CHECK_FUNCS([asprintf reallocarray recallocarray strdup strcasecmp]) +AC_CHECK_FUNCS([strdup strcasecmp]) # Checks for pkg-config packages PKG_CHECK_MODULES(XKBCOMP, [x11 xkbfile xproto >= 7.0.17]) diff --git a/app/xkbcomp/expr.c b/app/xkbcomp/expr.c index f31f412e3..3555d64a4 100644 --- a/app/xkbcomp/expr.c +++ b/app/xkbcomp/expr.c @@ -94,7 +94,7 @@ exprOpText(unsigned type) return buf; } -static char * +char * exprTypeText(unsigned type) { static char buf[20]; @@ -127,8 +127,9 @@ exprTypeText(unsigned type) } int -ExprResolveLhs(const ExprDef *expr, ExprResult *elem_rtrn, - ExprResult *field_rtrn, ExprDef **index_rtrn) +ExprResolveLhs(ExprDef * expr, + ExprResult * elem_rtrn, + ExprResult * field_rtrn, ExprDef ** index_rtrn) { switch (expr->op) { @@ -153,10 +154,11 @@ ExprResolveLhs(const ExprDef *expr, ExprResult *elem_rtrn, } Bool -SimpleLookup(const XPointer priv, - Atom elem, Atom field, unsigned type, ExprResult *val_rtrn) +SimpleLookup(XPointer priv, + Atom elem, Atom field, unsigned type, ExprResult * val_rtrn) { - char *str; + LookupEntry *entry; + register char *str; if ((priv == NULL) || (field == None) || (elem != None) || @@ -165,7 +167,7 @@ SimpleLookup(const XPointer priv, return False; } str = XkbAtomGetString(NULL, field); - for (const LookupEntry *entry = (const LookupEntry *) priv; + for (entry = (LookupEntry *) priv; (entry != NULL) && (entry->name != NULL); entry++) { if (uStrCaseCmp(str, entry->name) == 0) @@ -180,10 +182,10 @@ SimpleLookup(const XPointer priv, } Bool -RadioLookup(const XPointer priv, - Atom elem, Atom field, unsigned type, ExprResult *val_rtrn) +RadioLookup(XPointer priv, + Atom elem, Atom field, unsigned type, ExprResult * val_rtrn) { - char *str; + register char *str; int rg; if ((field == None) || (elem != None) || (type != TypeInt)) @@ -207,13 +209,12 @@ RadioLookup(const XPointer priv, return True; } -#if 0 -static int +int TableLookup(XPointer priv, Atom elem, Atom field, unsigned type, ExprResult * val_rtrn) { LookupTable *tbl = (LookupTable *) priv; - char *str; + register char *str; if ((priv == NULL) || (field == None) || (type != TypeInt)) return False; @@ -233,7 +234,6 @@ TableLookup(XPointer priv, priv = (XPointer) tbl->entries; return SimpleLookup(priv, (Atom) None, field, type, val_rtrn); } -#endif static LookupEntry modIndexNames[] = { {"shift", ShiftMapIndex}, @@ -248,15 +248,15 @@ static LookupEntry modIndexNames[] = { {NULL, 0} }; -Bool -LookupModIndex(const XPointer priv, - Atom elem, Atom field, unsigned type, ExprResult *val_rtrn) +int +LookupModIndex(XPointer priv, + Atom elem, Atom field, unsigned type, ExprResult * val_rtrn) { return SimpleLookup((XPointer) modIndexNames, elem, field, type, val_rtrn); } -static int +int LookupModMask(XPointer priv, Atom elem, Atom field, unsigned type, ExprResult * val_rtrn) { @@ -272,7 +272,7 @@ LookupModMask(XPointer priv, else if (uStrCaseCmp(str, "none") == 0) val_rtrn->uval = 0; else if (LookupModIndex(priv, elem, field, type, val_rtrn)) - val_rtrn->uval = (1U << val_rtrn->uval); + val_rtrn->uval = (1 << val_rtrn->uval); else if (priv != NULL) { LookupPriv *lpriv = (LookupPriv *) priv; @@ -286,9 +286,8 @@ LookupModMask(XPointer priv, return True; } -#if 0 int -ExprResolveModIndex(const ExprDef *expr, +ExprResolveModIndex(ExprDef * expr, ExprResult * val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { @@ -363,23 +362,23 @@ ExprResolveModIndex(const ExprDef *expr, } return ok; } -#endif int -ExprResolveModMask(const ExprDef *expr, ExprResult *val_rtrn, +ExprResolveModMask(ExprDef * expr, + ExprResult * val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { - LookupPriv priv = { - .priv = NULL, - .chain = lookup, - .chainPriv = lookupPriv - }; + LookupPriv priv; - return ExprResolveMask(expr, val_rtrn, LookupModMask, (XPointer) &priv); + priv.priv = NULL; + priv.chain = lookup; + priv.chainPriv = lookupPriv; + return ExprResolveMask(expr, val_rtrn, LookupModMask, (XPointer) & priv); } int -ExprResolveBoolean(const ExprDef *expr, ExprResult *val_rtrn, +ExprResolveBoolean(ExprDef * expr, + ExprResult * val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { int ok = 0; @@ -444,24 +443,23 @@ ExprResolveBoolean(const ExprDef *expr, ExprResult *val_rtrn, val_rtrn->uval = !val_rtrn->uval; return ok; case OpAdd: - bogus = "Addition"; - goto boolean; + if (bogus == NULL) + bogus = "Addition"; case OpSubtract: - bogus = "Subtraction"; - goto boolean; + if (bogus == NULL) + bogus = "Subtraction"; case OpMultiply: - bogus = "Multiplication"; - goto boolean; + if (bogus == NULL) + bogus = "Multiplication"; case OpDivide: - bogus = "Division"; - goto boolean; + if (bogus == NULL) + bogus = "Division"; case OpAssign: - bogus = "Assignment"; - goto boolean; + if (bogus == NULL) + bogus = "Assignment"; case OpNegate: - bogus = "Negation"; - goto boolean; - boolean: + if (bogus == NULL) + bogus = "Negation"; ERROR("%s of boolean values not permitted\n", bogus); break; case OpUnaryPlus: @@ -475,7 +473,8 @@ ExprResolveBoolean(const ExprDef *expr, ExprResult *val_rtrn, } int -ExprResolveFloat(const ExprDef *expr, ExprResult *val_rtrn, +ExprResolveFloat(ExprDef * expr, + ExprResult * val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { int ok = 0; @@ -487,7 +486,7 @@ ExprResolveFloat(const ExprDef *expr, ExprResult *val_rtrn, case ExprValue: if (expr->type == TypeString) { - char *str; + register char *str; str = XkbAtomGetString(NULL, expr->value.str); if ((str != NULL) && (strlen(str) == 1)) { @@ -587,7 +586,8 @@ ExprResolveFloat(const ExprDef *expr, ExprResult *val_rtrn, } int -ExprResolveInteger(const ExprDef *expr, ExprResult *val_rtrn, +ExprResolveInteger(ExprDef * expr, + ExprResult * val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { int ok = 0; @@ -599,7 +599,7 @@ ExprResolveInteger(const ExprDef *expr, ExprResult *val_rtrn, case ExprValue: if (expr->type == TypeString) { - char *str; + register char *str; str = XkbAtomGetString(NULL, expr->value.str); if (str != NULL) switch (strlen(str)) @@ -707,7 +707,8 @@ ExprResolveInteger(const ExprDef *expr, ExprResult *val_rtrn, } int -ExprResolveString(const ExprDef *expr, ExprResult *val_rtrn, +ExprResolveString(ExprDef * expr, + ExprResult * val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { int ok = 0; @@ -760,44 +761,36 @@ ExprResolveString(const ExprDef *expr, ExprResult *val_rtrn, if (ExprResolveString(left, &leftRtrn, lookup, lookupPriv) && ExprResolveString(right, &rightRtrn, lookup, lookupPriv)) { + int len; char *new; - -#ifdef HAVE_ASPRINTF - if (asprintf(&new, "%s%s", leftRtrn.str, rightRtrn.str) < 0) - new = NULL; -#else - size_t len = strlen(leftRtrn.str) + strlen(rightRtrn.str) + 1; - new = malloc(len); -#endif + len = strlen(leftRtrn.str) + strlen(rightRtrn.str) + 1; + new = (char *) uAlloc(len); if (new) { -#ifndef HAVE_ASPRINTF snprintf(new, len, "%s%s", leftRtrn.str, rightRtrn.str); -#endif val_rtrn->str = new; return True; } } return False; case OpSubtract: - bogus = "Subtraction"; - goto string; + if (bogus == NULL) + bogus = "Subtraction"; case OpMultiply: - bogus = "Multiplication"; - goto string; + if (bogus == NULL) + bogus = "Multiplication"; case OpDivide: - bogus = "Division"; - goto string; + if (bogus == NULL) + bogus = "Division"; case OpAssign: - bogus = "Assignment"; - goto string; + if (bogus == NULL) + bogus = "Assignment"; case OpNegate: - bogus = "Negation"; - goto string; + if (bogus == NULL) + bogus = "Negation"; case OpInvert: - bogus = "Bitwise complement"; - goto string; - string: + if (bogus == NULL) + bogus = "Bitwise complement"; ERROR("%s of string values not permitted\n", bogus); return False; case OpNot: @@ -822,7 +815,8 @@ ExprResolveString(const ExprDef *expr, ExprResult *val_rtrn, } int -ExprResolveKeyName(const ExprDef *expr, ExprResult *val_rtrn, +ExprResolveKeyName(ExprDef * expr, + ExprResult * val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { int ok = 0; @@ -864,27 +858,26 @@ ExprResolveKeyName(const ExprDef *expr, ExprResult *val_rtrn, XkbAtomText(NULL, expr->value.field.field, XkbMessage)); return ok; case OpAdd: - bogus = "Addition"; - goto keyname; + if (bogus == NULL) + bogus = "Addition"; case OpSubtract: - bogus = "Subtraction"; - goto keyname; + if (bogus == NULL) + bogus = "Subtraction"; case OpMultiply: - bogus = "Multiplication"; - goto keyname; + if (bogus == NULL) + bogus = "Multiplication"; case OpDivide: - bogus = "Division"; - goto keyname; + if (bogus == NULL) + bogus = "Division"; case OpAssign: - bogus = "Assignment"; - goto keyname; + if (bogus == NULL) + bogus = "Assignment"; case OpNegate: - bogus = "Negation"; - goto keyname; + if (bogus == NULL) + bogus = "Negation"; case OpInvert: - bogus = "Bitwise complement"; - goto keyname; - keyname: + if (bogus == NULL) + bogus = "Bitwise complement"; ERROR("%s of key name values not permitted\n", bogus); return False; case OpNot: @@ -911,8 +904,7 @@ ExprResolveKeyName(const ExprDef *expr, ExprResult *val_rtrn, /***====================================================================***/ int -ExprResolveEnum(const ExprDef *expr, ExprResult *val_rtrn, - const LookupEntry *values) +ExprResolveEnum(ExprDef * expr, ExprResult * val_rtrn, LookupEntry * values) { if (expr->op != ExprIdent) { @@ -942,12 +934,13 @@ ExprResolveEnum(const ExprDef *expr, ExprResult *val_rtrn, } int -ExprResolveMask(const ExprDef *expr, ExprResult *val_rtrn, +ExprResolveMask(ExprDef * expr, + ExprResult * val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { int ok = 0; ExprResult leftRtrn, rightRtrn; - const ExprDef *left, *right; + ExprDef *left, *right; const char *bogus = NULL; switch (expr->op) @@ -986,11 +979,9 @@ ExprResolveMask(const ExprDef *expr, ExprResult *val_rtrn, return ok; case ExprArrayRef: bogus = "array reference"; - goto unexpected_mask; case ExprActionDecl: - bogus = "function use"; - goto unexpected_mask; - unexpected_mask: + if (bogus == NULL) + bogus = "function use"; ERROR("Unexpected %s in mask expression\n", bogus); ACTION("Expression ignored\n"); return False; @@ -1050,16 +1041,16 @@ ExprResolveMask(const ExprDef *expr, ExprResult *val_rtrn, } int -ExprResolveKeySym(const ExprDef *expr, ExprResult *val_rtrn, +ExprResolveKeySym(ExprDef * expr, + ExprResult * val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { int ok = 0; + KeySym sym; if (expr->op == ExprIdent) { - const char *str; - KeySym sym; - + char *str; str = XkbAtomGetString(NULL, expr->value.str); if ((str != NULL) && ((sym = XStringToKeysym(str)) != NoSymbol)) { diff --git a/app/xkbcomp/expr.h b/app/xkbcomp/expr.h index 756119059..163d474e5 100644 --- a/app/xkbcomp/expr.h +++ b/app/xkbcomp/expr.h @@ -35,14 +35,17 @@ typedef union _ExprResult XkbKeyNameRec keyName; } ExprResult; -typedef Bool(*IdentLookupFunc) (const XPointer /* priv */ , +typedef Bool(*IdentLookupFunc) (XPointer /* priv */ , Atom /* elem */ , Atom /* field */ , unsigned /* type */ , ExprResult * /* val_rtrn */ ); -extern int ExprResolveLhs(const ExprDef * /* expr */ , +extern char *exprTypeText(unsigned /* type */ + ); + +extern int ExprResolveLhs(ExprDef * /* expr */ , ExprResult * /* elem_rtrn */ , ExprResult * /* field_rtrn */ , ExprDef ** /* index_rtrn */ @@ -72,81 +75,95 @@ typedef struct _LookupTable extern char *exprOpText(unsigned /* type */ ); -extern Bool RadioLookup(const XPointer /* priv */ , +extern int RadioLookup(XPointer /* priv */ , Atom /* elem */ , Atom /* field */ , unsigned /* type */ , ExprResult * /* val_rtrn */ ); -extern Bool SimpleLookup(const XPointer /* priv */ , +extern int SimpleLookup(XPointer /* priv */ , Atom /* elem */ , Atom /* field */ , unsigned /* type */ , ExprResult * /* val_rtrn */ ); -extern Bool LookupModIndex(const XPointer /* priv */ , +extern int TableLookup(XPointer /* priv */ , + Atom /* elem */ , + Atom /* field */ , + unsigned /* type */ , + ExprResult * /* val_rtrn */ + ); + +extern int LookupModIndex(XPointer /* priv */ , Atom /* elem */ , Atom /* field */ , unsigned /* type */ , ExprResult * /* val_rtrn */ ); -extern int ExprResolveModIndex(const ExprDef * /* expr */ , +extern int LookupModMask(XPointer /* priv */ , + Atom /* elem */ , + Atom /* field */ , + unsigned /* type */ , + ExprResult * /* val_rtrn */ + ); + +extern int ExprResolveModIndex(ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* lookupPriv */ ); -extern int ExprResolveModMask(const ExprDef * /* expr */ , +extern int ExprResolveModMask(ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* priv */ ); -extern int ExprResolveBoolean(const ExprDef * /* expr */ , +extern int ExprResolveBoolean(ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* lookupPriv */ ); -extern int ExprResolveInteger(const ExprDef * /* expr */ , +extern int ExprResolveInteger(ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* lookupPriv */ ); -extern int ExprResolveFloat(const ExprDef * /* expr */ , +extern int ExprResolveFloat(ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* lookupPriv */ ); -extern int ExprResolveString(const ExprDef * /* expr */ , +extern int ExprResolveString(ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* lookupPriv */ ); -extern int ExprResolveKeyName(const ExprDef * /* expr */ , +extern int ExprResolveKeyName(ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* lookupPriv */ ); -extern int ExprResolveEnum(const ExprDef * /* expr */ , +extern int ExprResolveEnum(ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , - const LookupEntry * /* values */ + LookupEntry * /* values */ ); -extern int ExprResolveMask(const ExprDef * /* expr */ , +extern int ExprResolveMask(ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* lookupPriv */ ); -extern int ExprResolveKeySym(const ExprDef * /* expr */ , +extern int ExprResolveKeySym(ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* lookupPriv */ diff --git a/app/xkbcomp/geometry.c b/app/xkbcomp/geometry.c index 69dfc3c65..a75961662 100644 --- a/app/xkbcomp/geometry.c +++ b/app/xkbcomp/geometry.c @@ -247,7 +247,7 @@ typedef struct _GeometryInfo } GeometryInfo; static char * -ddText(Display *dpy, const DoodadInfo *di) +ddText(Display * dpy, DoodadInfo * di) { static char buf[64]; @@ -269,7 +269,7 @@ ddText(Display *dpy, const DoodadInfo *di) /***====================================================================***/ static void -InitPropertyInfo(PropertyInfo *pi, const GeometryInfo *info) +InitPropertyInfo(PropertyInfo * pi, GeometryInfo * info) { pi->defs.defined = 0; pi->defs.fileID = info->fileID; @@ -291,17 +291,19 @@ FreeProperties(PropertyInfo * pi, GeometryInfo * info) } for (tmp = pi; tmp != NULL; tmp = next) { - free(tmp->name); - free(tmp->value); + if (tmp->name) + uFree(tmp->name); + if (tmp->value) + uFree(tmp->value); tmp->name = tmp->value = NULL; next = (PropertyInfo *) tmp->defs.next; - free(tmp); + uFree(tmp); } return; } static void -InitKeyInfo(KeyInfo *key, RowInfo *row, const GeometryInfo *info) +InitKeyInfo(KeyInfo * key, RowInfo * row, GeometryInfo * info) { if (key != &row->dfltKey) @@ -313,14 +315,12 @@ InitKeyInfo(KeyInfo *key, RowInfo *row, const GeometryInfo *info) else { bzero(key, sizeof(KeyInfo)); - *key = (KeyInfo) { - .defs.defined = _GK_Default, - .defs.fileID = info->fileID, - .defs.merge = info->merge, - .defs.next = NULL, - .row = row - }; strcpy(key->name, "default"); + key->defs.defined = _GK_Default; + key->defs.fileID = info->fileID; + key->defs.merge = info->merge; + key->defs.next = NULL; + key->row = row; } return; } @@ -337,7 +337,7 @@ ClearKeyInfo(KeyInfo * key) } static void -FreeKeys(KeyInfo *key, RowInfo *row, const GeometryInfo *info) +FreeKeys(KeyInfo * key, RowInfo * row, GeometryInfo * info) { KeyInfo *tmp; KeyInfo *next; @@ -351,13 +351,13 @@ FreeKeys(KeyInfo *key, RowInfo *row, const GeometryInfo *info) { ClearKeyInfo(tmp); next = (KeyInfo *) tmp->defs.next; - free(tmp); + uFree(tmp); } return; } static void -InitRowInfo(RowInfo *row, SectionInfo *section, const GeometryInfo *info) +InitRowInfo(RowInfo * row, SectionInfo * section, GeometryInfo * info) { if (row != §ion->dfltRow) { @@ -380,7 +380,7 @@ InitRowInfo(RowInfo *row, SectionInfo *section, const GeometryInfo *info) } static void -ClearRowInfo(RowInfo *row, const GeometryInfo *info) +ClearRowInfo(RowInfo * row, GeometryInfo * info) { row->defs.defined &= ~_GR_Default; row->top = row->left = 0; @@ -394,20 +394,21 @@ ClearRowInfo(RowInfo *row, const GeometryInfo *info) } static void -FreeRows(RowInfo *row, SectionInfo *section, const GeometryInfo *info) +FreeRows(RowInfo * row, SectionInfo * section, GeometryInfo * info) { RowInfo *next; + RowInfo *tmp; if (row == section->rows) { section->nRows = 0; section->rows = NULL; } - for (RowInfo *tmp = row; tmp != NULL; tmp = next) + for (tmp = row; tmp != NULL; tmp = next) { ClearRowInfo(tmp, info); next = (RowInfo *) tmp->defs.next; - free(tmp); + uFree(tmp); } return; } @@ -526,7 +527,7 @@ FreeDoodads(DoodadInfo * di, SectionInfo * si, GeometryInfo * info) { next = (DoodadInfo *) tmp->defs.next; ClearDoodadInfo(tmp); - free(tmp); + uFree(tmp); } return; } @@ -557,8 +558,7 @@ InitSectionInfo(SectionInfo * si, GeometryInfo * info) } static void -DupSectionInfo(SectionInfo *into, const SectionInfo *from, - const GeometryInfo *info) +DupSectionInfo(SectionInfo * into, SectionInfo * from, GeometryInfo * info) { CommonInfo defs; @@ -617,7 +617,7 @@ FreeSections(SectionInfo * si, GeometryInfo * info) { ClearSectionInfo(tmp, info); next = (SectionInfo *) tmp->defs.next; - free(tmp); + uFree(tmp); } return; } @@ -637,24 +637,24 @@ FreeShapes(ShapeInfo * si, GeometryInfo * info) { if (tmp->outlines) { - int i; + register int i; for (i = 0; i < tmp->nOutlines; i++) { if (tmp->outlines[i].points != NULL) { - free(tmp->outlines[i].points); + uFree(tmp->outlines[i].points); tmp->outlines[i].num_points = 0; tmp->outlines[i].points = NULL; } } - free(tmp->outlines); + uFree(tmp->outlines); tmp->szOutlines = 0; tmp->nOutlines = 0; tmp->outlines = NULL; tmp->primary = tmp->approx = NULL; } next = (ShapeInfo *) tmp->defs.next; - free(tmp); + uFree(tmp); } return; } @@ -675,7 +675,8 @@ InitGeometryInfo(GeometryInfo * info, unsigned fileID, unsigned merge) static void ClearGeometryInfo(GeometryInfo * info) { - free(info->name); + if (info->name) + uFree(info->name); info->name = NULL; if (info->props) FreeProperties(info->props, info); @@ -700,9 +701,10 @@ NextProperty(GeometryInfo * info) { PropertyInfo *pi; - pi = calloc(1, sizeof(PropertyInfo)); + pi = uTypedAlloc(PropertyInfo); if (pi) { + bzero((char *) pi, sizeof(PropertyInfo)); info->props = (PropertyInfo *) AddCommonInfo(&info->props->defs, (CommonInfo *) pi); info->nProps++; @@ -711,7 +713,7 @@ NextProperty(GeometryInfo * info) } static PropertyInfo * -FindProperty(const GeometryInfo *info, const char *name) +FindProperty(GeometryInfo * info, char *name) { PropertyInfo *old; @@ -747,7 +749,8 @@ AddProperty(GeometryInfo * info, PropertyInfo * new) ACTION("Ignoring \"%s\", using \"%s\"\n", old->value, new->value); } - free(old->value); + if (old->value) + uFree(old->value); old->value = uStringDup(new->value); return True; } @@ -776,9 +779,10 @@ NextShape(GeometryInfo * info) { ShapeInfo *si; - si = calloc(1, sizeof(ShapeInfo)); + si = uTypedAlloc(ShapeInfo); if (si) { + bzero((char *) si, sizeof(ShapeInfo)); info->shapes = (ShapeInfo *) AddCommonInfo(&info->shapes->defs, (CommonInfo *) si); info->nShapes++; @@ -879,7 +883,7 @@ NextDfltDoodad(SectionInfo * si, GeometryInfo * info) { DoodadInfo *di; - di = calloc(1, sizeof(DoodadInfo)); + di = uTypedCalloc(1, DoodadInfo); if (!di) return NULL; if (si) @@ -902,7 +906,7 @@ NextDoodad(SectionInfo * si, GeometryInfo * info) { DoodadInfo *di; - di = calloc(1, sizeof(DoodadInfo)); + di = uTypedCalloc(1, DoodadInfo); if (di) { if (si) @@ -1043,7 +1047,7 @@ AddOverlay(SectionInfo * si, GeometryInfo * info, OverlayInfo * new) return True; } old = new; - new = calloc(1, sizeof(OverlayInfo)); + new = uTypedCalloc(1, OverlayInfo); if (!new) { if (warningLevel > 0) @@ -1072,7 +1076,7 @@ NextSection(GeometryInfo * info) { SectionInfo *si; - si = malloc(sizeof(SectionInfo)); + si = uTypedAlloc(SectionInfo); if (si) { *si = info->dfltSection; @@ -1089,9 +1093,11 @@ NextSection(GeometryInfo * info) } static SectionInfo * -FindMatchingSection(GeometryInfo *info, const SectionInfo *new) +FindMatchingSection(GeometryInfo * info, SectionInfo * new) { - for (SectionInfo *old = info->sections; old != NULL; + SectionInfo *old; + + for (old = info->sections; old != NULL; old = (SectionInfo *) old->defs.next) { if (new->name == old->name) @@ -1162,7 +1168,7 @@ NextRow(SectionInfo * si) { RowInfo *row; - row = malloc(sizeof(RowInfo)); + row = uTypedAlloc(RowInfo); if (row) { *row = si->dfltRow; @@ -1199,7 +1205,7 @@ NextKey(RowInfo * row) { KeyInfo *key; - key = malloc(sizeof(KeyInfo)); + key = uTypedAlloc(KeyInfo); if (key) { *key = row->dfltKey; @@ -1347,7 +1353,8 @@ HandleIncludeGeometry(IncludeStmt * stmt, XkbDescPtr xkb, GeometryInfo * info, (*hndlr) (rtrn, xkb, MergeOverride, &included); if (stmt->stmt != NULL) { - free(included.name); + if (included.name != NULL) + uFree(included.name); included.name = stmt->stmt; stmt->stmt = NULL; } @@ -1400,8 +1407,9 @@ HandleIncludeGeometry(IncludeStmt * stmt, XkbDescPtr xkb, GeometryInfo * info, } static int -SetShapeField(ShapeInfo *si, const char *field, - const ExprDef *arrayNdx, const ExprDef *value, GeometryInfo *info) +SetShapeField(ShapeInfo * si, + const char *field, + ExprDef * arrayNdx, ExprDef * value, GeometryInfo * info) { ExprResult tmp; @@ -1431,8 +1439,10 @@ SetShapeField(ShapeInfo *si, const char *field, } static int -SetShapeDoodadField(DoodadInfo *di, const char *field, const ExprDef *arrayNdx, - const ExprDef *value, SectionInfo *si, GeometryInfo *info) +SetShapeDoodadField(DoodadInfo * di, + const char *field, + ExprDef * arrayNdx, + ExprDef * value, SectionInfo * si, GeometryInfo * info) { ExprResult tmp; const char *typeName; @@ -1499,8 +1509,10 @@ SetShapeDoodadField(DoodadInfo *di, const char *field, const ExprDef *arrayNdx, #define FIELD_USHORT 2 static int -SetTextDoodadField(DoodadInfo *di, const char *field, const ExprDef *arrayNdx, - const ExprDef *value, SectionInfo *si, GeometryInfo *info) +SetTextDoodadField(DoodadInfo * di, + const char *field, + ExprDef * arrayNdx, + ExprDef * value, SectionInfo * si, GeometryInfo * info) { ExprResult tmp; unsigned def; @@ -1647,9 +1659,11 @@ SetTextDoodadField(DoodadInfo *di, const char *field, const ExprDef *arrayNdx, } static int -SetIndicatorDoodadField(DoodadInfo * di, const char *field, - const ExprDef *arrayNdx, const ExprDef *value, - SectionInfo *si, GeometryInfo *info) +SetIndicatorDoodadField(DoodadInfo * di, + const char *field, + ExprDef * arrayNdx, + ExprDef * value, + SectionInfo * si, GeometryInfo * info) { ExprResult tmp; @@ -1690,8 +1704,10 @@ SetIndicatorDoodadField(DoodadInfo * di, const char *field, } static int -SetLogoDoodadField(DoodadInfo *di, const char *field, const ExprDef *arrayNdx, - const ExprDef *value, SectionInfo *si, GeometryInfo *info) +SetLogoDoodadField(DoodadInfo * di, + const char *field, + ExprDef * arrayNdx, + ExprDef * value, SectionInfo * si, GeometryInfo * info) { ExprResult tmp; const char *typeName = "logo doodad"; @@ -1769,9 +1785,10 @@ SetLogoDoodadField(DoodadInfo *di, const char *field, const ExprDef *arrayNdx, } static int -SetDoodadField(DoodadInfo *di, const char *field, - const ExprDef *arrayNdx, const ExprDef *value, - SectionInfo *si, GeometryInfo *info) +SetDoodadField(DoodadInfo * di, + const char *field, + ExprDef * arrayNdx, + ExprDef * value, SectionInfo * si, GeometryInfo * info) { ExprResult tmp; @@ -1871,9 +1888,9 @@ SetDoodadField(DoodadInfo *di, const char *field, } static int -SetSectionField(SectionInfo *si, const char *field, - const ExprDef *arrayNdx, const ExprDef *value, - GeometryInfo *info) +SetSectionField(SectionInfo * si, + const char *field, + ExprDef * arrayNdx, ExprDef * value, GeometryInfo * info) { unsigned short *pField; unsigned def; @@ -1959,8 +1976,9 @@ SetSectionField(SectionInfo *si, const char *field, } static int -SetRowField(RowInfo *row, const char *field, - const ExprDef *arrayNdx, const ExprDef *value, GeometryInfo *info) +SetRowField(RowInfo * row, + const char *field, + ExprDef * arrayNdx, ExprDef * value, GeometryInfo * info) { ExprResult tmp; @@ -2024,8 +2042,9 @@ SetRowField(RowInfo *row, const char *field, } static int -SetKeyField(KeyInfo *key, const char *field, - const ExprDef *arrayNdx, const ExprDef *value, GeometryInfo *info) +SetKeyField(KeyInfo * key, + const char *field, + ExprDef * arrayNdx, ExprDef * value, GeometryInfo * info) { ExprResult tmp; @@ -2101,7 +2120,7 @@ SetKeyField(KeyInfo *key, const char *field, } static int -SetGeometryProperty(GeometryInfo *info, char *property, const ExprDef *value) +SetGeometryProperty(GeometryInfo * info, char *property, ExprDef * value) { PropertyInfo pi; ExprResult result; @@ -2386,7 +2405,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge, return True; } si->nOutlines = def->nOutlines; - si->outlines = calloc(def->nOutlines, sizeof(XkbOutlineRec)); + si->outlines = uTypedCalloc(def->nOutlines, XkbOutlineRec); if (!si->outlines) { ERROR("Couldn't allocate outlines for \"%s\"\n", @@ -2407,7 +2426,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge, outline = &si->outlines[nOut++]; outline->num_points = ol->nPoints; outline->corner_radius = si->dfltCornerRadius; - outline->points = calloc(ol->nPoints, sizeof(XkbPointRec)); + outline->points = uTypedCalloc(ol->nPoints, XkbPointRec); if (!outline->points) { ERROR("Can't allocate points for \"%s\"\n", @@ -2531,6 +2550,8 @@ static int HandleOverlayDef(OverlayDef * def, unsigned merge, SectionInfo * si, GeometryInfo * info) { + OverlayKeyDef *keyDef; + OverlayKeyInfo *key; OverlayInfo ol; if ((def->nKeys < 1) && (warningLevel > 3)) @@ -2544,23 +2565,20 @@ HandleOverlayDef(OverlayDef * def, bzero(&ol, sizeof(OverlayInfo)); ol.name = XkbInternAtom(info->dpy, XkbAtomGetString(NULL, def->name), False); - for (OverlayKeyDef *keyDef = def->keys; keyDef; + for (keyDef = def->keys; keyDef; keyDef = (OverlayKeyDef *) keyDef->common.next) { - OverlayKeyInfo *key = calloc(1, sizeof(OverlayKeyInfo)); - if (!key) + key = uTypedCalloc(1, OverlayKeyInfo); + if ((!key) && warningLevel > 0) { - if (warningLevel > 0) - { - WSGO("Couldn't allocate OverlayKeyInfo\n"); - ACTION("Overlay %s for section %s will be incomplete\n", - XkbAtomText(info->dpy, ol.name, XkbMessage), - scText(info->dpy, si)); - } + WSGO("Couldn't allocate OverlayKeyInfo\n"); + ACTION("Overlay %s for section %s will be incomplete\n", + XkbAtomText(info->dpy, ol.name, XkbMessage), + scText(info->dpy, si)); return False; } - strncpy(key->over, keyDef->over, sizeof(key->over)); - strncpy(key->under, keyDef->under, sizeof(key->under)); + strncpy(key->over, keyDef->over, XkbKeyNameLength); + strncpy(key->under, keyDef->under, XkbKeyNameLength); key->sectionRow = _GOK_UnknownRow; key->overlayRow = _GOK_UnknownRow; ol.keys = (OverlayKeyInfo *) AddCommonInfo(&ol.keys->defs, @@ -2578,10 +2596,11 @@ HandleOverlayDef(OverlayDef * def, static Bool HandleComplexKey(KeyDef * def, KeyInfo * key, GeometryInfo * info) { - RowInfo *row = key->row; + RowInfo *row; + ExprDef *expr; - for (ExprDef *expr = def->expr; expr != NULL; - expr = (ExprDef *) expr->common.next) + row = key->row; + for (expr = def->expr; expr != NULL; expr = (ExprDef *) expr->common.next) { if (expr->op == OpAssign) { @@ -2635,13 +2654,15 @@ static Bool HandleRowBody(RowDef * def, RowInfo * row, unsigned merge, GeometryInfo * info) { + KeyDef *keyDef; + if ((def->nKeys < 1) && (warningLevel > 3)) { ERROR("Row in section %s has no keys\n", rowText(info->dpy, row)); ACTION("Section ignored\n"); return True; } - for (KeyDef *keyDef = def->keys; keyDef != NULL; + for (keyDef = def->keys; keyDef != NULL; keyDef = (KeyDef *) keyDef->common.next) { if (keyDef->common.stmtType == StmtVarDef) @@ -2705,7 +2726,10 @@ static Bool HandleSectionBody(SectionDef * def, SectionInfo * si, unsigned merge, GeometryInfo * info) { - for (RowDef *rowDef = def->rows; rowDef != NULL; + RowDef *rowDef; + DoodadInfo *di; + + for (rowDef = def->rows; rowDef != NULL; rowDef = (RowDef *) rowDef->common.next) { if (rowDef->common.stmtType == StmtVarDef) @@ -2713,8 +2737,6 @@ HandleSectionBody(SectionDef * def, VarDef *var = (VarDef *) rowDef; ExprResult elem, field; ExprDef *ndx; - DoodadInfo *di; - if (ExprResolveLhs(var->name, &elem, &field, &ndx) == 0) return 0; /* internal error, already reported */ if ((elem.str == NULL) || (uStrCaseCmp(elem.str, "section") == 0)) @@ -2818,6 +2840,7 @@ HandleGeometryFile(XkbFile * file, XkbDescPtr xkb, unsigned merge, GeometryInfo * info) { ParseCommon *stmt; + const char *failWhat; if (merge == MergeDefault) merge = MergeAugment; @@ -2825,8 +2848,7 @@ HandleGeometryFile(XkbFile * file, stmt = file->defs; while (stmt) { - const char *failWhat = NULL; - + failWhat = NULL; switch (stmt->stmtType) { case StmtInclude: @@ -2859,18 +2881,17 @@ HandleGeometryFile(XkbFile * file, info->errorCount++; break; case StmtVModDef: - failWhat = "virtual modifier"; - goto fail; + if (!failWhat) + failWhat = "virtual modifier"; case StmtInterpDef: - failWhat = "symbol interpretation"; - goto fail; + if (!failWhat) + failWhat = "symbol interpretation"; case StmtGroupCompatDef: - failWhat = "group compatibility map"; - goto fail; + if (!failWhat) + failWhat = "group compatibility map"; case StmtKeycodeDef: - failWhat = "key name"; - goto fail; - fail: + if (!failWhat) + failWhat = "key name"; ERROR("Interpretation files may not include other types\n"); ACTION("Ignoring %s definition.\n", failWhat); info->errorCount++; @@ -2898,9 +2919,9 @@ HandleGeometryFile(XkbFile * file, static Bool CopyShapeDef(Display * dpy, XkbGeometryPtr geom, ShapeInfo * si) { - int n; + register int i, n; XkbShapePtr shape; - XkbOutlinePtr old_outline; + XkbOutlinePtr old_outline, outline; Atom name; si->index = geom->num_shapes; @@ -2913,11 +2934,9 @@ CopyShapeDef(Display * dpy, XkbGeometryPtr geom, ShapeInfo * si) return False; } old_outline = si->outlines; - for (int i = 0; i < si->nOutlines; i++, old_outline++) + for (i = 0; i < si->nOutlines; i++, old_outline++) { - XkbOutlinePtr outline = - XkbAddGeomOutline(shape, old_outline->num_points); - + outline = XkbAddGeomOutline(shape, old_outline->num_points); if (!outline) { WSGO("Couldn't allocate outline in shape\n"); @@ -3252,6 +3271,7 @@ FontFromParts(Atom fontTok, Atom slantTok, Atom setWidthTok, Atom varTok, int size, Atom encodingTok) { + int totalSize; const char *font, *weight, *slant, *setWidth, *variant, *encoding; char *rtrn; @@ -3270,22 +3290,15 @@ FontFromParts(Atom fontTok, None ? XkbAtomGetString(NULL, encodingTok) : DFLT_ENCODING); if (size == 0) size = DFLT_SIZE; - -#ifdef HAVE_ASPRINTF - if (asprintf(&rtrn, FONT_TEMPLATE, font, weight, slant, - setWidth, variant, size, encoding) < 0) - rtrn = NULL; -#else - size_t totalSize = + totalSize = strlen(FONT_TEMPLATE) + strlen(font) + strlen(weight) + strlen(slant); totalSize += strlen(setWidth) + strlen(variant) + strlen(encoding); - rtrn = calloc(totalSize, 1); + rtrn = uCalloc(totalSize, 1); if (rtrn) { snprintf(rtrn, totalSize, FONT_TEMPLATE, font, weight, slant, setWidth, variant, size, encoding); } -#endif return rtrn; } @@ -3388,7 +3401,8 @@ VerifyOverlayInfo(XkbGeometryPtr geom, OverlayInfo * oi, GeometryInfo * info, short rowMap[256], short rowSize[256]) { - OverlayKeyInfo *ki, *next; + register OverlayKeyInfo *ki, *next; + unsigned long oKey, uKey, sKey; XkbRowPtr row; XkbKeyPtr key; int r, k; @@ -3396,16 +3410,15 @@ VerifyOverlayInfo(XkbGeometryPtr geom, /* find out which row each key is in */ for (ki = oi->keys; ki != NULL; ki = (OverlayKeyInfo *) ki->defs.next) { - unsigned long oKey = KeyNameToLong(ki->over); - unsigned long uKey = KeyNameToLong(ki->under); - + oKey = KeyNameToLong(ki->over); + uKey = KeyNameToLong(ki->under); for (r = 0, row = section->rows; (r < section->num_rows) && oKey; r++, row++) { for (k = 0, key = row->keys; (k < row->num_keys) && oKey; k++, key++) { - unsigned long sKey = KeyNameToLong(key->name.name); + sKey = KeyNameToLong(key->name.name); if (sKey == oKey) { if (warningLevel > 0) @@ -3442,7 +3455,7 @@ VerifyOverlayInfo(XkbGeometryPtr geom, while ((oi->keys != NULL) && (oi->keys->sectionRow == _GOK_UnknownRow)) { next = (OverlayKeyInfo *) oi->keys->defs.next; - free(oi->keys); + uFree(oi->keys); oi->keys = next; oi->nKeys--; } @@ -3453,7 +3466,7 @@ VerifyOverlayInfo(XkbGeometryPtr geom, { ki->defs.next = next->defs.next; oi->nKeys--; - free(next); + uFree(next); next = (OverlayKeyInfo *) ki->defs.next; } } @@ -3488,7 +3501,11 @@ CopyOverlayDef(XkbGeometryPtr geom, { Atom name; XkbOverlayPtr ol; + XkbOverlayRowPtr row; + XkbOverlayKeyPtr key; + OverlayKeyInfo *ki; short rowMap[256], rowSize[256]; + int i; if (!VerifyOverlayInfo(geom, section, oi, info, rowMap, rowSize)) return False; @@ -3501,7 +3518,7 @@ CopyOverlayDef(XkbGeometryPtr geom, XkbAtomText(info->dpy, section->name, XkbMessage)); return False; } - for (int i = 0; i < oi->nRows; i++) + for (i = 0; i < oi->nRows; i++) { int tmp, row_under; for (tmp = 0, row_under = -1; @@ -3519,11 +3536,10 @@ CopyOverlayDef(XkbGeometryPtr geom, return False; } } - for (OverlayKeyInfo *ki = oi->keys; ki != NULL; - ki = (OverlayKeyInfo *) ki->defs.next) + for (ki = oi->keys; ki != NULL; ki = (OverlayKeyInfo *) ki->defs.next) { - XkbOverlayRowPtr row = &ol->rows[ki->overlayRow]; - XkbOverlayKeyPtr key = &row->keys[row->num_keys++]; + row = &ol->rows[ki->overlayRow]; + key = &row->keys[row->num_keys++]; bzero(key, sizeof(XkbOverlayKeyRec)); strncpy(key->over.name, ki->over, XkbKeyNameLength); strncpy(key->under.name, ki->under, XkbKeyNameLength); @@ -3537,6 +3553,10 @@ static Bool CopySectionDef(XkbGeometryPtr geom, SectionInfo * si, GeometryInfo * info) { XkbSectionPtr section; + XkbRowPtr row; + XkbKeyPtr key; + KeyInfo *ki; + RowInfo *ri; Atom name; name = XkbInternAtom(NULL, XkbAtomGetString(NULL, si->name), False); @@ -3554,9 +3574,9 @@ CopySectionDef(XkbGeometryPtr geom, SectionInfo * si, GeometryInfo * info) section->height = si->height; section->angle = si->angle; section->priority = si->priority; - for (RowInfo *ri = si->rows; ri != NULL; ri = (RowInfo *) ri->defs.next) + for (ri = si->rows; ri != NULL; ri = (RowInfo *) ri->defs.next) { - XkbRowPtr row = XkbAddGeomRow(section, ri->nKeys); + row = XkbAddGeomRow(section, ri->nKeys); if (row == NULL) { WSGO("Couldn't allocate row in section\n"); @@ -3566,9 +3586,8 @@ CopySectionDef(XkbGeometryPtr geom, SectionInfo * si, GeometryInfo * info) row->top = ri->top; row->left = ri->left; row->vertical = ri->vertical; - for (KeyInfo *ki = ri->keys; ki != NULL; ki = (KeyInfo *) ki->defs.next) + for (ki = ri->keys; ki != NULL; ki = (KeyInfo *) ki->defs.next) { - XkbKeyPtr key; XkbColorPtr color; if ((ki->defs.defined & _GK_Name) == 0) { @@ -3609,15 +3628,16 @@ CopySectionDef(XkbGeometryPtr geom, SectionInfo * si, GeometryInfo * info) } if (si->doodads != NULL) { - for (DoodadInfo *di = si->doodads; di != NULL; - di = (DoodadInfo *) di->defs.next) + DoodadInfo *di; + for (di = si->doodads; di != NULL; di = (DoodadInfo *) di->defs.next) { CopyDoodadDef(geom, section, di, info); } } if (si->overlays != NULL) { - for (OverlayInfo *oi = si->overlays; oi != NULL; + OverlayInfo *oi; + for (oi = si->overlays; oi != NULL; oi = (OverlayInfo *) oi->defs.next) { CopyOverlayDef(geom, section, oi, info); @@ -3650,15 +3670,14 @@ CompileGeometry(XkbFile * file, XkbFileInfo * result, unsigned merge) if (info.errorCount == 0) { XkbGeometryPtr geom; - XkbGeometrySizesRec sizes = { - .which = XkbGeomAllMask, - .num_properties = info.nProps, - .num_colors = 8, - .num_shapes = info.nShapes, - .num_sections = info.nSections, - .num_doodads = info.nDoodads - }; - + XkbGeometrySizesRec sizes; + bzero(&sizes, sizeof(sizes)); + sizes.which = XkbGeomAllMask; + sizes.num_properties = info.nProps; + sizes.num_colors = 8; + sizes.num_shapes = info.nShapes; + sizes.num_sections = info.nSections; + sizes.num_doodads = info.nDoodads; if (XkbAllocGeometry(xkb, &sizes) != Success) { WSGO("Couldn't allocate GeometryRec\n"); @@ -3701,7 +3720,8 @@ CompileGeometry(XkbFile * file, XkbFileInfo * result, unsigned merge) if (info.props) { - for (PropertyInfo *pi = info.props; pi != NULL; + PropertyInfo *pi; + for (pi = info.props; pi != NULL; pi = (PropertyInfo *) pi->defs.next) { if (!XkbAddGeomProperty(geom, pi->name, pi->value)) @@ -3710,7 +3730,8 @@ CompileGeometry(XkbFile * file, XkbFileInfo * result, unsigned merge) } if (info.shapes) { - for (ShapeInfo *si = info.shapes; si != NULL; + ShapeInfo *si; + for (si = info.shapes; si != NULL; si = (ShapeInfo *) si->defs.next) { if (!CopyShapeDef(xkb->dpy, geom, si)) @@ -3719,7 +3740,8 @@ CompileGeometry(XkbFile * file, XkbFileInfo * result, unsigned merge) } if (info.sections) { - for (SectionInfo *si = info.sections; si != NULL; + SectionInfo *si; + for (si = info.sections; si != NULL; si = (SectionInfo *) si->defs.next) { if (!CopySectionDef(geom, si, &info)) @@ -3728,7 +3750,8 @@ CompileGeometry(XkbFile * file, XkbFileInfo * result, unsigned merge) } if (info.doodads) { - for (DoodadInfo *di = info.doodads; di != NULL; + DoodadInfo *di; + for (di = info.doodads; di != NULL; di = (DoodadInfo *) di->defs.next) { if (!CopyDoodadDef(geom, NULL, di, &info)) diff --git a/app/xkbcomp/indicators.c b/app/xkbcomp/indicators.c index 470091edd..b3e7d1825 100644 --- a/app/xkbcomp/indicators.c +++ b/app/xkbcomp/indicators.c @@ -57,17 +57,16 @@ ClearIndicatorMapInfo(Display * dpy, LEDInfo * info) } LEDInfo * -AddIndicatorMap(LEDInfo *oldLEDs, const LEDInfo *new) +AddIndicatorMap(LEDInfo * oldLEDs, LEDInfo * new) { LEDInfo *old, *last; + unsigned collide; last = NULL; for (old = oldLEDs; old != NULL; old = (LEDInfo *) old->defs.next) { if (old->name == new->name) { - unsigned collide; - if ((old->real_mods == new->real_mods) && (old->vmods == new->vmods) && (old->groups == new->groups) && @@ -147,7 +146,7 @@ AddIndicatorMap(LEDInfo *oldLEDs, const LEDInfo *new) last = old; } /* new definition */ - old = malloc(sizeof(LEDInfo)); + old = uTypedAlloc(LEDInfo); if (!old) { WSGO("Couldn't allocate indicator map\n"); @@ -199,8 +198,9 @@ static LookupEntry groupComponentNames[] = { }; int -SetIndicatorMapField(LEDInfo *led, XkbDescPtr xkb, const char *field, - const ExprDef *arrayNdx, const ExprDef *value) +SetIndicatorMapField(LEDInfo * led, + XkbDescPtr xkb, + const char *field, ExprDef *arrayNdx, ExprDef *value) { ExprResult rtrn; Bool ok; @@ -323,10 +323,12 @@ SetIndicatorMapField(LEDInfo *led, XkbDescPtr xkb, const char *field, } LEDInfo * -HandleIndicatorMapDef(IndicatorMapDef *def, XkbDescPtr xkb, - const LEDInfo *dflt, LEDInfo *oldLEDs, unsigned merge) +HandleIndicatorMapDef(IndicatorMapDef * def, + XkbDescPtr xkb, + LEDInfo * dflt, LEDInfo * oldLEDs, unsigned merge) { - LEDInfo led; + LEDInfo led, *rtrn; + VarDef *var; Bool ok; if (def->merge != MergeDefault) @@ -337,8 +339,7 @@ HandleIndicatorMapDef(IndicatorMapDef *def, XkbDescPtr xkb, led.name = def->name; ok = True; - for (VarDef *var = def->body; var != NULL; - var = (VarDef *) var->common.next) + for (var = def->body; var != NULL; var = (VarDef *) var->common.next) { ExprResult elem, field; ExprDef *arrayNdx; @@ -363,7 +364,7 @@ HandleIndicatorMapDef(IndicatorMapDef *def, XkbDescPtr xkb, } if (ok) { - LEDInfo *rtrn = AddIndicatorMap(oldLEDs, &led); + rtrn = AddIndicatorMap(oldLEDs, &led); return rtrn; } return NULL; @@ -413,11 +414,11 @@ CopyIndicatorMapDefs(XkbFileInfo * result, LEDInfo * leds, last = led; } else - free(led); + uFree(led); } else { - XkbIndicatorMapPtr im; + register XkbIndicatorMapPtr im; im = &xkb->indicators->maps[led->indicator - 1]; im->flags = led->flags; im->which_groups = led->which_groups; @@ -429,7 +430,7 @@ CopyIndicatorMapDefs(XkbFileInfo * result, LEDInfo * leds, im->ctrls = led->ctrls; if (xkb->names != NULL) xkb->names->indicators[led->indicator - 1] = led->name; - free(led); + uFree(led); } } if (unboundRtrn != NULL) @@ -444,7 +445,8 @@ BindIndicators(XkbFileInfo * result, Bool force, LEDInfo * unbound, LEDInfo ** unboundRtrn) { XkbDescPtr xkb; - LEDInfo *led, *next, *last; + register int i; + register LEDInfo *led, *next, *last; xkb = result->xkb; if (xkb->names != NULL) @@ -453,7 +455,7 @@ BindIndicators(XkbFileInfo * result, { if (led->indicator == _LED_NotBound) { - for (int i = 0; i < XkbNumIndicators; i++) + for (i = 0; i < XkbNumIndicators; i++) { if (xkb->names->indicators[i] == led->name) { @@ -469,7 +471,7 @@ BindIndicators(XkbFileInfo * result, { if (led->indicator == _LED_NotBound) { - for (int i = 0; i < XkbNumIndicators; i++) + for (i = 0; i < XkbNumIndicators; i++) { if (xkb->names->indicators[i] == None) { @@ -499,7 +501,7 @@ BindIndicators(XkbFileInfo * result, if (force) { unbound = next; - free(led); + uFree(led); } else { @@ -524,7 +526,7 @@ BindIndicators(XkbFileInfo * result, led->indicator = _LED_NotBound; if (force) { - free(led); + uFree(led); unbound = next; } else @@ -553,7 +555,7 @@ BindIndicators(XkbFileInfo * result, else unbound = next; led->defs.next = NULL; - free(led); + uFree(led); } } } @@ -566,7 +568,7 @@ BindIndicators(XkbFileInfo * result, for (led = unbound; led != NULL; led = next) { next = (LEDInfo *) led->defs.next; - free(led); + uFree(led); } } return True; diff --git a/app/xkbcomp/indicators.h b/app/xkbcomp/indicators.h index befee602e..6bf6111e7 100644 --- a/app/xkbcomp/indicators.h +++ b/app/xkbcomp/indicators.h @@ -57,19 +57,19 @@ extern void ClearIndicatorMapInfo(Display * /* dpy */ , extern LEDInfo *AddIndicatorMap(LEDInfo * /* oldLEDs */ , - const LEDInfo * /* newLED */ + LEDInfo * /* newLED */ ); extern int SetIndicatorMapField(LEDInfo * /* led */ , XkbDescPtr /* xkb */ , const char * /* field */ , - const ExprDef * /* arrayNdx */ , - const ExprDef * /* value */ + ExprDef * /* arrayNdx */ , + ExprDef * /* value */ ); extern LEDInfo *HandleIndicatorMapDef(IndicatorMapDef * /* stmt */ , XkbDescPtr /* xkb */ , - const LEDInfo * /* dflt */ , + LEDInfo * /* dflt */ , LEDInfo * /* oldLEDs */ , unsigned /* mergeMode */ ); diff --git a/app/xkbcomp/keycodes.c b/app/xkbcomp/keycodes.c index a9dc2b4a3..4a8973c95 100644 --- a/app/xkbcomp/keycodes.c +++ b/app/xkbcomp/keycodes.c @@ -89,7 +89,7 @@ static void HandleKeycodesFile(XkbFile * file, KeyNamesInfo * info); static void -InitIndicatorNameInfo(IndicatorNameInfo *ii, const KeyNamesInfo *info) +InitIndicatorNameInfo(IndicatorNameInfo * ii, KeyNamesInfo * info) { ii->defs.defined = 0; ii->defs.merge = info->merge; @@ -117,7 +117,7 @@ NextIndicatorName(KeyNamesInfo * info) { IndicatorNameInfo *ii; - ii = malloc(sizeof(IndicatorNameInfo)); + ii = uTypedAlloc(IndicatorNameInfo); if (ii) { InitIndicatorNameInfo(ii, info); @@ -130,7 +130,9 @@ NextIndicatorName(KeyNamesInfo * info) static IndicatorNameInfo * FindIndicatorByIndex(KeyNamesInfo * info, int ndx) { - for (IndicatorNameInfo *old = info->leds; old != NULL; + IndicatorNameInfo *old; + + for (old = info->leds; old != NULL; old = (IndicatorNameInfo *) old->defs.next) { if (old->ndx == ndx) @@ -142,7 +144,9 @@ FindIndicatorByIndex(KeyNamesInfo * info, int ndx) static IndicatorNameInfo * FindIndicatorByName(KeyNamesInfo * info, Atom name) { - for (IndicatorNameInfo *old = info->leds; old != NULL; + IndicatorNameInfo *old; + + for (old = info->leds; old != NULL; old = (IndicatorNameInfo *) old->defs.next) { if (old->name == name) @@ -196,7 +200,9 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new) info->leds = (IndicatorNameInfo *) old->defs.next; else { - for (IndicatorNameInfo *tmp = info->leds; tmp != NULL; + IndicatorNameInfo *tmp; + tmp = info->leds; + for (; tmp != NULL; tmp = (IndicatorNameInfo *) tmp->defs.next) { if (tmp->defs.next == (CommonInfo *) old) @@ -206,7 +212,7 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new) } } } - free(old); + uFree(old); } } } @@ -270,15 +276,16 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new) static void ClearKeyNamesInfo(KeyNamesInfo * info) { - free(info->name); + if (info->name != NULL) + uFree(info->name); info->name = NULL; info->computedMax = info->explicitMax = info->explicitMin = -1; info->computedMin = 256; info->effectiveMin = 8; info->effectiveMax = 255; - bzero(info->names, sizeof(info->names)); - bzero(info->files, sizeof(info->files)); - bzero(info->has_alt_forms, sizeof(info->has_alt_forms)); + bzero((char *) info->names, sizeof(info->names)); + bzero((char *) info->files, sizeof(info->files)); + bzero((char *) info->has_alt_forms, sizeof(info->has_alt_forms)); if (info->leds) ClearIndicatorNameInfo(info->leds, info); if (info->aliases) @@ -298,9 +305,11 @@ InitKeyNamesInfo(KeyNamesInfo * info) } static int -FindKeyByLong(const KeyNamesInfo *info, unsigned long name) +FindKeyByLong(KeyNamesInfo * info, unsigned long name) { - for (int i = info->effectiveMin; i <= info->effectiveMax; i++) + register int i; + + for (i = info->effectiveMin; i <= info->effectiveMax; i++) { if (info->names[i] == name) return i; @@ -314,8 +323,9 @@ FindKeyByLong(const KeyNamesInfo *info, unsigned long name) * Note that the key's name is stored as a long, the keycode is the index. */ static Bool -AddKeyName(KeyNamesInfo *info, int kc, const char *name, - unsigned merge, unsigned fileID, Bool reportCollisions) +AddKeyName(KeyNamesInfo * info, + int kc, + char *name, unsigned merge, unsigned fileID, Bool reportCollisions) { int old; unsigned long lval; @@ -425,6 +435,9 @@ static void MergeIncludedKeycodes(KeyNamesInfo * into, KeyNamesInfo * from, unsigned merge) { + register int i; + char buf[5]; + if (from->errorCount > 0) { into->errorCount += from->errorCount; @@ -435,11 +448,9 @@ MergeIncludedKeycodes(KeyNamesInfo * into, KeyNamesInfo * from, into->name = from->name; from->name = NULL; } - for (int i = from->computedMin; i <= from->computedMax; i++) + for (i = from->computedMin; i <= from->computedMax; i++) { unsigned thisMerge; - char buf[5]; - if (from->names[i] == 0) continue; LongToKeyName(from->names[i], buf); @@ -515,7 +526,8 @@ HandleIncludeKeycodes(IncludeStmt * stmt, XkbDescPtr xkb, KeyNamesInfo * info) HandleKeycodesFile(rtrn, xkb, MergeOverride, &included); if (stmt->stmt != NULL) { - free(included.name); + if (included.name != NULL) + uFree(included.name); included.name = stmt->stmt; stmt->stmt = NULL; } @@ -528,10 +540,11 @@ HandleIncludeKeycodes(IncludeStmt * stmt, XkbDescPtr xkb, KeyNamesInfo * info) /* Do we have more than one include statement? */ if ((stmt->next != NULL) && (included.errorCount < 1)) { + IncludeStmt *next; unsigned op; KeyNamesInfo next_incl; - for (IncludeStmt *next = stmt->next; next != NULL; next = next->next) + for (next = stmt->next; next != NULL; next = next->next) { if ((next->file == NULL) && (next->map == NULL)) { @@ -568,7 +581,7 @@ HandleIncludeKeycodes(IncludeStmt * stmt, XkbDescPtr xkb, KeyNamesInfo * info) * e.g. <ESC> = 9 */ static int -HandleKeycodeDef(const KeycodeDef *stmt, unsigned merge, KeyNamesInfo *info) +HandleKeycodeDef(KeycodeDef * stmt, unsigned merge, KeyNamesInfo * info) { int code; ExprResult result; @@ -609,7 +622,7 @@ HandleKeycodeDef(const KeycodeDef *stmt, unsigned merge, KeyNamesInfo *info) * @return 1 on success, 0 otherwise. */ static int -HandleKeyNameVar(const VarDef *stmt, KeyNamesInfo *info) +HandleKeyNameVar(VarDef * stmt, KeyNamesInfo * info) { ExprResult tmp, field; ExprDef *arrayNdx; @@ -707,7 +720,7 @@ HandleKeyNameVar(const VarDef *stmt, KeyNamesInfo *info) } static int -HandleIndicatorNameDef(const IndicatorNameDef *def, +HandleIndicatorNameDef(IndicatorNameDef * def, unsigned merge, KeyNamesInfo * info) { IndicatorNameInfo ii; @@ -847,7 +860,7 @@ CompileKeycodes(XkbFile * file, XkbFileInfo * result, unsigned merge) if (XkbAllocNames(xkb, XkbKeyNamesMask | XkbIndicatorNamesMask, 0, 0) == Success) { - int i; + register int i; xkb->names->keycodes = XkbInternAtom(xkb->dpy, info.name, False); uDEBUG2(1, "key range: %d..%d\n", xkb->min_key_code, xkb->max_key_code); @@ -879,8 +892,8 @@ CompileKeycodes(XkbFile * file, XkbFileInfo * result, unsigned merge) XkbAtomGetString(NULL, ii->name), False); if (xkb->indicators != NULL) { - unsigned bit = 1U << (ii->ndx - 1); - + register unsigned bit; + bit = 1 << (ii->ndx - 1); if (ii->virtual) xkb->indicators->phys_indicators &= ~bit; else diff --git a/app/xkbcomp/keymap.c b/app/xkbcomp/keymap.c index 1640566cc..b373f433e 100644 --- a/app/xkbcomp/keymap.c +++ b/app/xkbcomp/keymap.c @@ -85,7 +85,7 @@ CompileKeymap(XkbFile * file, XkbFileInfo * result, unsigned merge) while ((file) && (ok)) { file->topName = mainName; - if ((have & (1U << file->type)) != 0) + if ((have & (1 << file->type)) != 0) { ERROR("More than one %s section in a %s file\n", XkbConfigText(file->type, XkbMessage), @@ -93,7 +93,7 @@ CompileKeymap(XkbFile * file, XkbFileInfo * result, unsigned merge) ACTION("All sections after the first ignored\n"); ok = False; } - else if ((1U << file->type) & (~legal)) + else if ((1 << file->type) & (~legal)) { ERROR("Cannot define %s in a %s file\n", XkbConfigText(file->type, XkbMessage), @@ -138,7 +138,7 @@ CompileKeymap(XkbFile * file, XkbFileInfo * result, unsigned merge) break; } if (ok) - have |= (1U << file->type); + have |= (1 << file->type); file = (XkbFile *) file->common.next; } /* compile the sections we have in the file one-by-one, or fail. */ @@ -161,7 +161,7 @@ CompileKeymap(XkbFile * file, XkbFileInfo * result, unsigned merge) result->defined = have; if (required & (~have)) { - int i, bit; + register int i, bit; unsigned missing; missing = required & (~have); for (i = 0, bit = 1; missing != 0; i++, bit <<= 1) diff --git a/app/xkbcomp/keytypes.c b/app/xkbcomp/keytypes.c index fcf87e010..121280f3a 100644 --- a/app/xkbcomp/keytypes.c +++ b/app/xkbcomp/keytypes.c @@ -92,6 +92,27 @@ Atom tok_KEYPAD; /***====================================================================***/ +extern Bool AddMapEntry(XkbDescPtr /* xkb */ , + KeyTypeInfo * /* type */ , + XkbKTMapEntryPtr /* new */ , + Bool /* clobber */ , + Bool /* report */ + ); + +extern Bool AddPreserve(XkbDescPtr /* xkb */ , + KeyTypeInfo * /* type */ , + PreserveInfo * /* new */ , + Bool /* clobber */ , + Bool /* report */ + ); + +extern Bool AddLevelName(KeyTypeInfo * /* type */ , + unsigned /* level */ , + Atom /* name */ , + Bool /* clobber */ , + Bool /* report */ + ); + #define MapEntryTxt(t,x,e) \ XkbVModMaskText((t)->dpy,(x),(e)->mods.real_mods,(e)->mods.vmods,XkbMessage) #define PreserveIndexTxt(t,x,p) \ @@ -105,7 +126,7 @@ Atom tok_KEYPAD; /***====================================================================***/ static void -InitKeyTypesInfo(KeyTypesInfo *info, XkbDescPtr xkb, const KeyTypesInfo *from) +InitKeyTypesInfo(KeyTypesInfo * info, XkbDescPtr xkb, KeyTypesInfo * from) { tok_ONE_LEVEL = XkbInternAtom(NULL, "ONE_LEVEL", False); tok_TWO_LEVEL = XkbInternAtom(NULL, "TWO_LEVEL", False); @@ -138,8 +159,8 @@ InitKeyTypesInfo(KeyTypesInfo *info, XkbDescPtr xkb, const KeyTypesInfo *from) info->dflt = from->dflt; if (from->dflt.entries) { - info->dflt.entries = calloc(from->dflt.szEntries, - sizeof(XkbKTMapEntryRec)); + info->dflt.entries = uTypedCalloc(from->dflt.szEntries, + XkbKTMapEntryRec); if (info->dflt.entries) { unsigned sz = from->dflt.nEntries * sizeof(XkbKTMapEntryRec); @@ -148,21 +169,21 @@ InitKeyTypesInfo(KeyTypesInfo *info, XkbDescPtr xkb, const KeyTypesInfo *from) } if (from->dflt.lvlNames) { - info->dflt.lvlNames = calloc(from->dflt.szNames, sizeof(Atom)); + info->dflt.lvlNames = uTypedCalloc(from->dflt.szNames, Atom); if (info->dflt.lvlNames) { - unsigned sz = from->dflt.szNames * sizeof(Atom); + register unsigned sz = from->dflt.szNames * sizeof(Atom); memcpy(info->dflt.lvlNames, from->dflt.lvlNames, sz); } } if (from->dflt.preserve) { - PreserveInfo *last = NULL; - - for (PreserveInfo *old = from->dflt.preserve; - old; old = (PreserveInfo *) old->defs.next) + PreserveInfo *old, *new, *last; + last = NULL; + old = from->dflt.preserve; + for (; old; old = (PreserveInfo *) old->defs.next) { - PreserveInfo *new = malloc(sizeof(PreserveInfo)); + new = uTypedAlloc(PreserveInfo); if (!new) return; *new = *old; @@ -181,12 +202,16 @@ InitKeyTypesInfo(KeyTypesInfo *info, XkbDescPtr xkb, const KeyTypesInfo *from) static void FreeKeyTypeInfo(KeyTypeInfo * type) { - free(type->entries); - type->entries = NULL; - - free(type->lvlNames); - type->lvlNames = NULL; - + if (type->entries != NULL) + { + uFree(type->entries); + type->entries = NULL; + } + if (type->lvlNames != NULL) + { + uFree(type->lvlNames); + type->lvlNames = NULL; + } if (type->preserve != NULL) { ClearCommonInfo(&type->preserve->defs); @@ -199,12 +224,13 @@ static void FreeKeyTypesInfo(KeyTypesInfo * info) { info->dpy = NULL; - free(info->name); + if (info->name) + uFree(info->name); info->name = NULL; if (info->types) { - for (KeyTypeInfo *type = info->types; type; - type = (KeyTypeInfo *) type->defs.next) + register KeyTypeInfo *type; + for (type = info->types; type; type = (KeyTypeInfo *) type->defs.next) { FreeKeyTypeInfo(type); } @@ -219,9 +245,10 @@ NextKeyType(KeyTypesInfo * info) { KeyTypeInfo *type; - type = calloc(1, sizeof(KeyTypeInfo)); + type = uTypedAlloc(KeyTypeInfo); if (type != NULL) { + bzero(type, sizeof(KeyTypeInfo)); type->defs.fileID = info->fileID; type->dpy = info->dpy; info->types = (KeyTypeInfo *) AddCommonInfo(&info->types->defs, @@ -232,10 +259,11 @@ NextKeyType(KeyTypesInfo * info) } static KeyTypeInfo * -FindMatchingKeyType(KeyTypesInfo *info, const KeyTypeInfo *new) +FindMatchingKeyType(KeyTypesInfo * info, KeyTypeInfo * new) { - for (KeyTypeInfo *old = info->types; old; - old = (KeyTypeInfo *) old->defs.next) + KeyTypeInfo *old; + + for (old = info->types; old; old = (KeyTypeInfo *) old->defs.next) { if (old->name == new->name) return old; @@ -340,6 +368,8 @@ static void MergeIncludedKeyTypes(KeyTypesInfo * into, KeyTypesInfo * from, unsigned merge, XkbDescPtr xkb) { + KeyTypeInfo *type; + if (from->errorCount > 0) { into->errorCount += from->errorCount; @@ -350,8 +380,7 @@ MergeIncludedKeyTypes(KeyTypesInfo * into, into->name = from->name; from->name = NULL; } - for (KeyTypeInfo *type = from->types; type; - type = (KeyTypeInfo *) type->defs.next) + for (type = from->types; type; type = (KeyTypeInfo *) type->defs.next) { if (merge != MergeDefault) type->defs.merge = merge; @@ -393,7 +422,8 @@ HandleIncludeKeyTypes(IncludeStmt * stmt, (*hndlr) (rtrn, xkb, newMerge, &included); if (stmt->stmt != NULL) { - free(included.name); + if (included.name != NULL) + uFree(included.name); included.name = stmt->stmt; stmt->stmt = NULL; } @@ -405,10 +435,11 @@ HandleIncludeKeyTypes(IncludeStmt * stmt, } if ((stmt->next != NULL) && (included.errorCount < 1)) { + IncludeStmt *next; unsigned op; KeyTypesInfo next_incl; - for (IncludeStmt *next = stmt->next; next != NULL; next = next->next) + for (next = stmt->next; next != NULL; next = next->next) { if ((next->file == NULL) && (next->map == NULL)) { @@ -445,9 +476,9 @@ HandleIncludeKeyTypes(IncludeStmt * stmt, /***====================================================================***/ static XkbKTMapEntryPtr -FindMatchingMapEntry(const KeyTypeInfo *type, unsigned mask, unsigned vmask) +FindMatchingMapEntry(KeyTypeInfo * type, unsigned mask, unsigned vmask) { - int i; + register int i; XkbKTMapEntryPtr entry; for (i = 0, entry = type->entries; i < type->nEntries; i++, entry++) @@ -461,11 +492,13 @@ FindMatchingMapEntry(const KeyTypeInfo *type, unsigned mask, unsigned vmask) static void DeleteLevel1MapEntries(KeyTypeInfo * type) { - for (int i = 0; i < type->nEntries; i++) + register int i, n; + + for (i = 0; i < type->nEntries; i++) { if (type->entries[i].level == 0) { - for (int n = i; n < type->nEntries - 1; n++) + for (n = i; n < type->nEntries - 1; n++) { type->entries[n] = type->entries[n + 1]; } @@ -484,7 +517,7 @@ NextMapEntry(KeyTypeInfo * type) { if (type->entries == NULL) { - type->entries = calloc(2, sizeof(XkbKTMapEntryRec)); + type->entries = uTypedCalloc(2, XkbKTMapEntryRec); if (type->entries == NULL) { ERROR("Couldn't allocate map entries for %s\n", TypeTxt(type)); @@ -497,9 +530,9 @@ NextMapEntry(KeyTypeInfo * type) else if (type->nEntries >= type->szEntries) { type->szEntries *= 2; - type->entries = recallocarray(type->entries, - type->nEntries, type->szEntries, - sizeof(XkbKTMapEntryRec)); + type->entries = uTypedRecalloc(type->entries, + type->nEntries, type->szEntries, + XkbKTMapEntryRec); if (type->entries == NULL) { ERROR("Couldn't reallocate map entries for %s\n", TypeTxt(type)); @@ -510,7 +543,7 @@ NextMapEntry(KeyTypeInfo * type) return &type->entries[type->nEntries++]; } -static Bool +Bool AddPreserve(XkbDescPtr xkb, KeyTypeInfo * type, PreserveInfo * new, Bool clobber, Bool report) { @@ -560,7 +593,7 @@ AddPreserve(XkbDescPtr xkb, } return True; } - old = malloc(sizeof(PreserveInfo)); + old = uTypedAlloc(PreserveInfo); if (!old) { WSGO("Couldn't allocate preserve in %s\n", TypeTxt(type)); @@ -582,7 +615,7 @@ AddPreserve(XkbDescPtr xkb, * @param clobber Overwrite existing entry. * @param report True if a warning is to be printed on. */ -static Bool +Bool AddMapEntry(XkbDescPtr xkb, KeyTypeInfo * type, XkbKTMapEntryPtr new, Bool clobber, Bool report) @@ -648,8 +681,8 @@ static LookupEntry lnames[] = { }; static Bool -SetMapEntry(KeyTypeInfo *type, XkbDescPtr xkb, - const ExprDef *arrayNdx, const ExprDef *value) +SetMapEntry(KeyTypeInfo * type, + XkbDescPtr xkb, ExprDef * arrayNdx, ExprDef * value) { ExprResult rtrn; XkbKTMapEntryRec entry; @@ -695,8 +728,8 @@ SetMapEntry(KeyTypeInfo *type, XkbDescPtr xkb, } static Bool -SetPreserve(KeyTypeInfo *type, XkbDescPtr xkb, - const ExprDef *arrayNdx, const ExprDef *value) +SetPreserve(KeyTypeInfo * type, + XkbDescPtr xkb, ExprDef * arrayNdx, ExprDef * value) { ExprResult rtrn; PreserveInfo new; @@ -733,7 +766,7 @@ SetPreserve(KeyTypeInfo *type, XkbDescPtr xkb, new.preMods = rtrn.uval & 0xff; new.preVMods = (rtrn.uval >> 16) & 0xffff; if ((new.preMods & (~new.indexMods)) - || (new.preVMods & (~new.indexVMods))) + || (new.preVMods && (~new.indexVMods))) { if (warningLevel > 0) { @@ -753,14 +786,14 @@ SetPreserve(KeyTypeInfo *type, XkbDescPtr xkb, /***====================================================================***/ -static Bool +Bool AddLevelName(KeyTypeInfo * type, unsigned level, Atom name, Bool clobber, Bool report) { if ((type->lvlNames == NULL) || (type->szNames <= level)) { - type->lvlNames = recallocarray(type->lvlNames, type->szNames, - level + 1, sizeof(Atom)); + type->lvlNames = + uTypedRecalloc(type->lvlNames, type->szNames, level + 1, Atom); if (type->lvlNames == NULL) { ERROR("Couldn't allocate level names for type %s\n", @@ -805,7 +838,7 @@ AddLevelName(KeyTypeInfo * type, } static Bool -SetLevelName(KeyTypeInfo *type, const ExprDef *arrayNdx, const ExprDef *value) +SetLevelName(KeyTypeInfo * type, ExprDef * arrayNdx, ExprDef * value) { ExprResult rtrn; unsigned level; @@ -844,15 +877,16 @@ SetLevelName(KeyTypeInfo *type, const ExprDef *arrayNdx, const ExprDef *value) * @param field The field to parse (e.g. modifiers, map, level_name) */ static Bool -SetKeyTypeField(KeyTypeInfo * type, XkbDescPtr xkb, const char *field, - const ExprDef *arrayNdx, const ExprDef *value, - KeyTypesInfo *info) +SetKeyTypeField(KeyTypeInfo * type, + XkbDescPtr xkb, + const char *field, + ExprDef * arrayNdx, ExprDef * value, KeyTypesInfo * info) { + ExprResult tmp; + if (uStrCaseCmp(field, "modifiers") == 0) { - ExprResult tmp; unsigned mods, vmods; - if (arrayNdx != NULL) { WARN("The modifiers field of a key type is not an array\n"); @@ -903,7 +937,7 @@ SetKeyTypeField(KeyTypeInfo * type, XkbDescPtr xkb, const char *field, } static Bool -HandleKeyTypeVar(const VarDef *stmt, XkbDescPtr xkb, KeyTypesInfo *info) +HandleKeyTypeVar(VarDef * stmt, XkbDescPtr xkb, KeyTypesInfo * info) { ExprResult elem, field; ExprDef *arrayNdx; @@ -928,8 +962,8 @@ HandleKeyTypeVar(const VarDef *stmt, XkbDescPtr xkb, KeyTypesInfo *info) } static int -HandleKeyTypeBody(const VarDef *def, XkbDescPtr xkb, - KeyTypeInfo *type, KeyTypesInfo *info) +HandleKeyTypeBody(VarDef * def, + XkbDescPtr xkb, KeyTypeInfo * type, KeyTypesInfo * info) { int ok = 1; ExprResult tmp, field; @@ -955,27 +989,30 @@ HandleKeyTypeBody(const VarDef *def, XkbDescPtr xkb, * */ static int -HandleKeyTypeDef(const KeyTypeDef *def, - XkbDescPtr xkb, unsigned merge, KeyTypesInfo *info) +HandleKeyTypeDef(KeyTypeDef * def, + XkbDescPtr xkb, unsigned merge, KeyTypesInfo * info) { - KeyTypeInfo type = { - .defs.defined = 0, - .defs.fileID = info->fileID, - .defs.merge = (def->merge != MergeDefault) ? def->merge : merge, - .defs.next = NULL, - .dpy = info->dpy, - .name = def->name, - .mask = info->dflt.mask, - .vmask = info->dflt.vmask, - .groupInfo = info->dflt.groupInfo, - .numLevels = 1, - .nEntries = 0, - .szEntries = 0, - .entries = NULL, - .preserve = NULL, - .szNames = 0, - .lvlNames = NULL - }; + register int i; + KeyTypeInfo type; + + if (def->merge != MergeDefault) + merge = def->merge; + + type.defs.defined = 0; + type.defs.fileID = info->fileID; + type.defs.merge = merge; + type.defs.next = NULL; + type.dpy = info->dpy; + type.name = def->name; + type.mask = info->dflt.mask; + type.vmask = info->dflt.vmask; + type.groupInfo = info->dflt.groupInfo; + type.numLevels = 1; + type.nEntries = type.szEntries = 0; + type.entries = NULL; + type.szNames = 0; + type.lvlNames = NULL; + type.preserve = NULL; /* Parse the actual content. */ if (!HandleKeyTypeBody(def->body, xkb, &type, info)) @@ -986,7 +1023,7 @@ HandleKeyTypeDef(const KeyTypeDef *def, /* now copy any appropriate map, preserve or level names from the */ /* default type */ - for (int i = 0; i < info->dflt.nEntries; i++) + for (i = 0; i < info->dflt.nEntries; i++) { XkbKTMapEntryPtr dflt; dflt = &info->dflt.entries[i]; @@ -1009,7 +1046,7 @@ HandleKeyTypeDef(const KeyTypeDef *def, dflt = (PreserveInfo *) dflt->defs.next; } } - for (int i = 0; i < info->dflt.szNames; i++) + for (i = 0; i < info->dflt.szNames; i++) { if ((i < type.numLevels) && (info->dflt.lvlNames[i] != None)) { @@ -1097,16 +1134,17 @@ HandleKeyTypesFile(XkbFile * file, static Bool CopyDefToKeyType(XkbDescPtr xkb, XkbKeyTypePtr type, KeyTypeInfo * def) { - for (PreserveInfo *pre = def->preserve; pre != NULL; + register int i; + PreserveInfo *pre; + + for (pre = def->preserve; pre != NULL; pre = (PreserveInfo *) pre->defs.next) { XkbKTMapEntryPtr match; - XkbKTMapEntryRec tmp = { - .mods.real_mods = pre->indexMods, - .mods.vmods = pre->indexVMods, - .level = 0 - }; - + XkbKTMapEntryRec tmp; + tmp.mods.real_mods = pre->indexMods; + tmp.mods.vmods = pre->indexVMods; + tmp.level = 0; AddMapEntry(xkb, def, &tmp, False, False); match = FindMatchingMapEntry(def, pre->indexMods, pre->indexVMods); if (!match) @@ -1124,7 +1162,7 @@ CopyDefToKeyType(XkbDescPtr xkb, XkbKeyTypePtr type, KeyTypeInfo * def) type->map = def->entries; if (def->preserve) { - type->preserve = calloc(type->map_count, sizeof(XkbModsRec)); + type->preserve = uTypedCalloc(type->map_count, XkbModsRec); if (!type->preserve) { WARN("Couldn't allocate preserve array in CopyDefToKeyType\n"); @@ -1133,8 +1171,8 @@ CopyDefToKeyType(XkbDescPtr xkb, XkbKeyTypePtr type, KeyTypeInfo * def) } else { - for (PreserveInfo *pre = def->preserve; pre != NULL; - pre = (PreserveInfo *) pre->defs.next) + pre = def->preserve; + for (; pre != NULL; pre = (PreserveInfo *) pre->defs.next) { int ndx = pre->matchingMapIndex; type->preserve[ndx].mask = pre->preMods; @@ -1148,10 +1186,10 @@ CopyDefToKeyType(XkbDescPtr xkb, XkbKeyTypePtr type, KeyTypeInfo * def) type->name = (Atom) def->name; if (def->szNames > 0) { - type->level_names = calloc(def->numLevels, sizeof(Atom)); + type->level_names = uTypedCalloc(def->numLevels, Atom); /* assert def->szNames<=def->numLevels */ - for (int i = 0; i < def->szNames; i++) + for (i = 0; i < def->szNames; i++) { type->level_names[i] = (Atom) def->lvlNames[i]; } @@ -1179,9 +1217,9 @@ CompileKeyTypes(XkbFile * file, XkbFileInfo * result, unsigned merge) if (info.errorCount == 0) { - int i; - KeyTypeInfo *def; - XkbKeyTypePtr type, next; + register int i; + register KeyTypeInfo *def; + register XkbKeyTypePtr type, next; if (info.name != NULL) { diff --git a/app/xkbcomp/listing.c b/app/xkbcomp/listing.c index fcf23d3ad..dc1cee9ae 100644 --- a/app/xkbcomp/listing.c +++ b/app/xkbcomp/listing.c @@ -70,13 +70,16 @@ SOFTWARE. ******************************************************************/ -#include "utils.h" #include <stdio.h> #include <ctype.h> #include <sys/types.h> #include <sys/stat.h> #include <X11/keysym.h> +#if defined(sgi) +#include <malloc.h> +#endif + #define DEBUG_VAR listingDebug #include "xkbcomp.h" #include <stdlib.h> @@ -123,9 +126,7 @@ SOFTWARE. #define lowbit(x) ((x) & (-(x))) -#ifdef DEBUG unsigned int listingDebug; -#endif static int szListing = 0; static int nListed = 0; @@ -154,7 +155,7 @@ AddMapOnly(char *map) szMapOnly = 5; else szMapOnly *= 2; - mapOnly = reallocarray(list, szMapOnly, sizeof(char *)); + mapOnly = uTypedRealloc(list, szMapOnly, char *); if (!mapOnly) { WSGO("Couldn't allocate list of maps\n"); @@ -165,7 +166,7 @@ AddMapOnly(char *map) return 1; } -static int +int AddListing(char *file, char *map) { if (nListed >= szListing) @@ -174,7 +175,7 @@ AddListing(char *file, char *map) szListing = 10; else szListing *= 2; - list = reallocarray(list, szListing, sizeof(Listing)); + list = uTypedRealloc(list, szListing, Listing); if (!list) { WSGO("Couldn't allocate list of files and maps\n"); @@ -194,10 +195,10 @@ AddListing(char *file, char *map) /***====================================================================***/ static void -ListFile(FILE *outFile, const char *fileName, XkbFile *map) +ListFile(FILE * outFile, char *fileName, XkbFile * map) { - unsigned flags; - const char *mapName; + register unsigned flags; + char *mapName; flags = map->flags; if ((flags & XkbLC_Hidden) && (!(verboseLevel & WantHiddenMaps))) @@ -227,7 +228,7 @@ ListFile(FILE *outFile, const char *fileName, XkbFile *map) mapName = NULL; if (dirsToStrip > 0) { - const char *tmp, *last; + char *tmp, *last; int i; for (i = 0, tmp = last = fileName; (i < dirsToStrip) && tmp; i++) { @@ -302,33 +303,28 @@ AddDirectory(char *head, char *ptrn, char *rest, char *map) { char *tmp, *filename; struct stat sbuf; + size_t tmpsize; filename = FileName(file); if (!filename || filename[0] == '.') continue; if (ptrn && (!XkbNameMatchesPattern(filename, ptrn))) continue; -#ifdef HAVE_ASPRINTF - if (asprintf(&tmp, "%s%s%s", - (head ? head : ""), (head ? "/" : ""), filename) < 0) - continue; -#else - size_t tmpsize = (head ? strlen(head) : 0) + strlen(filename) + 2; - tmp = malloc(tmpsize); + tmpsize = (head ? strlen(head) : 0) + strlen(filename) + 2; + tmp = uAlloc(tmpsize); if (!tmp) continue; snprintf(tmp, tmpsize, "%s%s%s", (head ? head : ""), (head ? "/" : ""), filename); -#endif if (stat(tmp, &sbuf) < 0) { - free(tmp); + uFree(tmp); continue; } if (((rest != NULL) && (!S_ISDIR(sbuf.st_mode))) || ((map != NULL) && (S_ISDIR(sbuf.st_mode)))) { - free(tmp); + uFree(tmp); continue; } if (S_ISDIR(sbuf.st_mode)) @@ -404,11 +400,13 @@ AddMatchingFiles(char *head_in) static Bool MapMatches(char *mapToConsider, char *ptrn) { + int i; + if (ptrn != NULL) return XkbNameMatchesPattern(mapToConsider, ptrn); if (nMapOnly < 1) return True; - for (int i = 0; i < nMapOnly; i++) + for (i = 0; i < nMapOnly; i++) { if (XkbNameMatchesPattern(mapToConsider, mapOnly[i])) return True; @@ -417,10 +415,13 @@ MapMatches(char *mapToConsider, char *ptrn) } int -GenerateListing(const char *out_name) +GenerateListing(char *out_name) { - FILE *outFile; - XkbFile *rtrn; + int i; + FILE *inputFile, *outFile; + XkbFile *rtrn, *mapToUse; + unsigned oldWarningLevel; + char *mapName; if (nFilesListed < 1) { @@ -440,9 +441,8 @@ GenerateListing(const char *out_name) if (warningLevel > 9) fprintf(stderr, "should list:\n"); #endif - for (int i = 0; i < nListed; i++) + for (i = 0; i < nListed; i++) { - unsigned oldWarningLevel; #ifdef DEBUG if (warningLevel > 9) { @@ -455,7 +455,6 @@ GenerateListing(const char *out_name) warningLevel = 0; if (list[i].file) { - FILE *inputFile; struct stat sbuf; if (stat(list[i].file, &sbuf) < 0) @@ -481,8 +480,8 @@ GenerateListing(const char *out_name) setScanState(list[i].file, 1); if (XKBParseFile(inputFile, &rtrn) && (rtrn != NULL)) { - char *mapName = list[i].map; - XkbFile *mapToUse = rtrn; + mapName = list[i].map; + mapToUse = rtrn; for (; mapToUse; mapToUse = (XkbFile *) mapToUse->common.next) { if (!MapMatches(mapToUse->name, mapName)) @@ -494,9 +493,5 @@ GenerateListing(const char *out_name) } warningLevel = oldWarningLevel; } - if (outFile != stdout) - { - fclose(outFile); - } return 1; } diff --git a/app/xkbcomp/misc.c b/app/xkbcomp/misc.c index 0b5f4330a..5faa6c1cb 100644 --- a/app/xkbcomp/misc.c +++ b/app/xkbcomp/misc.c @@ -53,6 +53,7 @@ ProcessIncludeFile(IncludeStmt * stmt, unsigned file_type, XkbFile ** file_rtrn, unsigned *merge_rtrn) { + FILE *file; XkbFile *rtrn, *mapToUse; char oldFile[1024] = {0}; int oldLine = lineNum; @@ -62,7 +63,7 @@ ProcessIncludeFile(IncludeStmt * stmt, { /* file not in cache, open it, parse it and store it in cache for next time. */ - FILE *file = XkbFindFileInPath(stmt->file, file_type, &stmt->path); + file = XkbFindFileInPath(stmt->file, file_type, &stmt->path); if (file == NULL) { ERROR("Can't find file \"%s\" for %s include\n", stmt->file, @@ -73,10 +74,8 @@ ProcessIncludeFile(IncludeStmt * stmt, strcpy(oldFile, scanFile); oldLine = lineNum; setScanState(stmt->file, 1); -#ifdef DEBUG if (debugFlags & 2) INFO("About to parse include file %s\n", stmt->file); -#endif /* parse the file */ if ((XKBParseFile(file, &rtrn) == 0) || (rtrn == NULL)) { @@ -177,7 +176,6 @@ ReportBadType(const char *type, const char *field, return False; } -#if 0 int ReportBadIndexType(char *type, char *field, char *name, char *wanted) { @@ -185,7 +183,6 @@ ReportBadIndexType(char *type, char *field, char *name, char *wanted) ACTION("Ignoring assignment to illegal field in %s\n", name); return False; } -#endif int ReportBadField(const char *type, const char *field, const char *name) @@ -195,7 +192,6 @@ ReportBadField(const char *type, const char *field, const char *name) return False; } -#if 0 int ReportMultipleDefs(char *type, char *field, char *name) { @@ -203,13 +199,12 @@ ReportMultipleDefs(char *type, char *field, char *name) ACTION("Using last definition\n"); return False; } -#endif /***====================================================================***/ Bool -UseNewField(unsigned field, const CommonInfo *oldDefs, - const CommonInfo *newDefs, unsigned *pCollide) +UseNewField(unsigned field, + CommonInfo * oldDefs, CommonInfo * newDefs, unsigned *pCollide) { Bool useNew; @@ -232,10 +227,9 @@ UseNewField(unsigned field, const CommonInfo *oldDefs, return useNew; } -#if 0 -static Bool -MergeNewField(unsigned field, const CommonInfo *oldDefs, - const CommonInfo *newDefs, unsigned *pCollide) +Bool +MergeNewField(unsigned field, + CommonInfo * oldDefs, CommonInfo * newDefs, unsigned *pCollide) { if ((oldDefs->defined & field) && (newDefs->defined & field)) { @@ -249,7 +243,6 @@ MergeNewField(unsigned field, const CommonInfo *oldDefs, } return False; } -#endif XPointer ClearCommonInfo(CommonInfo * cmn) @@ -260,7 +253,7 @@ ClearCommonInfo(CommonInfo * cmn) for (this = cmn; this != NULL; this = next) { next = this->next; - free(this); + uFree(this); } } return NULL; @@ -296,140 +289,141 @@ typedef struct _KeyNameDesc } KeyNameDesc; static KeyNameDesc dfltKeys[] = { - {XK_Escape, NoSymbol, "ESC\0", 0}, - {XK_quoteleft, XK_asciitilde, "TLDE", 0}, - {XK_1, XK_exclam, "AE01", 0}, - {XK_2, XK_at, "AE02", 0}, - {XK_3, XK_numbersign, "AE03", 0}, - {XK_4, XK_dollar, "AE04", 0}, - {XK_5, XK_percent, "AE05", 0}, - {XK_6, XK_asciicircum, "AE06", 0}, - {XK_7, XK_ampersand, "AE07", 0}, - {XK_8, XK_asterisk, "AE08", 0}, - {XK_9, XK_parenleft, "AE09", 0}, - {XK_0, XK_parenright, "AE10", 0}, - {XK_minus, XK_underscore, "AE11", 0}, - {XK_equal, XK_plus, "AE12", 0}, - {XK_BackSpace, NoSymbol, "BKSP", 0}, - {XK_Tab, NoSymbol, "TAB\0", 0}, - {XK_q, XK_Q, "AD01", 0}, - {XK_w, XK_W, "AD02", 0}, - {XK_e, XK_E, "AD03", 0}, - {XK_r, XK_R, "AD04", 0}, - {XK_t, XK_T, "AD05", 0}, - {XK_y, XK_Y, "AD06", 0}, - {XK_u, XK_U, "AD07", 0}, - {XK_i, XK_I, "AD08", 0}, - {XK_o, XK_O, "AD09", 0}, - {XK_p, XK_P, "AD10", 0}, - {XK_bracketleft, XK_braceleft, "AD11", 0}, - {XK_bracketright, XK_braceright, "AD12", 0}, - {XK_Return, NoSymbol, "RTRN", 0}, - {XK_Caps_Lock, NoSymbol, "CAPS", 0}, - {XK_a, XK_A, "AC01", 0}, - {XK_s, XK_S, "AC02", 0}, - {XK_d, XK_D, "AC03", 0}, - {XK_f, XK_F, "AC04", 0}, - {XK_g, XK_G, "AC05", 0}, - {XK_h, XK_H, "AC06", 0}, - {XK_j, XK_J, "AC07", 0}, - {XK_k, XK_K, "AC08", 0}, - {XK_l, XK_L, "AC09", 0}, - {XK_semicolon, XK_colon, "AC10", 0}, - {XK_quoteright, XK_quotedbl, "AC11", 0}, - {XK_Shift_L, NoSymbol, "LFSH", 0}, - {XK_z, XK_Z, "AB01", 0}, - {XK_x, XK_X, "AB02", 0}, - {XK_c, XK_C, "AB03", 0}, - {XK_v, XK_V, "AB04", 0}, - {XK_b, XK_B, "AB05", 0}, - {XK_n, XK_N, "AB06", 0}, - {XK_m, XK_M, "AB07", 0}, - {XK_comma, XK_less, "AB08", 0}, - {XK_period, XK_greater, "AB09", 0}, - {XK_slash, XK_question, "AB10", 0}, - {XK_backslash, XK_bar, "BKSL", 0}, - {XK_Control_L, NoSymbol, "LCTL", 0}, - {XK_space, NoSymbol, "SPCE", 0}, - {XK_Shift_R, NoSymbol, "RTSH", 0}, - {XK_Alt_L, NoSymbol, "LALT", 0}, - {XK_space, NoSymbol, "SPCE", 0}, - {XK_Control_R, NoSymbol, "RCTL", 0}, - {XK_Alt_R, NoSymbol, "RALT", 0}, - {XK_F1, NoSymbol, "FK01", 0}, - {XK_F2, NoSymbol, "FK02", 0}, - {XK_F3, NoSymbol, "FK03", 0}, - {XK_F4, NoSymbol, "FK04", 0}, - {XK_F5, NoSymbol, "FK05", 0}, - {XK_F6, NoSymbol, "FK06", 0}, - {XK_F7, NoSymbol, "FK07", 0}, - {XK_F8, NoSymbol, "FK08", 0}, - {XK_F9, NoSymbol, "FK09", 0}, - {XK_F10, NoSymbol, "FK10", 0}, - {XK_F11, NoSymbol, "FK11", 0}, - {XK_F12, NoSymbol, "FK12", 0}, - {XK_Print, NoSymbol, "PRSC", 0}, - {XK_Scroll_Lock, NoSymbol, "SCLK", 0}, - {XK_Pause, NoSymbol, "PAUS", 0}, - {XK_Insert, NoSymbol, "INS\0", 0}, - {XK_Home, NoSymbol, "HOME", 0}, - {XK_Prior, NoSymbol, "PGUP", 0}, - {XK_Delete, NoSymbol, "DELE", 0}, - {XK_End, NoSymbol, "END", 0}, - {XK_Next, NoSymbol, "PGDN", 0}, - {XK_Up, NoSymbol, "UP\0\0", 0}, - {XK_Left, NoSymbol, "LEFT", 0}, - {XK_Down, NoSymbol, "DOWN", 0}, - {XK_Right, NoSymbol, "RGHT", 0}, - {XK_Num_Lock, NoSymbol, "NMLK", 0}, - {XK_KP_Divide, NoSymbol, "KPDV", 0}, - {XK_KP_Multiply, NoSymbol, "KPMU", 0}, - {XK_KP_Subtract, NoSymbol, "KPSU", 0}, - {NoSymbol, XK_KP_7, "KP7\0", 0}, - {NoSymbol, XK_KP_8, "KP8\0", 0}, - {NoSymbol, XK_KP_9, "KP9\0", 0}, - {XK_KP_Add, NoSymbol, "KPAD", 0}, - {NoSymbol, XK_KP_4, "KP4\0", 0}, - {NoSymbol, XK_KP_5, "KP5\0", 0}, - {NoSymbol, XK_KP_6, "KP6\0", 0}, - {NoSymbol, XK_KP_1, "KP1\0", 0}, - {NoSymbol, XK_KP_2, "KP2\0", 0}, - {NoSymbol, XK_KP_3, "KP3\0", 0}, - {XK_KP_Enter, NoSymbol, "KPEN", 0}, - {NoSymbol, XK_KP_0, "KP0\0", 0}, - {XK_KP_Delete, NoSymbol, "KPDL", 0}, - {XK_less, XK_greater, "LSGT", 0}, - {XK_KP_Separator, NoSymbol, "KPCO", 0}, - {XK_Find, NoSymbol, "FIND", 0}, - {NoSymbol, NoSymbol, "\0\0\0\0", 0} + {XK_Escape, NoSymbol, "ESC\0"}, + {XK_quoteleft, XK_asciitilde, "TLDE"}, + {XK_1, XK_exclam, "AE01"}, + {XK_2, XK_at, "AE02"}, + {XK_3, XK_numbersign, "AE03"}, + {XK_4, XK_dollar, "AE04"}, + {XK_5, XK_percent, "AE05"}, + {XK_6, XK_asciicircum, "AE06"}, + {XK_7, XK_ampersand, "AE07"}, + {XK_8, XK_asterisk, "AE08"}, + {XK_9, XK_parenleft, "AE09"}, + {XK_0, XK_parenright, "AE10"}, + {XK_minus, XK_underscore, "AE11"}, + {XK_equal, XK_plus, "AE12"}, + {XK_BackSpace, NoSymbol, "BKSP"}, + {XK_Tab, NoSymbol, "TAB\0"}, + {XK_q, XK_Q, "AD01"}, + {XK_w, XK_W, "AD02"}, + {XK_e, XK_E, "AD03"}, + {XK_r, XK_R, "AD04"}, + {XK_t, XK_T, "AD05"}, + {XK_y, XK_Y, "AD06"}, + {XK_u, XK_U, "AD07"}, + {XK_i, XK_I, "AD08"}, + {XK_o, XK_O, "AD09"}, + {XK_p, XK_P, "AD10"}, + {XK_bracketleft, XK_braceleft, "AD11"}, + {XK_bracketright, XK_braceright, "AD12"}, + {XK_Return, NoSymbol, "RTRN"}, + {XK_Caps_Lock, NoSymbol, "CAPS"}, + {XK_a, XK_A, "AC01"}, + {XK_s, XK_S, "AC02"}, + {XK_d, XK_D, "AC03"}, + {XK_f, XK_F, "AC04"}, + {XK_g, XK_G, "AC05"}, + {XK_h, XK_H, "AC06"}, + {XK_j, XK_J, "AC07"}, + {XK_k, XK_K, "AC08"}, + {XK_l, XK_L, "AC09"}, + {XK_semicolon, XK_colon, "AC10"}, + {XK_quoteright, XK_quotedbl, "AC11"}, + {XK_Shift_L, NoSymbol, "LFSH"}, + {XK_z, XK_Z, "AB01"}, + {XK_x, XK_X, "AB02"}, + {XK_c, XK_C, "AB03"}, + {XK_v, XK_V, "AB04"}, + {XK_b, XK_B, "AB05"}, + {XK_n, XK_N, "AB06"}, + {XK_m, XK_M, "AB07"}, + {XK_comma, XK_less, "AB08"}, + {XK_period, XK_greater, "AB09"}, + {XK_slash, XK_question, "AB10"}, + {XK_backslash, XK_bar, "BKSL"}, + {XK_Control_L, NoSymbol, "LCTL"}, + {XK_space, NoSymbol, "SPCE"}, + {XK_Shift_R, NoSymbol, "RTSH"}, + {XK_Alt_L, NoSymbol, "LALT"}, + {XK_space, NoSymbol, "SPCE"}, + {XK_Control_R, NoSymbol, "RCTL"}, + {XK_Alt_R, NoSymbol, "RALT"}, + {XK_F1, NoSymbol, "FK01"}, + {XK_F2, NoSymbol, "FK02"}, + {XK_F3, NoSymbol, "FK03"}, + {XK_F4, NoSymbol, "FK04"}, + {XK_F5, NoSymbol, "FK05"}, + {XK_F6, NoSymbol, "FK06"}, + {XK_F7, NoSymbol, "FK07"}, + {XK_F8, NoSymbol, "FK08"}, + {XK_F9, NoSymbol, "FK09"}, + {XK_F10, NoSymbol, "FK10"}, + {XK_F11, NoSymbol, "FK11"}, + {XK_F12, NoSymbol, "FK12"}, + {XK_Print, NoSymbol, "PRSC"}, + {XK_Scroll_Lock, NoSymbol, "SCLK"}, + {XK_Pause, NoSymbol, "PAUS"}, + {XK_Insert, NoSymbol, "INS\0"}, + {XK_Home, NoSymbol, "HOME"}, + {XK_Prior, NoSymbol, "PGUP"}, + {XK_Delete, NoSymbol, "DELE"}, + {XK_End, NoSymbol, "END"}, + {XK_Next, NoSymbol, "PGDN"}, + {XK_Up, NoSymbol, "UP\0\0"}, + {XK_Left, NoSymbol, "LEFT"}, + {XK_Down, NoSymbol, "DOWN"}, + {XK_Right, NoSymbol, "RGHT"}, + {XK_Num_Lock, NoSymbol, "NMLK"}, + {XK_KP_Divide, NoSymbol, "KPDV"}, + {XK_KP_Multiply, NoSymbol, "KPMU"}, + {XK_KP_Subtract, NoSymbol, "KPSU"}, + {NoSymbol, XK_KP_7, "KP7\0"}, + {NoSymbol, XK_KP_8, "KP8\0"}, + {NoSymbol, XK_KP_9, "KP9\0"}, + {XK_KP_Add, NoSymbol, "KPAD"}, + {NoSymbol, XK_KP_4, "KP4\0"}, + {NoSymbol, XK_KP_5, "KP5\0"}, + {NoSymbol, XK_KP_6, "KP6\0"}, + {NoSymbol, XK_KP_1, "KP1\0"}, + {NoSymbol, XK_KP_2, "KP2\0"}, + {NoSymbol, XK_KP_3, "KP3\0"}, + {XK_KP_Enter, NoSymbol, "KPEN"}, + {NoSymbol, XK_KP_0, "KP0\0"}, + {XK_KP_Delete, NoSymbol, "KPDL"}, + {XK_less, XK_greater, "LSGT"}, + {XK_KP_Separator, NoSymbol, "KPCO"}, + {XK_Find, NoSymbol, "FIND"}, + {NoSymbol, NoSymbol, "\0\0\0\0"} }; Status ComputeKbdDefaults(XkbDescPtr xkb) { - int nUnknown; + Status rtrn; + register int i, tmp, nUnknown; + KeyNameDesc *name; + KeySym *syms; + char tmpname[XkbKeyNameLength + 1]; if ((xkb->names == NULL) || (xkb->names->keys == NULL)) { - Status rtrn; if ((rtrn = XkbAllocNames(xkb, XkbKeyNamesMask, 0, 0)) != Success) return rtrn; } - for (KeyNameDesc *name = dfltKeys; (name->name[0] != '\0'); name++) + for (name = dfltKeys; (name->name[0] != '\0'); name++) { name->used = False; } nUnknown = 0; - for (int i = xkb->min_key_code; i <= xkb->max_key_code; i++) + for (i = xkb->min_key_code; i <= xkb->max_key_code; i++) { - int tmp = XkbKeyNumSyms(xkb, i); + tmp = XkbKeyNumSyms(xkb, i); if ((xkb->names->keys[i].name[0] == '\0') && (tmp > 0)) { - KeySym *syms; - tmp = XkbKeyGroupsWidth(xkb, i); syms = XkbKeySymsPtr(xkb, i); - for (KeyNameDesc *name = dfltKeys; (name->name[0] != '\0'); name++) + for (name = dfltKeys; (name->name[0] != '\0'); name++) { Bool match = True; if (((name->level1 != syms[0]) @@ -450,8 +444,6 @@ ComputeKbdDefaults(XkbDescPtr xkb) } else { - char tmpname[XkbKeyNameLength + 1]; - if (warningLevel > 2) { WARN @@ -472,8 +464,6 @@ ComputeKbdDefaults(XkbDescPtr xkb) { if (warningLevel > 2) { - char tmpname[XkbKeyNameLength + 1]; - WARN("Key %d does not match any defaults\n", i); ACTION("Using name <U%03d>\n", nUnknown); snprintf(tmpname, sizeof(tmpname), "U%03d", nUnknown++); @@ -504,6 +494,8 @@ FindNamedKey(XkbDescPtr xkb, unsigned int *kc_rtrn, Bool use_aliases, Bool create, int start_from) { + register unsigned n; + if (start_from < xkb->min_key_code) { start_from = xkb->min_key_code; @@ -516,7 +508,7 @@ FindNamedKey(XkbDescPtr xkb, *kc_rtrn = 0; /* some callers rely on this */ if (xkb && xkb->names && xkb->names->keys) { - for (unsigned n = start_from; n <= xkb->max_key_code; n++) + for (n = start_from; n <= xkb->max_key_code; n++) { unsigned long tmp; tmp = KeyNameToLong(xkb->names->keys[n].name); @@ -554,7 +546,7 @@ FindNamedKey(XkbDescPtr xkb, } } /* Find first unused keycode and store our key here */ - for (unsigned n = xkb->min_key_code; n <= xkb->max_key_code; n++) + for (n = xkb->min_key_code; n <= xkb->max_key_code; n++) { if (xkb->names->keys[n].name[0] == '\0') { @@ -573,6 +565,7 @@ Bool FindKeyNameForAlias(XkbDescPtr xkb, unsigned long lname, unsigned long *real_name) { + register int i; char name[XkbKeyNameLength + 1]; if (xkb && xkb->geom && xkb->geom->key_aliases) @@ -581,7 +574,7 @@ FindKeyNameForAlias(XkbDescPtr xkb, unsigned long lname, a = xkb->geom->key_aliases; LongToKeyName(lname, name); name[XkbKeyNameLength] = '\0'; - for (int i = 0; i < xkb->geom->num_key_aliases; i++, a++) + for (i = 0; i < xkb->geom->num_key_aliases; i++, a++) { if (strncmp(name, a->alias, XkbKeyNameLength) == 0) { @@ -596,7 +589,7 @@ FindKeyNameForAlias(XkbDescPtr xkb, unsigned long lname, a = xkb->names->key_aliases; LongToKeyName(lname, name); name[XkbKeyNameLength] = '\0'; - for (int i = 0; i < xkb->names->num_key_aliases; i++, a++) + for (i = 0; i < xkb->names->num_key_aliases; i++, a++) { if (strncmp(name, a->alias, XkbKeyNameLength) == 0) { diff --git a/app/xkbcomp/misc.h b/app/xkbcomp/misc.h index e1ed7587c..b6a5288d3 100644 --- a/app/xkbcomp/misc.h +++ b/app/xkbcomp/misc.h @@ -36,11 +36,17 @@ typedef struct _CommonInfo } CommonInfo; extern Bool UseNewField(unsigned /* field */ , - const CommonInfo * /* oldDefs */ , - const CommonInfo * /* newDefs */ , + CommonInfo * /* oldDefs */ , + CommonInfo * /* newDefs */ , unsigned * /* pCollide */ ); +extern Bool MergeNewField(unsigned /* field */ , + CommonInfo * /* oldDefs */ , + CommonInfo * /* newDefs */ , + unsigned * /* pCollide */ + ); + extern XPointer ClearCommonInfo(CommonInfo * /* cmn */ ); diff --git a/app/xkbcomp/parseutils.c b/app/xkbcomp/parseutils.c index 917a24007..4b77c4c60 100644 --- a/app/xkbcomp/parseutils.c +++ b/app/xkbcomp/parseutils.c @@ -57,15 +57,13 @@ ExprDef * ExprCreate(unsigned op, unsigned type) { ExprDef *expr; - expr = malloc(sizeof(ExprDef)); + expr = uTypedAlloc(ExprDef); if (expr) { - *expr = (ExprDef) { - .common.stmtType = StmtExpr, - .common.next = NULL, - .op = op, - .type = type - }; + expr->common.stmtType = StmtExpr; + expr->common.next = NULL; + expr->op = op; + expr->type = type; } else { @@ -79,16 +77,14 @@ ExprDef * ExprCreateUnary(unsigned op, unsigned type, ExprDef * child) { ExprDef *expr; - expr = malloc(sizeof(ExprDef)); + expr = uTypedAlloc(ExprDef); if (expr) { - *expr = (ExprDef) { - .common.stmtType = StmtExpr, - .common.next = NULL, - .op = op, - .type = type, - .value.child = child - }; + expr->common.stmtType = StmtExpr; + expr->common.next = NULL; + expr->op = op; + expr->type = type; + expr->value.child = child; } else { @@ -102,22 +98,20 @@ ExprDef * ExprCreateBinary(unsigned op, ExprDef * left, ExprDef * right) { ExprDef *expr; - expr = malloc(sizeof(ExprDef)); + expr = uTypedAlloc(ExprDef); if (expr) { - *expr = (ExprDef) { - .common.stmtType = StmtExpr, - .common.next = NULL, - .op = op, - .type = TypeUnknown, - .value.binary.left = left, - .value.binary.right = right - }; - + expr->common.stmtType = StmtExpr; + expr->common.next = NULL; + expr->op = op; if ((op == OpAssign) || (left->type == TypeUnknown)) expr->type = right->type; else if ((left->type == right->type) || (right->type == TypeUnknown)) expr->type = left->type; + else + expr->type = TypeUnknown; + expr->value.binary.left = left; + expr->value.binary.right = right; } else { @@ -128,20 +122,18 @@ ExprCreateBinary(unsigned op, ExprDef * left, ExprDef * right) } KeycodeDef * -KeycodeCreate(const char *name, ExprDef *value) +KeycodeCreate(char *name, ExprDef * value) { KeycodeDef *def; - def = malloc(sizeof(KeycodeDef)); + def = uTypedAlloc(KeycodeDef); if (def) { - *def = (KeycodeDef) { - .common.stmtType = StmtKeycodeDef, - .common.next = NULL, - .value = value - }; + def->common.stmtType = StmtKeycodeDef; + def->common.next = NULL; strncpy(def->name, name, XkbKeyNameLength); def->name[XkbKeyNameLength] = '\0'; + def->value = value; } else { @@ -152,17 +144,15 @@ KeycodeCreate(const char *name, ExprDef *value) } KeyAliasDef * -KeyAliasCreate(const char *alias, const char *real) +KeyAliasCreate(char *alias, char *real) { KeyAliasDef *def; - def = malloc(sizeof(KeyAliasDef)); + def = uTypedAlloc(KeyAliasDef); if (def) { - *def = (KeyAliasDef) { - .common.stmtType = StmtKeyAliasDef, - .common.next = NULL, - }; + def->common.stmtType = StmtKeyAliasDef; + def->common.next = NULL; strncpy(def->alias, alias, XkbKeyNameLength); def->alias[XkbKeyNameLength] = '\0'; strncpy(def->real, real, XkbKeyNameLength); @@ -180,15 +170,13 @@ VModDef * VModCreate(Atom name, ExprDef * value) { VModDef *def; - def = malloc(sizeof(VModDef)); + def = uTypedAlloc(VModDef); if (def) { - *def = (VModDef) { - .common.stmtType = StmtVModDef, - .common.next = NULL, - .name = name, - .value = value - }; + def->common.stmtType = StmtVModDef; + def->common.next = NULL; + def->name = name; + def->value = value; } else { @@ -202,15 +190,13 @@ VarDef * VarCreate(ExprDef * name, ExprDef * value) { VarDef *def; - def = malloc(sizeof(VarDef)); + def = uTypedAlloc(VarDef); if (def) { - *def = (VarDef) { - .common.stmtType = StmtVarDef, - .common.next = NULL, - .name = name, - .value = value - }; + def->common.stmtType = StmtVarDef; + def->common.next = NULL; + def->name = name; + def->value = value; } else { @@ -237,18 +223,16 @@ InterpCreate(const char *sym_str, ExprDef * match) { InterpDef *def; - def = malloc(sizeof(InterpDef)); + def = uTypedAlloc(InterpDef); if (def) { - *def = (InterpDef) { - .common.stmtType = StmtInterpDef, - .common.next = NULL, - .match = match - }; + def->common.stmtType = StmtInterpDef; + def->common.next = NULL; if (LookupKeysym(sym_str, &def->sym) == 0) def->ignore = True; else def->ignore = False; + def->match = match; } else { @@ -263,16 +247,14 @@ KeyTypeCreate(Atom name, VarDef * body) { KeyTypeDef *def; - def = malloc(sizeof(KeyTypeDef)); + def = uTypedAlloc(KeyTypeDef); if (def) { - *def = (KeyTypeDef) { - .common.stmtType = StmtKeyTypeDef, - .common.next = NULL, - .merge = MergeDefault, - .name = name, - .body = body - }; + def->common.stmtType = StmtKeyTypeDef; + def->common.next = NULL; + def->merge = MergeDefault; + def->name = name; + def->body = body; } else { @@ -287,17 +269,15 @@ SymbolsCreate(char *keyName, ExprDef * symbols) { SymbolsDef *def; - def = malloc(sizeof(SymbolsDef)); + def = uTypedAlloc(SymbolsDef); if (def) { - *def = (SymbolsDef) { - .common.stmtType = StmtSymbolsDef, - .common.next = NULL, - .merge = MergeDefault, - .symbols = symbols - }; + def->common.stmtType = StmtSymbolsDef; + def->common.next = NULL; + def->merge = MergeDefault; + bzero(def->keyName, 5); strncpy(def->keyName, keyName, 4); - def->keyName[4] = 0; + def->symbols = symbols; } else { @@ -312,16 +292,14 @@ GroupCompatCreate(int group, ExprDef * val) { GroupCompatDef *def; - def = malloc(sizeof(GroupCompatDef)); + def = uTypedAlloc(GroupCompatDef); if (def) { - *def = (GroupCompatDef) { - .common.stmtType = StmtGroupCompatDef, - .common.next = NULL, - .merge = MergeDefault, - .group = group, - .def = val - }; + def->common.stmtType = StmtGroupCompatDef; + def->common.next = NULL; + def->merge = MergeDefault; + def->group = group; + def->def = val; } else { @@ -336,16 +314,14 @@ ModMapCreate(Atom modifier, ExprDef * keys) { ModMapDef *def; - def = malloc(sizeof(ModMapDef)); + def = uTypedAlloc(ModMapDef); if (def) { - *def = (ModMapDef) { - .common.stmtType = StmtModMapDef, - .common.next = NULL, - .merge = MergeDefault, - .modifier = modifier, - .keys = keys - }; + def->common.stmtType = StmtModMapDef; + def->common.next = NULL; + def->merge = MergeDefault; + def->modifier = modifier; + def->keys = keys; } else { @@ -360,16 +336,14 @@ IndicatorMapCreate(Atom name, VarDef * body) { IndicatorMapDef *def; - def = malloc(sizeof(IndicatorMapDef)); + def = uTypedAlloc(IndicatorMapDef); if (def) { - *def = (IndicatorMapDef) { - .common.stmtType = StmtIndicatorMapDef, - .common.next = NULL, - .merge = MergeDefault, - .name = name, - .body = body - }; + def->common.stmtType = StmtIndicatorMapDef; + def->common.next = NULL; + def->merge = MergeDefault; + def->name = name; + def->body = body; } else { @@ -384,17 +358,15 @@ IndicatorNameCreate(int ndx, ExprDef * name, Bool virtual) { IndicatorNameDef *def; - def = malloc(sizeof(IndicatorNameDef)); + def = uTypedAlloc(IndicatorNameDef); if (def) { - *def = (IndicatorNameDef) { - .common.stmtType = StmtIndicatorNameDef, - .common.next = NULL, - .merge = MergeDefault, - .ndx = ndx, - .name = name, - .virtual = virtual - }; + def->common.stmtType = StmtIndicatorNameDef; + def->common.next = NULL; + def->merge = MergeDefault; + def->ndx = ndx; + def->name = name; + def->virtual = virtual; } else { @@ -409,16 +381,14 @@ ActionCreate(Atom name, ExprDef * args) { ExprDef *act; - act = malloc(sizeof(ExprDef)); + act = uTypedAlloc(ExprDef); if (act) { - *act = (ExprDef) { - .common.stmtType = StmtExpr, - .common.next = NULL, - .op = ExprActionDecl, - .value.action.name = name, - .value.action.args = args - }; + act->common.stmtType = StmtExpr; + act->common.next = NULL; + act->op = ExprActionDecl; + act->value.action.name = name; + act->value.action.args = args; return act; } FATAL("Couldn't allocate ActionDef in parser\n"); @@ -435,7 +405,7 @@ CreateKeysymList(char *sym) { def->value.list.nSyms = 1; def->value.list.szSyms = 4; - def->value.list.syms = calloc(4, sizeof(char *)); + def->value.list.syms = uTypedCalloc(4, char *); if (def->value.list.syms != NULL) { def->value.list.syms[0] = sym; @@ -450,20 +420,19 @@ ShapeDef * ShapeDeclCreate(Atom name, OutlineDef * outlines) { ShapeDef *shape; + OutlineDef *ol; - shape = calloc(1, sizeof(ShapeDef)); + shape = uTypedAlloc(ShapeDef); if (shape != NULL) { - *shape = (ShapeDef) { - .common.stmtType = StmtShapeDef, - .common.next = NULL, - .merge = MergeDefault, - .name = name, - .nOutlines = 0, - .outlines = outlines - }; - for (OutlineDef *ol = outlines; ol != NULL; - ol = (OutlineDef *) ol->common.next) + bzero(shape, sizeof(ShapeDef)); + shape->common.stmtType = StmtShapeDef; + shape->common.next = NULL; + shape->merge = MergeDefault; + shape->name = name; + shape->nOutlines = 0; + shape->outlines = outlines; + for (ol = outlines; ol != NULL; ol = (OutlineDef *) ol->common.next) { if (ol->nPoints > 0) shape->nOutlines++; @@ -476,25 +445,24 @@ OutlineDef * OutlineCreate(Atom field, ExprDef * points) { OutlineDef *outline; + ExprDef *pt; - outline = calloc(1, sizeof(OutlineDef)); + outline = uTypedAlloc(OutlineDef); if (outline != NULL) { - *outline = (OutlineDef) { - .common.stmtType = StmtOutlineDef, - .common.next = NULL, - .field = field, - .nPoints = 0, - .points = points - }; + bzero(outline, sizeof(OutlineDef)); + outline->common.stmtType = StmtOutlineDef; + outline->common.next = NULL; + outline->field = field; + outline->nPoints = 0; if (points->op == ExprCoord) { - for (ExprDef *pt = points; pt != NULL; - pt = (ExprDef *) pt->common.next) + for (pt = points; pt != NULL; pt = (ExprDef *) pt->common.next) { outline->nPoints++; } } + outline->points = points; } return outline; } @@ -504,13 +472,12 @@ KeyDeclCreate(char *name, ExprDef * expr) { KeyDef *key; - key = calloc(1, sizeof(KeyDef)); + key = uTypedAlloc(KeyDef); if (key != NULL) { - *key = (KeyDef) { - .common.stmtType = StmtKeyDef, - .common.next = NULL, - }; + bzero(key, sizeof(KeyDef)); + key->common.stmtType = StmtKeyDef; + key->common.next = NULL; if (name) key->name = name; else @@ -519,33 +486,31 @@ KeyDeclCreate(char *name, ExprDef * expr) return key; } -#if 0 KeyDef * KeyDeclMerge(KeyDef * into, KeyDef * from) { into->expr = (ExprDef *) AppendStmt(&into->expr->common, &from->expr->common); from->expr = NULL; - free(from); + uFree(from); return into; } -#endif RowDef * RowDeclCreate(KeyDef * keys) { RowDef *row; + KeyDef *key; - row = calloc(1, sizeof(RowDef)); + row = uTypedAlloc(RowDef); if (row != NULL) { - *row = (RowDef) { - .common.stmtType = StmtRowDef, - .common.next = NULL, - .nKeys = 0, - .keys = keys - }; - for (KeyDef *key = keys; key != NULL; key = (KeyDef *) key->common.next) + bzero(row, sizeof(RowDef)); + row->common.stmtType = StmtRowDef; + row->common.next = NULL; + row->nKeys = 0; + row->keys = keys; + for (key = keys; key != NULL; key = (KeyDef *) key->common.next) { if (key->common.stmtType == StmtKeyDef) row->nKeys++; @@ -558,18 +523,18 @@ SectionDef * SectionDeclCreate(Atom name, RowDef * rows) { SectionDef *section; + RowDef *row; - section = calloc(1, sizeof(SectionDef)); + section = uTypedAlloc(SectionDef); if (section != NULL) { - *section = (SectionDef) { - .common.stmtType = StmtSectionDef, - .common.next = NULL, - .name = name, - .nRows = 0, - .rows = rows - }; - for (RowDef *row = rows; row != NULL; row = (RowDef *) row->common.next) + bzero(section, sizeof(SectionDef)); + section->common.stmtType = StmtSectionDef; + section->common.next = NULL; + section->name = name; + section->nRows = 0; + section->rows = rows; + for (row = rows; row != NULL; row = (RowDef *) row->common.next) { if (row->common.stmtType == StmtRowDef) section->nRows++; @@ -583,16 +548,15 @@ OverlayKeyCreate(char *under, char *over) { OverlayKeyDef *key; - key = calloc(1, sizeof(OverlayKeyDef)); + key = uTypedAlloc(OverlayKeyDef); if (key != NULL) { - *key = (OverlayKeyDef) { - .common.stmtType = StmtOverlayKeyDef - }; + bzero(key, sizeof(OverlayKeyDef)); + key->common.stmtType = StmtOverlayKeyDef; strncpy(key->over, over, XkbKeyNameLength); strncpy(key->under, under, XkbKeyNameLength); - free(over); - free(under); + uFree(over); + uFree(under); } return key; } @@ -601,16 +565,16 @@ OverlayDef * OverlayDeclCreate(Atom name, OverlayKeyDef * keys) { OverlayDef *ol; + OverlayKeyDef *key; - ol = calloc(1, sizeof(OverlayDef)); + ol = uTypedAlloc(OverlayDef); if (ol != NULL) { - *ol = (OverlayDef) { - .common.stmtType = StmtOverlayDef, - .name = name, - .keys = keys - }; - for (OverlayKeyDef *key = keys; key != NULL; + bzero(ol, sizeof(OverlayDef)); + ol->common.stmtType = StmtOverlayDef; + ol->name = name; + ol->keys = keys; + for (key = keys; key != NULL; key = (OverlayKeyDef *) key->common.next) { ol->nKeys++; @@ -624,16 +588,15 @@ DoodadCreate(unsigned type, Atom name, VarDef * body) { DoodadDef *doodad; - doodad = calloc(1, sizeof(DoodadDef)); + doodad = uTypedAlloc(DoodadDef); if (doodad != NULL) { - *doodad = (DoodadDef) { - .common.stmtType = StmtDoodadDef, - .common.next = NULL, - .type = type, - .name = name, - .body = body - }; + bzero(doodad, sizeof(DoodadDef)); + doodad->common.stmtType = StmtDoodadDef; + doodad->common.next = NULL; + doodad->type = type; + doodad->name = name; + doodad->body = body; } return doodad; } @@ -644,10 +607,10 @@ AppendKeysymList(ExprDef * list, char *sym) if (list->value.list.nSyms >= list->value.list.szSyms) { list->value.list.szSyms *= 2; - list->value.list.syms = recallocarray(list->value.list.syms, - list->value.list.nSyms, - list->value.list.szSyms, - sizeof(char *)); + list->value.list.syms = uTypedRecalloc(list->value.list.syms, + list->value.list.nSyms, + list->value.list.szSyms, + char *); if (list->value.list.syms == NULL) { FATAL("Couldn't resize list of symbols for append\n"); @@ -662,6 +625,7 @@ int LookupKeysym(const char *str, KeySym * sym_rtrn) { KeySym sym; + char *tmp; if ((!str) || (uStrCaseCmp(str, "any") == 0) || (uStrCaseCmp(str, "nosymbol") == 0)) @@ -682,8 +646,6 @@ LookupKeysym(const char *str, KeySym * sym_rtrn) return 1; } if (strlen(str) > 2 && str[0] == '0' && str[1] == 'x') { - char *tmp; - sym = strtoul(str, &tmp, 16); if (sym != ULONG_MAX && (!tmp || *tmp == '\0')) { *sym_rtrn = sym; @@ -717,25 +679,23 @@ IncludeCreate(char *str, unsigned merge) haveSelf = True; } if (first == NULL) - first = incl = malloc(sizeof(IncludeStmt)); + first = incl = uTypedAlloc(IncludeStmt); else { - incl->next = malloc(sizeof(IncludeStmt)); + incl->next = uTypedAlloc(IncludeStmt); incl = incl->next; } if (incl) { - *incl = (IncludeStmt) { - .common.stmtType = StmtInclude, - .common.next = NULL, - .merge = merge, - .stmt = NULL, - .file = file, - .map = map, - .modifier = extra_data, - .path = NULL, - .next = NULL - }; + incl->common.stmtType = StmtInclude; + incl->common.next = NULL; + incl->merge = merge; + incl->stmt = NULL; + incl->file = file; + incl->map = map; + incl->modifier = extra_data; + incl->path = NULL; + incl->next = NULL; } else { @@ -756,7 +716,7 @@ IncludeCreate(char *str, unsigned merge) if (first) first->stmt = stmt; else if (stmt) - free(stmt); + uFree(stmt); return first; BAIL: ERROR("Illegal include statement \"%s\"\n", stmt); @@ -764,16 +724,20 @@ IncludeCreate(char *str, unsigned merge) while (first) { incl = first->next; - free(first->file); - free(first->map); - free(first->modifier); - free(first->path); - first->file = first->map = first->modifier = first->path = NULL; - free(first); + if (first->file) + uFree(first->file); + if (first->map) + uFree(first->map); + if (first->modifier) + uFree(first->modifier); + if (first->path) + uFree(first->path); + first->file = first->map = first->path = NULL; + uFree(first); first = incl; } if (stmt) - free(stmt); + uFree(stmt); return NULL; } @@ -798,9 +762,10 @@ PrintStmtAddrs(ParseCommon * stmt) static void CheckDefaultMap(XkbFile * maps) { - XkbFile *dflt = NULL; + XkbFile *dflt, *tmp; - for (XkbFile *tmp = maps; tmp != NULL; + dflt = NULL; + for (tmp = maps, dflt = NULL; tmp != NULL; tmp = (XkbFile *) tmp->common.next) { if (tmp->flags & XkbLC_Default) @@ -851,19 +816,18 @@ CreateXKBFile(int type, char *name, ParseCommon * defs, unsigned flags) XkbFile *file; static int fileID; - file = calloc(1, sizeof(XkbFile)); + file = uTypedAlloc(XkbFile); if (file) { XkbEnsureSafeMapName(name); - *file = (XkbFile) { - .type = type, - .topName = uStringDup(name), - .name = name, - .defs = defs, - .id = fileID++, - .compiled = False, - .flags = flags - }; + bzero(file, sizeof(XkbFile)); + file->type = type; + file->topName = uStringDup(name); + file->name = name; + file->defs = defs; + file->id = fileID++; + file->compiled = False; + file->flags = flags; } return file; } diff --git a/app/xkbcomp/parseutils.h b/app/xkbcomp/parseutils.h index 41333e4a5..5cc9391b5 100644 --- a/app/xkbcomp/parseutils.h +++ b/app/xkbcomp/parseutils.h @@ -68,12 +68,12 @@ extern ExprDef *ExprCreateBinary(unsigned /* op */ , ExprDef * /* right */ ); -extern KeycodeDef *KeycodeCreate(const char * /* name */ , +extern KeycodeDef *KeycodeCreate(char * /* name */ , ExprDef * /* value */ ); -extern KeyAliasDef *KeyAliasCreate(const char * /* alias */ , - const char * /* real */ +extern KeyAliasDef *KeyAliasCreate(char * /* alias */ , + char * /* real */ ); extern VModDef *VModCreate(Atom /* name */ , diff --git a/app/xkbcomp/symbols.c b/app/xkbcomp/symbols.c index 69cbe3284..06e5095c0 100644 --- a/app/xkbcomp/symbols.c +++ b/app/xkbcomp/symbols.c @@ -81,6 +81,7 @@ typedef struct _KeyInfo static void InitKeyInfo(KeyInfo * info) { + register int i; static char dflt[4] = "*"; info->defs.defined = 0; @@ -90,7 +91,7 @@ InitKeyInfo(KeyInfo * info) info->name = KeyNameToLong(dflt); info->groupInfo = 0; info->typesDefined = info->symsDefined = info->actsDefined = 0; - for (int i = 0; i < XkbNumKbdGroups; i++) + for (i = 0; i < XkbNumKbdGroups; i++) { info->numLevels[i] = 0; info->types[i] = None; @@ -113,19 +114,23 @@ InitKeyInfo(KeyInfo * info) static void FreeKeyInfo(KeyInfo * info) { + register int i; + info->defs.defined = 0; info->defs.fileID = 0; info->defs.merge = MergeOverride; info->defs.next = NULL; info->groupInfo = 0; info->typesDefined = info->symsDefined = info->actsDefined = 0; - for (int i = 0; i < XkbNumKbdGroups; i++) + for (i = 0; i < XkbNumKbdGroups; i++) { info->numLevels[i] = 0; info->types[i] = None; - free(info->syms[i]); + if (info->syms[i] != NULL) + uFree(info->syms[i]); info->syms[i] = NULL; - free(info->acts[i]); + if (info->acts[i] != NULL) + uFree(info->acts[i]); info->acts[i] = NULL; } info->dfltType = None; @@ -146,11 +151,13 @@ FreeKeyInfo(KeyInfo * info) static Bool CopyKeyInfo(KeyInfo * old, KeyInfo * new, Bool clearOld) { + register int i; + *new = *old; new->defs.next = NULL; if (clearOld) { - for (int i = 0; i < XkbNumKbdGroups; i++) + for (i = 0; i < XkbNumKbdGroups; i++) { old->numLevels[i] = 0; old->syms[i] = NULL; @@ -159,29 +166,32 @@ CopyKeyInfo(KeyInfo * old, KeyInfo * new, Bool clearOld) } else { - for (int i = 0; i < XkbNumKbdGroups; i++) + int width; + for (i = 0; i < XkbNumKbdGroups; i++) { - int width = new->numLevels[i]; + width = new->numLevels[i]; if (old->syms[i] != NULL) { - new->syms[i] = calloc(width, sizeof(KeySym)); + new->syms[i] = uTypedCalloc(width, KeySym); if (!new->syms[i]) { new->syms[i] = NULL; new->numLevels[i] = 0; return False; } - memcpy(new->syms[i], old->syms[i], width * sizeof(KeySym)); + memcpy((char *) new->syms[i], (char *) old->syms[i], + width * sizeof(KeySym)); } if (old->acts[i] != NULL) { - new->acts[i] = calloc(width, sizeof(XkbAction)); + new->acts[i] = uTypedCalloc(width, XkbAction); if (!new->acts[i]) { new->acts[i] = NULL; return False; } - memcpy(new->acts[i], old->acts[i], width * sizeof(XkbAction)); + memcpy((char *) new->acts[i], (char *) old->acts[i], + width * sizeof(XkbAction)); } } } @@ -227,6 +237,8 @@ typedef struct _SymbolsInfo static void InitSymbolsInfo(SymbolsInfo * info, XkbDescPtr xkb) { + register int i; + tok_ONE_LEVEL = XkbInternAtom(NULL, "ONE_LEVEL", False); tok_TWO_LEVEL = XkbInternAtom(NULL, "TWO_LEVEL", False); tok_KEYPAD = XkbInternAtom(NULL, "KEYPAD", False); @@ -238,9 +250,9 @@ InitSymbolsInfo(SymbolsInfo * info, XkbDescPtr xkb) info->groupInfo = 0; info->szKeys = SYMBOLS_INIT_SIZE; info->nKeys = 0; - info->keys = calloc(SYMBOLS_INIT_SIZE, sizeof(KeyInfo)); + info->keys = uTypedCalloc(SYMBOLS_INIT_SIZE, KeyInfo); info->modMap = NULL; - for (int i = 0; i < XkbNumKbdGroups; i++) + for (i = 0; i < XkbNumKbdGroups; i++) info->groupNames[i] = None; InitKeyInfo(&info->dflt); InitVModInfo(&info->vmods, xkb); @@ -252,15 +264,18 @@ InitSymbolsInfo(SymbolsInfo * info, XkbDescPtr xkb) static void FreeSymbolsInfo(SymbolsInfo * info) { - free(info->name); + register int i; + + if (info->name) + uFree(info->name); info->name = NULL; if (info->keys) { - for (int i = 0; i < info->nKeys; i++) + for (i = 0; i < info->nKeys; i++) { FreeKeyInfo(&info->keys[i]); } - free(info->keys); + uFree(info->keys); info->keys = NULL; } if (info->modMap) @@ -273,7 +288,7 @@ FreeSymbolsInfo(SymbolsInfo * info) ClearAliases(&info->aliases); info->aliases = NULL; } - bzero(info, sizeof(SymbolsInfo)); + bzero((char *) info, sizeof(SymbolsInfo)); return; } @@ -292,18 +307,18 @@ ResizeKeyGroup(KeyInfo * key, if ((key->syms[group] == NULL) || tooSmall) { - key->syms[group] = recallocarray(key->syms[group], - key->numLevels[group], newWidth, - sizeof(KeySym)); + key->syms[group] = uTypedRecalloc(key->syms[group], + key->numLevels[group], newWidth, + KeySym); if (!key->syms[group]) return False; } if (((forceActions) && (tooSmall || (key->acts[group] == NULL))) || (tooSmall && (key->acts[group] != NULL))) { - key->acts[group] = recallocarray(key->acts[group], - key->numLevels[group], newWidth, - sizeof(XkbAction)); + key->acts[group] = uTypedRecalloc(key->acts[group], + key->numLevels[group], newWidth, + XkbAction); if (!key->acts[group]) return False; } @@ -318,6 +333,7 @@ MergeKeyGroups(SymbolsInfo * info, KeySym *resultSyms; XkbAction *resultActs; int resultWidth; + register int i; Bool report, clobber; clobber = (from->defs.merge != MergeAugment); @@ -338,7 +354,7 @@ MergeKeyGroups(SymbolsInfo * info, } if (resultSyms == NULL) { - resultSyms = calloc(resultWidth, sizeof(KeySym)); + resultSyms = uTypedCalloc(resultWidth, KeySym); if (!resultSyms) { WSGO("Could not allocate symbols for group merge\n"); @@ -349,7 +365,7 @@ MergeKeyGroups(SymbolsInfo * info, } if ((resultActs == NULL) && (into->acts[group] || from->acts[group])) { - resultActs = calloc(resultWidth, sizeof(XkbAction)); + resultActs = uTypedCalloc(resultWidth, XkbAction); if (!resultActs) { WSGO("Could not allocate actions for group merge\n"); @@ -358,7 +374,7 @@ MergeKeyGroups(SymbolsInfo * info, return False; } } - for (int i = 0; i < resultWidth; i++) + for (i = 0; i < resultWidth; i++) { KeySym fromSym, toSym; if (from->syms[group] && (i < from->numLevels[group])) @@ -439,39 +455,42 @@ MergeKeyGroups(SymbolsInfo * info, } } if ((into->syms[group] != NULL) && (resultSyms != into->syms[group])) - free(into->syms[group]); + uFree(into->syms[group]); if ((from->syms[group] != NULL) && (resultSyms != from->syms[group])) - free(from->syms[group]); + uFree(from->syms[group]); if ((into->acts[group] != NULL) && (resultActs != into->acts[group])) - free(into->acts[group]); + uFree(into->acts[group]); if ((from->acts[group] != NULL) && (resultActs != from->acts[group])) - free(from->acts[group]); + uFree(from->acts[group]); into->numLevels[group] = resultWidth; into->syms[group] = resultSyms; from->syms[group] = NULL; into->acts[group] = resultActs; from->acts[group] = NULL; - into->symsDefined |= (1U << group); - from->symsDefined &= ~(1U << group); - into->actsDefined |= (1U << group); - from->actsDefined &= ~(1U << group); + into->symsDefined |= (1 << group); + from->symsDefined &= ~(1 << group); + into->actsDefined |= (1 << group); + from->actsDefined &= ~(1 << group); return True; } static Bool MergeKeys(SymbolsInfo * info, KeyInfo * into, KeyInfo * from) { + register int i; unsigned collide = 0; Bool report; if (from->defs.merge == MergeReplace) { - for (int i = 0; i < XkbNumKbdGroups; i++) + for (i = 0; i < XkbNumKbdGroups; i++) { if (into->numLevels[i] != 0) { - free(into->syms[i]); - free(into->acts[i]); + if (into->syms[i]) + uFree(into->syms[i]); + if (into->acts[i]) + uFree(into->acts[i]); } } *into = *from; @@ -481,7 +500,7 @@ MergeKeys(SymbolsInfo * info, KeyInfo * into, KeyInfo * from) report = ((warningLevel > 9) || ((into->defs.fileID == from->defs.fileID) && (warningLevel > 0))); - for (int i = 0; i < XkbNumKbdGroups; i++) + for (i = 0; i < XkbNumKbdGroups; i++) { if (from->numLevels[i] > 0) { @@ -490,11 +509,11 @@ MergeKeys(SymbolsInfo * info, KeyInfo * into, KeyInfo * from) into->numLevels[i] = from->numLevels[i]; into->syms[i] = from->syms[i]; into->acts[i] = from->acts[i]; - into->symsDefined |= (1U << i); + into->symsDefined |= (1 << i); from->syms[i] = NULL; from->acts[i] = NULL; from->numLevels[i] = 0; - from->symsDefined &= ~(1U << i); + from->symsDefined &= ~(1 << i); if (into->syms[i]) into->defs.defined |= _Key_Syms; if (into->acts[i]) @@ -582,16 +601,17 @@ MergeKeys(SymbolsInfo * info, KeyInfo * into, KeyInfo * from) static Bool AddKeySymbols(SymbolsInfo * info, KeyInfo * key, XkbDescPtr xkb) { + register int i; unsigned long real_name; - for (int i = 0; i < info->nKeys; i++) + for (i = 0; i < info->nKeys; i++) { if (info->keys[i].name == key->name) return MergeKeys(info, &info->keys[i], key); } if (FindKeyNameForAlias(xkb, key->name, &real_name)) { - for (int i = 0; i < info->nKeys; i++) + for (i = 0; i < info->nKeys; i++) { if (info->keys[i].name == real_name) return MergeKeys(info, &info->keys[i], key); @@ -600,8 +620,8 @@ AddKeySymbols(SymbolsInfo * info, KeyInfo * key, XkbDescPtr xkb) if (info->nKeys >= info->szKeys) { info->szKeys += SYMBOLS_CHUNK; - info->keys = recallocarray(info->keys, info->nKeys, info->szKeys, - sizeof(KeyInfo)); + info->keys = + uTypedRecalloc(info->keys, info->nKeys, info->szKeys, KeyInfo); if (!info->keys) { WSGO("Could not allocate key symbols descriptions\n"); @@ -624,10 +644,9 @@ AddModMapEntry(SymbolsInfo * info, ModMapEntry * new) if (new->haveSymbol && mm->haveSymbol && (new->u.keySym == mm->u.keySym)) { + unsigned use, ignore; if (mm->modifier != new->modifier) { - unsigned use, ignore; - if (clobber) { use = new->modifier; @@ -651,10 +670,9 @@ AddModMapEntry(SymbolsInfo * info, ModMapEntry * new) if ((!new->haveSymbol) && (!mm->haveSymbol) && (new->u.keyName == mm->u.keyName)) { + unsigned use, ignore; if (mm->modifier != new->modifier) { - unsigned use, ignore; - if (clobber) { use = new->modifier; @@ -675,7 +693,7 @@ AddModMapEntry(SymbolsInfo * info, ModMapEntry * new) return True; } } - mm = malloc(sizeof(ModMapEntry)); + mm = uTypedAlloc(ModMapEntry); if (mm == NULL) { WSGO("Could not allocate modifier map entry\n"); @@ -695,7 +713,7 @@ static void MergeIncludedSymbols(SymbolsInfo * into, SymbolsInfo * from, unsigned merge, XkbDescPtr xkb) { - int i; + register int i; KeyInfo *key; if (from->errorCount > 0) @@ -733,7 +751,7 @@ MergeIncludedSymbols(SymbolsInfo * into, SymbolsInfo * from, if (!AddModMapEntry(into, mm)) into->errorCount++; next = (ModMapEntry *) mm->defs.next; - free(mm); + uFree(mm); } from->modMap = NULL; } @@ -780,7 +798,8 @@ HandleIncludeSymbols(IncludeStmt * stmt, (*hndlr) (rtrn, xkb, MergeOverride, &included); if (stmt->stmt != NULL) { - free(included.name); + if (included.name != NULL) + uFree(included.name); included.name = stmt->stmt; stmt->stmt = NULL; } @@ -855,8 +874,8 @@ static LookupEntry groupNames[] = { #define ACTIONS 2 static Bool -GetGroupIndex(KeyInfo *key, const ExprDef *arrayNdx, - unsigned what, unsigned *ndx_rtrn) +GetGroupIndex(KeyInfo * key, + ExprDef * arrayNdx, unsigned what, unsigned *ndx_rtrn) { const char *name; ExprResult tmp; @@ -868,15 +887,16 @@ GetGroupIndex(KeyInfo *key, const ExprDef *arrayNdx, if (arrayNdx == NULL) { + register int i; unsigned defined; if (what == SYMBOLS) defined = key->symsDefined; else defined = key->actsDefined; - for (int i = 0; i < XkbNumKbdGroups; i++) + for (i = 0; i < XkbNumKbdGroups; i++) { - if ((defined & (1U << i)) == 0) + if ((defined & (1 << i)) == 0) { *ndx_rtrn = i; return True; @@ -907,17 +927,19 @@ GetGroupIndex(KeyInfo *key, const ExprDef *arrayNdx, } static Bool -AddSymbolsToKey(KeyInfo *key, XkbDescPtr xkb, const char *field, - const ExprDef *arrayNdx, const ExprDef *value, - SymbolsInfo *info) +AddSymbolsToKey(KeyInfo * key, + XkbDescPtr xkb, + const char *field, + ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info) { unsigned ndx, nSyms; + int i; if (!GetGroupIndex(key, arrayNdx, SYMBOLS, &ndx)) return False; if (value == NULL) { - key->symsDefined |= (1U << ndx); + key->symsDefined |= (1 << ndx); return True; } if (value->op != ExprKeysymList) @@ -943,8 +965,8 @@ AddSymbolsToKey(KeyInfo *key, XkbDescPtr xkb, const char *field, ACTION("Symbols lost\n"); return False; } - key->symsDefined |= (1U << ndx); - for (int i = 0; i < nSyms; i++) { + key->symsDefined |= (1 << ndx); + for (i = 0; i < nSyms; i++) { if (!LookupKeysym(value->value.list.syms[i], &key->syms[ndx][i])) { if (warningLevel > 0) { @@ -954,7 +976,7 @@ AddSymbolsToKey(KeyInfo *key, XkbDescPtr xkb, const char *field, key->syms[ndx][i] = NoSymbol; } } - for (int i = key->numLevels[ndx] - 1; + for (i = key->numLevels[ndx] - 1; (i >= 0) && (key->syms[ndx][i] == NoSymbol); i--) { key->numLevels[ndx]--; @@ -963,10 +985,12 @@ AddSymbolsToKey(KeyInfo *key, XkbDescPtr xkb, const char *field, } static Bool -AddActionsToKey(KeyInfo *key, XkbDescPtr xkb, const char *field, - const ExprDef *arrayNdx, const ExprDef *value, - SymbolsInfo *info) +AddActionsToKey(KeyInfo * key, + XkbDescPtr xkb, + const char *field, + ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info) { + register int i; unsigned ndx, nActs; ExprDef *act; XkbAnyAction *toAct; @@ -976,7 +1000,7 @@ AddActionsToKey(KeyInfo *key, XkbDescPtr xkb, const char *field, if (value == NULL) { - key->actsDefined |= (1U << ndx); + key->actsDefined |= (1 << ndx); return True; } if (value->op != ExprActionList) @@ -1009,11 +1033,11 @@ AddActionsToKey(KeyInfo *key, XkbDescPtr xkb, const char *field, ACTION("Actions lost\n"); return False; } - key->actsDefined |= (1U << ndx); + key->actsDefined |= (1 << ndx); toAct = (XkbAnyAction *) key->acts[ndx]; act = value->value.child; - for (int i = 0; i < nActs; i++, toAct++) + for (i = 0; i < nActs; i++, toAct++) { if (!HandleActionDef(act, xkb, toAct, MergeOverride, info->action)) { @@ -1027,7 +1051,7 @@ AddActionsToKey(KeyInfo *key, XkbDescPtr xkb, const char *field, } static int -SetAllowNone(KeyInfo *key, const ExprDef *arrayNdx, const ExprDef *value) +SetAllowNone(KeyInfo * key, ExprDef * arrayNdx, ExprDef * value) { ExprResult tmp; unsigned radio_groups = 0; @@ -1052,7 +1076,7 @@ SetAllowNone(KeyInfo *key, const ExprDef *arrayNdx, const ExprDef *value) tmp.uval); return False; } - radio_groups |= (1U << (tmp.uval - 1)); + radio_groups |= (1 << (tmp.uval - 1)); } if (!ExprResolveBoolean(value, &tmp, NULL, NULL)) { @@ -1097,9 +1121,10 @@ static LookupEntry rgEntries[] = { }; static Bool -SetSymbolsField(KeyInfo *key, XkbDescPtr xkb, const char *field, - const ExprDef *arrayNdx, const ExprDef *value, - SymbolsInfo *info) +SetSymbolsField(KeyInfo * key, + XkbDescPtr xkb, + const char *field, + ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info) { Bool ok = True; ExprResult tmp; @@ -1137,7 +1162,7 @@ SetSymbolsField(KeyInfo *key, XkbDescPtr xkb, const char *field, else { key->types[ndx.uval - 1] = XkbInternAtom(NULL, tmp.str, False); - key->typesDefined |= (1U << (ndx.uval - 1)); + key->typesDefined |= (1 << (ndx.uval - 1)); } } else if (uStrCaseCmp(field, "symbols") == 0) @@ -1203,7 +1228,7 @@ SetSymbolsField(KeyInfo *key, XkbDescPtr xkb, const char *field, key->behavior.type = XkbKB_RadioGroup | (permanent ? XkbKB_Permanent : 0); key->behavior.data = tmp.uval - 1; - if (key->allowNone & (1U << (tmp.uval - 1))) + if (key->allowNone & (1 << (tmp.uval - 1))) key->behavior.data |= XkbKB_RGAllowNone; key->defs.defined |= _Key_Behavior; } @@ -1345,7 +1370,7 @@ SetSymbolsField(KeyInfo *key, XkbDescPtr xkb, const char *field, } static int -SetGroupName(SymbolsInfo *info, const ExprDef *arrayNdx,const ExprDef *value) +SetGroupName(SymbolsInfo * info, ExprDef * arrayNdx, ExprDef * value) { ExprResult tmp, name; @@ -1468,6 +1493,8 @@ HandleSymbolsBody(VarDef * def, XkbDescPtr xkb, KeyInfo * key, SymbolsInfo * info) { Bool ok = True; + ExprResult tmp, field; + ExprDef *arrayNdx; for (; def != NULL; def = (VarDef *) def->common.next) { @@ -1478,9 +1505,6 @@ HandleSymbolsBody(VarDef * def, } else { - ExprResult tmp, field; - ExprDef *arrayNdx; - if (def->name == NULL) { if ((def->value == NULL) @@ -1512,6 +1536,7 @@ SetExplicitGroup(SymbolsInfo * info, KeyInfo * key) if ((key->typesDefined | key->symsDefined | key->actsDefined) & ~1) { + int i; if (warningLevel > 0) { WARN("For map %s an explicit group is specified\n", info->name); @@ -1519,17 +1544,19 @@ SetExplicitGroup(SymbolsInfo * info, KeyInfo * key) longText(key->name, XkbMessage)); ACTION("All groups except first one will be ignored\n"); } - for (int i = 1; i < XkbNumKbdGroups; i++) + for (i = 1; i < XkbNumKbdGroups; i++) { key->numLevels[i] = 0; - free(key->syms[i]); + if (key->syms[i] != NULL) + uFree(key->syms[i]); key->syms[i] = (KeySym *) NULL; - free(key->acts[i]); + if (key->acts[i] != NULL) + uFree(key->acts[i]); key->acts[i] = (XkbAction *) NULL; key->types[i] = (Atom) 0; } } - key->typesDefined = key->symsDefined = key->actsDefined = 1U << group; + key->typesDefined = key->symsDefined = key->actsDefined = 1 << group; key->numLevels[group] = key->numLevels[0]; key->numLevels[0] = 0; @@ -1576,6 +1603,7 @@ static Bool HandleModMapDef(ModMapDef * def, XkbDescPtr xkb, unsigned merge, SymbolsInfo * info) { + ExprDef *key; ModMapEntry tmp; ExprResult rtrn; Bool ok; @@ -1589,8 +1617,7 @@ HandleModMapDef(ModMapDef * def, } ok = True; tmp.modifier = rtrn.uval; - for (ExprDef *key = def->keys; key != NULL; - key = (ExprDef *) key->common.next) + for (key = def->keys; key != NULL; key = (ExprDef *) key->common.next) { if ((key->op == ExprValue) && (key->type == TypeKeyName)) { @@ -1679,14 +1706,14 @@ HandleSymbolsFile(XkbFile * file, static Bool FindKeyForSymbol(XkbDescPtr xkb, KeySym sym, unsigned int *kc_rtrn) { - int j; - Bool gotOne; + register int i, j; + register Bool gotOne; j = 0; do { gotOne = False; - for (int i = xkb->min_key_code; i <= (int) xkb->max_key_code; i++) + for (i = xkb->min_key_code; i <= (int) xkb->max_key_code; i++) { if (j < (int) XkbKeyNumSyms(xkb, i)) { @@ -1713,11 +1740,13 @@ FindKeyForSymbol(XkbDescPtr xkb, KeySym sym, unsigned int *kc_rtrn) * @return True if found, False otherwise. */ static Bool -FindNamedType(const XkbDescPtr xkb, Atom name, unsigned *type_rtrn) +FindNamedType(XkbDescPtr xkb, Atom name, unsigned *type_rtrn) { + register unsigned n; + if (xkb && xkb->map && xkb->map->types) { - for (unsigned n = 0; n < xkb->map->num_types; n++) + for (n = 0; n < xkb->map->num_types; n++) { if (xkb->map->types[n].name == (Atom) name) { @@ -1761,15 +1790,15 @@ KSIsUpper(KeySym ks) * - TWO_LEVEL for other 2 shift level keys. * and the same for four level keys. * - * @param width Number of syms in syms. + * @param width Number of sysms in syms. * @param syms The keysyms for the given key (must be size width). * @param typeNameRtrn Set to the Atom of the type name. * * @returns True if a type could be found, False otherwise. */ static Bool -FindAutomaticType(int width, const KeySym *syms, - Atom *typeNameRtrn, Bool *autoType) +FindAutomaticType(int width, KeySym * syms, Atom * typeNameRtrn, + Bool * autoType) { *autoType = False; if ((width == 1) || (width == 0)) @@ -1821,14 +1850,14 @@ FindAutomaticType(int width, const KeySym *syms, static void PrepareKeyDef(KeyInfo * key) { - int i, defined, lastGroup; + int i, j, width, defined, lastGroup; Bool identical; defined = key->symsDefined | key->actsDefined | key->typesDefined; /* get highest group number */ for (i = XkbNumKbdGroups - 1; i >= 0; i--) { - if (defined & (1U << i)) + if (defined & (1 << i)) break; } lastGroup = i; @@ -1841,34 +1870,34 @@ PrepareKeyDef(KeyInfo * key) /* We can make a wrong assumption here. But leaving gaps is worse. */ for (i = lastGroup; i > 0; i--) { - int width; - - if (defined & (1U << i)) + if (defined & (1 << i)) continue; width = key->numLevels[0]; if (key->typesDefined & 1) { - for (int j = 0; j < width; j++) + for (j = 0; j < width; j++) { key->types[i] = key->types[0]; } - key->typesDefined |= 1U << i; + key->typesDefined |= 1 << i; } if ((key->actsDefined & 1) && key->acts[0]) { - key->acts[i] = calloc(width, sizeof(XkbAction)); + key->acts[i] = uTypedCalloc(width, XkbAction); if (key->acts[i] == NULL) continue; - memcpy(key->acts[i], key->acts[0], width * sizeof(XkbAction)); - key->actsDefined |= 1U << i; + memcpy((void *) key->acts[i], (void *) key->acts[0], + width * sizeof(XkbAction)); + key->actsDefined |= 1 << i; } if ((key->symsDefined & 1) && key->syms[0]) { - key->syms[i] = calloc(width, sizeof(KeySym)); + key->syms[i] = uTypedCalloc(width, KeySym); if (key->syms[i] == NULL) continue; - memcpy(key->syms[i], key->syms[0], width * sizeof(KeySym)); - key->symsDefined |= 1U << i; + memcpy((void *) key->syms[i], (void *) key->syms[0], + width * sizeof(KeySym)); + key->symsDefined |= 1 << i; } if (defined & 1) { @@ -1908,9 +1937,11 @@ PrepareKeyDef(KeyInfo * key) for (i = lastGroup; i > 0; i--) { key->numLevels[i] = 0; - free(key->syms[i]); + if (key->syms[i] != NULL) + uFree(key->syms[i]); key->syms[i] = (KeySym *) NULL; - free(key->acts[i]); + if (key->acts[i] != NULL) + uFree(key->acts[i]); key->acts[i] = (XkbAction *) NULL; key->types[i] = (Atom) 0; } @@ -1929,8 +1960,8 @@ PrepareKeyDef(KeyInfo * key) static Bool CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, int start_from) { - int i; - unsigned kc, width, nGroups; + register int i; + unsigned okc, kc, width, tmp, nGroups; XkbKeyTypePtr type; Bool haveActions, autoType, useAlias; KeySym *outSyms; @@ -1959,8 +1990,8 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, int start_from) for (i = width = nGroups = 0; i < XkbNumKbdGroups; i++) { if (((i + 1) > nGroups) - && (((key->symsDefined | key->actsDefined) & (1U << i)) - || (key->typesDefined) & (1U << i))) + && (((key->symsDefined | key->actsDefined) & (1 << i)) + || (key->typesDefined) & (1 << i))) nGroups = i + 1; if (key->acts[i]) haveActions = True; @@ -1990,7 +2021,7 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, int start_from) if (FindNamedType(xkb, key->types[i], &types[i])) { if (!autoType || key->numLevels[i] > 2) - xkb->server->explicit[kc] |= (1U << i); + xkb->server->explicit[kc] |= (1 << i); } else { @@ -2069,7 +2100,7 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, int start_from) if (key->syms[i] != NULL) { /* fill key to "width" symbols*/ - for (unsigned tmp = 0; tmp < width; tmp++) + for (tmp = 0; tmp < width; tmp++) { if (tmp < key->numLevels[i]) outSyms[tmp] = key->syms[i][tmp]; @@ -2094,8 +2125,6 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, int start_from) break; case XkbKB_Overlay1: case XkbKB_Overlay2: - { - unsigned okc; /* find key by name! */ if (!FindNamedKey(xkb, key->nameForOverlayKey, &okc, True, CreateKeyNames(xkb), 0)) @@ -2111,7 +2140,6 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, int start_from) break; } key->behavior.data = okc; - } default: xkb->server->behaviors[kc] = key->behavior; xkb->server->explicit[kc] |= XkbExplicitBehaviorMask; @@ -2125,9 +2153,9 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, int start_from) if (key->repeat != RepeatUndefined) { if (key->repeat == RepeatYes) - xkb->ctrls->per_key_repeat[kc / 8] |= (1U << (kc % 8)); + xkb->ctrls->per_key_repeat[kc / 8] |= (1 << (kc % 8)); else - xkb->ctrls->per_key_repeat[kc / 8] &= ~(1U << (kc % 8)); + xkb->ctrls->per_key_repeat[kc / 8] &= ~(1 << (kc % 8)); xkb->server->explicit[kc] |= XkbExplicitAutoRepeatMask; } @@ -2171,7 +2199,7 @@ CopyModMapDef(XkbFileInfo * result, ModMapEntry * entry) } return False; } - xkb->map->modmap[kc] |= (1U << entry->modifier); + xkb->map->modmap[kc] |= (1 << entry->modifier); return True; } @@ -2185,6 +2213,7 @@ CopyModMapDef(XkbFileInfo * result, ModMapEntry * entry) Bool CompileSymbols(XkbFile * file, XkbFileInfo * result, unsigned merge) { + register int i; SymbolsInfo info; XkbDescPtr xkb; @@ -2198,7 +2227,6 @@ CompileSymbols(XkbFile * file, XkbFileInfo * result, unsigned merge) return True; if (info.errorCount == 0) { - int i; KeyInfo *key; /* alloc memory in the xkb struct */ diff --git a/app/xkbcomp/utils.c b/app/xkbcomp/utils.c index deb96ea99..cba6fec17 100644 --- a/app/xkbcomp/utils.c +++ b/app/xkbcomp/utils.c @@ -30,41 +30,73 @@ #include <stdlib.h> #include <stdarg.h> +/***====================================================================***/ + +Opaque +uAlloc(unsigned size) +{ + return ((Opaque) malloc(size)); +} + +/***====================================================================***/ + +Opaque +uCalloc(unsigned n, unsigned size) +{ + return ((Opaque) calloc(n, size)); +} /***====================================================================***/ -#ifndef HAVE_RECALLOCARRAY -void * -uRecalloc(void *old, size_t nOld, size_t nNew, size_t itemSize) +Opaque +uRealloc(Opaque old, unsigned newSize) +{ + if (old == NULL) + return ((Opaque) malloc(newSize)); + else + return ((Opaque) realloc((char *) old, newSize)); +} + +/***====================================================================***/ + +Opaque +uRecalloc(Opaque old, unsigned nOld, unsigned nNew, unsigned itemSize) { char *rtrn; if (old == NULL) - rtrn = calloc(nNew, itemSize); + rtrn = (char *) calloc(nNew, itemSize); else { - rtrn = reallocarray(old, nNew, itemSize); + rtrn = (char *) realloc((char *) old, nNew * itemSize); if ((rtrn) && (nNew > nOld)) { bzero(&rtrn[nOld * itemSize], (nNew - nOld) * itemSize); } } - return (void *) rtrn; + return (Opaque) rtrn; } -#endif +/***====================================================================***/ + +void +uFree(Opaque ptr) +{ + if (ptr != (Opaque) NULL) + free((char *) ptr); + return; +} /***====================================================================***/ -/*** DEBUG FUNCTIONS ***/ +/*** PRINT FUNCTIONS ***/ /***====================================================================***/ -#ifdef DEBUG -static FILE *uDebugFile = NULL; +FILE *uDebugFile = NULL; int uDebugIndentLevel = 0; -static const int uDebugIndentSize = 4; +int uDebugIndentSize = 4; Boolean -uSetDebugFile(const char *name) +uSetDebugFile(char *name) { if ((uDebugFile != NULL) && (uDebugFile != stderr)) { @@ -84,11 +116,12 @@ uSetDebugFile(const char *name) } void -uDebug(const char *s, ...) +uDebug(char *s, ...) { + int i; va_list args; - for (int i = (uDebugIndentLevel * uDebugIndentSize); i > 0; i--) + for (i = (uDebugIndentLevel * uDebugIndentSize); i > 0; i--) { putc(' ', uDebugFile); } @@ -97,18 +130,28 @@ uDebug(const char *s, ...) va_end(args); fflush(uDebugFile); } -#endif + +void +uDebugNOI(char *s, ...) +{ + va_list args; + + va_start(args, s); + vfprintf(uDebugFile, s, args); + va_end(args); + fflush(uDebugFile); +} /***====================================================================***/ static FILE *errorFile = NULL; static int outCount = 0; -static const char *preMsg = NULL; -static const char *postMsg = NULL; -static const char *prefix = NULL; +static char *preMsg = NULL; +static char *postMsg = NULL; +static char *prefix = NULL; Boolean -uSetErrorFile(const char *name) +uSetErrorFile(char *name) { if ((errorFile != NULL) && (errorFile != stderr)) { @@ -234,7 +277,7 @@ uInternalError(const char *s, ...) } void -uSetPreErrorMessage(const char *msg) +uSetPreErrorMessage(char *msg) { outCount = 0; preMsg = msg; @@ -242,14 +285,14 @@ uSetPreErrorMessage(const char *msg) } void -uSetPostErrorMessage(const char *msg) +uSetPostErrorMessage(char *msg) { postMsg = msg; return; } void -uSetErrorPrefix(const char *pre) +uSetErrorPrefix(char *pre) { prefix = pre; return; @@ -273,7 +316,7 @@ uStringDup(const char *str) if (str == NULL) return NULL; - rtrn = malloc(strlen(str) + 1); + rtrn = (char *) uAlloc(strlen(str) + 1); strcpy(rtrn, str); return rtrn; } @@ -285,7 +328,7 @@ uStrCaseCmp(const char *str1, const char *str2) { char buf1[512], buf2[512]; char c, *s; - int n; + register int n; for (n = 0, s = buf1; (c = *str1++); n++) { @@ -309,7 +352,7 @@ uStrCaseCmp(const char *str1, const char *str2) } int -uStrCasePrefix(const char *my_prefix, const char *str) +uStrCasePrefix(const char *my_prefix, char *str) { char c1; char c2; diff --git a/app/xkbcomp/utils.h b/app/xkbcomp/utils.h index 2bf767447..728d7b4e1 100644 --- a/app/xkbcomp/utils.h +++ b/app/xkbcomp/utils.h @@ -29,17 +29,15 @@ /***====================================================================***/ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <stdio.h> -#include <stdlib.h> #include <X11/Xos.h> #include <X11/Xfuncproto.h> #include <X11/Xfuncs.h> #include <stddef.h> +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #ifndef NUL #define NUL '\0' @@ -47,6 +45,13 @@ /***====================================================================***/ +#ifndef OPAQUE_DEFINED +typedef void *Opaque; +#endif +#ifndef NullOpaque +#define NullOpaque ((Opaque)NULL) +#endif + #ifndef BOOLEAN_DEFINED typedef char Boolean; #endif @@ -69,23 +74,37 @@ typedef int Comparison; /***====================================================================***/ -#ifndef HAVE_REALLOCARRAY -#define reallocarray(p, n, s) realloc(p, (n) * (s)) -#endif - -#ifndef HAVE_RECALLOCARRAY -#define recallocarray uRecalloc - -extern void *uRecalloc(void * /* old */ , - size_t /* nOld */ , - size_t /* nNew */ , - size_t /* newSize */ +extern Opaque uAlloc(unsigned /* size */ + ); +extern Opaque uCalloc(unsigned /* n */ , + unsigned /* size */ + ); +extern Opaque uRealloc(Opaque /* old */ , + unsigned /* newSize */ ); +extern Opaque uRecalloc(Opaque /* old */ , + unsigned /* nOld */ , + unsigned /* nNew */ , + unsigned /* newSize */ + ); +extern void uFree(Opaque /* ptr */ + ); + +#define uTypedAlloc(t) ((t *)uAlloc((unsigned)sizeof(t))) +#define uTypedCalloc(n,t) ((t *)uCalloc((unsigned)n,(unsigned)sizeof(t))) +#define uTypedRealloc(pO,n,t) ((t *)uRealloc((Opaque)pO,((unsigned)n)*sizeof(t))) +#define uTypedRecalloc(pO,o,n,t) ((t *)uRecalloc((Opaque)pO,((unsigned)o),((unsigned)n),sizeof(t))) +#if (defined mdHasAlloca) && (mdHasAlloca) +#define uTmpAlloc(n) ((Opaque)alloca((unsigned)n)) +#define uTmpFree(p) +#else +#define uTmpAlloc(n) uAlloc(n) +#define uTmpFree(p) uFree(p) #endif /***====================================================================***/ -extern Boolean uSetErrorFile(const char * /* name */ +extern Boolean uSetErrorFile(char * /* name */ ); #define INFO uInformation @@ -120,13 +139,13 @@ uInformation(const char * /* s */ , ... extern void uInternalError(const char * /* s */ , ... ) _X_ATTRIBUTE_PRINTF(1, 2); - extern void uSetPreErrorMessage(const char * /* msg */ + extern void uSetPreErrorMessage(char * /* msg */ ); - extern void uSetPostErrorMessage(const char * /* msg */ + extern void uSetPostErrorMessage(char * /* msg */ ); - extern void uSetErrorPrefix(const char * /* void */ + extern void uSetErrorPrefix(char * /* void */ ); extern void uFinishUp(void); @@ -164,28 +183,40 @@ uInformation(const char * /* s */ , ... /***====================================================================***/ -#ifdef DEBUG #ifndef DEBUG_VAR #define DEBUG_VAR debugFlags #endif -extern unsigned int DEBUG_VAR; +extern + unsigned int DEBUG_VAR; -extern void uDebug(const char *, ...) _X_ATTRIBUTE_PRINTF(1, 2); + extern void uDebug(char * /* s */ , ... + ) _X_ATTRIBUTE_PRINTF(1, 2); -extern Boolean uSetDebugFile(const char *name); + extern void uDebugNOI( /* no indent */ + char * /* s */ , ... + ) _X_ATTRIBUTE_PRINTF(1, 2); -extern int uDebugIndentLevel; + extern Boolean uSetDebugFile(char *name); + extern FILE *uDebugFile; + extern int uDebugIndentLevel; + extern int uDebugIndentSize; #define uDebugIndent(l) (uDebugIndentLevel+=(l)) #define uDebugOutdent(l) (uDebugIndentLevel-=(l)) - +#ifdef DEBUG #define uDEBUG(f,s) { if (DEBUG_VAR&(f)) uDebug(s);} #define uDEBUG1(f,s,a) { if (DEBUG_VAR&(f)) uDebug(s,a);} #define uDEBUG2(f,s,a,b) { if (DEBUG_VAR&(f)) uDebug(s,a,b);} #define uDEBUG3(f,s,a,b,c) { if (DEBUG_VAR&(f)) uDebug(s,a,b,c);} #define uDEBUG4(f,s,a,b,c,d) { if (DEBUG_VAR&(f)) uDebug(s,a,b,c,d);} #define uDEBUG5(f,s,a,b,c,d,e) { if (DEBUG_VAR&(f)) uDebug(s,a,b,c,d,e);} +#define uDEBUG_NOI(f,s) { if (DEBUG_VAR&(f)) uDebug(s);} +#define uDEBUG_NOI1(f,s,a) { if (DEBUG_VAR&(f)) uDebugNOI(s,a);} +#define uDEBUG_NOI2(f,s,a,b) { if (DEBUG_VAR&(f)) uDebugNOI(s,a,b);} +#define uDEBUG_NOI3(f,s,a,b,c) { if (DEBUG_VAR&(f)) uDebugNOI(s,a,b,c);} +#define uDEBUG_NOI4(f,s,a,b,c,d) { if (DEBUG_VAR&(f)) uDebugNOI(s,a,b,c,d);} +#define uDEBUG_NOI5(f,s,a,b,c,d,e) { if (DEBUG_VAR&(f)) uDebugNOI(s,a,b,c,d,e);} #else #define uDEBUG(f,s) #define uDEBUG1(f,s,a) @@ -193,6 +224,12 @@ extern int uDebugIndentLevel; #define uDEBUG3(f,s,a,b,c) #define uDEBUG4(f,s,a,b,c,d) #define uDEBUG5(f,s,a,b,c,d,e) +#define uDEBUG_NOI(f,s) +#define uDEBUG_NOI1(f,s,a) +#define uDEBUG_NOI2(f,s,a,b) +#define uDEBUG_NOI3(f,s,a,b,c) +#define uDEBUG_NOI4(f,s,a,b,c,d) +#define uDEBUG_NOI5(f,s,a,b,c,d,e) #endif #endif /* UTILS_H */ diff --git a/app/xkbcomp/vmod.c b/app/xkbcomp/vmod.c index 279b549a8..847838606 100644 --- a/app/xkbcomp/vmod.c +++ b/app/xkbcomp/vmod.c @@ -47,6 +47,8 @@ InitVModInfo(VModInfo * info, XkbDescPtr xkb) void ClearVModInfo(VModInfo * info, XkbDescPtr xkb) { + register int i; + if (XkbAllocNames(xkb, XkbVirtualModNamesMask, 0, 0) != Success) return; if (XkbAllocServerMap(xkb, XkbVirtualModsMask, 0) != Success) @@ -55,8 +57,7 @@ ClearVModInfo(VModInfo * info, XkbDescPtr xkb) info->newlyDefined = info->defined = info->available = 0; if (xkb && xkb->names) { - int i, bit; - + register int bit; for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1) { if (xkb->names->vmods[i] != None) @@ -77,9 +78,9 @@ ClearVModInfo(VModInfo * info, XkbDescPtr xkb) * @param mergeMode Merge strategy (e.g. MergeOverride) */ Bool -HandleVModDef(const VModDef *stmt, unsigned mergeMode, VModInfo *info) +HandleVModDef(VModDef * stmt, unsigned mergeMode, VModInfo * info) { - int i, bit, nextFree; + register int i, bit, nextFree; ExprResult mod; XkbServerMapPtr srv; XkbNamesPtr names; @@ -137,9 +138,9 @@ HandleVModDef(const VModDef *stmt, unsigned mergeMode, VModInfo *info) ACTION("Exiting\n"); return False; } - info->defined |= (1U << nextFree); - info->newlyDefined |= (1U << nextFree); - info->available |= (1U << nextFree); + info->defined |= (1 << nextFree); + info->newlyDefined |= (1 << nextFree); + info->available |= (1 << nextFree); names->vmods[nextFree] = stmtName; if (stmt->value == NULL) return True; @@ -165,12 +166,13 @@ HandleVModDef(const VModDef *stmt, unsigned mergeMode, VModInfo *info) * @return True on success, False otherwise. If False is returned, val_rtrn is * undefined. */ -static int +int LookupVModIndex(XPointer priv, Atom elem, Atom field, unsigned type, ExprResult * val_rtrn) { - int i; - char *fieldStr; + register int i; + register char *fieldStr; + register char *modStr; XkbDescPtr xkb; xkb = (XkbDescPtr) priv; @@ -190,7 +192,7 @@ LookupVModIndex(XPointer priv, */ for (i = 0; i < XkbNumVirtualMods; i++) { - char *modStr = XkbAtomGetString(xkb->dpy, xkb->names->vmods[i]); + modStr = XkbAtomGetString(xkb->dpy, xkb->names->vmods[i]); if ((modStr != NULL) && (uStrCaseCmp(fieldStr, modStr) == 0)) { val_rtrn->uval = i; @@ -216,8 +218,8 @@ LookupVModMask(XPointer priv, { if (LookupVModIndex(priv, elem, field, type, val_rtrn)) { - unsigned ndx = val_rtrn->uval; - val_rtrn->uval = (1U << (XkbNumModifiers + ndx)); + register unsigned ndx = val_rtrn->uval; + val_rtrn->uval = (1 << (XkbNumModifiers + ndx)); return True; } return False; @@ -226,28 +228,26 @@ LookupVModMask(XPointer priv, int FindKeypadVMod(XkbDescPtr xkb) { - if (xkb) { - Atom name = XkbInternAtom(xkb->dpy, "NumLock", False); - ExprResult rtrn; + Atom name; + ExprResult rtrn; - if (LookupVModIndex((XPointer) xkb, None, name, TypeInt, &rtrn)) - { - return rtrn.ival; - } + name = XkbInternAtom(xkb->dpy, "NumLock", False); + if ((xkb) && LookupVModIndex((XPointer) xkb, None, name, TypeInt, &rtrn)) + { + return rtrn.ival; } return -1; } Bool -ResolveVirtualModifier(const ExprDef *def, ExprResult *val_rtrn, - const VModInfo *info) +ResolveVirtualModifier(ExprDef * def, ExprResult * val_rtrn, VModInfo * info) { XkbNamesPtr names; names = info->xkb->names; if (def->op == ExprIdent) { - int i, bit; + register int i, bit; for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1) { char *str1, *str2; diff --git a/app/xkbcomp/vmod.h b/app/xkbcomp/vmod.h index 6e0203674..75f9fb4b5 100644 --- a/app/xkbcomp/vmod.h +++ b/app/xkbcomp/vmod.h @@ -44,7 +44,7 @@ extern void ClearVModInfo(VModInfo * /* info */ , XkbDescPtr /* xkb */ ); -extern Bool HandleVModDef(const VModDef * /* stmt */ , +extern Bool HandleVModDef(VModDef * /* stmt */ , unsigned /* mergeMode */ , VModInfo * /* info */ ); @@ -53,6 +53,13 @@ extern Bool ApplyVModDefs(VModInfo * /* info */ , XkbDescPtr /* xkb */ ); +extern int LookupVModIndex(XPointer /* priv */ , + Atom /* elem */ , + Atom /* field */ , + unsigned /* type */ , + ExprResult * /* val_rtrn */ + ); + extern int LookupVModMask(XPointer /* priv */ , Atom /* elem */ , Atom /* field */ , @@ -63,9 +70,9 @@ extern int LookupVModMask(XPointer /* priv */ , extern int FindKeypadVMod(XkbDescPtr /* xkb */ ); -extern Bool ResolveVirtualModifier(const ExprDef * /* def */ , +extern Bool ResolveVirtualModifier(ExprDef * /* def */ , ExprResult * /* value_rtrn */ , - const VModInfo * /* info */ + VModInfo * /* info */ ); #endif /* VMOD_H */ diff --git a/app/xkbcomp/xkbcomp.c b/app/xkbcomp/xkbcomp.c index 6aedb67a1..796fa22a5 100644 --- a/app/xkbcomp/xkbcomp.c +++ b/app/xkbcomp/xkbcomp.c @@ -24,7 +24,6 @@ ********************************************************/ -#include "utils.h" #include <stdio.h> #include <ctype.h> #include <X11/keysym.h> @@ -35,6 +34,10 @@ #include <unistd.h> /* end BR */ +#if defined(sgi) +#include <malloc.h> +#endif + #define DEBUG_VAR debugFlags #include "xkbcomp.h" #include <stdlib.h> @@ -67,9 +70,7 @@ #define INPUT_XKB 1 #define INPUT_XKM 2 -#ifdef DEBUG unsigned int debugFlags; -#endif static const char *fileTypeExt[] = { "XXX", @@ -80,12 +81,12 @@ static const char *fileTypeExt[] = { }; static unsigned inputFormat, outputFormat; -static const char *rootDir; +char *rootDir; static char *inputFile; -static const char *inputMap; +static char *inputMap; static char *outputFile; -static const char *inDpyName; -static const char *outDpyName; +static char *inDpyName; +static char *outDpyName; static Display *inDpy; static Display *outDpy; static Bool showImplicit = False; @@ -95,10 +96,10 @@ static Bool xkblist = False; unsigned warningLevel = 5; unsigned verboseLevel = 0; unsigned dirsToStrip = 0; -static unsigned optionalParts = 0; -static const char *preErrorMsg = NULL; -static const char *postErrorMsg = NULL; -static const char *errorPrefix = NULL; +unsigned optionalParts = 0; +static char *preErrorMsg = NULL; +static char *postErrorMsg = NULL; +static char *errorPrefix = NULL; static unsigned int device_id = XkbUseCoreKbd; /***====================================================================***/ @@ -177,7 +178,7 @@ Usage(int argc, char *argv[]) /***====================================================================***/ static void -setVerboseFlags(const char *str) +setVerboseFlags(char *str) { for (; *str; str++) { @@ -213,7 +214,7 @@ setVerboseFlags(const char *str) static Bool parseArgs(int argc, char *argv[]) { - int i, tmp; + register int i, tmp; i = strlen(argv[0]); tmp = strlen("xkblist"); @@ -464,7 +465,8 @@ parseArgs(int argc, char *argv[]) } else { - for (const char *tmp2 = argv[i]; (*tmp2 != '\0'); tmp2++) + char *tmp2; + for (tmp2 = argv[i]; (*tmp2 != '\0'); tmp2++) { switch (*tmp2) { @@ -565,7 +567,7 @@ parseArgs(int argc, char *argv[]) } else if (strncmp(argv[i], "-v", 2) == 0) { - const char *str; + char *str; if (argv[i][2] != '\0') str = &argv[i][2]; else if ((i < (argc - 1)) && (argv[i + 1][0] != '-')) @@ -758,25 +760,20 @@ parseArgs(int argc, char *argv[]) } else if ((!outputFile) && (inputFile) && (strcmp(inputFile, "-") == 0)) { -#ifdef HAVE_ASPRINTF - if (asprintf(&outputFile, "stdin.%s", fileTypeExt[outputFormat]) < 0) -#else - size_t len = strlen("stdin") + strlen(fileTypeExt[outputFormat]) + 2; - outputFile = calloc(len, sizeof(char)); - if (outputFile != NULL) - snprintf(outputFile, len, "stdin.%s", fileTypeExt[outputFormat]); - else -#endif + int len = strlen("stdin") + strlen(fileTypeExt[outputFormat]) + 2; + outputFile = uTypedCalloc(len, char); + if (outputFile == NULL) { WSGO("Cannot allocate space for output file name\n"); ACTION("Exiting\n"); exit(1); } + snprintf(outputFile, len, "stdin.%s", fileTypeExt[outputFormat]); } else if ((outputFile == NULL) && (inputFile != NULL)) { int len; - const char *base, *ext; + char *base, *ext; if (inputMap == NULL) { @@ -790,7 +787,7 @@ parseArgs(int argc, char *argv[]) base = inputMap; len = strlen(base) + strlen(fileTypeExt[outputFormat]) + 2; - outputFile = calloc(len, sizeof(char)); + outputFile = uTypedCalloc(len, char); if (outputFile == NULL) { WSGO("Cannot allocate space for output file name\n"); @@ -809,15 +806,14 @@ parseArgs(int argc, char *argv[]) else if (outputFile == NULL) { int len; - char *ch, buf[128]; - const char *name = buf; + char *ch, *name, buf[128]; if (inDpyName[0] == ':') - snprintf(buf, sizeof(buf), "server%s", inDpyName); + snprintf(name = buf, sizeof(buf), "server%s", inDpyName); else name = inDpyName; len = strlen(name) + strlen(fileTypeExt[outputFormat]) + 2; - outputFile = calloc(len, sizeof(char)); + outputFile = uTypedCalloc(len, char); if (outputFile == NULL) { WSGO("Cannot allocate space for output file name\n"); @@ -852,7 +848,7 @@ parseArgs(int argc, char *argv[]) } static Display * -GetDisplay(const char *program, const char *dpyName) +GetDisplay(char *program, char *dpyName) { int mjr, mnr, error; Display *dpy; @@ -908,9 +904,7 @@ main(int argc, char *argv[]) Status status; scan_set_file(stdin); -#ifdef DEBUG uSetDebugFile(NullString); -#endif uSetErrorFile(NullString); XkbInitIncludePath(); @@ -1028,7 +1022,7 @@ main(int argc, char *argv[]) } } } - bzero(&result, sizeof(result)); + bzero((char *) &result, sizeof(result)); result.type = mapToUse->type; if ((result.xkb = XkbAllocKeyboard()) == NULL) { @@ -1072,7 +1066,7 @@ main(int argc, char *argv[]) else if (inputFormat == INPUT_XKM) /* parse xkm file */ { unsigned tmp; - bzero(&result, sizeof(result)); + bzero((char *) &result, sizeof(result)); if ((result.xkb = XkbAllocKeyboard()) == NULL) { WSGO("Cannot allocate keyboard description\n"); @@ -1094,7 +1088,7 @@ main(int argc, char *argv[]) } else if (inDpy != NULL) { - bzero(&result, sizeof(result)); + bzero((char *) &result, sizeof(result)); result.type = XkmKeymapFile; result.xkb = XkbGetMap(inDpy, XkbAllMapComponentsMask, device_id); if (result.xkb == NULL) diff --git a/app/xkbcomp/xkbcomp.h b/app/xkbcomp/xkbcomp.h index d57a7f660..67b88b3ab 100644 --- a/app/xkbcomp/xkbcomp.h +++ b/app/xkbcomp/xkbcomp.h @@ -31,10 +31,6 @@ #define DEBUG_VAR debugFlags #endif -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <X11/Xlib.h> #include <X11/XKBlib.h> @@ -114,6 +110,7 @@ typedef struct _ParseCommon #define CreateKeyNames(x) ((x)->flags&AutoKeyNames) extern unsigned warningLevel; +extern unsigned optionalParts; typedef struct _IncludeStmt { @@ -171,7 +168,7 @@ typedef struct _Expr unsigned uval; int ival; char keyName[5]; - void *ptr; + Opaque ptr; } value; } ExprDef; @@ -363,7 +360,7 @@ extern Bool CompileKeyTypes(XkbFile * /* file */ , typedef struct _LEDInfo *LEDInfoPtr; -extern Bool CompileCompatMap(const XkbFile * /* file */ , +extern Bool CompileCompatMap(XkbFile * /* file */ , XkbFileInfo * /* result */ , unsigned /* merge */ , LEDInfoPtr * /* unboundLEDs */ @@ -380,16 +377,21 @@ extern Bool CompileSymbols(XkbFile * /* file */ , #define WantFullNames (1<<3) #define ListRecursive (1<<4) +extern char *rootDir; extern unsigned verboseLevel; extern unsigned dirsToStrip; +extern Bool AddListing(char * /* file */ , + char * /* map */ + ); + extern Bool AddMatchingFiles(char * /* head_in */ ); extern int AddMapOnly(char * /* map */ ); -extern int GenerateListing(const char * /* filename */ +extern int GenerateListing(char * /* filename */ ); #endif /* XKBCOMP_H */ diff --git a/app/xkbcomp/xkbparse.y b/app/xkbcomp/xkbparse.y index 5253e4834..88df242ef 100644 --- a/app/xkbcomp/xkbparse.y +++ b/app/xkbcomp/xkbparse.y @@ -91,14 +91,15 @@ %{ #ifdef DEBUG #define YYDEBUG 1 -#define DEBUG_VAR parseDebug -unsigned int parseDebug; #endif +#define DEBUG_VAR parseDebug #include "parseutils.h" #include <X11/keysym.h> #include <X11/extensions/XKBgeom.h> #include <stdlib.h> +unsigned int parseDebug; + %} %right EQUALS %left PLUS MINUS diff --git a/app/xkbcomp/xkbpath.c b/app/xkbcomp/xkbpath.c index 6d9d13ac4..8a5e555a5 100644 --- a/app/xkbcomp/xkbpath.c +++ b/app/xkbcomp/xkbpath.c @@ -123,7 +123,7 @@ XkbParseIncludeMap(char **str_inout, char **file_rtrn, char **map_rtrn, } else if (str[0] == '(') { - free(*extra_data); + uFree(*extra_data); return False; } else @@ -134,8 +134,8 @@ XkbParseIncludeMap(char **str_inout, char **file_rtrn, char **map_rtrn, tmp = strchr(str, ')'); if ((tmp == NULL) || (tmp[1] != '\0')) { - free(*file_rtrn); - free(*extra_data); + uFree(*file_rtrn); + uFree(*extra_data); return False; } *tmp++ = '\0'; @@ -175,15 +175,20 @@ XkbAddDefaultDirectoriesToPath(void) /** * Remove all entries from the global includePath. */ -static void +void XkbClearIncludePath(void) { + register int i; + if (szPath > 0) { - for (int i = 0; i < nPathEntries; i++) + for (i = 0; i < nPathEntries; i++) { - free(includePath[i]); - includePath[i] = NULL; + if (includePath[i] != NULL) + { + uFree(includePath[i]); + includePath[i] = NULL; + } } nPathEntries = 0; } @@ -213,24 +218,22 @@ XkbAddDirectoryToPath(const char *dir) } if (nPathEntries >= szPath) { - char **new; szPath += PATH_CHUNK; - new = (char **) realloc(includePath, szPath * sizeof(char *)); - if (new == NULL) + includePath = (char **) realloc(includePath, szPath * sizeof(char *)); + if (includePath == NULL) { WSGO("Allocation failed (includePath)\n"); return False; } - else - includePath = new; } - includePath[nPathEntries] = strdup(dir); + includePath[nPathEntries] = + (char *) calloc(strlen(dir) + 1, sizeof(char)); if (includePath[nPathEntries] == NULL) { WSGO("Allocation failed (includePath[%d])\n", nPathEntries); return False; } - nPathEntries++; + strcpy(includePath[nPathEntries++], dir); return True; } @@ -283,7 +286,7 @@ XkbDirectoryForInclude(unsigned type) typedef struct _FileCacheEntry { - const char *name; + char *name; unsigned type; char *path; void *data; @@ -305,7 +308,7 @@ static FileCacheEntry *fileCache; * @return The data from the overwritten file or NULL. */ void * -XkbAddFileToCache(const char *name, unsigned type, char *path, void *data) +XkbAddFileToCache(char *name, unsigned type, char *path, void *data) { FileCacheEntry *entry; @@ -320,16 +323,14 @@ XkbAddFileToCache(const char *name, unsigned type, char *path, void *data) return old; } } - entry = malloc(sizeof(FileCacheEntry)); + entry = uTypedAlloc(FileCacheEntry); if (entry != NULL) { - *entry = (FileCacheEntry) { - .name = name, - .type = type, - .path = path, - .data = data, - .next = fileCache - }; + entry->name = name; + entry->type = type; + entry->path = path; + entry->data = data; + entry->next = fileCache; fileCache = entry; } return NULL; @@ -345,7 +346,7 @@ XkbAddFileToCache(const char *name, unsigned type, char *path, void *data) * @return the data from the cache entry or NULL if no matching entry was found. */ void * -XkbFindFileInCache(const char *name, unsigned type, char **pathRtrn) +XkbFindFileInCache(char *name, unsigned type, char **pathRtrn) { FileCacheEntry *entry; @@ -373,19 +374,19 @@ XkbFindFileInCache(const char *name, unsigned type, char **pathRtrn) * pathRtrn is undefined. */ FILE * -XkbFindFileInPath(const char *name, unsigned type, char **pathRtrn) +XkbFindFileInPath(char *name, unsigned type, char **pathRtrn) { + register int i; FILE *file = NULL; - int nameLen, typeLen; - char buf[PATH_MAX]; - const char *typeDir; + int nameLen, typeLen, pathLen; + char buf[PATH_MAX], *typeDir; typeDir = XkbDirectoryForInclude(type); nameLen = strlen(name); typeLen = strlen(typeDir); - for (int i = 0; i < nPathEntries; i++) + for (i = 0; i < nPathEntries; i++) { - int pathLen = strlen(includePath[i]); + pathLen = strlen(includePath[i]); if (typeLen < 1) continue; @@ -404,7 +405,9 @@ XkbFindFileInPath(const char *name, unsigned type, char **pathRtrn) if ((file != NULL) && (pathRtrn != NULL)) { - *pathRtrn = strdup(buf); + *pathRtrn = (char *) calloc(strlen(buf) + 1, sizeof(char)); + if (*pathRtrn != NULL) + strcpy(*pathRtrn, buf); } return file; } diff --git a/app/xkbcomp/xkbpath.h b/app/xkbcomp/xkbpath.h index fa6ec1f06..66c3ab76b 100644 --- a/app/xkbcomp/xkbpath.h +++ b/app/xkbcomp/xkbpath.h @@ -29,6 +29,8 @@ extern Bool XkbInitIncludePath(void); +extern void XkbClearIncludePath(void); + extern void XkbAddDefaultDirectoriesToPath(void); extern Bool XkbAddDirectoryToPath(const char * /* dir */ @@ -37,18 +39,18 @@ extern Bool XkbAddDirectoryToPath(const char * /* dir */ extern char *XkbDirectoryForInclude(unsigned /* type */ ); -extern FILE *XkbFindFileInPath(const char * /* name */ , +extern FILE *XkbFindFileInPath(char * /* name */ , unsigned /* type */ , char ** /* pathRtrn */ ); -extern void *XkbAddFileToCache(const char * /* name */ , +extern void *XkbAddFileToCache(char * /* name */ , unsigned /* type */ , char * /* path */ , void * /* data */ ); -extern void *XkbFindFileInCache(const char * /* name */ , +extern void *XkbFindFileInCache(char * /* name */ , unsigned /* type */ , char ** /* pathRtrn */ ); diff --git a/app/xkbcomp/xkbscan.c b/app/xkbcomp/xkbscan.c index 1207aff32..9780159e5 100644 --- a/app/xkbcomp/xkbscan.c +++ b/app/xkbcomp/xkbscan.c @@ -36,9 +36,7 @@ #include "utils.h" #include "parseutils.h" -#ifdef DEBUG unsigned int scanDebug; -#endif static FILE *yyin; @@ -578,7 +576,7 @@ static int numKeywords = sizeof(keywords) / sizeof(struct _Keyword); static int yyGetIdent(int first) { - int ch, j, found; + int ch, i, j, found; int rtrn = IDENT; scanBuf[0] = first; @@ -591,7 +589,7 @@ yyGetIdent(int first) scanBuf[j++] = '\0'; found = 0; - for (int i = 0; (!found) && (i < numKeywords); i++) + for (i = 0; (!found) && (i < numKeywords); i++) { if (uStrCaseCmp(scanBuf, keywords[i].keyword) == 0) { |