configure.in
branchSDL-1.2
changeset 4028 81837116ef59
parent 3991 7a649501c089
child 4034 4ea82f5e7e2c
     1.1 --- a/configure.in	Tue Jul 10 04:31:31 2007 +0000
     1.2 +++ b/configure.in	Tue Jul 10 04:41:50 2007 +0000
     1.3 @@ -578,10 +578,10 @@
     1.4      if test x$enable_audio = xyes -a x$enable_nas = xyes; then
     1.5          AC_MSG_CHECKING(for NAS audio support)
     1.6          have_nas=no
     1.7 -        if test -r /usr/X11R6/include/audio/audiolib.h; then
     1.8 +        if true; then
     1.9              have_nas=yes
    1.10 -            NAS_CFLAGS="-I/usr/X11R6/include/"
    1.11 -            NAS_LIBS="-L/usr/X11R6/lib -laudio -lXt"
    1.12 +            NAS_CFLAGS=""
    1.13 +            NAS_LIBS="-laudio -lXt"
    1.14  
    1.15          dnl On IRIX, the NAS includes are in a different directory,
    1.16          dnl and libnas must be explicitly linked in
    1.17 @@ -1761,7 +1761,7 @@
    1.18              ;;
    1.19          *-*-netbsd*)
    1.20              pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
    1.21 -            pthread_lib="-L/usr/lib -lpthread"
    1.22 +            pthread_lib="-lpthread"
    1.23              ;;
    1.24          *-*-openbsd*)
    1.25              pthread_cflags="-D_REENTRANT"
    1.26 @@ -2104,8 +2104,13 @@
    1.27                #if defined(HAVE_USB_H)
    1.28                #include <usb.h>
    1.29                #endif
    1.30 +	      #ifdef __DragonFly__
    1.31 +              #include <bus/usb/usb.h>
    1.32 +              #include <bus/usb/usbhid.h>
    1.33 +	      #else
    1.34                #include <dev/usb/usb.h>
    1.35                #include <dev/usb/usbhid.h>
    1.36 +	      #endif
    1.37                #if defined(HAVE_USBHID_H)
    1.38                #include <usbhid.h>
    1.39                #elif defined(HAVE_LIBUSB_H)