Merge remote-tracking branch 'origin/master' into dev

Author: viest

config.m4

@@ -102,8 +102,8 @@ if test "$PHP_XLSWRITER" != "no"; then
 
     PHP_NEW_EXTENSION(xlswriter, $xls_writer_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 
-    PHP_ADD_INCLUDE([$ext_builddir])
-    PHP_ADD_INCLUDE([$ext_builddir/include])
+    PHP_ADD_INCLUDE([$srcdir])
+    PHP_ADD_INCLUDE([$srcdir/include])
 
     PHP_ADD_BUILD_DIR([$ext_builddir/kernel])
     PHP_ADD_BUILD_DIR([$ext_builddir/library/src])