[postgis-tickets] r16342 - Address configure issues for unusual CC/CFLAGS

[Darafei]

Author: komzpa
Date: 2018-01-19 09:52:33 -0800 (Fri, 19 Jan 2018)
New Revision: 16342

Modified:
   trunk/configure.ac
   trunk/raster/Makefile.in
   trunk/raster/rt_pg/Makefile.in
Log:
Address configure issues for unusual CC/CFLAGS

Patch by Raúl Marín Rodríguez.

Closes #3995
Closes https://github.com/postgis/postgis/pull/195


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2018-01-19 17:50:51 UTC (rev 16341)
+++ trunk/configure.ac	2018-01-19 17:52:33 UTC (rev 16342)
@@ -518,11 +518,20 @@
   dnl Ensure we can link against libpq
   LIBS_SAVE="$LIBS"
   LIBS="$PGSQL_FE_LDFLAGS"
+
+  CC_SAVE="$CC"
+  CC=`"$PG_CONFIG" --cc`
+
+  CFLAGS_SAVE="$CFLAGS"
+  CFLAGS=`"$PG_CONFIG" --cflags`
+
   AC_CHECK_LIB([pq], [PQserverVersion],
     [],
     [AC_MSG_ERROR([could not find libpq])],
     [])
   LIBS="$LIBS_SAVE"
+  CC="$CC_SAVE"
+  CFLAGS="$CFLAGS_SAVE"
 
   AC_DEFINE_UNQUOTED([POSTGIS_PGSQL_VERSION], [$POSTGIS_PGSQL_VERSION], [PostgreSQL server version])
   AC_SUBST([POSTGIS_PGSQL_VERSION])
@@ -1337,7 +1346,10 @@
 		CPPFLAGS_SAVE="$CPPFLAGS"
 		CPPFLAGS="$LIBGDAL_CFLAGS"
 		CFLAGS_SAVE="$CFLAGS"
-		CFLAGS=""
+		CFLAGS=`"$PG_CONFIG" --cflags`
+		CC_SAVE="$CC"
+		CC=`"$PG_CONFIG" --cc`
+
 		LIBS_SAVE="$LIBS"
 		LIBS="$LIBGDAL_LDFLAGS"
 
@@ -1366,6 +1378,7 @@
 
 		CPPFLAGS="$CPPFLAGS_SAVE"
 		CFLAGS="$CFLAGS_SAVE"
+		CC="$CC_SAVE"
 		LIBS="$LIBS_SAVE"
 
 		AC_SUBST([LIBGDAL_CFLAGS])

Modified: trunk/raster/Makefile.in
===================================================================
--- trunk/raster/Makefile.in	2018-01-19 17:50:51 UTC (rev 16341)
+++ trunk/raster/Makefile.in	2018-01-19 17:52:33 UTC (rev 16342)
@@ -19,8 +19,12 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #############################################################################
 
-all: @RT_CORE_LIB@ @RT_PG_LIB@ @RT_LOADER@ @RT_POSTGIS_SQL@ 
+CC=@CC@
+CFLAGS=-I../liblwgeom @CFLAGS@ @WARNFLAGS@
+LDFLAGS = @LDFLAGS@
 
+all: @RT_CORE_LIB@ @RT_PG_LIB@ @RT_LOADER@ @RT_POSTGIS_SQL@
+
 corelib:
 	$(MAKE) -C rt_core
 

Modified: trunk/raster/rt_pg/Makefile.in
===================================================================
--- trunk/raster/rt_pg/Makefile.in	2018-01-19 17:50:51 UTC (rev 16341)
+++ trunk/raster/rt_pg/Makefile.in	2018-01-19 17:52:33 UTC (rev 16342)
@@ -65,6 +65,7 @@
 LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@
 LIBPROJ_CFLAGS=@PROJ_CPPFLAGS@
 
+CC = @CC@
 override CFLAGS := $(LIBLWGEOM_CFLAGS) @CFLAGS@
 PG_CPPFLAGS+= @CPPFLAGS@ $(LIBGDAL_CFLAGS) $(LIBPGCOMMON_CFLAGS) $(LIBPROJ_CFLAGS) -I../rt_core
 SHLIB_LINK_F = ../rt_core/librtcore.a $(LIBLWGEOM_LDFLAGS) $(LIBPGCOMMON_LDFLAGS) $(LIBGDAL_LDFLAGS) @SHLIB_LINK@