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.

35 lines
823 B

  1. --- a/configure
  2. +++ b/configure
  3. @@ -388,18 +388,22 @@ then
  4. fi
  5. echo_n "Configuring for system... "
  6. -if uname -s
  7. -then
  8. - LUAROCKS_UNAME_S=`uname -s`
  9. -else
  10. - die "Could not determine operating system. 'uname -s' failed."
  11. +if [ -z "$LUAROCKS_UNAME_S" ]; then
  12. + if uname -s
  13. + then
  14. + LUAROCKS_UNAME_S=`uname -s`
  15. + else
  16. + die "Could not determine operating system. 'uname -s' failed."
  17. + fi
  18. fi
  19. echo_n "Configuring for architecture... "
  20. -if uname -m
  21. -then
  22. - LUAROCKS_UNAME_M=`uname -m`
  23. -else
  24. - die "Could not determine processor architecture. 'uname -m' failed."
  25. +if [ -z "$LUAROCKS_UNAME_M" ]; then
  26. + if uname -m
  27. + then
  28. + LUAROCKS_UNAME_M=`uname -m`
  29. + else
  30. + die "Could not determine processor architecture. 'uname -m' failed."
  31. + fi
  32. fi
  33. for v in 5.1 5.2 5.3; do