OSX 10.6 x86_64 fixes for configure and libusb; Audio is next

[debian/gnuradio] / config / gr_set_md_cpu.m4

diff --git a/config/gr_set_md_cpu.m4 b/config/gr_set_md_cpu.m4
index d8714c4a71861a87466ccee3c01e478295aaaf34..bb2862deeaad15b02b1fd0fb5bfc3e813e4a43c2 100644 (file)
--- a/config/gr_set_md_cpu.m4
+++ b/config/gr_set_md_cpu.m4
@@ -50,8 +50,19 @@ AC_DEFUN([GR_SET_MD_CPU],[
   AC_ARG_WITH(md-cpu,
        AC_HELP_STRING([--with-md-cpu=ARCH],[set machine dependent speedups (auto)]),
                [cf_with_md_cpu="$withval"],
-               [cf_with_md_cpu="$host_cpu"])
-
+               [
+    dnl temporary fix for Darwin 10.6; $host_cpu is always "i386" no matter
+    dnl if the kernel is in 32-bit or 64-bit mode.
+    case "$host_os" in
+      darwin*)
+        cf_with_md_cpu=`uname -m`
+        ;;
+      *)
+        cf_with_md_cpu="$host_cpu"
+        ;;
+    esac
+  ])
+  AC_MSG_RESULT($cf_with_md_cpu)
   case "$cf_with_md_cpu" in
    x86 | i[[3-7]]86)   MD_CPU=x86      MD_SUBCPU=x86 ;;
    x86_64)             MD_CPU=x86      MD_SUBCPU=x86_64 ;;