[w3m-dev 04262] FreeBSD sysmouse (Re: road to 0.5.2)

[email protected] Tue, 29 May 2007 19:28:27 +0900 (JST)
Newsgroups gmane.comp.web.w3m.devel
Message-ID <[email protected]>
# 

http://www.freebsd.org/cgi/cvsweb.cgi/ports/www/w3m/files/patch-configure?rev=1.8
FreeBSD  sysmouse 

-----------------------------------
  <[email protected]>

diff -u configure.ac.orig configure.ac
--- configure.ac.orig	Thu May 24 13:36:12 2007
+++ configure.ac	Tue May 29 19:11:51 2007
@@ -97,8 +97,10 @@
  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
diff -u configure.orig configure
--- configure.orig	Tue May 29 18:22:15 2007
+++ configure	Tue May 29 19:12:08 2007
@@ -7020,7 +7020,7 @@
 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 @@
   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