- finish windows support

diff --git a/ext/enchant/config.w32 b/ext/enchant/config.w32
index f9ba6beafc3328372fd95d895eba2e96daf5059b..08075031a66e7c93b4110ac02107b3259efaa685 100644 (file)
--- a/ext/enchant/config.w32
+++ b/ext/enchant/config.w32
@@ -1,12 +1,15 @@
 // $Id$
 // vim:ft=javascript
 
-ARG_ENABLE("enchant", "Enchant Support", "no");
+ARG_WITH("enchant", "Enchant Support", "no");
 
 if (PHP_ENCHANT == "yes") {
-       if (CHECK_HEADER_ADD_INCLUDE("enchant.h", "CFLAGS_ENCHANT", PHP_ENCHANT)) {
+       if (CHECK_HEADER_ADD_INCLUDE("enchant.h", "CFLAGS_ENCHANT", PHP_ENCHANT+ ";" + PHP_PHP_BUILD + "\\include\\enchant") &&
+                       CHECK_HEADER_ADD_INCLUDE("glib.h", "CFLAGS_ENCHANT", PHP_ENCHANT+ ";" + PHP_PHP_BUILD + "\\include\\glib-2.0") &&
+                       CHECK_LIB("libenchant.lib", "enchant", PHP_ENCHANT) ) {
                EXTENSION("enchant", "enchant.c");
                AC_DEFINE('HAVE_ENCHANT', 1, 'Have Enchant support', false);
+               ADD_FLAG("CFLAG_ENCHANT", "/D _WIN32");
        } else {
                WARNING('Could not find enchant.h; skipping');
        }