nlopess Thu Apr 29 11:19:26 2004 EDT
Modified files:
/phpdoc Makefile.in configure.in
Log:
enable version checking. works well on cygwin
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.148&r2=1.149&ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.148 phpdoc/Makefile.in:1.149
--- phpdoc/Makefile.in:1.148 Sat Apr 17 12:10:02 2004
+++ phpdoc/Makefile.in Thu Apr 29 11:19:26 2004
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.148 2004/04/17 16:10:02 kennyt Exp $
+# $Id: Makefile.in,v 1.149 2004/04/29 15:19:26 nlopess Exp $
#
all: html
@@ -39,7 +39,6 @@
[EMAIL PROTECTED]@
-VERSION="@PHP_VERSION@"
HTML_STYLESHEET=dsssl/html.dsl
PHPWEB_STYLESHEET=dsssl/phpweb.dsl
HOWTO_STYLESHEET=dsssl/howto.dsl
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.200&r2=1.201&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.200 phpdoc/configure.in:1.201
--- phpdoc/configure.in:1.200 Sun Feb 8 07:58:13 2004
+++ phpdoc/configure.in Thu Apr 29 11:19:26 2004
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.200 2004/02/08 12:58:13 leszek Exp $
+dnl $Id: configure.in,v 1.201 2004/04/29 15:19:26 nlopess Exp $
dnl autoconf initialisation
AC_INIT()
@@ -67,14 +67,14 @@
else
AC_MSG_CHECKING([php version])
PHPVERSION=`$PHP -q -f $srcdir/scripts/version.php`
-# version check disabled for now, seems to be causing troubles on cygwin
-# if test "yes" = `echo '<?php echo phpversion()>3?"yes":"no"; ?>' | $PHP -q`; then
+
+ if test "yes" = `echo '<?php echo phpversion()>3?"yes":"no"; ?>' | $PHP -q`; then
+ AC_MSG_RESULT($PHPVERSION)
+ else
AC_MSG_RESULT($PHPVERSION)
-# else
-# AC_MSG_RESULT($PHPVERSION)
-# AC_MSG_ERROR([PHP version 4.0.0 or newer needed])
-# PHP=no
-# fi
+ AC_MSG_ERROR([PHP version 4.0.0 or newer needed])
+ PHP=no
+ fi
fi
AC_SUBST(PHP)
