[geos-commits] r3081 - in trunk: . php/test

svn_geos at osgeo.org svn_geos at osgeo.org
Tue Jul 13 07:03:49 EDT 2010


Author: strk
Date: 2010-07-13 11:03:49 +0000 (Tue, 13 Jul 2010)
New Revision: 3081

Modified:
   trunk/configure.in
   trunk/php/test/Makefile.am
Log:
Cleanup PHP-specific dependency handling and reporting


Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2010-07-08 20:54:50 UTC (rev 3080)
+++ trunk/configure.in	2010-07-13 11:03:49 UTC (rev 3081)
@@ -314,20 +314,13 @@
 
 		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
 
 
 fi
 AM_CONDITIONAL(ENABLE_PHP, [ test x"$use_php" = xtrue ])
-AM_CONDITIONAL(ENABLE_PHP_TESTS, [ test x"$can_test_php" = xtrue ])
+AM_CONDITIONAL(HAVE_PHP, [ test x"$PHP" != x ])
+AM_CONDITIONAL(HAVE_PHP_UNIT, [ test x"$PHPUNIT" != x ])
 
 
 dnl --------------------------------------------------------------------
@@ -516,7 +509,16 @@
 dnl -- echo "---------------------------------------"
 dnl -- echo "Boost UTF: $use_boost_utf"
 echo "Swig: $use_swig"
-echo "Python: $use_python"
-echo "Ruby: $use_ruby"
-echo "PHP: $use_php"
+echo "Python bindings: $use_python"
+echo "Ruby bindings: $use_ruby"
+
+echo "PHP bindings: $use_php"
+if test x"$use_php" = xtrue; then
+ echo " PHP: $PHP"
+ echo " PHPUNIT: $PHPUNIT"
+ if test x"$PHP" != x -o x"$PHPUNIT" != x; then
+   AC_MSG_WARN([PHP Unit testing disabled (missing PHP or PHPUNIT)])
+ fi
+fi
+
 dnl -- echo "---------------------------------------"

Modified: trunk/php/test/Makefile.am
===================================================================
--- trunk/php/test/Makefile.am	2010-07-08 20:54:50 UTC (rev 3080)
+++ trunk/php/test/Makefile.am	2010-07-13 11:03:49 UTC (rev 3081)
@@ -27,22 +27,26 @@
 abs_topbuilddir=`cd $(top_builddir); pwd`
 abs_srcdir=`cd $(srcdir); pwd`
 
-if ENABLE_PHP_TESTS
+if HAVE_PHP
 
+PHPOPTS = -n -d enable_dl=On -d extension_dir=$(abs_topbuilddir)/php/.libs
+
+crashtest:
+	$(PHP) $(PHPOPTS) $(abs_srcdir)/crashme.php
+
+if HAVE_PHP_UNIT
+
 TESTS = phpunit
 
-PHPOPTS = -n -d enable_dl=On -d extension_dir=$(abs_topbuilddir)/php/.libs
-
 phpunit: test.php 
 	echo "#!/bin/sh" > $@ 
 	echo "$(PHP) $(PHPOPTS) $(PHPUNIT) test $(abs_srcdir)/test.php $$@" >> $@
 	chmod +x $@
 
-crashtest:
-	$(PHP) $(PHPOPTS) $(abs_srcdir)/crashme.php
-
 clean-local:
 	rm -f phpunit
 
 
 endif
+
+endif



More information about the geos-commits mailing list