1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
$NetBSD: patch-aa,v 1.3 2004/04/07 12:57:58 salo Exp $
--- configure.orig 2003-12-08 22:33:31.000000000 +0100
+++ configure 2004-04-06 22:46:56.000000000 +0200
@@ -367,8 +367,8 @@
_inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
;;
--with-extralibdir=*)
- _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
-# _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
+# _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
+ _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
;;
--enable-runtime-cpudetection)
_runtime_cpudetection=yes
@@ -431,7 +431,7 @@
case "`( uname -m ) 2>&1`" in
i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
ia64) host_arch=ia64 ;;
- x86_64) host_arch=x86_64 ;;
+ x86_64|amd64) host_arch=x86_64 ;;
ppc) host_arch=ppc ;;
alpha) host_arch=alpha ;;
sparc*) host_arch=sparc ;;
@@ -499,7 +499,7 @@
for _cc in "$_cc" gcc gcc-3.3 gcc-3.2 gcc-3.1 gcc3 gcc-3.0 cc ; do
echocheck "$_cc version"
cc_name=`( $_cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1`
- cc_version=`( $_cc -dumpversion ) 2>&1`
+ cc_version=`( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1`
if test "$?" -gt 0; then
cc_version="not found"
fi
@@ -610,7 +610,7 @@
pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1`
pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
- pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
+ pfamily=`$_cpuinfo | grep -i 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
@@ -819,7 +819,7 @@
_optimizing=''
;;
- x86_64)
+ x86_64|amd64)
_def_arch='#define ARCH_X86_64 1'
_target_arch='TARGET_ARCH_X86_64 = yes'
iproc='x86_64'
@@ -4491,11 +4491,11 @@
int main(void) { return 0; }
EOF
- cc_check -lmatroska -lebml -lstdc++ && _matroska=yes
+ cc_check -lmatroska -lebml -lm -lstdc++ && _matroska=yes
if test "$_matroska" = no ; then
_saved_inc_extra=$_inc_extra
_inc_extra="$_inc_extra -I/usr/local/include"
- cc_check -lmatroska -lebml -lstdc++ && _matroska=yes
+ cc_check -lmatroska -lebml -lm -lstdc++ && _matroska=yes
if test "$_matroska" = no ; then
_inc_extra=$_saved_inc_extra
fi
|
