*** empty log message ***
authorSam Lantinga <slouken@libsdl.org>
Tue, 11 Jun 2002 19:56:41 +0000
changeset 403 8d431937739d
parent 402 7efee6e36f00
child 404 cbb346aca05d
*** empty log message ***
configure.in
src/joystick/bsd/SDL_sysjoystick.c
--- a/configure.in	Tue Jun 11 19:43:04 2002 +0000
+++ b/configure.in	Tue Jun 11 19:56:41 2002 +0000
@@ -1545,9 +1545,13 @@
             SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
         fi
 
+        AC_CHECK_HEADER(usb.h, have_usb_h=yes)
         AC_CHECK_HEADER(usbhid.h, have_usbhid_h=yes)
         AC_CHECK_HEADER(libusb.h, have_libusb_h=yes)
         AC_CHECK_HEADER(libusbhid.h, have_libusbhid_h=yes)
+        if test x$have_usb_h = xyes; then
+            CFLAGS="$CFLAGS -DHAVE_USB_H"
+        fi
         if test x$have_usbhid_h = xyes; then
             CFLAGS="$CFLAGS -DHAVE_USBHID_H"
         fi
@@ -1561,6 +1565,9 @@
         AC_MSG_CHECKING(for usbhid)
         have_usbhid=no
         AC_TRY_COMPILE([
+          #if defined(HAVE_USB_H)
+          #include <usb.h>
+          #endif
           #include <dev/usb/usb.h>
           #include <dev/usb/usbhid.h>
           #if defined(HAVE_USBHID_H)
@@ -1569,7 +1576,6 @@
           #include <libusb.h>
           #elif defined(HAVE_LIBUSBHID_H)
           #include <libusbhid.h>
-          #endif
         ],[
           struct report_desc *repdesc;
           struct usb_ctl_report *repbuf;
--- a/src/joystick/bsd/SDL_sysjoystick.c	Tue Jun 11 19:43:04 2002 +0000
+++ b/src/joystick/bsd/SDL_sysjoystick.c	Tue Jun 11 19:56:41 2002 +0000
@@ -39,6 +39,9 @@
 #include <string.h>
 #include <errno.h>
 
+#if defined(HAVE_USB_H)
+#include <usb.h>
+#endif
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>