]> granicus.if.org Git - libx264/commitdiff
remove nasm version check. a feature check is all that's needed.
authorLoren Merritt <pengvado@akuvian.org>
Tue, 20 May 2008 09:58:08 +0000 (03:58 -0600)
committerLoren Merritt <pengvado@akuvian.org>
Tue, 20 May 2008 10:02:10 +0000 (04:02 -0600)
silence stderr in yasm version check.

configure

index 94554dea4a6e5f417cdfc6c37c81ef5eb5059706..2cb9bad1382a7a678bed731f9219f45fb5e61fd0 100755 (executable)
--- a/configure
+++ b/configure
@@ -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