oops - one modification was just in the generated "configure", not in

"configure.in", so it got lost during regen

1 files changed, 20 insertions, 11 deletions

diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj
index da58388d29c..53504a0f6e6 100644
--- a/devel/SDL/patches/patch-aj
+++ b/devel/SDL/patches/patch-aj
@@ -1,8 +1,17 @@
-$NetBSD: patch-aj,v 1.16 2003/09/03 19:30:57 drochner Exp $
+$NetBSD: patch-aj,v 1.17 2003/09/04 09:53:33 drochner Exp $
 
 --- configure.in.orig	2003-08-30 21:13:18.000000000 +0200
 +++ configure.in
-@@ -413,7 +413,7 @@ CheckNAS()
+@@ -258,6 +258,8 @@ CheckOSS()
+         AC_MSG_RESULT($have_oss)
+         if test x$have_oss = xyes; then
+             CFLAGS="$CFLAGS -DOSS_SUPPORT"
++	    LDFLAGS="$LDFLAGS $LIBOSSAUDIO"
++	    SDL_LIBS="$SDL_LIBS $LIBOSSAUDIO"
+             AUDIO_SUBDIRS="$AUDIO_SUBDIRS dsp"
+             AUDIO_DRIVERS="$AUDIO_DRIVERS dsp/libaudio_dsp.la"
+             AUDIO_SUBDIRS="$AUDIO_SUBDIRS dma"
+@@ -413,7 +415,7 @@ CheckNAS()
      if test x$enable_audio = xyes -a x$enable_nas = xyes; then
          AC_MSG_CHECKING(for NAS audio support)
          have_nas=no
@@ -11,7 +20,7 @@ $NetBSD: patch-aj,v 1.16 2003/09/03 19:30:57 drochner Exp $
              have_nas=yes
              CFLAGS="$CFLAGS -DNAS_SUPPORT"
              SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt"
-@@ -496,7 +496,7 @@ CheckNASM()
+@@ -496,7 +498,7 @@ CheckNASM()
                    NASMFLAGS="-f aoutb"
                    ;;
                *)
@@ -20,7 +29,7 @@ $NetBSD: patch-aj,v 1.16 2003/09/03 19:30:57 drochner Exp $
                    ;;
              esac
              AC_SUBST(NASMFLAGS)
-@@ -933,18 +933,18 @@ CheckAAlib()
+@@ -933,18 +935,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
@@ -47,7 +56,7 @@ $NetBSD: patch-aj,v 1.16 2003/09/03 19:30:57 drochner Exp $
  
              VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib"
              VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la"
-@@ -1115,12 +1115,13 @@ CheckPTH()
+@@ -1115,12 +1117,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
@@ -65,7 +74,7 @@ $NetBSD: patch-aj,v 1.16 2003/09/03 19:30:57 drochner Exp $
              SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
              SDL_LIBS="$SDL_LIBS $PTH_LIBS"
              CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -1161,8 +1162,8 @@ CheckPTHREAD()
+@@ -1161,8 +1164,8 @@ CheckPTHREAD()
              pthread_lib="-pthread"
              ;;
          *-*-netbsd*)
@@ -76,7 +85,7 @@ $NetBSD: patch-aj,v 1.16 2003/09/03 19:30:57 drochner Exp $
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -1600,29 +1601,31 @@ CheckUSBHID()
+@@ -1600,29 +1603,31 @@ CheckUSBHID()
          have_libusbhid=no
          have_libusb=no
          AC_CHECK_LIB(usbhid, hid_init, have_libusbhid=yes)
@@ -117,7 +126,7 @@ $NetBSD: patch-aj,v 1.16 2003/09/03 19:30:57 drochner Exp $
          fi
  
          AC_MSG_CHECKING(for usbhid)
-@@ -1868,6 +1871,7 @@ case "$target" in
+@@ -1868,6 +1873,7 @@ case "$target" in
          CheckESD
          CheckNAS
          CheckX11
@@ -125,7 +134,7 @@ $NetBSD: patch-aj,v 1.16 2003/09/03 19:30:57 drochner Exp $
          CheckAAlib
          CheckOpenGL
          CheckPTHREAD
-@@ -1876,9 +1880,9 @@ case "$target" in
+@@ -1876,9 +1882,9 @@ case "$target" in
          COPY_ARCH_SRC(src/main, linux, SDL_main.c)
          # Set up files for the audio library
          if test x$enable_audio = xyes; then
@@ -138,7 +147,7 @@ $NetBSD: patch-aj,v 1.16 2003/09/03 19:30:57 drochner Exp $
          fi
          # Set up files for the cdrom library
          if test x$enable_cdrom = xyes; then
-@@ -1887,9 +1891,6 @@ case "$target" in
+@@ -1887,9 +1893,6 @@ case "$target" in
          fi
          # Set up files for the thread library
          if test x$enable_threads = xyes; then
@@ -148,7 +157,7 @@ $NetBSD: patch-aj,v 1.16 2003/09/03 19:30:57 drochner Exp $
              CopyUnixThreadSource
          fi
          # Set up files for the timer library
-@@ -2543,7 +2544,7 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$
+@@ -2543,7 +2546,7 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$
  
  # Set runtime shared library paths as needed