From c3291aed202c48986133a7e6c6db448739e94876 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Fri, 5 Oct 2001 21:15:38 +0000
Subject: [PATCH] Fix shared library builds for MacOS X.

---
 src/Makefile.shlib            | 4 ++--
 src/makefiles/Makefile.darwin | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 4b89aa4927..34f805ed98 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -6,7 +6,7 @@
 # Copyright (c) 1998, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.54 2001/09/22 22:54:32 petere Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.55 2001/10/05 21:15:38 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -113,7 +113,7 @@ endif
 
 ifeq ($(PORTNAME), darwin)
   shlib			:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-  LINK.shared		= $(COMPILER) $(CFLAGS_SL)
+  LINK.shared		= $(COMPILER) $(DARWIN_NAMESPACE_SPEC) -bundle -undefined suppress
 endif
 
 ifeq ($(PORTNAME), openbsd)
diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin
index b6619165b0..3d58055b9b 100644
--- a/src/makefiles/Makefile.darwin
+++ b/src/makefiles/Makefile.darwin
@@ -2,9 +2,12 @@ AROPT = cr
 AWK= awk
  
 DLSUFFIX = .so
-CFLAGS_SL = -bundle -undefined suppress
+CFLAGS_SL =
+ifeq (,$(filter $(host_os), darwin1.0 darwin1.1 darwin1.2))
+DARWIN_NAMESPACE_SPEC = -flat_namespace
+endif
  
 %.so: %.o
-	$(CC) $(CFLAGS) $(CFLAGS_SL) -o $@ $<
+	$(CC) $(DARWIN_NAMESPACE_SPEC) -bundle -undefined suppress -o $@ $<
 
 sqlmansect = 7