[Gnash-commit] [SCM] Gnash branch, master, updated. 1ada75853b271dfa90b91a9bbf4e3df383d36695

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  1ada75853b271dfa90b91a9bbf4e3df383d36695 (commit)
      from  44dbf3d6bb9e5ed3c60260f3da67da2df9f4e587 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=1ada75853b271dfa90b91a9bbf4e3df383d36695


commit 1ada75853b271dfa90b91a9bbf4e3df383d36695
Author: Sandro Santilli <address@hidden>
Date:   Fri Dec 10 14:13:05 2010 +0100

    Check for input devices after deciding if FB should be built or not. Should 
fix bug #31846

diff --git a/configure.ac b/configure.ac
index 5800212..7f8de8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -808,86 +808,6 @@ AC_SUBST(MEDIA_CONFIG)
 
 
 dnl -------------------------------
-dnl Input Device selection
-dnl -------------------------------
-
-dnl Multiple input devices are supported. These can all work in
-dnl varying combinations, so several may be listed. These are only
-dnl required when using the Framebuffer, as without the X11 desktop,
-dnl Gnash has to handle all these internally. This can get
-dnl messy, as one might want to use a touchscreen with a normal mouse
-dnl or keyboard attached. 
-dnl By default, don't build any of these, as they are only for the Framebuffer
-dnl running without X11.
-if test x"${build_fb}" = xyes; then
-build_ps2mouse=yes
-build_ps2keyboard=no
-build_input_events=yes
-build_tslib=yes
-input_events="PS/2 Mouse, Input Devices, Touchscreen via Tslib"
-else
-build_ps2mouse=no
-build_ps2keyboard=no
-build_input_events=no
-build_tslib=no
-input_events=
-fi
-AC_ARG_ENABLE(input,
-  AC_HELP_STRING([--enable-input=], [Enable support for the specified input 
devices for the framebuffer GUI 
(default=ps2mouse|ps2keyboard|events|touchscreen)]),
-  [if test -n ${enableval}; then
-    enableval=`echo ${enableval} | tr '\054' ' ' `
-  fi
-  while test -n "${enableval}" ; do
-    val=`echo ${enableval} | cut -d ' ' -f 1`
-    case "${val}" in
-      ps2m*|PS2m*|m*|M*)        dnl a PS/2 style mouse
-        build_ps2mouse=yes
-        input_events="${input_events}, PS/2 Mouse"
-        ;;
-      ps2k*|PS2K*|k*|K*)        dnl a PS/2 style keyboard
-        build_ps2keyboard=yes
-        input_events="${input_events}, PS/2 Keyboard"
-        ;;
-      i*|I*|ev*|Ev*)    dnl use the new Input Event, which supports both
-        input_events="${input_events}, Input Event Device"
-        build_input_events=yes
-        ;;
-      t*|T*) dnl use a touchscreen with tslib, which works like a mouse
-        build_tslib=yes
-        input_events="${input_events}, Touchscreen"
-        ;;
-      *) AC_MSG_ERROR([invalid input device list! ${enableval} given (accept: 
ps2mouse|keyboard|events,touchscreen)])
-         ;;
-      esac
-    enableval=`echo ${enableval} | cut -d ' ' -f 2-6`
-    if test "x$val" = "x$enableval"; then
-      break;
-    fi
-  done],
-)
-
-if test x"${build_tslib}" = xyes; then
-  AC_DEFINE(USE_TSLIB, [1], [Use a tslib supported touchscreen])
-  GNASH_PKG_FIND(ts, [tslib.h], [Touchscreen library], ts_config)
-fi
-AM_CONDITIONAL(ENABLE_TSLIB, [test x${ac_cv_header_tslib_h} != xno])
-
-if test x"${build_ps2mouse}" = xyes; then
-  AC_DEFINE(USE_MOUSE_PS2, [1], [Add support for a directly using a PS/2 
Mouse])
-fi
-AM_CONDITIONAL(ENABLE_MOUSE, [test x"${build_ps2mouse}" = xyes])
-
-if test x"${build_ps2keyboard}" = xyes; then
-  AC_DEFINE(USE_KEYBOARD_PS2, [1], [Add support for directly using a PS/2 
Keyboard])
-fi
-if test x"${build_input_events}" = xyes; then
-  AC_DEFINE(USE_INPUT_EVENTS, [1], [Add support for a directly using Linux 
Input Event Devices])
-fi
-AM_CONDITIONAL(ENABLE_INPUT_EVENTS, [test x"${build_input_events}" = xyes])
-dnl this is enabled if we have any input devices at all
-AM_CONDITIONAL(ENABLE_INPUT_DEVICES, [test x"${input_events}" != x])
-
-dnl -------------------------------
 dnl Renderer Selection
 dnl -------------------------------
 input_events=
