From 18928c2f61084ae504e550bdcca00cd209df6fd9 Mon Sep 17 00:00:00 2001
From: Brian Cameron <brian.cameron@sun.com>
Date: Sat, 5 Nov 2005 00:30:49 +0000
Subject: Fix check for XInput and add a check for libgen.h. Fixes bugs #320580
 and

2005-11-04  Brian Cameron  <brian.cameron@sun.com>

        * configure.ac: Fix check for XInput and add a check
          for libgen.h.  Fixes bugs #320580 and #320581.
---
 ChangeLog    | 5 +++++
 configure.in | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0987c30f..ac02c72f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-04  Brian Cameron  <brian.cameron@sun.com>
+
+	* configure.ac: Fix check for XInput and add a check
+	  for libgen.h.  Fixes bugs #320580 and #320581.
+
 2005-11-03  Brian Cameron  <brian.cameron@sun.com>
 
 	* gui/modules/Makefile.am, gui/modules/keymouselistener.c,
diff --git a/configure.in b/configure.in
index 8d6cb9f9..f2fd521a 100644
--- a/configure.in
+++ b/configure.in
@@ -455,6 +455,11 @@ AC_CHECK_HEADER(login_cap.h, [
 AC_CHECK_HEADERS(sys/sockio.h, [
 		 AC_DEFINE(HAVE_SYS_SOCKIO_H)])
 
+# 
+# Check for libgen.h
+#
+AC_CHECK_HEADERS(libgen.h, [
+                 AC_DEFINE(HAVE_LIBGEN_H)])
 
 #
 # Xdmcp checking
@@ -606,7 +611,7 @@ if test "x$XINPUT_LIBS" = x; then
        ;;
     esac
     AC_MSG_CHECKING(for -lXi in $xinputpath)
-    AC_TRY_LINK([], [XOpenDisplay()], [
+    AC_TRY_LINK([], [XOpenDevice()], [
 	AC_MSG_RESULT(yes)
 	XINPUT_LIBS="$XINPUT_RPATH_FLAGS -L$xinputpath -lXi"
         LIBS="$save_LIBS"
-- 
cgit v1.2.1