From: Pierre Joye <pierre.php@gmail.com>
Date: Thu, 14 Feb 2013 06:24:26 +0000 (+0100)
Subject: - fix windows build
X-Git-Tag: php-5.5.0beta1~42^2~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f74c938c950de1b0fcdb0ef2bd66760832b57a53;p=php

- fix windows build
---

diff --git a/config.w32 b/config.w32
index 6f3c89c135..feebe41afd 100644
--- a/config.w32
+++ b/config.w32
@@ -2,27 +2,27 @@ ARG_ENABLE("optimizer-plus", "whether to enable Zend OptimizerPlus support", "ye
 
 if (PHP_OPTIMIZER_PLUS != "no") {
 
-  PHP_PGI = "no"; // workaround
-  PHP_PGO = "no"; // workaround
+	PHP_PGI = "no"; // workaround
+	PHP_PGO = "no"; // workaround
 
-  EXTENSION('ZendOptimizerPlus', "\
-    ZendAccelerator.c \
-	zend_accelerator_blacklist.c \
-	zend_accelerator_debug.c \
-	zend_accelerator_hash.c \
-	zend_accelerator_module.c \
-	zend_accelerator_util_funcs.c \
-	zend_persist.c \
-	zend_persist_calc.c \
-	zend_shared_alloc.c \
-	shared_alloc_win32.c", true);
+	EXTENSION('ZendOptimizerPlus', "\
+		ZendAccelerator.c \
+		zend_accelerator_blacklist.c \
+		zend_accelerator_debug.c \
+		zend_accelerator_hash.c \
+		zend_accelerator_module.c \
+		zend_accelerator_util_funcs.c \
+		zend_persist.c \
+		zend_persist_calc.c \
+		zend_shared_alloc.c \
+		shared_alloc_win32.c", true);
 
-  ADD_SOURCES("Optimizer", "zend_optimizer.c", "ZendOptimizerPlus", "OptimizerObj");
+	ADD_SOURCES(configure_module_dirname + "/Optimizer", "zend_optimizer.c", "ZendOptimizerPlus", "OptimizerObj");
 
   
-  ADD_FLAG('CFLAGS_ZENDOPTIMIZERPLUS', "/I .");
-  ADD_FLAG('CFLAGS_ZENDOPTIMIZERPLUS', "/D HAVE_OPTIMIZER_PLUS=1");
+	ADD_FLAG('CFLAGS_ZENDOPTIMIZERPLUS', "/I " + configure_module_dirname);
+	ADD_FLAG('CFLAGS_ZENDOPTIMIZERPLUS', "/D HAVE_OPTIMIZER_PLUS=1");
 
-  ADD_FLAG('CFLAGS_ZENDOPTIMIZERPLUS', "/Dregexec=php_regexec /Dregerror=php_regerror /Dregfree=php_regfree /Dregcomp=php_regcomp /Iext/ereg/regex");
+	ADD_FLAG('CFLAGS_ZENDOPTIMIZERPLUS', "/Dregexec=php_regexec /Dregerror=php_regerror /Dregfree=php_regfree /Dregcomp=php_regcomp /Iext/ereg/regex");
 
 }