Merge remote-tracking branch 'php/master'

diff --git a/.gitignore b/.gitignore
index 20c5e8b98fe81182da1f40c102f0dc8bc7eb3bc8..076cb14794ba8005b4b99c622ac72420cb8b5dab 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@
 /.deps
 /*.lo
 /*.la
-/config.[^m]*
+/config.[^mw]*
 /configure*
 /lib*
 /ac*.m4

diff --git a/config.w32 b/config.w32
new file mode 100644 (file)
index 0000000..e33ea76
--- /dev/null
+++ b/config.w32
@@ -0,0 +1,7 @@
+\r
+\r
+ARG_ENABLE("raphf", "for raphf support", "no");\r
+\r
+if (PHP_RAPHF == "yes") {\r
+               EXTENSION("raphf", "php_raphf.c");\r
+}\r

diff --git a/package.xml b/package.xml
index 2eac6d7ffa1f01d3b461c392316d10763b5474a2..5dbc3fbd593a285058b1b5c239569a808c01898e 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -37,6 +37,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <file role="doc" name="CREDITS" />
    <file role="doc" name="LICENSE" />
    <file role="src" name="config.m4" />
+   <file role="src" name="config.w32" />
    <file role="src" name="php_raphf.h" />
    <file role="src" name="php_raphf.c" />
    <dir name="tests">