[Saga-devel] saga SVN commit 3321: /trunk/adaptors/default/

[amerzky at cct.lsu.edu]

User: amerzky
Date: 2009/01/17 09:21 AM

Modified:
 /trunk/adaptors/default/
  configure
 /trunk/adaptors/default/config/
  saga_postgresql.m4

Log:
 fix pq detection
 A

File Changes:

Directory: /trunk/adaptors/default/config/
==========================================

File [modified]: saga_postgresql.m4
Delta lines: +7 -1
===================================================================
--- trunk/adaptors/default/config/saga_postgresql.m4	2009-01-17 12:59:15 UTC (rev 3320)
+++ trunk/adaptors/default/config/saga_postgresql.m4	2009-01-17 15:21:29 UTC (rev 3321)
@@ -81,6 +81,8 @@
 
       saved_cppflags=$CPPFLAGS
       saved_ldflags=$LDFLAGS
+      saved_ldlibpath=$LD_LIBRARY_PATH
+      saved_dyldlibpath=$DYLD_LIBRARY_PATH
 
       POSTGRESQL_PATH=$tmp_path
       POSTGRESQL_LDFLAGS="-L$tmp_path/lib/$subdir -lpq"
@@ -92,6 +94,9 @@
       LDFLAGS="$LDFLAGS $POSTGRESQL_LDFLAGS"
       export LDFLAGS
 
+      LD_LIBRARY_PATH="$tmp_path/lib/$subdir:$LD_LIBRARY_PATH"
+      DYLD_LIBRARY_PATH="$tmp_path/lib/$subdir:$DYLD_LIBRARY_PATH"
+
       AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <libpq-fe.h>]],
                                       [[
                                         PGconn* connection = PQconnectdb ("testdb");
@@ -106,6 +111,8 @@
 
         LDFLAGS=$saved_ldflags
         CPPFLAGS=$saved_cppflags
+        LD_LIBRARY_PATH=$saved_ldlibpath
+        DYLD_LIBRARY_PATH=$saved_dyldlibpath
         POSTGRESQL_LOCATION=""
       
       else
@@ -126,7 +133,6 @@
                                return 0; ]])],
             [POSTGRESQL_VERSION=`cat conftest.out`],
             [POSTGRESQL_VERSION=""])
-        AC_LANG_POP
 
         if test "$POSTGRESQL_VERSION" = ""; then
           AC_MSG_RESULT([unknown])

Directory: /trunk/adaptors/default/
===================================

File [modified]: configure
Delta lines: +7 -6
===================================================================
--- trunk/adaptors/default/configure	2009-01-17 12:59:15 UTC (rev 3320)
+++ trunk/adaptors/default/configure	2009-01-17 15:21:29 UTC (rev 3321)
@@ -2826,6 +2826,8 @@
 
       saved_cppflags=$CPPFLAGS
       saved_ldflags=$LDFLAGS
+      saved_ldlibpath=$LD_LIBRARY_PATH
+      saved_dyldlibpath=$DYLD_LIBRARY_PATH
 
       POSTGRESQL_PATH=$tmp_path
       POSTGRESQL_LDFLAGS="-L$tmp_path/lib/$subdir -lpq"
@@ -2837,6 +2839,9 @@
       LDFLAGS="$LDFLAGS $POSTGRESQL_LDFLAGS"
       export LDFLAGS
 
+      LD_LIBRARY_PATH="$tmp_path/lib/$subdir:$LD_LIBRARY_PATH"
+      DYLD_LIBRARY_PATH="$tmp_path/lib/$subdir:$DYLD_LIBRARY_PATH"
+
       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -2891,6 +2896,8 @@
 
         LDFLAGS=$saved_ldflags
         CPPFLAGS=$saved_cppflags
+        LD_LIBRARY_PATH=$saved_ldlibpath
+        DYLD_LIBRARY_PATH=$saved_dyldlibpath
         POSTGRESQL_LOCATION=""
 
       else
@@ -2968,13 +2975,7 @@
 fi
 
 
-        ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-
         if test "$POSTGRESQL_VERSION" = ""; then
           { echo "$as_me:$LINENO: result: unknown" >&5
 echo "${ECHO_T}unknown" >&6; }