Merge pull request #833

Author: jmikola

bin/prep-release.php

@@ -35,8 +35,8 @@ function get_files() {
         "phongo_*.{h,c}",
         "config.{m4,w32}",
         "Makefile.frag",
-        "scripts/build/autotools/*.{m4}",
-        "scripts/build/autotools/m4/*.{m4}",
+        "scripts/autotools/*.{m4}",
+        "scripts/autotools/*/*.{m4}",
 
         "src/*.{c,h}",
 

config.m4

@@ -245,32 +245,32 @@ if test "$PHP_MONGODB" != "no"; then
     ])
 
     dnl Avoid using AC_CONFIG_MACRO_DIR, which might conflict with PHP
-    _include([scripts/build/autotools/m4/ac_compile_check_sizeof.m4])
-    _include([scripts/build/autotools/m4/ac_create_stdint_h.m4])
-    _include([scripts/build/autotools/m4/as_var_copy.m4])
-    _include([scripts/build/autotools/m4/ax_check_compile_flag.m4])
-    _include([scripts/build/autotools/m4/ax_prototype.m4])
-    _include([scripts/build/autotools/m4/ax_pthread.m4])
-    _include([scripts/build/autotools/m4/php_mongodb.m4])
-    _include([scripts/build/autotools/m4/pkg.m4])
-
-    _include([scripts/build/autotools/CheckCompiler.m4])
-    _include([scripts/build/autotools/CheckHost.m4])
-
-    _include([scripts/build/autotools/libbson/CheckAtomics.m4])
-    _include([scripts/build/autotools/libbson/CheckHeaders.m4])
-    _include([scripts/build/autotools/libbson/Endian.m4])
-    _include([scripts/build/autotools/libbson/FindDependencies.m4])
-    _include([scripts/build/autotools/libbson/Versions.m4])
-
-    _include([scripts/build/autotools/libmongoc/CheckCompression.m4])
-    _include([scripts/build/autotools/libmongoc/CheckResolv.m4])
-    _include([scripts/build/autotools/libmongoc/CheckSasl.m4])
-    _include([scripts/build/autotools/libmongoc/CheckSSL.m4])
-    _include([scripts/build/autotools/libmongoc/FindDependencies.m4])
-    _include([scripts/build/autotools/libmongoc/PlatformFlags.m4])
-    _include([scripts/build/autotools/libmongoc/Versions.m4])
-    _include([scripts/build/autotools/libmongoc/WeakSymbols.m4])
+    _include([scripts/autotools/m4/ac_compile_check_sizeof.m4])
+    _include([scripts/autotools/m4/ac_create_stdint_h.m4])
+    _include([scripts/autotools/m4/as_var_copy.m4])
+    _include([scripts/autotools/m4/ax_check_compile_flag.m4])
+    _include([scripts/autotools/m4/ax_prototype.m4])
+    _include([scripts/autotools/m4/ax_pthread.m4])
+    _include([scripts/autotools/m4/php_mongodb.m4])
+    _include([scripts/autotools/m4/pkg.m4])
+
+    _include([scripts/autotools/CheckCompiler.m4])
+    _include([scripts/autotools/CheckHost.m4])
+
+    _include([scripts/autotools/libbson/CheckAtomics.m4])
+    _include([scripts/autotools/libbson/CheckHeaders.m4])
+    _include([scripts/autotools/libbson/Endian.m4])
+    _include([scripts/autotools/libbson/FindDependencies.m4])
+    _include([scripts/autotools/libbson/Versions.m4])
+
+    _include([scripts/autotools/libmongoc/CheckCompression.m4])
+    _include([scripts/autotools/libmongoc/CheckResolv.m4])
+    _include([scripts/autotools/libmongoc/CheckSasl.m4])
+    _include([scripts/autotools/libmongoc/CheckSSL.m4])
+    _include([scripts/autotools/libmongoc/FindDependencies.m4])
+    _include([scripts/autotools/libmongoc/PlatformFlags.m4])
+    _include([scripts/autotools/libmongoc/Versions.m4])
+    _include([scripts/autotools/libmongoc/WeakSymbols.m4])
 
     m4_popdef([_include])