fix package.xml

[m6w6/ext-pq] / config.m4

diff --git a/config.m4 b/config.m4
index cfb995bfc3e1528267d9e1a24e551798657fbad8..ed20d5620964ea98c6da02ed0e6c277cb0adf9d0 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -1,7 +1,5 @@
 PHP_ARG_WITH(pq, [whether to enable libpq (PostgreSQL) support],
-[  --with-pq                      Include libpq support])
-PHP_ARG_WITH(pq-postgresql, [where to find PostgreSQL server headers],
-[  --with-pq-postgresql        Define some standard type IODs from catalog/pg_type.h], [$PHP_PQ])
+[  --with-pq[=DIR]           Include libpq support])
 
 if test "$PHP_PQ" != "no"; then
        SEARCH_PATH="/usr/local /usr /opt"
@@ -39,6 +37,7 @@ if test "$PHP_PQ" != "no"; then
                src/php_pq_misc.c\
                src/php_pq_callback.c\
                src/php_pq_object.c\
+               src/php_pq_params.c\
                src/php_pqcancel.c\
                src/php_pqconn.c\
                src/php_pqconn_event.c\
@@ -49,28 +48,12 @@ if test "$PHP_PQ" != "no"; then
                src/php_pqstm.c\
                src/php_pqtxn.c\
                src/php_pqtypes.c\
+               src/php_pqcur.c\
        "
        PHP_NEW_EXTENSION(pq, $PQ_SRC, $ext_shared)
        PHP_ADD_BUILD_DIR($ext_builddir/src)
        PHP_ADD_INCLUDE($ext_srcdir/src)
        PHP_ADD_EXTENSION_DEP(pq, raphf)
        
-       if test "$PHP_PQ_POSTGRESQL" != "no"; then
-               if test "$PHP_PQ_POSTGRESQL" != "yes"; then
-                       SEARCH_PATH="$PHP_PQ_POSTGRESQL $SEARCH_PATH"
-               fi
-               for i in $SEARCH_PATH; do
-                       CATALOG="$i/include/postgresql/server/catalog/pg_type.h"
-                       AC_MSG_CHECKING(for $CATALOG)
-                       if test -f "$CATALOG"; then
-                               AC_MSG_RESULT(yep)
-                               AC_PROG_AWK()
-                               $AWK -f $ext_srcdir/php_pq_type.awk < "$CATALOG" > $ext_srcdir/php_pq_type.h
-                               AC_DEFINE(HAVE_PHP_PQ_TYPE_H, 1, Have PostgreSQL type OID defs)
-                               break
-                       fi
-                       AC_MSG_RESULT(nope)
-               done
-       fi
 fi