Fixed up the xinput test in configure.in

-Yosh

diff --git a/ChangeLog b/ChangeLog
index 86fb275e82c3bc399eca06bb0deaf78a94ab245d..7406c9631a263bae295360f0ba6f0c960484d6ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
-Thu Jan  1 19:43:45 PST 1998 Manish Singh <yosh@gimp.org>
+Thu Jan  1 21:21:56 PST 1998 Manish Singh <yosh@gimp.org>
 
+       * configure.in: fixed up the xinput test
        * Miscellaneous portability fixes.
 
 Mon Dec 29 22:05:45 1997  Miguel de Icaza  <miguel@nuclecu.unam.mx>

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 86fb275e82c3bc399eca06bb0deaf78a94ab245d..7406c9631a263bae295360f0ba6f0c960484d6ef 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,5 +1,6 @@
-Thu Jan  1 19:43:45 PST 1998 Manish Singh <yosh@gimp.org>
+Thu Jan  1 21:21:56 PST 1998 Manish Singh <yosh@gimp.org>
 
+       * configure.in: fixed up the xinput test
        * Miscellaneous portability fixes.
 
 Mon Dec 29 22:05:45 1997  Miguel de Icaza  <miguel@nuclecu.unam.mx>

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 86fb275e82c3bc399eca06bb0deaf78a94ab245d..7406c9631a263bae295360f0ba6f0c960484d6ef 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,6 @@
-Thu Jan  1 19:43:45 PST 1998 Manish Singh <yosh@gimp.org>
+Thu Jan  1 21:21:56 PST 1998 Manish Singh <yosh@gimp.org>
 
+       * configure.in: fixed up the xinput test
        * Miscellaneous portability fixes.
 
 Mon Dec 29 22:05:45 1997  Miguel de Icaza  <miguel@nuclecu.unam.mx>

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 86fb275e82c3bc399eca06bb0deaf78a94ab245d..7406c9631a263bae295360f0ba6f0c960484d6ef 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,5 +1,6 @@
-Thu Jan  1 19:43:45 PST 1998 Manish Singh <yosh@gimp.org>
+Thu Jan  1 21:21:56 PST 1998 Manish Singh <yosh@gimp.org>
 
+       * configure.in: fixed up the xinput test
        * Miscellaneous portability fixes.
 
 Mon Dec 29 22:05:45 1997  Miguel de Icaza  <miguel@nuclecu.unam.mx>

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 86fb275e82c3bc399eca06bb0deaf78a94ab245d..7406c9631a263bae295360f0ba6f0c960484d6ef 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,6 @@
-Thu Jan  1 19:43:45 PST 1998 Manish Singh <yosh@gimp.org>
+Thu Jan  1 21:21:56 PST 1998 Manish Singh <yosh@gimp.org>
 
+       * configure.in: fixed up the xinput test
        * Miscellaneous portability fixes.
 
 Mon Dec 29 22:05:45 1997  Miguel de Icaza  <miguel@nuclecu.unam.mx>

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 86fb275e82c3bc399eca06bb0deaf78a94ab245d..7406c9631a263bae295360f0ba6f0c960484d6ef 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,6 @@
-Thu Jan  1 19:43:45 PST 1998 Manish Singh <yosh@gimp.org>
+Thu Jan  1 21:21:56 PST 1998 Manish Singh <yosh@gimp.org>
 
+       * configure.in: fixed up the xinput test
        * Miscellaneous portability fixes.
 
 Mon Dec 29 22:05:45 1997  Miguel de Icaza  <miguel@nuclecu.unam.mx>

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 86fb275e82c3bc399eca06bb0deaf78a94ab245d..7406c9631a263bae295360f0ba6f0c960484d6ef 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,6 @@
-Thu Jan  1 19:43:45 PST 1998 Manish Singh <yosh@gimp.org>
+Thu Jan  1 21:21:56 PST 1998 Manish Singh <yosh@gimp.org>
 
+       * configure.in: fixed up the xinput test
        * Miscellaneous portability fixes.
 
 Mon Dec 29 22:05:45 1997  Miguel de Icaza  <miguel@nuclecu.unam.mx>

diff --git a/configure.in b/configure.in
index 4858d9078aa164303676b02010912617cf796119..2838ffe2eabdf9e0fb2e1a6086de8717e091857a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -110,7 +110,7 @@ x_ldflags="$X_LDFLAGS $X_LIBS"
 
 # set up things for XInput
 
-if test "x$with_xinput" = "xgxi" -o "x$with_xinput" = "xyes"; then
+if test "x$with_xinput" = "xgxi" || test "x$with_xinput" = "xyes"; then
   AC_DEFINE(XINPUT_GXI)
   xinput_progs=gxid
   x_libs="-lXi $x_libs"