# HG changeset patch # User Sam Lantinga # Date 1184042510 0 # Node ID 81837116ef590bc64526b0747f7d5e4534b34076 # Parent 407ecf3ad3b345d833b3f63ce0033002fe655944 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. diff -r 407ecf3ad3b3 -r 81837116ef59 configure.in --- 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 #endif + #ifdef __DragonFly__ + #include + #include + #else #include #include + #endif #if defined(HAVE_USBHID_H) #include #elif defined(HAVE_LIBUSB_H)