From c3a5564894bc516c0bda3a7a2821d9c19b563e1e Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Fri, 2 Jan 1998 05:15:34 +0000 Subject: [PATCH] Fixed up the xinput test in configure.in -Yosh --- ChangeLog | 3 ++- ChangeLog.pre-2-0 | 3 ++- ChangeLog.pre-2-10 | 3 ++- ChangeLog.pre-2-2 | 3 ++- ChangeLog.pre-2-4 | 3 ++- ChangeLog.pre-2-6 | 3 ++- ChangeLog.pre-2-8 | 3 ++- configure.in | 2 +- 8 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 86fb275e82..7406c9631a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ -Thu Jan 1 19:43:45 PST 1998 Manish Singh +Thu Jan 1 21:21:56 PST 1998 Manish Singh + * configure.in: fixed up the xinput test * Miscellaneous portability fixes. Mon Dec 29 22:05:45 1997 Miguel de Icaza diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 86fb275e82..7406c9631a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,5 +1,6 @@ -Thu Jan 1 19:43:45 PST 1998 Manish Singh +Thu Jan 1 21:21:56 PST 1998 Manish Singh + * configure.in: fixed up the xinput test * Miscellaneous portability fixes. Mon Dec 29 22:05:45 1997 Miguel de Icaza diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 86fb275e82..7406c9631a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,6 @@ -Thu Jan 1 19:43:45 PST 1998 Manish Singh +Thu Jan 1 21:21:56 PST 1998 Manish Singh + * configure.in: fixed up the xinput test * Miscellaneous portability fixes. Mon Dec 29 22:05:45 1997 Miguel de Icaza diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 86fb275e82..7406c9631a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,5 +1,6 @@ -Thu Jan 1 19:43:45 PST 1998 Manish Singh +Thu Jan 1 21:21:56 PST 1998 Manish Singh + * configure.in: fixed up the xinput test * Miscellaneous portability fixes. Mon Dec 29 22:05:45 1997 Miguel de Icaza diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 86fb275e82..7406c9631a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,6 @@ -Thu Jan 1 19:43:45 PST 1998 Manish Singh +Thu Jan 1 21:21:56 PST 1998 Manish Singh + * configure.in: fixed up the xinput test * Miscellaneous portability fixes. Mon Dec 29 22:05:45 1997 Miguel de Icaza diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 86fb275e82..7406c9631a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,6 @@ -Thu Jan 1 19:43:45 PST 1998 Manish Singh +Thu Jan 1 21:21:56 PST 1998 Manish Singh + * configure.in: fixed up the xinput test * Miscellaneous portability fixes. Mon Dec 29 22:05:45 1997 Miguel de Icaza diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 86fb275e82..7406c9631a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,6 @@ -Thu Jan 1 19:43:45 PST 1998 Manish Singh +Thu Jan 1 21:21:56 PST 1998 Manish Singh + * configure.in: fixed up the xinput test * Miscellaneous portability fixes. Mon Dec 29 22:05:45 1997 Miguel de Icaza diff --git a/configure.in b/configure.in index 4858d9078a..2838ffe2ea 100644 --- 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"