diff --git a/build_dist.sh b/build_dist.sh
index 5f55d3468..79f461a3c 100755
--- a/build_dist.sh
+++ b/build_dist.sh
@@ -1,14 +1,15 @@
 #!/bin/sh
 rm -f config.cache
 rm -fr autom4te.cache
+rm -rf config.log
+rm -rf Makefile
 chmod a-x docs/*.rst docs/*.htm*
 
-/opt/local/bin/autoheader
-/opt/local/bin/aclocal -I m4
-/opt/local/bin/glibtool -f
-/opt/local/bin/automake -ac
-/opt/local/bin/autoconf
-./configure --enable-python-binding --with-zlib=shipped --enable-examples=yes --enable-tests=yes
-# --with-boost-python=mt-1_35 --with-boost-thread=mt-1_35 --with-boost-system=mt-1_35 --with-boost-filesystem=mt-1_35 --with-boost-regex=mt-1_35 --with-boost-program-options=mt-1_35
-make dist check
+autoheader
+aclocal -I m4
+glibtoolize -f
+automake -ac
+autoconf
+./configure --enable-python-binding --with-zlib=shipped --enable-examples=yes --enable-tests=yes --with-boost-system=mt --with-boost-python=mt --with-boost-thread=mt --with-boost-filesystem=mt --with-boost-regex=mt --with-boost-program-options=mt
+make -j 8 dist check
 
diff --git a/m4/ax_python-fixed.m4 b/m4/ax_python-fixed.m4
index ca50f73f7..3340cf2fa 100644
--- a/m4/ax_python-fixed.m4
+++ b/m4/ax_python-fixed.m4
@@ -59,13 +59,18 @@ AC_DEFUN([AX_PYTHON],
 [AC_MSG_CHECKING(for python build information)
 AC_MSG_RESULT([])
 for python in python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
-AC_CHECK_PROGS(PYTHON_BIN, [$python])
+# AC_CHECK_PROGS(PYTHON_BIN, [$python])
+PYTHON_BIN=$python
 ax_python_bin=$PYTHON_BIN
 if test x$ax_python_bin != x; then
    AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no)
-   AC_CHECK_HEADER([$ax_python_bin/Python.h],
-   ax_python_header=/usr/include/$ax_python_bin,
-   ax_python_header=no)
+   AC_CHECK_HEADER([$ax_python_bin/Python.h], ax_python_header=/usr/include/$ax_python_bin, ax_python_header=no)
+   if test $ax_python_lib != no; then
+     if test $ax_python_header != no; then
+       break;
+     fi
+   fi
+   AC_CHECK_HEADER([$ax_python_bin/Python.h], ax_python_header=/opt/local/include/$ax_python_bin, ax_python_header=no)
    if test $ax_python_lib != no; then
      if test $ax_python_header != no; then
        break;