fixed broken test for wxUSE_JOYSTICK in configure.

added joytest sample to samples_dist and samples/configure.


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

Makefile.in

@@ -870,6 +870,13 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/ipc/*.h $(DISTDIR)/samples/ipc
 	cp $(SAMPDIR)/ipc/*.xpm $(DISTDIR)/samples/ipc
 
+	mkdir $(DISTDIR)/samples/joytest
+	cp $(SAMPDIR)/joytest/Makefile.in $(DISTDIR)/samples/joytest
+	cp $(SAMPDIR)/joytest/makefile.unx $(DISTDIR)/samples/joytest
+	cp $(SAMPDIR)/joytest/*.cpp $(DISTDIR)/samples/joytest
+	cp $(SAMPDIR)/joytest/*.h $(DISTDIR)/samples/joytest
+	cp $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest
+
 	mkdir $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/makefile.unx $(DISTDIR)/samples/layout

configure

@@ -9281,7 +9281,7 @@ else
 int main() {
 
 /* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
+typedef int charset[2]; const charset x = {0,0};
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
@@ -9356,7 +9356,7 @@ for ac_kw in inline __inline__ __inline; do
 #include "confdefs.h"
 
 int main() {
-} $ac_kw foo() {
+} int $ac_kw foo() {
 ; return 0; }
 EOF
 if { (eval echo configure:9363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@@ -12975,7 +12975,7 @@ fi
 
 if test "$TOOLKIT" != "MSW"; then
 
-if test "$wxUSE_JOYSTICK" = 1; then
+if test "$wxUSE_JOYSTICK" = "yes"; then
     for ac_hdr in linux/joystick.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
@@ -13017,14 +13017,14 @@ fi
 done
 
   if test "$ac_cv_header_linux_joystick_h" != "yes"; then
-    wxUSE_JOYSTICK=0
+    wxUSE_JOYSTICK=no
     echo "configure: warning: Joystick not supported yb this system" 1>&2
   fi
 fi
 
 fi
 
-if test "$wxUSE_JOYSTICK" = 1; then
+if test "$wxUSE_JOYSTICK" = "yes"; then
     cat >> confdefs.h <<\EOF
 #define wxUSE_JOYSTICK 1
 EOF

configure.in

@@ -3057,11 +3057,11 @@ dnl ---------------------------------------------------------------------------
 dnl under MSW we always have joystick support
 if test "$TOOLKIT" != "MSW"; then
 
-if test "$wxUSE_JOYSTICK" = 1; then
+if test "$wxUSE_JOYSTICK" = "yes"; then
   dnl joystick support is only for Linux 2.1.x or greater
   AC_CHECK_HEADERS(linux/joystick.h)
   if test "$ac_cv_header_linux_joystick_h" != "yes"; then
-    wxUSE_JOYSTICK=0
+    wxUSE_JOYSTICK=no
     AC_MSG_WARN(Joystick not supported yb this system, disabled)
   fi
 fi
@@ -3069,7 +3069,7 @@ fi
 fi
 dnl if !MSW
 
-if test "$wxUSE_JOYSTICK" = 1; then
+if test "$wxUSE_JOYSTICK" = "yes"; then
     AC_DEFINE(wxUSE_JOYSTICK)
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
 fi

samples/configure

@@ -669,6 +669,7 @@ trap 'rm -fr `echo "
             image/Makefile
             internat/Makefile
             ipc/Makefile
+            joytest/Makefile
             layout/Makefile
             listctrl/Makefile
             mdi/Makefile
@@ -811,6 +812,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             image/Makefile
             internat/Makefile
             ipc/Makefile
+            joytest/Makefile
             layout/Makefile
             listctrl/Makefile
             mdi/Makefile

samples/configure.in

@@ -37,6 +37,7 @@ AC_OUTPUT([
             image/Makefile
             internat/Makefile
             ipc/Makefile
+            joytest/Makefile
             layout/Makefile
             listctrl/Makefile
             mdi/Makefile