@@ -1842,6 +1762,87 @@ fi
 
 dnl TODO: add checks for all other GUIs
 
+dnl -------------------------------
+dnl Input Device selection
+dnl -------------------------------
+
+dnl Multiple input devices are supported. These can all work in
+dnl varying combinations, so several may be listed. These are only
+dnl required when using the Framebuffer, as without the X11 desktop,
+dnl Gnash has to handle all these internally. This can get
+dnl messy, as one might want to use a touchscreen with a normal mouse
+dnl or keyboard attached. 
+dnl By default, don't build any of these, as they are only for the Framebuffer
+dnl running without X11.
+if test x"${build_fb}" = xyes; then
+build_ps2mouse=yes
+build_ps2keyboard=no
+build_input_events=yes
+build_tslib=yes
+input_events="PS/2 Mouse, Input Devices, Touchscreen via Tslib"
+else
+build_ps2mouse=no
+build_ps2keyboard=no
+build_input_events=no
+build_tslib=no
+input_events=
+fi
+AC_ARG_ENABLE(input,
+  AC_HELP_STRING([--enable-input=], [Enable support for the specified input 
devices for the framebuffer GUI 
(default=ps2mouse|ps2keyboard|events|touchscreen)]),
+  [if test -n ${enableval}; then
+    enableval=`echo ${enableval} | tr '\054' ' ' `
+  fi
+  while test -n "${enableval}" ; do
+    val=`echo ${enableval} | cut -d ' ' -f 1`
+    case "${val}" in
+      ps2m*|PS2m*|m*|M*)        dnl a PS/2 style mouse
+        build_ps2mouse=yes
+        input_events="${input_events}, PS/2 Mouse"
+        ;;
+      ps2k*|PS2K*|k*|K*)        dnl a PS/2 style keyboard
+        build_ps2keyboard=yes
+        input_events="${input_events}, PS/2 Keyboard"
+        ;;
+      i*|I*|ev*|Ev*)    dnl use the new Input Event, which supports both
+        input_events="${input_events}, Input Event Device"
+        build_input_events=yes
+        ;;
+      t*|T*) dnl use a touchscreen with tslib, which works like a mouse
+        build_tslib=yes
+        input_events="${input_events}, Touchscreen"
+        ;;
+      *) AC_MSG_ERROR([invalid input device list! ${enableval} given (accept: 
ps2mouse|keyboard|events,touchscreen)])
+         ;;
+      esac
+    enableval=`echo ${enableval} | cut -d ' ' -f 2-6`
+    if test "x$val" = "x$enableval"; then
+      break;
+    fi
+  done],
+)
+
+if test x"${build_tslib}" = xyes; then
+  AC_DEFINE(USE_TSLIB, [1], [Use a tslib supported touchscreen])
+  GNASH_PKG_FIND(ts, [tslib.h], [Touchscreen library], ts_config)
+fi
+AM_CONDITIONAL(ENABLE_TSLIB, [test x${ac_cv_header_tslib_h} != xno])
+
+if test x"${build_ps2mouse}" = xyes; then
+  AC_DEFINE(USE_MOUSE_PS2, [1], [Add support for a directly using a PS/2 
Mouse])
+fi
+AM_CONDITIONAL(ENABLE_MOUSE, [test x"${build_ps2mouse}" = xyes])
+
+if test x"${build_ps2keyboard}" = xyes; then
+  AC_DEFINE(USE_KEYBOARD_PS2, [1], [Add support for directly using a PS/2 
Keyboard])
+fi
+if test x"${build_input_events}" = xyes; then
+  AC_DEFINE(USE_INPUT_EVENTS, [1], [Add support for a directly using Linux 
Input Event Devices])
+fi
+AM_CONDITIONAL(ENABLE_INPUT_EVENTS, [test x"${build_input_events}" = xyes])
+dnl this is enabled if we have any input devices at all
+AM_CONDITIONAL(ENABLE_INPUT_DEVICES, [test x"${input_events}" != x])
+
+
 dnl -----------------------------------------------------------
 dnl Try to ignore stupid dependencies
 dnl -----------------------------------------------------------

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |  161 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 81 insertions(+), 80 deletions(-)


hooks/post-receive
-- 
Gnash