pgxs in configure

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
+LIB_A = libpc.a

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 ===========================================================================

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:

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:

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)