--- a/build-scripts/strip_fPIC.sh	Mon Jun 26 01:33:53 2006 +0000
+++ b/build-scripts/strip_fPIC.sh	Mon Jun 26 05:27:15 2006 +0000
@@ -8,6 +8,9 @@
         -?PIC)
             # Ignore -fPIC and -DPIC options
             ;;
+        -fno-common)
+            # Ignore -fPIC and -DPIC options
+            ;;
         *)
             command="$command $1"
             ;;

--- a/configure.in	Mon Jun 26 01:33:53 2006 +0000
+++ b/configure.in	Mon Jun 26 05:27:15 2006 +0000
@@ -611,6 +611,9 @@
                   openbsd)
                       NASMFLAGS="-f aoutb"
                       ;;
+                  macosx)
+                      NASMFLAGS="-f macho"
+                      ;;
                   *)
                       NASMFLAGS="-f elf"
                       ;;
@@ -620,7 +623,7 @@
 
             dnl See if hidden visibility is supported
             echo 'GLOBAL _bar:function hidden' > nasm_vis.asm
-            if $NASM $NASMFLAGS nasm_vis.asm -o nasm_vis.o >&AS_MESSAGE_LOG_FD ; then
+            if $NASM $NASMFLAGS nasm_vis.asm -o nasm_vis.o >&AS_MESSAGE_LOG_FD 2>&1; then
                 NASMFLAGS="$NASMFLAGS -DHIDDEN_VISIBILITY"
             fi
             rm -f nasm_vis.asm nasm_vis.o
@@ -2413,6 +2416,10 @@
         CheckDummyAudio
         CheckDLOPEN
 
+        # Temporarily disabled:
+        # ld: mmxp2_32.o has external relocation entries in non-writable section (__TEXT,__text) for symbols: _mmxreturn
+        #CheckNASM
+
         # Set up files for the shared object loading library
         # (this needs to be done before the dynamic X11 check)
         if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then