disable joystick for wxMGL, it's not implemented there

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index 8e5b3fde2daf3c093efa0711c793589ccfc7d0bf..36630e0b3a5dd767471dbd28194b62ec4fa8b53b 100755 (executable)
--- a/configure
+++ b/configure
@@ -45477,6 +45477,7 @@ echo "${ECHO_T}$wxUSE_JOYSTICK" >&6
         fi
 
         else
         fi
 
         else

+                if test "$wxUSE_MGL" != "1"; then

 
 for ac_header in linux/joystick.h
 do
 
 for ac_header in linux/joystick.h
 do


@@ -45626,6 +45627,7 @@ fi
 
 done
 
 
 done
 

+        fi

     fi
 
     if test "$wxUSE_JOYSTICK" = "yes"; then
     fi
 
     if test "$wxUSE_JOYSTICK" = "yes"; then

diff --git a/configure.in b/configure.in
index 0616e8e9d8cc75d0546f0dbddd8d3a8639f975df..94cc9304a5e313464bf86b2d817d863554bb4346 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6313,7 +6313,10 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
 
     dnl joystick support is only for Linux 2.1.x or greater
     else
 
     dnl joystick support is only for Linux 2.1.x or greater
     else

-        AC_CHECK_HEADERS(linux/joystick.h, wxUSE_JOYSTICK=yes)
+        dnl wxJoystick not supported by wxMGL at all
+        if test "$wxUSE_MGL" != "1"; then
+            AC_CHECK_HEADERS(linux/joystick.h, wxUSE_JOYSTICK=yes)
+        fi

     fi
 
     if test "$wxUSE_JOYSTICK" = "yes"; then
     fi
 
     if test "$wxUSE_JOYSTICK" = "yes"; then