commit e46c7656cdaa0c5748ce7243c4c1d975839f8650 from: matthieu date: Sun Apr 28 14:14:08 2024 UTC Update to xkbcomp 1.4.7 commit - 4220610d43dde16d7f4c49cf49113683f0eafec8 commit + e46c7656cdaa0c5748ce7243c4c1d975839f8650 blob - a5d629c7bb63be9b973c648dd13bbd6104e75efa blob + c4d8751c78a186e333f8fadd2ee448749a48396a --- app/xkbcomp/ChangeLog +++ app/xkbcomp/ChangeLog @@ -1,3 +1,396 @@ +commit e26102f28f08e5432b1ad44bbaef7f32aff199f6 +Author: Alan Coopersmith +Date: Sat Feb 3 14:23:58 2024 -0800 + + xkbcomp 1.4.7 + + Signed-off-by: Alan Coopersmith + +commit ff32f542c94f1b30ba2ba58193adb3774a5c50e6 +Author: Alan Coopersmith +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 + +commit 1f1ea56ca22a85164c4362650b004e202f4007fd +Author: Alan Coopersmith +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 + +commit 6ce2c46869ced346839eb7e0c3f83170025495c6 +Author: Alan Coopersmith +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 + +commit 772470d0e4fef8e0a3d6eaf4c563fa7b1f6d6d19 +Author: Alan Coopersmith +Date: Sun Dec 11 15:32:03 2022 -0800 + + Replace calloc(strlen())+strcpy() pairs with strdup() calls + + Signed-off-by: Alan Coopersmith + +commit 6db8fd556e2562e9a0a821c0d6fd4f7cdcf6266c +Author: Alan Coopersmith +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 + +commit 299c9762b1dbe53f3297c54e5526aeae767d1a10 +Author: Alan Coopersmith +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 + +commit e4cba31313b44e40efcc0c260a33c3ec83e4b772 +Author: Alan Coopersmith +Date: Sun Dec 11 10:20:05 2022 -0800 + + Stop building more unused functions + + Signed-off-by: Alan Coopersmith + +commit 3e486c4578f3f6a81fc0f9afba6551dfa8c7b63b +Author: Alan Coopersmith +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 + +commit a3bbf780252e55bb1dcab717289ef09e00d11223 +Author: Alan Coopersmith +Date: Sun Dec 11 09:55:55 2022 -0800 + + Remove unused "no indent" (NOI) debug functions + + Signed-off-by: Alan Coopersmith + +commit 0493c7216dd39baeb420583be71af095576dbf74 +Author: Alan Coopersmith +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 + +commit 4119707089b5c14f53bd5ff0b86ee7e575ac9316 +Author: Alan Coopersmith +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 + +commit 0d22aac7bb50ff1f7588f78ec25e9fb62a7b2e5e +Author: Alan Coopersmith +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 + +commit c7a5d1468c75adb2139d2c2facc73854f13b5ba3 +Author: Alan Coopersmith +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 + +commit e6821a8a7b16e5a8e4c478c9544798fae59a21d1 +Author: Alan Coopersmith +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 + +commit 81e46cab5f4bdd69fa0a644dba86f6902cece175 +Author: Alan Coopersmith +Date: Sat Dec 10 16:10:01 2022 -0800 + + Use asprintf() if the platform supports it + + Signed-off-by: Alan Coopersmith + +commit a1551b78e9ac0e2075ca241c0e8ae361758f26b4 +Author: Alan Coopersmith +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 + +commit e4e821d5083072e796d6489ddcacf895a43c66f1 +Author: Alan Coopersmith +Date: Sat Dec 10 15:37:56 2022 -0800 + + Fix 106 missing-field-initializers warnings in misc.c + + Signed-off-by: Alan Coopersmith + +commit 1fb639c97fc28b8ed66b5553eafbbeed07e4cb09 +Author: Alan Coopersmith +Date: Sat Dec 10 15:33:17 2022 -0800 + + Replace malloc()+bzero() pairs with calloc() calls + + Signed-off-by: Alan Coopersmith + +commit 8e58b7949ab96180d60fb13f7820d6cc01c228ae +Author: Alan Coopersmith +Date: Sat Dec 10 15:21:49 2022 -0800 + + Remove unnecessary casts from bzero() calls + + Signed-off-by: Alan Coopersmith + +commit bdbfa354dd4d93657104ccd7c9e892ed45197dd8 +Author: Alan Coopersmith +Date: Sat Dec 10 15:16:05 2022 -0800 + + Remove unnecessary casts from memcpy() calls + + Signed-off-by: Alan Coopersmith + +commit f1757a005f471044da3f8e946a091b067996d270 +Author: Alan Coopersmith +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 + +commit 5655379ce89ab55f25a536972aaa310480de9432 +Author: Alan Coopersmith +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 + +commit 2ac6a7f029d8855fbb4e8024aab0511727ac3a67 +Author: Alan Coopersmith +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 + +commit 8d85bd1e2f9473958b235caf7af9913b518f73dd +Author: Alan Coopersmith +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 + +commit e02e32f71f6c24fcc69bdaf58f6f9e973a017896 +Author: Alan Coopersmith +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 + +commit 75af06f5f8ffc41fabd100253aad222cb4ab8662 +Author: Alan Coopersmith +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 + +commit 265ea3a77418df2744575f1168f89a33f01e72d4 +Author: Alan Coopersmith +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 + +commit 81e51cf1ff494131827df487a0f538c3b07e0407 +Author: Alan Coopersmith +Date: Sat Dec 10 13:34:09 2022 -0800 + + Delete unused uTmpAlloc/uTmpFree wrappers around alloca() + + Signed-off-by: Alan Coopersmith + +commit 77b1efa1c83ad64d49d1e9c085d2a496580ce6f9 +Author: Alan Coopersmith +Date: Sat Dec 10 13:26:39 2022 -0800 + + Use C99 struct initializers + + Signed-off-by: Alan Coopersmith + +commit 64761ee9424f755b84ab0ce02d13eda32d215a14 +Author: Alan Coopersmith +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 + +commit 9737af15196380a1687d18a17d297ee17b45a83f +Author: Alan Coopersmith +Date: Sat Dec 10 11:03:40 2022 -0800 + + Remove register keyword from variable declarations + + Signed-off-by: Alan Coopersmith + +commit b67c058e2ccc27472b238a6b5dc5e4cd20f6d2bd +Author: Alan Coopersmith +Date: Sat Dec 10 09:08:33 2022 -0800 + + Eliminate 20 -Wimplicit-fallthrough warnings + + Signed-off-by: Alan Coopersmith + +commit 634f60a9b25b5d03c78e90574adce3e38f378333 +Author: Alan Coopersmith +Date: Thu Jul 28 17:30:21 2022 -0700 + + gitlab CI: stop requiring Signed-off-by in commits + + Signed-off-by: Alan Coopersmith + +commit 931c469b2b91603c5c196abf65a39c7dab8609d7 +Author: Leandro Nini +Date: Sat Dec 10 07:49:56 2022 +0000 + + Avoid possibly dereferencing null pointer + + This addresses issue #21 + + Signed-off-by: Leandro Nini + commit 7bac6a25bb44d39710f1b2b5fdad56d7f4c01c39 Author: Alan Coopersmith Date: Wed Dec 7 17:53:16 2022 -0800 @@ -169,7 +562,7 @@ Date: Thu Nov 5 14:24:24 2020 +1000 Signed-off-by: Peter Hutterer commit a0a4f112c5858ac2b932247dba2d85061bb59145 -Author: Miroslav Koškár < +Author: Miroslav Koškár Date: Mon Jul 6 07:48:48 2020 +0200 Fix lockdevbtn to be XkbSA_LockDeviceBtn action @@ -265,7 +658,7 @@ Date: Sat Feb 15 17:34:41 2014 +0100 Signed-off-by: Alan Coopersmith commit 9edd61b91a02bda31fc6edd2c32c553e872b6ea2 -Author: Miroslav Koškár < +Author: Miroslav Koškár Date: Fri Jan 18 20:01:01 2019 +0100 Fix invalid error report on F_Accel field @@ -1956,7 +2349,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 +Author: Kristian Høgsberg Date: Thu Sep 1 19:37:02 2005 +0000 Define DFLT_XKB_CONFIG_ROOT to $(datadir)/X11/xkb so we look in the right @@ -1997,13 +2390,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 +Author: Søren Sandmann Pedersen 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 +Author: Søren Sandmann Pedersen Date: Fri Jul 15 18:02:35 2005 +0000 Build system for xkbcomp blob - e531099f2e89f7f0d0fd279e609b2e00130be294 blob + d2012b1e3382cbb5820435f540f0afa655383811 --- app/xkbcomp/Makefile.in +++ app/xkbcomp/Makefile.in @@ -247,7 +247,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CHANGELOG_CMD = @CHANGELOG_CMD@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -258,11 +257,9 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ EXEEXT = @EXEEXT@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ -GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ blob - db23549d154d9f449a872e08afdb8a571cbc4e7d blob + 2173f53d69a273e6c38a54e0aaa47d9e987c2950 --- app/xkbcomp/aclocal.m4 +++ app/xkbcomp/aclocal.m4 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, +[m4_warning([this file was generated for autoconf 2.71. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) @@ -1355,7 +1355,7 @@ dnl DEALINGS IN THE SOFTWARE. # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.20.0]) +m4_define([vers_have], [1.20.1]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -1402,10 +1402,10 @@ rm -f conftest.$ac_ext AC_MSG_CHECKING([if $RAWCPP requires -traditional]) AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve "whitespace"?]])]) -if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then +if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve "'` -eq 1 ; then AC_MSG_RESULT([no]) else - if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then + if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve "'` -eq 1 ; then TRADITIONALCPPFLAGS="-traditional" RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" AC_MSG_RESULT([yes]) @@ -3023,7 +3023,7 @@ XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wuninitia XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wshadow]) XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-noreturn]) XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-format-attribute]) -XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op]) # These are currently disabled because they are noisy. They will be enabled blob - a984bc716ae15cfa60916ccd8041a65f69b14694 blob + c629eb6ae34a7d6d6e4eb249a9a1d4ecdbf8ecce --- app/xkbcomp/action.c +++ app/xkbcomp/action.c @@ -38,6 +38,8 @@ static Bool actionsInitialized; static ExprDef constTrue; static ExprDef constFalse; +static void ActionsInit(void); + /***====================================================================***/ static Bool @@ -333,16 +335,15 @@ ReportNotFound(unsigned action, unsigned field, const } static Bool -HandleNoAction(XkbDescPtr xkb, - XkbAnyAction * action, - unsigned field, ExprDef * array_ndx, ExprDef * value) +HandleNoAction(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, + const ExprDef *array_ndx, const ExprDef *value) { return ReportIllegal(action->type, field); } static Bool -CheckLatchLockFlags(unsigned action, - unsigned field, ExprDef * value, unsigned *flags_inout) +CheckLatchLockFlags(unsigned action, unsigned field, + const ExprDef *value, unsigned *flags_inout) { unsigned tmp; ExprResult result; @@ -363,16 +364,14 @@ CheckLatchLockFlags(unsigned action, } static Bool -CheckModifierField(XkbDescPtr xkb, - unsigned action, - ExprDef * value, +CheckModifierField(XkbDescPtr xkb, unsigned action, const ExprDef *value, unsigned *flags_inout, unsigned *mods_rtrn) { ExprResult rtrn; if (value->op == ExprIdent) { - register char *valStr; + char *valStr; valStr = XkbAtomGetString(NULL, value->value.str); if (valStr && ((uStrCaseCmp(valStr, "usemodmapmods") == 0) || (uStrCaseCmp(valStr, "modmapmods") == 0))) @@ -391,13 +390,10 @@ CheckModifierField(XkbDescPtr xkb, } static Bool -HandleSetLatchMods(XkbDescPtr xkb, - XkbAnyAction * action, - unsigned field, ExprDef * array_ndx, ExprDef * value) +HandleSetLatchMods(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, + const ExprDef *array_ndx, const ExprDef *value) { XkbModAction *act; - unsigned rtrn; - unsigned t1, t2; act = (XkbModAction *) action; if (array_ndx != NULL) @@ -414,15 +410,18 @@ HandleSetLatchMods(XkbDescPtr xkb, { case F_ClearLocks: case F_LatchToLock: - rtrn = act->flags; + { + unsigned rtrn = act->flags; if (CheckLatchLockFlags(action->type, field, value, &rtrn)) { act->flags = rtrn; return True; } return False; + } case F_Modifiers: - t1 = act->flags; + { + unsigned t1 = act->flags, t2; if (CheckModifierField(xkb, action->type, value, &t1, &t2)) { act->flags = t1; @@ -433,6 +432,7 @@ HandleSetLatchMods(XkbDescPtr xkb, } return False; } + } return ReportIllegal(action->type, field); } @@ -445,13 +445,10 @@ static LookupEntry lockWhich[] = { }; static Bool -HandleLockMods(XkbDescPtr xkb, - XkbAnyAction * action, - unsigned field, ExprDef * array_ndx, ExprDef * value) +HandleLockMods(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, + const ExprDef *array_ndx, const ExprDef *value) { XkbModAction *act; - unsigned t1, t2; - ExprResult rtrn; act = (XkbModAction *) action; if ((array_ndx != NULL) && (field == F_Modifiers || field == F_Affect)) @@ -459,13 +456,17 @@ HandleLockMods(XkbDescPtr xkb, 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: - t1 = act->flags; + { + unsigned t1 = act->flags, t2; if (CheckModifierField(xkb, action->type, value, &t1, &t2)) { act->flags = t1; @@ -476,6 +477,7 @@ HandleLockMods(XkbDescPtr xkb, } return False; } + } return ReportIllegal(action->type, field); } @@ -492,10 +494,10 @@ static LookupEntry groupNames[] = { }; static Bool -CheckGroupField(unsigned action, - ExprDef * value, unsigned *flags_inout, int *grp_rtrn) +CheckGroupField(unsigned action, const ExprDef *value, + unsigned *flags_inout, int *grp_rtrn) { - ExprDef *spec; + const ExprDef *spec; ExprResult rtrn; if ((value->op == OpNegate) || (value->op == OpUnaryPlus)) @@ -529,14 +531,10 @@ CheckGroupField(unsigned action, } static Bool -HandleSetLatchGroup(XkbDescPtr xkb, - XkbAnyAction * action, - unsigned field, ExprDef * array_ndx, ExprDef * value) +HandleSetLatchGroup(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, + const ExprDef *array_ndx, const ExprDef *value) { XkbGroupAction *act; - unsigned rtrn; - unsigned t1; - int t2; act = (XkbGroupAction *) action; if (array_ndx != NULL) @@ -553,15 +551,19 @@ HandleSetLatchGroup(XkbDescPtr xkb, { case F_ClearLocks: case F_LatchToLock: - rtrn = act->flags; + { + unsigned rtrn = act->flags; if (CheckLatchLockFlags(action->type, field, value, &rtrn)) { act->flags = rtrn; return True; } return False; + } case F_Group: - t1 = act->flags; + { + unsigned t1 = act->flags; + int t2; if (CheckGroupField(action->type, value, &t1, &t2)) { act->flags = t1; @@ -570,24 +572,23 @@ HandleSetLatchGroup(XkbDescPtr xkb, } return False; } + } return ReportIllegal(action->type, field); } static Bool -HandleLockGroup(XkbDescPtr xkb, - XkbAnyAction * action, - unsigned field, ExprDef * array_ndx, ExprDef * value) +HandleLockGroup(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, + const ExprDef * array_ndx, const 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) { - t1 = act->flags; + unsigned t1 = act->flags; + int t2; if (CheckGroupField(action->type, value, &t1, &t2)) { act->flags = t1; @@ -600,13 +601,11 @@ HandleLockGroup(XkbDescPtr xkb, } static Bool -HandleMovePtr(XkbDescPtr xkb, - XkbAnyAction * action, - unsigned field, ExprDef * array_ndx, ExprDef * value) +HandleMovePtr(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, + const ExprDef *array_ndx, const ExprDef *value) { ExprResult rtrn; XkbPtrAction *act; - Bool absolute; act = (XkbPtrAction *) action; if ((array_ndx != NULL) && ((field == F_X) || (field == F_Y))) @@ -614,6 +613,8 @@ HandleMovePtr(XkbDescPtr xkb, if ((field == F_X) || (field == F_Y)) { + Bool absolute; + if ((value->op == OpNegate) || (value->op == OpUnaryPlus)) absolute = False; else @@ -658,9 +659,8 @@ static LookupEntry btnNames[] = { }; static Bool -HandlePtrBtn(XkbDescPtr xkb, - XkbAnyAction * action, - unsigned field, ExprDef * array_ndx, ExprDef * value) +HandlePtrBtn(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, + const ExprDef *array_ndx, const ExprDef *value) { ExprResult rtrn; XkbPtrBtnAction *act; @@ -720,9 +720,8 @@ static LookupEntry ptrDflts[] = { }; static Bool -HandleSetPtrDflt(XkbDescPtr xkb, - XkbAnyAction * action, - unsigned field, ExprDef * array_ndx, ExprDef * value) +HandleSetPtrDflt(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, + const ExprDef *array_ndx, const ExprDef *value) { ExprResult rtrn; XkbPtrDfltAction *act; @@ -739,7 +738,7 @@ HandleSetPtrDflt(XkbDescPtr xkb, } else if ((field == F_Button) || (field == F_Value)) { - ExprDef *btn; + const ExprDef *btn; if (array_ndx != NULL) return ReportActionNotArray(action->type, field); if ((value->op == OpNegate) || (value->op == OpUnaryPlus)) @@ -797,19 +796,19 @@ static LookupEntry isoNames[] = { }; static Bool -HandleISOLock(XkbDescPtr xkb, - XkbAnyAction * action, - unsigned field, ExprDef * array_ndx, ExprDef * value) +HandleISOLock(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, + const ExprDef *array_ndx, const ExprDef *value) { ExprResult rtrn; XkbISOAction *act; - unsigned flags, mods; - int group; + unsigned flags; act = (XkbISOAction *) action; switch (field) { case F_Modifiers: + { + unsigned mods; if (array_ndx != NULL) return ReportActionNotArray(action->type, field); flags = act->flags; @@ -822,7 +821,10 @@ HandleISOLock(XkbDescPtr xkb, return True; } return False; + } case F_Group: + { + int group; if (array_ndx != NULL) return ReportActionNotArray(action->type, field); flags = act->flags; @@ -833,6 +835,7 @@ HandleISOLock(XkbDescPtr xkb, return True; } return False; + } case F_Affect: if (array_ndx != NULL) return ReportActionNotArray(action->type, field); @@ -847,9 +850,8 @@ HandleISOLock(XkbDescPtr xkb, } static Bool -HandleSwitchScreen(XkbDescPtr xkb, - XkbAnyAction * action, - unsigned field, ExprDef * array_ndx, ExprDef * value) +HandleSwitchScreen(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, + const ExprDef *array_ndx, const ExprDef *value) { ExprResult rtrn; XkbSwitchScreenAction *act; @@ -857,7 +859,7 @@ HandleSwitchScreen(XkbDescPtr xkb, act = (XkbSwitchScreenAction *) action; if (field == F_Screen) { - ExprDef *scrn; + const ExprDef *scrn; if (array_ndx != NULL) return ReportActionNotArray(action->type, field); if ((value->op == OpNegate) || (value->op == OpUnaryPlus)) @@ -939,9 +941,8 @@ LookupEntry ctrlNames[] = { }; static Bool -HandleSetLockControls(XkbDescPtr xkb, - XkbAnyAction * action, - unsigned field, ExprDef * array_ndx, ExprDef * value) +HandleSetLockControls(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, + const ExprDef *array_ndx, const ExprDef *value) { ExprResult rtrn; XkbCtrlsAction *act; @@ -980,9 +981,8 @@ static LookupEntry evNames[] = { }; static Bool -HandleActionMessage(XkbDescPtr xkb, - XkbAnyAction * action, - unsigned field, ExprDef * array_ndx, ExprDef * value) +HandleActionMessage(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, + const ExprDef *array_ndx, const ExprDef *value) { ExprResult rtrn; XkbMessageAction *act; @@ -1058,14 +1058,11 @@ HandleActionMessage(XkbDescPtr xkb, } static Bool -HandleRedirectKey(XkbDescPtr xkb, - XkbAnyAction * action, - unsigned field, ExprDef * array_ndx, ExprDef * value) +HandleRedirectKey(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, + const ExprDef *array_ndx, const ExprDef *value) { ExprResult rtrn; XkbRedirectKeyAction *act; - unsigned t1, t2, vmods, vmask; - unsigned long tmp; if (array_ndx != NULL) return ReportActionNotArray(action->type, field); @@ -1074,6 +1071,10 @@ HandleRedirectKey(XkbDescPtr xkb, 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); @@ -1085,11 +1086,16 @@ HandleRedirectKey(XkbDescPtr xkb, } act->new_key = t1; return True; + } case F_ModsToClear: case F_Modifiers: - t1 = 0; + { + unsigned t1 = 0, t2; + if (CheckModifierField(xkb, action->type, value, &t1, &t2)) { + unsigned vmods, vmask; + act->mods_mask |= (t2 & 0xff); if (field == F_Modifiers) act->mods |= (t2 & 0xff); @@ -1110,13 +1116,13 @@ HandleRedirectKey(XkbDescPtr xkb, } return True; } + } return ReportIllegal(action->type, field); } static Bool -HandleDeviceBtn(XkbDescPtr xkb, - XkbAnyAction * action, - unsigned field, ExprDef * array_ndx, ExprDef * value) +HandleDeviceBtn(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, + const ExprDef *array_ndx, const ExprDef *value) { ExprResult rtrn; XkbDeviceBtnAction *act; @@ -1184,9 +1190,8 @@ HandleDeviceBtn(XkbDescPtr xkb, } static Bool -HandleDeviceValuator(XkbDescPtr xkb, - XkbAnyAction * action, - unsigned field, ExprDef * array_ndx, ExprDef * value) +HandleDeviceValuator(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, + const ExprDef *array_ndx, const ExprDef *value) { #if 0 ExprResult rtrn; @@ -1199,9 +1204,8 @@ HandleDeviceValuator(XkbDescPtr xkb, } static Bool -HandlePrivate(XkbDescPtr xkb, - XkbAnyAction * action, - unsigned field, ExprDef * array_ndx, ExprDef * value) +HandlePrivate(XkbDescPtr xkb, XkbAnyAction *action, unsigned field, + const ExprDef *array_ndx, const ExprDef *value) { ExprResult rtrn; @@ -1270,8 +1274,8 @@ HandlePrivate(XkbDescPtr xkb, typedef Bool(*actionHandler) (XkbDescPtr /* xkb */ , XkbAnyAction * /* action */ , unsigned /* field */ , - ExprDef * /* array_ndx */ , - ExprDef * /* value */ + const ExprDef * /* array_ndx */ , + const ExprDef * /* value */ ); static actionHandler handleAction[XkbSA_NumActions + 1] = { @@ -1319,12 +1323,11 @@ ApplyActionFactoryDefaults(XkbAction * action) int -HandleActionDef(ExprDef * def, - XkbDescPtr xkb, - XkbAnyAction * action, unsigned mergeMode, ActionInfo * info) +HandleActionDef(const ExprDef *def, XkbDescPtr xkb, XkbAnyAction *action, + unsigned mergeMode, const ActionInfo *info) { ExprDef *arg; - register char *str; + const char *str; unsigned tmp, hndlrType; if (!actionsInitialized) @@ -1419,17 +1422,15 @@ HandleActionDef(ExprDef * def, /***====================================================================***/ 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 = uTypedAlloc(ActionInfo); + new = malloc(sizeof(ActionInfo)); if (new == NULL) { WSGO("Couldn't allocate space for action default\n"); @@ -1468,23 +1469,27 @@ SetActionField(XkbDescPtr xkb, /***====================================================================***/ -void +static void ActionsInit(void) { if (!actionsInitialized) { - 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); + 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) + }; actionsInitialized = 1; } return; blob - bd9273d8c6ad0abeb80c642bbe59583d7e47402f blob + c6a73c050842ea16d2b4647925ad872d535e7e11 --- app/xkbcomp/action.h +++ app/xkbcomp/action.h @@ -64,11 +64,11 @@ typedef struct _ActionInfo struct _ActionInfo *next; } ActionInfo; -extern int HandleActionDef(ExprDef * /* def */ , +extern int HandleActionDef(const ExprDef * /* def */ , XkbDescPtr /* xkb */ , XkbAnyAction * /* action */ , unsigned /* mergeMode */ , - ActionInfo * /* info */ + const ActionInfo * /* info */ ); extern int SetActionField(XkbDescPtr /* xkb */ , @@ -79,8 +79,6 @@ extern int SetActionField(XkbDescPtr /* xkb */ , ActionInfo ** /* info_rtrn */ ); -extern void ActionsInit(void); - extern LookupEntry ctrlNames[]; #endif /* ACTION_H */ blob - b9d44ef6542fba9147912615c312d8f62b3146d6 blob + c914cbc45126f77d1a2495dbf19ae028f4bcbab2 --- app/xkbcomp/alias.c +++ app/xkbcomp/alias.c @@ -76,8 +76,8 @@ HandleCollision(AliasInfo * old, AliasInfo * new) } static void -InitAliasInfo(AliasInfo * info, - unsigned merge, unsigned file_id, char *alias, char *real) +InitAliasInfo(AliasInfo *info, unsigned merge, unsigned file_id, + const char *alias, const char *real) { bzero(info, sizeof(AliasInfo)); info->def.merge = merge; @@ -88,8 +88,8 @@ InitAliasInfo(AliasInfo * info, } int -HandleAliasDef(KeyAliasDef * def, - unsigned merge, unsigned file_id, AliasInfo ** info_in) +HandleAliasDef(const KeyAliasDef *def, + unsigned merge, unsigned file_id, AliasInfo **info_in) { AliasInfo *info; @@ -103,7 +103,7 @@ HandleAliasDef(KeyAliasDef * def, return True; } } - info = uTypedCalloc(1, AliasInfo); + info = calloc(1, sizeof(AliasInfo)); if (info == NULL) { WSGO("Allocation failure in HandleAliasDef\n"); @@ -140,7 +140,7 @@ MergeAliases(AliasInfo ** into, AliasInfo ** merge, un *merge = NULL; return True; } - bzero((char *) &def, sizeof(KeyAliasDef)); + bzero(&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, un int ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** info_in) { - register int i; + int i; XkbKeyAliasPtr old, a; AliasInfo *info; int nNew, nOld; @@ -237,10 +237,10 @@ ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** { if (!xkb->geom) { - XkbGeometrySizesRec sizes; - bzero((char *) &sizes, sizeof(XkbGeometrySizesRec)); - sizes.which = XkbGeomKeyAliasesMask; - sizes.num_key_aliases = nOld + nNew; + XkbGeometrySizesRec sizes = { + .which = XkbGeomKeyAliasesMask, + .num_key_aliases = nOld + nNew + }; status = XkbAllocGeometry(xkb, &sizes); } else blob - 93e05275eb9dbf60140b4577cd2aa2ac00a34061 blob + 13404c651c5832351f4e278cce1ab7b7bc662db1 --- app/xkbcomp/alias.h +++ app/xkbcomp/alias.h @@ -34,7 +34,7 @@ typedef struct _AliasInfo char real[XkbKeyNameLength + 1]; } AliasInfo; -extern int HandleAliasDef(KeyAliasDef * /* def */ , +extern int HandleAliasDef(const KeyAliasDef * /* def */ , unsigned /* merge */ , unsigned /* file_id */ , AliasInfo ** /* info */ blob - 757ef42f06ce49030b87a657947ce20d53ac006a blob + 26f4249c4486c28ddb499711d5c2d3d6b8e84888 --- app/xkbcomp/compat.c +++ app/xkbcomp/compat.c @@ -81,7 +81,7 @@ typedef struct _CompatInfo /***====================================================================***/ static char * -siText(SymInterpInfo * si, CompatInfo * info) +siText(const SymInterpInfo *si, const CompatInfo *info) { static char buf[128]; @@ -102,8 +102,6 @@ siText(SymInterpInfo * si, CompatInfo * info) static void InitCompatInfo(CompatInfo * info, XkbDescPtr xkb) { - register int i; - info->xkb = xkb; info->name = NULL; info->fileID = 0; @@ -117,7 +115,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 (i = 0; i < XkbAnyActionDataSize; i++) + for (int i = 0; i < XkbAnyActionDataSize; i++) { info->dflt.interp.act.data[i] = 0; } @@ -125,8 +123,7 @@ InitCompatInfo(CompatInfo * info, XkbDescPtr xkb) info->ledDflt.defs.fileID = info->fileID; info->ledDflt.defs.defined = 0; info->ledDflt.defs.merge = MergeOverride; - bzero((char *) &info->groupCompat[0], - XkbNumKbdGroups * sizeof(GroupCompatInfo)); + bzero(&info->groupCompat[0], XkbNumKbdGroups * sizeof(GroupCompatInfo)); info->leds = NULL; InitVModInfo(&info->vmods, xkb); return; @@ -135,25 +132,21 @@ InitCompatInfo(CompatInfo * info, XkbDescPtr xkb) static void ClearCompatInfo(CompatInfo * info, XkbDescPtr xkb) { - register int i; - - if (info->name != NULL) - uFree(info->name); + free(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 (i = 0; i < XkbAnyActionDataSize; i++) + for (int 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((char *) &info->groupCompat[0], - XkbNumKbdGroups * sizeof(GroupCompatInfo)); + bzero(&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); @@ -165,10 +158,9 @@ NextInterp(CompatInfo * info) { SymInterpInfo *si; - si = uTypedAlloc(SymInterpInfo); + si = calloc(1, sizeof(SymInterpInfo)); if (si) { - bzero((char *) si, sizeof(SymInterpInfo)); info->interps = (SymInterpInfo *) AddCommonInfo(&info->interps->defs, (CommonInfo *) si); @@ -178,7 +170,7 @@ NextInterp(CompatInfo * info) } static SymInterpInfo * -FindMatchingInterp(CompatInfo * info, SymInterpInfo * new) +FindMatchingInterp(CompatInfo *info, const SymInterpInfo *new) { SymInterpInfo *old; @@ -198,13 +190,13 @@ FindMatchingInterp(CompatInfo * info, SymInterpInfo * 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; @@ -263,7 +255,7 @@ AddInterp(CompatInfo * info, SymInterpInfo * new) } static Bool -AddGroupCompat(CompatInfo * info, unsigned group, GroupCompatInfo * newGC) +AddGroupCompat(CompatInfo *info, unsigned group, const GroupCompatInfo *newGC) { GroupCompatInfo *gc; unsigned merge; @@ -289,9 +281,9 @@ AddGroupCompat(CompatInfo * info, unsigned group, Grou /***====================================================================***/ static Bool -ResolveStateAndPredicate(ExprDef * expr, - unsigned *pred_rtrn, - unsigned *mods_rtrn, CompatInfo * info) +ResolveStateAndPredicate(const ExprDef *expr, + unsigned *pred_rtrn, unsigned *mods_rtrn, + const CompatInfo *info) { ExprResult result; @@ -349,10 +341,9 @@ ResolveStateAndPredicate(ExprDef * expr, static void MergeIncludedCompatMaps(CompatInfo * into, CompatInfo * from, unsigned merge) { - SymInterpInfo *si; - LEDInfo *led, *rtrn, *next; + LEDInfo *next; GroupCompatInfo *gcm; - register int i; + int i; if (from->errorCount > 0) { @@ -364,7 +355,8 @@ MergeIncludedCompatMaps(CompatInfo * into, CompatInfo into->name = from->name; from->name = NULL; } - for (si = from->interps; si; si = (SymInterpInfo *) si->defs.next) + for (SymInterpInfo *si = from->interps; si; + si = (SymInterpInfo *) si->defs.next) { if (merge != MergeDefault) si->defs.merge = merge; @@ -378,8 +370,10 @@ MergeIncludedCompatMaps(CompatInfo * into, CompatInfo if (!AddGroupCompat(into, i, gcm)) into->errorCount++; } - for (led = from->leds; led != NULL; led = next) + for (LEDInfo *led = from->leds; led != NULL; led = next) { + LEDInfo *rtrn; + next = (LEDInfo *) led->defs.next; if (merge != MergeDefault) led->defs.merge = merge; @@ -392,14 +386,14 @@ MergeIncludedCompatMaps(CompatInfo * into, CompatInfo return; } -typedef void (*FileHandler) (XkbFile * /* rtrn */ , +typedef void (*FileHandler) (const XkbFile * /* rtrn */ , XkbDescPtr /* xkb */ , unsigned /* merge */ , CompatInfo * /* info */ ); static Bool -HandleIncludeCompatMap(IncludeStmt * stmt, +HandleIncludeCompatMap(IncludeStmt *stmt, XkbDescPtr xkb, CompatInfo * info, FileHandler hndlr) { unsigned newMerge; @@ -427,8 +421,7 @@ HandleIncludeCompatMap(IncludeStmt * stmt, (*hndlr) (rtrn, xkb, MergeOverride, &included); if (stmt->stmt != NULL) { - if (included.name != NULL) - uFree(included.name); + free(included.name); included.name = stmt->stmt; stmt->stmt = NULL; } @@ -492,10 +485,9 @@ static LookupEntry useModMapValues[] = { }; static int -SetInterpField(SymInterpInfo * si, - XkbDescPtr xkb, - const char *field, - ExprDef * arrayNdx, ExprDef * value, CompatInfo * info) +SetInterpField(SymInterpInfo *si, XkbDescPtr xkb, const char *field, + const ExprDef *arrayNdx, const ExprDef *value, + const CompatInfo *info) { int ok = 1; ExprResult tmp; @@ -604,7 +596,7 @@ LookupEntry groupNames[] = { }; static int -HandleInterpVar(VarDef * stmt, XkbDescPtr xkb, CompatInfo * info) +HandleInterpVar(const VarDef *stmt, XkbDescPtr xkb, CompatInfo *info) { ExprResult elem, field; ExprDef *ndx; @@ -624,8 +616,8 @@ HandleInterpVar(VarDef * stmt, XkbDescPtr xkb, CompatI } static int -HandleInterpBody(VarDef * def, XkbDescPtr xkb, SymInterpInfo * si, - CompatInfo * info) +HandleInterpBody(const VarDef *def, XkbDescPtr xkb, SymInterpInfo *si, + CompatInfo *info) { int ok = 1; ExprResult tmp, field; @@ -647,8 +639,8 @@ HandleInterpBody(VarDef * def, XkbDescPtr xkb, SymInte } static int -HandleInterpDef(InterpDef * def, XkbDescPtr xkb, unsigned merge, - CompatInfo * info) +HandleInterpDef(const InterpDef *def, XkbDescPtr xkb, unsigned merge, + CompatInfo *info) { unsigned pred, mods; SymInterpInfo si; @@ -689,8 +681,8 @@ HandleInterpDef(InterpDef * def, XkbDescPtr xkb, unsig } static int -HandleGroupCompatDef(GroupCompatDef * def, - XkbDescPtr xkb, unsigned merge, CompatInfo * info) +HandleGroupCompatDef(const GroupCompatDef *def, + XkbDescPtr xkb, unsigned merge, CompatInfo *info) { ExprResult val; GroupCompatInfo tmp; @@ -721,8 +713,8 @@ HandleGroupCompatDef(GroupCompatDef * def, } static void -HandleCompatMapFile(XkbFile * file, - XkbDescPtr xkb, unsigned merge, CompatInfo * info) +HandleCompatMapFile(const XkbFile *file, + XkbDescPtr xkb, unsigned merge, CompatInfo *info) { ParseCommon *stmt; @@ -791,12 +783,11 @@ HandleCompatMapFile(XkbFile * file, } static void -CopyInterps(CompatInfo * info, +CopyInterps(const CompatInfo *info, XkbCompatMapPtr compat, Bool needSymbol, unsigned pred) { - SymInterpInfo *si; - - for (si = info->interps; si; si = (SymInterpInfo *) si->defs.next) + for (SymInterpInfo *si = info->interps; si; + si = (SymInterpInfo *) si->defs.next) { if (((si->interp.match & XkbSI_OpMask) != pred) || (needSymbol && (si->interp.sym == NoSymbol)) || @@ -814,13 +805,11 @@ CopyInterps(CompatInfo * info, } Bool -CompileCompatMap(XkbFile * file, - XkbFileInfo * result, unsigned merge, LEDInfo ** unboundLEDs) +CompileCompatMap(const XkbFile *file, + XkbFileInfo *result, unsigned merge, LEDInfo **unboundLEDs) { - int i; CompatInfo info; XkbDescPtr xkb; - GroupCompatInfo *gcm; xkb = result->xkb; InitCompatInfo(&info, xkb); @@ -830,7 +819,9 @@ CompileCompatMap(XkbFile * file, if (info.errorCount == 0) { - int size; + int size, i; + GroupCompatInfo *gcm; + if (XkbAllocCompatMap(xkb, XkbAllCompatMask, info.nInterps) != Success) { @@ -883,7 +874,6 @@ CompileCompatMap(XkbFile * file, ClearCompatInfo(&info, xkb); return True; } - if (info.interps != NULL) - uFree(info.interps); + free(info.interps); return False; } blob - 17e18faf41ed232563f83a7951f189322ce28338 blob + a16d7ba45d18628263776baf58e2c3d073f60201 --- app/xkbcomp/config.h.in +++ app/xkbcomp/config.h.in @@ -1,14 +1,26 @@ /* 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 header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H +/* Define to 1 if you have the 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 header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H @@ -33,6 +45,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Name of package */ #undef PACKAGE @@ -63,17 +78,102 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS +/* 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 -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS blob - 04d7843613ab4c4699a2614aa20e0b6b7a4f5b37 blob + a154026823e5a9c9abe62242bffe590710f107d9 --- app/xkbcomp/configure +++ app/xkbcomp/configure @@ -1,11 +1,12 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xkbcomp 1.4.6. +# Generated by GNU Autoconf 2.71 for xkbcomp 1.4.7. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -16,14 +17,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -33,46 +36,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi + # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -81,13 +84,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -96,8 +92,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -109,31 +109,11 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then @@ -154,20 +134,22 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else +else \$as_nop case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -187,42 +169,53 @@ as_fn_success || { exitcode=1; echo as_fn_success fail as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : -else +else \$as_nop exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO 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 +else $as_nop as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : -else +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : break 2 fi fi @@ -230,14 +223,21 @@ fi esac as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS +if $as_found +then : +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi +fi - if test "x$CONFIG_SHELL" != x; then : + + if test "x$CONFIG_SHELL" != x +then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -255,18 +255,19 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and $0: https://gitlab.freedesktop.org/xorg/app/xkbcomp/-/issues $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or @@ -295,6 +296,7 @@ as_fn_unset () } as_unset=as_fn_unset + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -312,6 +314,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -326,7 +336,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -335,7 +345,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -374,12 +384,13 @@ as_fn_executable_p () # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -391,18 +402,27 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -414,9 +434,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -443,7 +463,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -487,7 +507,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -501,6 +521,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -514,6 +538,13 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -581,48 +612,44 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='xkbcomp' PACKAGE_TARNAME='xkbcomp' -PACKAGE_VERSION='1.4.6' -PACKAGE_STRING='xkbcomp 1.4.6' +PACKAGE_VERSION='1.4.7' +PACKAGE_STRING='xkbcomp 1.4.7' 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 -#ifdef HAVE_SYS_TYPES_H -# include +#include +#ifdef HAVE_STDIO_H +# include #endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif #endif #ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif # include #endif -#ifdef HAVE_STRINGS_H -# include -#endif #ifdef HAVE_INTTYPES_H # include #endif #ifdef HAVE_STDINT_H # include #endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif #ifdef HAVE_UNISTD_H # include #endif" +ac_header_c_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -668,9 +695,9 @@ CHANGELOG_CMD STRICT_CFLAGS CWARNFLAGS BASE_CFLAGS -EGREP -GREP -CPP +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE @@ -681,16 +708,6 @@ 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 @@ -714,6 +731,13 @@ am__isrc INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC target_alias host_alias build_alias @@ -756,8 +780,8 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_maintainer_mode enable_dependency_tracking +enable_maintainer_mode enable_selective_werror enable_strict_compilation enable_silent_rules @@ -772,7 +796,6 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR @@ -848,8 +871,6 @@ do *) ac_optarg=yes ;; esac - # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -890,9 +911,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -916,9 +937,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1129,9 +1150,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1145,9 +1166,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1191,9 +1212,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1209,7 +1230,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1273,7 +1294,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1330,7 +1351,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.6 to adapt to many kinds of systems. +\`configure' configures xkbcomp 1.4.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1401,7 +1422,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xkbcomp 1.4.6:";; + short | recursive ) echo "Configuration of xkbcomp 1.4.7:";; esac cat <<\_ACEOF @@ -1409,13 +1430,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) @@ -1441,7 +1462,6 @@ Some influential environment variables: LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory - CPP C preprocessor PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH directories to add to pkg-config's search path @@ -1477,9 +1497,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1507,7 +1527,8 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -1515,7 +1536,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1524,10 +1545,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xkbcomp configure 1.4.6 -generated by GNU Autoconf 2.69 +xkbcomp configure 1.4.7 +generated by GNU Autoconf 2.71 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1544,14 +1565,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1559,14 +1580,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1576,25 +1598,61 @@ fi } # ac_fn_c_try_compile -# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES -# --------------------------------------------- +# 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 +# ------------------------------------------------------------------ # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. -ac_fn_c_check_decl () +# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR. +ac_fn_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack as_decl_name=`echo $2|sed 's/ *(.*//'` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +printf %s "checking whether $as_decl_name is declared... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -$as_echo_n "checking whether $as_decl_name is declared... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + eval ac_save_FLAGS=\$$6 + as_fn_append $6 " $5" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { #ifndef $as_decl_name #ifdef __cplusplus @@ -1608,129 +1666,22 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -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 +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + eval $6=\$ac_save_FLAGS -} # 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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -} # ac_fn_c_check_header_compile +} # ac_fn_check_decl # ac_fn_c_try_link LINENO # ----------------------- @@ -1738,14 +1689,14 @@ $as_echo "$ac_res" >&6; } ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext + rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1753,17 +1704,18 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1784,11 +1736,12 @@ fi ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case declares $2. @@ -1796,16 +1749,9 @@ else #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ + which can conflict with char $2 (); below. */ -#ifdef __STDC__ -# include -#else -# include -#endif - +#include #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -1823,35 +1769,56 @@ choke me #endif int -main () +main (void) { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func +ac_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.6, which was -generated by GNU Autoconf 2.69. Invocation command line was +It was created by xkbcomp $as_me 1.4.7, which was +generated by GNU Autoconf 2.71. Invocation command line was - $ $0 $@ + $ $0$ac_configure_args_raw _ACEOF exec 5>>config.log @@ -1884,8 +1851,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS @@ -1920,7 +1891,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -1955,11 +1926,13 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - $as_echo "## ---------------- ## + printf "%s\n" "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -1970,8 +1943,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -1995,7 +1968,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var cont ) echo - $as_echo "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -2003,14 +1976,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var cont do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + printf "%s\n" "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -2018,15 +1991,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var cont do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - $as_echo "## ----------- ## + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -2034,8 +2007,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var cont echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -2049,63 +2022,48 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -$as_echo "/* confdefs.h */" > confdefs.h +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" + +for ac_site_file in $ac_site_files do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -2115,713 +2073,521 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -# 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. ## -## -------------------- ## - -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_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; -ac_config_headers="$ac_config_headers config.h" +/* 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);' -# Initialize Automake -am__api_version='1.12' +# 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]); +' -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 +# 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 -# 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. +#include +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} -# 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 +// 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; - done -IFS=$as_save_IFS +struct incomplete_array +{ + int datasize; + double data[]; +}; -rm -rf conftest.one conftest.two conftest.dir +struct named_init { + int number; + const wchar_t *name; + double average; +}; -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; } +typedef const char *ccp; -# 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}' +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; +} -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } -# 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 +// 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); -# 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 + const char *str = ""; + int number = 0; + float fnumber = 0; - # 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 + 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); -rm -f conftest.file + return *str && number && fnumber; +} +' -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"` +# 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); -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; -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 varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); -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 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; -# 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 named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; -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 + ni.number = 58; + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; -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 + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' -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 +# 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 - 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 +// 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; -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +// 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"); -{ $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 +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } -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; +}; - 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; } +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; -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 -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_AWK="$ac_prog" - $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 -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 +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' - test -n "$AWK" && break -done +# 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} -{ $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 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 +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; +} +" -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 +# 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} -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 +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" -# 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 +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" -# Define the identity of the package. - PACKAGE='xkbcomp' - VERSION='1.4.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" - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -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: -# -# -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 -' - +# 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 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" + break + fi + ac_first_candidate=false + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : -# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +fi - - - - - - - - - -{ $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 +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +if test -f "${ac_aux_dir}config.guess"; then + ac_config_guess="$SHELL ${ac_aux_dir}config.guess" fi +if test -f "${ac_aux_dir}config.sub"; then + ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_configure="$SHELL ${ac_aux_dir}configure" +fi - { $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= +# 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 + 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. ## +## -------------------- ## - MAINT=$MAINTAINER_MODE_TRUE +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 -DEPDIR="${am__leading_dot}deps" +ac_config_headers="$ac_config_headers config.h" -ac_config_commands="$ac_config_commands depfiles" +# 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. -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 ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2830,11 +2596,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2842,11 +2609,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2857,11 +2628,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2870,11 +2641,12 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -2882,11 +2654,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2897,11 +2673,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2909,8 +2685,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2923,11 +2699,12 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2935,11 +2712,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2950,11 +2731,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2963,11 +2744,12 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2976,15 +2758,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3000,18 +2786,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3022,11 +2808,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -3034,11 +2821,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3049,11 +2840,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3066,11 +2857,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -3078,11 +2870,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3093,11 +2889,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3109,8 +2905,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -3118,43 +2914,147 @@ esac fi fi - - -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } - -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -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\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 +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 - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } done + done +IFS=$as_save_IFS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +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;} +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 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion -version; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + int -main () +main (void) { ; @@ -3166,9 +3066,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -3189,11 +3089,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -3210,7 +3111,7 @@ do # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3226,44 +3127,46 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else +else $as_nop ac_file='' fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "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; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3277,15 +3180,15 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -3294,7 +3197,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -3306,8 +3209,8 @@ _ACEOF ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -3315,10 +3218,10 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -3326,39 +3229,40 @@ $as_echo "$ac_try_echo"; } >&5 *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details" "$LINENO" 5; } fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -3372,11 +3276,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3385,31 +3290,32 @@ $as_echo "$ac_try_echo"; } >&5 break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -3419,29 +3325,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -3450,57 +3360,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else +else $as_nop CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -3515,109 +3428,915 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} +$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 -/* 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]; - -/* 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 () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +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 '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +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 : + 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 + 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 +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi +fi ac_ext=c 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) +{ + + ; + return 0; +} +_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 + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + 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 +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}' -depcc="$CC" am_compiler_list= +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -{ $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 +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 +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 +done + done +IFS=$as_save_IFS + +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;; + *) + 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 + ;; +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 + + +{ 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: +# +# +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 -' + + + + +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 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 @@ -3721,621 +4440,165 @@ else rm -rf conftest.dir else am_cv_CC_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -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 -#include -#include -#include -#include - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -#define debug(...) fprintf (stderr, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - your preprocessor is broken; -#endif -#if BIG_OK -#else - your preprocessor is broken; -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; - -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) -{ - // 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"; - - // 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 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 - # 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 to if __STDC__ is defined, since - # 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 -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_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 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -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 + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= 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 to if __STDC__ is defined, since - # 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 -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_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 +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -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 + +{ 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 fi - fi + { 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='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= 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" + MAINT=$MAINTAINER_MODE_TRUE -{ $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 + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5 +printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; } +if test ${ac_cv_c_undeclared_builtin_options+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_save_CFLAGS=$CFLAGS + ac_cv_c_undeclared_builtin_options='cannot detect' + for ac_arg in '' -fno-builtin; do + CFLAGS="$ac_save_CFLAGS $ac_arg" + # This test program should *not* compile successfully. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -#include -#include int -main () +main (void) { - +(void) strchr; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +if ac_fn_c_try_compile "$LINENO" +then : -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 +else $as_nop + # This test program should compile successfully. + # No library function is consistently available on + # freestanding implementations, so test against a dummy + # declaration. Include always-available headers on the + # off chance that they somehow elicit warnings. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#include +#include +#include +#include +extern void ac_decl (int, char *); -_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 - -_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 -#include -#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 () +main (void) { - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; +(void) ac_decl (0, (char *) 0); + (void) ac_decl; + + ; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no +if ac_fn_c_try_compile "$LINENO" +then : + if test x"$ac_arg" = x +then : + ac_cv_c_undeclared_builtin_options='none needed' +else $as_nop + ac_cv_c_undeclared_builtin_options=$ac_arg fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + break fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + done + CFLAGS=$ac_save_CFLAGS -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - 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 -# 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_c_check_decl "$LINENO" "__clang__" "ac_cv_have_decl___clang__" "$ac_includes_default" -if test "x$ac_cv_have_decl___clang__" = xyes; then : +ac_fn_check_decl "$LINENO" "__clang__" "ac_cv_have_decl___clang__" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl___clang__" = xyes +then : CLANGCC="yes" -else +else $as_nop CLANGCC="no" fi - -ac_fn_c_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default" -if test "x$ac_cv_have_decl___INTEL_COMPILER" = xyes; then : +ac_fn_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl___INTEL_COMPILER" = xyes +then : INTELCC="yes" -else +else $as_nop INTELCC="no" fi - -ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" -if test "x$ac_cv_have_decl___SUNPRO_C" = xyes; then : +ac_fn_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl___SUNPRO_C" = xyes +then : SUNCC="yes" -else +else $as_nop SUNCC="no" fi @@ -4346,16 +4609,16 @@ fi - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -4365,11 +4628,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4381,11 +4648,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4394,11 +4661,12 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. @@ -4408,11 +4676,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4424,11 +4696,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -4436,8 +4708,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -4449,37 +4721,40 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else + + # Make sure we can run config.sub. +$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +printf %s "checking build system type... " >&6; } +if test ${ac_cv_build+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 +ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -4498,21 +4773,22 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +printf %s "checking host system type... " >&6; } +if test ${ac_cv_host+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -4531,11 +4807,12 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +printf %s "checking for a sed that does not truncate output... " >&6; } +if test ${ac_cv_path_SED+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" @@ -4549,10 +4826,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in sed gsed + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + ac_path_SED="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED @@ -4561,13 +4843,13 @@ case `"$ac_path_SED" --version 2>&1` in ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" + printf "%s\n" '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -4595,8 +4877,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +printf "%s\n" "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -4606,9 +4888,10 @@ $as_echo "$ac_cv_path_SED" >&6; } # Check whether --enable-selective-werror was given. -if test "${enable_selective_werror+set}" = set; then : +if test ${enable_selective_werror+y} +then : enableval=$enable_selective_werror; SELECTIVE_WERROR=$enableval -else +else $as_nop SELECTIVE_WERROR=yes fi @@ -4641,24 +4924,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -4668,24 +4953,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -4703,29 +4990,31 @@ found="no" CFLAGS="$CFLAGS -Wall" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall" >&5 -$as_echo_n "checking if $CC supports -Wall... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall" >&5 +printf %s "checking if $CC supports -Wall... " >&6; } cacheid=xorg_cv_cc_flag__Wall - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -4733,8 +5022,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wall" found="yes" @@ -4759,24 +5048,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -4786,24 +5077,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -4821,29 +5114,31 @@ found="no" CFLAGS="$CFLAGS -Wpointer-arith" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-arith" >&5 -$as_echo_n "checking if $CC supports -Wpointer-arith... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-arith" >&5 +printf %s "checking if $CC supports -Wpointer-arith... " >&6; } cacheid=xorg_cv_cc_flag__Wpointer_arith - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -4851,8 +5146,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wpointer-arith" found="yes" @@ -4877,24 +5172,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -4904,24 +5201,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -4939,29 +5238,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-declarations" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations" >&5 -$as_echo_n "checking if $CC supports -Wmissing-declarations... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations" >&5 +printf %s "checking if $CC supports -Wmissing-declarations... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_declarations - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -4969,8 +5270,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-declarations" found="yes" @@ -4995,24 +5296,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5022,24 +5325,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5057,29 +5362,31 @@ found="no" CFLAGS="$CFLAGS -Wformat=2" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat=2" >&5 -$as_echo_n "checking if $CC supports -Wformat=2... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat=2" >&5 +printf %s "checking if $CC supports -Wformat=2... " >&6; } cacheid=xorg_cv_cc_flag__Wformat_2 - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5087,8 +5394,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wformat=2" found="yes" @@ -5106,29 +5413,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -Wformat" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat" >&5 -$as_echo_n "checking if $CC supports -Wformat... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat" >&5 +printf %s "checking if $CC supports -Wformat... " >&6; } cacheid=xorg_cv_cc_flag__Wformat - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5136,8 +5445,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wformat" found="yes" @@ -5164,51 +5473,55 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi 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 + 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 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5226,29 +5539,31 @@ found="no" CFLAGS="$CFLAGS -Wstrict-prototypes" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wstrict-prototypes" >&5 -$as_echo_n "checking if $CC supports -Wstrict-prototypes... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wstrict-prototypes" >&5 +printf %s "checking if $CC supports -Wstrict-prototypes... " >&6; } cacheid=xorg_cv_cc_flag__Wstrict_prototypes - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5256,8 +5571,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wstrict-prototypes" found="yes" @@ -5282,24 +5597,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5309,24 +5626,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5344,29 +5663,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-prototypes" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-prototypes" >&5 -$as_echo_n "checking if $CC supports -Wmissing-prototypes... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-prototypes" >&5 +printf %s "checking if $CC supports -Wmissing-prototypes... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_prototypes - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5374,8 +5695,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-prototypes" found="yes" @@ -5400,24 +5721,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5427,24 +5750,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5462,29 +5787,31 @@ found="no" CFLAGS="$CFLAGS -Wnested-externs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnested-externs" >&5 -$as_echo_n "checking if $CC supports -Wnested-externs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnested-externs" >&5 +printf %s "checking if $CC supports -Wnested-externs... " >&6; } cacheid=xorg_cv_cc_flag__Wnested_externs - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5492,8 +5819,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wnested-externs" found="yes" @@ -5518,24 +5845,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5545,24 +5874,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5580,29 +5911,31 @@ found="no" CFLAGS="$CFLAGS -Wbad-function-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wbad-function-cast" >&5 -$as_echo_n "checking if $CC supports -Wbad-function-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wbad-function-cast" >&5 +printf %s "checking if $CC supports -Wbad-function-cast... " >&6; } cacheid=xorg_cv_cc_flag__Wbad_function_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5610,8 +5943,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wbad-function-cast" found="yes" @@ -5636,24 +5969,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5663,24 +5998,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5698,29 +6035,31 @@ found="no" CFLAGS="$CFLAGS -Wold-style-definition" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wold-style-definition" >&5 -$as_echo_n "checking if $CC supports -Wold-style-definition... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wold-style-definition" >&5 +printf %s "checking if $CC supports -Wold-style-definition... " >&6; } cacheid=xorg_cv_cc_flag__Wold_style_definition - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5728,8 +6067,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wold-style-definition" found="yes" @@ -5747,29 +6086,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -fd" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fd" >&5 -$as_echo_n "checking if $CC supports -fd... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fd" >&5 +printf %s "checking if $CC supports -fd... " >&6; } cacheid=xorg_cv_cc_flag__fd - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5777,8 +6118,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -fd" found="yes" @@ -5803,24 +6144,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5830,24 +6173,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5865,29 +6210,31 @@ found="no" CFLAGS="$CFLAGS -Wdeclaration-after-statement" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wdeclaration-after-statement" >&5 -$as_echo_n "checking if $CC supports -Wdeclaration-after-statement... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wdeclaration-after-statement" >&5 +printf %s "checking if $CC supports -Wdeclaration-after-statement... " >&6; } cacheid=xorg_cv_cc_flag__Wdeclaration_after_statement - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5895,8 +6242,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wdeclaration-after-statement" found="yes" @@ -5925,24 +6272,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5952,24 +6301,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5987,29 +6338,31 @@ found="no" CFLAGS="$CFLAGS -Wunused" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused" >&5 -$as_echo_n "checking if $CC supports -Wunused... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused" >&5 +printf %s "checking if $CC supports -Wunused... " >&6; } cacheid=xorg_cv_cc_flag__Wunused - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6017,8 +6370,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wunused" found="yes" @@ -6043,24 +6396,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6070,24 +6425,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6105,29 +6462,31 @@ found="no" CFLAGS="$CFLAGS -Wuninitialized" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wuninitialized" >&5 -$as_echo_n "checking if $CC supports -Wuninitialized... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wuninitialized" >&5 +printf %s "checking if $CC supports -Wuninitialized... " >&6; } cacheid=xorg_cv_cc_flag__Wuninitialized - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6135,8 +6494,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wuninitialized" found="yes" @@ -6161,24 +6520,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6188,24 +6549,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6223,29 +6586,31 @@ found="no" CFLAGS="$CFLAGS -Wshadow" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wshadow" >&5 -$as_echo_n "checking if $CC supports -Wshadow... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wshadow" >&5 +printf %s "checking if $CC supports -Wshadow... " >&6; } cacheid=xorg_cv_cc_flag__Wshadow - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6253,8 +6618,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wshadow" found="yes" @@ -6279,24 +6644,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6306,24 +6673,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6341,29 +6710,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-noreturn" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5 -$as_echo_n "checking if $CC supports -Wmissing-noreturn... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5 +printf %s "checking if $CC supports -Wmissing-noreturn... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_noreturn - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6371,8 +6742,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-noreturn" found="yes" @@ -6397,24 +6768,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6424,24 +6797,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6459,29 +6834,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-format-attribute" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5 -$as_echo_n "checking if $CC supports -Wmissing-format-attribute... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5 +printf %s "checking if $CC supports -Wmissing-format-attribute... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_format_attribute - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6489,8 +6866,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-format-attribute" found="yes" @@ -6498,6 +6875,7 @@ $as_echo "$supported" >&6; } fi +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) @@ -6515,24 +6893,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6542,142 +6922,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int i; -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - xorg_cv_cc_flag_unused_command_line_argument=yes -else - xorg_cv_cc_flag_unused_command_line_argument=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } - xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument - CFLAGS="$xorg_testset_save_CFLAGS" -fi - -found="no" - - if test $found = "no" ; then - if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then - CFLAGS="$CFLAGS -Werror=unknown-warning-option" - fi - - if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then - CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - fi - - CFLAGS="$CFLAGS -Wredundant-decls" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wredundant-decls" >&5 -$as_echo_n "checking if $CC supports -Wredundant-decls... " >&6; } - cacheid=xorg_cv_cc_flag__Wredundant_decls - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int i; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval $cacheid=yes -else - eval $cacheid=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi - - - CFLAGS="$xorg_testset_save_CFLAGS" - - eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } - if test "$supported" = "yes" ; then - BASE_CFLAGS="$BASE_CFLAGS -Wredundant-decls" - found="yes" - fi - fi - - - - - - - - - - - - - - - -xorg_testset_save_CFLAGS="$CFLAGS" - -if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then - CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else - 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 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6695,29 +6959,31 @@ found="no" CFLAGS="$CFLAGS -Wlogical-op" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wlogical-op" >&5 -$as_echo_n "checking if $CC supports -Wlogical-op... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wlogical-op" >&5 +printf %s "checking if $CC supports -Wlogical-op... " >&6; } cacheid=xorg_cv_cc_flag__Wlogical_op - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6725,8 +6991,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wlogical-op" found="yes" @@ -6763,24 +7029,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6790,24 +7058,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6825,29 +7095,31 @@ found="no" CFLAGS="$CFLAGS -Werror=implicit" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=implicit" >&5 -$as_echo_n "checking if $CC supports -Werror=implicit... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=implicit" >&5 +printf %s "checking if $CC supports -Werror=implicit... " >&6; } cacheid=xorg_cv_cc_flag__Werror_implicit - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6855,8 +7127,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=implicit" found="yes" @@ -6874,29 +7146,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5 -$as_echo_n "checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5 +printf %s "checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; } cacheid=xorg_cv_cc_flag__errwarn_E_NO_EXPLICIT_TYPE_GIVEN__errwarn_E_NO_IMPLICIT_DECL_ALLOWED - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6904,8 +7178,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" found="yes" @@ -6930,24 +7204,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6957,24 +7233,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6992,29 +7270,31 @@ found="no" CFLAGS="$CFLAGS -Werror=nonnull" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=nonnull" >&5 -$as_echo_n "checking if $CC supports -Werror=nonnull... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=nonnull" >&5 +printf %s "checking if $CC supports -Werror=nonnull... " >&6; } cacheid=xorg_cv_cc_flag__Werror_nonnull - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7022,8 +7302,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=nonnull" found="yes" @@ -7048,24 +7328,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7075,24 +7357,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7110,29 +7394,31 @@ found="no" CFLAGS="$CFLAGS -Werror=init-self" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=init-self" >&5 -$as_echo_n "checking if $CC supports -Werror=init-self... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=init-self" >&5 +printf %s "checking if $CC supports -Werror=init-self... " >&6; } cacheid=xorg_cv_cc_flag__Werror_init_self - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7140,8 +7426,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=init-self" found="yes" @@ -7166,24 +7452,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7193,24 +7481,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7228,29 +7518,31 @@ found="no" CFLAGS="$CFLAGS -Werror=main" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=main" >&5 -$as_echo_n "checking if $CC supports -Werror=main... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=main" >&5 +printf %s "checking if $CC supports -Werror=main... " >&6; } cacheid=xorg_cv_cc_flag__Werror_main - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7258,8 +7550,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=main" found="yes" @@ -7284,24 +7576,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7311,24 +7605,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7346,29 +7642,31 @@ found="no" CFLAGS="$CFLAGS -Werror=missing-braces" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=missing-braces" >&5 -$as_echo_n "checking if $CC supports -Werror=missing-braces... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=missing-braces" >&5 +printf %s "checking if $CC supports -Werror=missing-braces... " >&6; } cacheid=xorg_cv_cc_flag__Werror_missing_braces - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7376,8 +7674,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=missing-braces" found="yes" @@ -7402,24 +7700,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7429,24 +7729,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7464,29 +7766,31 @@ found="no" CFLAGS="$CFLAGS -Werror=sequence-point" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=sequence-point" >&5 -$as_echo_n "checking if $CC supports -Werror=sequence-point... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=sequence-point" >&5 +printf %s "checking if $CC supports -Werror=sequence-point... " >&6; } cacheid=xorg_cv_cc_flag__Werror_sequence_point - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7494,8 +7798,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=sequence-point" found="yes" @@ -7520,24 +7824,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7547,24 +7853,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7582,29 +7890,31 @@ found="no" CFLAGS="$CFLAGS -Werror=return-type" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=return-type" >&5 -$as_echo_n "checking if $CC supports -Werror=return-type... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=return-type" >&5 +printf %s "checking if $CC supports -Werror=return-type... " >&6; } cacheid=xorg_cv_cc_flag__Werror_return_type - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7612,8 +7922,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=return-type" found="yes" @@ -7631,29 +7941,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5 -$as_echo_n "checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5 +printf %s "checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; } cacheid=xorg_cv_cc_flag__errwarn_E_FUNC_HAS_NO_RETURN_STMT - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7661,8 +7973,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT" found="yes" @@ -7687,24 +7999,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7714,24 +8028,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7749,29 +8065,31 @@ found="no" CFLAGS="$CFLAGS -Werror=trigraphs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=trigraphs" >&5 -$as_echo_n "checking if $CC supports -Werror=trigraphs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=trigraphs" >&5 +printf %s "checking if $CC supports -Werror=trigraphs... " >&6; } cacheid=xorg_cv_cc_flag__Werror_trigraphs - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7779,8 +8097,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=trigraphs" found="yes" @@ -7805,24 +8123,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7832,24 +8152,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7867,29 +8189,31 @@ found="no" CFLAGS="$CFLAGS -Werror=array-bounds" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=array-bounds" >&5 -$as_echo_n "checking if $CC supports -Werror=array-bounds... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=array-bounds" >&5 +printf %s "checking if $CC supports -Werror=array-bounds... " >&6; } cacheid=xorg_cv_cc_flag__Werror_array_bounds - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7897,8 +8221,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=array-bounds" found="yes" @@ -7923,24 +8247,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7950,24 +8276,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7985,29 +8313,31 @@ found="no" CFLAGS="$CFLAGS -Werror=write-strings" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=write-strings" >&5 -$as_echo_n "checking if $CC supports -Werror=write-strings... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=write-strings" >&5 +printf %s "checking if $CC supports -Werror=write-strings... " >&6; } cacheid=xorg_cv_cc_flag__Werror_write_strings - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8015,8 +8345,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=write-strings" found="yes" @@ -8041,24 +8371,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8068,24 +8400,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8103,29 +8437,31 @@ found="no" CFLAGS="$CFLAGS -Werror=address" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=address" >&5 -$as_echo_n "checking if $CC supports -Werror=address... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=address" >&5 +printf %s "checking if $CC supports -Werror=address... " >&6; } cacheid=xorg_cv_cc_flag__Werror_address - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8133,8 +8469,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=address" found="yes" @@ -8159,24 +8495,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8186,24 +8524,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8221,29 +8561,31 @@ found="no" CFLAGS="$CFLAGS -Werror=int-to-pointer-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=int-to-pointer-cast" >&5 -$as_echo_n "checking if $CC supports -Werror=int-to-pointer-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=int-to-pointer-cast" >&5 +printf %s "checking if $CC supports -Werror=int-to-pointer-cast... " >&6; } cacheid=xorg_cv_cc_flag__Werror_int_to_pointer_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8251,8 +8593,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=int-to-pointer-cast" found="yes" @@ -8270,29 +8612,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION" >&5 -$as_echo_n "checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION" >&5 +printf %s "checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; } cacheid=xorg_cv_cc_flag__errwarn_E_BAD_PTR_INT_COMBINATION - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8300,8 +8644,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION" found="yes" @@ -8326,24 +8670,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8353,24 +8699,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8388,29 +8736,31 @@ found="no" CFLAGS="$CFLAGS -Werror=pointer-to-int-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=pointer-to-int-cast" >&5 -$as_echo_n "checking if $CC supports -Werror=pointer-to-int-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=pointer-to-int-cast" >&5 +printf %s "checking if $CC supports -Werror=pointer-to-int-cast... " >&6; } cacheid=xorg_cv_cc_flag__Werror_pointer_to_int_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8418,8 +8768,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=pointer-to-int-cast" found="yes" @@ -8428,8 +8778,8 @@ $as_echo "$supported" >&6; } # Also -errwarn=E_BAD_PTR_INT_COMBINATION else -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&5 -$as_echo "$as_me: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&5 +printf "%s\n" "$as_me: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&2;} @@ -8447,24 +8797,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8474,24 +8826,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8509,29 +8863,31 @@ found="no" CFLAGS="$CFLAGS -Wimplicit" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wimplicit" >&5 -$as_echo_n "checking if $CC supports -Wimplicit... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wimplicit" >&5 +printf %s "checking if $CC supports -Wimplicit... " >&6; } cacheid=xorg_cv_cc_flag__Wimplicit - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8539,8 +8895,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wimplicit" found="yes" @@ -8565,24 +8921,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8592,24 +8950,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8627,29 +8987,31 @@ found="no" CFLAGS="$CFLAGS -Wnonnull" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnonnull" >&5 -$as_echo_n "checking if $CC supports -Wnonnull... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnonnull" >&5 +printf %s "checking if $CC supports -Wnonnull... " >&6; } cacheid=xorg_cv_cc_flag__Wnonnull - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8657,8 +9019,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wnonnull" found="yes" @@ -8683,24 +9045,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8710,24 +9074,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8745,29 +9111,31 @@ found="no" CFLAGS="$CFLAGS -Winit-self" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Winit-self" >&5 -$as_echo_n "checking if $CC supports -Winit-self... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Winit-self" >&5 +printf %s "checking if $CC supports -Winit-self... " >&6; } cacheid=xorg_cv_cc_flag__Winit_self - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8775,8 +9143,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Winit-self" found="yes" @@ -8801,24 +9169,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8828,24 +9198,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8863,29 +9235,31 @@ found="no" CFLAGS="$CFLAGS -Wmain" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmain" >&5 -$as_echo_n "checking if $CC supports -Wmain... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmain" >&5 +printf %s "checking if $CC supports -Wmain... " >&6; } cacheid=xorg_cv_cc_flag__Wmain - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8893,8 +9267,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmain" found="yes" @@ -8919,24 +9293,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8946,24 +9322,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8981,29 +9359,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-braces" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-braces" >&5 -$as_echo_n "checking if $CC supports -Wmissing-braces... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-braces" >&5 +printf %s "checking if $CC supports -Wmissing-braces... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_braces - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9011,8 +9391,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-braces" found="yes" @@ -9037,24 +9417,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9064,24 +9446,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9099,29 +9483,31 @@ found="no" CFLAGS="$CFLAGS -Wsequence-point" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wsequence-point" >&5 -$as_echo_n "checking if $CC supports -Wsequence-point... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wsequence-point" >&5 +printf %s "checking if $CC supports -Wsequence-point... " >&6; } cacheid=xorg_cv_cc_flag__Wsequence_point - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9129,8 +9515,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wsequence-point" found="yes" @@ -9155,24 +9541,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9182,24 +9570,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9217,29 +9607,31 @@ found="no" CFLAGS="$CFLAGS -Wreturn-type" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wreturn-type" >&5 -$as_echo_n "checking if $CC supports -Wreturn-type... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wreturn-type" >&5 +printf %s "checking if $CC supports -Wreturn-type... " >&6; } cacheid=xorg_cv_cc_flag__Wreturn_type - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9247,8 +9639,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wreturn-type" found="yes" @@ -9273,24 +9665,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9300,24 +9694,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9335,29 +9731,31 @@ found="no" CFLAGS="$CFLAGS -Wtrigraphs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wtrigraphs" >&5 -$as_echo_n "checking if $CC supports -Wtrigraphs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wtrigraphs" >&5 +printf %s "checking if $CC supports -Wtrigraphs... " >&6; } cacheid=xorg_cv_cc_flag__Wtrigraphs - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9365,8 +9763,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wtrigraphs" found="yes" @@ -9391,24 +9789,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9418,24 +9818,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9453,29 +9855,31 @@ found="no" CFLAGS="$CFLAGS -Warray-bounds" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Warray-bounds" >&5 -$as_echo_n "checking if $CC supports -Warray-bounds... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Warray-bounds" >&5 +printf %s "checking if $CC supports -Warray-bounds... " >&6; } cacheid=xorg_cv_cc_flag__Warray_bounds - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9483,8 +9887,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Warray-bounds" found="yes" @@ -9509,24 +9913,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9536,24 +9942,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9571,29 +9979,31 @@ found="no" CFLAGS="$CFLAGS -Wwrite-strings" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wwrite-strings" >&5 -$as_echo_n "checking if $CC supports -Wwrite-strings... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wwrite-strings" >&5 +printf %s "checking if $CC supports -Wwrite-strings... " >&6; } cacheid=xorg_cv_cc_flag__Wwrite_strings - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9601,8 +10011,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wwrite-strings" found="yes" @@ -9627,24 +10037,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9654,24 +10066,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9689,29 +10103,31 @@ found="no" CFLAGS="$CFLAGS -Waddress" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Waddress" >&5 -$as_echo_n "checking if $CC supports -Waddress... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Waddress" >&5 +printf %s "checking if $CC supports -Waddress... " >&6; } cacheid=xorg_cv_cc_flag__Waddress - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9719,8 +10135,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Waddress" found="yes" @@ -9745,24 +10161,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9772,24 +10190,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9807,29 +10227,31 @@ found="no" CFLAGS="$CFLAGS -Wint-to-pointer-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wint-to-pointer-cast" >&5 -$as_echo_n "checking if $CC supports -Wint-to-pointer-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wint-to-pointer-cast" >&5 +printf %s "checking if $CC supports -Wint-to-pointer-cast... " >&6; } cacheid=xorg_cv_cc_flag__Wint_to_pointer_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9837,8 +10259,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wint-to-pointer-cast" found="yes" @@ -9863,24 +10285,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9890,24 +10314,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9925,29 +10351,31 @@ found="no" CFLAGS="$CFLAGS -Wpointer-to-int-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-to-int-cast" >&5 -$as_echo_n "checking if $CC supports -Wpointer-to-int-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-to-int-cast" >&5 +printf %s "checking if $CC supports -Wpointer-to-int-cast... " >&6; } cacheid=xorg_cv_cc_flag__Wpointer_to_int_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9955,8 +10383,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wpointer-to-int-cast" found="yes" @@ -9985,9 +10413,10 @@ fi # Check whether --enable-strict-compilation was given. -if test "${enable_strict_compilation+set}" = set; then : +if test ${enable_strict_compilation+y} +then : enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval -else +else $as_nop STRICT_COMPILE=no fi @@ -10014,24 +10443,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10041,24 +10472,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10076,29 +10509,31 @@ found="no" CFLAGS="$CFLAGS -pedantic" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -pedantic" >&5 -$as_echo_n "checking if $CC supports -pedantic... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -pedantic" >&5 +printf %s "checking if $CC supports -pedantic... " >&6; } cacheid=xorg_cv_cc_flag__pedantic - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -10106,8 +10541,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -pedantic" found="yes" @@ -10132,24 +10567,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10159,24 +10596,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10194,29 +10633,31 @@ found="no" CFLAGS="$CFLAGS -Werror" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5 -$as_echo_n "checking if $CC supports -Werror... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5 +printf %s "checking if $CC supports -Werror... " >&6; } cacheid=xorg_cv_cc_flag__Werror - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -10224,8 +10665,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -Werror" found="yes" @@ -10243,29 +10684,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -errwarn" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn" >&5 -$as_echo_n "checking if $CC supports -errwarn... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn" >&5 +printf %s "checking if $CC supports -errwarn... " >&6; } cacheid=xorg_cv_cc_flag__errwarn - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -10273,8 +10716,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -errwarn" found="yes" @@ -10302,24 +10745,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10329,24 +10774,26 @@ if test "x$xorg_testset_cc_unused_command_line_argumen CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10364,29 +10811,31 @@ found="no" CFLAGS="$CFLAGS -Werror=attributes" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5 -$as_echo_n "checking if $CC supports -Werror=attributes... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5 +printf %s "checking if $CC supports -Werror=attributes... " >&6; } cacheid=xorg_cv_cc_flag__Werror_attributes - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -10394,8 +10843,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes" found="yes" @@ -10425,18 +10874,14 @@ _ACEOF PVM="0" fi -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION_MINOR $PVM -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION_MINOR $PVM" >>confdefs.h PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` if test "x$PVP" = "x"; then PVP="0" fi -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION_PATCHLEVEL $PVP -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION_PATCHLEVEL $PVP" >>confdefs.h @@ -10466,11 +10911,12 @@ case $host_os in # Solaris 2.0 - 11.3 use SysV man page section numbers, so we # check for a man page file found in later versions that use # traditional section numbers instead - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5 -$as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; } -if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5 +printf %s "checking for /usr/share/man/man7/attributes.7... " >&6; } +if test ${ac_cv_file__usr_share_man_man7_attributes_7+y} +then : + printf %s "(cached) " >&6 +else $as_nop test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/usr/share/man/man7/attributes.7"; then @@ -10479,11 +10925,12 @@ else ac_cv_file__usr_share_man_man7_attributes_7=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5 -$as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } -if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5 +printf "%s\n" "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } +if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes +then : SYSV_MAN_SECTIONS=false -else +else $as_nop SYSV_MAN_SECTIONS=true fi @@ -10578,7 +11025,8 @@ MAN_SUBSTS="\ # Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : +if test ${enable_silent_rules+y} +then : enableval=$enable_silent_rules; fi @@ -10588,12 +11036,13 @@ case $enable_silent_rules in # ((( *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +printf %s "checking whether $am_make supports nested variables... " >&6; } +if test ${am_cv_make_support_nested_variables+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if printf "%s\n" 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -10605,8 +11054,8 @@ else am_cv_make_support_nested_variables=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -10624,11 +11073,12 @@ for ac_prog in 'bison -y' byacc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_YACC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_YACC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else @@ -10636,11 +11086,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_YACC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10651,11 +11105,11 @@ fi fi YACC=$ac_cv_prog_YACC if test -n "$YACC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 -$as_echo "$YACC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 +printf "%s\n" "$YACC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -10665,11 +11119,12 @@ 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 -{ $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 +{ 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 case $YACC_INST in [\\/]* | ?:[\\/]*) ac_cv_path_YACC_INST="$YACC_INST" # Let the user override the test with a path. @@ -10679,11 +11134,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_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 + 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 break 2 fi done @@ -10695,11 +11154,11 @@ esac fi YACC_INST=$ac_cv_path_YACC_INST if test -n "$YACC_INST"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC_INST" >&5 -$as_echo "$YACC_INST" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACC_INST" >&5 +printf "%s\n" "$YACC_INST" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -10709,33 +11168,52 @@ if test ! -f "$srcdir/xkbparse.c"; then fi fi -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 +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 -done +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 + +fi + + # Checks for pkg-config packages pkg_failed=no -{ $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; } +{ 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; } if test -n "$XKBCOMP_CFLAGS"; then pkg_cv_XKBCOMP_CFLAGS="$XKBCOMP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xkbfile xproto >= 7.0.17\""; } >&5 + { { printf "%s\n" "$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=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XKBCOMP_CFLAGS=`$PKG_CONFIG --cflags "x11 xkbfile xproto >= 7.0.17" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -10749,10 +11227,10 @@ if test -n "$XKBCOMP_LIBS"; then pkg_cv_XKBCOMP_LIBS="$XKBCOMP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xkbfile xproto >= 7.0.17\""; } >&5 + { { printf "%s\n" "$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=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XKBCOMP_LIBS=`$PKG_CONFIG --libs "x11 xkbfile xproto >= 7.0.17" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -10766,8 +11244,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -10793,10 +11271,10 @@ Alternatively, you may set the environment variables X 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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -10810,24 +11288,26 @@ See \`config.log' for more details" "$LINENO" 5; } else XKBCOMP_CFLAGS=$pkg_cv_XKBCOMP_CFLAGS XKBCOMP_LIBS=$pkg_cv_XKBCOMP_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi # Checks for typedefs, structures, and compiler characteristics. # Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then : +if test ${enable_largefile+y} +then : enableval=$enable_largefile; fi if test "$enable_largefile" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if ${ac_cv_sys_largefile_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +printf %s "checking for special C compiler options needed for large files... " >&6; } +if test ${ac_cv_sys_largefile_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then ac_save_CC=$CC @@ -10841,44 +11321,47 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : break fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_largefile_CC=' -n32'; break fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam break done CC=$ac_save_CC rm -f conftest.$ac_ext fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -$as_echo "$ac_cv_sys_largefile_CC" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if ${ac_cv_sys_file_offset_bits+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if test ${ac_cv_sys_file_offset_bits+y} +then : + printf %s "(cached) " >&6 +else $as_nop while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10887,22 +11370,23 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_file_offset_bits=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 @@ -10911,43 +11395,43 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_file_offset_bits=64; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_sys_file_offset_bits=unknown break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; *) -cat >>confdefs.h <<_ACEOF -#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -_ACEOF +printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h ;; esac rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if ${ac_cv_sys_large_files+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } +if test ${ac_cv_sys_large_files+y} +then : + printf %s "(cached) " >&6 +else $as_nop while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10956,22 +11440,23 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_large_files=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _LARGE_FILES 1 @@ -10980,48 +11465,46 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_large_files=1; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_sys_large_files=unknown break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -$as_echo "$ac_cv_sys_large_files" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +printf "%s\n" "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; *) -cat >>confdefs.h <<_ACEOF -#define _LARGE_FILES $ac_cv_sys_large_files -_ACEOF +printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h ;; esac rm -rf conftest* fi - - fi # Check whether --with-xkb_config_root was given. -if test "${with_xkb_config_root+set}" = set; then : +if test ${with_xkb_config_root+y} +then : withval=$with_xkb_config_root; XKBCONFIGROOT="$withval" -else +else $as_nop XKBCONFIGROOT='${datadir}/X11/xkb' fi @@ -11057,8 +11540,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -11088,15 +11571,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var cont /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -11110,8 +11593,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;} fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -11128,7 +11611,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -11139,14 +11622,22 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 -$as_echo_n "checking that generated files are newer than configure... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +printf %s "checking that generated files are newer than configure... " >&6; } if test -n "$am_sleep_pid"; then # Hide warnings about reused PIDs. wait $am_sleep_pid 2>/dev/null fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 -$as_echo "done" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 +printf "%s\n" "done" >&6; } +if test -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 if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -11159,21 +11650,13 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAI 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" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -11196,14 +11679,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -11213,46 +11698,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi + # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -11261,13 +11746,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -11276,8 +11754,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -11289,32 +11771,12 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are @@ -11325,13 +11787,14 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -11358,18 +11821,20 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset + # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -11381,12 +11846,13 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -11417,7 +11883,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -11439,6 +11905,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -11452,6 +11922,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -11493,7 +11969,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -11502,7 +11978,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -11564,8 +12040,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.6, which was -generated by GNU Autoconf 2.69. Invocation command line was +This file was extended by xkbcomp $as_me 1.4.7, which was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -11627,14 +12103,16 @@ $config_commands Report bugs to ." _ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -xkbcomp config.status 1.4.6 -configured by $0, generated by GNU Autoconf 2.69, +xkbcomp config.status 1.4.7 +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -11674,15 +12152,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -11690,7 +12168,7 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -11699,7 +12177,7 @@ do as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -11727,7 +12205,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -11741,7 +12219,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF @@ -11775,9 +12253,9 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files + test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers + test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree @@ -12113,7 +12591,7 @@ do esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -12121,17 +12599,17 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -12148,7 +12626,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -12172,9 +12650,9 @@ $as_echo X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -12236,8 +12714,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -12281,9 +12759,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -12299,20 +12777,20 @@ which seems to be undefined. Please make sure it is d # if test x"$ac_file" != x-; then { - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi @@ -12332,7 +12810,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| X"$_am_arg" : 'X\(//\)[^/]' \| \ X"$_am_arg" : 'X\(//\)$' \| \ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$_am_arg" | +printf "%s\n" X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -12352,8 +12830,8 @@ $as_echo X"$_am_arg" | s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} + :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +printf "%s\n" "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -12385,7 +12863,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | +printf "%s\n" X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -12427,7 +12905,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | +printf "%s\n" X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -12486,7 +12964,7 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi blob - 3aedf484b26ce9963ec55370adb68931e11f6a18 blob + 7a73509464612ae9dde542772b8772117b6eda0b --- app/xkbcomp/configure.ac +++ app/xkbcomp/configure.ac @@ -21,12 +21,17 @@ dnl dnl Process this file with autoconf to create configure. # Initialize Autoconf -AC_PREREQ([2.60]) -AC_INIT([xkbcomp], [1.4.6], +AC_PREREQ([2.70]) +AC_INIT([xkbcomp], [1.4.7], [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]) @@ -45,7 +50,7 @@ if test ! -f "$srcdir/xkbparse.c"; then fi fi -AC_CHECK_FUNCS([strdup strcasecmp]) +AC_CHECK_FUNCS([asprintf reallocarray recallocarray strdup strcasecmp]) # Checks for pkg-config packages PKG_CHECK_MODULES(XKBCOMP, [x11 xkbfile xproto >= 7.0.17]) blob - 3555d64a4e95f047d7170046509ee49ed7b302a4 blob + f31f412e31c3881af8445f504e0da7061798ddfe --- app/xkbcomp/expr.c +++ app/xkbcomp/expr.c @@ -94,7 +94,7 @@ exprOpText(unsigned type) return buf; } -char * +static char * exprTypeText(unsigned type) { static char buf[20]; @@ -127,9 +127,8 @@ exprTypeText(unsigned type) } int -ExprResolveLhs(ExprDef * expr, - ExprResult * elem_rtrn, - ExprResult * field_rtrn, ExprDef ** index_rtrn) +ExprResolveLhs(const ExprDef *expr, ExprResult *elem_rtrn, + ExprResult *field_rtrn, ExprDef **index_rtrn) { switch (expr->op) { @@ -154,11 +153,10 @@ ExprResolveLhs(ExprDef * expr, } Bool -SimpleLookup(XPointer priv, - Atom elem, Atom field, unsigned type, ExprResult * val_rtrn) +SimpleLookup(const XPointer priv, + Atom elem, Atom field, unsigned type, ExprResult *val_rtrn) { - LookupEntry *entry; - register char *str; + char *str; if ((priv == NULL) || (field == None) || (elem != None) || @@ -167,7 +165,7 @@ SimpleLookup(XPointer priv, return False; } str = XkbAtomGetString(NULL, field); - for (entry = (LookupEntry *) priv; + for (const LookupEntry *entry = (const LookupEntry *) priv; (entry != NULL) && (entry->name != NULL); entry++) { if (uStrCaseCmp(str, entry->name) == 0) @@ -182,10 +180,10 @@ SimpleLookup(XPointer priv, } Bool -RadioLookup(XPointer priv, - Atom elem, Atom field, unsigned type, ExprResult * val_rtrn) +RadioLookup(const XPointer priv, + Atom elem, Atom field, unsigned type, ExprResult *val_rtrn) { - register char *str; + char *str; int rg; if ((field == None) || (elem != None) || (type != TypeInt)) @@ -209,12 +207,13 @@ RadioLookup(XPointer priv, return True; } -int +#if 0 +static int TableLookup(XPointer priv, Atom elem, Atom field, unsigned type, ExprResult * val_rtrn) { LookupTable *tbl = (LookupTable *) priv; - register char *str; + char *str; if ((priv == NULL) || (field == None) || (type != TypeInt)) return False; @@ -234,6 +233,7 @@ 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} }; -int -LookupModIndex(XPointer priv, - Atom elem, Atom field, unsigned type, ExprResult * val_rtrn) +Bool +LookupModIndex(const XPointer priv, + Atom elem, Atom field, unsigned type, ExprResult *val_rtrn) { return SimpleLookup((XPointer) modIndexNames, elem, field, type, val_rtrn); } -int +static 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 = (1 << val_rtrn->uval); + val_rtrn->uval = (1U << val_rtrn->uval); else if (priv != NULL) { LookupPriv *lpriv = (LookupPriv *) priv; @@ -286,8 +286,9 @@ LookupModMask(XPointer priv, return True; } +#if 0 int -ExprResolveModIndex(ExprDef * expr, +ExprResolveModIndex(const ExprDef *expr, ExprResult * val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { @@ -362,23 +363,23 @@ ExprResolveModIndex(ExprDef * expr, } return ok; } +#endif int -ExprResolveModMask(ExprDef * expr, - ExprResult * val_rtrn, +ExprResolveModMask(const ExprDef *expr, ExprResult *val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { - LookupPriv priv; + LookupPriv priv = { + .priv = NULL, + .chain = lookup, + .chainPriv = lookupPriv + }; - priv.priv = NULL; - priv.chain = lookup; - priv.chainPriv = lookupPriv; - return ExprResolveMask(expr, val_rtrn, LookupModMask, (XPointer) & priv); + return ExprResolveMask(expr, val_rtrn, LookupModMask, (XPointer) &priv); } int -ExprResolveBoolean(ExprDef * expr, - ExprResult * val_rtrn, +ExprResolveBoolean(const ExprDef *expr, ExprResult *val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { int ok = 0; @@ -443,23 +444,24 @@ ExprResolveBoolean(ExprDef * expr, val_rtrn->uval = !val_rtrn->uval; return ok; case OpAdd: - if (bogus == NULL) - bogus = "Addition"; + bogus = "Addition"; + goto boolean; case OpSubtract: - if (bogus == NULL) - bogus = "Subtraction"; + bogus = "Subtraction"; + goto boolean; case OpMultiply: - if (bogus == NULL) - bogus = "Multiplication"; + bogus = "Multiplication"; + goto boolean; case OpDivide: - if (bogus == NULL) - bogus = "Division"; + bogus = "Division"; + goto boolean; case OpAssign: - if (bogus == NULL) - bogus = "Assignment"; + bogus = "Assignment"; + goto boolean; case OpNegate: - if (bogus == NULL) - bogus = "Negation"; + bogus = "Negation"; + goto boolean; + boolean: ERROR("%s of boolean values not permitted\n", bogus); break; case OpUnaryPlus: @@ -473,8 +475,7 @@ ExprResolveBoolean(ExprDef * expr, } int -ExprResolveFloat(ExprDef * expr, - ExprResult * val_rtrn, +ExprResolveFloat(const ExprDef *expr, ExprResult *val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { int ok = 0; @@ -486,7 +487,7 @@ ExprResolveFloat(ExprDef * expr, case ExprValue: if (expr->type == TypeString) { - register char *str; + char *str; str = XkbAtomGetString(NULL, expr->value.str); if ((str != NULL) && (strlen(str) == 1)) { @@ -586,8 +587,7 @@ ExprResolveFloat(ExprDef * expr, } int -ExprResolveInteger(ExprDef * expr, - ExprResult * val_rtrn, +ExprResolveInteger(const ExprDef *expr, ExprResult *val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { int ok = 0; @@ -599,7 +599,7 @@ ExprResolveInteger(ExprDef * expr, case ExprValue: if (expr->type == TypeString) { - register char *str; + char *str; str = XkbAtomGetString(NULL, expr->value.str); if (str != NULL) switch (strlen(str)) @@ -707,8 +707,7 @@ ExprResolveInteger(ExprDef * expr, } int -ExprResolveString(ExprDef * expr, - ExprResult * val_rtrn, +ExprResolveString(const ExprDef *expr, ExprResult *val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { int ok = 0; @@ -761,36 +760,44 @@ ExprResolveString(ExprDef * expr, if (ExprResolveString(left, &leftRtrn, lookup, lookupPriv) && ExprResolveString(right, &rightRtrn, lookup, lookupPriv)) { - int len; char *new; - len = strlen(leftRtrn.str) + strlen(rightRtrn.str) + 1; - new = (char *) uAlloc(len); + +#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 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: - if (bogus == NULL) - bogus = "Subtraction"; + bogus = "Subtraction"; + goto string; case OpMultiply: - if (bogus == NULL) - bogus = "Multiplication"; + bogus = "Multiplication"; + goto string; case OpDivide: - if (bogus == NULL) - bogus = "Division"; + bogus = "Division"; + goto string; case OpAssign: - if (bogus == NULL) - bogus = "Assignment"; + bogus = "Assignment"; + goto string; case OpNegate: - if (bogus == NULL) - bogus = "Negation"; + bogus = "Negation"; + goto string; case OpInvert: - if (bogus == NULL) - bogus = "Bitwise complement"; + bogus = "Bitwise complement"; + goto string; + string: ERROR("%s of string values not permitted\n", bogus); return False; case OpNot: @@ -815,8 +822,7 @@ ExprResolveString(ExprDef * expr, } int -ExprResolveKeyName(ExprDef * expr, - ExprResult * val_rtrn, +ExprResolveKeyName(const ExprDef *expr, ExprResult *val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { int ok = 0; @@ -858,26 +864,27 @@ ExprResolveKeyName(ExprDef * expr, XkbAtomText(NULL, expr->value.field.field, XkbMessage)); return ok; case OpAdd: - if (bogus == NULL) - bogus = "Addition"; + bogus = "Addition"; + goto keyname; case OpSubtract: - if (bogus == NULL) - bogus = "Subtraction"; + bogus = "Subtraction"; + goto keyname; case OpMultiply: - if (bogus == NULL) - bogus = "Multiplication"; - case OpDivide: - if (bogus == NULL) - bogus = "Division"; + bogus = "Multiplication"; + goto keyname; + case OpDivide: + bogus = "Division"; + goto keyname; case OpAssign: - if (bogus == NULL) - bogus = "Assignment"; + bogus = "Assignment"; + goto keyname; case OpNegate: - if (bogus == NULL) - bogus = "Negation"; + bogus = "Negation"; + goto keyname; case OpInvert: - if (bogus == NULL) - bogus = "Bitwise complement"; + bogus = "Bitwise complement"; + goto keyname; + keyname: ERROR("%s of key name values not permitted\n", bogus); return False; case OpNot: @@ -904,7 +911,8 @@ ExprResolveKeyName(ExprDef * expr, /***====================================================================***/ int -ExprResolveEnum(ExprDef * expr, ExprResult * val_rtrn, LookupEntry * values) +ExprResolveEnum(const ExprDef *expr, ExprResult *val_rtrn, + const LookupEntry *values) { if (expr->op != ExprIdent) { @@ -934,13 +942,12 @@ ExprResolveEnum(ExprDef * expr, ExprResult * val_rtrn, } int -ExprResolveMask(ExprDef * expr, - ExprResult * val_rtrn, +ExprResolveMask(const ExprDef *expr, ExprResult *val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { int ok = 0; ExprResult leftRtrn, rightRtrn; - ExprDef *left, *right; + const ExprDef *left, *right; const char *bogus = NULL; switch (expr->op) @@ -979,9 +986,11 @@ ExprResolveMask(ExprDef * expr, return ok; case ExprArrayRef: bogus = "array reference"; + goto unexpected_mask; case ExprActionDecl: - if (bogus == NULL) - bogus = "function use"; + bogus = "function use"; + goto unexpected_mask; + unexpected_mask: ERROR("Unexpected %s in mask expression\n", bogus); ACTION("Expression ignored\n"); return False; @@ -1041,16 +1050,16 @@ ExprResolveMask(ExprDef * expr, } int -ExprResolveKeySym(ExprDef * expr, - ExprResult * val_rtrn, +ExprResolveKeySym(const ExprDef *expr, ExprResult *val_rtrn, IdentLookupFunc lookup, XPointer lookupPriv) { int ok = 0; - KeySym sym; if (expr->op == ExprIdent) { - char *str; + const char *str; + KeySym sym; + str = XkbAtomGetString(NULL, expr->value.str); if ((str != NULL) && ((sym = XStringToKeysym(str)) != NoSymbol)) { blob - 163d474e5cc98b82aba736190a9867074d109012 blob + 75611905992149263a9ce5073e9e3bc096dce15d --- app/xkbcomp/expr.h +++ app/xkbcomp/expr.h @@ -35,17 +35,14 @@ typedef union _ExprResult XkbKeyNameRec keyName; } ExprResult; -typedef Bool(*IdentLookupFunc) (XPointer /* priv */ , +typedef Bool(*IdentLookupFunc) (const XPointer /* priv */ , Atom /* elem */ , Atom /* field */ , unsigned /* type */ , ExprResult * /* val_rtrn */ ); -extern char *exprTypeText(unsigned /* type */ - ); - -extern int ExprResolveLhs(ExprDef * /* expr */ , +extern int ExprResolveLhs(const ExprDef * /* expr */ , ExprResult * /* elem_rtrn */ , ExprResult * /* field_rtrn */ , ExprDef ** /* index_rtrn */ @@ -75,95 +72,81 @@ typedef struct _LookupTable extern char *exprOpText(unsigned /* type */ ); -extern int RadioLookup(XPointer /* priv */ , +extern Bool RadioLookup(const XPointer /* priv */ , Atom /* elem */ , Atom /* field */ , unsigned /* type */ , ExprResult * /* val_rtrn */ ); -extern int SimpleLookup(XPointer /* priv */ , +extern Bool SimpleLookup(const XPointer /* priv */ , Atom /* elem */ , Atom /* field */ , unsigned /* type */ , ExprResult * /* val_rtrn */ ); -extern int TableLookup(XPointer /* priv */ , - Atom /* elem */ , - Atom /* field */ , - unsigned /* type */ , - ExprResult * /* val_rtrn */ - ); - -extern int LookupModIndex(XPointer /* priv */ , +extern Bool LookupModIndex(const XPointer /* priv */ , Atom /* elem */ , Atom /* field */ , unsigned /* type */ , ExprResult * /* val_rtrn */ ); -extern int LookupModMask(XPointer /* priv */ , - Atom /* elem */ , - Atom /* field */ , - unsigned /* type */ , - ExprResult * /* val_rtrn */ - ); - -extern int ExprResolveModIndex(ExprDef * /* expr */ , +extern int ExprResolveModIndex(const ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* lookupPriv */ ); -extern int ExprResolveModMask(ExprDef * /* expr */ , +extern int ExprResolveModMask(const ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* priv */ ); -extern int ExprResolveBoolean(ExprDef * /* expr */ , +extern int ExprResolveBoolean(const ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* lookupPriv */ ); -extern int ExprResolveInteger(ExprDef * /* expr */ , +extern int ExprResolveInteger(const ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* lookupPriv */ ); -extern int ExprResolveFloat(ExprDef * /* expr */ , +extern int ExprResolveFloat(const ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* lookupPriv */ ); -extern int ExprResolveString(ExprDef * /* expr */ , +extern int ExprResolveString(const ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* lookupPriv */ ); -extern int ExprResolveKeyName(ExprDef * /* expr */ , +extern int ExprResolveKeyName(const ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* lookupPriv */ ); -extern int ExprResolveEnum(ExprDef * /* expr */ , +extern int ExprResolveEnum(const ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , - LookupEntry * /* values */ + const LookupEntry * /* values */ ); -extern int ExprResolveMask(ExprDef * /* expr */ , +extern int ExprResolveMask(const ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* lookupPriv */ ); -extern int ExprResolveKeySym(ExprDef * /* expr */ , +extern int ExprResolveKeySym(const ExprDef * /* expr */ , ExprResult * /* val_rtrn */ , IdentLookupFunc /* lookup */ , XPointer /* lookupPriv */ blob - a75961662e45668cfc1f430899121d01ad3d6670 blob + 69dfc3c65ee5cd89aaa3946caeba67de0ede22df --- app/xkbcomp/geometry.c +++ app/xkbcomp/geometry.c @@ -247,7 +247,7 @@ typedef struct _GeometryInfo } GeometryInfo; static char * -ddText(Display * dpy, DoodadInfo * di) +ddText(Display *dpy, const DoodadInfo *di) { static char buf[64]; @@ -269,7 +269,7 @@ ddText(Display * dpy, DoodadInfo * di) /***====================================================================***/ static void -InitPropertyInfo(PropertyInfo * pi, GeometryInfo * info) +InitPropertyInfo(PropertyInfo *pi, const GeometryInfo *info) { pi->defs.defined = 0; pi->defs.fileID = info->fileID; @@ -291,19 +291,17 @@ FreeProperties(PropertyInfo * pi, GeometryInfo * info) } for (tmp = pi; tmp != NULL; tmp = next) { - if (tmp->name) - uFree(tmp->name); - if (tmp->value) - uFree(tmp->value); + free(tmp->name); + free(tmp->value); tmp->name = tmp->value = NULL; next = (PropertyInfo *) tmp->defs.next; - uFree(tmp); + free(tmp); } return; } static void -InitKeyInfo(KeyInfo * key, RowInfo * row, GeometryInfo * info) +InitKeyInfo(KeyInfo *key, RowInfo *row, const GeometryInfo *info) { if (key != &row->dfltKey) @@ -315,12 +313,14 @@ InitKeyInfo(KeyInfo * key, RowInfo * row, GeometryInfo 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, GeometryInfo * info) +FreeKeys(KeyInfo *key, RowInfo *row, const GeometryInfo *info) { KeyInfo *tmp; KeyInfo *next; @@ -351,13 +351,13 @@ FreeKeys(KeyInfo * key, RowInfo * row, GeometryInfo * { ClearKeyInfo(tmp); next = (KeyInfo *) tmp->defs.next; - uFree(tmp); + free(tmp); } return; } static void -InitRowInfo(RowInfo * row, SectionInfo * section, GeometryInfo * info) +InitRowInfo(RowInfo *row, SectionInfo *section, const GeometryInfo *info) { if (row != §ion->dfltRow) { @@ -380,7 +380,7 @@ InitRowInfo(RowInfo * row, SectionInfo * section, Geom } static void -ClearRowInfo(RowInfo * row, GeometryInfo * info) +ClearRowInfo(RowInfo *row, const GeometryInfo *info) { row->defs.defined &= ~_GR_Default; row->top = row->left = 0; @@ -394,21 +394,20 @@ ClearRowInfo(RowInfo * row, GeometryInfo * info) } static void -FreeRows(RowInfo * row, SectionInfo * section, GeometryInfo * info) +FreeRows(RowInfo *row, SectionInfo *section, const GeometryInfo *info) { RowInfo *next; - RowInfo *tmp; if (row == section->rows) { section->nRows = 0; section->rows = NULL; } - for (tmp = row; tmp != NULL; tmp = next) + for (RowInfo *tmp = row; tmp != NULL; tmp = next) { ClearRowInfo(tmp, info); next = (RowInfo *) tmp->defs.next; - uFree(tmp); + free(tmp); } return; } @@ -527,7 +526,7 @@ FreeDoodads(DoodadInfo * di, SectionInfo * si, Geometr { next = (DoodadInfo *) tmp->defs.next; ClearDoodadInfo(tmp); - uFree(tmp); + free(tmp); } return; } @@ -558,7 +557,8 @@ InitSectionInfo(SectionInfo * si, GeometryInfo * info) } static void -DupSectionInfo(SectionInfo * into, SectionInfo * from, GeometryInfo * info) +DupSectionInfo(SectionInfo *into, const SectionInfo *from, + const GeometryInfo *info) { CommonInfo defs; @@ -617,7 +617,7 @@ FreeSections(SectionInfo * si, GeometryInfo * info) { ClearSectionInfo(tmp, info); next = (SectionInfo *) tmp->defs.next; - uFree(tmp); + free(tmp); } return; } @@ -637,24 +637,24 @@ FreeShapes(ShapeInfo * si, GeometryInfo * info) { if (tmp->outlines) { - register int i; + int i; for (i = 0; i < tmp->nOutlines; i++) { if (tmp->outlines[i].points != NULL) { - uFree(tmp->outlines[i].points); + free(tmp->outlines[i].points); tmp->outlines[i].num_points = 0; tmp->outlines[i].points = NULL; } } - uFree(tmp->outlines); + free(tmp->outlines); tmp->szOutlines = 0; tmp->nOutlines = 0; tmp->outlines = NULL; tmp->primary = tmp->approx = NULL; } next = (ShapeInfo *) tmp->defs.next; - uFree(tmp); + free(tmp); } return; } @@ -675,8 +675,7 @@ InitGeometryInfo(GeometryInfo * info, unsigned fileID, static void ClearGeometryInfo(GeometryInfo * info) { - if (info->name) - uFree(info->name); + free(info->name); info->name = NULL; if (info->props) FreeProperties(info->props, info); @@ -701,10 +700,9 @@ NextProperty(GeometryInfo * info) { PropertyInfo *pi; - pi = uTypedAlloc(PropertyInfo); + pi = calloc(1, sizeof(PropertyInfo)); if (pi) { - bzero((char *) pi, sizeof(PropertyInfo)); info->props = (PropertyInfo *) AddCommonInfo(&info->props->defs, (CommonInfo *) pi); info->nProps++; @@ -713,7 +711,7 @@ NextProperty(GeometryInfo * info) } static PropertyInfo * -FindProperty(GeometryInfo * info, char *name) +FindProperty(const GeometryInfo *info, const char *name) { PropertyInfo *old; @@ -749,8 +747,7 @@ AddProperty(GeometryInfo * info, PropertyInfo * new) ACTION("Ignoring \"%s\", using \"%s\"\n", old->value, new->value); } - if (old->value) - uFree(old->value); + free(old->value); old->value = uStringDup(new->value); return True; } @@ -779,10 +776,9 @@ NextShape(GeometryInfo * info) { ShapeInfo *si; - si = uTypedAlloc(ShapeInfo); + si = calloc(1, sizeof(ShapeInfo)); if (si) { - bzero((char *) si, sizeof(ShapeInfo)); info->shapes = (ShapeInfo *) AddCommonInfo(&info->shapes->defs, (CommonInfo *) si); info->nShapes++; @@ -883,7 +879,7 @@ NextDfltDoodad(SectionInfo * si, GeometryInfo * info) { DoodadInfo *di; - di = uTypedCalloc(1, DoodadInfo); + di = calloc(1, sizeof(DoodadInfo)); if (!di) return NULL; if (si) @@ -906,7 +902,7 @@ NextDoodad(SectionInfo * si, GeometryInfo * info) { DoodadInfo *di; - di = uTypedCalloc(1, DoodadInfo); + di = calloc(1, sizeof(DoodadInfo)); if (di) { if (si) @@ -1047,7 +1043,7 @@ AddOverlay(SectionInfo * si, GeometryInfo * info, Over return True; } old = new; - new = uTypedCalloc(1, OverlayInfo); + new = calloc(1, sizeof(OverlayInfo)); if (!new) { if (warningLevel > 0) @@ -1076,7 +1072,7 @@ NextSection(GeometryInfo * info) { SectionInfo *si; - si = uTypedAlloc(SectionInfo); + si = malloc(sizeof(SectionInfo)); if (si) { *si = info->dfltSection; @@ -1093,11 +1089,9 @@ NextSection(GeometryInfo * info) } static SectionInfo * -FindMatchingSection(GeometryInfo * info, SectionInfo * new) +FindMatchingSection(GeometryInfo *info, const SectionInfo *new) { - SectionInfo *old; - - for (old = info->sections; old != NULL; + for (SectionInfo *old = info->sections; old != NULL; old = (SectionInfo *) old->defs.next) { if (new->name == old->name) @@ -1168,7 +1162,7 @@ NextRow(SectionInfo * si) { RowInfo *row; - row = uTypedAlloc(RowInfo); + row = malloc(sizeof(RowInfo)); if (row) { *row = si->dfltRow; @@ -1205,7 +1199,7 @@ NextKey(RowInfo * row) { KeyInfo *key; - key = uTypedAlloc(KeyInfo); + key = malloc(sizeof(KeyInfo)); if (key) { *key = row->dfltKey; @@ -1353,8 +1347,7 @@ HandleIncludeGeometry(IncludeStmt * stmt, XkbDescPtr x (*hndlr) (rtrn, xkb, MergeOverride, &included); if (stmt->stmt != NULL) { - if (included.name != NULL) - uFree(included.name); + free(included.name); included.name = stmt->stmt; stmt->stmt = NULL; } @@ -1407,9 +1400,8 @@ HandleIncludeGeometry(IncludeStmt * stmt, XkbDescPtr x } static int -SetShapeField(ShapeInfo * si, - const char *field, - ExprDef * arrayNdx, ExprDef * value, GeometryInfo * info) +SetShapeField(ShapeInfo *si, const char *field, + const ExprDef *arrayNdx, const ExprDef *value, GeometryInfo *info) { ExprResult tmp; @@ -1439,10 +1431,8 @@ SetShapeField(ShapeInfo * si, } static int -SetShapeDoodadField(DoodadInfo * di, - const char *field, - ExprDef * arrayNdx, - ExprDef * value, SectionInfo * si, GeometryInfo * info) +SetShapeDoodadField(DoodadInfo *di, const char *field, const ExprDef *arrayNdx, + const ExprDef *value, SectionInfo *si, GeometryInfo *info) { ExprResult tmp; const char *typeName; @@ -1509,10 +1499,8 @@ SetShapeDoodadField(DoodadInfo * di, #define FIELD_USHORT 2 static int -SetTextDoodadField(DoodadInfo * di, - const char *field, - ExprDef * arrayNdx, - ExprDef * value, SectionInfo * si, GeometryInfo * info) +SetTextDoodadField(DoodadInfo *di, const char *field, const ExprDef *arrayNdx, + const ExprDef *value, SectionInfo *si, GeometryInfo *info) { ExprResult tmp; unsigned def; @@ -1659,11 +1647,9 @@ SetTextDoodadField(DoodadInfo * di, } static int -SetIndicatorDoodadField(DoodadInfo * di, - const char *field, - ExprDef * arrayNdx, - ExprDef * value, - SectionInfo * si, GeometryInfo * info) +SetIndicatorDoodadField(DoodadInfo * di, const char *field, + const ExprDef *arrayNdx, const ExprDef *value, + SectionInfo *si, GeometryInfo *info) { ExprResult tmp; @@ -1704,10 +1690,8 @@ SetIndicatorDoodadField(DoodadInfo * di, } static int -SetLogoDoodadField(DoodadInfo * di, - const char *field, - ExprDef * arrayNdx, - ExprDef * value, SectionInfo * si, GeometryInfo * info) +SetLogoDoodadField(DoodadInfo *di, const char *field, const ExprDef *arrayNdx, + const ExprDef *value, SectionInfo *si, GeometryInfo *info) { ExprResult tmp; const char *typeName = "logo doodad"; @@ -1785,10 +1769,9 @@ SetLogoDoodadField(DoodadInfo * di, } static int -SetDoodadField(DoodadInfo * di, - const char *field, - ExprDef * arrayNdx, - ExprDef * value, SectionInfo * si, GeometryInfo * info) +SetDoodadField(DoodadInfo *di, const char *field, + const ExprDef *arrayNdx, const ExprDef *value, + SectionInfo *si, GeometryInfo *info) { ExprResult tmp; @@ -1888,9 +1871,9 @@ SetDoodadField(DoodadInfo * di, } static int -SetSectionField(SectionInfo * si, - const char *field, - ExprDef * arrayNdx, ExprDef * value, GeometryInfo * info) +SetSectionField(SectionInfo *si, const char *field, + const ExprDef *arrayNdx, const ExprDef *value, + GeometryInfo *info) { unsigned short *pField; unsigned def; @@ -1976,9 +1959,8 @@ SetSectionField(SectionInfo * si, } static int -SetRowField(RowInfo * row, - const char *field, - ExprDef * arrayNdx, ExprDef * value, GeometryInfo * info) +SetRowField(RowInfo *row, const char *field, + const ExprDef *arrayNdx, const ExprDef *value, GeometryInfo *info) { ExprResult tmp; @@ -2042,9 +2024,8 @@ SetRowField(RowInfo * row, } static int -SetKeyField(KeyInfo * key, - const char *field, - ExprDef * arrayNdx, ExprDef * value, GeometryInfo * info) +SetKeyField(KeyInfo *key, const char *field, + const ExprDef *arrayNdx, const ExprDef *value, GeometryInfo *info) { ExprResult tmp; @@ -2120,7 +2101,7 @@ SetKeyField(KeyInfo * key, } static int -SetGeometryProperty(GeometryInfo * info, char *property, ExprDef * value) +SetGeometryProperty(GeometryInfo *info, char *property, const ExprDef *value) { PropertyInfo pi; ExprResult result; @@ -2405,7 +2386,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsign return True; } si->nOutlines = def->nOutlines; - si->outlines = uTypedCalloc(def->nOutlines, XkbOutlineRec); + si->outlines = calloc(def->nOutlines, sizeof(XkbOutlineRec)); if (!si->outlines) { ERROR("Couldn't allocate outlines for \"%s\"\n", @@ -2426,7 +2407,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsign outline = &si->outlines[nOut++]; outline->num_points = ol->nPoints; outline->corner_radius = si->dfltCornerRadius; - outline->points = uTypedCalloc(ol->nPoints, XkbPointRec); + outline->points = calloc(ol->nPoints, sizeof(XkbPointRec)); if (!outline->points) { ERROR("Can't allocate points for \"%s\"\n", @@ -2550,8 +2531,6 @@ static int HandleOverlayDef(OverlayDef * def, unsigned merge, SectionInfo * si, GeometryInfo * info) { - OverlayKeyDef *keyDef; - OverlayKeyInfo *key; OverlayInfo ol; if ((def->nKeys < 1) && (warningLevel > 3)) @@ -2565,20 +2544,23 @@ HandleOverlayDef(OverlayDef * def, bzero(&ol, sizeof(OverlayInfo)); ol.name = XkbInternAtom(info->dpy, XkbAtomGetString(NULL, def->name), False); - for (keyDef = def->keys; keyDef; + for (OverlayKeyDef *keyDef = def->keys; keyDef; keyDef = (OverlayKeyDef *) keyDef->common.next) { - key = uTypedCalloc(1, OverlayKeyInfo); - if ((!key) && warningLevel > 0) + OverlayKeyInfo *key = calloc(1, sizeof(OverlayKeyInfo)); + if (!key) { - 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)); + 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)); + } return False; } - strncpy(key->over, keyDef->over, XkbKeyNameLength); - strncpy(key->under, keyDef->under, XkbKeyNameLength); + strncpy(key->over, keyDef->over, sizeof(key->over)); + strncpy(key->under, keyDef->under, sizeof(key->under)); key->sectionRow = _GOK_UnknownRow; key->overlayRow = _GOK_UnknownRow; ol.keys = (OverlayKeyInfo *) AddCommonInfo(&ol.keys->defs, @@ -2596,11 +2578,10 @@ HandleOverlayDef(OverlayDef * def, static Bool HandleComplexKey(KeyDef * def, KeyInfo * key, GeometryInfo * info) { - RowInfo *row; - ExprDef *expr; + RowInfo *row = key->row; - row = key->row; - for (expr = def->expr; expr != NULL; expr = (ExprDef *) expr->common.next) + for (ExprDef *expr = def->expr; expr != NULL; + expr = (ExprDef *) expr->common.next) { if (expr->op == OpAssign) { @@ -2654,15 +2635,13 @@ 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 = def->keys; keyDef != NULL; + for (KeyDef *keyDef = def->keys; keyDef != NULL; keyDef = (KeyDef *) keyDef->common.next) { if (keyDef->common.stmtType == StmtVarDef) @@ -2726,10 +2705,7 @@ static Bool HandleSectionBody(SectionDef * def, SectionInfo * si, unsigned merge, GeometryInfo * info) { - RowDef *rowDef; - DoodadInfo *di; - - for (rowDef = def->rows; rowDef != NULL; + for (RowDef *rowDef = def->rows; rowDef != NULL; rowDef = (RowDef *) rowDef->common.next) { if (rowDef->common.stmtType == StmtVarDef) @@ -2737,6 +2713,8 @@ 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)) @@ -2840,7 +2818,6 @@ HandleGeometryFile(XkbFile * file, XkbDescPtr xkb, unsigned merge, GeometryInfo * info) { ParseCommon *stmt; - const char *failWhat; if (merge == MergeDefault) merge = MergeAugment; @@ -2848,7 +2825,8 @@ HandleGeometryFile(XkbFile * file, stmt = file->defs; while (stmt) { - failWhat = NULL; + const char *failWhat = NULL; + switch (stmt->stmtType) { case StmtInclude: @@ -2881,17 +2859,18 @@ HandleGeometryFile(XkbFile * file, info->errorCount++; break; case StmtVModDef: - if (!failWhat) - failWhat = "virtual modifier"; + failWhat = "virtual modifier"; + goto fail; case StmtInterpDef: - if (!failWhat) - failWhat = "symbol interpretation"; - case StmtGroupCompatDef: - if (!failWhat) - failWhat = "group compatibility map"; + failWhat = "symbol interpretation"; + goto fail; + case StmtGroupCompatDef: + failWhat = "group compatibility map"; + goto fail; case StmtKeycodeDef: - if (!failWhat) - failWhat = "key name"; + failWhat = "key name"; + goto fail; + fail: ERROR("Interpretation files may not include other types\n"); ACTION("Ignoring %s definition.\n", failWhat); info->errorCount++; @@ -2919,9 +2898,9 @@ HandleGeometryFile(XkbFile * file, static Bool CopyShapeDef(Display * dpy, XkbGeometryPtr geom, ShapeInfo * si) { - register int i, n; + int n; XkbShapePtr shape; - XkbOutlinePtr old_outline, outline; + XkbOutlinePtr old_outline; Atom name; si->index = geom->num_shapes; @@ -2934,9 +2913,11 @@ CopyShapeDef(Display * dpy, XkbGeometryPtr geom, Shape return False; } old_outline = si->outlines; - for (i = 0; i < si->nOutlines; i++, old_outline++) + for (int i = 0; i < si->nOutlines; i++, old_outline++) { - outline = XkbAddGeomOutline(shape, old_outline->num_points); + XkbOutlinePtr outline = + XkbAddGeomOutline(shape, old_outline->num_points); + if (!outline) { WSGO("Couldn't allocate outline in shape\n"); @@ -3271,7 +3252,6 @@ 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; @@ -3290,15 +3270,22 @@ FontFromParts(Atom fontTok, None ? XkbAtomGetString(NULL, encodingTok) : DFLT_ENCODING); if (size == 0) size = DFLT_SIZE; - totalSize = + +#ifdef HAVE_ASPRINTF + if (asprintf(&rtrn, FONT_TEMPLATE, font, weight, slant, + setWidth, variant, size, encoding) < 0) + rtrn = NULL; +#else + size_t totalSize = strlen(FONT_TEMPLATE) + strlen(font) + strlen(weight) + strlen(slant); totalSize += strlen(setWidth) + strlen(variant) + strlen(encoding); - rtrn = uCalloc(totalSize, 1); + rtrn = calloc(totalSize, 1); if (rtrn) { snprintf(rtrn, totalSize, FONT_TEMPLATE, font, weight, slant, setWidth, variant, size, encoding); } +#endif return rtrn; } @@ -3401,8 +3388,7 @@ VerifyOverlayInfo(XkbGeometryPtr geom, OverlayInfo * oi, GeometryInfo * info, short rowMap[256], short rowSize[256]) { - register OverlayKeyInfo *ki, *next; - unsigned long oKey, uKey, sKey; + OverlayKeyInfo *ki, *next; XkbRowPtr row; XkbKeyPtr key; int r, k; @@ -3410,15 +3396,16 @@ VerifyOverlayInfo(XkbGeometryPtr geom, /* find out which row each key is in */ for (ki = oi->keys; ki != NULL; ki = (OverlayKeyInfo *) ki->defs.next) { - oKey = KeyNameToLong(ki->over); - uKey = KeyNameToLong(ki->under); + unsigned long oKey = KeyNameToLong(ki->over); + unsigned long 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++) { - sKey = KeyNameToLong(key->name.name); + unsigned long sKey = KeyNameToLong(key->name.name); if (sKey == oKey) { if (warningLevel > 0) @@ -3455,7 +3442,7 @@ VerifyOverlayInfo(XkbGeometryPtr geom, while ((oi->keys != NULL) && (oi->keys->sectionRow == _GOK_UnknownRow)) { next = (OverlayKeyInfo *) oi->keys->defs.next; - uFree(oi->keys); + free(oi->keys); oi->keys = next; oi->nKeys--; } @@ -3466,7 +3453,7 @@ VerifyOverlayInfo(XkbGeometryPtr geom, { ki->defs.next = next->defs.next; oi->nKeys--; - uFree(next); + free(next); next = (OverlayKeyInfo *) ki->defs.next; } } @@ -3501,11 +3488,7 @@ 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; @@ -3518,7 +3501,7 @@ CopyOverlayDef(XkbGeometryPtr geom, XkbAtomText(info->dpy, section->name, XkbMessage)); return False; } - for (i = 0; i < oi->nRows; i++) + for (int i = 0; i < oi->nRows; i++) { int tmp, row_under; for (tmp = 0, row_under = -1; @@ -3536,10 +3519,11 @@ CopyOverlayDef(XkbGeometryPtr geom, return False; } } - for (ki = oi->keys; ki != NULL; ki = (OverlayKeyInfo *) ki->defs.next) + for (OverlayKeyInfo *ki = oi->keys; ki != NULL; + ki = (OverlayKeyInfo *) ki->defs.next) { - row = &ol->rows[ki->overlayRow]; - key = &row->keys[row->num_keys++]; + XkbOverlayRowPtr row = &ol->rows[ki->overlayRow]; + XkbOverlayKeyPtr key = &row->keys[row->num_keys++]; bzero(key, sizeof(XkbOverlayKeyRec)); strncpy(key->over.name, ki->over, XkbKeyNameLength); strncpy(key->under.name, ki->under, XkbKeyNameLength); @@ -3553,10 +3537,6 @@ 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); @@ -3574,9 +3554,9 @@ CopySectionDef(XkbGeometryPtr geom, SectionInfo * si, section->height = si->height; section->angle = si->angle; section->priority = si->priority; - for (ri = si->rows; ri != NULL; ri = (RowInfo *) ri->defs.next) + for (RowInfo *ri = si->rows; ri != NULL; ri = (RowInfo *) ri->defs.next) { - row = XkbAddGeomRow(section, ri->nKeys); + XkbRowPtr row = XkbAddGeomRow(section, ri->nKeys); if (row == NULL) { WSGO("Couldn't allocate row in section\n"); @@ -3586,8 +3566,9 @@ CopySectionDef(XkbGeometryPtr geom, SectionInfo * si, row->top = ri->top; row->left = ri->left; row->vertical = ri->vertical; - for (ki = ri->keys; ki != NULL; ki = (KeyInfo *) ki->defs.next) + for (KeyInfo *ki = ri->keys; ki != NULL; ki = (KeyInfo *) ki->defs.next) { + XkbKeyPtr key; XkbColorPtr color; if ((ki->defs.defined & _GK_Name) == 0) { @@ -3628,16 +3609,15 @@ CopySectionDef(XkbGeometryPtr geom, SectionInfo * si, } if (si->doodads != NULL) { - DoodadInfo *di; - for (di = si->doodads; di != NULL; di = (DoodadInfo *) di->defs.next) + for (DoodadInfo *di = si->doodads; di != NULL; + di = (DoodadInfo *) di->defs.next) { CopyDoodadDef(geom, section, di, info); } } if (si->overlays != NULL) { - OverlayInfo *oi; - for (oi = si->overlays; oi != NULL; + for (OverlayInfo *oi = si->overlays; oi != NULL; oi = (OverlayInfo *) oi->defs.next) { CopyOverlayDef(geom, section, oi, info); @@ -3670,14 +3650,15 @@ CompileGeometry(XkbFile * file, XkbFileInfo * result, if (info.errorCount == 0) { XkbGeometryPtr geom; - 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; + XkbGeometrySizesRec sizes = { + .which = XkbGeomAllMask, + .num_properties = info.nProps, + .num_colors = 8, + .num_shapes = info.nShapes, + .num_sections = info.nSections, + .num_doodads = info.nDoodads + }; + if (XkbAllocGeometry(xkb, &sizes) != Success) { WSGO("Couldn't allocate GeometryRec\n"); @@ -3720,8 +3701,7 @@ CompileGeometry(XkbFile * file, XkbFileInfo * result, if (info.props) { - PropertyInfo *pi; - for (pi = info.props; pi != NULL; + for (PropertyInfo *pi = info.props; pi != NULL; pi = (PropertyInfo *) pi->defs.next) { if (!XkbAddGeomProperty(geom, pi->name, pi->value)) @@ -3730,8 +3710,7 @@ CompileGeometry(XkbFile * file, XkbFileInfo * result, } if (info.shapes) { - ShapeInfo *si; - for (si = info.shapes; si != NULL; + for (ShapeInfo *si = info.shapes; si != NULL; si = (ShapeInfo *) si->defs.next) { if (!CopyShapeDef(xkb->dpy, geom, si)) @@ -3740,8 +3719,7 @@ CompileGeometry(XkbFile * file, XkbFileInfo * result, } if (info.sections) { - SectionInfo *si; - for (si = info.sections; si != NULL; + for (SectionInfo *si = info.sections; si != NULL; si = (SectionInfo *) si->defs.next) { if (!CopySectionDef(geom, si, &info)) @@ -3750,8 +3728,7 @@ CompileGeometry(XkbFile * file, XkbFileInfo * result, } if (info.doodads) { - DoodadInfo *di; - for (di = info.doodads; di != NULL; + for (DoodadInfo *di = info.doodads; di != NULL; di = (DoodadInfo *) di->defs.next) { if (!CopyDoodadDef(geom, NULL, di, &info)) blob - b3e7d1825d09668b48ac4cf450f3f64950fd22b4 blob + 470091edd2072bdd66cf321065073c948904d68c --- app/xkbcomp/indicators.c +++ app/xkbcomp/indicators.c @@ -57,16 +57,17 @@ ClearIndicatorMapInfo(Display * dpy, LEDInfo * info) } LEDInfo * -AddIndicatorMap(LEDInfo * oldLEDs, LEDInfo * new) +AddIndicatorMap(LEDInfo *oldLEDs, const 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) && @@ -146,7 +147,7 @@ AddIndicatorMap(LEDInfo * oldLEDs, LEDInfo * new) last = old; } /* new definition */ - old = uTypedAlloc(LEDInfo); + old = malloc(sizeof(LEDInfo)); if (!old) { WSGO("Couldn't allocate indicator map\n"); @@ -198,9 +199,8 @@ static LookupEntry groupComponentNames[] = { }; int -SetIndicatorMapField(LEDInfo * led, - XkbDescPtr xkb, - const char *field, ExprDef *arrayNdx, ExprDef *value) +SetIndicatorMapField(LEDInfo *led, XkbDescPtr xkb, const char *field, + const ExprDef *arrayNdx, const ExprDef *value) { ExprResult rtrn; Bool ok; @@ -323,12 +323,10 @@ SetIndicatorMapField(LEDInfo * led, } LEDInfo * -HandleIndicatorMapDef(IndicatorMapDef * def, - XkbDescPtr xkb, - LEDInfo * dflt, LEDInfo * oldLEDs, unsigned merge) +HandleIndicatorMapDef(IndicatorMapDef *def, XkbDescPtr xkb, + const LEDInfo *dflt, LEDInfo *oldLEDs, unsigned merge) { - LEDInfo led, *rtrn; - VarDef *var; + LEDInfo led; Bool ok; if (def->merge != MergeDefault) @@ -339,7 +337,8 @@ HandleIndicatorMapDef(IndicatorMapDef * def, led.name = def->name; ok = True; - for (var = def->body; var != NULL; var = (VarDef *) var->common.next) + for (VarDef *var = def->body; var != NULL; + var = (VarDef *) var->common.next) { ExprResult elem, field; ExprDef *arrayNdx; @@ -364,7 +363,7 @@ HandleIndicatorMapDef(IndicatorMapDef * def, } if (ok) { - rtrn = AddIndicatorMap(oldLEDs, &led); + LEDInfo *rtrn = AddIndicatorMap(oldLEDs, &led); return rtrn; } return NULL; @@ -414,11 +413,11 @@ CopyIndicatorMapDefs(XkbFileInfo * result, LEDInfo * l last = led; } else - uFree(led); + free(led); } else { - register XkbIndicatorMapPtr im; + XkbIndicatorMapPtr im; im = &xkb->indicators->maps[led->indicator - 1]; im->flags = led->flags; im->which_groups = led->which_groups; @@ -430,7 +429,7 @@ CopyIndicatorMapDefs(XkbFileInfo * result, LEDInfo * l im->ctrls = led->ctrls; if (xkb->names != NULL) xkb->names->indicators[led->indicator - 1] = led->name; - uFree(led); + free(led); } } if (unboundRtrn != NULL) @@ -445,8 +444,7 @@ BindIndicators(XkbFileInfo * result, Bool force, LEDInfo * unbound, LEDInfo ** unboundRtrn) { XkbDescPtr xkb; - register int i; - register LEDInfo *led, *next, *last; + LEDInfo *led, *next, *last; xkb = result->xkb; if (xkb->names != NULL) @@ -455,7 +453,7 @@ BindIndicators(XkbFileInfo * result, { if (led->indicator == _LED_NotBound) { - for (i = 0; i < XkbNumIndicators; i++) + for (int i = 0; i < XkbNumIndicators; i++) { if (xkb->names->indicators[i] == led->name) { @@ -471,7 +469,7 @@ BindIndicators(XkbFileInfo * result, { if (led->indicator == _LED_NotBound) { - for (i = 0; i < XkbNumIndicators; i++) + for (int i = 0; i < XkbNumIndicators; i++) { if (xkb->names->indicators[i] == None) { @@ -501,7 +499,7 @@ BindIndicators(XkbFileInfo * result, if (force) { unbound = next; - uFree(led); + free(led); } else { @@ -526,7 +524,7 @@ BindIndicators(XkbFileInfo * result, led->indicator = _LED_NotBound; if (force) { - uFree(led); + free(led); unbound = next; } else @@ -555,7 +553,7 @@ BindIndicators(XkbFileInfo * result, else unbound = next; led->defs.next = NULL; - uFree(led); + free(led); } } } @@ -568,7 +566,7 @@ BindIndicators(XkbFileInfo * result, for (led = unbound; led != NULL; led = next) { next = (LEDInfo *) led->defs.next; - uFree(led); + free(led); } } return True; blob - 6bf6111e7280d8a735f5dcb3cde53037083def11 blob + befee602ede6c1f8048ed415f1a1d135a2252fdf --- app/xkbcomp/indicators.h +++ app/xkbcomp/indicators.h @@ -57,19 +57,19 @@ extern void ClearIndicatorMapInfo(Display * /* dpy */ extern LEDInfo *AddIndicatorMap(LEDInfo * /* oldLEDs */ , - LEDInfo * /* newLED */ + const LEDInfo * /* newLED */ ); extern int SetIndicatorMapField(LEDInfo * /* led */ , XkbDescPtr /* xkb */ , const char * /* field */ , - ExprDef * /* arrayNdx */ , - ExprDef * /* value */ + const ExprDef * /* arrayNdx */ , + const ExprDef * /* value */ ); extern LEDInfo *HandleIndicatorMapDef(IndicatorMapDef * /* stmt */ , XkbDescPtr /* xkb */ , - LEDInfo * /* dflt */ , + const LEDInfo * /* dflt */ , LEDInfo * /* oldLEDs */ , unsigned /* mergeMode */ ); blob - 377bb8687ffe16bfc79ea25c8667cabf72aaf2c2 blob + ec298b53740270ce82b326c4c2deaa5dcdec4596 --- app/xkbcomp/install-sh +++ app/xkbcomp/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,22 +64,16 @@ mvprog=${MVPROG-mv} rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -97,7 +87,7 @@ dir_arg= dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -114,18 +104,28 @@ Options: --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake@gnu.org. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,46 +137,62 @@ while test $# -ne 0; do -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; + -p) cpprog="$cpprog -p";; + -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -S) backupsuffix="$2" + shift;; - -T) no_target_directory=true;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; + -T) is_target_a_directory=never;; + --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +224,15 @@ if test $# -eq 0; then fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +248,16 @@ if test -z "$dir_arg"; then *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -250,6 +275,10 @@ do dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -266,178 +295,148 @@ do fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac + posix_mkdir=false + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -450,14 +449,25 @@ do else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -472,20 +482,24 @@ do # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -493,24 +507,24 @@ do # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 @@ -519,9 +533,9 @@ do done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: blob - 4a8973c95cd857f038b5e44e8aae4877772e1656 blob + a9dc2b4a317658b87c26af4933ee34d7ceb6bafe --- app/xkbcomp/keycodes.c +++ app/xkbcomp/keycodes.c @@ -89,7 +89,7 @@ static void HandleKeycodesFile(XkbFile * file, KeyNamesInfo * info); static void -InitIndicatorNameInfo(IndicatorNameInfo * ii, KeyNamesInfo * info) +InitIndicatorNameInfo(IndicatorNameInfo *ii, const KeyNamesInfo *info) { ii->defs.defined = 0; ii->defs.merge = info->merge; @@ -117,7 +117,7 @@ NextIndicatorName(KeyNamesInfo * info) { IndicatorNameInfo *ii; - ii = uTypedAlloc(IndicatorNameInfo); + ii = malloc(sizeof(IndicatorNameInfo)); if (ii) { InitIndicatorNameInfo(ii, info); @@ -130,9 +130,7 @@ NextIndicatorName(KeyNamesInfo * info) static IndicatorNameInfo * FindIndicatorByIndex(KeyNamesInfo * info, int ndx) { - IndicatorNameInfo *old; - - for (old = info->leds; old != NULL; + for (IndicatorNameInfo *old = info->leds; old != NULL; old = (IndicatorNameInfo *) old->defs.next) { if (old->ndx == ndx) @@ -144,9 +142,7 @@ FindIndicatorByIndex(KeyNamesInfo * info, int ndx) static IndicatorNameInfo * FindIndicatorByName(KeyNamesInfo * info, Atom name) { - IndicatorNameInfo *old; - - for (old = info->leds; old != NULL; + for (IndicatorNameInfo *old = info->leds; old != NULL; old = (IndicatorNameInfo *) old->defs.next) { if (old->name == name) @@ -200,9 +196,7 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInf info->leds = (IndicatorNameInfo *) old->defs.next; else { - IndicatorNameInfo *tmp; - tmp = info->leds; - for (; tmp != NULL; + for (IndicatorNameInfo *tmp = info->leds; tmp != NULL; tmp = (IndicatorNameInfo *) tmp->defs.next) { if (tmp->defs.next == (CommonInfo *) old) @@ -212,7 +206,7 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInf } } } - uFree(old); + free(old); } } } @@ -276,16 +270,15 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInf static void ClearKeyNamesInfo(KeyNamesInfo * info) { - if (info->name != NULL) - uFree(info->name); + free(info->name); info->name = NULL; info->computedMax = info->explicitMax = info->explicitMin = -1; info->computedMin = 256; info->effectiveMin = 8; info->effectiveMax = 255; - 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)); + bzero(info->names, sizeof(info->names)); + bzero(info->files, sizeof(info->files)); + bzero(info->has_alt_forms, sizeof(info->has_alt_forms)); if (info->leds) ClearIndicatorNameInfo(info->leds, info); if (info->aliases) @@ -305,11 +298,9 @@ InitKeyNamesInfo(KeyNamesInfo * info) } static int -FindKeyByLong(KeyNamesInfo * info, unsigned long name) +FindKeyByLong(const KeyNamesInfo *info, unsigned long name) { - register int i; - - for (i = info->effectiveMin; i <= info->effectiveMax; i++) + for (int i = info->effectiveMin; i <= info->effectiveMax; i++) { if (info->names[i] == name) return i; @@ -323,9 +314,8 @@ FindKeyByLong(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, - char *name, unsigned merge, unsigned fileID, Bool reportCollisions) +AddKeyName(KeyNamesInfo *info, int kc, const char *name, + unsigned merge, unsigned fileID, Bool reportCollisions) { int old; unsigned long lval; @@ -435,9 +425,6 @@ static void MergeIncludedKeycodes(KeyNamesInfo * into, KeyNamesInfo * from, unsigned merge) { - register int i; - char buf[5]; - if (from->errorCount > 0) { into->errorCount += from->errorCount; @@ -448,9 +435,11 @@ MergeIncludedKeycodes(KeyNamesInfo * into, KeyNamesInf into->name = from->name; from->name = NULL; } - for (i = from->computedMin; i <= from->computedMax; i++) + for (int i = from->computedMin; i <= from->computedMax; i++) { unsigned thisMerge; + char buf[5]; + if (from->names[i] == 0) continue; LongToKeyName(from->names[i], buf); @@ -526,8 +515,7 @@ HandleIncludeKeycodes(IncludeStmt * stmt, XkbDescPtr x HandleKeycodesFile(rtrn, xkb, MergeOverride, &included); if (stmt->stmt != NULL) { - if (included.name != NULL) - uFree(included.name); + free(included.name); included.name = stmt->stmt; stmt->stmt = NULL; } @@ -540,11 +528,10 @@ HandleIncludeKeycodes(IncludeStmt * stmt, XkbDescPtr x /* Do we have more than one include statement? */ if ((stmt->next != NULL) && (included.errorCount < 1)) { - IncludeStmt *next; unsigned op; KeyNamesInfo next_incl; - for (next = stmt->next; next != NULL; next = next->next) + for (IncludeStmt *next = stmt->next; next != NULL; next = next->next) { if ((next->file == NULL) && (next->map == NULL)) { @@ -581,7 +568,7 @@ HandleIncludeKeycodes(IncludeStmt * stmt, XkbDescPtr x * e.g. = 9 */ static int -HandleKeycodeDef(KeycodeDef * stmt, unsigned merge, KeyNamesInfo * info) +HandleKeycodeDef(const KeycodeDef *stmt, unsigned merge, KeyNamesInfo *info) { int code; ExprResult result; @@ -622,7 +609,7 @@ HandleKeycodeDef(KeycodeDef * stmt, unsigned merge, Ke * @return 1 on success, 0 otherwise. */ static int -HandleKeyNameVar(VarDef * stmt, KeyNamesInfo * info) +HandleKeyNameVar(const VarDef *stmt, KeyNamesInfo *info) { ExprResult tmp, field; ExprDef *arrayNdx; @@ -720,7 +707,7 @@ HandleKeyNameVar(VarDef * stmt, KeyNamesInfo * info) } static int -HandleIndicatorNameDef(IndicatorNameDef * def, +HandleIndicatorNameDef(const IndicatorNameDef *def, unsigned merge, KeyNamesInfo * info) { IndicatorNameInfo ii; @@ -860,7 +847,7 @@ CompileKeycodes(XkbFile * file, XkbFileInfo * result, if (XkbAllocNames(xkb, XkbKeyNamesMask | XkbIndicatorNamesMask, 0, 0) == Success) { - register int i; + 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); @@ -892,8 +879,8 @@ CompileKeycodes(XkbFile * file, XkbFileInfo * result, XkbAtomGetString(NULL, ii->name), False); if (xkb->indicators != NULL) { - register unsigned bit; - bit = 1 << (ii->ndx - 1); + unsigned bit = 1U << (ii->ndx - 1); + if (ii->virtual) xkb->indicators->phys_indicators &= ~bit; else blob - b373f433ead95d1db6fa056c097e416af82bf5b1 blob + 1640566cccc1deac1a1e6cd2e8a4797aa1f49697 --- app/xkbcomp/keymap.c +++ app/xkbcomp/keymap.c @@ -85,7 +85,7 @@ CompileKeymap(XkbFile * file, XkbFileInfo * result, un while ((file) && (ok)) { file->topName = mainName; - if ((have & (1 << file->type)) != 0) + if ((have & (1U << 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, un ACTION("All sections after the first ignored\n"); ok = False; } - else if ((1 << file->type) & (~legal)) + else if ((1U << 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, un break; } if (ok) - have |= (1 << file->type); + have |= (1U << 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, un result->defined = have; if (required & (~have)) { - register int i, bit; + int i, bit; unsigned missing; missing = required & (~have); for (i = 0, bit = 1; missing != 0; i++, bit <<= 1) blob - 121280f3aec72fb2c3b3a061994d34d394d77a16 blob + fcf87e010a734b0a26ee60a70254e0caf5b2175c --- app/xkbcomp/keytypes.c +++ app/xkbcomp/keytypes.c @@ -92,27 +92,6 @@ 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) \ @@ -126,7 +105,7 @@ extern Bool AddLevelName(KeyTypeInfo * /* type */ , /***====================================================================***/ static void -InitKeyTypesInfo(KeyTypesInfo * info, XkbDescPtr xkb, KeyTypesInfo * from) +InitKeyTypesInfo(KeyTypesInfo *info, XkbDescPtr xkb, const KeyTypesInfo *from) { tok_ONE_LEVEL = XkbInternAtom(NULL, "ONE_LEVEL", False); tok_TWO_LEVEL = XkbInternAtom(NULL, "TWO_LEVEL", False); @@ -159,8 +138,8 @@ InitKeyTypesInfo(KeyTypesInfo * info, XkbDescPtr xkb, info->dflt = from->dflt; if (from->dflt.entries) { - info->dflt.entries = uTypedCalloc(from->dflt.szEntries, - XkbKTMapEntryRec); + info->dflt.entries = calloc(from->dflt.szEntries, + sizeof(XkbKTMapEntryRec)); if (info->dflt.entries) { unsigned sz = from->dflt.nEntries * sizeof(XkbKTMapEntryRec); @@ -169,21 +148,21 @@ InitKeyTypesInfo(KeyTypesInfo * info, XkbDescPtr xkb, } if (from->dflt.lvlNames) { - info->dflt.lvlNames = uTypedCalloc(from->dflt.szNames, Atom); + info->dflt.lvlNames = calloc(from->dflt.szNames, sizeof(Atom)); if (info->dflt.lvlNames) { - register unsigned sz = from->dflt.szNames * sizeof(Atom); + unsigned sz = from->dflt.szNames * sizeof(Atom); memcpy(info->dflt.lvlNames, from->dflt.lvlNames, sz); } } if (from->dflt.preserve) { - PreserveInfo *old, *new, *last; - last = NULL; - old = from->dflt.preserve; - for (; old; old = (PreserveInfo *) old->defs.next) + PreserveInfo *last = NULL; + + for (PreserveInfo *old = from->dflt.preserve; + old; old = (PreserveInfo *) old->defs.next) { - new = uTypedAlloc(PreserveInfo); + PreserveInfo *new = malloc(sizeof(PreserveInfo)); if (!new) return; *new = *old; @@ -202,16 +181,12 @@ InitKeyTypesInfo(KeyTypesInfo * info, XkbDescPtr xkb, static void FreeKeyTypeInfo(KeyTypeInfo * type) { - if (type->entries != NULL) - { - uFree(type->entries); - type->entries = NULL; - } - if (type->lvlNames != NULL) - { - uFree(type->lvlNames); - type->lvlNames = NULL; - } + free(type->entries); + type->entries = NULL; + + free(type->lvlNames); + type->lvlNames = NULL; + if (type->preserve != NULL) { ClearCommonInfo(&type->preserve->defs); @@ -224,13 +199,12 @@ static void FreeKeyTypesInfo(KeyTypesInfo * info) { info->dpy = NULL; - if (info->name) - uFree(info->name); + free(info->name); info->name = NULL; if (info->types) { - register KeyTypeInfo *type; - for (type = info->types; type; type = (KeyTypeInfo *) type->defs.next) + for (KeyTypeInfo *type = info->types; type; + type = (KeyTypeInfo *) type->defs.next) { FreeKeyTypeInfo(type); } @@ -245,10 +219,9 @@ NextKeyType(KeyTypesInfo * info) { KeyTypeInfo *type; - type = uTypedAlloc(KeyTypeInfo); + type = calloc(1, sizeof(KeyTypeInfo)); if (type != NULL) { - bzero(type, sizeof(KeyTypeInfo)); type->defs.fileID = info->fileID; type->dpy = info->dpy; info->types = (KeyTypeInfo *) AddCommonInfo(&info->types->defs, @@ -259,11 +232,10 @@ NextKeyType(KeyTypesInfo * info) } static KeyTypeInfo * -FindMatchingKeyType(KeyTypesInfo * info, KeyTypeInfo * new) +FindMatchingKeyType(KeyTypesInfo *info, const KeyTypeInfo *new) { - KeyTypeInfo *old; - - for (old = info->types; old; old = (KeyTypeInfo *) old->defs.next) + for (KeyTypeInfo *old = info->types; old; + old = (KeyTypeInfo *) old->defs.next) { if (old->name == new->name) return old; @@ -368,8 +340,6 @@ static void MergeIncludedKeyTypes(KeyTypesInfo * into, KeyTypesInfo * from, unsigned merge, XkbDescPtr xkb) { - KeyTypeInfo *type; - if (from->errorCount > 0) { into->errorCount += from->errorCount; @@ -380,7 +350,8 @@ MergeIncludedKeyTypes(KeyTypesInfo * into, into->name = from->name; from->name = NULL; } - for (type = from->types; type; type = (KeyTypeInfo *) type->defs.next) + for (KeyTypeInfo *type = from->types; type; + type = (KeyTypeInfo *) type->defs.next) { if (merge != MergeDefault) type->defs.merge = merge; @@ -422,8 +393,7 @@ HandleIncludeKeyTypes(IncludeStmt * stmt, (*hndlr) (rtrn, xkb, newMerge, &included); if (stmt->stmt != NULL) { - if (included.name != NULL) - uFree(included.name); + free(included.name); included.name = stmt->stmt; stmt->stmt = NULL; } @@ -435,11 +405,10 @@ HandleIncludeKeyTypes(IncludeStmt * stmt, } if ((stmt->next != NULL) && (included.errorCount < 1)) { - IncludeStmt *next; unsigned op; KeyTypesInfo next_incl; - for (next = stmt->next; next != NULL; next = next->next) + for (IncludeStmt *next = stmt->next; next != NULL; next = next->next) { if ((next->file == NULL) && (next->map == NULL)) { @@ -476,9 +445,9 @@ HandleIncludeKeyTypes(IncludeStmt * stmt, /***====================================================================***/ static XkbKTMapEntryPtr -FindMatchingMapEntry(KeyTypeInfo * type, unsigned mask, unsigned vmask) +FindMatchingMapEntry(const KeyTypeInfo *type, unsigned mask, unsigned vmask) { - register int i; + int i; XkbKTMapEntryPtr entry; for (i = 0, entry = type->entries; i < type->nEntries; i++, entry++) @@ -492,13 +461,11 @@ FindMatchingMapEntry(KeyTypeInfo * type, unsigned mask static void DeleteLevel1MapEntries(KeyTypeInfo * type) { - register int i, n; - - for (i = 0; i < type->nEntries; i++) + for (int i = 0; i < type->nEntries; i++) { if (type->entries[i].level == 0) { - for (n = i; n < type->nEntries - 1; n++) + for (int n = i; n < type->nEntries - 1; n++) { type->entries[n] = type->entries[n + 1]; } @@ -517,7 +484,7 @@ NextMapEntry(KeyTypeInfo * type) { if (type->entries == NULL) { - type->entries = uTypedCalloc(2, XkbKTMapEntryRec); + type->entries = calloc(2, sizeof(XkbKTMapEntryRec)); if (type->entries == NULL) { ERROR("Couldn't allocate map entries for %s\n", TypeTxt(type)); @@ -530,9 +497,9 @@ NextMapEntry(KeyTypeInfo * type) else if (type->nEntries >= type->szEntries) { type->szEntries *= 2; - type->entries = uTypedRecalloc(type->entries, - type->nEntries, type->szEntries, - XkbKTMapEntryRec); + type->entries = recallocarray(type->entries, + type->nEntries, type->szEntries, + sizeof(XkbKTMapEntryRec)); if (type->entries == NULL) { ERROR("Couldn't reallocate map entries for %s\n", TypeTxt(type)); @@ -543,7 +510,7 @@ NextMapEntry(KeyTypeInfo * type) return &type->entries[type->nEntries++]; } -Bool +static Bool AddPreserve(XkbDescPtr xkb, KeyTypeInfo * type, PreserveInfo * new, Bool clobber, Bool report) { @@ -593,7 +560,7 @@ AddPreserve(XkbDescPtr xkb, } return True; } - old = uTypedAlloc(PreserveInfo); + old = malloc(sizeof(PreserveInfo)); if (!old) { WSGO("Couldn't allocate preserve in %s\n", TypeTxt(type)); @@ -615,7 +582,7 @@ AddPreserve(XkbDescPtr xkb, * @param clobber Overwrite existing entry. * @param report True if a warning is to be printed on. */ -Bool +static Bool AddMapEntry(XkbDescPtr xkb, KeyTypeInfo * type, XkbKTMapEntryPtr new, Bool clobber, Bool report) @@ -681,8 +648,8 @@ static LookupEntry lnames[] = { }; static Bool -SetMapEntry(KeyTypeInfo * type, - XkbDescPtr xkb, ExprDef * arrayNdx, ExprDef * value) +SetMapEntry(KeyTypeInfo *type, XkbDescPtr xkb, + const ExprDef *arrayNdx, const ExprDef *value) { ExprResult rtrn; XkbKTMapEntryRec entry; @@ -728,8 +695,8 @@ SetMapEntry(KeyTypeInfo * type, } static Bool -SetPreserve(KeyTypeInfo * type, - XkbDescPtr xkb, ExprDef * arrayNdx, ExprDef * value) +SetPreserve(KeyTypeInfo *type, XkbDescPtr xkb, + const ExprDef *arrayNdx, const ExprDef *value) { ExprResult rtrn; PreserveInfo new; @@ -766,7 +733,7 @@ SetPreserve(KeyTypeInfo * type, 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) { @@ -786,14 +753,14 @@ SetPreserve(KeyTypeInfo * type, /***====================================================================***/ -Bool +static Bool AddLevelName(KeyTypeInfo * type, unsigned level, Atom name, Bool clobber, Bool report) { if ((type->lvlNames == NULL) || (type->szNames <= level)) { - type->lvlNames = - uTypedRecalloc(type->lvlNames, type->szNames, level + 1, Atom); + type->lvlNames = recallocarray(type->lvlNames, type->szNames, + level + 1, sizeof(Atom)); if (type->lvlNames == NULL) { ERROR("Couldn't allocate level names for type %s\n", @@ -838,7 +805,7 @@ AddLevelName(KeyTypeInfo * type, } static Bool -SetLevelName(KeyTypeInfo * type, ExprDef * arrayNdx, ExprDef * value) +SetLevelName(KeyTypeInfo *type, const ExprDef *arrayNdx, const ExprDef *value) { ExprResult rtrn; unsigned level; @@ -877,16 +844,15 @@ SetLevelName(KeyTypeInfo * type, ExprDef * arrayNdx, E * @param field The field to parse (e.g. modifiers, map, level_name) */ static Bool -SetKeyTypeField(KeyTypeInfo * type, - XkbDescPtr xkb, - const char *field, - ExprDef * arrayNdx, ExprDef * value, KeyTypesInfo * info) +SetKeyTypeField(KeyTypeInfo * type, XkbDescPtr xkb, const char *field, + const ExprDef *arrayNdx, const 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"); @@ -937,7 +903,7 @@ SetKeyTypeField(KeyTypeInfo * type, } static Bool -HandleKeyTypeVar(VarDef * stmt, XkbDescPtr xkb, KeyTypesInfo * info) +HandleKeyTypeVar(const VarDef *stmt, XkbDescPtr xkb, KeyTypesInfo *info) { ExprResult elem, field; ExprDef *arrayNdx; @@ -962,8 +928,8 @@ HandleKeyTypeVar(VarDef * stmt, XkbDescPtr xkb, KeyTyp } static int -HandleKeyTypeBody(VarDef * def, - XkbDescPtr xkb, KeyTypeInfo * type, KeyTypesInfo * info) +HandleKeyTypeBody(const VarDef *def, XkbDescPtr xkb, + KeyTypeInfo *type, KeyTypesInfo *info) { int ok = 1; ExprResult tmp, field; @@ -989,30 +955,27 @@ HandleKeyTypeBody(VarDef * def, * */ static int -HandleKeyTypeDef(KeyTypeDef * def, - XkbDescPtr xkb, unsigned merge, KeyTypesInfo * info) +HandleKeyTypeDef(const KeyTypeDef *def, + XkbDescPtr xkb, unsigned merge, KeyTypesInfo *info) { - 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; + 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 + }; /* Parse the actual content. */ if (!HandleKeyTypeBody(def->body, xkb, &type, info)) @@ -1023,7 +986,7 @@ HandleKeyTypeDef(KeyTypeDef * def, /* now copy any appropriate map, preserve or level names from the */ /* default type */ - for (i = 0; i < info->dflt.nEntries; i++) + for (int i = 0; i < info->dflt.nEntries; i++) { XkbKTMapEntryPtr dflt; dflt = &info->dflt.entries[i]; @@ -1046,7 +1009,7 @@ HandleKeyTypeDef(KeyTypeDef * def, dflt = (PreserveInfo *) dflt->defs.next; } } - for (i = 0; i < info->dflt.szNames; i++) + for (int i = 0; i < info->dflt.szNames; i++) { if ((i < type.numLevels) && (info->dflt.lvlNames[i] != None)) { @@ -1134,17 +1097,16 @@ HandleKeyTypesFile(XkbFile * file, static Bool CopyDefToKeyType(XkbDescPtr xkb, XkbKeyTypePtr type, KeyTypeInfo * def) { - register int i; - PreserveInfo *pre; - - for (pre = def->preserve; pre != NULL; + for (PreserveInfo *pre = def->preserve; pre != NULL; pre = (PreserveInfo *) pre->defs.next) { XkbKTMapEntryPtr match; - XkbKTMapEntryRec tmp; - tmp.mods.real_mods = pre->indexMods; - tmp.mods.vmods = pre->indexVMods; - tmp.level = 0; + XkbKTMapEntryRec tmp = { + .mods.real_mods = pre->indexMods, + .mods.vmods = pre->indexVMods, + .level = 0 + }; + AddMapEntry(xkb, def, &tmp, False, False); match = FindMatchingMapEntry(def, pre->indexMods, pre->indexVMods); if (!match) @@ -1162,7 +1124,7 @@ CopyDefToKeyType(XkbDescPtr xkb, XkbKeyTypePtr type, K type->map = def->entries; if (def->preserve) { - type->preserve = uTypedCalloc(type->map_count, XkbModsRec); + type->preserve = calloc(type->map_count, sizeof(XkbModsRec)); if (!type->preserve) { WARN("Couldn't allocate preserve array in CopyDefToKeyType\n"); @@ -1171,8 +1133,8 @@ CopyDefToKeyType(XkbDescPtr xkb, XkbKeyTypePtr type, K } else { - pre = def->preserve; - for (; pre != NULL; pre = (PreserveInfo *) pre->defs.next) + for (PreserveInfo *pre = def->preserve; pre != NULL; + pre = (PreserveInfo *) pre->defs.next) { int ndx = pre->matchingMapIndex; type->preserve[ndx].mask = pre->preMods; @@ -1186,10 +1148,10 @@ CopyDefToKeyType(XkbDescPtr xkb, XkbKeyTypePtr type, K type->name = (Atom) def->name; if (def->szNames > 0) { - type->level_names = uTypedCalloc(def->numLevels, Atom); + type->level_names = calloc(def->numLevels, sizeof(Atom)); /* assert def->szNames<=def->numLevels */ - for (i = 0; i < def->szNames; i++) + for (int i = 0; i < def->szNames; i++) { type->level_names[i] = (Atom) def->lvlNames[i]; } @@ -1217,9 +1179,9 @@ CompileKeyTypes(XkbFile * file, XkbFileInfo * result, if (info.errorCount == 0) { - register int i; - register KeyTypeInfo *def; - register XkbKeyTypePtr type, next; + int i; + KeyTypeInfo *def; + XkbKeyTypePtr type, next; if (info.name != NULL) { blob - dc1cee9ae1b54b9cd739712f6bf79a8e9710b9e4 blob + fcf23d3ade98599c64d753951c230f813275321b --- app/xkbcomp/listing.c +++ app/xkbcomp/listing.c @@ -70,16 +70,13 @@ SOFTWARE. ******************************************************************/ +#include "utils.h" #include #include #include #include #include -#if defined(sgi) -#include -#endif - #define DEBUG_VAR listingDebug #include "xkbcomp.h" #include @@ -126,7 +123,9 @@ SOFTWARE. #define lowbit(x) ((x) & (-(x))) +#ifdef DEBUG unsigned int listingDebug; +#endif static int szListing = 0; static int nListed = 0; @@ -155,7 +154,7 @@ AddMapOnly(char *map) szMapOnly = 5; else szMapOnly *= 2; - mapOnly = uTypedRealloc(list, szMapOnly, char *); + mapOnly = reallocarray(list, szMapOnly, sizeof(char *)); if (!mapOnly) { WSGO("Couldn't allocate list of maps\n"); @@ -166,7 +165,7 @@ AddMapOnly(char *map) return 1; } -int +static int AddListing(char *file, char *map) { if (nListed >= szListing) @@ -175,7 +174,7 @@ AddListing(char *file, char *map) szListing = 10; else szListing *= 2; - list = uTypedRealloc(list, szListing, Listing); + list = reallocarray(list, szListing, sizeof(Listing)); if (!list) { WSGO("Couldn't allocate list of files and maps\n"); @@ -195,10 +194,10 @@ AddListing(char *file, char *map) /***====================================================================***/ static void -ListFile(FILE * outFile, char *fileName, XkbFile * map) +ListFile(FILE *outFile, const char *fileName, XkbFile *map) { - register unsigned flags; - char *mapName; + unsigned flags; + const char *mapName; flags = map->flags; if ((flags & XkbLC_Hidden) && (!(verboseLevel & WantHiddenMaps))) @@ -228,7 +227,7 @@ ListFile(FILE * outFile, char *fileName, XkbFile * map mapName = NULL; if (dirsToStrip > 0) { - char *tmp, *last; + const char *tmp, *last; int i; for (i = 0, tmp = last = fileName; (i < dirsToStrip) && tmp; i++) { @@ -303,28 +302,33 @@ AddDirectory(char *head, char *ptrn, char *rest, char { char *tmp, *filename; struct stat sbuf; - size_t tmpsize; filename = FileName(file); if (!filename || filename[0] == '.') continue; if (ptrn && (!XkbNameMatchesPattern(filename, ptrn))) continue; - tmpsize = (head ? strlen(head) : 0) + strlen(filename) + 2; - tmp = uAlloc(tmpsize); +#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); if (!tmp) continue; snprintf(tmp, tmpsize, "%s%s%s", (head ? head : ""), (head ? "/" : ""), filename); +#endif if (stat(tmp, &sbuf) < 0) { - uFree(tmp); + free(tmp); continue; } if (((rest != NULL) && (!S_ISDIR(sbuf.st_mode))) || ((map != NULL) && (S_ISDIR(sbuf.st_mode)))) { - uFree(tmp); + free(tmp); continue; } if (S_ISDIR(sbuf.st_mode)) @@ -400,13 +404,11 @@ 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 (i = 0; i < nMapOnly; i++) + for (int i = 0; i < nMapOnly; i++) { if (XkbNameMatchesPattern(mapToConsider, mapOnly[i])) return True; @@ -415,13 +417,10 @@ MapMatches(char *mapToConsider, char *ptrn) } int -GenerateListing(char *out_name) +GenerateListing(const char *out_name) { - int i; - FILE *inputFile, *outFile; - XkbFile *rtrn, *mapToUse; - unsigned oldWarningLevel; - char *mapName; + FILE *outFile; + XkbFile *rtrn; if (nFilesListed < 1) { @@ -441,8 +440,9 @@ GenerateListing(char *out_name) if (warningLevel > 9) fprintf(stderr, "should list:\n"); #endif - for (i = 0; i < nListed; i++) + for (int i = 0; i < nListed; i++) { + unsigned oldWarningLevel; #ifdef DEBUG if (warningLevel > 9) { @@ -455,6 +455,7 @@ GenerateListing(char *out_name) warningLevel = 0; if (list[i].file) { + FILE *inputFile; struct stat sbuf; if (stat(list[i].file, &sbuf) < 0) @@ -480,8 +481,8 @@ GenerateListing(char *out_name) setScanState(list[i].file, 1); if (XKBParseFile(inputFile, &rtrn) && (rtrn != NULL)) { - mapName = list[i].map; - mapToUse = rtrn; + char *mapName = list[i].map; + XkbFile *mapToUse = rtrn; for (; mapToUse; mapToUse = (XkbFile *) mapToUse->common.next) { if (!MapMatches(mapToUse->name, mapName)) @@ -493,5 +494,9 @@ GenerateListing(char *out_name) } warningLevel = oldWarningLevel; } + if (outFile != stdout) + { + fclose(outFile); + } return 1; } blob - aa04395958e6db0c73a03ab4a98d260dcb2bddc9 blob + f290f305b671f7dea69ee65e730b40792976b138 --- app/xkbcomp/man/Makefile.in +++ app/xkbcomp/man/Makefile.in @@ -125,7 +125,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CHANGELOG_CMD = @CHANGELOG_CMD@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -136,11 +135,9 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ EXEEXT = @EXEEXT@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ -GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ blob - 5faa6c1cb71169a28d31600767e22de3ebcde8a0 blob + 0b5f4330ab3f6ed7458afd4283e79dab3365cd42 --- app/xkbcomp/misc.c +++ app/xkbcomp/misc.c @@ -53,7 +53,6 @@ ProcessIncludeFile(IncludeStmt * stmt, unsigned file_type, XkbFile ** file_rtrn, unsigned *merge_rtrn) { - FILE *file; XkbFile *rtrn, *mapToUse; char oldFile[1024] = {0}; int oldLine = lineNum; @@ -63,7 +62,7 @@ ProcessIncludeFile(IncludeStmt * stmt, { /* file not in cache, open it, parse it and store it in cache for next time. */ - file = XkbFindFileInPath(stmt->file, file_type, &stmt->path); + FILE *file = XkbFindFileInPath(stmt->file, file_type, &stmt->path); if (file == NULL) { ERROR("Can't find file \"%s\" for %s include\n", stmt->file, @@ -74,8 +73,10 @@ 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)) { @@ -176,6 +177,7 @@ ReportBadType(const char *type, const char *field, return False; } +#if 0 int ReportBadIndexType(char *type, char *field, char *name, char *wanted) { @@ -183,6 +185,7 @@ ReportBadIndexType(char *type, char *field, char *name ACTION("Ignoring assignment to illegal field in %s\n", name); return False; } +#endif int ReportBadField(const char *type, const char *field, const char *name) @@ -192,6 +195,7 @@ ReportBadField(const char *type, const char *field, co return False; } +#if 0 int ReportMultipleDefs(char *type, char *field, char *name) { @@ -199,12 +203,13 @@ ReportMultipleDefs(char *type, char *field, char *name ACTION("Using last definition\n"); return False; } +#endif /***====================================================================***/ Bool -UseNewField(unsigned field, - CommonInfo * oldDefs, CommonInfo * newDefs, unsigned *pCollide) +UseNewField(unsigned field, const CommonInfo *oldDefs, + const CommonInfo *newDefs, unsigned *pCollide) { Bool useNew; @@ -227,9 +232,10 @@ UseNewField(unsigned field, return useNew; } -Bool -MergeNewField(unsigned field, - CommonInfo * oldDefs, CommonInfo * newDefs, unsigned *pCollide) +#if 0 +static Bool +MergeNewField(unsigned field, const CommonInfo *oldDefs, + const CommonInfo *newDefs, unsigned *pCollide) { if ((oldDefs->defined & field) && (newDefs->defined & field)) { @@ -243,6 +249,7 @@ MergeNewField(unsigned field, } return False; } +#endif XPointer ClearCommonInfo(CommonInfo * cmn) @@ -253,7 +260,7 @@ ClearCommonInfo(CommonInfo * cmn) for (this = cmn; this != NULL; this = next) { next = this->next; - uFree(this); + free(this); } } return NULL; @@ -289,141 +296,140 @@ typedef struct _KeyNameDesc } KeyNameDesc; static KeyNameDesc dfltKeys[] = { - {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"} + {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} }; Status ComputeKbdDefaults(XkbDescPtr xkb) { - Status rtrn; - register int i, tmp, nUnknown; - KeyNameDesc *name; - KeySym *syms; - char tmpname[XkbKeyNameLength + 1]; + int nUnknown; if ((xkb->names == NULL) || (xkb->names->keys == NULL)) { + Status rtrn; if ((rtrn = XkbAllocNames(xkb, XkbKeyNamesMask, 0, 0)) != Success) return rtrn; } - for (name = dfltKeys; (name->name[0] != '\0'); name++) + for (KeyNameDesc *name = dfltKeys; (name->name[0] != '\0'); name++) { name->used = False; } nUnknown = 0; - for (i = xkb->min_key_code; i <= xkb->max_key_code; i++) + for (int i = xkb->min_key_code; i <= xkb->max_key_code; i++) { - tmp = XkbKeyNumSyms(xkb, i); + int 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 (name = dfltKeys; (name->name[0] != '\0'); name++) + for (KeyNameDesc *name = dfltKeys; (name->name[0] != '\0'); name++) { Bool match = True; if (((name->level1 != syms[0]) @@ -444,6 +450,8 @@ ComputeKbdDefaults(XkbDescPtr xkb) } else { + char tmpname[XkbKeyNameLength + 1]; + if (warningLevel > 2) { WARN @@ -464,6 +472,8 @@ ComputeKbdDefaults(XkbDescPtr xkb) { if (warningLevel > 2) { + char tmpname[XkbKeyNameLength + 1]; + WARN("Key %d does not match any defaults\n", i); ACTION("Using name \n", nUnknown); snprintf(tmpname, sizeof(tmpname), "U%03d", nUnknown++); @@ -494,8 +504,6 @@ 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; @@ -508,7 +516,7 @@ FindNamedKey(XkbDescPtr xkb, *kc_rtrn = 0; /* some callers rely on this */ if (xkb && xkb->names && xkb->names->keys) { - for (n = start_from; n <= xkb->max_key_code; n++) + for (unsigned n = start_from; n <= xkb->max_key_code; n++) { unsigned long tmp; tmp = KeyNameToLong(xkb->names->keys[n].name); @@ -546,7 +554,7 @@ FindNamedKey(XkbDescPtr xkb, } } /* Find first unused keycode and store our key here */ - for (n = xkb->min_key_code; n <= xkb->max_key_code; n++) + for (unsigned n = xkb->min_key_code; n <= xkb->max_key_code; n++) { if (xkb->names->keys[n].name[0] == '\0') { @@ -565,7 +573,6 @@ 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) @@ -574,7 +581,7 @@ FindKeyNameForAlias(XkbDescPtr xkb, unsigned long lnam a = xkb->geom->key_aliases; LongToKeyName(lname, name); name[XkbKeyNameLength] = '\0'; - for (i = 0; i < xkb->geom->num_key_aliases; i++, a++) + for (int i = 0; i < xkb->geom->num_key_aliases; i++, a++) { if (strncmp(name, a->alias, XkbKeyNameLength) == 0) { @@ -589,7 +596,7 @@ FindKeyNameForAlias(XkbDescPtr xkb, unsigned long lnam a = xkb->names->key_aliases; LongToKeyName(lname, name); name[XkbKeyNameLength] = '\0'; - for (i = 0; i < xkb->names->num_key_aliases; i++, a++) + for (int i = 0; i < xkb->names->num_key_aliases; i++, a++) { if (strncmp(name, a->alias, XkbKeyNameLength) == 0) { blob - b6a5288d318330f23e1972944e31bfd523d9d8a0 blob + e1ed7587cd0cf8341ed0be5773108476f7f5a68e --- app/xkbcomp/misc.h +++ app/xkbcomp/misc.h @@ -36,17 +36,11 @@ typedef struct _CommonInfo } CommonInfo; extern Bool UseNewField(unsigned /* field */ , - CommonInfo * /* oldDefs */ , - CommonInfo * /* newDefs */ , + const CommonInfo * /* oldDefs */ , + const CommonInfo * /* newDefs */ , unsigned * /* pCollide */ ); -extern Bool MergeNewField(unsigned /* field */ , - CommonInfo * /* oldDefs */ , - CommonInfo * /* newDefs */ , - unsigned * /* pCollide */ - ); - extern XPointer ClearCommonInfo(CommonInfo * /* cmn */ ); blob - 4b77c4c602c69f32917798d27ad5d56e5040f89f blob + 917a240078d23f99ee13f84729d5395503d3bf1f --- app/xkbcomp/parseutils.c +++ app/xkbcomp/parseutils.c @@ -57,13 +57,15 @@ ExprDef * ExprCreate(unsigned op, unsigned type) { ExprDef *expr; - expr = uTypedAlloc(ExprDef); + expr = malloc(sizeof(ExprDef)); if (expr) { - expr->common.stmtType = StmtExpr; - expr->common.next = NULL; - expr->op = op; - expr->type = type; + *expr = (ExprDef) { + .common.stmtType = StmtExpr, + .common.next = NULL, + .op = op, + .type = type + }; } else { @@ -77,14 +79,16 @@ ExprDef * ExprCreateUnary(unsigned op, unsigned type, ExprDef * child) { ExprDef *expr; - expr = uTypedAlloc(ExprDef); + expr = malloc(sizeof(ExprDef)); if (expr) { - expr->common.stmtType = StmtExpr; - expr->common.next = NULL; - expr->op = op; - expr->type = type; - expr->value.child = child; + *expr = (ExprDef) { + .common.stmtType = StmtExpr, + .common.next = NULL, + .op = op, + .type = type, + .value.child = child + }; } else { @@ -98,20 +102,22 @@ ExprDef * ExprCreateBinary(unsigned op, ExprDef * left, ExprDef * right) { ExprDef *expr; - expr = uTypedAlloc(ExprDef); + expr = malloc(sizeof(ExprDef)); if (expr) { - expr->common.stmtType = StmtExpr; - expr->common.next = NULL; - expr->op = op; + *expr = (ExprDef) { + .common.stmtType = StmtExpr, + .common.next = NULL, + .op = op, + .type = TypeUnknown, + .value.binary.left = left, + .value.binary.right = right + }; + 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 { @@ -122,18 +128,20 @@ ExprCreateBinary(unsigned op, ExprDef * left, ExprDef } KeycodeDef * -KeycodeCreate(char *name, ExprDef * value) +KeycodeCreate(const char *name, ExprDef *value) { KeycodeDef *def; - def = uTypedAlloc(KeycodeDef); + def = malloc(sizeof(KeycodeDef)); if (def) { - def->common.stmtType = StmtKeycodeDef; - def->common.next = NULL; + *def = (KeycodeDef) { + .common.stmtType = StmtKeycodeDef, + .common.next = NULL, + .value = value + }; strncpy(def->name, name, XkbKeyNameLength); def->name[XkbKeyNameLength] = '\0'; - def->value = value; } else { @@ -144,15 +152,17 @@ KeycodeCreate(char *name, ExprDef * value) } KeyAliasDef * -KeyAliasCreate(char *alias, char *real) +KeyAliasCreate(const char *alias, const char *real) { KeyAliasDef *def; - def = uTypedAlloc(KeyAliasDef); + def = malloc(sizeof(KeyAliasDef)); if (def) { - def->common.stmtType = StmtKeyAliasDef; - def->common.next = NULL; + *def = (KeyAliasDef) { + .common.stmtType = StmtKeyAliasDef, + .common.next = NULL, + }; strncpy(def->alias, alias, XkbKeyNameLength); def->alias[XkbKeyNameLength] = '\0'; strncpy(def->real, real, XkbKeyNameLength); @@ -170,13 +180,15 @@ VModDef * VModCreate(Atom name, ExprDef * value) { VModDef *def; - def = uTypedAlloc(VModDef); + def = malloc(sizeof(VModDef)); if (def) { - def->common.stmtType = StmtVModDef; - def->common.next = NULL; - def->name = name; - def->value = value; + *def = (VModDef) { + .common.stmtType = StmtVModDef, + .common.next = NULL, + .name = name, + .value = value + }; } else { @@ -190,13 +202,15 @@ VarDef * VarCreate(ExprDef * name, ExprDef * value) { VarDef *def; - def = uTypedAlloc(VarDef); + def = malloc(sizeof(VarDef)); if (def) { - def->common.stmtType = StmtVarDef; - def->common.next = NULL; - def->name = name; - def->value = value; + *def = (VarDef) { + .common.stmtType = StmtVarDef, + .common.next = NULL, + .name = name, + .value = value + }; } else { @@ -223,16 +237,18 @@ InterpCreate(const char *sym_str, ExprDef * match) { InterpDef *def; - def = uTypedAlloc(InterpDef); + def = malloc(sizeof(InterpDef)); if (def) { - def->common.stmtType = StmtInterpDef; - def->common.next = NULL; + *def = (InterpDef) { + .common.stmtType = StmtInterpDef, + .common.next = NULL, + .match = match + }; if (LookupKeysym(sym_str, &def->sym) == 0) def->ignore = True; else def->ignore = False; - def->match = match; } else { @@ -247,14 +263,16 @@ KeyTypeCreate(Atom name, VarDef * body) { KeyTypeDef *def; - def = uTypedAlloc(KeyTypeDef); + def = malloc(sizeof(KeyTypeDef)); if (def) { - def->common.stmtType = StmtKeyTypeDef; - def->common.next = NULL; - def->merge = MergeDefault; - def->name = name; - def->body = body; + *def = (KeyTypeDef) { + .common.stmtType = StmtKeyTypeDef, + .common.next = NULL, + .merge = MergeDefault, + .name = name, + .body = body + }; } else { @@ -269,15 +287,17 @@ SymbolsCreate(char *keyName, ExprDef * symbols) { SymbolsDef *def; - def = uTypedAlloc(SymbolsDef); + def = malloc(sizeof(SymbolsDef)); if (def) { - def->common.stmtType = StmtSymbolsDef; - def->common.next = NULL; - def->merge = MergeDefault; - bzero(def->keyName, 5); + *def = (SymbolsDef) { + .common.stmtType = StmtSymbolsDef, + .common.next = NULL, + .merge = MergeDefault, + .symbols = symbols + }; strncpy(def->keyName, keyName, 4); - def->symbols = symbols; + def->keyName[4] = 0; } else { @@ -292,14 +312,16 @@ GroupCompatCreate(int group, ExprDef * val) { GroupCompatDef *def; - def = uTypedAlloc(GroupCompatDef); + def = malloc(sizeof(GroupCompatDef)); if (def) { - def->common.stmtType = StmtGroupCompatDef; - def->common.next = NULL; - def->merge = MergeDefault; - def->group = group; - def->def = val; + *def = (GroupCompatDef) { + .common.stmtType = StmtGroupCompatDef, + .common.next = NULL, + .merge = MergeDefault, + .group = group, + .def = val + }; } else { @@ -314,14 +336,16 @@ ModMapCreate(Atom modifier, ExprDef * keys) { ModMapDef *def; - def = uTypedAlloc(ModMapDef); + def = malloc(sizeof(ModMapDef)); if (def) { - def->common.stmtType = StmtModMapDef; - def->common.next = NULL; - def->merge = MergeDefault; - def->modifier = modifier; - def->keys = keys; + *def = (ModMapDef) { + .common.stmtType = StmtModMapDef, + .common.next = NULL, + .merge = MergeDefault, + .modifier = modifier, + .keys = keys + }; } else { @@ -336,14 +360,16 @@ IndicatorMapCreate(Atom name, VarDef * body) { IndicatorMapDef *def; - def = uTypedAlloc(IndicatorMapDef); + def = malloc(sizeof(IndicatorMapDef)); if (def) { - def->common.stmtType = StmtIndicatorMapDef; - def->common.next = NULL; - def->merge = MergeDefault; - def->name = name; - def->body = body; + *def = (IndicatorMapDef) { + .common.stmtType = StmtIndicatorMapDef, + .common.next = NULL, + .merge = MergeDefault, + .name = name, + .body = body + }; } else { @@ -358,15 +384,17 @@ IndicatorNameCreate(int ndx, ExprDef * name, Bool virt { IndicatorNameDef *def; - def = uTypedAlloc(IndicatorNameDef); + def = malloc(sizeof(IndicatorNameDef)); if (def) { - def->common.stmtType = StmtIndicatorNameDef; - def->common.next = NULL; - def->merge = MergeDefault; - def->ndx = ndx; - def->name = name; - def->virtual = virtual; + *def = (IndicatorNameDef) { + .common.stmtType = StmtIndicatorNameDef, + .common.next = NULL, + .merge = MergeDefault, + .ndx = ndx, + .name = name, + .virtual = virtual + }; } else { @@ -381,14 +409,16 @@ ActionCreate(Atom name, ExprDef * args) { ExprDef *act; - act = uTypedAlloc(ExprDef); + act = malloc(sizeof(ExprDef)); if (act) { - act->common.stmtType = StmtExpr; - act->common.next = NULL; - act->op = ExprActionDecl; - act->value.action.name = name; - act->value.action.args = args; + *act = (ExprDef) { + .common.stmtType = StmtExpr, + .common.next = NULL, + .op = ExprActionDecl, + .value.action.name = name, + .value.action.args = args + }; return act; } FATAL("Couldn't allocate ActionDef in parser\n"); @@ -405,7 +435,7 @@ CreateKeysymList(char *sym) { def->value.list.nSyms = 1; def->value.list.szSyms = 4; - def->value.list.syms = uTypedCalloc(4, char *); + def->value.list.syms = calloc(4, sizeof(char *)); if (def->value.list.syms != NULL) { def->value.list.syms[0] = sym; @@ -420,19 +450,20 @@ ShapeDef * ShapeDeclCreate(Atom name, OutlineDef * outlines) { ShapeDef *shape; - OutlineDef *ol; - shape = uTypedAlloc(ShapeDef); + shape = calloc(1, sizeof(ShapeDef)); if (shape != NULL) { - 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) + *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) { if (ol->nPoints > 0) shape->nOutlines++; @@ -445,24 +476,25 @@ OutlineDef * OutlineCreate(Atom field, ExprDef * points) { OutlineDef *outline; - ExprDef *pt; - outline = uTypedAlloc(OutlineDef); + outline = calloc(1, sizeof(OutlineDef)); if (outline != NULL) { - bzero(outline, sizeof(OutlineDef)); - outline->common.stmtType = StmtOutlineDef; - outline->common.next = NULL; - outline->field = field; - outline->nPoints = 0; + *outline = (OutlineDef) { + .common.stmtType = StmtOutlineDef, + .common.next = NULL, + .field = field, + .nPoints = 0, + .points = points + }; if (points->op == ExprCoord) { - for (pt = points; pt != NULL; pt = (ExprDef *) pt->common.next) + for (ExprDef *pt = points; pt != NULL; + pt = (ExprDef *) pt->common.next) { outline->nPoints++; } } - outline->points = points; } return outline; } @@ -472,12 +504,13 @@ KeyDeclCreate(char *name, ExprDef * expr) { KeyDef *key; - key = uTypedAlloc(KeyDef); + key = calloc(1, sizeof(KeyDef)); if (key != NULL) { - bzero(key, sizeof(KeyDef)); - key->common.stmtType = StmtKeyDef; - key->common.next = NULL; + *key = (KeyDef) { + .common.stmtType = StmtKeyDef, + .common.next = NULL, + }; if (name) key->name = name; else @@ -486,31 +519,33 @@ 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; - uFree(from); + free(from); return into; } +#endif RowDef * RowDeclCreate(KeyDef * keys) { RowDef *row; - KeyDef *key; - row = uTypedAlloc(RowDef); + row = calloc(1, sizeof(RowDef)); if (row != NULL) { - 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) + *row = (RowDef) { + .common.stmtType = StmtRowDef, + .common.next = NULL, + .nKeys = 0, + .keys = keys + }; + for (KeyDef *key = keys; key != NULL; key = (KeyDef *) key->common.next) { if (key->common.stmtType == StmtKeyDef) row->nKeys++; @@ -523,18 +558,18 @@ SectionDef * SectionDeclCreate(Atom name, RowDef * rows) { SectionDef *section; - RowDef *row; - section = uTypedAlloc(SectionDef); + section = calloc(1, sizeof(SectionDef)); if (section != NULL) { - 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) + *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) { if (row->common.stmtType == StmtRowDef) section->nRows++; @@ -548,15 +583,16 @@ OverlayKeyCreate(char *under, char *over) { OverlayKeyDef *key; - key = uTypedAlloc(OverlayKeyDef); + key = calloc(1, sizeof(OverlayKeyDef)); if (key != NULL) { - bzero(key, sizeof(OverlayKeyDef)); - key->common.stmtType = StmtOverlayKeyDef; + *key = (OverlayKeyDef) { + .common.stmtType = StmtOverlayKeyDef + }; strncpy(key->over, over, XkbKeyNameLength); strncpy(key->under, under, XkbKeyNameLength); - uFree(over); - uFree(under); + free(over); + free(under); } return key; } @@ -565,16 +601,16 @@ OverlayDef * OverlayDeclCreate(Atom name, OverlayKeyDef * keys) { OverlayDef *ol; - OverlayKeyDef *key; - ol = uTypedAlloc(OverlayDef); + ol = calloc(1, sizeof(OverlayDef)); if (ol != NULL) { - bzero(ol, sizeof(OverlayDef)); - ol->common.stmtType = StmtOverlayDef; - ol->name = name; - ol->keys = keys; - for (key = keys; key != NULL; + *ol = (OverlayDef) { + .common.stmtType = StmtOverlayDef, + .name = name, + .keys = keys + }; + for (OverlayKeyDef *key = keys; key != NULL; key = (OverlayKeyDef *) key->common.next) { ol->nKeys++; @@ -588,15 +624,16 @@ DoodadCreate(unsigned type, Atom name, VarDef * body) { DoodadDef *doodad; - doodad = uTypedAlloc(DoodadDef); + doodad = calloc(1, sizeof(DoodadDef)); if (doodad != NULL) { - bzero(doodad, sizeof(DoodadDef)); - doodad->common.stmtType = StmtDoodadDef; - doodad->common.next = NULL; - doodad->type = type; - doodad->name = name; - doodad->body = body; + *doodad = (DoodadDef) { + .common.stmtType = StmtDoodadDef, + .common.next = NULL, + .type = type, + .name = name, + .body = body + }; } return doodad; } @@ -607,10 +644,10 @@ AppendKeysymList(ExprDef * list, char *sym) if (list->value.list.nSyms >= list->value.list.szSyms) { list->value.list.szSyms *= 2; - list->value.list.syms = uTypedRecalloc(list->value.list.syms, - list->value.list.nSyms, - list->value.list.szSyms, - char *); + list->value.list.syms = recallocarray(list->value.list.syms, + list->value.list.nSyms, + list->value.list.szSyms, + sizeof(char *)); if (list->value.list.syms == NULL) { FATAL("Couldn't resize list of symbols for append\n"); @@ -625,7 +662,6 @@ int LookupKeysym(const char *str, KeySym * sym_rtrn) { KeySym sym; - char *tmp; if ((!str) || (uStrCaseCmp(str, "any") == 0) || (uStrCaseCmp(str, "nosymbol") == 0)) @@ -646,6 +682,8 @@ 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; @@ -679,23 +717,25 @@ IncludeCreate(char *str, unsigned merge) haveSelf = True; } if (first == NULL) - first = incl = uTypedAlloc(IncludeStmt); + first = incl = malloc(sizeof(IncludeStmt)); else { - incl->next = uTypedAlloc(IncludeStmt); + incl->next = malloc(sizeof(IncludeStmt)); incl = incl->next; } if (incl) { - 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; + *incl = (IncludeStmt) { + .common.stmtType = StmtInclude, + .common.next = NULL, + .merge = merge, + .stmt = NULL, + .file = file, + .map = map, + .modifier = extra_data, + .path = NULL, + .next = NULL + }; } else { @@ -716,7 +756,7 @@ IncludeCreate(char *str, unsigned merge) if (first) first->stmt = stmt; else if (stmt) - uFree(stmt); + free(stmt); return first; BAIL: ERROR("Illegal include statement \"%s\"\n", stmt); @@ -724,20 +764,16 @@ IncludeCreate(char *str, unsigned merge) while (first) { incl = first->next; - 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); + free(first->file); + free(first->map); + free(first->modifier); + free(first->path); + first->file = first->map = first->modifier = first->path = NULL; + free(first); first = incl; } if (stmt) - uFree(stmt); + free(stmt); return NULL; } @@ -762,10 +798,9 @@ PrintStmtAddrs(ParseCommon * stmt) static void CheckDefaultMap(XkbFile * maps) { - XkbFile *dflt, *tmp; + XkbFile *dflt = NULL; - dflt = NULL; - for (tmp = maps, dflt = NULL; tmp != NULL; + for (XkbFile *tmp = maps; tmp != NULL; tmp = (XkbFile *) tmp->common.next) { if (tmp->flags & XkbLC_Default) @@ -816,18 +851,19 @@ CreateXKBFile(int type, char *name, ParseCommon * defs XkbFile *file; static int fileID; - file = uTypedAlloc(XkbFile); + file = calloc(1, sizeof(XkbFile)); if (file) { XkbEnsureSafeMapName(name); - 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; + *file = (XkbFile) { + .type = type, + .topName = uStringDup(name), + .name = name, + .defs = defs, + .id = fileID++, + .compiled = False, + .flags = flags + }; } return file; } blob - 5cc9391b5336c0d612b7ef95de07cfd60f1ccdb6 blob + 41333e4a57f4bb987c7703d8414c335ae8a39603 --- app/xkbcomp/parseutils.h +++ app/xkbcomp/parseutils.h @@ -68,12 +68,12 @@ extern ExprDef *ExprCreateBinary(unsigned /* op */ , ExprDef * /* right */ ); -extern KeycodeDef *KeycodeCreate(char * /* name */ , +extern KeycodeDef *KeycodeCreate(const char * /* name */ , ExprDef * /* value */ ); -extern KeyAliasDef *KeyAliasCreate(char * /* alias */ , - char * /* real */ +extern KeyAliasDef *KeyAliasCreate(const char * /* alias */ , + const char * /* real */ ); extern VModDef *VModCreate(Atom /* name */ , blob - 06e5095c0ac351c384141934a92b3d6188b5b484 blob + 69cbe32841602f9df8defa630204346a36aac0b1 --- app/xkbcomp/symbols.c +++ app/xkbcomp/symbols.c @@ -81,7 +81,6 @@ typedef struct _KeyInfo static void InitKeyInfo(KeyInfo * info) { - register int i; static char dflt[4] = "*"; info->defs.defined = 0; @@ -91,7 +90,7 @@ InitKeyInfo(KeyInfo * info) info->name = KeyNameToLong(dflt); info->groupInfo = 0; info->typesDefined = info->symsDefined = info->actsDefined = 0; - for (i = 0; i < XkbNumKbdGroups; i++) + for (int i = 0; i < XkbNumKbdGroups; i++) { info->numLevels[i] = 0; info->types[i] = None; @@ -114,23 +113,19 @@ 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 (i = 0; i < XkbNumKbdGroups; i++) + for (int i = 0; i < XkbNumKbdGroups; i++) { info->numLevels[i] = 0; info->types[i] = None; - if (info->syms[i] != NULL) - uFree(info->syms[i]); + free(info->syms[i]); info->syms[i] = NULL; - if (info->acts[i] != NULL) - uFree(info->acts[i]); + free(info->acts[i]); info->acts[i] = NULL; } info->dfltType = None; @@ -151,13 +146,11 @@ FreeKeyInfo(KeyInfo * info) static Bool CopyKeyInfo(KeyInfo * old, KeyInfo * new, Bool clearOld) { - register int i; - *new = *old; new->defs.next = NULL; if (clearOld) { - for (i = 0; i < XkbNumKbdGroups; i++) + for (int i = 0; i < XkbNumKbdGroups; i++) { old->numLevels[i] = 0; old->syms[i] = NULL; @@ -166,32 +159,29 @@ CopyKeyInfo(KeyInfo * old, KeyInfo * new, Bool clearOl } else { - int width; - for (i = 0; i < XkbNumKbdGroups; i++) + for (int i = 0; i < XkbNumKbdGroups; i++) { - width = new->numLevels[i]; + int width = new->numLevels[i]; if (old->syms[i] != NULL) { - new->syms[i] = uTypedCalloc(width, KeySym); + new->syms[i] = calloc(width, sizeof(KeySym)); if (!new->syms[i]) { new->syms[i] = NULL; new->numLevels[i] = 0; return False; } - memcpy((char *) new->syms[i], (char *) old->syms[i], - width * sizeof(KeySym)); + memcpy(new->syms[i], old->syms[i], width * sizeof(KeySym)); } if (old->acts[i] != NULL) { - new->acts[i] = uTypedCalloc(width, XkbAction); + new->acts[i] = calloc(width, sizeof(XkbAction)); if (!new->acts[i]) { new->acts[i] = NULL; return False; } - memcpy((char *) new->acts[i], (char *) old->acts[i], - width * sizeof(XkbAction)); + memcpy(new->acts[i], old->acts[i], width * sizeof(XkbAction)); } } } @@ -237,8 +227,6 @@ 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); @@ -250,9 +238,9 @@ InitSymbolsInfo(SymbolsInfo * info, XkbDescPtr xkb) info->groupInfo = 0; info->szKeys = SYMBOLS_INIT_SIZE; info->nKeys = 0; - info->keys = uTypedCalloc(SYMBOLS_INIT_SIZE, KeyInfo); + info->keys = calloc(SYMBOLS_INIT_SIZE, sizeof(KeyInfo)); info->modMap = NULL; - for (i = 0; i < XkbNumKbdGroups; i++) + for (int i = 0; i < XkbNumKbdGroups; i++) info->groupNames[i] = None; InitKeyInfo(&info->dflt); InitVModInfo(&info->vmods, xkb); @@ -264,18 +252,15 @@ InitSymbolsInfo(SymbolsInfo * info, XkbDescPtr xkb) static void FreeSymbolsInfo(SymbolsInfo * info) { - register int i; - - if (info->name) - uFree(info->name); + free(info->name); info->name = NULL; if (info->keys) { - for (i = 0; i < info->nKeys; i++) + for (int i = 0; i < info->nKeys; i++) { FreeKeyInfo(&info->keys[i]); } - uFree(info->keys); + free(info->keys); info->keys = NULL; } if (info->modMap) @@ -288,7 +273,7 @@ FreeSymbolsInfo(SymbolsInfo * info) ClearAliases(&info->aliases); info->aliases = NULL; } - bzero((char *) info, sizeof(SymbolsInfo)); + bzero(info, sizeof(SymbolsInfo)); return; } @@ -307,18 +292,18 @@ ResizeKeyGroup(KeyInfo * key, if ((key->syms[group] == NULL) || tooSmall) { - key->syms[group] = uTypedRecalloc(key->syms[group], - key->numLevels[group], newWidth, - KeySym); + key->syms[group] = recallocarray(key->syms[group], + key->numLevels[group], newWidth, + sizeof(KeySym)); if (!key->syms[group]) return False; } if (((forceActions) && (tooSmall || (key->acts[group] == NULL))) || (tooSmall && (key->acts[group] != NULL))) { - key->acts[group] = uTypedRecalloc(key->acts[group], - key->numLevels[group], newWidth, - XkbAction); + key->acts[group] = recallocarray(key->acts[group], + key->numLevels[group], newWidth, + sizeof(XkbAction)); if (!key->acts[group]) return False; } @@ -333,7 +318,6 @@ MergeKeyGroups(SymbolsInfo * info, KeySym *resultSyms; XkbAction *resultActs; int resultWidth; - register int i; Bool report, clobber; clobber = (from->defs.merge != MergeAugment); @@ -354,7 +338,7 @@ MergeKeyGroups(SymbolsInfo * info, } if (resultSyms == NULL) { - resultSyms = uTypedCalloc(resultWidth, KeySym); + resultSyms = calloc(resultWidth, sizeof(KeySym)); if (!resultSyms) { WSGO("Could not allocate symbols for group merge\n"); @@ -365,7 +349,7 @@ MergeKeyGroups(SymbolsInfo * info, } if ((resultActs == NULL) && (into->acts[group] || from->acts[group])) { - resultActs = uTypedCalloc(resultWidth, XkbAction); + resultActs = calloc(resultWidth, sizeof(XkbAction)); if (!resultActs) { WSGO("Could not allocate actions for group merge\n"); @@ -374,7 +358,7 @@ MergeKeyGroups(SymbolsInfo * info, return False; } } - for (i = 0; i < resultWidth; i++) + for (int i = 0; i < resultWidth; i++) { KeySym fromSym, toSym; if (from->syms[group] && (i < from->numLevels[group])) @@ -455,42 +439,39 @@ MergeKeyGroups(SymbolsInfo * info, } } if ((into->syms[group] != NULL) && (resultSyms != into->syms[group])) - uFree(into->syms[group]); + free(into->syms[group]); if ((from->syms[group] != NULL) && (resultSyms != from->syms[group])) - uFree(from->syms[group]); + free(from->syms[group]); if ((into->acts[group] != NULL) && (resultActs != into->acts[group])) - uFree(into->acts[group]); + free(into->acts[group]); if ((from->acts[group] != NULL) && (resultActs != from->acts[group])) - uFree(from->acts[group]); + free(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 |= (1 << group); - from->symsDefined &= ~(1 << group); - into->actsDefined |= (1 << group); - from->actsDefined &= ~(1 << group); + into->symsDefined |= (1U << group); + from->symsDefined &= ~(1U << group); + into->actsDefined |= (1U << group); + from->actsDefined &= ~(1U << 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 (i = 0; i < XkbNumKbdGroups; i++) + for (int i = 0; i < XkbNumKbdGroups; i++) { if (into->numLevels[i] != 0) { - if (into->syms[i]) - uFree(into->syms[i]); - if (into->acts[i]) - uFree(into->acts[i]); + free(into->syms[i]); + free(into->acts[i]); } } *into = *from; @@ -500,7 +481,7 @@ MergeKeys(SymbolsInfo * info, KeyInfo * into, KeyInfo report = ((warningLevel > 9) || ((into->defs.fileID == from->defs.fileID) && (warningLevel > 0))); - for (i = 0; i < XkbNumKbdGroups; i++) + for (int i = 0; i < XkbNumKbdGroups; i++) { if (from->numLevels[i] > 0) { @@ -509,11 +490,11 @@ MergeKeys(SymbolsInfo * info, KeyInfo * into, KeyInfo into->numLevels[i] = from->numLevels[i]; into->syms[i] = from->syms[i]; into->acts[i] = from->acts[i]; - into->symsDefined |= (1 << i); + into->symsDefined |= (1U << i); from->syms[i] = NULL; from->acts[i] = NULL; from->numLevels[i] = 0; - from->symsDefined &= ~(1 << i); + from->symsDefined &= ~(1U << i); if (into->syms[i]) into->defs.defined |= _Key_Syms; if (into->acts[i]) @@ -601,17 +582,16 @@ MergeKeys(SymbolsInfo * info, KeyInfo * into, KeyInfo static Bool AddKeySymbols(SymbolsInfo * info, KeyInfo * key, XkbDescPtr xkb) { - register int i; unsigned long real_name; - for (i = 0; i < info->nKeys; i++) + for (int 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 (i = 0; i < info->nKeys; i++) + for (int i = 0; i < info->nKeys; i++) { if (info->keys[i].name == real_name) return MergeKeys(info, &info->keys[i], key); @@ -620,8 +600,8 @@ AddKeySymbols(SymbolsInfo * info, KeyInfo * key, XkbDe if (info->nKeys >= info->szKeys) { info->szKeys += SYMBOLS_CHUNK; - info->keys = - uTypedRecalloc(info->keys, info->nKeys, info->szKeys, KeyInfo); + info->keys = recallocarray(info->keys, info->nKeys, info->szKeys, + sizeof(KeyInfo)); if (!info->keys) { WSGO("Could not allocate key symbols descriptions\n"); @@ -644,9 +624,10 @@ 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; @@ -670,9 +651,10 @@ 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; @@ -693,7 +675,7 @@ AddModMapEntry(SymbolsInfo * info, ModMapEntry * new) return True; } } - mm = uTypedAlloc(ModMapEntry); + mm = malloc(sizeof(ModMapEntry)); if (mm == NULL) { WSGO("Could not allocate modifier map entry\n"); @@ -713,7 +695,7 @@ static void MergeIncludedSymbols(SymbolsInfo * into, SymbolsInfo * from, unsigned merge, XkbDescPtr xkb) { - register int i; + int i; KeyInfo *key; if (from->errorCount > 0) @@ -751,7 +733,7 @@ MergeIncludedSymbols(SymbolsInfo * into, SymbolsInfo * if (!AddModMapEntry(into, mm)) into->errorCount++; next = (ModMapEntry *) mm->defs.next; - uFree(mm); + free(mm); } from->modMap = NULL; } @@ -798,8 +780,7 @@ HandleIncludeSymbols(IncludeStmt * stmt, (*hndlr) (rtrn, xkb, MergeOverride, &included); if (stmt->stmt != NULL) { - if (included.name != NULL) - uFree(included.name); + free(included.name); included.name = stmt->stmt; stmt->stmt = NULL; } @@ -874,8 +855,8 @@ static LookupEntry groupNames[] = { #define ACTIONS 2 static Bool -GetGroupIndex(KeyInfo * key, - ExprDef * arrayNdx, unsigned what, unsigned *ndx_rtrn) +GetGroupIndex(KeyInfo *key, const ExprDef *arrayNdx, + unsigned what, unsigned *ndx_rtrn) { const char *name; ExprResult tmp; @@ -887,16 +868,15 @@ GetGroupIndex(KeyInfo * key, if (arrayNdx == NULL) { - register int i; unsigned defined; if (what == SYMBOLS) defined = key->symsDefined; else defined = key->actsDefined; - for (i = 0; i < XkbNumKbdGroups; i++) + for (int i = 0; i < XkbNumKbdGroups; i++) { - if ((defined & (1 << i)) == 0) + if ((defined & (1U << i)) == 0) { *ndx_rtrn = i; return True; @@ -927,19 +907,17 @@ GetGroupIndex(KeyInfo * key, } static Bool -AddSymbolsToKey(KeyInfo * key, - XkbDescPtr xkb, - const char *field, - ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info) +AddSymbolsToKey(KeyInfo *key, XkbDescPtr xkb, const char *field, + const ExprDef *arrayNdx, const ExprDef *value, + SymbolsInfo *info) { unsigned ndx, nSyms; - int i; if (!GetGroupIndex(key, arrayNdx, SYMBOLS, &ndx)) return False; if (value == NULL) { - key->symsDefined |= (1 << ndx); + key->symsDefined |= (1U << ndx); return True; } if (value->op != ExprKeysymList) @@ -965,8 +943,8 @@ AddSymbolsToKey(KeyInfo * key, ACTION("Symbols lost\n"); return False; } - key->symsDefined |= (1 << ndx); - for (i = 0; i < nSyms; i++) { + key->symsDefined |= (1U << ndx); + for (int i = 0; i < nSyms; i++) { if (!LookupKeysym(value->value.list.syms[i], &key->syms[ndx][i])) { if (warningLevel > 0) { @@ -976,7 +954,7 @@ AddSymbolsToKey(KeyInfo * key, key->syms[ndx][i] = NoSymbol; } } - for (i = key->numLevels[ndx] - 1; + for (int i = key->numLevels[ndx] - 1; (i >= 0) && (key->syms[ndx][i] == NoSymbol); i--) { key->numLevels[ndx]--; @@ -985,12 +963,10 @@ AddSymbolsToKey(KeyInfo * key, } static Bool -AddActionsToKey(KeyInfo * key, - XkbDescPtr xkb, - const char *field, - ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info) +AddActionsToKey(KeyInfo *key, XkbDescPtr xkb, const char *field, + const ExprDef *arrayNdx, const ExprDef *value, + SymbolsInfo *info) { - register int i; unsigned ndx, nActs; ExprDef *act; XkbAnyAction *toAct; @@ -1000,7 +976,7 @@ AddActionsToKey(KeyInfo * key, if (value == NULL) { - key->actsDefined |= (1 << ndx); + key->actsDefined |= (1U << ndx); return True; } if (value->op != ExprActionList) @@ -1033,11 +1009,11 @@ AddActionsToKey(KeyInfo * key, ACTION("Actions lost\n"); return False; } - key->actsDefined |= (1 << ndx); + key->actsDefined |= (1U << ndx); toAct = (XkbAnyAction *) key->acts[ndx]; act = value->value.child; - for (i = 0; i < nActs; i++, toAct++) + for (int i = 0; i < nActs; i++, toAct++) { if (!HandleActionDef(act, xkb, toAct, MergeOverride, info->action)) { @@ -1051,7 +1027,7 @@ AddActionsToKey(KeyInfo * key, } static int -SetAllowNone(KeyInfo * key, ExprDef * arrayNdx, ExprDef * value) +SetAllowNone(KeyInfo *key, const ExprDef *arrayNdx, const ExprDef *value) { ExprResult tmp; unsigned radio_groups = 0; @@ -1076,7 +1052,7 @@ SetAllowNone(KeyInfo * key, ExprDef * arrayNdx, ExprDe tmp.uval); return False; } - radio_groups |= (1 << (tmp.uval - 1)); + radio_groups |= (1U << (tmp.uval - 1)); } if (!ExprResolveBoolean(value, &tmp, NULL, NULL)) { @@ -1121,10 +1097,9 @@ static LookupEntry rgEntries[] = { }; static Bool -SetSymbolsField(KeyInfo * key, - XkbDescPtr xkb, - const char *field, - ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info) +SetSymbolsField(KeyInfo *key, XkbDescPtr xkb, const char *field, + const ExprDef *arrayNdx, const ExprDef *value, + SymbolsInfo *info) { Bool ok = True; ExprResult tmp; @@ -1162,7 +1137,7 @@ SetSymbolsField(KeyInfo * key, else { key->types[ndx.uval - 1] = XkbInternAtom(NULL, tmp.str, False); - key->typesDefined |= (1 << (ndx.uval - 1)); + key->typesDefined |= (1U << (ndx.uval - 1)); } } else if (uStrCaseCmp(field, "symbols") == 0) @@ -1228,7 +1203,7 @@ SetSymbolsField(KeyInfo * key, key->behavior.type = XkbKB_RadioGroup | (permanent ? XkbKB_Permanent : 0); key->behavior.data = tmp.uval - 1; - if (key->allowNone & (1 << (tmp.uval - 1))) + if (key->allowNone & (1U << (tmp.uval - 1))) key->behavior.data |= XkbKB_RGAllowNone; key->defs.defined |= _Key_Behavior; } @@ -1370,7 +1345,7 @@ SetSymbolsField(KeyInfo * key, } static int -SetGroupName(SymbolsInfo * info, ExprDef * arrayNdx, ExprDef * value) +SetGroupName(SymbolsInfo *info, const ExprDef *arrayNdx,const ExprDef *value) { ExprResult tmp, name; @@ -1493,8 +1468,6 @@ 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) { @@ -1505,6 +1478,9 @@ HandleSymbolsBody(VarDef * def, } else { + ExprResult tmp, field; + ExprDef *arrayNdx; + if (def->name == NULL) { if ((def->value == NULL) @@ -1536,7 +1512,6 @@ 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); @@ -1544,19 +1519,17 @@ SetExplicitGroup(SymbolsInfo * info, KeyInfo * key) longText(key->name, XkbMessage)); ACTION("All groups except first one will be ignored\n"); } - for (i = 1; i < XkbNumKbdGroups; i++) + for (int i = 1; i < XkbNumKbdGroups; i++) { key->numLevels[i] = 0; - if (key->syms[i] != NULL) - uFree(key->syms[i]); + free(key->syms[i]); key->syms[i] = (KeySym *) NULL; - if (key->acts[i] != NULL) - uFree(key->acts[i]); + free(key->acts[i]); key->acts[i] = (XkbAction *) NULL; key->types[i] = (Atom) 0; } } - key->typesDefined = key->symsDefined = key->actsDefined = 1 << group; + key->typesDefined = key->symsDefined = key->actsDefined = 1U << group; key->numLevels[group] = key->numLevels[0]; key->numLevels[0] = 0; @@ -1603,7 +1576,6 @@ static Bool HandleModMapDef(ModMapDef * def, XkbDescPtr xkb, unsigned merge, SymbolsInfo * info) { - ExprDef *key; ModMapEntry tmp; ExprResult rtrn; Bool ok; @@ -1617,7 +1589,8 @@ HandleModMapDef(ModMapDef * def, } ok = True; tmp.modifier = rtrn.uval; - for (key = def->keys; key != NULL; key = (ExprDef *) key->common.next) + for (ExprDef *key = def->keys; key != NULL; + key = (ExprDef *) key->common.next) { if ((key->op == ExprValue) && (key->type == TypeKeyName)) { @@ -1706,14 +1679,14 @@ HandleSymbolsFile(XkbFile * file, static Bool FindKeyForSymbol(XkbDescPtr xkb, KeySym sym, unsigned int *kc_rtrn) { - register int i, j; - register Bool gotOne; + int j; + Bool gotOne; j = 0; do { gotOne = False; - for (i = xkb->min_key_code; i <= (int) xkb->max_key_code; i++) + for (int i = xkb->min_key_code; i <= (int) xkb->max_key_code; i++) { if (j < (int) XkbKeyNumSyms(xkb, i)) { @@ -1740,13 +1713,11 @@ FindKeyForSymbol(XkbDescPtr xkb, KeySym sym, unsigned * @return True if found, False otherwise. */ static Bool -FindNamedType(XkbDescPtr xkb, Atom name, unsigned *type_rtrn) +FindNamedType(const XkbDescPtr xkb, Atom name, unsigned *type_rtrn) { - register unsigned n; - if (xkb && xkb->map && xkb->map->types) { - for (n = 0; n < xkb->map->num_types; n++) + for (unsigned n = 0; n < xkb->map->num_types; n++) { if (xkb->map->types[n].name == (Atom) name) { @@ -1790,15 +1761,15 @@ KSIsUpper(KeySym ks) * - TWO_LEVEL for other 2 shift level keys. * and the same for four level keys. * - * @param width Number of sysms in syms. + * @param width Number of syms 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, KeySym * syms, Atom * typeNameRtrn, - Bool * autoType) +FindAutomaticType(int width, const KeySym *syms, + Atom *typeNameRtrn, Bool *autoType) { *autoType = False; if ((width == 1) || (width == 0)) @@ -1850,14 +1821,14 @@ FindAutomaticType(int width, KeySym * syms, Atom * typ static void PrepareKeyDef(KeyInfo * key) { - int i, j, width, defined, lastGroup; + int i, defined, lastGroup; Bool identical; defined = key->symsDefined | key->actsDefined | key->typesDefined; /* get highest group number */ for (i = XkbNumKbdGroups - 1; i >= 0; i--) { - if (defined & (1 << i)) + if (defined & (1U << i)) break; } lastGroup = i; @@ -1870,34 +1841,34 @@ PrepareKeyDef(KeyInfo * key) /* We can make a wrong assumption here. But leaving gaps is worse. */ for (i = lastGroup; i > 0; i--) { - if (defined & (1 << i)) + int width; + + if (defined & (1U << i)) continue; width = key->numLevels[0]; if (key->typesDefined & 1) { - for (j = 0; j < width; j++) + for (int j = 0; j < width; j++) { key->types[i] = key->types[0]; } - key->typesDefined |= 1 << i; + key->typesDefined |= 1U << i; } if ((key->actsDefined & 1) && key->acts[0]) { - key->acts[i] = uTypedCalloc(width, XkbAction); + key->acts[i] = calloc(width, sizeof(XkbAction)); if (key->acts[i] == NULL) continue; - memcpy((void *) key->acts[i], (void *) key->acts[0], - width * sizeof(XkbAction)); - key->actsDefined |= 1 << i; + memcpy(key->acts[i], key->acts[0], width * sizeof(XkbAction)); + key->actsDefined |= 1U << i; } if ((key->symsDefined & 1) && key->syms[0]) { - key->syms[i] = uTypedCalloc(width, KeySym); + key->syms[i] = calloc(width, sizeof(KeySym)); if (key->syms[i] == NULL) continue; - memcpy((void *) key->syms[i], (void *) key->syms[0], - width * sizeof(KeySym)); - key->symsDefined |= 1 << i; + memcpy(key->syms[i], key->syms[0], width * sizeof(KeySym)); + key->symsDefined |= 1U << i; } if (defined & 1) { @@ -1937,11 +1908,9 @@ PrepareKeyDef(KeyInfo * key) for (i = lastGroup; i > 0; i--) { key->numLevels[i] = 0; - if (key->syms[i] != NULL) - uFree(key->syms[i]); + free(key->syms[i]); key->syms[i] = (KeySym *) NULL; - if (key->acts[i] != NULL) - uFree(key->acts[i]); + free(key->acts[i]); key->acts[i] = (XkbAction *) NULL; key->types[i] = (Atom) 0; } @@ -1960,8 +1929,8 @@ PrepareKeyDef(KeyInfo * key) static Bool CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, int start_from) { - register int i; - unsigned okc, kc, width, tmp, nGroups; + int i; + unsigned kc, width, nGroups; XkbKeyTypePtr type; Bool haveActions, autoType, useAlias; KeySym *outSyms; @@ -1990,8 +1959,8 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, in for (i = width = nGroups = 0; i < XkbNumKbdGroups; i++) { if (((i + 1) > nGroups) - && (((key->symsDefined | key->actsDefined) & (1 << i)) - || (key->typesDefined) & (1 << i))) + && (((key->symsDefined | key->actsDefined) & (1U << i)) + || (key->typesDefined) & (1U << i))) nGroups = i + 1; if (key->acts[i]) haveActions = True; @@ -2021,7 +1990,7 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, in if (FindNamedType(xkb, key->types[i], &types[i])) { if (!autoType || key->numLevels[i] > 2) - xkb->server->explicit[kc] |= (1 << i); + xkb->server->explicit[kc] |= (1U << i); } else { @@ -2100,7 +2069,7 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, in if (key->syms[i] != NULL) { /* fill key to "width" symbols*/ - for (tmp = 0; tmp < width; tmp++) + for (unsigned tmp = 0; tmp < width; tmp++) { if (tmp < key->numLevels[i]) outSyms[tmp] = key->syms[i][tmp]; @@ -2125,6 +2094,8 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, in break; case XkbKB_Overlay1: case XkbKB_Overlay2: + { + unsigned okc; /* find key by name! */ if (!FindNamedKey(xkb, key->nameForOverlayKey, &okc, True, CreateKeyNames(xkb), 0)) @@ -2140,6 +2111,7 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, in break; } key->behavior.data = okc; + } default: xkb->server->behaviors[kc] = key->behavior; xkb->server->explicit[kc] |= XkbExplicitBehaviorMask; @@ -2153,9 +2125,9 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, in if (key->repeat != RepeatUndefined) { if (key->repeat == RepeatYes) - xkb->ctrls->per_key_repeat[kc / 8] |= (1 << (kc % 8)); + xkb->ctrls->per_key_repeat[kc / 8] |= (1U << (kc % 8)); else - xkb->ctrls->per_key_repeat[kc / 8] &= ~(1 << (kc % 8)); + xkb->ctrls->per_key_repeat[kc / 8] &= ~(1U << (kc % 8)); xkb->server->explicit[kc] |= XkbExplicitAutoRepeatMask; } @@ -2199,7 +2171,7 @@ CopyModMapDef(XkbFileInfo * result, ModMapEntry * entr } return False; } - xkb->map->modmap[kc] |= (1 << entry->modifier); + xkb->map->modmap[kc] |= (1U << entry->modifier); return True; } @@ -2213,7 +2185,6 @@ CopyModMapDef(XkbFileInfo * result, ModMapEntry * entr Bool CompileSymbols(XkbFile * file, XkbFileInfo * result, unsigned merge) { - register int i; SymbolsInfo info; XkbDescPtr xkb; @@ -2227,6 +2198,7 @@ CompileSymbols(XkbFile * file, XkbFileInfo * result, u return True; if (info.errorCount == 0) { + int i; KeyInfo *key; /* alloc memory in the xkb struct */ blob - cba6fec174f15f64461b5e25549449c13856ef9d blob + deb96ea996d7fe650d420b2f2b422deffd4b46ff --- app/xkbcomp/utils.c +++ app/xkbcomp/utils.c @@ -30,73 +30,41 @@ #include #include -/***====================================================================***/ -Opaque -uAlloc(unsigned size) -{ - return ((Opaque) malloc(size)); -} - /***====================================================================***/ -Opaque -uCalloc(unsigned n, unsigned size) +#ifndef HAVE_RECALLOCARRAY +void * +uRecalloc(void *old, size_t nOld, size_t nNew, size_t itemSize) { - return ((Opaque) calloc(n, size)); -} - -/***====================================================================***/ - -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 = (char *) calloc(nNew, itemSize); + rtrn = calloc(nNew, itemSize); else { - rtrn = (char *) realloc((char *) old, nNew * itemSize); + rtrn = reallocarray(old, nNew, itemSize); if ((rtrn) && (nNew > nOld)) { bzero(&rtrn[nOld * itemSize], (nNew - nOld) * itemSize); } } - return (Opaque) rtrn; + return (void *) rtrn; } +#endif -/***====================================================================***/ -void -uFree(Opaque ptr) -{ - if (ptr != (Opaque) NULL) - free((char *) ptr); - return; -} - /***====================================================================***/ -/*** PRINT FUNCTIONS ***/ +/*** DEBUG FUNCTIONS ***/ /***====================================================================***/ -FILE *uDebugFile = NULL; +#ifdef DEBUG +static FILE *uDebugFile = NULL; int uDebugIndentLevel = 0; -int uDebugIndentSize = 4; +static const int uDebugIndentSize = 4; Boolean -uSetDebugFile(char *name) +uSetDebugFile(const char *name) { if ((uDebugFile != NULL) && (uDebugFile != stderr)) { @@ -116,12 +84,11 @@ uSetDebugFile(char *name) } void -uDebug(char *s, ...) +uDebug(const char *s, ...) { - int i; va_list args; - for (i = (uDebugIndentLevel * uDebugIndentSize); i > 0; i--) + for (int i = (uDebugIndentLevel * uDebugIndentSize); i > 0; i--) { putc(' ', uDebugFile); } @@ -130,28 +97,18 @@ uDebug(char *s, ...) va_end(args); fflush(uDebugFile); } - -void -uDebugNOI(char *s, ...) -{ - va_list args; - - va_start(args, s); - vfprintf(uDebugFile, s, args); - va_end(args); - fflush(uDebugFile); -} +#endif /***====================================================================***/ static FILE *errorFile = NULL; static int outCount = 0; -static char *preMsg = NULL; -static char *postMsg = NULL; -static char *prefix = NULL; +static const char *preMsg = NULL; +static const char *postMsg = NULL; +static const char *prefix = NULL; Boolean -uSetErrorFile(char *name) +uSetErrorFile(const char *name) { if ((errorFile != NULL) && (errorFile != stderr)) { @@ -277,7 +234,7 @@ uInternalError(const char *s, ...) } void -uSetPreErrorMessage(char *msg) +uSetPreErrorMessage(const char *msg) { outCount = 0; preMsg = msg; @@ -285,14 +242,14 @@ uSetPreErrorMessage(char *msg) } void -uSetPostErrorMessage(char *msg) +uSetPostErrorMessage(const char *msg) { postMsg = msg; return; } void -uSetErrorPrefix(char *pre) +uSetErrorPrefix(const char *pre) { prefix = pre; return; @@ -316,7 +273,7 @@ uStringDup(const char *str) if (str == NULL) return NULL; - rtrn = (char *) uAlloc(strlen(str) + 1); + rtrn = malloc(strlen(str) + 1); strcpy(rtrn, str); return rtrn; } @@ -328,7 +285,7 @@ uStrCaseCmp(const char *str1, const char *str2) { char buf1[512], buf2[512]; char c, *s; - register int n; + int n; for (n = 0, s = buf1; (c = *str1++); n++) { @@ -352,7 +309,7 @@ uStrCaseCmp(const char *str1, const char *str2) } int -uStrCasePrefix(const char *my_prefix, char *str) +uStrCasePrefix(const char *my_prefix, const char *str) { char c1; char c2; blob - 728d7b4e11dd7bd9e1c9a247aeeb629b98541047 blob + 2bf7674474e6dea8ba98ea7c43068bea038bf0ca --- app/xkbcomp/utils.h +++ app/xkbcomp/utils.h @@ -29,15 +29,17 @@ /***====================================================================***/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include +#include #include #include #include #include -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #ifndef NUL #define NUL '\0' @@ -45,13 +47,6 @@ /***====================================================================***/ -#ifndef OPAQUE_DEFINED -typedef void *Opaque; -#endif -#ifndef NullOpaque -#define NullOpaque ((Opaque)NULL) -#endif - #ifndef BOOLEAN_DEFINED typedef char Boolean; #endif @@ -74,37 +69,23 @@ typedef int Comparison; /***====================================================================***/ -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 */ - ); +#ifndef HAVE_REALLOCARRAY +#define reallocarray(p, n, s) realloc(p, (n) * (s)) +#endif -#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) +#ifndef HAVE_RECALLOCARRAY +#define recallocarray uRecalloc + +extern void *uRecalloc(void * /* old */ , + size_t /* nOld */ , + size_t /* nNew */ , + size_t /* newSize */ + ); #endif /***====================================================================***/ -extern Boolean uSetErrorFile(char * /* name */ +extern Boolean uSetErrorFile(const char * /* name */ ); #define INFO uInformation @@ -139,13 +120,13 @@ uInformation(const char * /* s */ , ... extern void uInternalError(const char * /* s */ , ... ) _X_ATTRIBUTE_PRINTF(1, 2); - extern void uSetPreErrorMessage(char * /* msg */ + extern void uSetPreErrorMessage(const char * /* msg */ ); - extern void uSetPostErrorMessage(char * /* msg */ + extern void uSetPostErrorMessage(const char * /* msg */ ); - extern void uSetErrorPrefix(char * /* void */ + extern void uSetErrorPrefix(const char * /* void */ ); extern void uFinishUp(void); @@ -183,40 +164,28 @@ 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(char * /* s */ , ... - ) _X_ATTRIBUTE_PRINTF(1, 2); +extern void uDebug(const char *, ...) _X_ATTRIBUTE_PRINTF(1, 2); - extern void uDebugNOI( /* no indent */ - char * /* s */ , ... - ) _X_ATTRIBUTE_PRINTF(1, 2); +extern Boolean uSetDebugFile(const char *name); - extern Boolean uSetDebugFile(char *name); +extern int uDebugIndentLevel; - 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) @@ -224,12 +193,6 @@ extern #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 */ blob - 847838606d1ca32d6ae4715efcf16f5b33af25db blob + 279b549a89e5408e3b3c735d2b5aff33fd9fece1 --- app/xkbcomp/vmod.c +++ app/xkbcomp/vmod.c @@ -47,8 +47,6 @@ 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) @@ -57,7 +55,8 @@ ClearVModInfo(VModInfo * info, XkbDescPtr xkb) info->newlyDefined = info->defined = info->available = 0; if (xkb && xkb->names) { - register int bit; + int i, bit; + for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1) { if (xkb->names->vmods[i] != None) @@ -78,9 +77,9 @@ ClearVModInfo(VModInfo * info, XkbDescPtr xkb) * @param mergeMode Merge strategy (e.g. MergeOverride) */ Bool -HandleVModDef(VModDef * stmt, unsigned mergeMode, VModInfo * info) +HandleVModDef(const VModDef *stmt, unsigned mergeMode, VModInfo *info) { - register int i, bit, nextFree; + int i, bit, nextFree; ExprResult mod; XkbServerMapPtr srv; XkbNamesPtr names; @@ -138,9 +137,9 @@ HandleVModDef(VModDef * stmt, unsigned mergeMode, VMod ACTION("Exiting\n"); return False; } - info->defined |= (1 << nextFree); - info->newlyDefined |= (1 << nextFree); - info->available |= (1 << nextFree); + info->defined |= (1U << nextFree); + info->newlyDefined |= (1U << nextFree); + info->available |= (1U << nextFree); names->vmods[nextFree] = stmtName; if (stmt->value == NULL) return True; @@ -166,13 +165,12 @@ HandleVModDef(VModDef * stmt, unsigned mergeMode, VMod * @return True on success, False otherwise. If False is returned, val_rtrn is * undefined. */ -int +static int LookupVModIndex(XPointer priv, Atom elem, Atom field, unsigned type, ExprResult * val_rtrn) { - register int i; - register char *fieldStr; - register char *modStr; + int i; + char *fieldStr; XkbDescPtr xkb; xkb = (XkbDescPtr) priv; @@ -192,7 +190,7 @@ LookupVModIndex(XPointer priv, */ for (i = 0; i < XkbNumVirtualMods; i++) { - modStr = XkbAtomGetString(xkb->dpy, xkb->names->vmods[i]); + char *modStr = XkbAtomGetString(xkb->dpy, xkb->names->vmods[i]); if ((modStr != NULL) && (uStrCaseCmp(fieldStr, modStr) == 0)) { val_rtrn->uval = i; @@ -218,8 +216,8 @@ LookupVModMask(XPointer priv, { if (LookupVModIndex(priv, elem, field, type, val_rtrn)) { - register unsigned ndx = val_rtrn->uval; - val_rtrn->uval = (1 << (XkbNumModifiers + ndx)); + unsigned ndx = val_rtrn->uval; + val_rtrn->uval = (1U << (XkbNumModifiers + ndx)); return True; } return False; @@ -228,26 +226,28 @@ LookupVModMask(XPointer priv, int FindKeypadVMod(XkbDescPtr xkb) { - Atom name; - ExprResult rtrn; + if (xkb) { + Atom name = XkbInternAtom(xkb->dpy, "NumLock", False); + ExprResult rtrn; - name = XkbInternAtom(xkb->dpy, "NumLock", False); - if ((xkb) && LookupVModIndex((XPointer) xkb, None, name, TypeInt, &rtrn)) - { - return rtrn.ival; + if (LookupVModIndex((XPointer) xkb, None, name, TypeInt, &rtrn)) + { + return rtrn.ival; + } } return -1; } Bool -ResolveVirtualModifier(ExprDef * def, ExprResult * val_rtrn, VModInfo * info) +ResolveVirtualModifier(const ExprDef *def, ExprResult *val_rtrn, + const VModInfo *info) { XkbNamesPtr names; names = info->xkb->names; if (def->op == ExprIdent) { - register int i, bit; + int i, bit; for (i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1) { char *str1, *str2; blob - 75f9fb4b54d469b0f055110ee58e7766ea543bbd blob + 6e0203674f20b204586a90730276ecdf871b1a48 --- app/xkbcomp/vmod.h +++ app/xkbcomp/vmod.h @@ -44,7 +44,7 @@ extern void ClearVModInfo(VModInfo * /* info */ , XkbDescPtr /* xkb */ ); -extern Bool HandleVModDef(VModDef * /* stmt */ , +extern Bool HandleVModDef(const VModDef * /* stmt */ , unsigned /* mergeMode */ , VModInfo * /* info */ ); @@ -53,13 +53,6 @@ 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 */ , @@ -70,9 +63,9 @@ extern int LookupVModMask(XPointer /* priv */ , extern int FindKeypadVMod(XkbDescPtr /* xkb */ ); -extern Bool ResolveVirtualModifier(ExprDef * /* def */ , +extern Bool ResolveVirtualModifier(const ExprDef * /* def */ , ExprResult * /* value_rtrn */ , - VModInfo * /* info */ + const VModInfo * /* info */ ); #endif /* VMOD_H */ blob - 796fa22a5102265d5ba43f91c401675fc66d0dd8 blob + 6aedb67a1274424cb4fe2417e543ee21c95cbc17 --- app/xkbcomp/xkbcomp.c +++ app/xkbcomp/xkbcomp.c @@ -24,6 +24,7 @@ ********************************************************/ +#include "utils.h" #include #include #include @@ -34,10 +35,6 @@ #include /* end BR */ -#if defined(sgi) -#include -#endif - #define DEBUG_VAR debugFlags #include "xkbcomp.h" #include @@ -70,7 +67,9 @@ #define INPUT_XKB 1 #define INPUT_XKM 2 +#ifdef DEBUG unsigned int debugFlags; +#endif static const char *fileTypeExt[] = { "XXX", @@ -81,12 +80,12 @@ static const char *fileTypeExt[] = { }; static unsigned inputFormat, outputFormat; -char *rootDir; +static const char *rootDir; static char *inputFile; -static char *inputMap; +static const char *inputMap; static char *outputFile; -static char *inDpyName; -static char *outDpyName; +static const char *inDpyName; +static const char *outDpyName; static Display *inDpy; static Display *outDpy; static Bool showImplicit = False; @@ -96,10 +95,10 @@ static Bool xkblist = False; unsigned warningLevel = 5; unsigned verboseLevel = 0; unsigned dirsToStrip = 0; -unsigned optionalParts = 0; -static char *preErrorMsg = NULL; -static char *postErrorMsg = NULL; -static char *errorPrefix = NULL; +static unsigned optionalParts = 0; +static const char *preErrorMsg = NULL; +static const char *postErrorMsg = NULL; +static const char *errorPrefix = NULL; static unsigned int device_id = XkbUseCoreKbd; /***====================================================================***/ @@ -178,7 +177,7 @@ Usage(int argc, char *argv[]) /***====================================================================***/ static void -setVerboseFlags(char *str) +setVerboseFlags(const char *str) { for (; *str; str++) { @@ -214,7 +213,7 @@ setVerboseFlags(char *str) static Bool parseArgs(int argc, char *argv[]) { - register int i, tmp; + int i, tmp; i = strlen(argv[0]); tmp = strlen("xkblist"); @@ -465,8 +464,7 @@ parseArgs(int argc, char *argv[]) } else { - char *tmp2; - for (tmp2 = argv[i]; (*tmp2 != '\0'); tmp2++) + for (const char *tmp2 = argv[i]; (*tmp2 != '\0'); tmp2++) { switch (*tmp2) { @@ -567,7 +565,7 @@ parseArgs(int argc, char *argv[]) } else if (strncmp(argv[i], "-v", 2) == 0) { - char *str; + const char *str; if (argv[i][2] != '\0') str = &argv[i][2]; else if ((i < (argc - 1)) && (argv[i + 1][0] != '-')) @@ -760,20 +758,25 @@ parseArgs(int argc, char *argv[]) } else if ((!outputFile) && (inputFile) && (strcmp(inputFile, "-") == 0)) { - int len = strlen("stdin") + strlen(fileTypeExt[outputFormat]) + 2; - outputFile = uTypedCalloc(len, char); - if (outputFile == NULL) +#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 { 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; - char *base, *ext; + const char *base, *ext; if (inputMap == NULL) { @@ -787,7 +790,7 @@ parseArgs(int argc, char *argv[]) base = inputMap; len = strlen(base) + strlen(fileTypeExt[outputFormat]) + 2; - outputFile = uTypedCalloc(len, char); + outputFile = calloc(len, sizeof(char)); if (outputFile == NULL) { WSGO("Cannot allocate space for output file name\n"); @@ -806,14 +809,15 @@ parseArgs(int argc, char *argv[]) else if (outputFile == NULL) { int len; - char *ch, *name, buf[128]; + char *ch, buf[128]; + const char *name = buf; if (inDpyName[0] == ':') - snprintf(name = buf, sizeof(buf), "server%s", inDpyName); + snprintf(buf, sizeof(buf), "server%s", inDpyName); else name = inDpyName; len = strlen(name) + strlen(fileTypeExt[outputFormat]) + 2; - outputFile = uTypedCalloc(len, char); + outputFile = calloc(len, sizeof(char)); if (outputFile == NULL) { WSGO("Cannot allocate space for output file name\n"); @@ -848,7 +852,7 @@ parseArgs(int argc, char *argv[]) } static Display * -GetDisplay(char *program, char *dpyName) +GetDisplay(const char *program, const char *dpyName) { int mjr, mnr, error; Display *dpy; @@ -904,7 +908,9 @@ main(int argc, char *argv[]) Status status; scan_set_file(stdin); +#ifdef DEBUG uSetDebugFile(NullString); +#endif uSetErrorFile(NullString); XkbInitIncludePath(); @@ -1022,7 +1028,7 @@ main(int argc, char *argv[]) } } } - bzero((char *) &result, sizeof(result)); + bzero(&result, sizeof(result)); result.type = mapToUse->type; if ((result.xkb = XkbAllocKeyboard()) == NULL) { @@ -1066,7 +1072,7 @@ main(int argc, char *argv[]) else if (inputFormat == INPUT_XKM) /* parse xkm file */ { unsigned tmp; - bzero((char *) &result, sizeof(result)); + bzero(&result, sizeof(result)); if ((result.xkb = XkbAllocKeyboard()) == NULL) { WSGO("Cannot allocate keyboard description\n"); @@ -1088,7 +1094,7 @@ main(int argc, char *argv[]) } else if (inDpy != NULL) { - bzero((char *) &result, sizeof(result)); + bzero(&result, sizeof(result)); result.type = XkmKeymapFile; result.xkb = XkbGetMap(inDpy, XkbAllMapComponentsMask, device_id); if (result.xkb == NULL) blob - 67b88b3ab1f992d25b58934f1f15ecd67771916c blob + d57a7f66034145823646e58d76f686ebc441b74b --- app/xkbcomp/xkbcomp.h +++ app/xkbcomp/xkbcomp.h @@ -29,6 +29,10 @@ #ifndef DEBUG_VAR #define DEBUG_VAR debugFlags +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include @@ -110,7 +114,6 @@ typedef struct _ParseCommon #define CreateKeyNames(x) ((x)->flags&AutoKeyNames) extern unsigned warningLevel; -extern unsigned optionalParts; typedef struct _IncludeStmt { @@ -168,7 +171,7 @@ typedef struct _Expr unsigned uval; int ival; char keyName[5]; - Opaque ptr; + void *ptr; } value; } ExprDef; @@ -360,7 +363,7 @@ extern Bool CompileKeyTypes(XkbFile * /* file */ , typedef struct _LEDInfo *LEDInfoPtr; -extern Bool CompileCompatMap(XkbFile * /* file */ , +extern Bool CompileCompatMap(const XkbFile * /* file */ , XkbFileInfo * /* result */ , unsigned /* merge */ , LEDInfoPtr * /* unboundLEDs */ @@ -377,21 +380,16 @@ 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(char * /* filename */ +extern int GenerateListing(const char * /* filename */ ); #endif /* XKBCOMP_H */ blob - 88df242ef8996696072eec5d247a30ab4f505d7a blob + 5253e48346a4b0013997ab8aad1aab3f1055b8b6 --- app/xkbcomp/xkbparse.y +++ app/xkbcomp/xkbparse.y @@ -91,15 +91,14 @@ %{ #ifdef DEBUG #define YYDEBUG 1 -#endif #define DEBUG_VAR parseDebug +unsigned int parseDebug; +#endif #include "parseutils.h" #include #include #include -unsigned int parseDebug; - %} %right EQUALS %left PLUS MINUS blob - 8a5e555a50cb319bc25e9dffd00691e902ff7498 blob + 6d9d13ac4cae11e6fbbd99fd811a1d1af9526da1 --- app/xkbcomp/xkbpath.c +++ app/xkbcomp/xkbpath.c @@ -123,7 +123,7 @@ XkbParseIncludeMap(char **str_inout, char **file_rtrn, } else if (str[0] == '(') { - uFree(*extra_data); + free(*extra_data); return False; } else @@ -134,8 +134,8 @@ XkbParseIncludeMap(char **str_inout, char **file_rtrn, tmp = strchr(str, ')'); if ((tmp == NULL) || (tmp[1] != '\0')) { - uFree(*file_rtrn); - uFree(*extra_data); + free(*file_rtrn); + free(*extra_data); return False; } *tmp++ = '\0'; @@ -175,20 +175,15 @@ XkbAddDefaultDirectoriesToPath(void) /** * Remove all entries from the global includePath. */ -void +static void XkbClearIncludePath(void) { - register int i; - if (szPath > 0) { - for (i = 0; i < nPathEntries; i++) + for (int i = 0; i < nPathEntries; i++) { - if (includePath[i] != NULL) - { - uFree(includePath[i]); - includePath[i] = NULL; - } + free(includePath[i]); + includePath[i] = NULL; } nPathEntries = 0; } @@ -218,22 +213,24 @@ XkbAddDirectoryToPath(const char *dir) } if (nPathEntries >= szPath) { + char **new; szPath += PATH_CHUNK; - includePath = (char **) realloc(includePath, szPath * sizeof(char *)); - if (includePath == NULL) + new = (char **) realloc(includePath, szPath * sizeof(char *)); + if (new == NULL) { WSGO("Allocation failed (includePath)\n"); return False; } + else + includePath = new; } - includePath[nPathEntries] = - (char *) calloc(strlen(dir) + 1, sizeof(char)); + includePath[nPathEntries] = strdup(dir); if (includePath[nPathEntries] == NULL) { WSGO("Allocation failed (includePath[%d])\n", nPathEntries); return False; } - strcpy(includePath[nPathEntries++], dir); + nPathEntries++; return True; } @@ -286,7 +283,7 @@ XkbDirectoryForInclude(unsigned type) typedef struct _FileCacheEntry { - char *name; + const char *name; unsigned type; char *path; void *data; @@ -308,7 +305,7 @@ static FileCacheEntry *fileCache; * @return The data from the overwritten file or NULL. */ void * -XkbAddFileToCache(char *name, unsigned type, char *path, void *data) +XkbAddFileToCache(const char *name, unsigned type, char *path, void *data) { FileCacheEntry *entry; @@ -323,14 +320,16 @@ XkbAddFileToCache(char *name, unsigned type, char *pat return old; } } - entry = uTypedAlloc(FileCacheEntry); + entry = malloc(sizeof(FileCacheEntry)); if (entry != NULL) { - entry->name = name; - entry->type = type; - entry->path = path; - entry->data = data; - entry->next = fileCache; + *entry = (FileCacheEntry) { + .name = name, + .type = type, + .path = path, + .data = data, + .next = fileCache + }; fileCache = entry; } return NULL; @@ -346,7 +345,7 @@ XkbAddFileToCache(char *name, unsigned type, char *pat * @return the data from the cache entry or NULL if no matching entry was found. */ void * -XkbFindFileInCache(char *name, unsigned type, char **pathRtrn) +XkbFindFileInCache(const char *name, unsigned type, char **pathRtrn) { FileCacheEntry *entry; @@ -374,19 +373,19 @@ XkbFindFileInCache(char *name, unsigned type, char **p * pathRtrn is undefined. */ FILE * -XkbFindFileInPath(char *name, unsigned type, char **pathRtrn) +XkbFindFileInPath(const char *name, unsigned type, char **pathRtrn) { - register int i; FILE *file = NULL; - int nameLen, typeLen, pathLen; - char buf[PATH_MAX], *typeDir; + int nameLen, typeLen; + char buf[PATH_MAX]; + const char *typeDir; typeDir = XkbDirectoryForInclude(type); nameLen = strlen(name); typeLen = strlen(typeDir); - for (i = 0; i < nPathEntries; i++) + for (int i = 0; i < nPathEntries; i++) { - pathLen = strlen(includePath[i]); + int pathLen = strlen(includePath[i]); if (typeLen < 1) continue; @@ -405,9 +404,7 @@ XkbFindFileInPath(char *name, unsigned type, char **pa if ((file != NULL) && (pathRtrn != NULL)) { - *pathRtrn = (char *) calloc(strlen(buf) + 1, sizeof(char)); - if (*pathRtrn != NULL) - strcpy(*pathRtrn, buf); + *pathRtrn = strdup(buf); } return file; } blob - 66c3ab76b09576c3ef84f5a0eba3ad444dbcd535 blob + fa6ec1f0619ebf0bc4482d6b25802ef89852a5e1 --- app/xkbcomp/xkbpath.h +++ app/xkbcomp/xkbpath.h @@ -29,8 +29,6 @@ extern Bool XkbInitIncludePath(void); -extern void XkbClearIncludePath(void); - extern void XkbAddDefaultDirectoriesToPath(void); extern Bool XkbAddDirectoryToPath(const char * /* dir */ @@ -39,18 +37,18 @@ extern Bool XkbAddDirectoryToPath(const char * /* dir extern char *XkbDirectoryForInclude(unsigned /* type */ ); -extern FILE *XkbFindFileInPath(char * /* name */ , +extern FILE *XkbFindFileInPath(const char * /* name */ , unsigned /* type */ , char ** /* pathRtrn */ ); -extern void *XkbAddFileToCache(char * /* name */ , +extern void *XkbAddFileToCache(const char * /* name */ , unsigned /* type */ , char * /* path */ , void * /* data */ ); -extern void *XkbFindFileInCache(char * /* name */ , +extern void *XkbFindFileInCache(const char * /* name */ , unsigned /* type */ , char ** /* pathRtrn */ ); blob - 9780159e57c0c463f15c734062fa4a2bfa32abbc blob + 1207aff321486a1012901df959122790dbaa3dbb --- app/xkbcomp/xkbscan.c +++ app/xkbcomp/xkbscan.c @@ -36,7 +36,9 @@ #include "utils.h" #include "parseutils.h" +#ifdef DEBUG unsigned int scanDebug; +#endif static FILE *yyin; @@ -576,7 +578,7 @@ static int numKeywords = sizeof(keywords) / sizeof(str static int yyGetIdent(int first) { - int ch, i, j, found; + int ch, j, found; int rtrn = IDENT; scanBuf[0] = first; @@ -589,7 +591,7 @@ yyGetIdent(int first) scanBuf[j++] = '\0'; found = 0; - for (i = 0; (!found) && (i < numKeywords); i++) + for (int i = 0; (!found) && (i < numKeywords); i++) { if (uStrCaseCmp(scanBuf, keywords[i].keyword) == 0) {