Log

Author Commit Date CI Message
Ran Benita c357a11a 2012-03-01T21:20:45 Add function to free XkbFile's Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 3216ecc0 2012-02-24T10:46:41 Don't cache loaded rules files This needlessly occupies memory for the lifetime of the library, and does not make a noticeable difference otherwise. This rules file won't be loaded more than once in most cases anyway, so just load it again when it happens. Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita ca9829ea 2012-02-24T09:59:25 Don't cache parsed files This needlessly occupies memory for the lifetime of the library, and does not make a noticeable difference otherwise. Instead, just parse the same file again when it happens. Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita a64e9708 2012-03-02T15:56:03 Remove unneeded freeing mechanisms Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita d2c3dd0c 2012-03-02T22:31:29 Constify some more text functions Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita eb738b13 2012-03-02T17:40:19 Constify global tables Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita c7bf3687 2012-03-02T22:36:32 Make the sections array local to the keymap compiling function Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita a0b44235 2012-03-02T16:12:18 Use limits.h to find min/max short value Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 266dfae5 2012-02-29T21:26:28 Remove useless casts Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita baf6a677 2012-03-02T22:34:14 Remove unused global type tokens Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 1616b864 2012-03-03T01:15:56 Use strchr instead of index Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita f549ce07 2012-03-02T17:25:58 Use global tables for action string handling Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita f4242512 2012-02-29T20:12:17 Use strdup instead of strlen + malloc + strcpy Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 6a34e4e1 2012-02-29T19:56:39 Don't check for NULL before free() Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 4bc839ab 2012-02-29T20:50:17 Use memset instead of bzero Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita a3e40917 2012-03-01T23:43:51 Remove return's at the end of void functions Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita f278cea1 2012-02-29T20:25:11 Remove all uses of the register keyword Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita c41061a0 2012-02-23T19:26:33 Use yacc-generated header instead of tokens.h The yacc implementation can generate all the necessary token definitions itself; there is no need to maintain a hand written file for that. Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 0d8874d0 2012-02-26T00:03:24 makekeys: update to match the rest of libX11 makekeys This integrates two commits from libX11: ebd6ef0a4db0ddef0ae17ad14571518ccdeea5ba XStringToKeysym: Special case for XF86 keysyms Some XFree86 keysyms were in XKeysymDB as XF86_foo, despite really being XF86foo. So, if we get to the bottom of XStringToKeysym and haven't found our XF86_foo, try it again as XF86foo. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 00175397480b76d32bf82b0c7c94c91a2a95954e makekeys: Scan vendor keysyms as well as core Since we can't really live without vendor keysyms, scan them all in to generate ks_tables.h, rather than only doing the core ones, and leaving the vendor syms to be manually synchronised with XKeysymDB. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Notice that the xkey.sh test is changed to match libX11 behavior, i.e. XKeysymToString(0x1008FE20) -> "XF86Ungrab" as opposed to "XF86_Ungrab". Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita ad4f195e 2012-02-25T23:17:47 makekeys: Receive the keysym files as arguments Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 0e98541f 2012-02-25T21:13:26 When makekeys fails to find a good hash, print error instead of divide-by-zero This matches commit 78a894231ae8ec4959007b6d9b8d2a15d6333a1e from libX11: Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 04e687c9 2012-02-25T21:09:28 makekeys: Fix build/target word size mismatch when cross-compiling This matches commit 24283d40b1e4314c6647dda49d2a159833341a8b from libX11: Since makekeys is built using build environment's compiler and runs natively, we have to make sure that the size of the Signature type is the same on both the native environment and the target, otherwise we get mismatches upon running X, and some LSB test failures (xts5). Use an unsigned 32-bit integer on all platforms. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 744527e9 2012-02-24T16:10:06 Fix remaining warnings Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita eff72fab 2012-02-25T11:53:01 Fix warnings in scanner and parser Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 1d969c5c 2012-02-24T16:08:55 Fix an incorrect sizeof Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita f3e4335f 2012-02-24T16:07:17 Fix all constness warnings These are all trivial/obvious fixes which clear a bunch of warnings. Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita cca1c050 2012-02-24T16:03:44 Fix possible null dereferences Fix all reported null dereferences from clang-analyzer. There seems to be one false negative (in file indicators.c), but it is fixed anyway. Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita a0dd0526 2012-02-25T11:46:12 Remove unused includes of "tokens.h" Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 9005624f 2012-02-24T16:00:10 Remove unneeded assignments and variables Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita a48ddb5d 2012-02-24T15:55:45 makekeys: clear const and shadow warnings The name 'index' is used by the standard library, so use 'ndx' like some other files. Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita fdf7e8f6 2012-02-24T15:53:08 makekeys: make buf local to main() All the functions already accept it as a parameter. This clears -Wshadow warnings. Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 6a3b38b1 2012-02-24T15:51:31 Remove ancient compatibility check Other headers include malloc just fine. Signed-off-by: Ran Benita <ran234@gmail.com>
Ran Benita 9ad0be33 2012-02-24T10:04:16 Remove unused debug #defines Signed-off-by: Ran Benita <ran234@gmail.com>
Daniel Stone 1ab058bb 2012-02-20T17:47:46 Fix typo in ExprResolveKeyCode Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone e209fe31 2012-02-20T17:33:39 Perform bounds checking in ExprResolveGroup Every caller did the exact same check on the group bounds after calling ExprResolveGroup, so might as well do it inside. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 43ed3ff0 2012-02-20T17:14:04 Switch expression resolution priv from char to void Avoids a lot of really lame casts. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone eb6d9a05 2012-02-20T17:09:06 Remove chaining support from LookupModMask Turns out we never use it, so. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 11ea0791 2012-02-20T17:07:48 Invert LookupModMask/LookupVModMask order We never want to solely lookup a virtual modifier without also looking up core modifiers. So, rather than chaining the vmod lookup inside the core modifier lookup, invert the ordering. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 1a2f2556 2012-02-20T17:00:51 Remove unused LookupPriv::priv Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 55e058f8 2012-02-20T16:59:51 Move some definitions from expr.h to expr.c Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 90d86c36 2012-02-20T16:54:54 Remove field reference lookup support None of the lookup functions anyone ever used supported field references, so don't pretend we do in the API. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 590df28c 2012-02-20T16:35:39 Move groupNames mask definition to its user groupNames was declared in compat.c as a global to anything which included compat.h (for which groupNames was its sole reason to exist), but only ever used in indicators.c. Which is kind of fortunate, given that e314931e removed identical definitions of groupNames (as integers, not masks) from both action.c and symbols.c. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 91b89852 2012-02-20T16:24:02 Turn ExprResolveInteger into a simple wrapper Move the bulk of ExprResolveInteger into an internal function called ExprResolveIntegerLookup, and introduce ExprResolveInteger as a simple wrapper which doesn't take priv/lookup arguments. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone d32822e6 2012-02-20T16:04:37 Open-code a radio group SimpleLookup Because, joke's on you, it wasn't actually looking up radio groups. Just checking to see if it was a string that was "none", or an integer. Lord give me strength. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone e314931e 2012-02-20T15:47:57 Add ExprResolveGroup helper Just a dumb wrapper around ExprResolveInteger. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 8b47dbbf 2012-02-20T15:47:38 Add ExprResolveButton helper Just a dumb wrapper around ExprResolveInteger. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 3431a089 2012-02-20T15:37:53 Introduce ExprResolveLevel helper Which returns an integer representing the level number represented by the given expression. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 193e9b39 2012-02-20T15:33:40 Introduce ExprResolveRadioGroup helper Just a tiny special-cased version of ExprResolveInteger. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 26285a7b 2012-02-20T14:15:08 Remove priv arguments from ExprResolveString They've never been used. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone b7b49eb0 2012-02-20T14:10:41 Remove priv arguments from ExprResolveKeySym They've never been used by its one caller. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 70033b13 2012-02-20T14:08:55 Remove priv arguments from ExprResolveKeyName They've never been used. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 482d4faa 2012-02-20T13:44:27 Remove priv arguments from ExprResolveBoolean They've never been used. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 94041575 2012-02-20T13:40:34 Remove priv arguments from ExprResolveFloat They've never been used. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 3151ce36 2012-02-20T13:34:36 Remove priv arguments from ExprResolveModMask What with them now being unused and all. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 67605d2c 2012-02-20T13:32:09 Introduce ExprResolveVModMask Which is just a slightly more typesafe wrapper around the chained ExprResolveModMask everyone was using earlier. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone fbb82199 2012-02-16T11:18:49 Respect explicit minimum/maximum keycodes Make sure we carry over an explicit minimum/maximum keycode setting, rather than just using the computed minimum/maximum; this got broken while changing the keycode range to be unsigned. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reported-by: Pekka Paalanen <ppaalanen@gmail.com>
Daniel Stone c45cdb0c 2012-02-16T00:22:11 Still more memory leak fixes Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 83f18b1c 2012-02-15T19:39:33 Fix xkbparse.y compilation Thanks to autotools happily building stale generated sources, I hadn't actually ever built my xkbparse.y changes. Fix that so it not only compiles, but works. This seems to parse long keycodes correctly, although I very much would not recommend testing this by declaring 0x1fffffff as your highest keycode. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone eb8c96cb 2012-02-15T16:42:45 Don't leak SymbolsInfo Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 3077e97e 2012-02-15T16:37:31 tests: Free returned XKB map Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 67c874d7 2012-02-15T16:24:07 Enable stderr debugging by default (If debugFlags is set to non-zero.) Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone f57dcfeb 2012-02-15T16:23:47 Raise keycode range to 32 bits \o/ Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 4e228511 2012-02-15T14:34:08 Introduce xkb_keycode_t for keycodes And use it consistently everywhere, including with a special long-safe internal keycode type, to ease the transition to large keycodes. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 8f01b144 2012-02-15T12:54:11 xkbscan: Copy, rather than assign, file name For some reason, lex decided to reduce a strcpy into an assignment, leading to entirely justified valgrind warnings about invalid reads, when scanFile was set to a string which may have only ever lived on the stack of a now-exited function. Make it a strdup() instead. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone ead9d0cb 2012-02-15T11:49:10 Move include path from X11/extensions/ to xkbcommon/ Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 1a6c3807 2012-02-15T15:58:14 vmod: Pass xkb_desc explicitly to vmod functions Some error paths don't set info->xkb correctly, so just do like most utility functions and pass the xkb_desc explicitly. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Rob Bradford 615291f1 2012-01-05T14:20:35 xkbcomp: Silence warning of return of uninitialised value Some routes through HandleGeometryVar do not set a return value. Set a default value for the return variable to avoid returning an uninitialised value.
Pekka Paalanen c19661b9 2011-12-16T12:52:00 Add xkbc_free_keymap helper Which just calls XkbcFreeKeyboard with the only arguments you'd ever pass it. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com> Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Rob Bradford 99e29de2 2011-10-27T14:30:21 xkbcomp: Copy the string into the buffer rather than updating pointer Avoids assigning the global pointer to a value that may only have a stack lifetime: Fixes valgrind warnings such as: ==24795== Invalid read of size 1 ==24795== at 0x4A06E9A: strcpy (mc_replace_strmem.c:311) ==24795== by 0x4E54D68: ProcessIncludeFile (misc.c:73) ==24795== by 0x4E59726: HandleIncludeSymbols.constprop.3 (symbols.c:829) ==24795== by 0x4E59D8E: HandleSymbolsFile (symbols.c:1673) ==24795== by 0x4E5A068: CompileSymbols (symbols.c:2211) ==24795== by 0x4E51A61: CompileKeymap (keymap.c:155) ==24795== by 0x4E5B410: xkb_compile_keymap_from_components (xkbcomp.c:236) ==24795== by 0x4E5B587: xkb_compile_keymap_from_rules (xkbcomp.c:161) ==24795== by 0x405ED2: display_create (window.c:2007) ==24795== by 0x403732: main (desktop-shell.c:320) ==24795== Address 0x7fefff0a0 is just below the stack ptr. To suppress, use: --workaround-gcc296-bugs=yes ==24795== ==24795== Source and destination overlap in strcpy(0x7fefff430, 0x7fefff430) ==24795== at 0x4A06F3D: strcpy (mc_replace_strmem.c:311) ==24795== by 0x4E54D68: ProcessIncludeFile (misc.c:73) ==24795== by 0x4E59726: HandleIncludeSymbols.constprop.3 (symbols.c:829) ==24795== by 0x4E59D8E: HandleSymbolsFile (symbols.c:1673) ==24795== by 0x4E5A068: CompileSymbols (symbols.c:2211) ==24795== by 0x4E51A61: CompileKeymap (keymap.c:155) ==24795== by 0x4E5B410: xkb_compile_keymap_from_components (xkbcomp.c:236) ==24795== by 0x4E5B587: xkb_compile_keymap_from_rules (xkbcomp.c:161) ==24795== by 0x405ED2: display_create (window.c:2007) ==24795== by 0x403732: main (desktop-shell.c:320)
Cyril Brulebois f91afe4f 2011-06-03T17:19:09 Add prototype for CheckDefaultMap(). Those warnings disappear accordingly: | CC parseutils.lo | parseutils.c:742: warning: no previous prototype for ‘CheckDefaultMap’ | CC xkbscan.lo | xkbscan.l: In function ‘XKBParseString’: | xkbscan.l:220: warning: implicit declaration of function ‘CheckDefaultMap’ | xkbscan.l:220: warning: nested extern declaration of ‘CheckDefaultMap’ Reviewed-by: Dirk Wallenstein <halsmit@t-online.de> Signed-off-by: Cyril Brulebois <kibi@debian.org>
Kristian Høgsberg 05f5be9f 2011-04-04T09:21:55 Also update required kbproto version in .pc.in file
Kristian Høgsberg 9dd7dc6d 2011-03-18T00:33:48 configure: Lower kbproto requirement to 1.0.4 There's nothing in 1.0.5 that we need.
Kristian Høgsberg dd0e8b70 2011-01-29T14:06:39 Revert "config: remove incorrectly implemented visibility compiler option" This reverts commit bf9fdceef63507da889a22eb1a583d2b6376f5ea. We really only want to expose symbols that we explicitly mark as part of the API. This may not work with other platforms or compilers, but the fact that private symbols are not available on Linux+GCC is enough of an incentive to not use those. Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Cyril Brulebois 621c2a7a 2011-01-29T14:24:46 Get rid of unneeded <X11/Xlib.h> include. There's no need for this xlib include: | YACC xkbparse.c | CC xkbparse.lo | xkbparse.y:98:22: error: X11/Xlib.h: No such file or directory Signed-off-by: Cyril Brulebois <kibi@debian.org> Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Kristian Høgsberg a63e82be 2010-12-17T21:14:54 Rename XkbcInternAtom() to xkb_intern_atom() and export Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Gaetan Nadon b9b00119 2010-12-11T19:25:09 config: update COPYING for software licensing The Copyright statements must appear in full. When only the year was different, I added it in an existing Copyright statement. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon 1b6e022c 2010-12-11T18:56:21 config: set the default xkb config root based on xkeyboard-config module The default value ${dataroot}/X11/xkb only works if xkeyboard-config has created the keymaps in that directory. Let's obtain the true final value of where the keymaps are and use that as a default. In a production environment this is the only value that can work. This new default value also has the merit of making the 'check' target to work in distcheck which does not have a copy of the xkeyboard-config keymaps in its sandbox based on ${dataroot}/X11/xkb. The test data cannot find the "include" keymaps it needs. .../libxkbcommon-0.1.0/_inst/share/X11/xkb Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon 5e43e7b4 2010-12-09T19:51:41 config: distribute the .sh test programs and test data The test programs and the test data are required in the tarball and needed for distcheck. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon f424bd8f 2010-12-09T19:45:26 config: make it easier to add TEST programs LDADD is a Makefile wide variable. Automake matches prog name with .c file by default Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon ff8e8f69 2010-12-09T18:25:18 config: include: use nobase_include_HEADERS Slightly simpler. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon 2422c41b 2010-12-09T16:28:52 config: add keysymdef and xf86keysym as dependencies of ks_tables.h This would cover the scenario where these headers file are updated, for example, a new version is installed. Running 'make' again on libxkbcommon should rebuild ks_tables.h. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon 69e52ad9 2010-12-09T16:22:17 config: makekeys prog should stand alone in the makekeys directory This program is a utility to generated a header file. The header file it generates should not be located in the directory where this utility program is compiled. Move the /makekeys dir as a sibling of /src. This reduces the number of bi-directional relationships between directories. Make corresponding makefiles simplifications. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon 89377d5c 2010-12-08T21:20:46 config: use existing variables KEYSYMDEF_H and XF86KEYSYM_H These automake variables are not currently used. The variable KS_HEADERS is not required anymore. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon bf9fdcee 2010-12-08T20:37:26 config: remove incorrectly implemented visibility compiler option CFLAGS is a user variable which should never be set by the configuration. It allows the user to alter the configuration compiler options. The visibility is only set for GNU compiler, leaving libraries built with other compilers with the wrong visibility. All other xorg libraries set visibilty using _X_EXPORT or _X_HIDDEN. For the time being, all the symbols will have the default visibility which does not break anything. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon ec3fbfdf 2010-12-07T18:22:38 config: use xproto pkgconfig includex11dir variable Rather than appending X11 to the include dir. It should be safe to use as it has been added in 2005. Use a local variable name matching the pkgconfig name. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon 3c570b7c 2010-12-07T18:17:29 config: relocate library functions check and comment No functional changes. Follow Automake suggested order. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon 41664ba2 2010-12-07T14:32:57 config: remove PKG_PROG_PKG_CONFIG test If pkg-config is missing, the configuration fails while initializing XORG_* macros: warning: PKG_PROG_PKG_CONFIG is m4_require'd but not m4_defun'd line 11622: PKG_PROG_PKG_CONFIG: command not found The output is sufficient to locate the problem. It is not possible, or very difficult, to not have pkg-config installed as the whole desktop and countless other software depends on it. Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon f5076604 2010-12-07T11:09:13 config: let Automake handle Lex and Yacc dist and cleaning BUILT_SOURCES and MAINTAINERCLEAN are not needed for lex and yacc Note that xkbscan was missing on those lines. Automake generates all the rules to handle building, distribution and cleaning. Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon e2f9f516 2010-12-07T10:59:13 config: allow to build tarball when yacc is missing Autoconf does not handle this scenario as well as Automake does. If xkbparse.c is already there, do not abort the configuration if yacc is missing as it is not needed. If both xkbparse.c and yacc are missing, abort configuration. Yacc is a required tool to build the package. Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon 2c51e4b1 2010-12-07T10:42:21 config: add the default README file. Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon 7ce1a6dc 2010-12-07T10:39:16 config: add the INSTALL target for installation instructions Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon 63e2719a 2010-12-07T10:33:23 config: replace deprecated INCLUDES with AM_CPPFLAGS Fixes automake warning. Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon ceba14dc 2010-12-07T10:23:18 config: update subdirs .gitignore Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon f75ff7d9 2010-12-03T15:13:01 config: remove m4/.gitignore now that toplevel one handles it all The -Im4 in Makefile.am will have to wait until the day there is an m4 macro checked-in git in the m4 directory. This does not prevent libtool to install its macros in m4. Acked-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon 0bfae414 2010-12-03T14:50:14 config: .gitignore: template with default values for components #24239 This toplevel .gitignore covers all possible generated files from autotools, compiler, linker, etc... It has been in use for over a year in all xorg modules and has prevented a good number of patches. For example, in this module, src/stamp-h1 was not ignored even if the .gitignore had just been updated. Files with a .patch extension were not ignored which sometimes cause a patch to be checked-in git accidentally. Acked-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon 83f64da9 2010-12-03T14:39:13 config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls AC_PROG_C_C99. This sets gcc with -std=gnu99. If AC_PROG_CC macro is called afterwards, it resets CC to gcc. Acked-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon a0512b28 2010-12-02T20:52:34 config: initialize autoconf, automake and libtool Add missing AM_MAINTAINER_MODE, matching --enable-maintainer-mode option in autogen.sh. Acked-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon 971d9a99 2010-12-02T20:42:34 config: use XORG_DEFAULT_OPTION from util-macros version 1.8 This will handle AM_SILENT_RULES such that it will not break on earlier Autoconf versions. It provides a host of other configuration items Acked-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon 8562d978 2010-12-02T20:35:35 config: set Autoconf minimum version required to 2.60 This is the current minimum version required for all X.Org modules. The module can be configured with any higher version. Autoconf features from version > 2.60 cannot be used. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Jan Engelhardt f0456a83 2010-11-11T23:28:29 Update .gitignore Limit exclusion of files to their respective directory that they can appear in. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>