From: Michael Wallner <mike@php.net>
Date: Thu, 5 Dec 2013 08:37:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'refs/remotes/origin/master'
X-Git-Tag: release-1.0.2RC1~20
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=9155673850189951e27e188f2003ba68d8ea2c67;hp=8097dc0ba0178a6652959fc3d3ffbc8ebb319935;p=m6w6%2Fext-propro

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 20c5e8b..a59cb22 100644
--- 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
index 0000000..1d28775
--- /dev/null
+++ b/config.w32
@@ -0,0 +1,6 @@
+
+ARG_ENABLE("propro", "for propro support", "no");
+
+if (PHP_PROPRO == "yes") {
+		EXTENSION("propro", "php_propro.c");
+}
diff --git a/package.xml b/package.xml
index 1a81603..cd6a80c 100644
--- 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">