From 330c3e6e094640fdf433c9ffbbcce896d76a297b Mon Sep 17 00:00:00 2001
From: jgarcia <jgarcia>
Date: Mon, 24 Apr 2006 08:44:28 +0000
Subject: [PATCH] Fixes to build with Mac OSX Intel.

---
 contrib/sockets/sockets.lisp | 8 +++++++-
 src/aclocal.m4               | 6 +++++-
 src/configure                | 9 ++++++++-
 src/configure.in             | 5 ++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/contrib/sockets/sockets.lisp b/contrib/sockets/sockets.lisp
index ddc339afc..f172f796f 100644
--- a/contrib/sockets/sockets.lisp
+++ b/contrib/sockets/sockets.lisp
@@ -44,7 +44,13 @@
  "#include <fcntl.h>"
  "#include <stdio.h>"
  #+:cygwin
- "#define MSG_WAITALL 0")
+ "#define MSG_WAITALL 0"
+ "#ifndef MSG_CONFIRM"
+ "#define MSG_CONFIRM 0"
+ "#endif"
+ "#ifndef MSG_NOSIGNAL"
+ "#define MSG_NOSIGNAL 0"
+ "#endif")
 #+:wsock
 (clines
  #+(and (or :msvc :mingw32) (not :threads))
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index f6b1ca940..279dbdbad 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -263,9 +263,13 @@ case "${host_os}" in
 		LDRPATH=''
 		THREAD_CFLAGS='-D_THREAD_SAFE'
 		THREAD_LIBS='-lpthread'
+		# The GMP library has not yet been ported to Intel-OSX
+		if test `uname -m` = i386; then
+		  gmp_build=none-apple-${host_os}
+		fi
 		;;
 	*)
-		thehost="$host_os"
+		Thehost="$host_os"
 		shared="no"
 		;;
 esac
diff --git a/src/configure b/src/configure
index 33a38b4ed..5221bcd61 100755
--- a/src/configure
+++ b/src/configure
@@ -3588,6 +3588,10 @@ case "${host_os}" in
 		LDRPATH=''
 		THREAD_CFLAGS='-D_THREAD_SAFE'
 		THREAD_LIBS='-lpthread'
+		# The GMP library has not yet been ported to Intel-OSX
+		if test `uname -m` = i386; then
+		  gmp_build=none-apple-${host_os}
+		fi
 		;;
 	*)
 		thehost="$host_os"
@@ -9851,12 +9855,15 @@ _ACEOF
     { echo "$as_me:$LINENO: Configuring included GMP library:" >&5
 echo "$as_me: Configuring included GMP library:" >&6;}
     test -d gmp && rm -rf gmp
+    if test -z "$gmp_build"; then
+      gmp_build="${build_alias}"
+    fi
     if mkdir gmp; then
      ECL_GMP_HEADER='ecl/gmp.h'
      (destdir=`${PWDCMD}`; cd gmp; CC="${CC} ${PICFLAG}" \
        $srcdir/gmp/configure --disable-shared --prefix=${destdir} \
 	--infodir=${destdir}/doc --includedir=${destdir}/ecl \
-        --libdir=${destdir} --build=${build_alias} --host=${host_alias} $with_gmp)
+        --libdir=${destdir} --build=${gmp_build} --host=${host_alias} $with_gmp)
     fi
   fi
 fi
diff --git a/src/configure.in b/src/configure.in
index ccce7d853..3ed34ca31 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -494,12 +494,15 @@ else
   if test "${with_system_gmp}" = "no" ; then
     AC_MSG_NOTICE(Configuring included GMP library:)
     test -d gmp && rm -rf gmp
+    if test -z "$gmp_build"; then
+      gmp_build="${build_alias}"
+    fi
     if mkdir gmp; then
      ECL_GMP_HEADER='ecl/gmp.h'
      (destdir=`${PWDCMD}`; cd gmp; CC="${CC} ${PICFLAG}" \
        $srcdir/gmp/configure --disable-shared --prefix=${destdir} \
 	--infodir=${destdir}/doc --includedir=${destdir}/ecl \
-        --libdir=${destdir} --build=${build_alias} --host=${host_alias} $with_gmp)
+        --libdir=${destdir} --build=${gmp_build} --host=${host_alias} $with_gmp)
     fi
   fi
 fi