unbreak sysmouse support. [w3m-dev 04262]

3 files changed, 49 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 5947773..2c1797f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-05-29  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
 
+	* [w3m-dev 04262] FreeBSD sysmouse (Re: road to 0.5.2)
+	* configure.ac: unbreak sysmouse support, pointed out by 
+	  Travis Poppe <tlp@lickwid.net>.
+	* configure: regenerated.
+
+2007-05-29  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
 	* [w3m-dev 04260] Warning (Re: road to 0.5.2)
 	* main.c, display.c: delete unused macros, change void to static void.
 
@@ -8878,4 +8885,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.992 2007/05/29 12:07:02 inu Exp $
+$Id: ChangeLog,v 1.993 2007/05/29 12:17:14 inu Exp $
diff --git a/configure b/configure
index 478d1bd..36da158 100755
--- a/configure
+++ b/configure
@@ -7020,7 +7020,7 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <machine/console.h>
+#include <sys/consio.h>
    MOUSE_GETINFO
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
@@ -7047,7 +7047,43 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <machine/console.h>
+      MOUSE_GETINFO
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  cat >>confdefs.h <<\_ACEOF
+#define USE_SYSMOUSE 1
+_ACEOF
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
 
+rm -f conftest.err conftest.$ac_ext
 fi
 
 rm -f conftest.err conftest.$ac_ext
diff --git a/configure.ac b/configure.ac
index 29370a4..a2ee3dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,8 +97,10 @@ if test x"$enable_mouse" = xyes; then
  AC_CHECK_LIB(gpm, Gpm_Open, [AC_DEFINE(USE_GPM)
    		W3M_LIBS="$W3M_LIBS -lgpm"])
  AC_SUBST(USE_SYSMOUSE)
- AC_TRY_CPP([#include <machine/console.h>
-   MOUSE_GETINFO], [AC_DEFINE(USE_SYSMOUSE)])
+ AC_TRY_CPP([#include <sys/consio.h>
+   MOUSE_GETINFO], [AC_DEFINE(USE_SYSMOUSE)],
+   [AC_TRY_CPP([#include <machine/console.h>
+      MOUSE_GETINFO], [AC_DEFINE(USE_SYSMOUSE)])])
 fi
 AC_SUBST(AUXBIN_TARGETS)
 AC_W3M_TERMLIB