diff --exclude=autom4te.cache --exclude='*~' -urN quickfix-autotools-bootstrap/configure.in quickfix-python-build-patches/configure.in
--- quickfix-autotools-bootstrap/configure.in	2010-04-05 10:48:38.000000000 +0800
+++ quickfix-python-build-patches/configure.in	2011-04-18 00:28:29.528198004 +0800
@@ -129,29 +129,18 @@
 ########################################
 # PYTHON
 ########################################
-has_python=false
 AC_ARG_WITH(python,
-    [  --with-python=<path>     directory containing python headers e.g. /usr/local/include/python2.3], 
-    [if test $withval == "no"
+    [  --with-python     yes or no...set PYTHON env variable to control which python headers are used],
+    [if test $withval == "yes"
      then
-       has_python=false
-     else
-       has_python=true
+       AM_PATH_PYTHON(,, :)
+       PYTHON_CFLAGS="-I${PYTHON_PREFIX}/include/python${PYTHON_VERSION}"
+       AC_SUBST(PYTHON_CFLAGS)
      fi],
     has_python=false
 )
-PYTHON_PREFIX=$with_python
-AC_SUBST(PYTHON_PREFIX)
+AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ""])
 
-if test $has_python = true
-then
-    PYTHON_CFLAGS="-I${PYTHON_PREFIX}" 
-    AC_SUBST(PYTHON_CFLAGS)
-    PYTHON_SITE_PACKAGES=[`python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'`]
-    AC_SUBST(PYTHON_SITE_PACKAGES)
-    AC_DEFINE(HAVE_PYTHON, 1, Define if you have python)
-fi
-AM_CONDITIONAL(HAVE_PYTHON, $has_python)
 ########################################
 
 ########################################
diff --exclude=autom4te.cache --exclude='*~' -urN quickfix-autotools-bootstrap/src/python/Makefile.am quickfix-python-build-patches/src/python/Makefile.am
--- quickfix-autotools-bootstrap/src/python/Makefile.am	2010-04-05 10:57:42.000000000 +0800
+++ quickfix-python-build-patches/src/python/Makefile.am	2011-04-18 00:26:02.322198007 +0800
@@ -1,61 +1,25 @@
-lib_LTLIBRARIES = libquickfix_python.la
-libquickfix_python_la_SOURCES = \
-	QuickfixPython.cpp
+QuickfixPython.cpp:
+	./swig.sh
 
-pkgdata_DATA = quickfix.py quickfix40.py quickfix41.py quickfix42.py quickfix43.py quickfix44.py quickfix50.py quickfix50sp1.py quickfix50sp2.py quickfixt11.py
-
-all-local:
-	mkdir -p $(top_builddir)/lib/python
-	ln -sf ../../src/python/.libs/libquickfix_python.so $(top_builddir)/lib/python/_quickfix.so 
-	ln -sf ../../src/python/.libs/libquickfix_python.dylib $(top_builddir)/lib/python/_quickfix.dylib 
-	ln -sf ../../src/python/quickfix.py $(top_builddir)/lib/python/quickfix.py
-	ln -sf ../../src/python/quickfix40.py $(top_builddir)/lib/python/quickfix40.py
-	ln -sf ../../src/python/quickfix41.py $(top_builddir)/lib/python/quickfix41.py
-	ln -sf ../../src/python/quickfix42.py $(top_builddir)/lib/python/quickfix42.py
-	ln -sf ../../src/python/quickfix43.py $(top_builddir)/lib/python/quickfix43.py
-	ln -sf ../../src/python/quickfix44.py $(top_builddir)/lib/python/quickfix44.py
-	ln -sf ../../src/python/quickfix50.py $(top_builddir)/lib/python/quickfix50.py
-	ln -sf ../../src/python/quickfix50sp1.py $(top_builddir)/lib/python/quickfix50sp1.py
-	ln -sf ../../src/python/quickfix50sp2.py $(top_builddir)/lib/python/quickfix50sp2.py
-	ln -sf ../../src/python/quickfixt11.py $(top_builddir)/lib/python/quickfixt11.py
-
-	bash ./link.sh $(top_builddir)/lib/python _quickfix.so _quickfix.dylib
-
-clean-local:
-	rm -rf $(top_builddir)/lib/python
-
-install-exec-local:
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/_quickfix.so
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/_quickfix.dylib
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix40.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix41.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix42.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix43.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix44.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix50.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix50sp1.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix50sp2.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfixt11.py
-	ln -sf $(prefix)/lib/python/_quickfix.so $(PYTHON_SITE_PACKAGES)/_quickfix.so
-	ln -sf $(prefix)/lib/python/_quickfix.dylib $(PYTHON_SITE_PACKAGES)/_quickfix.dylib
-	cp $(top_builddir)/lib/python/*.py $(PYTHON_SITE_PACKAGES)
-
-uninstall-local:
-	rm -rf $(PYTHON_SITE_PACKAGES)/_quickfix.so
-	rm -rf $(PYTHON_SITE_PACKAGES)/_quickfix.dylib
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix40.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix41.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix42.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix43.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix44.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix50.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix50sp1.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix50sp2.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfixt11.py
-
-libquickfix_python_la_LDFLAGS = -version-info 10:0:0
-libquickfix_python_la_LIBADD = $(top_builddir)/src/C++/libquickfix.la 
-
-INCLUDES =-I. -I.. -I../..
+# TODO: remove
+#pyexec_LTLIBRARIES = libquickfix_python.la
+#libquickfix_python_la_SOURCES = QuickfixPython.cpp
+#libquickfix_python_la_LDFLAGS = -version-info 14:0:0
+#libquickfix_python_la_LIBADD = $(top_builddir)/src/C++/libquickfix.la
+
+pkgpyexec_LTLIBRARIES = _quickfix.la
+_quickfix_la_SOURCES = QuickfixPython.cpp XXXXXXXXXXXXXXXXXX
+_quickfix_la_LDFLAGS = -version-info 14:0:0 -module
+_quickfix_la_LIBADD = $(top_builddir)/src/C++/libquickfix.la
+
+pkgpyexec_PYTHON = \
+	quickfix.py \
+	quickfix40.py \
+	quickfix41.py \
+	quickfix42.py \
+	quickfix43.py \
+	quickfix44.py \
+	quickfix50.py \
+	quickfix50sp1.py \
+	quickfix50sp2.py \
+	quickfixt11.py