oops

[pspp-builds.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9c52b30a676ef3c77393bb174dc61b74538e6ab5..708911ed6cbf00d9536fecff27b6a25726035c04 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -48,14 +48,36 @@ AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
 
 
 dnl Checks needed for psql reader
-AC_CHECK_PROG(psql_support, pg_config, yes, no)
-if test x"$psql_support" = x"yes" ; then 
+
+dnl The 8.x series postgres tarballs installs with a default prefix of
+dnl /usr/local/pgsql whereas, OSes (such as debian)  install into /usr .
+
+dnl If the libpq.so file is in a non standard path, (one which the linker
+dnl doesn't search) then we must set the PG_LDFLAGS to -R/usr/wherever/
+dnl However, if the system happens to have more than one version of other
+dnl dependent libraries (eg. libgtk) in different standard paths. (eg:
+dnl /usr and /usr/local) then the wrong one may get linked. 
+
+dnl To overcome this, we first check for libpq in the standard places, and
+dnl only set PG_LDFLAGS if it's not found.
+
+
+AC_CHECK_LIB([pq], [PQexec], [libpq_in_std_lib_path=yes])
+
+AC_ARG_VAR([PG_CONFIG], [Full pathname of the pg_config program shipped with Postgresql])
+AC_PATH_PROG([PG_CONFIG], [pg_config], [], [$PATH:/usr/local/pgsql/bin:/usr/pgsql/bin])
+if test -n "$PG_CONFIG" ; then 
+   AC_SUBST(PG_CONFIG)
    AC_DEFINE([PSQL_SUPPORT], 1,
    [Define to 1 if building in support for reading from postgres databases.])
-   PG_CFLAGS=-I`pg_config --includedir` 
+   PG_CFLAGS=-I`$PG_CONFIG --includedir` 
    AC_SUBST(PG_CFLAGS)
-   PG_LDFLAGS=-L`pg_config --libdir`
+   
+   if test "x$libpq_in_std_lib_path" != x"yes" ; then
+      PG_LDFLAGS="-L`$PG_CONFIG --libdir` -R`$PG_CONFIG --libdir`"
+   fi
    AC_SUBST(PG_LDFLAGS)
+
    PG_LIBS=-lpq
    AC_SUBST(PG_LIBS)
    PKG_CHECK_MODULES(OPENSSL,libssl,
@@ -63,7 +85,7 @@ if test x"$psql_support" = x"yes" ; then
                    [Define to 1 if the openssl library is present.])
            ,)
 fi
-AM_CONDITIONAL(PSQL_SUPPORT, test x"$psql_support" = x"yes")
+AM_CONDITIONAL(PSQL_SUPPORT, test -n "$PG_CONFIG")
 
 dnl Checks needed for gnumeric reader
 gnm_support=yes;