projects
/
m6w6
/
ext-pq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
better type handling for bool/double params
[m6w6/ext-pq]
/
config.m4
diff --git
a/config.m4
b/config.m4
index 18ee2504837b5d288850de491b73f68c1ed62fa2..8014c65fbf5a189fb63db65ca912189d03fe546d 100644
(file)
--- a/
config.m4
+++ b/
config.m4
@@
-1,5
+1,5
@@
-PHP_ARG_WITH(pq,
for pq support
,
-[ --with-pq Include pq support])
+PHP_ARG_WITH(pq,
[whether to enable libpq (PostgreSQL) support]
,
+[ --with-pq Include
lib
pq support])
if test "$PHP_PQ" != "no"; then
SEARCH_PATH="/usr/local /usr /opt"
if test "$PHP_PQ" != "no"; then
SEARCH_PATH="/usr/local /usr /opt"
@@
-17,7
+17,7
@@
if test "$PHP_PQ" != "no"; then
done
if test -z "$PQ_DIR"; then
done
if test -z "$PQ_DIR"; then
- AC_MSG_
FAILURE
(could not find include/libpq-events.h)
+ AC_MSG_
ERROR
(could not find include/libpq-events.h)
fi
PHP_ADD_INCLUDE($PQ_DIR/include)
fi
PHP_ADD_INCLUDE($PQ_DIR/include)
@@
-30,11
+30,27
@@
if test "$PHP_PQ" != "no"; then
],[
-L$PQ_DIR/$PHP_LIBDIR
])
],[
-L$PQ_DIR/$PHP_LIBDIR
])
- PHP_CHECK_LIBRARY(pq, PQlibVersion,
AC_DEFINE(HAVE_PQLIBVERSION, 1, Have PQlibVersion)
)
+ PHP_CHECK_LIBRARY(pq, PQlibVersion,
[AC_DEFINE(HAVE_PQLIBVERSION, 1, Have PQlibVersion)]
)
- PQ_SRC="src/php_pq.c"
+ PQ_SRC="\
+ src/php_pq_module.c\
+ src/php_pq_misc.c\
+ src/php_pq_callback.c\
+ src/php_pq_object.c\
+ src/php_pqcancel.c\
+ src/php_pqconn.c\
+ src/php_pqconn_event.c\
+ src/php_pqcopy.c\
+ src/php_pqexc.c\
+ src/php_pqlob.c\
+ src/php_pqres.c\
+ src/php_pqstm.c\
+ src/php_pqtxn.c\
+ src/php_pqtypes.c\
+ "
PHP_NEW_EXTENSION(pq, $PQ_SRC, $ext_shared)
PHP_NEW_EXTENSION(pq, $PQ_SRC, $ext_shared)
- PHP_ADD_BUILD_DIR($ext_builddir/src, 1)
+ PHP_ADD_BUILD_DIR($ext_builddir/src)
+ PHP_ADD_INCLUDE($ext_srcdir/src)
PHP_ADD_EXTENSION_DEP(pq, raphf)
fi
PHP_ADD_EXTENSION_DEP(pq, raphf)
fi