From a868d036766126da28c7abc262632dab0096de09 Mon Sep 17 00:00:00 2001
From: aland <aland>
Date: Mon, 10 Sep 2001 21:53:16 +0000
Subject: [PATCH] 	Updated PGROOT tests, to hopefully work on Solaris. 
 Based on 	comments from "John Padula"
 <john_padula@aviancommunications.com>

---
 aclocal.m4 | 6 +++---
 configure  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 1978ba9..319629c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -571,7 +571,7 @@ AC_DEFUN(POSTGRESQL_CHECKS, [
 AC_CHECKING(for PostgreSQL includes)
 
 dnl First Check for a local install
-if test -d $PGROOT ; then
+if test "x$PGROOT" != "x" ; then
 	IS_LOCAL=1
 else
 	dnl Check common local install paths
@@ -590,7 +590,7 @@ else
 	fi
 fi
 dnl If we have a local install path, check for some files
-if test -d $PGROOT && test "x$IS_LOCAL" != "x" ; then
+if test "x$PGROOT" != "x" && test "x$IS_LOCAL" != "x" ; then
 	if test -e $PGROOT/lib/libpq${libltdl_cv_shlibext} ; then
 		if test -e $PGROOT/lib/libpq.a ; then
 			PQ_LIBS="-L$PGROOT/lib -lpq"
@@ -628,7 +628,7 @@ if test "x$PGROOT" = "x" ; then
 	fi
 fi
 
-if test "$PGROOT" && test "$PQ_LIBS" && test "$PG_INCLUDE_DIR" ; then
+if test "x$PGROOT" != "x" && test "x$PQ_LIBS" != "x" && test "x$PG_INCLUDE_DIR" != "x"; then
 	echo Postgresql found in $PGROOT.
 fi
 
diff --git a/configure b/configure
index d7190cb..b1950c1 100755
--- a/configure
+++ b/configure
@@ -562,7 +562,7 @@ fi
 
 
 
-# From configure.in Revision: 1.126 
+# From configure.in Revision: 1.127 
 RADIUSD_VERSION=0.2
 
 
@@ -4029,7 +4029,7 @@ fi
 echo "checking for PostgreSQL includes" 1>&6
 echo "configure:4031: checking for PostgreSQL includes" >&5
 
-if test -d $PGROOT ; then
+if test "x$PGROOT" != "x" ; then
 	IS_LOCAL=1
 else
 		if test -d /usr/local/pgsql ; then 
@@ -4046,7 +4046,7 @@ else
 		ISLOCAL=1
 	fi
 fi
-if test -d $PGROOT && test "x$IS_LOCAL" != "x" ; then
+if test "x$PGROOT" != "x" && test "x$IS_LOCAL" != "x" ; then
 	if test -e $PGROOT/lib/libpq${libltdl_cv_shlibext} ; then
 		if test -e $PGROOT/lib/libpq.a ; then
 			PQ_LIBS="-L$PGROOT/lib -lpq"
-- 
2.1.4