CVS update: php3

Date: Saturday June 12, 1999 @ 14:28 Author: jim Update of /repository/php3 In directory php:/tmp/cvs-serv5609 Modified Files: configure.in Log Message: Look in another place for PostgreSQL headers (Debian is different). Index: php3/configure.in diff -u php3/configure.in:1.393 php3/configure.in:1.394 --- php3/configure.in:1.393 Sat Jun 12 14:21:48 1999 +++ php3/configure.in Sat Jun 12 14:28:08 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.393 1999/06/12 18:21:48 jim Exp $ +dnl $Id: configure.in,v 1.394 1999/06/12 18:28:08 jim Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -1321,23 +1321,18 @@ base install directory, defaults to /usr/local/pgsql.], [ if test "$withval" != "no"; then - if test "$withval" = "yes"; then - if test -f /usr/include/pgsql/libpq-fe.h; then - PGSQL_INCDIR=/usr/include/pgsql - else - PGSQL_INCDIR=/usr/local/pgsql/include - fi - if test -f /usr/lib/libpq.a; then - PGSQL_LIBDIR=/usr/lib - else - PGSQL_LIBDIR=/usr/local/pgsql/lib - fi - else - PGSQL_INCDIR=$withval/include - test -d $withval/include/pgsql && PGSQL_INCDIR=$withval/include/pgsql - PGSQL_LIBDIR=$withval/lib - test -d $withval/lib/pgsql && PGSQL_LIBDIR=$withval/lib/pgsql - fi + if test "$withval" = "yes"; then + withval=/usr/local + + fi + + PGSQL_INCDIR=$withval/include + test -d $withval/include/pgsql && PGSQL_INCDIR=$withval/include/pgsql + test -d $withval/include/postgresql && PGSQL_INCDIR=$withval/include/postgresql + PGSQL_LIBDIR=$withval/lib + test -d $withval/lib/pgsql && PGSQL_LIBDIR=$withval/lib/pgsql + test -d $withval/lib/postgresql && PGSQL_LIBDIR=$withval/lib/postgresql + PGSQL_INCLUDE=-I$PGSQL_INCDIR PGSQL_LFLAGS=-L$PGSQL_LIBDIR PGSQL_LIBS=-lpq