mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

56 lines
1.3 KiB

  1. --- ./configure.orig 2008-07-06 05:55:25.000000000 +0000
  2. +++ ./configure 2008-07-06 05:55:47.000000000 +0000
  3. @@ -28881,7 +28881,7 @@
  4. if test x$USENASM = xtrue; then
  5. echo "$as_me:$LINENO: checking nasm version..." >&5
  6. echo $ECHO_N "checking nasm version...... $ECHO_C" >&6
  7. - BILLSNASM_arg=`nasm -r | tr '.' ' '`
  8. + BILLSNASM_arg=`nasm -v | tr '.' ' '`
  9. BILLSNASM_ret=`util/testnasm.sh $BILLSNASM_arg`
  10. if test x$BILLSNASM_ret = x"yes"; then
  11. USENASM=true
  12. --- ./util/testnasm.sh.orig 2008-07-06 05:51:54.000000000 +0000
  13. +++ ./util/testnasm.sh 2008-07-06 05:54:20.000000000 +0000
  14. @@ -5,36 +5,36 @@
  15. # This shell looks for version, then sees if we're 0.98.19 or greater
  16. #
  17. VER=`echo $1 | tr '[a-z]' '[A-Z]'`
  18. -until test $VER = "VERSION";
  19. +until test "$VER" = "VERSION" -o $# -le 0;
  20. do
  21. shift
  22. VER=`echo $1 | tr '[a-z]' '[A-Z]'`
  23. done
  24. # check for version tag
  25. -if test $VER != "VERSION"; then
  26. +if test "$VER" != "VERSION"; then
  27. echo "no"
  28. exit 0
  29. fi
  30. shift
  31. -if test $1 -gt 0; then
  32. +if test "$1" -gt 0; then
  33. echo "yes"
  34. exit 0
  35. fi
  36. shift
  37. -if test $1 -gt 98; then
  38. +if test "$1" -gt 98; then
  39. echo "yes"
  40. exit 0
  41. fi
  42. shift
  43. -if test -z $1; then
  44. +if test -z "$1"; then
  45. echo "no"
  46. exit 0
  47. fi
  48. -if test $1 -ge 19; then
  49. +if test "$1" -ge 19; then
  50. echo "yes"
  51. exit 0
  52. fi