CVS update: php4/ext/pgsql

Date: Sunday June 20, 1999 @ 14:52 Author: sas Update of /repository/php4/ext/pgsql In directory php:/tmp/cvs-serv17490/ext/pgsql Modified Files: config.m4 Log Message: Introduce AC_ADD_* macros The use of AC_EXPAND_PATH makes it possible to continue to use relative paths when configuring PHP. (e.g. --with-apache=../apache-1.3.x works again) Index: php4/ext/pgsql/config.m4 diff -u php4/ext/pgsql/config.m4:1.1 php4/ext/pgsql/config.m4:1.2 --- php4/ext/pgsql/config.m4:1.1 Wed Apr 21 22:48:24 1999 +++ php4/ext/pgsql/config.m4 Sun Jun 20 14:52:45 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 1999/04/22 02:48:24 ssb Exp $ +dnl $Id: config.m4,v 1.2 1999/06/20 18:52:45 sas Exp $ AC_MSG_CHECKING(for PostgresSQL support) AC_ARG_WITH(pgsql, @@ -18,6 +18,8 @@ PGSQL_INCLUDE=-I$PGSQL_INCDIR PGSQL_LFLAGS=-L$PGSQL_LIBDIR PGSQL_LIBS=-lpq + AC_ADD_LIBRARY_WITH_PATH(pq, $PGSQL_LIBDIR) + AC_ADD_INCLUDE($PGSQL_INCDIR) old_CFLAGS=$CFLAGS; old_LDFLAGS=$LDFLAGS; old_LIBS=$LIBS CFLAGS="$CFLAGS $PGSQL_INCLUDE" @@ -28,8 +30,6 @@ AC_CHECK_FUNC(PQcmdTuples,AC_DEFINE(HAVE_PQCMDTUPLES)) CFLAGS=$old_CFLAGS; LDFLAGS=$old_LDFLAGS; LIBS=$old_LIBS PHP_EXTENSION(pgsql) - EXTRA_LIBS="$EXTRA_LIBS $PGSQL_LFLAGS $PGSQL_LIBS" - INCLUDES="$INCLUDES $PGSQL_INCLUDE" else AC_MSG_RESULT(no) fi