cvs: php-gtk / config.m4
| From: | Andrei Zmievski | Date: | Tue, 14 Aug 2007 21:34:59 +0000 |
| Subject: | cvs: php-gtk / config.m4 | ||
| Groups: | php.gtk.cvs | ||
| Request: | Send a blank email to php-gtk-cvs+get-2764@lists.php.net to get a copy of this message | ||
andrei Tue Aug 14 21:34:59 2007 UTC
Modified files:
/php-gtk config.m4
Log:
Check only first line of php -v for CLI/CGI version.
http://cvs.php.net/viewvc.cgi/php-gtk/config.m4?r1=1.19&r2=1.20&diff_format=u
Index: php-gtk/config.m4
diff -u php-gtk/config.m4:1.19 php-gtk/config.m4:1.20
--- php-gtk/config.m4:1.19 Thu Feb 22 17:20:39 2007
+++ php-gtk/config.m4 Tue Aug 14 21:34:59 2007
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.19 2007/02/22 17:20:39 andrei Exp $
+dnl $Id: config.m4,v 1.20 2007/08/14 21:34:59 andrei Exp $
dnl config.m4 for extension php-gtk
PHP_ARG_ENABLE(php-gtk,for PHP-GTK support,
@@ -27,7 +27,7 @@
AC_MSG_ERROR(Could not locate PHP executable)
fi
- PHP_SAPI=
$PHP --version | sed -n 's/.*(\(...\)).*/\1/p'
+ PHP_SAPI=$PHP --version | head -1 | sed -n 's/.*(\(...\)).*/\1/p'
if test "$PHP_SAPI" != "cli" ; then
AC_MSG_ERROR(PHP CLI version is required[,] $PHP_SAPI found)
fi
@@ -70,7 +70,7 @@
PHP_NEW_EXTENSION(php_gtk2, main/php_gtk.c main/phpg_support.c main/phpg_gtype.c \
main/phpg_exceptions.c main/php_gtk_util.c main/phpg_gvalue.c \
main/phpg_closure.c main/phpg_gboxed.c main/phpg_gpointer.c \
- main/phpg_atom.c main/phpg_gobject.c,
+ main/phpg_atom.c main/phpg_paramspec.c main/phpg_gobject.c,
$ext_shared,, -I@ext_srcdir@/main)
PHP_ADD_SOURCES_X(/main, php_gtk_ext.c,, shared_objects_php_gtk2)