andrei		Tue Sep 23 16:13:59 2008 UTC

  Modified files:              
    /php-gtk	config.m4 
  Log:
  Use php-config to look for PHP executable.
  
  
http://cvs.php.net/viewvc.cgi/php-gtk/config.m4?r1=1.23&r2=1.24&diff_format=u
Index: php-gtk/config.m4
diff -u php-gtk/config.m4:1.23 php-gtk/config.m4:1.24
--- php-gtk/config.m4:1.23	Wed Feb 13 05:05:27 2008
+++ php-gtk/config.m4	Tue Sep 23 16:13:59 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.23 2008/02/13 05:05:27 andrei Exp $
+dnl $Id: config.m4,v 1.24 2008/09/23 16:13:59 andrei Exp $
 dnl config.m4 for extension php-gtk
 
 PHP_ARG_ENABLE(php-gtk,for PHP-GTK support,
@@ -8,10 +8,11 @@
   --enable-php-gtk        Enable PHP-GTK support])
 
 if test "$PHP_PHP_GTK" != "no"; then
-  PHP_PREFIX=`$PHP_CONFIG --prefix`
-  AC_MSG_CHECKING(for PHP executable in $PHP_PREFIX/bin)
-  if test -x $PHP_PREFIX/bin/php; then
-    PHP_VERSION=`$PHP_CONFIG --version`
+  AC_MSG_CHECKING(for PHP executable)
+  PHP_PREFIX=`$PHP_CONFIG --prefix 2>/dev/null`
+  PHP=`$PHP_CONFIG --php-binary 2>/dev/null`
+  if test -x "$PHP" -o -x "$PHP_PREFIX/bin/php"; then 
+    PHP_VERSION=`$PHP_CONFIG --version 2>/dev/null`
     AC_MSG_RESULT(found version $PHP_VERSION)
 
     case $PHP_VERSION in
@@ -22,7 +23,9 @@
 the location of php-config for the required version.])
         ;;
     esac
-    PHP=$PHP_PREFIX/bin/php
+	if test ! -x "$PHP"; then
+		PHP=$PHP_PREFIX/bin/php
+	fi
   else
     AC_MSG_ERROR(Could not locate PHP executable)
   fi