[mapserver-commits] r9159 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2009-07-09 15:58:31 -0400 (Thu, 09 Jul 2009)
New Revision: 9159

Modified:
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
Added the extra libs in configure for postgresql

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2009-07-09 19:17:12 UTC (rev 9158)
+++ trunk/mapserver/configure	2009-07-09 19:58:31 UTC (rev 9159)
@@ -11741,7 +11741,12 @@
   fi
 
   POSTGIS_ENABLED=-DUSE_POSTGIS
-  POSTGIS_LIB="-L`$PG_CONFIG --libdir` -lpq"
+  POSTGIS_EXTRALIBS=`$PG_CONFIG --libs`
+    if test $? -eq 0 ; then
+      POSTGIS_LIB="-L`$PG_CONFIG --libdir` -lpq $POSTGIS_EXTRALIBS"
+  else
+      POSTGIS_LIB="-L`$PG_CONFIG --libdir` -lpq"
+  fi
   POSTGIS_INC="-I`$PG_CONFIG --includedir`"
 fi
 

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2009-07-09 19:17:12 UTC (rev 9158)
+++ trunk/mapserver/configure.in	2009-07-09 19:58:31 UTC (rev 9159)
@@ -1560,7 +1560,13 @@
   fi
 
   POSTGIS_ENABLED=-DUSE_POSTGIS
-  POSTGIS_LIB="-L`$PG_CONFIG --libdir` -lpq"
+  POSTGIS_EXTRALIBS=`$PG_CONFIG --libs`
+  dnl Verify if pg_config has the "--libs" option..
+  if test $? -eq 0 ; then  
+      POSTGIS_LIB="-L`$PG_CONFIG --libdir` -lpq $POSTGIS_EXTRALIBS"
+  else
+      POSTGIS_LIB="-L`$PG_CONFIG --libdir` -lpq"
+  fi
   POSTGIS_INC="-I`$PG_CONFIG --includedir`"
 fi