Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
x264
Commits
1851df55
Commit
1851df55
authored
May 20, 2008
by
Loren Merritt
Browse files
remove nasm version check. a feature check is all that's needed.
silence stderr in yasm version check.
parent
d4e6d802
Changes
1
Hide whitespace changes
Inline
Side-by-side
configure
View file @
1851df55
...
...
@@ -300,22 +300,9 @@ if [ $shared = yes -a \( $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" \)
pic
=
"yes"
fi
if
[
$SYS
=
MACOSX
-a
$ARCH
=
X86
]
then
# we want Apple's nasm from Xcode 2.4.1 or later
NASM_BUILD_REQUIRED
=
11
NASM_BUILD
=
`
nasm
-v
|grep
"Apple Computer"
|sed
's/.*build \([0-9]*\).*/\1/'
`
if
[
$NASM_BUILD
-lt
$NASM_BUILD_REQUIRED
]
then
echo
"Your version of 'nasm' is too old."
echo
"Please install Xcode 2.4.1 or later."
AS
=
""
fi
fi
if
[
$ARCH
=
X86
-o
$ARCH
=
X86_64
]
;
then
if
[
$ARCH
=
X86
-a
$pic
=
yes
-a
x
$AS
=
xyasm
-a
\
"
`
yasm
--version
|
head
-n
1
`
"
"<"
"yasm 0.6.2"
]
;
then
"
`
yasm
--version
2>
$DEVNULL
|
head
-n
1
`
"
"<"
"yasm 0.6.2"
]
;
then
echo
"yasm prior to 0.6.2 miscompiles PIC. trying nasm instead..."
AS
=
nasm
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment