diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/aclocal.m4 quickfix-python-build-patches/aclocal.m4 --- quickfix/aclocal.m4 2011-05-29 11:19:47.668447471 +0800 +++ quickfix-python-build-patches/aclocal.m4 2011-05-29 11:19:55.238495572 +0800 @@ -9394,6 +9394,211 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# --------------------------------------------------------------------------- +# Adds support for distributing Python modules and packages. To +# install modules, copy them to $(pythondir), using the python_PYTHON +# automake variable. To install a package with the same name as the +# automake package, install to $(pkgpythondir), or use the +# pkgpython_PYTHON automake variable. +# +# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as +# locations to install python extension modules (shared libraries). +# Another macro is required to find the appropriate flags to compile +# extension modules. +# +# If your package is configured with a different prefix to python, +# users will have to add the install directory to the PYTHONPATH +# environment variable, or create a .pth file (see the python +# documentation for details). +# +# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will +# cause an error if the version of python installed on the system +# doesn't meet the requirement. MINIMUM-VERSION should consist of +# numbers and dots only. +AC_DEFUN([AM_PATH_PYTHON], + [ + dnl Find a Python interpreter. Python versions prior to 2.0 are not + dnl supported. (2.0 was released on October 16, 2000). + m4_define_default([_AM_PYTHON_INTERPRETER_LIST], + [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl +python2.1 python2.0]) + + m4_if([$1],[],[ + dnl No version check is needed. + # Find any Python interpreter. + if test -z "$PYTHON"; then + AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :) + fi + am_display_PYTHON=python + ], [ + dnl A version check is needed. + if test -n "$PYTHON"; then + # If the user set $PYTHON, use it and don't search something else. + AC_MSG_CHECKING([whether $PYTHON version >= $1]) + AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], + [AC_MSG_RESULT(yes)], + [AC_MSG_ERROR(too old)]) + am_display_PYTHON=$PYTHON + else + # Otherwise, try each interpreter until we find one that satisfies + # VERSION. + AC_CACHE_CHECK([for a Python interpreter with version >= $1], + [am_cv_pathless_PYTHON],[ + for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do + test "$am_cv_pathless_PYTHON" = none && break + AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break]) + done]) + # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. + if test "$am_cv_pathless_PYTHON" = none; then + PYTHON=: + else + AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) + fi + am_display_PYTHON=$am_cv_pathless_PYTHON + fi + ]) + + if test "$PYTHON" = :; then + dnl Run any user-specified action, or abort. + m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) + else + + dnl Query Python for its version number. Getting [:3] seems to be + dnl the best way to do this; it's what "site.py" does in the standard + dnl library. + + AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], + [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) + AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) + + dnl Use the values of $prefix and $exec_prefix for the corresponding + dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made + dnl distinct variables so they can be overridden if need be. However, + dnl general consensus is that you shouldn't need this ability. + + AC_SUBST([PYTHON_PREFIX], ['${prefix}']) + AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) + + dnl At times (like when building shared libraries) you may want + dnl to know which OS platform Python thinks this is. + + AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], + [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) + AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) + + + dnl Set up 4 directories: + + dnl pythondir -- where to install python scripts. This is the + dnl site-packages directory, not the python standard library + dnl directory like in previous automake betas. This behavior + dnl is more consistent with lispdir.m4 for example. + dnl Query distutils for this directory. distutils does not exist in + dnl Python 1.5, so we fall back to the hardcoded directory if it + dnl doesn't work. + AC_CACHE_CHECK([for $am_display_PYTHON script directory], + [am_cv_python_pythondir], + [if test "x$prefix" = xNONE + then + am_py_prefix=$ac_default_prefix + else + am_py_prefix=$prefix + fi + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; + *) + case $am_py_prefix in + /usr|/System*) ;; + *) + am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac + ]) + AC_SUBST([pythondir], [$am_cv_python_pythondir]) + + dnl pkgpythondir -- $PACKAGE directory under pythondir. Was + dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is + dnl more consistent with the rest of automake. + + AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) + + dnl pyexecdir -- directory for installing python extension modules + dnl (shared libraries) + dnl Query distutils for this directory. distutils does not exist in + dnl Python 1.5, so we fall back to the hardcoded directory if it + dnl doesn't work. + AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], + [am_cv_python_pyexecdir], + [if test "x$exec_prefix" = xNONE + then + am_py_exec_prefix=$am_py_prefix + else + am_py_exec_prefix=$exec_prefix + fi + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; + *) + case $am_py_exec_prefix in + /usr|/System*) ;; + *) + am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac + ]) + AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) + + dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) + + AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) + + dnl Run any user-specified action. + $2 + fi + +]) + + +# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# --------------------------------------------------------------------------- +# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION. +# Run ACTION-IF-FALSE otherwise. +# This test uses sys.hexversion instead of the string equivalent (first +# word of sys.version), in order to cope with versions such as 2.2c1. +# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000). +AC_DEFUN([AM_PYTHON_CHECK_VERSION], + [prog="import sys +# split strings by '.' and convert to numeric. Append some zeros +# because we need at least 4 digits for the hex conversion. +# map returns an iterator in Python 3.0 and a list in 2.x +minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]] +minverhex = 0 +# xrange is not present in Python 3.0 and range returns an iterator +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] +sys.exit(sys.hexversion < minverhex)" + AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/bin/cfg/Makefile.in quickfix-python-build-patches/bin/cfg/Makefile.in --- quickfix/bin/cfg/Makefile.in 2011-05-29 11:19:47.669447478 +0800 +++ quickfix-python-build-patches/bin/cfg/Makefile.in 2011-05-29 11:19:58.237514628 +0800 @@ -118,9 +118,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -179,9 +182,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/bin/Makefile.in quickfix-python-build-patches/bin/Makefile.in --- quickfix/bin/Makefile.in 2011-05-29 11:19:47.670447485 +0800 +++ quickfix-python-build-patches/bin/Makefile.in 2011-05-29 11:19:58.160514139 +0800 @@ -158,9 +158,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -219,9 +222,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/config/py-compile quickfix-python-build-patches/config/py-compile --- quickfix/config/py-compile 1970-01-01 08:00:00.000000000 +0800 +++ quickfix-python-build-patches/config/py-compile 2011-05-29 11:20:00.231527297 +0800 @@ -0,0 +1,146 @@ +#!/bin/sh +# py-compile - Compile a Python program + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009 Free Software +# Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +if [ -z "$PYTHON" ]; then + PYTHON=python +fi + +basedir= +destdir= +files= +while test $# -ne 0; do + case "$1" in + --basedir) + basedir=$2 + if test -z "$basedir"; then + echo "$0: Missing argument to --basedir." 1>&2 + exit 1 + fi + shift + ;; + --destdir) + destdir=$2 + if test -z "$destdir"; then + echo "$0: Missing argument to --destdir." 1>&2 + exit 1 + fi + shift + ;; + -h|--h*) + cat <<\EOF +Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..." + +Byte compile some python scripts FILES. Use --destdir to specify any +leading directory path to the FILES that you don't want to include in the +byte compiled file. Specify --basedir for any additional path information you +do want to be shown in the byte compiled file. + +Example: + py-compile --destdir /tmp/pkg-root --basedir /usr/share/test test.py test2.py + +Report bugs to . +EOF + exit $? + ;; + -v|--v*) + echo "py-compile $scriptversion" + exit $? + ;; + *) + files="$files $1" + ;; + esac + shift +done + +if test -z "$files"; then + echo "$0: No files given. Try \`$0 --help' for more information." 1>&2 + exit 1 +fi + +# if basedir was given, then it should be prepended to filenames before +# byte compilation. +if [ -z "$basedir" ]; then + pathtrans="path = file" +else + pathtrans="path = os.path.join('$basedir', file)" +fi + +# if destdir was given, then it needs to be prepended to the filename to +# byte compile but not go into the compiled file. +if [ -z "$destdir" ]; then + filetrans="filepath = path" +else + filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)" +fi + +$PYTHON -c " +import sys, os, py_compile + +files = '''$files''' + +sys.stdout.write('Byte-compiling python modules...\n') +for file in files.split(): + $pathtrans + $filetrans + if not os.path.exists(filepath) or not (len(filepath) >= 3 + and filepath[-3:] == '.py'): + continue + sys.stdout.write(file) + sys.stdout.flush() + py_compile.compile(filepath, filepath + 'c', path) +sys.stdout.write('\n')" || exit $? + +# this will fail for python < 1.5, but that doesn't matter ... +$PYTHON -O -c " +import sys, os, py_compile + +files = '''$files''' +sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n') +for file in files.split(): + $pathtrans + $filetrans + if not os.path.exists(filepath) or not (len(filepath) >= 3 + and filepath[-3:] == '.py'): + continue + sys.stdout.write(file) + sys.stdout.flush() + py_compile.compile(filepath, filepath + 'o', path) +sys.stdout.write('\n')" 2>/dev/null || : + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/config.h.in quickfix-python-build-patches/config.h.in --- quickfix/config.h.in 2010-04-06 10:00:22.000000000 +0800 +++ quickfix-python-build-patches/config.h.in 2011-05-29 11:19:56.000000000 +0800 @@ -69,9 +69,6 @@ /* Define if you have sql library (-lpq) */ #undef HAVE_POSTGRESQL -/* Define if you have python */ -#undef HAVE_PYTHON - /* Define if you have ruby */ #undef HAVE_RUBY diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/configure.in quickfix-python-build-patches/configure.in --- quickfix/configure.in 2010-04-05 10:48:38.000000000 +0800 +++ quickfix-python-build-patches/configure.in 2011-05-29 11:19:48.132450421 +0800 @@ -129,29 +129,18 @@ ######################################## # PYTHON ######################################## -has_python=false AC_ARG_WITH(python, - [ --with-python= 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/doc/html/Makefile.in quickfix-python-build-patches/doc/html/Makefile.in --- quickfix/doc/html/Makefile.in 2011-05-29 11:19:47.688447600 +0800 +++ quickfix-python-build-patches/doc/html/Makefile.in 2011-05-29 11:19:58.400515664 +0800 @@ -118,9 +118,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -179,9 +182,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/doc/Makefile.in quickfix-python-build-patches/doc/Makefile.in --- quickfix/doc/Makefile.in 2011-05-29 11:19:47.688447600 +0800 +++ quickfix-python-build-patches/doc/Makefile.in 2011-05-29 11:19:58.322515169 +0800 @@ -158,9 +158,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -219,9 +222,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/examples/executor/C++/Makefile.in quickfix-python-build-patches/examples/executor/C++/Makefile.in --- quickfix/examples/executor/C++/Makefile.in 2011-05-29 11:19:47.720447802 +0800 +++ quickfix-python-build-patches/examples/executor/C++/Makefile.in 2011-05-29 11:19:58.629517119 +0800 @@ -151,9 +151,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -212,9 +215,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/examples/executor/Makefile.in quickfix-python-build-patches/examples/executor/Makefile.in --- quickfix/examples/executor/Makefile.in 2011-05-29 11:19:47.690447612 +0800 +++ quickfix-python-build-patches/examples/executor/Makefile.in 2011-05-29 11:19:58.716517672 +0800 @@ -158,9 +158,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -219,9 +222,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/examples/Makefile.in quickfix-python-build-patches/examples/Makefile.in --- quickfix/examples/Makefile.in 2011-05-29 11:19:47.690447612 +0800 +++ quickfix-python-build-patches/examples/Makefile.in 2011-05-29 11:19:58.487516216 +0800 @@ -158,9 +158,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -219,9 +222,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/examples/ordermatch/Makefile.in quickfix-python-build-patches/examples/ordermatch/Makefile.in --- quickfix/examples/ordermatch/Makefile.in 2011-05-29 11:19:47.721447808 +0800 +++ quickfix-python-build-patches/examples/ordermatch/Makefile.in 2011-05-29 11:19:58.851518528 +0800 @@ -191,9 +191,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -252,9 +255,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/examples/ordermatch/test/Makefile.in quickfix-python-build-patches/examples/ordermatch/test/Makefile.in --- quickfix/examples/ordermatch/test/Makefile.in 2011-05-29 11:19:47.692447624 +0800 +++ quickfix-python-build-patches/examples/ordermatch/test/Makefile.in 2011-05-29 11:19:58.960519222 +0800 @@ -148,9 +148,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -209,9 +212,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/examples/tradeclient/Makefile.in quickfix-python-build-patches/examples/tradeclient/Makefile.in --- quickfix/examples/tradeclient/Makefile.in 2011-05-29 11:19:47.723447822 +0800 +++ quickfix-python-build-patches/examples/tradeclient/Makefile.in 2011-05-29 11:19:59.083520004 +0800 @@ -152,9 +152,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -213,9 +216,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/examples/tradeclientgui/banzai/Makefile.in quickfix-python-build-patches/examples/tradeclientgui/banzai/Makefile.in --- quickfix/examples/tradeclientgui/banzai/Makefile.in 2011-05-29 11:19:47.725447835 +0800 +++ quickfix-python-build-patches/examples/tradeclientgui/banzai/Makefile.in 2011-05-29 11:19:59.261521134 +0800 @@ -158,9 +158,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -219,9 +222,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/examples/tradeclientgui/banzai/src/Makefile.in quickfix-python-build-patches/examples/tradeclientgui/banzai/src/Makefile.in --- quickfix/examples/tradeclientgui/banzai/src/Makefile.in 2011-05-29 11:19:47.694447637 +0800 +++ quickfix-python-build-patches/examples/tradeclientgui/banzai/src/Makefile.in 2011-05-29 11:19:59.349521693 +0800 @@ -158,9 +158,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -219,9 +222,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/examples/tradeclientgui/banzai/src/quickfix/banzai/Makefile.in quickfix-python-build-patches/examples/tradeclientgui/banzai/src/quickfix/banzai/Makefile.in --- quickfix/examples/tradeclientgui/banzai/src/quickfix/banzai/Makefile.in 2011-05-29 11:19:47.694447637 +0800 +++ quickfix-python-build-patches/examples/tradeclientgui/banzai/src/quickfix/banzai/Makefile.in 2011-05-29 11:19:59.524522806 +0800 @@ -158,9 +158,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -219,9 +222,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/examples/tradeclientgui/banzai/src/quickfix/banzai/ui/Makefile.in quickfix-python-build-patches/examples/tradeclientgui/banzai/src/quickfix/banzai/ui/Makefile.in --- quickfix/examples/tradeclientgui/banzai/src/quickfix/banzai/ui/Makefile.in 2011-05-29 11:19:47.695447644 +0800 +++ quickfix-python-build-patches/examples/tradeclientgui/banzai/src/quickfix/banzai/ui/Makefile.in 2011-05-29 11:19:59.604523314 +0800 @@ -118,9 +118,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -179,9 +182,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/examples/tradeclientgui/banzai/src/quickfix/Makefile.in quickfix-python-build-patches/examples/tradeclientgui/banzai/src/quickfix/Makefile.in --- quickfix/examples/tradeclientgui/banzai/src/quickfix/Makefile.in 2011-05-29 11:19:47.695447644 +0800 +++ quickfix-python-build-patches/examples/tradeclientgui/banzai/src/quickfix/Makefile.in 2011-05-29 11:19:59.436522246 +0800 @@ -158,9 +158,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -219,9 +222,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/examples/tradeclientgui/banzai/test/Makefile.in quickfix-python-build-patches/examples/tradeclientgui/banzai/test/Makefile.in --- quickfix/examples/tradeclientgui/banzai/test/Makefile.in 2011-05-29 11:19:47.696447651 +0800 +++ quickfix-python-build-patches/examples/tradeclientgui/banzai/test/Makefile.in 2011-05-29 11:19:59.683523815 +0800 @@ -118,9 +118,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -179,9 +182,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/examples/tradeclientgui/Makefile.in quickfix-python-build-patches/examples/tradeclientgui/Makefile.in --- quickfix/examples/tradeclientgui/Makefile.in 2011-05-29 11:19:47.697447657 +0800 +++ quickfix-python-build-patches/examples/tradeclientgui/Makefile.in 2011-05-29 11:19:59.171520562 +0800 @@ -158,9 +158,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -219,9 +222,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/Makefile.in quickfix-python-build-patches/Makefile.in --- quickfix/Makefile.in 2011-05-29 11:19:47.713447757 +0800 +++ quickfix-python-build-patches/Makefile.in 2011-05-29 11:20:01.025532341 +0800 @@ -35,12 +35,12 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/quickfix.pc.in $(top_srcdir)/configure AUTHORS \ - ChangeLog INSTALL NEWS THANKS config/config.guess \ + COPYING ChangeLog INSTALL NEWS THANKS config/config.guess \ config/config.sub config/depcomp config/install-sh \ - config/ltmain.sh config/missing + config/ltmain.sh config/missing config/py-compile ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -199,9 +199,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -260,9 +263,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/spec/Makefile.in quickfix-python-build-patches/spec/Makefile.in --- quickfix/spec/Makefile.in 2011-05-29 11:19:47.698447663 +0800 +++ quickfix-python-build-patches/spec/Makefile.in 2011-05-29 11:19:59.772524380 +0800 @@ -142,9 +142,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -203,9 +206,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/src/C++/Makefile.in quickfix-python-build-patches/src/C++/Makefile.in --- quickfix/src/C++/Makefile.in 2011-05-29 11:19:47.699447669 +0800 +++ quickfix-python-build-patches/src/C++/Makefile.in 2011-05-29 11:19:59.912525270 +0800 @@ -222,9 +222,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -283,9 +286,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/src/C++/test/Makefile.in quickfix-python-build-patches/src/C++/test/Makefile.in --- quickfix/src/C++/test/Makefile.in 2011-05-29 11:19:47.699447669 +0800 +++ quickfix-python-build-patches/src/C++/test/Makefile.in 2011-05-29 11:20:00.030526020 +0800 @@ -160,9 +160,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -221,9 +224,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/src/Makefile.in quickfix-python-build-patches/src/Makefile.in --- quickfix/src/Makefile.in 2011-05-29 11:19:47.700447675 +0800 +++ quickfix-python-build-patches/src/Makefile.in 2011-05-29 11:20:00.155526815 +0800 @@ -192,9 +192,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -253,9 +256,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/src/python/Makefile.am quickfix-python-build-patches/src/python/Makefile.am --- quickfix/src/python/Makefile.am 2010-04-05 10:57:42.000000000 +0800 +++ quickfix-python-build-patches/src/python/Makefile.am 2011-05-29 11:19:48.133450427 +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 diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/src/python/Makefile.in quickfix-python-build-patches/src/python/Makefile.in --- quickfix/src/python/Makefile.in 2011-05-29 11:19:47.701447681 +0800 +++ quickfix-python-build-patches/src/python/Makefile.in 2011-05-29 11:20:00.285527640 +0800 @@ -15,7 +15,6 @@ @SET_MAKE@ - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -36,7 +35,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/python -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(pkgpyexec_PYTHON) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -66,15 +66,15 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgdatadir)" -LTLIBRARIES = $(lib_LTLIBRARIES) -libquickfix_python_la_DEPENDENCIES = \ - $(top_builddir)/src/C++/libquickfix.la -am_libquickfix_python_la_OBJECTS = QuickfixPython.lo -libquickfix_python_la_OBJECTS = $(am_libquickfix_python_la_OBJECTS) -libquickfix_python_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +am__installdirs = "$(DESTDIR)$(pkgpyexecdir)" \ + "$(DESTDIR)$(pkgpyexecdir)" +LTLIBRARIES = $(pkgpyexec_LTLIBRARIES) +_quickfix_la_DEPENDENCIES = $(top_builddir)/src/C++/libquickfix.la +am__quickfix_la_OBJECTS = QuickfixPython.lo +_quickfix_la_OBJECTS = $(am__quickfix_la_OBJECTS) +_quickfix_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(libquickfix_python_la_LDFLAGS) $(LDFLAGS) -o $@ + $(CXXFLAGS) $(_quickfix_la_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles @@ -88,9 +88,9 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libquickfix_python_la_SOURCES) -DIST_SOURCES = $(libquickfix_python_la_SOURCES) -DATA = $(pkgdata_DATA) +SOURCES = $(_quickfix_la_SOURCES) +DIST_SOURCES = $(_quickfix_la_SOURCES) +py_compile = $(top_srcdir)/config/py-compile ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -166,9 +166,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -227,9 +230,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -238,14 +245,28 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -lib_LTLIBRARIES = libquickfix_python.la -libquickfix_python_la_SOURCES = \ - QuickfixPython.cpp - -pkgdata_DATA = quickfix.py quickfix40.py quickfix41.py quickfix42.py quickfix43.py quickfix44.py quickfix50.py quickfix50sp1.py quickfix50sp2.py 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 + all: all-am .SUFFIXES: @@ -280,39 +301,39 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-libLTLIBRARIES: $(lib_LTLIBRARIES) +install-pkgpyexecLTLIBRARIES: $(pkgpyexec_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + test -z "$(pkgpyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgpyexecdir)" + @list='$(pkgpyexec_LTLIBRARIES)'; test -n "$(pkgpyexecdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ list2="$$list2 $$p"; \ else :; fi; \ done; \ test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgpyexecdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgpyexecdir)"; \ } -uninstall-libLTLIBRARIES: +uninstall-pkgpyexecLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + @list='$(pkgpyexec_LTLIBRARIES)'; test -n "$(pkgpyexecdir)" || list=; \ for p in $$list; do \ $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgpyexecdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgpyexecdir)/$$f"; \ done -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +clean-pkgpyexecLTLIBRARIES: + -test -z "$(pkgpyexec_LTLIBRARIES)" || rm -f $(pkgpyexec_LTLIBRARIES) + @list='$(pkgpyexec_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libquickfix_python.la: $(libquickfix_python_la_OBJECTS) $(libquickfix_python_la_DEPENDENCIES) - $(libquickfix_python_la_LINK) -rpath $(libdir) $(libquickfix_python_la_OBJECTS) $(libquickfix_python_la_LIBADD) $(LIBS) +_quickfix.la: $(_quickfix_la_OBJECTS) $(_quickfix_la_DEPENDENCIES) + $(_quickfix_la_LINK) -rpath $(pkgpyexecdir) $(_quickfix_la_OBJECTS) $(_quickfix_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -348,26 +369,44 @@ clean-libtool: -rm -rf .libs _libs -install-pkgdataDATA: $(pkgdata_DATA) +install-pkgpyexecPYTHON: $(pkgpyexec_PYTHON) @$(NORMAL_INSTALL) - test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" - @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + test -z "$(pkgpyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgpyexecdir)" + @list='$(pkgpyexec_PYTHON)'; dlist=; list2=; test -n "$(pkgpyexecdir)" || list=; \ for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ + if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ + if test -f $$b$$p; then \ + $(am__strip_dir) \ + dlist="$$dlist $$f"; \ + list2="$$list2 $$b$$p"; \ + else :; fi; \ + done; \ + for file in $$list2; do echo $$file; done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ - done + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgpyexecdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgpyexecdir)" || exit $$?; \ + done || exit $$?; \ + if test -n "$$dlist"; then \ + if test -z "$(DESTDIR)"; then \ + PYTHON=$(PYTHON) $(py_compile) --basedir "$(pkgpyexecdir)" $$dlist; \ + else \ + PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pkgpyexecdir)" $$dlist; \ + fi; \ + else :; fi -uninstall-pkgdataDATA: +uninstall-pkgpyexecPYTHON: @$(NORMAL_UNINSTALL) - @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + @list='$(pkgpyexec_PYTHON)'; test -n "$(pkgpyexecdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files + filesc=`echo "$$files" | sed 's|$$|c|'`; \ + fileso=`echo "$$files" | sed 's|$$|o|'`; \ + echo " ( cd '$(DESTDIR)$(pkgpyexecdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgpyexecdir)" && rm -f $$files || exit $$?; \ + echo " ( cd '$(DESTDIR)$(pkgpyexecdir)' && rm -f" $$filesc ")"; \ + cd "$(DESTDIR)$(pkgpyexecdir)" && rm -f $$filesc || exit $$?; \ + echo " ( cd '$(DESTDIR)$(pkgpyexecdir)' && rm -f" $$fileso ")"; \ + cd "$(DESTDIR)$(pkgpyexecdir)" && rm -f $$fileso ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -453,9 +492,9 @@ done check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) $(DATA) all-local +all-am: Makefile $(LTLIBRARIES) installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgdatadir)"; do \ + for dir in "$(DESTDIR)$(pkgpyexecdir)" "$(DESTDIR)$(pkgpyexecdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -485,7 +524,7 @@ @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool clean-local \ +clean-am: clean-generic clean-libtool clean-pkgpyexecLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -506,13 +545,13 @@ info-am: -install-data-am: install-pkgdataDATA +install-data-am: install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-exec-local install-libLTLIBRARIES +install-exec-am: install-pkgpyexecLTLIBRARIES install-pkgpyexecPYTHON install-html: install-html-am @@ -552,78 +591,27 @@ ps-am: -uninstall-am: uninstall-libLTLIBRARIES uninstall-local \ - uninstall-pkgdataDATA +uninstall-am: uninstall-pkgpyexecLTLIBRARIES uninstall-pkgpyexecPYTHON .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-generic clean-libLTLIBRARIES clean-libtool clean-local \ - ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-exec-local install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-pkgdataDATA install-ps install-ps-am install-strip \ +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkgpyexecLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pkgpyexecLTLIBRARIES \ + install-pkgpyexecPYTHON install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES \ - uninstall-local uninstall-pkgdataDATA - + tags uninstall uninstall-am uninstall-pkgpyexecLTLIBRARIES \ + uninstall-pkgpyexecPYTHON -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 +QuickfixPython.cpp: + ./swig.sh # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/src/ruby/Makefile.in quickfix-python-build-patches/src/ruby/Makefile.in --- quickfix/src/ruby/Makefile.in 2011-05-29 11:19:47.701447681 +0800 +++ quickfix-python-build-patches/src/ruby/Makefile.in 2011-05-29 11:20:00.389528301 +0800 @@ -142,9 +142,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -203,9 +206,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/test/atrun/Makefile.in quickfix-python-build-patches/test/atrun/Makefile.in --- quickfix/test/atrun/Makefile.in 2011-05-29 11:19:47.702447687 +0800 +++ quickfix-python-build-patches/test/atrun/Makefile.in 2011-05-29 11:20:00.574529476 +0800 @@ -118,9 +118,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -179,9 +182,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/test/cfg/Makefile.in quickfix-python-build-patches/test/cfg/Makefile.in --- quickfix/test/cfg/Makefile.in 2011-05-29 11:19:47.702447687 +0800 +++ quickfix-python-build-patches/test/cfg/Makefile.in 2011-05-29 11:20:00.657530003 +0800 @@ -118,9 +118,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -179,9 +182,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/test/definitions/Makefile.in quickfix-python-build-patches/test/definitions/Makefile.in --- quickfix/test/definitions/Makefile.in 2011-05-29 11:19:47.703447694 +0800 +++ quickfix-python-build-patches/test/definitions/Makefile.in 2011-05-29 11:20:00.748530582 +0800 @@ -158,9 +158,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -219,9 +222,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/test/definitions/server/future/Makefile.in quickfix-python-build-patches/test/definitions/server/future/Makefile.in --- quickfix/test/definitions/server/future/Makefile.in 2011-05-29 11:19:47.703447694 +0800 +++ quickfix-python-build-patches/test/definitions/server/future/Makefile.in 2011-05-29 11:20:00.916531649 +0800 @@ -118,9 +118,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -179,9 +182,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/test/definitions/server/Makefile.in quickfix-python-build-patches/test/definitions/server/Makefile.in --- quickfix/test/definitions/server/Makefile.in 2011-05-29 11:19:47.705447708 +0800 +++ quickfix-python-build-patches/test/definitions/server/Makefile.in 2011-05-29 11:20:00.836531140 +0800 @@ -158,9 +158,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -219,9 +222,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --exclude=autom4te.cache --exclude='*~' -urN quickfix/test/Makefile.in quickfix-python-build-patches/test/Makefile.in --- quickfix/test/Makefile.in 2011-05-29 11:19:47.705447708 +0800 +++ quickfix-python-build-patches/test/Makefile.in 2011-05-29 11:20:00.490528942 +0800 @@ -160,9 +160,12 @@ POSTGRESQL_CFLAGS = @POSTGRESQL_CFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ POSTGRESQL_PREFIX = @POSTGRESQL_PREFIX@ +PYTHON = @PYTHON@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ RUBY_CFLAGS = @RUBY_CFLAGS@ RUBY_PREFIX = @RUBY_PREFIX@ @@ -221,9 +224,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@