Update to SDL-1.2.7.

Changes:
* SDL no longer sets a fatal signal handler for SIGPIPE
* Fixed modifier key state on MacOS X
* Added support for remote XVideo
* Fixed static linking on MacOS X
* Fixed compiling with broken Linux 2.6 headers
* Fixed mouse cursor visibility and focus events on MacOS X
* Added support for /dev/joy* on Free/Net/OpenBSD
* Fixed problems with CD-ROM audio playback on MacOS X 10.1
* Added dynamic GL library loading to MacOS Carbon support
* Added function to create RWops from const memory: SDL_RWFromConstMem()
* Fixed build problems with newer versions of automake
* Fixed MacOS X libtool framework support
* Added CPU feature detection functions to SDL_cpuinfo.h
* Fixed illegal instruction crash using 3DNow on Intel processors
* Fixed asm issues with mmx.h and gcc 3.3
* Fixed crash calling app defined window proc
* Fixed long long constant warnings in GCC 3.3.1
* Fixed joystick open problems on BSD
* Fixed X11 mode line crash with only one video mode

Fixes PR pkg/22462.

Okayed by wiz@.

14 files changed, 870 insertions, 526 deletions

diff --git a/devel/SDL/Makefile.common b/devel/SDL/Makefile.common
index ad9e8db9be4..c6401b7535c 100644
--- a/devel/SDL/Makefile.common
+++ b/devel/SDL/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.11 2004/02/14 13:55:19 jlam Exp $
+# $NetBSD: Makefile.common,v 1.12 2004/04/17 00:15:21 snj Exp $
 #
 
-DISTNAME=	SDL-1.2.6
+DISTNAME=	SDL-1.2.7
 CATEGORIES=	devel games
 MASTER_SITES=	http://www.libsdl.org/release/
 
diff --git a/devel/SDL/PLIST b/devel/SDL/PLIST
index 6f9af74d6ca..7aceaf25be6 100644
--- a/devel/SDL/PLIST
+++ b/devel/SDL/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/09/03 19:30:51 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/04/17 00:15:21 snj Exp $
 bin/sdl-config
 include/SDL/SDL.h
 include/SDL/SDL_active.h
@@ -6,6 +6,7 @@ include/SDL/SDL_audio.h
 include/SDL/SDL_byteorder.h
 include/SDL/SDL_cdrom.h
 include/SDL/SDL_copying.h
+include/SDL/SDL_cpuinfo.h
 include/SDL/SDL_endian.h
 include/SDL/SDL_error.h
 include/SDL/SDL_events.h
@@ -33,7 +34,7 @@ lib/libSDL.a
 lib/libSDL.la
 lib/libSDL.so
 lib/libSDL.so.0
-lib/libSDL.so.0.6
+lib/libSDL.so.0.7
 lib/libSDLmain.a
 man/man3/SDLKey.3
 man/man3/SDL_ActiveEvent.3
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index df89407c599..8f2ae2c75d3 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,21 +1,17 @@
-$NetBSD: distinfo,v 1.26 2004/01/10 13:57:12 recht Exp $
+$NetBSD: distinfo,v 1.27 2004/04/17 00:15:21 snj Exp $
 
-SHA1 (SDL-1.2.6.tar.gz) = 6f64b79427ea279e5ae18ea07d9fe353fd138422
-Size (SDL-1.2.6.tar.gz) = 2042700 bytes
+SHA1 (SDL-1.2.7.tar.gz) = 1a840c50668f230df9e9163ef1a282d9f3355383
+Size (SDL-1.2.7.tar.gz) = 2470936 bytes
 SHA1 (patch-aa) = 4511f3af35b824d8e1425b571a8c12e44e8ef46c
 SHA1 (patch-ab) = 7effcc7f7f1856372692c147521888843810fed5
-SHA1 (patch-ac) = 0af2dde942c1f32c6fce937eb3d886773f0a7674
-SHA1 (patch-ad) = be83c13f11dfd0b94e598965065ef94a9daca0bb
 SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0
-SHA1 (patch-ag) = cd2fd8958b86e12c9d2786fe200c6ab44d8d40e1
-SHA1 (patch-aj) = 7bcfe591659e60dcdbd6c966f4347270ed3f14f5
+SHA1 (patch-aj) = 02705ec01b70cbfef6520586d799dccd835352dc
 SHA1 (patch-al) = 852877c85dd43782dfcf855d43ed6250449aa9fd
-SHA1 (patch-am) = 6e72e1c4c3894cc9ffad5ba61aab07de0d9f3fea
-SHA1 (patch-ap) = c477500c2540719c40253b30de1f389c8ed50334
-SHA1 (patch-ar) = 1a78f0bcb6a8f65f71af23accb2a9780331f275b
-SHA1 (patch-as) = a53286d5e0a2cab7e0a1d80baf3b76681f996b7a
+SHA1 (patch-am) = f11ac8c5904c00cf73aedfe3d2c2ffb8c8065550
+SHA1 (patch-ar) = 61e759bb3eb05890160573dfe63431792f1823bd
+SHA1 (patch-as) = 98813c71b10e209df90b5024cf8e6287113563ce
 SHA1 (patch-ba) = 0621af3f2c0abba700c30d7f4809f405a7ffe729
-SHA1 (patch-bb) = 1918b2e247f9fbbe583fd1111c94dc3a58bfd929
-SHA1 (patch-bc) = 8a47e8899f203d56f9855aea6516c4369ab327fe
-SHA1 (patch-bd) = c5e714b59212202c4889c129eb2b140660474816
+SHA1 (patch-bb) = 48407d4a2d881cb3427b29682fc7e417023d1b99
+SHA1 (patch-bc) = 40012e55c20e8c10b575a6de0ac4f3f2a35baf15
+SHA1 (patch-bd) = 191e5140254224228d7a8f27af16f88086278849
 SHA1 (patch-be) = 5f4ba09788f3ca5410067c14b90426f2a831e92b
