[Pspp-cvs] pspp configure.ac src/ui/gui/automake.mk src/ui...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   08/02/06 10:33:05

Modified files:
        .              : configure.ac 
        src/ui/gui     : automake.mk 
        src/ui/terminal: automake.mk 
        tests          : automake.mk 
        tests/command  : get-data-psql.sh 

Log message:
        Increase the chances of finding libpq if it's installed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/configure.ac?cvsroot=pspp&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/automake.mk?cvsroot=pspp&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/automake.mk?cvsroot=pspp&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/automake.mk?cvsroot=pspp&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/get-data-psql.sh?cvsroot=pspp&r1=1.3&r2=1.4

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/pspp/pspp/configure.ac,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- configure.ac        4 Feb 2008 03:46:15 -0000       1.72
+++ configure.ac        6 Feb 2008 10:33:05 -0000       1.73
@@ -48,13 +48,15 @@
 
 
 dnl Checks needed for psql reader
-AC_CHECK_PROG(psql_support, pg_config, yes, no)
-if test x"$psql_support" = x"yes" ; then 
+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`
+   PG_LDFLAGS=-R`$PG_CONFIG --libdir`
    AC_SUBST(PG_LDFLAGS)
    PG_LIBS=-lpq
    AC_SUBST(PG_LIBS)
@@ -63,7 +65,7 @@
                    [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;

Index: src/ui/gui/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/automake.mk,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- src/ui/gui/automake.mk      4 Feb 2008 01:24:01 -0000       1.45
+++ src/ui/gui/automake.mk      6 Feb 2008 10:33:05 -0000       1.46
@@ -9,6 +9,7 @@
 
 
 src_ui_gui_psppire_LDFLAGS = \
+       $(PG_LDFLAGS) \
        -export-dynamic 
 
 

Index: src/ui/terminal/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/src/ui/terminal/automake.mk,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/ui/terminal/automake.mk 4 Feb 2008 01:24:01 -0000       1.19
+++ src/ui/terminal/automake.mk 6 Feb 2008 10:33:05 -0000       1.20
@@ -41,6 +41,8 @@
 
 
 
+src_ui_terminal_pspp_LDFLAGS = $(PG_LDFLAGS)
+
 if RELOCATABLE_VIA_LD
-src_ui_terminal_pspp_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)`
+src_ui_terminal_pspp_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
 endif

Index: tests/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/tests/automake.mk,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- tests/automake.mk   4 Feb 2008 01:24:01 -0000       1.52
+++ tests/automake.mk   6 Feb 2008 10:33:05 -0000       1.53
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 TESTS_ENVIRONMENT = top_srcdir='$(top_srcdir)' top_builddir='$(top_builddir)'
-TESTS_ENVIRONMENT += PERL='@PERL@'
+TESTS_ENVIRONMENT += PERL='@PERL@' PG_CONFIG='@PG_CONFIG@'
 
 # Allow locale_charset to find charset.alias before running "make install".
 TESTS_ENVIRONMENT += CHARSETALIASDIR='$(abs_top_builddir)/gl'

Index: tests/command/get-data-psql.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/command/get-data-psql.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tests/command/get-data-psql.sh      6 Feb 2008 02:08:19 -0000       1.3
+++ tests/command/get-data-psql.sh      6 Feb 2008 10:33:05 -0000       1.4
@@ -21,7 +21,7 @@
 
 port=6543
 dbase=pspptest
-PG_CONFIG=pg_config
+PG_CONFIG=${PG_CONFIG:=pg_config}
 pgpath=`$PG_CONFIG | awk '/BINDIR/{print $3}'`
 
 cleanup()