Mandriva patches to xinput.

  Change to src/list.c fixes a typo/oversight.
  Change to configure.ac required to avoid possible error in configure step
due to "unquoted" version test.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>

diff --git a/configure.ac b/configure.ac
index d296038348078172740ff58d8fda696e21233145..f38914f00fc962bb17814cb046fd1b0f20665c23 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AC_PROG_CC
 AC_PROG_INSTALL
 
 # Checks for pkg-config packages
 AC_PROG_INSTALL
 
 # Checks for pkg-config packages

-PKG_CHECK_MODULES(XINPUT, x11 xext xi inputproto >= 1.4)
+PKG_CHECK_MODULES(XINPUT, x11 xext xi [inputproto >= 1.4])

 AC_SUBST(XINPUT_CFLAGS)
 AC_SUBST(XINPUT_LIBS)
 
 AC_SUBST(XINPUT_CFLAGS)
 AC_SUBST(XINPUT_LIBS)
 

diff --git a/src/list.c b/src/list.c
index 1bdffed3af61d05e978ad6afffad467be1dd2da5..4004ada51cf76179a76e5b18ffe06f8fe353469e 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -125,10 +125,10 @@ list(Display      *display,
        int     ret = EXIT_SUCCESS;
 
        for(loop=0; loop<argc; loop++) {
        int     ret = EXIT_SUCCESS;
 
        for(loop=0; loop<argc; loop++) {

-           info = find_device_info(display, argv[0], False);
+           info = find_device_info(display, argv[loop], False);

 
            if (!info) {
 
            if (!info) {

-               fprintf(stderr, "unable to find device %s\n", argv[0]);
+               fprintf(stderr, "unable to find device %s\n", argv[loop]);

                ret = EXIT_FAILURE;
            } else {
                print_info(info, shortformat);
                ret = EXIT_FAILURE;
            } else {
                print_info(info, shortformat);