1 files changed, 5 insertions, 2 deletions
diff --git a/bootstrap b/bootstrap
index c6be052..c014abf 100755
--- a/bootstrap
+++ b/bootstrap
@@ -6,6 +6,9 @@ if [ "${BASH_VERSINFO[0]}" -lt 4 ]; then
     exit 1
 fi
 
+# see #849
+unset CDPATH
+
 ########################################
 # Common meta-language implementation. Syntax:
 #
@@ -800,7 +803,7 @@ msg "*** Gathering the list of data files to install"
             scripts/compile | scripts/missing | scripts/depcomp | scripts/ltmain.sh | scripts/install-sh)
                 continue
                 ;;
-            # 
+            #
             # will produce. FIXME: create this file at the time of 'ct-ng build'.
             config/configure.in.in | config/configure.in)
                 continue
@@ -817,6 +820,6 @@ msg "*** Gathering the list of data files to install"
 } > verbatim-data.mk
 
 msg "*** Running autoreconf"
-autoreconf -Wall --force
+autoreconf -Wall --force -I m4
 
 msg "*** Done!"