From 3f2e7a5b78f269a1e8076c314b60acd31455a943 Mon Sep 17 00:00:00 2001
From: Dave Peticolas <dave@krondo.com>
Date: Sun, 24 Jun 2001 19:58:56 +0000
Subject: [PATCH] 2001-06-24  Dave Peticolas  <dave@krondo.com>

	* AUTHORS: credits

	* doc/sgml/C/xacc-about.sgml: credits

	* configure.in: Alex Zepeda's postgres configure patch


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4774 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 AUTHORS                    |  1 +
 ChangeLog                  |  8 ++++++++
 configure.in               | 22 ++++++++++++++++------
 doc/sgml/C/xacc-about.sgml |  8 ++++++++
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 90ceded1c9..f8cfd6493a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -179,5 +179,6 @@ Rob Walker <rob@valinux.com> guile and register patches
 David Woodhouse <dwmw2@infradead.org> messages  British translations
 Ken Yamaguchi <gooch@ic.EECS.Berkeley.EDU> QIF import fixes; MYM import
 Shimpei Yamashita <shimpei@gol.com> messages Japanese translation
+Alex Zepeda <jazepeda@pacbell.net> postgres configure patch
 
 ... and I am sure that I have missed many others ...
diff --git a/ChangeLog b/ChangeLog
index c4de7b57d3..a9e383649f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-06-24  Dave Peticolas  <dave@krondo.com>
+
+	* AUTHORS: credits
+
+	* doc/sgml/C/xacc-about.sgml: credits
+
+	* configure.in: Alex Zepeda's postgres configure patch
+
 2001-06-23  Kevin Finn  <kevinfinn@mediaone.net>
 
 	* src/gnome/window-reconcile.c: fix for display of auto end value
diff --git a/configure.in b/configure.in
index 466ff77fce..bbacc3fc0e 100644
--- a/configure.in
+++ b/configure.in
@@ -173,14 +173,24 @@ AC_ARG_ENABLE( sql,
   [
     if test "x$enableval" != "xno" ; then
       AC_CHECK_HEADERS(pgsql/libpq-fe.h postgresql/libpq-fe.h)
-      if test "x$ac_cv_header_pgsql_libpq_fe_h$ac_cv_header_postgresql_libpq_fe_h" == xnono; then
-         AC_MSG_ERROR([Cannot find PosgreSQL headers; won't build sql backend]) 
+      if test "x$ac_cv_header_pgsql_libpq_fe_h$ac_cv_header_postgresql_libpq_fe_h" = xnono; then
+         AC_MSG_ERROR([Cannot find PostgreSQL headers; won't build sql backend]) 
       else 
+        master_dirs="/usr/include /usr/local/include"
         if test "x$ac_cv_header_pgsql_libpq_fe_h" != xno; then
-          CFLAGS="${CFLAGS} -I/usr/include/pgsql"
+          for dir in $master_dirs; do
+              if test -f "$dir/pgsql/libpq-fe.h"; then
+                  CFLAGS="${CFLAGS} -I$dir/pgsql"
+                  break
 	fi
-        if test "x$ac_cv_header_postgresql_libpq_fe_h" != xno; then
-          CFLAGS="${CFLAGS} -I/usr/include/postgresql"
+          done
+        elif test "x$ac_cv_header_postgresql_libpq_fe_h" != xno; then
+          for dir in $master_dirs; do
+              if test -f "$dir/postgresql/libpq-fe.h"; then
+                  CFLAGS="${CFLAGS} -I$dir/postgresql"
+                  break
+              fi
+          done
 	fi
         
         saved_LIBS="$LIBS"
@@ -198,7 +208,7 @@ AC_ARG_ENABLE( sql,
             SQL_DIR=sql
           ],
           [
-            AC_MSG_ERROR([Cannot find PosgreSQL libraries; will not build sql backend]) 
+            AC_MSG_ERROR([Cannot find PostgreSQL libraries; will not build sql backend]) 
           ]
         )
         LIBS="$saved_LIBS"
diff --git a/doc/sgml/C/xacc-about.sgml b/doc/sgml/C/xacc-about.sgml
index c76d9d1aa2..8adab8181e 100644
--- a/doc/sgml/C/xacc-about.sgml
+++ b/doc/sgml/C/xacc-about.sgml
@@ -1016,6 +1016,14 @@ Nielsen</glossterm>
 </glossentry>
 </glosslist>
 
+<glossentry>
+<glossterm><email>jazepeda@pacbell.net</email> Alex Zepeda</glossterm>
+<glossdef>
+<para>postgres configure patch</para>
+</glossdef>
+</glossentry>
+</glosslist>
+
 </para>
 </sect1>