auroraeosrose		Wed Jul 30 19:34:26 2008 UTC

  Modified files:              
    /php-gtk/ext/gtk+	config.w32 
    /php-gtk/main	php_gtk.c php_gtk.h 
    /php-gtk/win32	confutils.js 
  Log:
  Add cairo support to windows config system and make cairo extension a dep of php-gtk if enabled
  
http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/config.w32?r1=1.9&r2=1.10&diff_format=u
Index: php-gtk/ext/gtk+/config.w32
diff -u php-gtk/ext/gtk+/config.w32:1.9 php-gtk/ext/gtk+/config.w32:1.10
--- php-gtk/ext/gtk+/config.w32:1.9	Mon Mar 10 17:09:06 2008
+++ php-gtk/ext/gtk+/config.w32	Wed Jul 30 19:34:26 2008
@@ -13,11 +13,16 @@
 	CHECK_HEADER("gdk/gdk.h") && CHECK_LIB("gdk-win32-2.0.lib", "php-gtk") &&
 	CHECK_HEADER("gtk/gtk.h") && CHECK_LIB("gtk-win32-2.0.lib", "php-gtk")) {
 
+	if (!ENABLE_CAIRO || (ENABLE_CAIRO && CHECK_HEADER_ADD_INCLUDE("ext/cairo/php_cairo_api.h") && CHECK_LIB("php_cairo.lib"))) {
+	
 		ADD_FLAG("CFLAGS_PHP_GTK", "/I ext\\gtk+ /I ..\\ext\\gtk+ /D HAVE_PHP_GTK=1");
 
 		EXTENSION("php-gtk", "gen_atk.c gen_gdk.c gen_gtk.c gen_pango.c php_gdk.c php_gtk+.c php_gtk+_types.c phpg_custom_tree_model.c", true); // always shared
 
 		AC_DEFINE("HAVE_PHP_GTK", 1, "PHP-GTK enabled");
+		if (ENABLE_CAIRO) {
+			ADD_FLAG("CFLAGS_PHP_GTK", "/D HAVE_CAIRO");
+		}
 
 		/* Create the file if it doesn't exist */
 		var temp = FSO.OpenTextFile("win32\\temp.bat", 8);
@@ -33,4 +38,5 @@
 		temp.WriteLine('grep -h "^PHP_GTK_EXPORT_CE" ext\\gtk+\\gen_gdk.c | sed -e "s/^/PHP_GTK_API extern /" > ext\\gtk+\\gen_gdk.h');
 		temp.WriteLine('grep -h "^PHP_GTK_EXPORT_CE" ext\\gtk+\\gen_gtk.c | sed -e "s/^/PHP_GTK_API extern /" > ext\\gtk+\\gen_gtk.h');
 		temp.Close();
+	}
 }
http://cvs.php.net/viewvc.cgi/php-gtk/main/php_gtk.c?r1=1.61&r2=1.62&diff_format=u
Index: php-gtk/main/php_gtk.c
diff -u php-gtk/main/php_gtk.c:1.61 php-gtk/main/php_gtk.c:1.62
--- php-gtk/main/php_gtk.c:1.61	Sat Jul 12 23:52:25 2008
+++ php-gtk/main/php_gtk.c	Wed Jul 30 19:34:26 2008
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
-/* $Id: php_gtk.c,v 1.61 2008/07/12 23:52:25 auroraeosrose Exp $: */
+/* $Id: php_gtk.c,v 1.62 2008/07/30 19:34:26 auroraeosrose Exp $: */
 
 #include "php_gtk.h"
 #include "SAPI.h"
@@ -47,11 +47,24 @@
 
 ZEND_DECLARE_MODULE_GLOBALS(gtk);
 
