From 577298ac0b6556b41fc35b1b8745cf5d7fdf240a Mon Sep 17 00:00:00 2001
From: vsc <vsc@b08c6af1-5177-4d33-ba66-4b1c6b8b522a>
Date: Tue, 28 May 2002 17:28:25 +0000
Subject: [PATCH] fix __SVR4 fix darwin cpp

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@504 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
---
 configure    | 4 ++++
 configure.in | 4 ++++
 m4/Yap.h.m4  | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 64d8aa4d5..539e70e97 100755
--- a/configure
+++ b/configure
@@ -4430,6 +4430,10 @@ _ACEOF
         DO_SECOND_LD=""
 	SHLIB_LD="cc -bundle -flat_namespace -undefined suppress"
 	INSTALL_DLLS=""
+        if test "$CC" = "cc"
+        then
+          CC="cc -no-cpp-precomp"
+        fi
 	;;
       *netbsd*|*freebsd*)
 	if echo __ELF__ | ${CC:-cc} -E - | grep -q __ELF__
diff --git a/configure.in b/configure.in
index 7e5a1dbc2..d2cfee536 100644
--- a/configure.in
+++ b/configure.in
@@ -463,6 +463,10 @@ case $target_os in
         DO_SECOND_LD=""
 	SHLIB_LD="cc -bundle -flat_namespace -undefined suppress"
 	INSTALL_DLLS=""
+        if test "$CC" = "cc"
+        then
+          CC="cc -no-cpp-precomp"
+        fi
 	;;
       *netbsd*|*freebsd*)
 	if echo __ELF__ | ${CC:-cc} -E - | grep -q __ELF__
diff --git a/m4/Yap.h.m4 b/m4/Yap.h.m4
index cd69cb7cd..557a05451 100644
--- a/m4/Yap.h.m4
+++ b/m4/Yap.h.m4
@@ -10,7 +10,7 @@
 * File:		Yap.h.m4						 *
 * mods:									 *
 * comments:	main header file for YAP				 *
-* version:      $Id: Yap.h.m4,v 1.26 2002-05-28 17:14:57 vsc Exp $	 *
+* version:      $Id: Yap.h.m4,v 1.27 2002-05-28 17:28:25 vsc Exp $	 *
 *************************************************************************/
 
 #include "config.h"
@@ -242,7 +242,7 @@ extern char     Option[20];
 #else
 #define MMAP_ADDR 0x09000000
 #endif
-#elif __svr4__ || _SVR4
+#elif __svr4__ || defined(__SVR4)
 #define MMAP_ADDR 0x02000000
 #elif defined(_WIN32) || defined(__CYGWIN__)
 #define MMAP_ADDR 0x30000000L