diff --git a/devel/SDL/patches/patch-ac b/devel/SDL/patches/patch-ac
deleted file mode 100644
index db84f88f674..00000000000
--- a/devel/SDL/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2004/01/10 13:57:12 recht Exp $
-
---- src/video/mmx.h.orig	2003-08-22 07:51:19.000000000 +0200
-+++ src/video/mmx.h	2004-01-10 14:24:56.000000000 +0100
-@@ -353,7 +353,7 @@
- #define	mmx_m2r(op, mem, reg) \
- 	__asm__ __volatile__ (#op " %0, %%" #reg \
- 			      : /* nothing */ \
--			      : "X" (mem))
-+			      : "m" (mem))
- 
- #define	mmx_r2m(op, reg, mem) \
- 	__asm__ __volatile__ (#op " %%" #reg ", %0" \
diff --git a/devel/SDL/patches/patch-ad b/devel/SDL/patches/patch-ad
deleted file mode 100644
index 2da15e80754..00000000000
--- a/devel/SDL/patches/patch-ad
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2003/10/27 23:19:46 kristerw Exp $
-
---- src/video/SDL_blit_A.c.orig	Sat Aug 30 21:13:06 2003
-+++ src/video/SDL_blit_A.c	Mon Oct 27 21:10:22 2003
-@@ -220,11 +220,11 @@
- 	int dstskip = info->d_skip >> 2;
-         Uint8 load[8];
-   
--        *(Uint64 *)load = 0x00fefefe00fefefe;/* alpha128 mask */
-+        *(Uint64 *)load = 0x00fefefe00fefefeULL;/* alpha128 mask */
-         movq_m2r(*load, mm4); /* alpha128 mask -> mm4 */
--        *(Uint64 *)load = 0x0001010100010101;/* !alpha128 mask */
-+        *(Uint64 *)load = 0x0001010100010101ULL;/* !alpha128 mask */
-         movq_m2r(*load, mm3); /* !alpha128 mask -> mm3 */
--        *(Uint64 *)load = 0xFF000000FF000000;/* dst alpha mask */
-+        *(Uint64 *)load = 0xFF000000FF000000ULL;/* dst alpha mask */
-         movq_m2r(*load, mm7); /* dst alpha mask -> mm7 */
- 	while(height--) {
-             DUFFS_LOOP_DOUBLE2(
-@@ -276,10 +276,10 @@
-     					alpha, alpha, alpha, alpha};
- 					
-                 movq_m2r(*load, mm4); /* alpha -> mm4 */
--		*(Uint64 *)load = 0x00FF00FF00FF00FF;
-+		*(Uint64 *)load = 0x00FF00FF00FF00FFULL;
-                 movq_m2r(*load, mm3); /* mask -> mm3 */
- 		pand_r2r(mm3, mm4); /* mm4 & mask -> 0A0A0A0A -> mm4 */
--		*(Uint64 *)load = 0xFF000000FF000000;/* dst alpha mask */
-+		*(Uint64 *)load = 0xFF000000FF000000ULL;/* dst alpha mask */
- 		movq_m2r(*load, mm7); /* dst alpha mask -> mm7 */
- 		
- 		while(height--) {
-@@ -360,13 +360,13 @@
-         Uint32 alpha = 0;
-         Uint8 load[8];
- 	                
--	*(Uint64 *)load = 0x00FF00FF00FF00FF;
-+	*(Uint64 *)load = 0x00FF00FF00FF00FFULL;
-         movq_m2r(*load, mm3); /* mask -> mm2 */
--	*(Uint64 *)load = 0x00FF000000000000;
-+	*(Uint64 *)load = 0x00FF000000000000ULL;
-         movq_m2r(*load, mm7); /* dst alpha mask -> mm2 */
--        *(Uint64 *)load = 0x00FFFFFF00FFFFFF;
-+        *(Uint64 *)load = 0x00FFFFFF00FFFFFFULL;
-         movq_m2r(*load, mm0); /* alpha 255 mask -> mm0 */
--        *(Uint64 *)load = 0xFF000000FF000000;
-+        *(Uint64 *)load = 0xFF000000FF000000ULL;
-         movq_m2r(*load, mm6); /* alpha 255 !mask -> mm6 */
- 	while(height--) {
- 	    DUFFS_LOOP4({
-@@ -792,11 +792,11 @@
-                 punpcklwd_r2r(mm0, mm0); /* 0A0A0A0A -> mm0 */
- 	  
-  	        /* Setup the 565 color channel masks */
--	        *(Uint64 *)load = 0xF800F800F800F800;
-+	        *(Uint64 *)load = 0xF800F800F800F800ULL;
- 		movq_m2r(*load, mm1); /* MASKRED -> mm1 */
--		*(Uint64 *)load = 0x07E007E007E007E0;
-+		*(Uint64 *)load = 0x07E007E007E007E0ULL;
- 		movq_m2r(*load, mm4); /* MASKGREEN -> mm4 */
--		*(Uint64 *)load = 0x001F001F001F001F;
-+		*(Uint64 *)load = 0x001F001F001F001FULL;
- 		movq_m2r(*load, mm7); /* MASKBLUE -> mm7 */
- 		while(height--) {
-                         DUFFS_LOOP_QUATRO2(
-@@ -942,11 +942,11 @@
-                 punpcklwd_r2r(mm0, mm0); /* 0A0A0A0A -> mm0 */
- 	  
-  	        /* Setup the 555 color channel masks */
--	        *(Uint64 *)load = 0x7C007C007C007C00;
-+	        *(Uint64 *)load = 0x7C007C007C007C00ULL;
- 		movq_m2r(*load, mm1); /* MASKRED -> mm1 */
--		*(Uint64 *)load = 0x03E003E003E003E0;
-+		*(Uint64 *)load = 0x03E003E003E003E0ULL;
- 		movq_m2r(*load, mm4); /* MASKGREEN -> mm4 */
--		*(Uint64 *)load = 0x001F001F001F001F;
-+		*(Uint64 *)load = 0x001F001F001F001FULL;
- 		movq_m2r(*load, mm7); /* MASKBLUE -> mm7 */
- 		while(height--) {
-                         DUFFS_LOOP_QUATRO2(
diff --git a/devel/SDL/patches/patch-ag b/devel/SDL/patches/patch-ag
deleted file mode 100644
index f8b4c92ad4e..00000000000
--- a/devel/SDL/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2003/09/03 19:30:56 drochner Exp $
-
---- src/hermes/Makefile.am.orig	2003-08-30 21:13:04.000000000 +0200
-+++ src/hermes/Makefile.am
-@@ -7,7 +7,7 @@ STRIP_FPIC = sh $(top_srcdir)/strip_fPIC
- SUFFIXES = .asm
- 
- .asm.lo:
--	$(LIBTOOL) --mode=compile $(STRIP_FPIC) $(NASM) @NASMFLAGS@ $< -o $*.o
-+	$(LIBTOOL) --tag=CC --mode=compile $(STRIP_FPIC) $(NASM) @NASMFLAGS@ $< -o $*.o
- 
- ###########################################################################
- 
diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj
index 53504a0f6e6..2f9f83842df 100644
--- a/devel/SDL/patches/patch-aj
+++ b/devel/SDL/patches/patch-aj
@@ -1,8 +1,21 @@
-$NetBSD: patch-aj,v 1.17 2003/09/04 09:53:33 drochner Exp $
+$NetBSD: patch-aj,v 1.18 2004/04/17 00:15:21 snj Exp $
 
---- configure.in.orig	2003-08-30 21:13:18.000000000 +0200
-+++ configure.in
-@@ -258,6 +258,8 @@ CheckOSS()
+--- configure.in.orig	2004-02-22 13:31:47.000000000 -0800
++++ configure.in	2004-04-10 16:05:54.000000000 -0700
+@@ -28,9 +28,9 @@ AC_SUBST(SDL_VERSION)
+ 
+ # libtool versioning
+ LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
+-LT_CURRENT=`expr $SDL_MICRO_VERSION - $SDL_INTERFACE_AGE`
+-LT_REVISION=$SDL_INTERFACE_AGE
+-LT_AGE=`expr $SDL_BINARY_AGE - $SDL_INTERFACE_AGE`
++LT_CURRENT=$SDL_INTERFACE_AGE
++LT_REVISION=$SDL_BINARY_AGE
++LT_AGE=0
+ 
+ AC_SUBST(LT_RELEASE)
+ AC_SUBST(LT_CURRENT)
+@@ -267,6 +267,8 @@ CheckOSS()
          AC_MSG_RESULT($have_oss)
          if test x$have_oss = xyes; then
              CFLAGS="$CFLAGS -DOSS_SUPPORT"
@@ -11,16 +24,19 @@ $NetBSD: patch-aj,v 1.17 2003/09/04 09:53:33 drochner Exp $
              AUDIO_SUBDIRS="$AUDIO_SUBDIRS dsp"
              AUDIO_DRIVERS="$AUDIO_DRIVERS dsp/libaudio_dsp.la"
              AUDIO_SUBDIRS="$AUDIO_SUBDIRS dma"
-@@ -413,7 +415,7 @@ CheckNAS()
+@@ -422,9 +424,9 @@ CheckNAS()
      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
-             CFLAGS="$CFLAGS -DNAS_SUPPORT"
+-            CFLAGS="$CFLAGS -DNAS_SUPPORT -I/usr/X11R6/include/"
++            CFLAGS="$CFLAGS -DNAS_SUPPORT"
              SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt"
-@@ -496,7 +498,7 @@ CheckNASM()
+             AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas"
+             AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la"
+@@ -505,7 +507,7 @@ CheckNASM()
                    NASMFLAGS="-f aoutb"
                    ;;
                *)
@@ -29,7 +45,7 @@ $NetBSD: patch-aj,v 1.17 2003/09/04 09:53:33 drochner Exp $
                    ;;
              esac
              AC_SUBST(NASMFLAGS)
-@@ -933,18 +935,18 @@ CheckAAlib()
+@@ -943,18 +945,18 @@ CheckAAlib()
  [  --enable-video-aalib    use AAlib video driver [default=no]],
                    , enable_video_aalib=no)
      if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
@@ -56,7 +72,7 @@ $NetBSD: patch-aj,v 1.17 2003/09/04 09:53:33 drochner Exp $
  
              VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib"
              VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la"
-@@ -1115,12 +1117,13 @@ CheckPTH()
+@@ -1125,12 +1127,13 @@ CheckPTH()
  [  --enable-pth            use GNU pth library for multi-threading [default=yes]],
                    , enable_pth=yes)
      if test x$enable_threads = xyes -a x$enable_pth = xyes; then
@@ -74,7 +90,7 @@ $NetBSD: patch-aj,v 1.17 2003/09/04 09:53:33 drochner Exp $
              SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
              SDL_LIBS="$SDL_LIBS $PTH_LIBS"
              CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -1161,8 +1164,8 @@ CheckPTHREAD()
+@@ -1171,8 +1174,8 @@ CheckPTHREAD()
              pthread_lib="-pthread"
              ;;
          *-*-netbsd*)
@@ -85,7 +101,7 @@ $NetBSD: patch-aj,v 1.17 2003/09/04 09:53:33 drochner Exp $
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -1600,29 +1603,31 @@ CheckUSBHID()
+@@ -1638,29 +1641,31 @@ CheckUSBHID()
          have_libusbhid=no
          have_libusb=no
          AC_CHECK_LIB(usbhid, hid_init, have_libusbhid=yes)
@@ -126,7 +142,7 @@ $NetBSD: patch-aj,v 1.17 2003/09/04 09:53:33 drochner Exp $
          fi
  
          AC_MSG_CHECKING(for usbhid)
-@@ -1868,6 +1873,7 @@ case "$target" in
+@@ -1957,6 +1962,7 @@ case "$target" in
          CheckESD
          CheckNAS
          CheckX11
@@ -134,8 +150,8 @@ $NetBSD: patch-aj,v 1.17 2003/09/04 09:53:33 drochner Exp $
          CheckAAlib
          CheckOpenGL
          CheckPTHREAD
-@@ -1876,9 +1882,9 @@ case "$target" in
-         COPY_ARCH_SRC(src/main, linux, SDL_main.c)
+@@ -1964,9 +1970,9 @@ case "$target" in
+         CheckUSBHID
          # Set up files for the audio library
          if test x$enable_audio = xyes; then
 -            CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
@@ -147,7 +163,7 @@ $NetBSD: patch-aj,v 1.17 2003/09/04 09:53:33 drochner Exp $
          fi
          # Set up files for the cdrom library
          if test x$enable_cdrom = xyes; then
-@@ -1887,9 +1893,6 @@ case "$target" in
+@@ -1975,9 +1981,6 @@ case "$target" in
          fi
          # Set up files for the thread library
          if test x$enable_threads = xyes; then
@@ -157,7 +173,7 @@ $NetBSD: patch-aj,v 1.17 2003/09/04 09:53:33 drochner Exp $
              CopyUnixThreadSource
          fi
          # Set up files for the timer library
-@@ -2543,7 +2546,7 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$
+@@ -2606,7 +2609,7 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$
  
  # Set runtime shared library paths as needed
  
diff --git a/devel/SDL/patches/patch-am b/devel/SDL/patches/patch-am
index 859445d1559..ce4d070b8ff 100644
--- a/devel/SDL/patches/patch-am
+++ b/devel/SDL/patches/patch-am
@@ -1,9 +1,31 @@
-$NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $
+$NetBSD: patch-am,v 1.13 2004/04/17 00:15:21 snj Exp $
 
---- configure.orig	Sat Aug 30 21:13:23 2003
-+++ configure
-@@ -3132,6 +3132,8 @@ rm -f conftest*
-         echo "$ac_t""$have_oss" 1>&6
+--- configure.orig	2004-02-22 13:32:33.000000000 -0800
++++ configure	2004-04-10 16:06:11.000000000 -0700
+@@ -463,7 +463,7 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_MICRO_VERSION SDL_INTERFACE_AGE SDL_BINARY_AGE SDL_VERSION LT_RELEASE LT_CURRENT LT_REVISION LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA ASFLAGS CCAS CCASFLAGS am__fastdepOBJC_TRUE am__fastdepOBJC_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS esd_lib ARTSCCONFIG arts_lib NASM NASMFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS PTH_CONFIG ARCH TARGET_LINUX_TRUE TARGET_LINUX_FALSE TARGET_QTOPIA_TRUE TARGET_QTOPIA_FALSE TARGET_SOLARIS_TRUE TARGET_SOLARIS_FALSE TARGET_IRIX_TRUE TARGET_IRIX_FALSE TARGET_BSDI_TRUE TARGET_BSDI_FALSE TARGET_FREEBSD_TRUE TARGET_FREEBSD_FALSE TARGET_NETBSD_TRUE TARGET_NETBSD_FALSE TARGET_OPENBSD_TRUE TARGET_OPENBSD_FALSE TARGET_AIX_TRUE TARGET_AIX_FALSE TARGET_WIN32_TRUE TARGET_WIN32_FALSE TARGET_BEOS_TRUE TARGET_BEOS_FALSE TARGET_MACOS_TRUE TARGET_MACOS_FALSE TARGET_MACOSX_TRUE TARGET_MACOSX_FALSE TARGET_QNX_TRUE TARGET_QNX_FALSE TARGET_MINT_TRUE TARGET_MINT_FALSE USE_DIRECTX_TRUE USE_DIRECTX_FALSE USE_CLONE_TRUE USE_CLONE_FALSE HAVE_NASM_TRUE HAVE_NASM_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE AUDIO_SUBDIRS AUDIO_DRIVERS VIDEO_SUBDIRS VIDEO_DRIVERS JOYSTICK_SUBDIRS JOYSTICK_DRIVERS CDROM_SUBDIRS CDROM_DRIVERS SDL_EXTRADIRS SDL_EXTRALIBS SDL_CFLAGS SDL_LIBS SDL_STATIC_LIBS SDL_RLD_FLAGS STATIC_SYSTEM_LIBS SHARED_SYSTEM_LIBS SYSTEM_LIBS OBJC OBJCFLAGS OBJCDEPMODE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_MICRO_VERSION SDL_INTERFACE_AGE SDL_BINARY_AGE SDL_VERSION LT_RELEASE LT_CURRENT LT_REVISION LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA ASFLAGS CCAS CCASFLAGS am__fastdepOBJC_TRUE am__fastdepOBJC_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS esd_lib ARTSCCONFIG arts_lib NASM NASMFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS AALIB_CONFIG PTHREAD_CONFIG ARCH TARGET_LINUX_TRUE TARGET_LINUX_FALSE TARGET_QTOPIA_TRUE TARGET_QTOPIA_FALSE TARGET_SOLARIS_TRUE TARGET_SOLARIS_FALSE TARGET_IRIX_TRUE TARGET_IRIX_FALSE TARGET_BSDI_TRUE TARGET_BSDI_FALSE TARGET_FREEBSD_TRUE TARGET_FREEBSD_FALSE TARGET_NETBSD_TRUE TARGET_NETBSD_FALSE TARGET_OPENBSD_TRUE TARGET_OPENBSD_FALSE TARGET_AIX_TRUE TARGET_AIX_FALSE TARGET_WIN32_TRUE TARGET_WIN32_FALSE TARGET_BEOS_TRUE TARGET_BEOS_FALSE TARGET_MACOS_TRUE TARGET_MACOS_FALSE TARGET_MACOSX_TRUE TARGET_MACOSX_FALSE TARGET_QNX_TRUE TARGET_QNX_FALSE TARGET_MINT_TRUE TARGET_MINT_FALSE USE_DIRECTX_TRUE USE_DIRECTX_FALSE USE_CLONE_TRUE USE_CLONE_FALSE HAVE_NASM_TRUE HAVE_NASM_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE AUDIO_SUBDIRS AUDIO_DRIVERS VIDEO_SUBDIRS VIDEO_DRIVERS JOYSTICK_SUBDIRS JOYSTICK_DRIVERS CDROM_SUBDIRS CDROM_DRIVERS SDL_EXTRADIRS SDL_EXTRALIBS SDL_CFLAGS SDL_LIBS SDL_STATIC_LIBS SDL_RLD_FLAGS STATIC_SYSTEM_LIBS SHARED_SYSTEM_LIBS SYSTEM_LIBS OBJC OBJCFLAGS OBJCDEPMODE LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -1587,9 +1587,9 @@ SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINO
+ 
+ # libtool versioning
+ LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
+-LT_CURRENT=`expr $SDL_MICRO_VERSION - $SDL_INTERFACE_AGE`
+-LT_REVISION=$SDL_INTERFACE_AGE
+-LT_AGE=`expr $SDL_BINARY_AGE - $SDL_INTERFACE_AGE`
++LT_CURRENT=$SDL_INTERFACE_AGE
++LT_REVISION=$SDL_BINARY_AGE
++LT_AGE=0
+ 
+ 
+ 
+@@ -21563,6 +21563,8 @@ rm -f conftest.err conftest.$ac_objext c
+ echo "${ECHO_T}$have_oss" >&6
          if test x$have_oss = xyes; then
              CFLAGS="$CFLAGS -DOSS_SUPPORT"
 +	    LDFLAGS="$LDFLAGS $LIBOSSAUDIO"
@@ -11,19 +33,19 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $
              AUDIO_SUBDIRS="$AUDIO_SUBDIRS dsp"
              AUDIO_DRIVERS="$AUDIO_DRIVERS dsp/libaudio_dsp.la"
              AUDIO_SUBDIRS="$AUDIO_SUBDIRS dma"
-@@ -3667,9 +3669,9 @@ fi
- 
-     if test x$enable_audio = xyes -a x$enable_nas = xyes; then
-         echo $ac_n "checking for NAS audio support""... $ac_c" 1>&6
--echo "configure:3671: checking for NAS audio support" >&5
-+echo "configure:3673: checking for NAS audio support" >&5
+@@ -22262,9 +22264,9 @@ fi;
+         echo "$as_me:$LINENO: checking for NAS audio support" >&5
+ echo $ECHO_N "checking for NAS audio support... $ECHO_C" >&6
          have_nas=no
 -        if test -r /usr/X11R6/include/audio/audiolib.h; then
 +        if true; then
              have_nas=yes
-             CFLAGS="$CFLAGS -DNAS_SUPPORT"
+-            CFLAGS="$CFLAGS -DNAS_SUPPORT -I/usr/X11R6/include/"
++            CFLAGS="$CFLAGS -DNAS_SUPPORT"
              SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt"
-@@ -3826,7 +3828,7 @@ fi
+             AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas"
+             AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la"
+@@ -22530,7 +22532,7 @@ fi
                    NASMFLAGS="-f aoutb"
                    ;;
                *)
@@ -31,77 +53,108 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $
 +                  test -n "$NASMFLAGS" || NASMFLAGS="-f elf"
                    ;;
              esac
-             
-@@ -5429,34 +5431,53 @@ else
- fi
  
+@@ -25053,63 +25055,58 @@ else
+   enable_video_aalib=no
+ fi;
      if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
--        echo $ac_n "checking for AAlib support""... $ac_c" 1>&6
--echo "configure:5434: checking for AAlib support" >&5
+-        echo "$as_me:$LINENO: checking for AAlib support" >&5
+-echo $ECHO_N "checking for AAlib support... $ECHO_C" >&6
 -        video_aalib=no
--        cat > conftest.$ac_ext <<EOF
--#line 5437 "configure"
--#include "confdefs.h"
+-        cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 -
 -         #include <aalib.h>
--        
--int main() {
 -
--        
--; return 0; }
--EOF
--if { (eval echo configure:5447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
--  
--        video_aalib=yes
--        
+-int
+-main ()
+-{
+-
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
 +        # Extract the first word of "aalib-config", so it can be a program name with args.
 +set dummy aalib-config; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:5438: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_path_AALIB_CONFIG'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
-+  case "$AALIB_CONFIG" in
-+  /*)
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_AALIB_CONFIG+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $AALIB_CONFIG in
++  [\\/]* | ?:[\\/]*)
 +  ac_cv_path_AALIB_CONFIG="$AALIB_CONFIG" # Let the user override the test with a path.
 +  ;;
-+  ?:/*)			 
-+  ac_cv_path_AALIB_CONFIG="$AALIB_CONFIG" # Let the user override the test with a dos path.
-+  ;;
 +  *)
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do 
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_path_AALIB_CONFIG="$ac_dir/$ac_word"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_AALIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
+ 
+-        video_aalib=yes
 +  ;;
 +esac
- fi
--rm -f conftest*
-+AALIB_CONFIG="$ac_cv_path_AALIB_CONFIG"
-+if test -n "$AALIB_CONFIG"; then
-+  echo "$ac_t""$AALIB_CONFIG" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
 +fi
++AALIB_CONFIG=$ac_cv_path_AALIB_CONFIG
+ 
++if test -n "$AALIB_CONFIG"; then
++  echo "$as_me:$LINENO: result: $AALIB_CONFIG" >&5
++echo "${ECHO_T}$AALIB_CONFIG" >&6
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
-+        echo $ac_n "checking for AAlib support""... $ac_c" 1>&6
-+echo "configure:5471: checking for AAlib support" >&5
++        echo "$as_me:$LINENO: checking for AAlib support" >&5
++echo $ECHO_N "checking for AAlib support... $ECHO_C" >&6
 +        if test x$AALIB_CONFIG = x; then
 +            video_aalib=no
 +	else
 +            AALIB_LIBS=`$AALIB_CONFIG --libs`
 +            video_aalib=yes
 +        fi
-         echo "$ac_t""$video_aalib" 1>&6
+         echo "$as_me:$LINENO: result: $video_aalib" >&5
+ echo "${ECHO_T}$video_aalib" >&6
          if test x$video_aalib = xyes; then
              CFLAGS="$CFLAGS -DENABLE_AALIB"
 -            SYSTEM_LIBS="$SYSTEM_LIBS -laa"
@@ -109,57 +162,58 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $
  
              VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib"
              VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la"
-@@ -5881,19 +5902,20 @@ else
- fi
- 
+@@ -25837,16 +25834,17 @@ else
+   enable_pth=yes
+ fi;
      if test x$enable_threads = xyes -a x$enable_pth = xyes; then
 -        # Extract the first word of "pth-config", so it can be a program name with args.
 -set dummy pth-config; ac_word=$2
 +        # Use the libpthread version of the pth library.
 +        # Extract the first word of "pthread-config", so it can be a program name with args.
 +set dummy pthread-config; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:5888: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_PTH_CONFIG'+set}'`\" = set"; then
-+echo "configure:5910: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_path_PTHREAD_CONFIG'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_PTH_CONFIG+set}" = set; then
++if test "${ac_cv_path_PTHREAD_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--  case "$PTH_CONFIG" in
-+  case "$PTHREAD_CONFIG" in
-   /*)
+-  case $PTH_CONFIG in
++  case $PTHREAD_CONFIG in
+   [\\/]* | ?:[\\/]*)
 -  ac_cv_path_PTH_CONFIG="$PTH_CONFIG" # Let the user override the test with a path.
 +  ac_cv_path_PTHREAD_CONFIG="$PTHREAD_CONFIG" # Let the user override the test with a path.
    ;;
-   ?:/*)			 
--  ac_cv_path_PTH_CONFIG="$PTH_CONFIG" # Let the user override the test with a dos path.
-+  ac_cv_path_PTHREAD_CONFIG="$PTHREAD_CONFIG" # Let the user override the test with a dos path.
-   ;;
    *)
-   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-@@ -5901,27 +5923,27 @@ else
-   for ac_dir in $ac_dummy; do 
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
--      ac_cv_path_PTH_CONFIG="$ac_dir/$ac_word"
-+      ac_cv_path_PTHREAD_CONFIG="$ac_dir/$ac_word"
-       break
-     fi
-   done
-   IFS="$ac_save_ifs"
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -25856,32 +25854,32 @@ do
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_PTH_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    ac_cv_path_PTHREAD_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
+ 
 -  test -z "$ac_cv_path_PTH_CONFIG" && ac_cv_path_PTH_CONFIG="no"
 +  test -z "$ac_cv_path_PTHREAD_CONFIG" && ac_cv_path_PTHREAD_CONFIG="no"
    ;;
  esac
  fi
--PTH_CONFIG="$ac_cv_path_PTH_CONFIG"
+-PTH_CONFIG=$ac_cv_path_PTH_CONFIG
++PTHREAD_CONFIG=$ac_cv_path_PTHREAD_CONFIG
+ 
 -if test -n "$PTH_CONFIG"; then
--  echo "$ac_t""$PTH_CONFIG" 1>&6
-+PTHREAD_CONFIG="$ac_cv_path_PTHREAD_CONFIG"
+-  echo "$as_me:$LINENO: result: $PTH_CONFIG" >&5
+-echo "${ECHO_T}$PTH_CONFIG" >&6
 +if test -n "$PTHREAD_CONFIG"; then
-+  echo "$ac_t""$PTHREAD_CONFIG" 1>&6
++  echo "$as_me:$LINENO: result: $PTHREAD_CONFIG" >&5
++echo "${ECHO_T}$PTHREAD_CONFIG" >&6
  else
-   echo "$ac_t""no" 1>&6
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
  fi
  
 -        if test "$PTH_CONFIG" = "no"; then
@@ -173,7 +227,7 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $
              SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
              SDL_LIBS="$SDL_LIBS $PTH_LIBS"
              CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -5970,8 +5992,8 @@ fi
+@@ -25930,8 +25928,8 @@ fi;
              pthread_lib="-pthread"
              ;;
          *-*-netbsd*)
@@ -184,115 +238,331 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -7045,56 +7067,45 @@ else
-   echo "$ac_t""no" 1>&6
+@@ -27751,93 +27749,21 @@ if test $ac_cv_lib_usbhid_hid_init = yes
+   have_libusbhid=yes
  fi
  
--        echo $ac_n "checking for hid_init in -lusb""... $ac_c" 1>&6
--echo "configure:7050: checking for hid_init in -lusb" >&5
--ac_lib_var=`echo usb'_'hid_init | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+        if test x$have_libusbhid = xyes; then
-+            SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid"
-+
-+            ac_safe=`echo "usbhid.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for usbhid.h""... $ac_c" 1>&6
-+echo "configure:7076: checking for usbhid.h" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
--  ac_save_LIBS="$LIBS"
+-        echo "$as_me:$LINENO: checking for hid_init in -lusb" >&5
+-echo $ECHO_N "checking for hid_init in -lusb... $ECHO_C" >&6
+-if test "${ac_cv_lib_usb_hid_init+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lusb  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 7058 "configure"
-+  cat > conftest.$ac_ext <<EOF
-+#line 7081 "configure"
- #include "confdefs.h"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
 -/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
 -/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char hid_init();
+-   builtin and then its argument prototype would still apply.  */
+-char hid_init ();
+-int
+-main ()
+-{
+-hid_init ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_usb_hid_init=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 -
--int main() {
--hid_init()
--; return 0; }
+-ac_cv_lib_usb_hid_init=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_usb_hid_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_usb_hid_init" >&6
+-if test $ac_cv_lib_usb_hid_init = yes; then
+-  have_libusb=yes
+-fi
+-
+         if test x$have_libusbhid = xyes; then
+             SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid"
+-        fi
+-        if test x$have_libusb = xyes; then
+-            SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
+-        fi
+ 
+-        if test "${ac_cv_header_usb_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for usb.h" >&5
+-echo $ECHO_N "checking for usb.h... $ECHO_C" >&6
+-if test "${ac_cv_header_usb_h+set}" = set; then
++            if test "${ac_cv_header_usbhid_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for usbhid.h" >&5
++echo $ECHO_N "checking for usbhid.h... $ECHO_C" >&6
++if test "${ac_cv_header_usbhid_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5
+-echo "${ECHO_T}$ac_cv_header_usb_h" >&6
++echo "$as_me:$LINENO: result: $ac_cv_header_usbhid_h" >&5
++echo "${ECHO_T}$ac_cv_header_usbhid_h" >&6
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking usb.h usability" >&5
+-echo $ECHO_N "checking usb.h usability... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking usbhid.h usability" >&5
++echo $ECHO_N "checking usbhid.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27845,7 +27771,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-#include <usb.h>
++#include <usbhid.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -27881,15 +27807,15 @@ echo "$as_me:$LINENO: result: $ac_header
+ echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking usb.h presence" >&5
+-echo $ECHO_N "checking usb.h presence... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking usbhid.h presence" >&5
++echo $ECHO_N "checking usbhid.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <usb.h>
 +#include <usbhid.h>
- EOF
--if { (eval echo configure:7069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:7086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-   rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
-+  eval "ac_cv_header_$ac_safe=yes"
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+@@ -27923,25 +27849,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: usb.h: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: usbhid.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: usbhid.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: usbhid.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: usbhid.h: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: usb.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: usb.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: usb.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: usb.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: usb.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: usb.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: usb.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: usb.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: usb.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: usb.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: usb.h: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: usbhid.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: usbhid.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: usbhid.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: usbhid.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: usbhid.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: usbhid.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: usbhid.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: usbhid.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: usbhid.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: usbhid.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: usbhid.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: usbhid.h: in the future, the compiler will take precedence" >&2;}
+     (
+       cat <<\_ASBOX
+ ## ------------------------------------------ ##
+@@ -27952,34 +27878,34 @@ _ASBOX
+       sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for usb.h" >&5
+-echo $ECHO_N "checking for usb.h... $ECHO_C" >&6
+-if test "${ac_cv_header_usb_h+set}" = set; then
++echo "$as_me:$LINENO: checking for usbhid.h" >&5
++echo $ECHO_N "checking for usbhid.h... $ECHO_C" >&6
++if test "${ac_cv_header_usbhid_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-+  echo "$ac_err" >&5
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
-+  eval "ac_cv_header_$ac_safe=no"
+-  ac_cv_header_usb_h=$ac_header_preproc
++  ac_cv_header_usbhid_h=$ac_header_preproc
  fi
- rm -f conftest*
--LIBS="$ac_save_LIBS"
--
+-echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5
+-echo "${ECHO_T}$ac_cv_header_usb_h" >&6
++echo "$as_me:$LINENO: result: $ac_cv_header_usbhid_h" >&5
++echo "${ECHO_T}$ac_cv_header_usbhid_h" >&6
+ 
  fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  have_libusb=yes
+-if test $ac_cv_header_usb_h = yes; then
+-  have_usb_h=yes
++if test $ac_cv_header_usbhid_h = yes; then
 +  have_usbhid_h=yes
- else
-   echo "$ac_t""no" 1>&6
  fi
  
--        if test x$have_libusbhid = xyes; then
--            SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid"
--        fi
--        if test x$have_libusb = xyes; then
--            SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
--        fi
--
--        ac_safe=`echo "usb.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for usb.h""... $ac_c" 1>&6
--echo "configure:7098: checking for usb.h" >&5
-+            ac_safe=`echo "libusbhid.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for libusbhid.h""... $ac_c" 1>&6
-+echo "configure:7109: checking for libusbhid.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -7099,12 +7110,12 @@ if eval "test \"`echo '$''{'ac_cv_header
-   echo $ac_n "(cached) $ac_c" 1>&6
+ 
+-        if test "${ac_cv_header_usbhid_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for usbhid.h" >&5
+-echo $ECHO_N "checking for usbhid.h... $ECHO_C" >&6
+-if test "${ac_cv_header_usbhid_h+set}" = set; then
++            if test "${ac_cv_header_libusbhid_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for libusbhid.h" >&5
++echo $ECHO_N "checking for libusbhid.h... $ECHO_C" >&6
++if test "${ac_cv_header_libusbhid_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_usbhid_h" >&5
+-echo "${ECHO_T}$ac_cv_header_usbhid_h" >&6
++echo "$as_me:$LINENO: result: $ac_cv_header_libusbhid_h" >&5
++echo "${ECHO_T}$ac_cv_header_libusbhid_h" >&6
  else
-   cat > conftest.$ac_ext <<EOF
--#line 7103 "configure"
-+#line 7114 "configure"
- #include "confdefs.h"
--#include <usb.h>
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking usbhid.h usability" >&5
+-echo $ECHO_N "checking usbhid.h usability... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking libusbhid.h usability" >&5
++echo $ECHO_N "checking libusbhid.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27987,7 +27913,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-#include <usbhid.h>
++#include <libusbhid.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -28023,15 +27949,15 @@ echo "$as_me:$LINENO: result: $ac_header
+ echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking usbhid.h presence" >&5
+-echo $ECHO_N "checking usbhid.h presence... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking libusbhid.h presence" >&5
++echo $ECHO_N "checking libusbhid.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <usbhid.h>
 +#include <libusbhid.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:7108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -7120,47 +7131,64 @@ rm -f conftest*
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+@@ -28065,25 +27991,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: usbhid.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: usbhid.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: usbhid.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: usbhid.h: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libusbhid.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: libusbhid.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libusbhid.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: libusbhid.h: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: usbhid.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: usbhid.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: usbhid.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: usbhid.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: usbhid.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: usbhid.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: usbhid.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: usbhid.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: usbhid.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: usbhid.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: usbhid.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: usbhid.h: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libusbhid.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: libusbhid.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libusbhid.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: libusbhid.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libusbhid.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: libusbhid.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libusbhid.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: libusbhid.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libusbhid.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: libusbhid.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libusbhid.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: libusbhid.h: in the future, the compiler will take precedence" >&2;}
+     (
+       cat <<\_ASBOX
+ ## ------------------------------------------ ##
+@@ -28094,34 +28020,112 @@ _ASBOX
+       sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for usbhid.h" >&5
+-echo $ECHO_N "checking for usbhid.h... $ECHO_C" >&6
+-if test "${ac_cv_header_usbhid_h+set}" = set; then
++echo "$as_me:$LINENO: checking for libusbhid.h" >&5
++echo $ECHO_N "checking for libusbhid.h... $ECHO_C" >&6
++if test "${ac_cv_header_libusbhid_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_header_usbhid_h=$ac_header_preproc
++  ac_cv_header_libusbhid_h=$ac_header_preproc
  fi
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  have_usb_h=yes
+-echo "$as_me:$LINENO: result: $ac_cv_header_usbhid_h" >&5
+-echo "${ECHO_T}$ac_cv_header_usbhid_h" >&6
++echo "$as_me:$LINENO: result: $ac_cv_header_libusbhid_h" >&5
++echo "${ECHO_T}$ac_cv_header_libusbhid_h" >&6
+ 
+ fi
+-if test $ac_cv_header_usbhid_h = yes; then
+-  have_usbhid_h=yes
++if test $ac_cv_header_libusbhid_h = yes; then
 +  have_libusbhid_h=yes
- else
-   echo "$ac_t""no" 1>&6
  fi
  
--        ac_safe=`echo "usbhid.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for usbhid.h""... $ac_c" 1>&6
--echo "configure:7131: checking for usbhid.h" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ 
+-        if test "${ac_cv_header_libusb_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for libusb.h" >&5
+-echo $ECHO_N "checking for libusb.h... $ECHO_C" >&6
+-if test "${ac_cv_header_libusb_h+set}" = set; then
 +            if test x$have_usbhid_h = xyes; then
 +                CFLAGS="$CFLAGS -DHAVE_USBHID_H"
 +            fi
@@ -300,131 +570,315 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $
 +                CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H"
 +        fi
 +	else
-+            echo $ac_n "checking for hid_init in -lusb""... $ac_c" 1>&6
-+echo "configure:7148: checking for hid_init in -lusb" >&5
-+ac_lib_var=`echo usb'_'hid_init | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 7136 "configure"
-+  ac_save_LIBS="$LIBS"
++            echo "$as_me:$LINENO: checking for hid_init in -lusb" >&5
++echo $ECHO_N "checking for hid_init in -lusb... $ECHO_C" >&6
++if test "${ac_cv_lib_usb_hid_init+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lusb  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 7156 "configure"
- #include "confdefs.h"
--#include <usbhid.h>
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
 +/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
 +/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char hid_init();
-+
-+int main() {
-+hid_init()
-+; return 0; }
- EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:7141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
-+if { (eval echo configure:7167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=yes"
-+  eval "ac_cv_lib_$ac_lib_var=yes"
- else
--  echo "$ac_err" >&5
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  eval "ac_cv_lib_$ac_lib_var=no"
- fi
- rm -f conftest*
-+LIBS="$ac_save_LIBS"
++   builtin and then its argument prototype would still apply.  */
++char hid_init ();
++int
++main ()
++{
++hid_init ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_usb_hid_init=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
- fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  have_usbhid_h=yes
++ac_cv_lib_usb_hid_init=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_usb_hid_init" >&5
++echo "${ECHO_T}$ac_cv_lib_usb_hid_init" >&6
++if test $ac_cv_lib_usb_hid_init = yes; then
 +  have_libusb=yes
- else
-   echo "$ac_t""no" 1>&6
- fi
- 
--        ac_safe=`echo "libusb.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for libusb.h""... $ac_c" 1>&6
--echo "configure:7164: checking for libusb.h" >&5
++fi
++
 +        if test x$have_libusb = xyes; then
 +            SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
 +
-+        ac_safe=`echo "usb.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for usb.h""... $ac_c" 1>&6
-+echo "configure:7192: checking for usb.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -7165,12 +7193,12 @@ if eval "test \"`echo '$''{'ac_cv_header
-   echo $ac_n "(cached) $ac_c" 1>&6
++        if test "${ac_cv_header_usb_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for usb.h" >&5
++echo $ECHO_N "checking for usb.h... $ECHO_C" >&6
++if test "${ac_cv_header_usb_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libusb_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libusb_h" >&6
++echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5
++echo "${ECHO_T}$ac_cv_header_usb_h" >&6
  else
-   cat > conftest.$ac_ext <<EOF
--#line 7169 "configure"
-+#line 7197 "configure"
- #include "confdefs.h"
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking libusb.h usability" >&5
+-echo $ECHO_N "checking libusb.h usability... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking usb.h usability" >&5
++echo $ECHO_N "checking usb.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -28129,7 +28133,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-#include <libusb.h>
++#include <usb.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -28165,15 +28169,15 @@ echo "$as_me:$LINENO: result: $ac_header
+ echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking libusb.h presence" >&5
+-echo $ECHO_N "checking libusb.h presence... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking usb.h presence" >&5
++echo $ECHO_N "checking usb.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 -#include <libusb.h>
 +#include <usb.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:7174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -7186,14 +7214,14 @@ rm -f conftest*
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+@@ -28207,25 +28211,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: libusb.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: libusb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libusb.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: libusb.h: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: usb.h: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: libusb.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: libusb.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libusb.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: libusb.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libusb.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: libusb.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libusb.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: libusb.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libusb.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: libusb.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libusb.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: libusb.h: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: usb.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: usb.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: usb.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: usb.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: usb.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: usb.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: usb.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: usb.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: usb.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: usb.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: usb.h: in the future, the compiler will take precedence" >&2;}
+     (
+       cat <<\_ASBOX
+ ## ------------------------------------------ ##
+@@ -28236,34 +28240,34 @@ _ASBOX
+       sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for libusb.h" >&5
+-echo $ECHO_N "checking for libusb.h... $ECHO_C" >&6
+-if test "${ac_cv_header_libusb_h+set}" = set; then
++echo "$as_me:$LINENO: checking for usb.h" >&5
++echo $ECHO_N "checking for usb.h... $ECHO_C" >&6
++if test "${ac_cv_header_usb_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_header_libusb_h=$ac_header_preproc
++  ac_cv_header_usb_h=$ac_header_preproc
  fi
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
+-echo "$as_me:$LINENO: result: $ac_cv_header_libusb_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libusb_h" >&6
++echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5
++echo "${ECHO_T}$ac_cv_header_usb_h" >&6
+ 
+ fi
+-if test $ac_cv_header_libusb_h = yes; then
 -  have_libusb_h=yes
++if test $ac_cv_header_usb_h = yes; then
 +  have_usb_h=yes
- else
-   echo "$ac_t""no" 1>&6
  fi
  
--        ac_safe=`echo "libusbhid.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for libusbhid.h""... $ac_c" 1>&6
--echo "configure:7197: checking for libusbhid.h" >&5
-+        ac_safe=`echo "libusb.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for libusb.h""... $ac_c" 1>&6
-+echo "configure:7225: checking for libusb.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -7198,12 +7226,12 @@ if eval "test \"`echo '$''{'ac_cv_header
-   echo $ac_n "(cached) $ac_c" 1>&6
+ 
+-        if test "${ac_cv_header_libusbhid_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for libusbhid.h" >&5
+-echo $ECHO_N "checking for libusbhid.h... $ECHO_C" >&6
+-if test "${ac_cv_header_libusbhid_h+set}" = set; then
++        if test "${ac_cv_header_libusb_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for libusb.h" >&5
++echo $ECHO_N "checking for libusb.h... $ECHO_C" >&6
++if test "${ac_cv_header_libusb_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libusbhid_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libusbhid_h" >&6
++echo "$as_me:$LINENO: result: $ac_cv_header_libusb_h" >&5
++echo "${ECHO_T}$ac_cv_header_libusb_h" >&6
  else
-   cat > conftest.$ac_ext <<EOF
--#line 7202 "configure"
-+#line 7230 "configure"
- #include "confdefs.h"
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking libusbhid.h usability" >&5
+-echo $ECHO_N "checking libusbhid.h usability... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking libusb.h usability" >&5
++echo $ECHO_N "checking libusb.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -28271,7 +28275,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
 -#include <libusbhid.h>
 +#include <libusb.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:7207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -7219,7 +7247,7 @@ rm -f conftest*
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -28307,15 +28311,15 @@ echo "$as_me:$LINENO: result: $ac_header
+ echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking libusbhid.h presence" >&5
+-echo $ECHO_N "checking libusbhid.h presence... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking libusb.h presence" >&5
++echo $ECHO_N "checking libusb.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <libusbhid.h>
++#include <libusb.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+@@ -28349,25 +28353,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: libusbhid.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: libusbhid.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libusbhid.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: libusbhid.h: proceeding with the compiler's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libusb.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: libusb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libusb.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: libusb.h: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: libusbhid.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: libusbhid.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libusbhid.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: libusbhid.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libusbhid.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: libusbhid.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libusbhid.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: libusbhid.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libusbhid.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: libusbhid.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: libusbhid.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: libusbhid.h: in the future, the compiler will take precedence" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libusb.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: libusb.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libusb.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: libusb.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libusb.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: libusb.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libusb.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: libusb.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libusb.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: libusb.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: libusb.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: libusb.h: in the future, the compiler will take precedence" >&2;}
+     (
+       cat <<\_ASBOX
+ ## ------------------------------------------ ##
+@@ -28378,33 +28382,29 @@ _ASBOX
+       sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for libusbhid.h" >&5
+-echo $ECHO_N "checking for libusbhid.h... $ECHO_C" >&6
+-if test "${ac_cv_header_libusbhid_h+set}" = set; then
++echo "$as_me:$LINENO: checking for libusb.h" >&5
++echo $ECHO_N "checking for libusb.h... $ECHO_C" >&6
++if test "${ac_cv_header_libusb_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_header_libusbhid_h=$ac_header_preproc
++  ac_cv_header_libusb_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libusbhid_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libusbhid_h" >&6
++echo "$as_me:$LINENO: result: $ac_cv_header_libusb_h" >&5
++echo "${ECHO_T}$ac_cv_header_libusb_h" >&6
+ 
  fi
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
+-if test $ac_cv_header_libusbhid_h = yes; then
 -  have_libusbhid_h=yes
++if test $ac_cv_header_libusb_h = yes; then
 +  have_libusb_h=yes
- else
-   echo "$ac_t""no" 1>&6
  fi
-@@ -7227,14 +7255,10 @@ fi
+ 
+ 
          if test x$have_usb_h = xyes; then
              CFLAGS="$CFLAGS -DHAVE_USB_H"
          fi
@@ -439,8 +893,8 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $
 +            fi
          fi
  
-         echo $ac_n "checking for usbhid""... $ac_c" 1>&6
-@@ -7598,6 +7622,7 @@ __EOF__
+         echo "$as_me:$LINENO: checking for usbhid" >&5
+@@ -28922,6 +28922,7 @@ __EOF__
          CheckESD
          CheckNAS
          CheckX11
@@ -448,8 +902,8 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $
          CheckAAlib
          CheckOpenGL
          CheckPTHREAD
-@@ -7616,9 +7641,9 @@ __EOF__
- 
+@@ -28929,9 +28930,9 @@ __EOF__
+         CheckUSBHID
          # Set up files for the audio library
          if test x$enable_audio = xyes; then
 -            CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
@@ -461,7 +915,7 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $
          fi
          # Set up files for the cdrom library
          if test x$enable_cdrom = xyes; then
-@@ -7627,9 +7652,6 @@ __EOF__
+@@ -28940,9 +28941,6 @@ __EOF__
          fi
          # Set up files for the thread library
          if test x$enable_threads = xyes; then
@@ -471,7 +925,7 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $
              CopyUnixThreadSource
          fi
          # Set up files for the timer library
-@@ -9105,7 +9127,7 @@ fi
+@@ -30425,7 +30423,7 @@ fi
  
  # Set runtime shared library paths as needed
  
@@ -480,13 +934,13 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $
    SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
  fi
  if test $ARCH = solaris; then
-@@ -9504,7 +9526,8 @@ s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
- s%@PKG_CONFIG@%$PKG_CONFIG%g
- s%@DIRECTFB_CFLAGS@%$DIRECTFB_CFLAGS%g
- s%@DIRECTFB_LIBS@%$DIRECTFB_LIBS%g
--s%@PTH_CONFIG@%$PTH_CONFIG%g
-+s%@AALIB_CONFIG@%$AALIB_CONFIG%g
-+s%@PTHREAD_CONFIG@%$PTHREAD_CONFIG%g
- s%@ARCH@%$ARCH%g
- s%@TARGET_LINUX_TRUE@%$TARGET_LINUX_TRUE%g
- s%@TARGET_LINUX_FALSE@%$TARGET_LINUX_FALSE%g
+@@ -31564,7 +31562,8 @@ s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@DIRECTFB_CFLAGS@,$DIRECTFB_CFLAGS,;t t
+ s,@DIRECTFB_LIBS@,$DIRECTFB_LIBS,;t t
+-s,@PTH_CONFIG@,$PTH_CONFIG,;t t
++s,@AALIB_CONFIG@,$AALIB_CONFIG,;t t
++s,@PTHREAD_CONFIG@,$PTHREAD_CONFIG,;t t
+ s,@ARCH@,$ARCH,;t t
+ s,@TARGET_LINUX_TRUE@,$TARGET_LINUX_TRUE,;t t
+ s,@TARGET_LINUX_FALSE@,$TARGET_LINUX_FALSE,;t t
diff --git a/devel/SDL/patches/patch-ap b/devel/SDL/patches/patch-ap
deleted file mode 100644
index 1d4ca0ee1c2..00000000000
--- a/devel/SDL/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.6 2003/09/03 19:31:00 drochner Exp $
-
---- src/hermes/Makefile.in.orig	2003-08-30 21:13:22.000000000 +0200
-+++ src/hermes/Makefile.in
-@@ -357,7 +357,7 @@ maintainer-clean-generic clean mostlycle
- 
- 
- .asm.lo:
--	$(LIBTOOL) --mode=compile $(STRIP_FPIC) $(NASM) @NASMFLAGS@ $< -o $*.o
-+	$(LIBTOOL) --tag=CC --mode=compile $(STRIP_FPIC) $(NASM) @NASMFLAGS@ $< -o $*.o
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/devel/SDL/patches/patch-ar b/devel/SDL/patches/patch-ar
index 6beda7aec33..5e4705e857c 100644
--- a/devel/SDL/patches/patch-ar
+++ b/devel/SDL/patches/patch-ar
@@ -1,11 +1,11 @@
-$NetBSD: patch-ar,v 1.2 2001/06/26 03:49:25 jlam Exp $
+$NetBSD: patch-ar,v 1.3 2004/04/17 00:15:21 snj Exp $
 
---- src/Makefile.am.orig	Wed Feb 28 07:06:11 2001
-+++ src/Makefile.am
-@@ -20,7 +20,6 @@
- 
+--- src/Makefile.am.orig	2004-04-10 14:48:03.000000000 -0700
++++ src/Makefile.am	2004-04-10 14:48:08.000000000 -0700
+@@ -21,7 +21,6 @@ lib_LTLIBRARIES = libSDL.la
  libSDL_la_SOURCES = $(GENERAL_SRCS)
  libSDL_la_LDFLAGS = 		\
+ 	-no-undefined		\
 -        -release $(LT_RELEASE)	\
  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  libSDL_la_LIBADD =		\
diff --git a/devel/SDL/patches/patch-as b/devel/SDL/patches/patch-as
index 0542a38a9c3..f18b38efb27 100644
--- a/devel/SDL/patches/patch-as
+++ b/devel/SDL/patches/patch-as
@@ -1,13 +1,12 @@
-$NetBSD: patch-as,v 1.2 2002/08/25 19:22:19 jlam Exp $
+$NetBSD: patch-as,v 1.3 2004/04/17 00:15:21 snj Exp $
 
---- src/Makefile.in.orig	Thu Nov  8 08:28:02 2001
-+++ src/Makefile.in
-@@ -128,7 +128,7 @@
- lib_LTLIBRARIES = libSDL.la
- 
+--- src/Makefile.in.orig	2004-02-22 13:32:05.000000000 -0800
++++ src/Makefile.in	2004-04-10 14:51:01.000000000 -0700
+@@ -300,7 +300,6 @@ lib_LTLIBRARIES = libSDL.la
  libSDL_la_SOURCES = $(GENERAL_SRCS)
--libSDL_la_LDFLAGS =          -release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libSDL_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- 
- libSDL_la_LIBADD =  	main/libarch.la			@SDL_EXTRALIBS@			@SYSTEM_LIBS@
+ libSDL_la_LDFLAGS = \
+ 	-no-undefined		\
+-        -release $(LT_RELEASE)	\
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
+ libSDL_la_LIBADD = \
diff --git a/devel/SDL/patches/patch-bb b/devel/SDL/patches/patch-bb
index 3e7b5305ad5..1bb78e54a24 100644
--- a/devel/SDL/patches/patch-bb
+++ b/devel/SDL/patches/patch-bb
@@ -1,22 +1,21 @@
-$NetBSD: patch-bb,v 1.1 2003/07/26 21:38:23 jmmv Exp $
+$NetBSD: patch-bb,v 1.2 2004/04/17 00:15:21 snj Exp $
 
---- src/audio/esd/Makefile.in.orig	2003-07-25 21:01:00.000000000 +0200
-+++ src/audio/esd/Makefile.in
-@@ -136,7 +136,7 @@ X_CFLAGS = @X_CFLAGS@
- X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--libaudio_esd_la_LDFLAGS = 
+--- src/audio/esd/Makefile.in.orig	2004-02-22 13:32:08.000000000 -0800
++++ src/audio/esd/Makefile.in	2004-04-10 14:54:04.000000000 -0700
+@@ -49,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_de
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(noinst_LTLIBRARIES)
 +libaudio_esd_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(ESD_LIBS)
- libaudio_esd_la_LIBADD = 
- libaudio_esd_la_OBJECTS =  SDL_esdaudio.lo
- CFLAGS = @CFLAGS@
-@@ -213,7 +213,7 @@ distclean-libtool:
- maintainer-clean-libtool:
- 
- libaudio_esd.la: $(libaudio_esd_la_OBJECTS) $(libaudio_esd_la_DEPENDENCIES)
+ libaudio_esd_la_LIBADD =
+ am__objects_1 = SDL_esdaudio.lo
+ am_libaudio_esd_la_OBJECTS = $(am__objects_1)
+@@ -317,7 +318,7 @@ clean-noinstLTLIBRARIES:
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libaudio_esd.la: $(libaudio_esd_la_OBJECTS) $(libaudio_esd_la_DEPENDENCIES) 
 -	$(LINK)  $(libaudio_esd_la_LDFLAGS) $(libaudio_esd_la_OBJECTS) $(libaudio_esd_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(libdir) $(libaudio_esd_la_LDFLAGS) $(libaudio_esd_la_OBJECTS) $(libaudio_esd_la_LIBADD) $(LIBS)
- 
- tags: TAGS
++	$(LINK)  -rpath $(libdir) $(libaudio_esd_la_LDFLAGS) $(libaudio_esd_la_OBJECTS) $(libaudio_esd_la_LIBADD) $(LIBS)
  
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
diff --git a/devel/SDL/patches/patch-bc b/devel/SDL/patches/patch-bc
index b7245603638..adae79e469d 100644
--- a/devel/SDL/patches/patch-bc
+++ b/devel/SDL/patches/patch-bc
@@ -1,22 +1,21 @@
-$NetBSD: patch-bc,v 1.1 2003/07/26 21:38:23 jmmv Exp $
+$NetBSD: patch-bc,v 1.2 2004/04/17 00:15:21 snj Exp $
 
---- src/audio/arts/Makefile.in.orig	2003-07-25 21:01:00.000000000 +0200
-+++ src/audio/arts/Makefile.in
-@@ -136,7 +136,7 @@ X_CFLAGS = @X_CFLAGS@
- X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--libaudio_arts_la_LDFLAGS = 
-+libaudio_arts_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) `$(ARTSCCONFIG) --libs`
- libaudio_arts_la_LIBADD = 
- libaudio_arts_la_OBJECTS =  SDL_artsaudio.lo
- CFLAGS = @CFLAGS@
-@@ -213,7 +213,7 @@ distclean-libtool:
- maintainer-clean-libtool:
- 
- libaudio_arts.la: $(libaudio_arts_la_OBJECTS) $(libaudio_arts_la_DEPENDENCIES)
+--- src/audio/arts/Makefile.in.orig	2004-02-22 13:32:05.000000000 -0800
++++ src/audio/arts/Makefile.in	2004-04-10 14:55:41.000000000 -0700
+@@ -49,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_de
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(noinst_LTLIBRARIES)
++libaudio_arts_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) `$(ARTSCONFIG) --libs`
+ libaudio_arts_la_LIBADD =
+ am__objects_1 = SDL_artsaudio.lo
+ am_libaudio_arts_la_OBJECTS = $(am__objects_1)
+@@ -317,7 +318,7 @@ clean-noinstLTLIBRARIES:
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libaudio_arts.la: $(libaudio_arts_la_OBJECTS) $(libaudio_arts_la_DEPENDENCIES) 
 -	$(LINK)  $(libaudio_arts_la_LDFLAGS) $(libaudio_arts_la_OBJECTS) $(libaudio_arts_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(libdir) $(libaudio_arts_la_LDFLAGS) $(libaudio_arts_la_OBJECTS) $(libaudio_arts_la_LIBADD) $(LIBS)
- 
- tags: TAGS
++	$(LINK) -rpath $(libdir)  $(libaudio_arts_la_LDFLAGS) $(libaudio_arts_la_OBJECTS) $(libaudio_arts_la_LIBADD) $(LIBS)
  
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
diff --git a/devel/SDL/patches/patch-bd b/devel/SDL/patches/patch-bd
index b219e6c94fe..ed6e37fac9e 100644
--- a/devel/SDL/patches/patch-bd
+++ b/devel/SDL/patches/patch-bd
@@ -1,22 +1,21 @@
-$NetBSD: patch-bd,v 1.1 2003/07/26 23:05:34 jmmv Exp $
+$NetBSD: patch-bd,v 1.2 2004/04/17 00:15:21 snj Exp $
 
---- src/audio/nas/Makefile.in.orig	2002-10-06 22:34:56.000000000 +0200
-+++ src/audio/nas/Makefile.in
-@@ -135,7 +135,7 @@ X_CFLAGS = @X_CFLAGS@
- X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--libaudio_nas_la_LDFLAGS = 
+--- src/audio/nas/Makefile.in.orig	2004-02-22 13:32:09.000000000 -0800
++++ src/audio/nas/Makefile.in	2004-04-10 14:57:22.000000000 -0700
+@@ -49,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_de
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(noinst_LTLIBRARIES)
 +libaudio_nas_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(SHARED_SYSTEM_LIBS)
- libaudio_nas_la_LIBADD = 
- libaudio_nas_la_OBJECTS =  SDL_nasaudio.lo
- CFLAGS = @CFLAGS@
-@@ -212,7 +212,7 @@ distclean-libtool:
- maintainer-clean-libtool:
- 
- libaudio_nas.la: $(libaudio_nas_la_OBJECTS) $(libaudio_nas_la_DEPENDENCIES)
+ libaudio_nas_la_LIBADD =
+ am__objects_1 = SDL_nasaudio.lo
+ am_libaudio_nas_la_OBJECTS = $(am__objects_1)
+@@ -317,7 +318,7 @@ clean-noinstLTLIBRARIES:
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libaudio_nas.la: $(libaudio_nas_la_OBJECTS) $(libaudio_nas_la_DEPENDENCIES) 
 -	$(LINK)  $(libaudio_nas_la_LDFLAGS) $(libaudio_nas_la_OBJECTS) $(libaudio_nas_la_LIBADD) $(LIBS)
 +	$(LINK) -rpath $(libdir) $(libaudio_nas_la_LDFLAGS) $(libaudio_nas_la_OBJECTS) $(libaudio_nas_la_LIBADD) $(LIBS)
  
- tags: TAGS
- 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)