--- ./postgis/configure.in	Thu May 12 12:09:02 2005
+++ ./postgis/configure.in	Thu May 12 15:31:23 2005
@@ -247,6 +247,9 @@
 		DLFLAGS=
 		EXE=.exe
 		;;
+	*darwin*)
+		DLFLAGS="-no-cpp-precomp -flat_namespace -undefined suppress -multiply_defined suppress"
+		;;
 esac
 
 
--- ./postgis/lwgeom/Makefile	Wed May 11 10:55:00 2005
+++ ./postgis/lwgeom/Makefile	Thu May 12 16:00:34 2005
@@ -79,7 +79,9 @@
 ifeq ($(USE_STATS),1)
 	override CFLAGS += -DUSE_STATS
 endif
- 
+
+SPECIAL1=
+SPECIAL2= 
 SA_OBJS=measures.o box2d.o ptarray.o lwgeom_api.o lwgeom.o lwpoint.o lwline.o lwpoly.o lwmpoint.o lwmline.o lwmpoly.o lwcollection.o $(GEOS_WRAPPER) $(JTS_WRAPPER) wktunparse.o lwgparse.o wktparse.tab.o lex.yy.o vsprintf.o
 
 OBJS=$(SA_OBJS) liblwgeom.o lwgeom_pg.o lwgeom_debug.o lwgeom_spheroid.o lwgeom_ogc.o lwgeom_functions_analytic.o $(JTS_OBJ) lwgeom_inout.o lwgeom_estimate.o lwgeom_functions_basic.o lwgeom_gist.o lwgeom_btree.o lwgeom_transform.o stringBuffer.o lwgeom_box.o lwgeom_box3d.o lwgeom_box2dfloat4.o lwgeom_chip.o lwgeom_svg.o lwgeom_gml.o lwgeom_triggers.o lwgeom_dump.o
@@ -94,12 +96,17 @@
 all: $(GEOS_RULES) $(SHLIB) ../lwpostgis.sql
 
 $(SHLIB): $(OBJS)
+ifeq ($(findstring darwin,$(HOST_OS)),darwin)
+	SPECIAL1="-bundle"
+	SPECIAL2="-bundle_loader $(${PGCONFIG} --bindir)/postgres"
+endif
+
 ifeq ($(findstring mingw,$(HOST_OS)),mingw)
 	dlltool --export-all  --output-def lwgeom.def $(OBJS)
 	dllwrap  -o $@ --dllname $@ --def lwgeom.def $(OBJS) $(SHLIB_LINK) $(PGBELIBS)
 	dlltool --dllname $@  --def lwgeom.def --output-lib liblwgeom.a
-else
-	$(CC) $(SHLIB_LINK) -o $(SHLIB) $(OBJS)
+else	
+	$(CC) $(SHLIB_LINK) -o $(SHLIB) $(SPECIAL1) $(OBJS) $(SPECIAL2)
 endif
 
 wktparse.tab.c: wktparse.y