96 lines
2.7 KiB
Plaintext
96 lines
2.7 KiB
Plaintext
$OpenBSD: patch-configure,v 1.36 2005/11/23 00:05:39 biorn Exp $
|
|
--- configure.orig Wed Apr 13 13:46:35 2005
|
|
+++ configure Wed Nov 23 00:41:37 2005
|
|
@@ -475,6 +475,9 @@ if test -z "$_target" ; then
|
|
if [ "`$_cc -dumpmachine | grep x86_64 | cut -d- -f1`" = "x86_64" -a \
|
|
-z "`echo $CFLAGS | grep -- -m32`" ]; then
|
|
host_arch=x86_64
|
|
+ elif [ "`$_cc -dumpmachine | grep amd64 | cut -d- -f1`" = "amd64" -a \
|
|
+ -z "`echo $CFLAGS | grep -- -m32`" ]; then
|
|
+ host_arch=x86_64
|
|
else
|
|
host_arch=i386
|
|
fi
|
|
@@ -484,7 +487,7 @@ if test -z "$_target" ; then
|
|
sparc) host_arch=sparc ;;
|
|
sparc64) host_arch=sparc64 ;;
|
|
parisc*|hppa*|9000*) host_arch=hppa ;;
|
|
- arm*) host_arch=arm ;;
|
|
+ zaurus|cats) host_arch=arm ;;
|
|
s390) host_arch=s390 ;;
|
|
s390x) host_arch=s390x ;;
|
|
mips) host_arch=mips ;;
|
|
@@ -710,10 +713,15 @@ fi
|
|
|
|
x86_exts_check()
|
|
{
|
|
+ case $host_arch in
|
|
+ x86_64) pparam="3dnow 3dnowext mmx mmxext xmm sse2"
|
|
+ ;;
|
|
+ *)
|
|
pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | _head 1`
|
|
if test -z "$pparam" ; then
|
|
pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | _head 1`
|
|
fi
|
|
+ esac
|
|
|
|
_mmx=no
|
|
_3dnow=no
|
|
@@ -2195,7 +2203,7 @@ fi
|
|
|
|
|
|
echocheck "iconv"
|
|
-if test "$_iconv" = auto ; then
|
|
+if test "$_iconv" != no ; then
|
|
_iconv_tmp='#include <iconv.h>'
|
|
|
|
cat > $TMPC << EOF
|
|
@@ -3789,6 +3797,8 @@ if test "$_aa" = yes ; then
|
|
_def_aa='#define HAVE_AA 1'
|
|
if cygwin ; then
|
|
_ld_aa=`aalib-config --libs | cut -d " " -f 2,5,6`
|
|
+ else
|
|
+ _ld_aa="-laa"
|
|
fi
|
|
_vosrc="$_vosrc vo_aa.c"
|
|
_vomodules="aa $_vomodules"
|
|
@@ -4730,7 +4740,7 @@ echores "$_sgiaudio"
|
|
|
|
|
|
echocheck "VCD support"
|
|
-if linux || bsdos || freebsd || netbsd || sunos || darwin ; then
|
|
+if linux || bsdos || freebsd || netbsd || sunos || darwin || openbsd ; then
|
|
_inputmodules="vcd $_inputmodules"
|
|
_def_vcd='#define HAVE_VCD 1'
|
|
echores "ok"
|
|
@@ -5323,7 +5333,10 @@ _inc_faad="-I`pwd`/libfaad2"
|
|
if test "$_faad_internal" = auto ; then
|
|
# the faad check needs a config.h file
|
|
if not test -f "config.h" ; then
|
|
- > config.h
|
|
+ cat > config.h << EOF
|
|
+/* C99 lrintf function available */
|
|
+$_def_lrintf
|
|
+EOF
|
|
fi
|
|
# internal faad: check if our dear gcc is able to compile it...
|
|
cp "`pwd`/libfaad2/cfft.c" $TMPC
|
|
@@ -6775,7 +6788,7 @@ CACA_LIB = $_ld_caca
|
|
# audio output
|
|
ALSA_LIB = $_ld_alsa
|
|
NAS_LIB = $_ld_nas
|
|
-ARTS_LIB = $_ld_arts
|
|
+ARTS_LIB = $_ld_arts -lstdc++
|
|
ARTS_INC = $_inc_arts
|
|
ESD_LIB = $_ld_esd
|
|
ESD_INC = $_inc_esd
|
|
@@ -7041,7 +7054,7 @@ $_def_malloc
|
|
$_def_memalign
|
|
#ifndef HAVE_MEMALIGN
|
|
# define memalign(a,b) malloc(b)
|
|
-#define MEMALIGN_HACK 1
|
|
+/* #define MEMALIGN_HACK 1 */
|
|
#endif
|
|
|
|
/* Define this if your system has the "alloca.h" header file */
|