91 lines
3.1 KiB
Text
91 lines
3.1 KiB
Text
$NetBSD: patch-aa,v 1.6 2007/02/15 14:27:48 joerg Exp $
|
|
|
|
--- configure.orig 2005-01-31 03:06:14.000000000 +0000
|
|
+++ configure
|
|
@@ -1130,6 +1130,7 @@ echo "$ac_t""$configuration" 1>&6
|
|
machine='' opsys=''
|
|
|
|
case "$canonical" in
|
|
+ arm-*-* ) machine=sparc ;;
|
|
sparc-*-* ) machine=sparc ;;
|
|
alpha*-*-* ) machine=alpha ;;
|
|
vax-*-* ) machine=vax ;;
|
|
@@ -1202,9 +1203,10 @@ case "$canonical" in
|
|
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
|
|
;;
|
|
|
|
@@ -1508,6 +1510,7 @@ EOF
|
|
*-sysv5* ) opsys=sco7 ;;
|
|
*-386bsd* ) opsys=386bsd ;;
|
|
*-freebsd* ) opsys=freebsd ;;
|
|
+ *-dragonfly* ) opsys=dragonfly ;;
|
|
*-nextstep* ) opsys=nextstep ;;
|
|
*-pc-cygwin* ) opsys=cygwin32 ;;
|
|
*-pc-mingw* ) opsys=mingw32 ;
|
|
@@ -3133,7 +3136,7 @@ echo "configure:3131: checking "for runt
|
|
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
|
|
@@ -14091,6 +14094,41 @@ else for feature in ncurses gpm; do
|
|
eval "with_${feature}=no"
|
|
done
|
|
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
|
|
test "$with_x11" = "yes" -o "$with_tty" = "yes" -o "$need_event_unixoid" = "yes" && extra_objs="$extra_objs event-unixoid.o" && if test "$extra_verbose" = "yes"; then
|
|
echo " xemacs will be linked with \"event-unixoid.o\""
|
|
fi
|
|
@@ -16511,6 +16549,7 @@ s%@libs_xauth@%$libs_xauth%g
|
|
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
|