From b2ca04afa78d3e276dbb1f58bb1badc62f9208dc Mon Sep 17 00:00:00 2001
From: Paul Ramsey <pramsey@opengeo.org>
Date: Thu, 7 Mar 2013 10:23:23 -0800
Subject: [PATCH] pgxs in configure

---
 config.mk.in       | 16 ++++------------
 configure.ac       | 29 +++++++++++++++++++++++++----
 lib/Makefile       |  6 +++---
 lib/cunit/Makefile |  8 +++-----
 pgsql/Makefile     |  4 +---
 5 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/config.mk.in b/config.mk.in
index 8b7d2c6..adca2ae 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -4,20 +4,12 @@ CFLAGS = @CFLAGS@
 XML2_CPPFLAGS = @XML2_CPPFLAGS@
 XML2_LDFLAGS = @XML2_LDFLAGS@
 
-ZLIB_CPPFLAGS =
-ZLIB_LDFLAGS = -lz
+ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
+ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 
 CUNIT_CPPFLAGS = @CUNIT_CPPFLAGS@
 CUNIT_LDFLAGS = @CUNIT_LDFLAGS@
 
+PGXS = @PGXS@
 
-#XML2_CPPFLAGS = -I/opt/local/include/libxml2
-#XML2_LDFLAGS = -lxml2
-
-#ZLIB_CPPFLAGS =
-#ZLIB_LDFLAGS = -lz
-
-#CUNIT_CPPFLAGS = -I/usr/local/include
-#CUNIT_LDFLAGS = -L/usr/local/lib -lcunit
-
-LIBPC_A = libpc.a
\ No newline at end of file
+LIB_A = libpc.a
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 34b8e4a..02ca208 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,10 +24,31 @@ AC_SUBST([EXESUFFIX])
 dnl
 dnl Search for flex/bison to build the parser
 dnl
-AC_PROG_LEX
-AC_PROG_YACC
-AC_SUBST([LEX])
-AC_SUBST([YACC])
+dnl AC_PROG_LEX
+dnl AC_PROG_YACC
+dnl AC_SUBST([LEX])
+dnl AC_SUBST([YACC])
+
+
+dnl ===========================================================================
+dnl Detect ZLib if it is installed 
+dnl ===========================================================================
+
+ZLIB_LDFLAGS=""
+AC_CHECK_HEADER([zlib.h], [
+	CUNIT_CPPFLAGS="$CPPFLAGS"
+	AC_CHECK_LIB([z], 
+	  [inflate], 
+	  [ZLIB_LDFLAGS="$LDFLAGS -lz"], 
+	  [AC_MSG_ERROR([could not locate zlib])]
+	  )
+	],
+	[
+	AC_MSG_ERROR([could not locate zlib])
+	])
+	
+AC_SUBST([ZLIB_CPPFLAGS])
+AC_SUBST([ZLIB_LDFLAGS])
 
 
 dnl ===========================================================================
diff --git a/lib/Makefile b/lib/Makefile
index 41c5798..79402bc 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -19,14 +19,14 @@ OBJS = \
 	stringbuffer.o \
 	hashtable.o
 
-all: $(LIBPC_A)
+all: $(LIB_A)
 	$(MAKE) -C cunit $@
 
-$(LIBPC_A): $(OBJS)
+$(LIB_A): $(OBJS)
 	ar rs $@ $^
 
 clean:
-	@rm -f $(OBJS) $(LIBPC_A)
+	@rm -f $(OBJS) $(LIB_A)
 	$(MAKE) -C cunit $@
 
 install:
diff --git a/lib/cunit/Makefile b/lib/cunit/Makefile
index f4770b3..db105d8 100644
--- a/lib/cunit/Makefile
+++ b/lib/cunit/Makefile
@@ -1,8 +1,6 @@
 
 include ../../config.mk
 
-LIBPC = ../$(LIBPC_A)
-
 CPPFLAGS = $(XML2_CPPFLAGS) $(CUNIT_CPPFLAGS) $(ZLIB_CPPFLAGS) -I..
 LDFLAGS = $(XML2_LDFLAGS) $(CUNIT_LDFLAGS) $(ZLIB_LDFLAGS)
 
@@ -23,11 +21,11 @@ check: $(EXE)
 	@./$(EXE)
 
 # Build the main unit test executable
-$(EXE): $(OBJS) $(LIBPC)
+$(EXE): $(OBJS) ../$(LIB_A)
 	$(CC) $(LDFLAGS) -o $@ $^
 
-$(LIBPC):
-	$(MAKE) -C .. $(LIBPC_A)
+../$(LIB_A):
+	$(MAKE) -C .. $(LIB_A)
 
 # Clean target
 clean:
diff --git a/pgsql/Makefile b/pgsql/Makefile
index cb2f22f..c679cae 100644
--- a/pgsql/Makefile
+++ b/pgsql/Makefile
@@ -15,9 +15,7 @@ REGRESS = pointcloud
 
 # Add in build/link flags for lib
 PG_CPPFLAGS += -I../lib 
-SHLIB_LINK += $(filter -lm, $(LIBS)) $(XML2_LDFLAGS) $(ZLIB_LDFLAGS) ../lib/$(LIBPC_A)
+SHLIB_LINK += $(filter -lm, $(LIBS)) $(XML2_LDFLAGS) $(ZLIB_LDFLAGS) ../lib/$(LIB_A)
 
 # We are going to use PGXS for sure
-PG_CONFIG = pg_config
-PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)