From: Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>
Date: Tue, 6 Oct 2009 08:52:23 +0000 (+0000)
Subject: Move CFLAGS after the PGXS include directive, so that the autotools configuration... 
X-Git-Tag: 1.5.0b1~409
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f10ab9eb5ff13b66a419ea50c3d33c98b91f1e3;p=postgis

Move CFLAGS after the PGXS include directive, so that the autotools configuration doesn't getting overwritten by the PGXS version. Required when passing custom compiler f
lags into PostGIS as reported by William Kyngesburye.


git-svn-id: http://svn.osgeo.org/postgis/trunk@4602 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/loader/Makefile.in b/loader/Makefile.in
index 4a149839e..98f3aa0c1 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -10,6 +10,18 @@
 # *
 # **********************************************************************
 
+# PGXS information
+#
+# Note that PGXS currently doesn't handle building FE executables, but we need
+# the INSTALL and DESTDIR variables so we can get the correct install paths. 
+# Hence we include the PGXS Makefile here, but ensure that we override the
+# 'all' and 'install' targets with the ones we really want to use below.
+PG_CONFIG = @PGCONFIG@
+PGXS := @PGXS@
+include $(PGXS)
+
+# Set CFLAGS afer PGXS, otherwise it will get overwritten with the PGXS
+# version which is not what we want. 
 CC=@CC@
 CFLAGS=@CFLAGS@ @PICFLAGS@ @WARNFLAGS@
 
@@ -33,16 +45,6 @@ LIBLWGEOM=../liblwgeom/liblwgeom.a
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 
-# PGXS information
-#
-# Note that PGXS currently doesn't handle building FE executables, but we need
-# the INSTALL and DESTDIR variables so we can get the correct install paths. 
-# Hence we include the PGXS Makefile here, but ensure that we override the
-# 'all' and 'install' targets with the ones we really want to use below.
-PG_CONFIG = @PGCONFIG@
-PGXS := @PGXS@
-include $(PGXS)
-
 
 # The real parts of the Makefile
 all: $(SHP2PGSQL) $(PGSQL2SHP) @GTK_BUILD@