diff options
author | kristerw <kristerw> | 2002-07-15 23:04:20 +0000 |
---|---|---|
committer | kristerw <kristerw> | 2002-07-15 23:04:20 +0000 |
commit | 15e624b2adee5c1bcfe1b110c130807b4aae8828 (patch) | |
tree | 4904eaec9332bd384839a660846ff68cec408e1e /devel/SDL | |
parent | fb6642f82b0460a6bea77e6663ed89f70a2c2c2d (diff) | |
download | pkgsrc-15e624b2adee5c1bcfe1b110c130807b4aae8828.tar.gz |
SDL configure checks if libusb or libusbhid is present on the system, but
it tried to use both if both was found (which caused conflicts.)
Solves PR 17602.
Diffstat (limited to 'devel/SDL')
-rw-r--r-- | devel/SDL/distinfo | 6 | ||||
-rw-r--r-- | devel/SDL/patches/patch-aj | 58 | ||||
-rw-r--r-- | devel/SDL/patches/patch-am | 198 |
3 files changed, 133 insertions, 129 deletions
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo index ab6a479bcb1..c095695ad4a 100644 --- a/devel/SDL/distinfo +++ b/devel/SDL/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2002/07/14 07:28:39 kristerw Exp $ +$NetBSD: distinfo,v 1.13 2002/07/15 23:04:20 kristerw Exp $ SHA1 (SDL-1.2.3.tar.gz) = f74f5bf47a472083da8700d2354cb90062e2a845 Size (SDL-1.2.3.tar.gz) = 1568671 bytes @@ -10,10 +10,10 @@ SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0 SHA1 (patch-ag) = 989c3464686a3158c538034ad7ea012a4e4b4b9e SHA1 (patch-ah) = f509c0c146002cf2525bd9b7c7532fbca7aa4fb6 SHA1 (patch-ai) = 0edabed555e3fc4b0a92aff9240359fc6637f022 -SHA1 (patch-aj) = b12b50ee78f5d905d28ed2e948b47e644a2b7890 +SHA1 (patch-aj) = e986d0f4935c2402d46672e8fec666d2a21d7087 SHA1 (patch-ak) = 657947be674831c98850f044315e4681fe58ea29 SHA1 (patch-al) = 0fe579ae0358d59f87a78fe4b5b006ef991d44f0 -SHA1 (patch-am) = 55b6fb31a3e0a29db281cd41ca2b671f0a22ed5c +SHA1 (patch-am) = ad3cf66da2b924ccf524bb6f4822c0facc708b69 SHA1 (patch-an) = b875bc9e173d69cb5fcc1b4ea3e7039b7633d187 SHA1 (patch-ap) = ca979b24a57a8f115f5e1bdf6b1e5672a60d20a9 SHA1 (patch-aq) = 45f63636a9caa338274db68596c8cf8c1d3cd0f0 diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj index cc84cdfe75c..945289ef446 100644 --- a/devel/SDL/patches/patch-aj +++ b/devel/SDL/patches/patch-aj @@ -1,6 +1,6 @@ -$NetBSD: patch-aj,v 1.11 2002/07/14 07:28:40 kristerw Exp $ +$NetBSD: patch-aj,v 1.12 2002/07/15 23:04:20 kristerw Exp $ --- configure.in.orig Thu Nov 8 08:28:00 2001 -+++ configure.in Sun Jul 14 06:02:41 2002 ++++ configure.in Mon Jul 15 23:28:12 2002 @@ -374,10 +374,7 @@ , enable_nas=yes) if test x$enable_audio = xyes -a x$enable_nas = xyes; then @@ -32,7 +32,7 @@ $NetBSD: patch-aj,v 1.11 2002/07/14 07:28:40 kristerw Exp $ ;; *-*-openbsd*) pthread_cflags="-D_REENTRANT" -@@ -1281,6 +1278,124 @@ +@@ -1281,6 +1278,126 @@ VIDEO_DRIVERS="$VIDEO_DRIVERS quartz/libvideo_quartz.la" } @@ -43,29 +43,31 @@ $NetBSD: patch-aj,v 1.11 2002/07/14 07:28:40 kristerw Exp $ + have_libusbhid=no + have_libusb=no + AC_CHECK_LIB(usbhid, hid_init, have_libusbhid=yes) -+ AC_CHECK_LIB(usb, hid_init, have_libusb=yes) + 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_CHECK_HEADER(usb.h, have_usb_h=yes) -+ AC_CHECK_HEADER(usbhid.h, have_usbhid_h=yes) -+ AC_CHECK_HEADER(libusb.h, have_libusb_h=yes) -+ AC_CHECK_HEADER(libusbhid.h, have_libusbhid_h=yes) -+ if test x$have_usb_h = xyes; then -+ CFLAGS="$CFLAGS -DHAVE_USB_H" -+ fi -+ if test x$have_usbhid_h = xyes; then -+ CFLAGS="$CFLAGS -DHAVE_USBHID_H" -+ fi -+ if test x$have_libusb_h = xyes; then -+ CFLAGS="$CFLAGS -DHAVE_LIBUSB_H" -+ fi -+ if test x$have_libusbhid_h = xyes; then -+ CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H" ++ AC_CHECK_HEADER(usbhid.h, have_usbhid_h=yes) ++ AC_CHECK_HEADER(libusbhid.h, have_libusbhid_h=yes) ++ if test x$have_usbhid_h = xyes; then ++ CFLAGS="$CFLAGS -DHAVE_USBHID_H" ++ fi ++ if test x$have_libusbhid_h = xyes; then ++ CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H" ++ fi ++ else ++ AC_CHECK_LIB(usb, hid_init, have_libusb=yes) ++ if test x$have_libusb = xyes; then ++ SYSTEM_LIBS="$SYSTEM_LIBS -lusb" ++ ++ AC_CHECK_HEADER(usb.h, have_usb_h=yes) ++ AC_CHECK_HEADER(libusb.h, have_libusb_h=yes) ++ if test x$have_usb_h = xyes; then ++ CFLAGS="$CFLAGS -DHAVE_USB_H" ++ fi ++ if test x$have_libusb_h = xyes; then ++ CFLAGS="$CFLAGS -DHAVE_LIBUSB_H" ++ fi ++ fi + fi + + AC_MSG_CHECKING(for usbhid) @@ -157,7 +159,7 @@ $NetBSD: patch-aj,v 1.11 2002/07/14 07:28:40 kristerw Exp $ case "$target" in *-*-linux*) ARCH=linux -@@ -1465,14 +1580,17 @@ +@@ -1465,14 +1582,17 @@ CheckDummyVideo CheckDiskAudio CheckNASM @@ -175,7 +177,7 @@ $NetBSD: patch-aj,v 1.11 2002/07/14 07:28:40 kristerw Exp $ # Set up files for the main() stub COPY_ARCH_SRC(src/main, linux, SDL_main.c) # Set up files for the audio library -@@ -1481,12 +1599,6 @@ +@@ -1481,12 +1601,6 @@ AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" fi @@ -188,7 +190,7 @@ $NetBSD: patch-aj,v 1.11 2002/07/14 07:28:40 kristerw Exp $ # Set up files for the cdrom library if test x$enable_cdrom = xyes; then CDROM_SUBDIRS="$CDROM_SUBDIRS openbsd" -@@ -1770,7 +1882,11 @@ +@@ -1770,7 +1884,11 @@ COPY_ARCH_SRC(src/thread, linux, SDL_systhread_c.h) COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex.c) COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex_c.h) @@ -200,7 +202,7 @@ $NetBSD: patch-aj,v 1.11 2002/07/14 07:28:40 kristerw Exp $ COPY_ARCH_SRC(src/thread, generic, SDL_syssem_c.h) COPY_ARCH_SRC(src/thread, linux, SDL_syscond.c) COPY_ARCH_SRC(src/thread, generic, SDL_syscond_c.h) -@@ -2159,6 +2275,10 @@ +@@ -2159,6 +2277,10 @@ SDL_RLD_FLAGS="-R\${exec_prefix}/lib" fi @@ -211,7 +213,7 @@ $NetBSD: patch-aj,v 1.11 2002/07/14 07:28:40 kristerw Exp $ if test $ARCH = openbsd; then SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib $SYSTEM_LIBS" fi -@@ -2277,6 +2397,7 @@ +@@ -2277,6 +2399,7 @@ src/joystick/Makefile src/joystick/amigaos/Makefile src/joystick/beos/Makefile diff --git a/devel/SDL/patches/patch-am b/devel/SDL/patches/patch-am index 8027f582aaa..67919b43355 100644 --- a/devel/SDL/patches/patch-am +++ b/devel/SDL/patches/patch-am @@ -1,6 +1,6 @@ -$NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ ---- configure.orig Sun Jul 14 05:59:37 2002 -+++ configure Sun Jul 14 06:02:55 2002 +$NetBSD: patch-am,v 1.5 2002/07/15 23:04:20 kristerw Exp $ +--- configure.orig Thu Nov 8 08:28:08 2001 ++++ configure Mon Jul 15 23:31:06 2002 @@ -3588,10 +3588,7 @@ if test x$enable_audio = xyes -a x$enable_nas = xyes; then echo $ac_n "checking for NAS audio support""... $ac_c" 1>&6 @@ -32,7 +32,7 @@ $NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ ;; *-*-openbsd*) pthread_cflags="-D_REENTRANT" -@@ -6034,6 +6031,377 @@ +@@ -6034,6 +6031,379 @@ VIDEO_DRIVERS="$VIDEO_DRIVERS quartz/libvideo_quartz.la" } @@ -81,66 +81,55 @@ $NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ + echo "$ac_t""no" 1>&6 +fi + -+ echo $ac_n "checking for hid_init in -lusb""... $ac_c" 1>&6 -+echo "configure:6081: 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:6085: 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" -+LIBS="-lusb $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 6089 "configure" ++ cat > conftest.$ac_ext <<EOF ++#line 6090 "configure" +#include "confdefs.h" -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* 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; } ++#include <usbhid.h> +EOF -+if { (eval echo configure:6100: \"$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:6095: \"$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" +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" +fi +rm -f conftest* -+LIBS="$ac_save_LIBS" -+ +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 ++ 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:6129: 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:6118: 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 + cat > conftest.$ac_ext <<EOF -+#line 6134 "configure" ++#line 6123 "configure" +#include "confdefs.h" -+#include <usb.h> ++#include <libusbhid.h> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:6139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6128: \"$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* @@ -156,57 +145,74 @@ $NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 -+ have_usb_h=yes ++ 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:6162: checking for usbhid.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ if test x$have_usbhid_h = xyes; then ++ CFLAGS="$CFLAGS -DHAVE_USBHID_H" ++ fi ++ if test x$have_libusbhid_h = xyes; then ++ CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H" ++ fi ++ else ++ echo $ac_n "checking for hid_init in -lusb""... $ac_c" 1>&6 ++echo "configure:6157: 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 6167 "configure" ++ ac_save_LIBS="$LIBS" ++LIBS="-lusb $LIBS" ++cat > conftest.$ac_ext <<EOF ++#line 6165 "configure" +#include "confdefs.h" -+#include <usbhid.h> ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* 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:6172: \"$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:6176: \"$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" ++ +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 ++ 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:6195: checking for libusb.h" >&5 ++ 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:6201: 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 + cat > conftest.$ac_ext <<EOF -+#line 6200 "configure" ++#line 6206 "configure" +#include "confdefs.h" -+#include <libusb.h> ++#include <usb.h> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:6205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6211: \"$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* @@ -222,24 +228,24 @@ $NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 -+ have_libusb_h=yes ++ 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:6228: 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:6234: 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 + cat > conftest.$ac_ext <<EOF -+#line 6233 "configure" ++#line 6239 "configure" +#include "confdefs.h" -+#include <libusbhid.h> ++#include <libusb.h> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:6238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6244: \"$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* @@ -255,29 +261,25 @@ $NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 -+ have_libusbhid_h=yes ++ have_libusb_h=yes +else + echo "$ac_t""no" 1>&6 +fi + -+ if test x$have_usb_h = xyes; then -+ CFLAGS="$CFLAGS -DHAVE_USB_H" -+ fi -+ if test x$have_usbhid_h = xyes; then -+ CFLAGS="$CFLAGS -DHAVE_USBHID_H" -+ fi -+ if test x$have_libusb_h = xyes; then -+ CFLAGS="$CFLAGS -DHAVE_LIBUSB_H" -+ fi -+ if test x$have_libusbhid_h = xyes; then -+ CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H" ++ if test x$have_usb_h = xyes; then ++ CFLAGS="$CFLAGS -DHAVE_USB_H" ++ fi ++ if test x$have_libusb_h = xyes; then ++ CFLAGS="$CFLAGS -DHAVE_LIBUSB_H" ++ fi ++ fi + fi + + echo $ac_n "checking for usbhid""... $ac_c" 1>&6 -+echo "configure:6273: checking for usbhid" >&5 ++echo "configure:6275: checking for usbhid" >&5 + have_usbhid=no + cat > conftest.$ac_ext <<EOF -+#line 6276 "configure" ++#line 6278 "configure" +#include "confdefs.h" + + #include <sys/types.h> @@ -302,7 +304,7 @@ $NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ + +; return 0; } +EOF -+if { (eval echo configure:6301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + have_usbhid=yes @@ -316,10 +318,10 @@ $NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ + + if test x$have_usbhid = xyes; then + echo $ac_n "checking for ucr_data member of usb_ctl_report""... $ac_c" 1>&6 -+echo "configure:6315: checking for ucr_data member of usb_ctl_report" >&5 ++echo "configure:6317: checking for ucr_data member of usb_ctl_report" >&5 + have_usbhid_ucr_data=no + cat > conftest.$ac_ext <<EOF -+#line 6318 "configure" ++#line 6320 "configure" +#include "confdefs.h" + + #include <sys/types.h> @@ -343,7 +345,7 @@ $NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ + +; return 0; } +EOF -+if { (eval echo configure:6342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + have_usbhid_ucr_data=yes @@ -359,10 +361,10 @@ $NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ + echo "$ac_t""$have_usbhid_ucr_data" 1>&6 + + echo $ac_n "checking for new usbhid API""... $ac_c" 1>&6 -+echo "configure:6358: checking for new usbhid API" >&5 ++echo "configure:6360: checking for new usbhid API" >&5 + have_usbhid_new=no + cat > conftest.$ac_ext <<EOF -+#line 6361 "configure" ++#line 6363 "configure" +#include "confdefs.h" + + #include <sys/types.h> @@ -386,7 +388,7 @@ $NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ + +; return 0; } +EOF -+if { (eval echo configure:6385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + have_usbhid_new=yes @@ -410,7 +412,7 @@ $NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ case "$target" in *-*-linux*) ARCH=linux -@@ -6588,14 +6956,17 @@ +@@ -6588,14 +6958,17 @@ CheckDummyVideo CheckDiskAudio CheckNASM @@ -428,7 +430,7 @@ $NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ # Set up files for the main() stub echo "Copying src/main/linux/SDL_main.c -> src/main/SDL_main.c" -@@ -6614,12 +6985,6 @@ +@@ -6614,12 +6987,6 @@ AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" fi @@ -441,7 +443,7 @@ $NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ # Set up files for the cdrom library if test x$enable_cdrom = xyes; then CDROM_SUBDIRS="$CDROM_SUBDIRS openbsd" -@@ -7553,6 +7918,19 @@ +@@ -7553,6 +7920,19 @@ __EOF__ cat >>$new <$old @@ -461,7 +463,7 @@ $NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ echo "Copying src/thread/linux/SDL_syssem.c -> src/thread/SDL_syssem.c" old="$srcdir/src/thread/linux/SDL_syssem.c" -@@ -7564,6 +7942,7 @@ +@@ -7564,6 +7944,7 @@ __EOF__ cat >>$new <$old @@ -469,7 +471,7 @@ $NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ echo "Copying src/thread/generic/SDL_syssem_c.h -> src/thread/SDL_syssem_c.h" old="$srcdir/src/thread/generic/SDL_syssem_c.h" -@@ -8844,6 +9223,10 @@ +@@ -8844,6 +9225,10 @@ SDL_RLD_FLAGS="-R\${exec_prefix}/lib" fi @@ -480,7 +482,7 @@ $NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ if test $ARCH = openbsd; then SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib $SYSTEM_LIBS" fi -@@ -9068,6 +9451,7 @@ +@@ -9068,6 +9453,7 @@ src/joystick/Makefile src/joystick/amigaos/Makefile src/joystick/beos/Makefile @@ -488,7 +490,7 @@ $NetBSD: patch-am,v 1.4 2002/07/14 07:28:40 kristerw Exp $ src/joystick/darwin/Makefile src/joystick/dummy/Makefile src/joystick/linux/Makefile -@@ -9328,6 +9712,7 @@ +@@ -9328,6 +9714,7 @@ src/joystick/Makefile src/joystick/amigaos/Makefile src/joystick/beos/Makefile |