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
|
diff -Naur xvidcoreOrg/build/generic/configure xvidcore/build/generic/configure
--- xvidcoreOrg/build/generic/configure 2006-11-01 10:39:36.000000000 +0000
+++ xvidcore/build/generic/configure 2008-01-26 18:07:50.453125000 +0000
@@ -3844,10 +3844,9 @@
[cC][yY][gG][wW][iI][nN]*|mingw32*|mks*)
echo "$as_me:$LINENO: result: ok" >&5
echo "${ECHO_T}ok" >&6
- STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
- SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"
- SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
- SPECIFIC_CFLAGS="-mno-cygwin"
+ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+ SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)"
+ SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
;;
darwin*|raphsody*)
STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
@@ -4016,7 +4015,7 @@
if test "$ac_nasm" = "yes" ; then
echo "$as_me:$LINENO: checking for nasm patch version" >&5
echo $ECHO_N "checking for nasm patch version... $ECHO_C" >&6
- nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1`
+ nasm_patch=`($nasm_prog -r || $nasm_prog -v) | cut -d '.' -f 3 | cut -d ' ' -f 1`
if test -z $nasm_patch ; then
nasm_patch=-1
fi
diff -Naur xvidcoreOrg/build/generic/configure.in xvidcore/build/generic/configure.in
--- xvidcoreOrg/build/generic/configure.in 2006-11-01 10:38:16.000000000 +0000
+++ xvidcore/build/generic/configure.in 2008-01-26 18:07:53.203125000 +0000
@@ -281,10 +281,9 @@
;;
[[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*)
AC_MSG_RESULT([ok])
- STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
- SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"
- SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
- SPECIFIC_CFLAGS="-mno-cygwin"
+ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+ SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)"
+ SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
;;
darwin*|raphsody*)
STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
@@ -363,7 +362,7 @@
dnl Checking nasm patch version
dnl
AC_MSG_CHECKING([for nasm patch version])
- nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1`
+ nasm_patch=`($nasm_prog -r || $nasm_prog -v) | cut -d '.' -f 3 | cut -d ' ' -f 1`
if test -z $nasm_patch ; then
nasm_patch=-1
fi
|
