w3m

Unnamed repository; edit this file to name it for gitweb.
git clone https://logand.com/git/w3m.git/
Log | Files | Refs | README

commit e32ed9067f31a02cbccadd70b0f8c4504f5fac22
parent 79789d79985a11f91c7c5ab1a4a69b8b03af0349
Author: inu <inu>
Date:   Tue, 29 May 2007 12:17:14 +0000

unbreak sysmouse support. [w3m-dev 04262]

Diffstat:
MChangeLog | 7+++++++
Mconfigure | 38+++++++++++++++++++++++++++++++++++++-
Mconfigure.ac | 6++++--
3 files changed, 48 insertions(+), 3 deletions(-)

diff --git 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. diff --git 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 @@ -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