Mercurial > sdl-ios-xcode

changeset 4028:81837116ef59 SDL-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added patch-aj from NetBSD pkgsrc: chunk 1: avoid hardcoding nas paths; pkgsrc installs it somewhere else. This part could probably be done better. chunk 2: -L/usr/lib is unnecessary chunk 3: Better DragonFly support.
author Sam Lantinga <slouken@libsdl.org>
date Tue, 10 Jul 2007 04:41:50 +0000
parents 407ecf3ad3b3
children e7ec5ee35d54
files configure.in
diffstat 1 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Tue Jul 10 04:31:31 2007 +0000
+++ b/configure.in	Tue Jul 10 04:41:50 2007 +0000
@@ -578,10 +578,10 @@
     if test x$enable_audio = xyes -a x$enable_nas = xyes; then
         AC_MSG_CHECKING(for NAS audio support)
         have_nas=no
-        if test -r /usr/X11R6/include/audio/audiolib.h; then
+        if true; then
             have_nas=yes
-            NAS_CFLAGS="-I/usr/X11R6/include/"
-            NAS_LIBS="-L/usr/X11R6/lib -laudio -lXt"
+            NAS_CFLAGS=""
+            NAS_LIBS="-laudio -lXt"
 
         dnl On IRIX, the NAS includes are in a different directory,
         dnl and libnas must be explicitly linked in
@@ -1761,7 +1761,7 @@
             ;;
         *-*-netbsd*)
             pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
-            pthread_lib="-L/usr/lib -lpthread"
+            pthread_lib="-lpthread"
             ;;
         *-*-openbsd*)
             pthread_cflags="-D_REENTRANT"
@@ -2104,8 +2104,13 @@
               #if defined(HAVE_USB_H)
               #include <usb.h>
               #endif
+	      #ifdef __DragonFly__
+              #include <bus/usb/usb.h>
+              #include <bus/usb/usbhid.h>
+	      #else
               #include <dev/usb/usb.h>
               #include <dev/usb/usbhid.h>
+	      #endif
               #if defined(HAVE_USBHID_H)
               #include <usbhid.h>
               #elif defined(HAVE_LIBUSB_H)