[geos-commits] r3016 - trunk
svn_geos at osgeo.org
svn_geos at osgeo.org
Sat Jun 19 07:32:49 EDT 2010
Author: strk
Date: 2010-06-19 11:32:49 +0000 (Sat, 19 Jun 2010)
New Revision: 3016
Modified:
trunk/configure.in
Log:
Check for PHP and PHPUNIT (for testing php bindings)
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2010-06-19 11:25:02 UTC (rev 3015)
+++ trunk/configure.in 2010-06-19 11:32:49 UTC (rev 3016)
@@ -304,16 +304,30 @@
if test x"$use_php" = xtrue; then
dnl Check for PHP
AC_PATH_PROG(PHP_CONFIG, php-config)
- dnl TODO: AC_SUBST ?
if test x"$PHP_CONFIG" = x; then
+ AC_MSG_WARN([php-config not found, php support disabled])
use_php=false
+ else
+
+ dnl TODO: check for version, we want PHP5 dev files
+
+ AC_PATH_PROG(PHP, php) dnl for unit testing
+ AC_PATH_PROG(PHPUNIT, phpunit) dnl for unit testing
+
+ if test x"$PHP" != x -a x"$PHPUNIT" != x; then
+ can_test_php=true
+ else
+ AC_MSG_WARN([php or phpunit not found, php binding tests disabled])
+ can_test_php=false
+ fi
+
fi
- dnl TODO: check for version, we want PHP5 dev files
fi
AM_CONDITIONAL(ENABLE_PHP, [ test x"$use_php" = xtrue ])
+AM_CONDITIONAL(ENABLE_PHP_TESTS, [ test x"$can_test_php" = xtrue ])
dnl --------------------------------------------------------------------
More information about the geos-commits
mailing list