From 853248d35929b622c4cfa7bb660d78770a372fbc Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 10 Jul 2007 04:41:50 +0000 Subject: [PATCH] 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. --- configure.in | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index 20c18e650..0ce9d86d3 100644 --- a/configure.in +++ b/configure.in @@ -578,10 +578,10 @@ AC_HELP_STRING([--enable-nas], [support the NAS audio API [[default=yes]]]), 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 @@ AC_HELP_STRING([--enable-pthread-sem], [use pthread semaphores [[default=yes]]]) ;; *-*-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 @@ CheckUSBHID() #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)