+#ifdef HAVE_CAIRO
+static const zend_module_dep gtk_cairo_deps[] = {
+	ZEND_MOD_REQUIRED("cairo")
+	{NULL, NULL, NULL}
+};
+#endif
+
 zend_module_entry gtk_module_entry = {
-	STANDARD_MODULE_HEADER,
-	"php-gtk",
+	STANDARD_MODULE_HEADER_EX,
+	NULL,  /* no ini entries */
+#ifdef HAVE_CAIRO
+	gtk_cairo_deps,
+#else
 	NULL,
-	PHP_MINIT(gtk),
+#endif
+ 	"php-gtk",
+ 	NULL,
+ 	PHP_MINIT(gtk),
 	PHP_MSHUTDOWN(gtk),
 	PHP_RINIT(gtk),
 	PHP_RSHUTDOWN(gtk),
http://cvs.php.net/viewvc.cgi/php-gtk/main/php_gtk.h?r1=1.155&r2=1.156&diff_format=u
Index: php-gtk/main/php_gtk.h
diff -u php-gtk/main/php_gtk.h:1.155 php-gtk/main/php_gtk.h:1.156
--- php-gtk/main/php_gtk.h:1.155	Sun May 11 16:30:08 2008
+++ php-gtk/main/php_gtk.h	Wed Jul 30 19:34:26 2008
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
-/* $Id: php_gtk.h,v 1.155 2008/05/11 16:30:08 andrei Exp $: */
+/* $Id: php_gtk.h,v 1.156 2008/07/30 19:34:26 auroraeosrose Exp $: */
 
 #ifndef _PHP_GTK_H
 #define _PHP_GTK_H
@@ -30,6 +30,9 @@
 #endif
 #include "php.h"
 #include "php_ini.h"
+#ifdef HAVE_CAIRO
+#include "ext/cairo/php_cairo_api.h"
+#endif
 
 /* workaround for expat-related declaration in PHP compat file */
 #ifdef lookup
http://cvs.php.net/viewvc.cgi/php-gtk/win32/confutils.js?r1=1.22&r2=1.23&diff_format=u
Index: php-gtk/win32/confutils.js
diff -u php-gtk/win32/confutils.js:1.22 php-gtk/win32/confutils.js:1.23
--- php-gtk/win32/confutils.js:1.22	Tue Jan 22 23:49:07 2008
+++ php-gtk/win32/confutils.js	Wed Jul 30 19:34:26 2008
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-// $Id: confutils.js,v 1.22 2008/01/22 23:49:07 sfox Exp $
+// $Id: confutils.js,v 1.23 2008/07/30 19:34:26 auroraeosrose Exp $
 
 /* set vars */
 var STDOUT = WScript.StdOut;
@@ -81,6 +81,9 @@
 		if (minor < 6)
 			minor = 6;
 	
+		if (major >= 2 && minor >=8) {
+			ENABLE_CAIRO = 1;
+		}
 		PHP_GTK_LIBVERSION = major + '.' + minor;
 	} else {
 		STDOUT.WriteLine("	<not found>");
@@ -601,10 +604,10 @@
 	return false;
 }
 
-function CHECK_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check, use_env, add_dir_part, add_to_flag_only) {
-
+function CHECK_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check, use_env, add_dir_part, add_to_flag_only)
+{
 	var dir_part_to_add = "";
-
+	
 	if (use_env == null) {
 		use_env = true;
 	}
@@ -622,7 +625,7 @@
 	} else {
 		path_to_check += ";" + php_usual_include_suspects;
 	}
-
+	
 	var p = search_paths(header_name, path_to_check, use_env ? "INCLUDE" : null);
 	var have = 0;
 	var sym;
@@ -636,13 +639,13 @@
 	sym = header_name.toUpperCase();
 	sym = sym.replace(new RegExp("[\\\\/\.-]", "g"), "_");
 
-	if (typeof(add_to_flag_only) == "undefined" &&
+	if (typeof(add_to_flag_only) == undefined &&
 			flag_name.match(new RegExp("^CFLAGS_(.*)$"))) {
 		add_to_flag_only = true;
 	}
 
-	if (typeof(add_to_flag_only) != "undefined") {
-		ADD_FLAG(flag_name, "/D HAVE_" + sym + "=" + have);
+	if (typeof(add_to_flag_only) != undefined) {
+		ADD_FLAG(flag_name, "/DHAVE_" + sym + "=" + have);
 	} else {
 		AC_DEFINE("HAVE_" + sym, have, "have the " + header_name + " header file");
 	}