$NetBSD: patch-ab,v 1.2 2002/10/06 11:40:07 magick Exp $

--- configure.orig	Fri Aug 16 06:11:45 2002
+++ configure
@@ -1157,6 +1157,7 @@
 machine='' opsys=''
 
 case "$canonical" in
+  arm-*-*         ) machine=arm ;;
   sparc-*-*        ) machine=sparc ;;
   alpha*-*-*       ) machine=alpha ;;
   vax-*-*          ) machine=vax ;;
@@ -1229,9 +1230,10 @@
     case "$canonical" in
       i[3-9]86-*-netbsd*) machine=intel386 ;;
       hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* )
-                                            machine=hp9000s300 ;;
+	machine=m68k ;;
       pc532-*-netbsd* | ns32k-*-netbsd* )  machine=ns32000 ;;
       pmax-*-netbsd*  | mips-*-netbsd*  )  machine=pmax ;;
+      alpha-*-netbsd* ) machine=alpha ;;
     esac
   ;;
 
@@ -3145,7 +3147,7 @@
     decosf* | linux* | irix*) dash_r="-rpath " ;;
     *)
       dash_r=""
-      for try_dash_r in "-R" "-R " "-rpath "; do
+      for try_dash_r in "-Wl,R" "-R " "-R " "-rpath "; do
         xe_check_libs="${try_dash_r}/no/such/file-or-directory"
         
 if test "$GCC" = "yes"; then
@@ -13283,6 +13285,43 @@
   fi
 fi
 
+ echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
+ echo "configure:10915: checking for main in -lossaudio" >&5
+ ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'`
+ 
+ xe_check_libs=" -lossaudio "
+ cat > conftest.$ac_ext <<EOF
+ #line 10920 "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.  */
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:10931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+ rm -f conftest*
+ xe_check_libs=""
+ 
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+   echo "$ac_t""yes" 1>&6
+   LIBOSSAUDIO=-lossaudio
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+
+EOF
 test "$need_miscplay" = "yes" && extra_objs="$extra_objs miscplay.o" &&  if test "$extra_verbose" = "yes"; then
    echo "    xemacs will be linked with \"miscplay.o\""
  fi
@@ -15926,6 +15965,7 @@
 s%@dnd_objs@%$dnd_objs%g
 s%@lwlib_objs@%$lwlib_objs%g
 s%@ALLOCA@%$ALLOCA%g
+s%@LIBOSSAUDIO@%$LIBOSSAUDIO%g
 s%@have_esd_config@%$have_esd_config%g
 s%@dll_ld@%$dll_ld%g
 s%@dll_cflags@%$dll_cflags%g