Merge remote-tracking branch 'refs/remotes/origin/master'

 especially if it merges an updated upstream into a topic branch.

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

diff --git a/config.w32 b/config.w32
new file mode 100644 (file)
index 0000000..1d28775
--- /dev/null
+++ b/config.w32
@@ -0,0 +1,6 @@
+\r
+ARG_ENABLE("propro", "for propro support", "no");\r
+\r
+if (PHP_PROPRO == "yes") {\r
+               EXTENSION("propro", "php_propro.c");\r
+}\r

diff --git a/package.xml b/package.xml
index 1a816036dc8fe52fecc778a512e2ba77c64f9f90..cd6a80c5c717d5b4dde11212fe6dde6419746381 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -38,6 +38,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <file role="doc" name="LICENSE" />
    <file role="doc" name="Doxyfile" />
    <file role="src" name="config.m4" />
+   <file role="src" name="config.w32" />
    <file role="src" name="php_propro.h" />
    <file role="src" name="php_propro.c" />
    <dir name="tests">