Include output from gdal-config --dep-libs when building raster2pgsql

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

diff --git a/configure.ac b/configure.ac
index d4bec58fd1e2ee962d2c7bb43636335c3ad6a4fd..79ecc5affc5da4ce875383873cdff68a5e33c2a2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -950,6 +950,7 @@ if test "x$with_raster" != "xno"; then
        USE_GDAL_SOURCE_TREE="no"
        LIBGDAL_CFLAGS=""
        LIBGDAL_LDFLAGS=""
+       LIBGDAL_DEPLIBS_LDFLAGS=""
 
        dnl GDAL version constants, update here
        GDAL_MIN_VERSION=1.8.0
@@ -997,6 +998,7 @@ if test "x$with_raster" != "xno"; then
 
                dnl Extract the linker and include flags 
                LIBGDAL_LDFLAGS=`$GDAL_CONFIG --libs`
+               LIBGDAL_DEPLIBS_LDFLAGS=`$GDAL_CONFIG --dep-libs`
                LIBGDAL_CFLAGS=`$GDAL_CONFIG --cflags`
 
                CPPFLAGS_SAVE="$CPPFLAGS"
@@ -1035,6 +1037,7 @@ if test "x$with_raster" != "xno"; then
 
                AC_SUBST([LIBGDAL_CFLAGS])
                AC_SUBST([LIBGDAL_LDFLAGS])
+               AC_SUBST([LIBGDAL_DEPLIBS_LDFLAGS])
 
                AC_SUBST([GDALFPOLYGONIZE])
 

diff --git a/raster/loader/Makefile.in b/raster/loader/Makefile.in
index 58b7e2e2decb5f225f66f98c8f4c773d01f03d8d..a1d75b11d8e93934de7b576216ebe54075d2b548 100644 (file)
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
@@ -24,16 +24,13 @@ RASTER2PGSQL=raster2pgsql@EXESUFFIX@
 # PostgreSQL executable directory
 PGSQL_BINDIR=@PGSQL_BINDIR@
 
-# PostgreSQL frontend CPPFLAGS and LDFLAGS (for compiling and linking with libpq)
-PGSQL_FE_CPPFLAGS=@PGSQL_FE_CPPFLAGS@
-PGSQL_FE_LDFLAGS=@PGSQL_FE_LDFLAGS@
-
 RT_CORE=../rt_core
 
 LIBLWGEOM_LDFLAGS=../../liblwgeom/liblwgeom.la
 LIBLWGEOM_CFLAGS=-I../../liblwgeom
 LIBGDAL_CFLAGS=@LIBGDAL_CFLAGS@
 LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@
+LIBGDAL_DEPLIBS_LDFLAGS=@LIBGDAL_DEPLIBS_LDFLAGS@
 PROJ_CFLAGS=@PROJ_CPPFLAGS@
 GEOS_CFLAGS=@GEOS_CPPFLAGS@
 GEOS_LDFLAGS=@GEOS_LDFLAGS@ -lgeos_c
@@ -54,7 +51,6 @@ CFLAGS = \
        $(RTCORE_CFLAGS) \
        $(LIBLWGEOM_CFLAGS) \
        $(PROJ_CFLAGS) \
-       $(PGSQL_FE_CPPFLAGS) \
        $(LIBGDAL_CFLAGS) \
        $(GEOS_CFLAGS) \
        $(GETTEXT_CFLAGS) \
@@ -63,8 +59,8 @@ CFLAGS = \
 LDFLAGS = \
        @LDFLAGS@ \
        $(LIBLWGEOM_LDFLAGS) \
-       $(PGSQL_FE_LDFLAGS) \
        $(LIBGDAL_LDFLAGS) \
+       $(LIBGDAL_DEPLIBS_LDFLAGS) \
        $(GEOS_LDFLAGS) \
        $(GETTEXT_LDFLAGS) \
        $(ICONV_LDFLAGS) \