diff --exclude=autom4te.cache --exclude='*~' -urN quickfix-1.13.3-autotools-bootstrap/aclocal.m4 quickfix-1.13.3-pyry-patched/aclocal.m4
--- quickfix-1.13.3-autotools-bootstrap/aclocal.m4 2010-06-03 15:59:40.234360303 +0100
+++ quickfix-1.13.3-pyry-patched/aclocal.m4 2010-05-25 14:49:22.731106979 +0100
@@ -8912,6 +8912,228 @@
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])])
+
+# Copyright (C) 2001, 2003, 2005 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_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ (exit $ac_status); }])
+
# 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-1.13.3-autotools-bootstrap/bin/cfg/Makefile.in quickfix-1.13.3-pyry-patched/bin/cfg/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/bin/cfg/Makefile.in 2010-06-03 15:59:43.630355327 +0100
+++ quickfix-1.13.3-pyry-patched/bin/cfg/Makefile.in 2010-05-25 18:32:48.708109809 +0100
@@ -116,9 +116,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -177,9 +181,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-1.13.3-autotools-bootstrap/bin/Makefile.in quickfix-1.13.3-pyry-patched/bin/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/bin/Makefile.in 2010-06-03 15:59:43.559358993 +0100
+++ quickfix-1.13.3-pyry-patched/bin/Makefile.in 2010-05-25 18:32:48.643110425 +0100
@@ -156,9 +156,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -217,9 +221,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-1.13.3-autotools-bootstrap/config/py-compile quickfix-1.13.3-pyry-patched/config/py-compile
--- quickfix-1.13.3-autotools-bootstrap/config/py-compile 1970-01-01 01:00:00.000000000 +0100
+++ quickfix-1.13.3-pyry-patched/config/py-compile 2010-05-25 18:32:50.456107031 +0100
@@ -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-1.13.3-autotools-bootstrap/config.h.in quickfix-1.13.3-pyry-patched/config.h.in
--- quickfix-1.13.3-autotools-bootstrap/config.h.in 2010-06-03 15:59:41.000000000 +0100
+++ quickfix-1.13.3-pyry-patched/config.h.in 2010-05-25 14:29:34.000000000 +0100
@@ -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-1.13.3-autotools-bootstrap/configure quickfix-1.13.3-pyry-patched/configure
--- quickfix-1.13.3-autotools-bootstrap/configure 2010-06-03 15:59:46.910354998 +0100
+++ quickfix-1.13.3-pyry-patched/configure 2010-05-25 18:32:52.078354922 +0100
@@ -807,9 +807,17 @@
RUBY_PREFIX
HAVE_PYTHON_FALSE
HAVE_PYTHON_TRUE
-PYTHON_SITE_PACKAGES
PYTHON_CFLAGS
+PYTHON_INCLUDEDIR
+pkgpyexecdir
+pyexecdir
+pkgpythondir
+pythondir
+PYTHON_PLATFORM
+PYTHON_EXEC_PREFIX
PYTHON_PREFIX
+PYTHON_VERSION
+PYTHON
POSTGRESQL_LIBS
POSTGRESQL_CFLAGS
POSTGRESQL_PREFIX
@@ -5288,13 +5296,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5291: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5299: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5294: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5302: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5297: output\"" >&5)
+ (eval echo "\"\$as_me:5305: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6497,7 +6505,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6500 "configure"' > conftest.$ac_ext
+ echo '#line 6508 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9056,11 +9064,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9059: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9067: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9063: \$? = $ac_status" >&5
+ echo "$as_me:9071: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9395,11 +9403,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9398: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9406: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9402: \$? = $ac_status" >&5
+ echo "$as_me:9410: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9500,11 +9508,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9503: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9511: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9507: \$? = $ac_status" >&5
+ echo "$as_me:9515: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9555,11 +9563,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9558: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9566: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9562: \$? = $ac_status" >&5
+ echo "$as_me:9570: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12358,7 +12366,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12361 "configure"
+#line 12369 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12454,7 +12462,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12457 "configure"
+#line 12465 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14474,11 +14482,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14477: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14485: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14481: \$? = $ac_status" >&5
+ echo "$as_me:14489: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14573,11 +14581,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14576: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14584: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14580: \$? = $ac_status" >&5
+ echo "$as_me:14588: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14625,11 +14633,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14628: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14636: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14632: \$? = $ac_status" >&5
+ echo "$as_me:14640: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15829,6 +15837,7 @@
LEX=${am_missing_run}flex
fi
+
########################################
# ALLOCATOR
########################################
@@ -15994,22 +16003,245 @@
fi
-PYTHON_PREFIX=$with_python
-
-
if test $has_python = true
then
- PYTHON_CFLAGS="-I${PYTHON_PREFIX}"
- PYTHON_SITE_PACKAGES=`python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'`
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PYTHON 1
-_ACEOF
+ if test -n "$PYTHON"; then
+ # If the user set $PYTHON, use it and don't search something else.
+ { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.3" >&5
+$as_echo_n "checking whether $PYTHON version >= 2.3... " >&6; }
+ 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.3'.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)"
+ if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
+ ($PYTHON -c "$prog") >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { { $as_echo "$as_me:$LINENO: error: too old" >&5
+$as_echo "$as_me: error: too old" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+ am_display_PYTHON=$PYTHON
+ else
+ # Otherwise, try each interpreter until we find one that satisfies
+ # VERSION.
+ { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.3" >&5
+$as_echo_n "checking for a Python interpreter with version >= 2.3... " >&6; }
+if test "${am_cv_pathless_PYTHON+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+
+ for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ test "$am_cv_pathless_PYTHON" = none && break
+ 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.3'.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)"
+ if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
+ ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ break
+fi
+
+ done
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5
+$as_echo "$am_cv_pathless_PYTHON" >&6; }
+ # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
+ if test "$am_cv_pathless_PYTHON" = none; then
+ PYTHON=:
+ else
+ # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
+set dummy $am_cv_pathless_PYTHON; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PYTHON+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ case $PYTHON in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
fi
- if $has_python; then
+PYTHON=$ac_cv_path_PYTHON
+if test -n "$PYTHON"; then
+ { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
+$as_echo "$PYTHON" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ fi
+ am_display_PYTHON=$am_cv_pathless_PYTHON
+ fi
+
+
+ if test "$PYTHON" = :; then
+ :
+ else
+
+
+ { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
+$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
+if test "${am_cv_python_version+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
+$as_echo "$am_cv_python_version" >&6; }
+ PYTHON_VERSION=$am_cv_python_version
+
+
+
+ PYTHON_PREFIX='${prefix}'
+
+ PYTHON_EXEC_PREFIX='${exec_prefix}'
+
+
+
+ { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
+$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
+if test "${am_cv_python_platform+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
+$as_echo "$am_cv_python_platform" >&6; }
+ PYTHON_PLATFORM=$am_cv_python_platform
+
+
+
+
+ { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
+$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
+if test "${am_cv_python_pythondir+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ 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
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+$as_echo "$am_cv_python_pythondir" >&6; }
+ pythondir=$am_cv_python_pythondir
+
+
+
+ pkgpythondir=\${pythondir}/$PACKAGE
+
+
+ { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
+$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
+if test "${am_cv_python_pyexecdir+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ 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
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+$as_echo "$am_cv_python_pyexecdir" >&6; }
+ pyexecdir=$am_cv_python_pyexecdir
+
+
+
+ pkgpyexecdir=\${pyexecdir}/$PACKAGE
+
+
+
+ fi
+
+
+
+ PYTHON_INCLUDEDIR=`$PYTHON -c 'from distutils import sysconfig; print sysconfig.get_python_inc()'`
+
+ PYTHON_CFLAGS="-I${PYTHON_INCLUDEDIR}"
+
+ fi
+ if test "$PYTHON" != :; then
HAVE_PYTHON_TRUE=
HAVE_PYTHON_FALSE='#'
else
diff --exclude=autom4te.cache --exclude='*~' -urN quickfix-1.13.3-autotools-bootstrap/configure.in quickfix-1.13.3-pyry-patched/configure.in
--- quickfix-1.13.3-autotools-bootstrap/configure.in 2010-04-05 03:48:38.000000000 +0100
+++ quickfix-1.13.3-pyry-patched/configure.in 2010-05-26 16:28:47.780359711 +0100
@@ -15,6 +15,7 @@
AM_PROG_LIBTOOL
AM_PROG_LEX
+
########################################
# ALLOCATOR
########################################
@@ -131,7 +132,7 @@
########################################
has_python=false
AC_ARG_WITH(python,
- [ --with-python= directory containing python headers e.g. /usr/local/include/python2.3],
+ [ --with-python[=] directory containing python headers e.g. /usr/local/include/python2.3],
[if test $withval == "no"
then
has_python=false
@@ -140,18 +141,19 @@
fi],
has_python=false
)
-PYTHON_PREFIX=$with_python
-AC_SUBST(PYTHON_PREFIX)
-
if test $has_python = true
then
- PYTHON_CFLAGS="-I${PYTHON_PREFIX}"
+ AM_PATH_PYTHON([2.3],, [:])
+
+ PYTHON_INCLUDEDIR=[`$PYTHON -c 'from distutils import sysconfig; print sysconfig.get_python_inc()'`]
+ AC_SUBST(PYTHON_INCLUDEDIR)
+ PYTHON_CFLAGS="-I${PYTHON_INCLUDEDIR}"
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)
+ dnl PYTHON_SITE_PACKAGES=[`$PYTHON -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'`]
+ dnl AC_SUBST(PYTHON_SITE_PACKAGES)
+ dnl AC_DEFINE(HAVE_PYTHON, 1, Define if you have python)
fi
-AM_CONDITIONAL(HAVE_PYTHON, $has_python)
+AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
########################################
########################################
@@ -176,7 +178,7 @@
then
RUBY_CFLAGS="-I${RUBY_PREFIX}"
AC_SUBST(RUBY_CFLAGS)
- RUBY_SITE_PACKAGES=[`ruby -e 'require "rbconfig"; print Config::CONFIG["sitedir"], "\n"'`]
+ RUBY_SITE_PACKAGES=[`ruby -e 'require "rbconfig"; print Config::CONFIG["sitearchdir"], "\n"'`]
AC_SUBST(RUBY_SITE_PACKAGES)
AC_DEFINE(HAVE_RUBY, 1, Define if you have ruby)
fi
diff --exclude=autom4te.cache --exclude='*~' -urN quickfix-1.13.3-autotools-bootstrap/COPYING quickfix-1.13.3-pyry-patched/COPYING
--- quickfix-1.13.3-autotools-bootstrap/COPYING 1970-01-01 01:00:00.000000000 +0100
+++ quickfix-1.13.3-pyry-patched/COPYING 2010-02-19 19:10:24.000000000 +0000
@@ -0,0 +1,46 @@
+The QuickFIX Software License, Version 1.0
+
+Copyright (c) 2001-2010 quickfixengine.org All rights
+reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+3. The end-user documentation included with the redistribution,
+ if any, must include the following acknowledgment:
+ "This product includes software developed by
+ quickfixengine.org (http://www.quickfixengine.org/)."
+ Alternately, this acknowledgment may appear in the software itself,
+ if and wherever such third-party acknowledgments normally appear.
+
+4. The names "QuickFIX" and "quickfixengine.org" must
+ not be used to endorse or promote products derived from this
+ software without prior written permission. For written
+ permission, please contact ask@quickfixengine.org
+
+5. Products derived from this software may not be called "QuickFIX",
+ nor may "QuickFIX" appear in their name, without prior written
+ permission of quickfixengine.org
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL QUICKFIXENGINE.ORG OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
diff --exclude=autom4te.cache --exclude='*~' -urN quickfix-1.13.3-autotools-bootstrap/doc/html/Makefile.in quickfix-1.13.3-pyry-patched/doc/html/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/doc/html/Makefile.in 2010-06-03 15:59:43.765360186 +0100
+++ quickfix-1.13.3-pyry-patched/doc/html/Makefile.in 2010-05-25 18:32:48.869110074 +0100
@@ -116,9 +116,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -177,9 +181,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-1.13.3-autotools-bootstrap/doc/Makefile.in quickfix-1.13.3-pyry-patched/doc/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/doc/Makefile.in 2010-06-03 15:59:43.700356036 +0100
+++ quickfix-1.13.3-pyry-patched/doc/Makefile.in 2010-05-25 18:32:48.790106311 +0100
@@ -156,9 +156,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -217,9 +221,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-1.13.3-autotools-bootstrap/examples/executor/C++/Makefile.in quickfix-1.13.3-pyry-patched/examples/executor/C++/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/examples/executor/C++/Makefile.in 2010-06-03 15:59:43.938359677 +0100
+++ quickfix-1.13.3-pyry-patched/examples/executor/C++/Makefile.in 2010-05-25 18:32:49.049303486 +0100
@@ -146,9 +146,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -207,9 +211,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-1.13.3-autotools-bootstrap/examples/executor/Makefile.in quickfix-1.13.3-pyry-patched/examples/executor/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/examples/executor/Makefile.in 2010-06-03 15:59:44.012359646 +0100
+++ quickfix-1.13.3-pyry-patched/examples/executor/Makefile.in 2010-05-25 18:32:49.148110494 +0100
@@ -156,9 +156,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -217,9 +221,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-1.13.3-autotools-bootstrap/examples/Makefile.in quickfix-1.13.3-pyry-patched/examples/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/examples/Makefile.in 2010-06-03 15:59:43.836358196 +0100
+++ quickfix-1.13.3-pyry-patched/examples/Makefile.in 2010-05-25 18:32:48.945109928 +0100
@@ -156,9 +156,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -217,9 +221,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-1.13.3-autotools-bootstrap/examples/ordermatch/Makefile.in quickfix-1.13.3-pyry-patched/examples/ordermatch/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/examples/ordermatch/Makefile.in 2010-06-03 15:59:44.108356931 +0100
+++ quickfix-1.13.3-pyry-patched/examples/ordermatch/Makefile.in 2010-05-25 18:32:49.252107663 +0100
@@ -185,9 +185,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -246,9 +250,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-1.13.3-autotools-bootstrap/examples/ordermatch/test/Makefile.in quickfix-1.13.3-pyry-patched/examples/ordermatch/test/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/examples/ordermatch/test/Makefile.in 2010-06-03 15:59:44.200359986 +0100
+++ quickfix-1.13.3-pyry-patched/examples/ordermatch/test/Makefile.in 2010-05-25 18:32:49.345109110 +0100
@@ -146,9 +146,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -207,9 +211,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-1.13.3-autotools-bootstrap/examples/tradeclient/Makefile.in quickfix-1.13.3-pyry-patched/examples/tradeclient/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/examples/tradeclient/Makefile.in 2010-06-03 15:59:44.291359315 +0100
+++ quickfix-1.13.3-pyry-patched/examples/tradeclient/Makefile.in 2010-05-25 18:32:49.438110277 +0100
@@ -146,9 +146,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -207,9 +211,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-1.13.3-autotools-bootstrap/examples/tradeclientgui/banzai/Makefile.in quickfix-1.13.3-pyry-patched/examples/tradeclientgui/banzai/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/examples/tradeclientgui/banzai/Makefile.in 2010-06-03 15:59:44.437356270 +0100
+++ quickfix-1.13.3-pyry-patched/examples/tradeclientgui/banzai/Makefile.in 2010-05-25 18:32:49.611110267 +0100
@@ -156,9 +156,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -217,9 +221,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-1.13.3-autotools-bootstrap/examples/tradeclientgui/banzai/src/Makefile.in quickfix-1.13.3-pyry-patched/examples/tradeclientgui/banzai/src/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/examples/tradeclientgui/banzai/src/Makefile.in 2010-06-03 15:59:44.511357354 +0100
+++ quickfix-1.13.3-pyry-patched/examples/tradeclientgui/banzai/src/Makefile.in 2010-05-25 18:32:49.691105185 +0100
@@ -156,9 +156,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -217,9 +221,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-1.13.3-autotools-bootstrap/examples/tradeclientgui/banzai/src/quickfix/banzai/Makefile.in quickfix-1.13.3-pyry-patched/examples/tradeclientgui/banzai/src/quickfix/banzai/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/examples/tradeclientgui/banzai/src/quickfix/banzai/Makefile.in 2010-06-03 15:59:44.656357566 +0100
+++ quickfix-1.13.3-pyry-patched/examples/tradeclientgui/banzai/src/quickfix/banzai/Makefile.in 2010-05-25 18:32:49.841107220 +0100
@@ -156,9 +156,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -217,9 +221,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-1.13.3-autotools-bootstrap/examples/tradeclientgui/banzai/src/quickfix/banzai/ui/Makefile.in quickfix-1.13.3-pyry-patched/examples/tradeclientgui/banzai/src/quickfix/banzai/ui/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/examples/tradeclientgui/banzai/src/quickfix/banzai/ui/Makefile.in 2010-06-03 15:59:44.722359575 +0100
+++ quickfix-1.13.3-pyry-patched/examples/tradeclientgui/banzai/src/quickfix/banzai/ui/Makefile.in 2010-05-25 18:32:49.912360542 +0100
@@ -116,9 +116,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -177,9 +181,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-1.13.3-autotools-bootstrap/examples/tradeclientgui/banzai/src/quickfix/Makefile.in quickfix-1.13.3-pyry-patched/examples/tradeclientgui/banzai/src/quickfix/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/examples/tradeclientgui/banzai/src/quickfix/Makefile.in 2010-06-03 15:59:44.583354620 +0100
+++ quickfix-1.13.3-pyry-patched/examples/tradeclientgui/banzai/src/quickfix/Makefile.in 2010-05-25 18:32:49.766110253 +0100
@@ -156,9 +156,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -217,9 +221,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-1.13.3-autotools-bootstrap/examples/tradeclientgui/banzai/test/Makefile.in quickfix-1.13.3-pyry-patched/examples/tradeclientgui/banzai/test/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/examples/tradeclientgui/banzai/test/Makefile.in 2010-06-03 15:59:44.788354879 +0100
+++ quickfix-1.13.3-pyry-patched/examples/tradeclientgui/banzai/test/Makefile.in 2010-05-25 18:32:49.985357043 +0100
@@ -116,9 +116,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -177,9 +181,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-1.13.3-autotools-bootstrap/examples/tradeclientgui/Makefile.in quickfix-1.13.3-pyry-patched/examples/tradeclientgui/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/examples/tradeclientgui/Makefile.in 2010-06-03 15:59:44.364360306 +0100
+++ quickfix-1.13.3-pyry-patched/examples/tradeclientgui/Makefile.in 2010-05-25 18:32:49.527109946 +0100
@@ -156,9 +156,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -217,9 +221,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-1.13.3-autotools-bootstrap/Makefile.in quickfix-1.13.3-pyry-patched/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/Makefile.in 2010-06-03 15:59:45.879354552 +0100
+++ quickfix-1.13.3-pyry-patched/Makefile.in 2010-05-25 18:32:51.106106237 +0100
@@ -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) \
@@ -197,9 +197,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -258,9 +262,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-1.13.3-autotools-bootstrap/README quickfix-1.13.3-pyry-patched/README
--- quickfix-1.13.3-autotools-bootstrap/README 1970-01-01 01:00:00.000000000 +0100
+++ quickfix-1.13.3-pyry-patched/README 2010-02-19 19:10:24.000000000 +0000
@@ -0,0 +1,46 @@
+The QuickFIX Software License, Version 1.0
+
+Copyright (c) 2001-2010 quickfixengine.org All rights
+reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+3. The end-user documentation included with the redistribution,
+ if any, must include the following acknowledgment:
+ "This product includes software developed by
+ quickfixengine.org (http://www.quickfixengine.org/)."
+ Alternately, this acknowledgment may appear in the software itself,
+ if and wherever such third-party acknowledgments normally appear.
+
+4. The names "QuickFIX" and "quickfixengine.org" must
+ not be used to endorse or promote products derived from this
+ software without prior written permission. For written
+ permission, please contact ask@quickfixengine.org
+
+5. Products derived from this software may not be called "QuickFIX",
+ nor may "QuickFIX" appear in their name, without prior written
+ permission of quickfixengine.org
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL QUICKFIXENGINE.ORG OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
diff --exclude=autom4te.cache --exclude='*~' -urN quickfix-1.13.3-autotools-bootstrap/spec/Makefile.in quickfix-1.13.3-pyry-patched/spec/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/spec/Makefile.in 2010-06-03 15:59:44.861354753 +0100
+++ quickfix-1.13.3-pyry-patched/spec/Makefile.in 2010-05-25 18:32:50.064356620 +0100
@@ -140,9 +140,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -201,9 +205,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-1.13.3-autotools-bootstrap/src/C++/Makefile.in quickfix-1.13.3-pyry-patched/src/C++/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/src/C++/Makefile.in 2010-06-03 15:59:44.980355315 +0100
+++ quickfix-1.13.3-pyry-patched/src/C++/Makefile.in 2010-05-25 18:32:50.184357810 +0100
@@ -220,9 +220,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -281,9 +285,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-1.13.3-autotools-bootstrap/src/C++/test/Makefile.in quickfix-1.13.3-pyry-patched/src/C++/test/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/src/C++/test/Makefile.in 2010-06-03 15:59:45.079360145 +0100
+++ quickfix-1.13.3-pyry-patched/src/C++/test/Makefile.in 2010-05-25 18:32:50.284357688 +0100
@@ -158,9 +158,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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 +223,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-1.13.3-autotools-bootstrap/src/Makefile.in quickfix-1.13.3-pyry-patched/src/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/src/Makefile.in 2010-06-03 15:59:45.183355387 +0100
+++ quickfix-1.13.3-pyry-patched/src/Makefile.in 2010-05-25 18:32:50.391361016 +0100
@@ -190,9 +190,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -251,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-1.13.3-autotools-bootstrap/src/python/__init__.py quickfix-1.13.3-pyry-patched/src/python/__init__.py
--- quickfix-1.13.3-autotools-bootstrap/src/python/__init__.py 1970-01-01 01:00:00.000000000 +0100
+++ quickfix-1.13.3-pyry-patched/src/python/__init__.py 2010-05-25 18:29:48.282107853 +0100
@@ -0,0 +1 @@
+from quickfix import *
diff --exclude=autom4te.cache --exclude='*~' -urN quickfix-1.13.3-autotools-bootstrap/src/python/Makefile.am quickfix-1.13.3-pyry-patched/src/python/Makefile.am
--- quickfix-1.13.3-autotools-bootstrap/src/python/Makefile.am 2010-04-05 03:57:42.000000000 +0100
+++ quickfix-1.13.3-pyry-patched/src/python/Makefile.am 2010-05-25 18:32:20.938108165 +0100
@@ -1,61 +1,27 @@
-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
+#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
+_quickfix_la_LDFLAGS = -version-info 14:0:0 -module
+_quickfix_la_LIBADD = $(top_builddir)/src/C++/libquickfix.la
+
+pkgpyexec_PYTHON = \
+ __init__.py \
+ quickfix.py \
+ quickfix40.py \
+ quickfix41.py \
+ quickfix42.py \
+ quickfix43.py \
+ quickfix44.py \
+ quickfix50.py \
+ quickfix50sp1.py \
+ quickfix50sp2.py \
+ quickfixt11.py
INCLUDES =-I. -I.. -I../..
diff --exclude=autom4te.cache --exclude='*~' -urN quickfix-1.13.3-autotools-bootstrap/src/python/Makefile.in quickfix-1.13.3-pyry-patched/src/python/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/src/python/Makefile.in 2010-06-03 15:59:45.287355378 +0100
+++ quickfix-1.13.3-pyry-patched/src/python/Makefile.in 2010-05-25 18:32:50.498107338 +0100
@@ -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)
@@ -164,9 +164,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -225,9 +229,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@
@@ -236,13 +244,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
+
+#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
+_quickfix_la_LDFLAGS = -version-info 14:0:0 -module
+_quickfix_la_LIBADD = $(top_builddir)/src/C++/libquickfix.la
+pkgpyexec_PYTHON = \
+ __init__.py \
+ quickfix.py \
+ quickfix40.py \
+ quickfix41.py \
+ quickfix42.py \
+ quickfix43.py \
+ quickfix44.py \
+ quickfix50.py \
+ quickfix50sp1.py \
+ quickfix50sp2.py \
+ quickfixt11.py
+
INCLUDES = -I. -I.. -I../..
all: all-am
@@ -278,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)
@@ -346,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)'; \
@@ -451,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
@@ -483,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
@@ -504,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
@@ -550,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-1.13.3-autotools-bootstrap/src/ruby/Makefile.am quickfix-1.13.3-pyry-patched/src/ruby/Makefile.am
--- quickfix-1.13.3-autotools-bootstrap/src/ruby/Makefile.am 2010-04-05 03:57:42.000000000 +0100
+++ quickfix-1.13.3-pyry-patched/src/ruby/Makefile.am 2010-05-26 16:27:38.676106837 +0100
@@ -1,35 +1,44 @@
-pkgdata_DATA = quickfix_ruby.rb quickfix_fields.rb quickfix40.rb quickfix41.rb quickfix42.rb quickfix43.rb quickfix44.rb quickfix50.rb quickfix50sp1.rb quickfix50sp2.rb quickfixt11.rb
+#pkgdata_DATA = quickfix_ruby.rb quickfix_fields.rb quickfix40.rb quickfix41.rb quickfix42.rb quickfix43.rb quickfix44.rb quickfix50.rb quickfix50sp1.rb quickfix50sp2.rb quickfixt11.rb
all-local:
bash ./make_ruby.sh $(CXX) $(CXXFLAGS) $(LIBS)
- mkdir -p $(top_builddir)/lib/ruby
- ln -sf ../../src/ruby/quickfix_ruby.rb $(top_builddir)/lib/ruby/quickfix_ruby.rb
- ln -sf ../../src/ruby/quickfix_fields.rb $(top_builddir)/lib/ruby/quickfix_fields.rb
- ln -sf ../../src/ruby/quickfix40.rb $(top_builddir)/lib/ruby/quickfix40.rb
- ln -sf ../../src/ruby/quickfix41.rb $(top_builddir)/lib/ruby/quickfix41.rb
- ln -sf ../../src/ruby/quickfix42.rb $(top_builddir)/lib/ruby/quickfix42.rb
- ln -sf ../../src/ruby/quickfix43.rb $(top_builddir)/lib/ruby/quickfix43.rb
- ln -sf ../../src/ruby/quickfix44.rb $(top_builddir)/lib/ruby/quickfix44.rb
- ln -sf ../../src/ruby/quickfix50.rb $(top_builddir)/lib/ruby/quickfix50.rb
- ln -sf ../../src/ruby/quickfix50sp1.rb $(top_builddir)/lib/ruby/quickfix50sp1.rb
- ln -sf ../../src/ruby/quickfix50sp2.rb $(top_builddir)/lib/ruby/quickfix50sp2.rb
- ln -sf ../../src/ruby/quickfixt11.rb $(top_builddir)/lib/ruby/quickfixt11.rb
- ln -sf ../../src/ruby/quickfix.so $(top_builddir)/lib/ruby/quickfix.so
- ln -sf ../../src/ruby/quickfix.bundle $(top_builddir)/lib/ruby/quickfix.bundle
-
- bash ./link.sh $(top_builddir)/lib/ruby quickfix.so quickfix.bundle
clean-local:
make -f Makefile.ruby clean
- rm -rf $(top_builddir)/lib/ruby
install-exec-local:
- cp -f $(top_builddir)/lib/ruby/*.rb $(RUBY_SITE_PACKAGES)
- cp -f $(top_builddir)/lib/ruby/quickfix.so $(RUBY_SITE_PACKAGES)
- cp -f $(top_builddir)/lib/ruby/quickfix.bundle $(RUBY_SITE_PACKAGES)
+ mkdir -p $(top_builddir)/lib/ruby
+
+ cp -f $(top_builddir)/src/ruby/*.rb $(top_builddir)$(RUBY_SITE_PACKAGES)
+ cp -f $(top_builddir)/src/ruby/quickfix.so $(top_builddir)$(RUBY_SITE_PACKAGES)
+ cp -f $(top_builddir)/src/ruby/quickfix.bundle $(top_builddir)$(RUBY_SITE_PACKAGES)
+
+# ln -sf ../../src/ruby/quickfix_ruby.rb $(top_builddir)/lib/ruby/quickfix_ruby.rb
+# ln -sf ../../src/ruby/quickfix_fields.rb $(top_builddir)/lib/ruby/quickfix_fields.rb
+# ln -sf ../../src/ruby/quickfix40.rb $(top_builddir)/lib/ruby/quickfix40.rb
+# ln -sf ../../src/ruby/quickfix41.rb $(top_builddir)/lib/ruby/quickfix41.rb
+# ln -sf ../../src/ruby/quickfix42.rb $(top_builddir)/lib/ruby/quickfix42.rb
+# ln -sf ../../src/ruby/quickfix43.rb $(top_builddir)/lib/ruby/quickfix43.rb
+# ln -sf ../../src/ruby/quickfix44.rb $(top_builddir)/lib/ruby/quickfix44.rb
+# ln -sf ../../src/ruby/quickfix50.rb $(top_builddir)/lib/ruby/quickfix50.rb
+# ln -sf ../../src/ruby/quickfix50sp1.rb $(top_builddir)/lib/ruby/quickfix50sp1.rb
+# ln -sf ../../src/ruby/quickfix50sp2.rb $(top_builddir)/lib/ruby/quickfix50sp2.rb
+# ln -sf ../../src/ruby/quickfixt11.rb $(top_builddir)/lib/ruby/quickfixt11.rb
+# ln -sf ../../src/ruby/quickfix.so $(top_builddir)/lib/ruby/quickfix.so
+# ln -sf ../../src/ruby/quickfix.bundle $(top_builddir)/lib/ruby/quickfix.bundle
+
+# bash ./link.sh $(top_builddir)/lib/ruby quickfix.so quickfix.bundle
+
+# cp -f $(top_builddir)/lib/ruby/*.rb $(RUBY_SITE_PACKAGES)
+# cp -f $(top_builddir)/lib/ruby/quickfix.so $(RUBY_SITE_PACKAGES)
+# cp -f $(top_builddir)/lib/ruby/quickfix.bundle $(RUBY_SITE_PACKAGES)
uninstall-local:
- rm -rf $(RUBY_SITE_PACKAGES)/quickfix*.rb
- rm -rf $(RUBY_SITE_PACKAGES)/quickfix*.so
- rm -rf $(RUBY_SITE_PACKAGES)/quickfix.bundle
+# rm -rf $(top_builddir)/lib/ruby
+# rm -rf $(RUBY_SITE_PACKAGES)/quickfix*.rb
+# rm -rf $(RUBY_SITE_PACKAGES)/quickfix*.so
+# rm -rf $(RUBY_SITE_PACKAGES)/quickfix.bundle
+ rm -rf $(top_builddir)$(RUBY_SITE_PACKAGES)/quickfix*.rb
+ rm -rf $(top_builddir)$(RUBY_SITE_PACKAGES)/quickfix*.so
+ rm -rf $(top_builddir)$(RUBY_SITE_PACKAGES)/quickfix.bundle
diff --exclude=autom4te.cache --exclude='*~' -urN quickfix-1.13.3-autotools-bootstrap/src/ruby/Makefile.in quickfix-1.13.3-pyry-patched/src/ruby/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/src/ruby/Makefile.in 2010-06-03 15:59:45.363360002 +0100
+++ quickfix-1.13.3-pyry-patched/src/ruby/Makefile.in 2010-05-25 18:32:50.575108133 +0100
@@ -140,9 +140,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -201,9 +205,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@
@@ -425,6 +433,11 @@
all-local:
bash ./make_ruby.sh $(CXX) $(CXXFLAGS) $(LIBS)
+
+clean-local:
+ make -f Makefile.ruby clean
+
+install-exec-local:
mkdir -p $(top_builddir)/lib/ruby
ln -sf ../../src/ruby/quickfix_ruby.rb $(top_builddir)/lib/ruby/quickfix_ruby.rb
ln -sf ../../src/ruby/quickfix_fields.rb $(top_builddir)/lib/ruby/quickfix_fields.rb
@@ -442,19 +455,15 @@
bash ./link.sh $(top_builddir)/lib/ruby quickfix.so quickfix.bundle
-clean-local:
- make -f Makefile.ruby clean
- rm -rf $(top_builddir)/lib/ruby
-
-install-exec-local:
- cp -f $(top_builddir)/lib/ruby/*.rb $(RUBY_SITE_PACKAGES)
- cp -f $(top_builddir)/lib/ruby/quickfix.so $(RUBY_SITE_PACKAGES)
- cp -f $(top_builddir)/lib/ruby/quickfix.bundle $(RUBY_SITE_PACKAGES)
+# cp -f $(top_builddir)/lib/ruby/*.rb $(RUBY_SITE_PACKAGES)
+# cp -f $(top_builddir)/lib/ruby/quickfix.so $(RUBY_SITE_PACKAGES)
+# cp -f $(top_builddir)/lib/ruby/quickfix.bundle $(RUBY_SITE_PACKAGES)
uninstall-local:
- rm -rf $(RUBY_SITE_PACKAGES)/quickfix*.rb
- rm -rf $(RUBY_SITE_PACKAGES)/quickfix*.so
- rm -rf $(RUBY_SITE_PACKAGES)/quickfix.bundle
+ rm -rf $(top_builddir)/lib/ruby
+# rm -rf $(RUBY_SITE_PACKAGES)/quickfix*.rb
+# rm -rf $(RUBY_SITE_PACKAGES)/quickfix*.so
+# rm -rf $(RUBY_SITE_PACKAGES)/quickfix.bundle
# 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-1.13.3-autotools-bootstrap/test/atrun/Makefile.in quickfix-1.13.3-pyry-patched/test/atrun/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/test/atrun/Makefile.in 2010-06-03 15:59:45.511355467 +0100
+++ quickfix-1.13.3-pyry-patched/test/atrun/Makefile.in 2010-05-25 18:32:50.732104693 +0100
@@ -116,9 +116,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -177,9 +181,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-1.13.3-autotools-bootstrap/test/cfg/Makefile.in quickfix-1.13.3-pyry-patched/test/cfg/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/test/cfg/Makefile.in 2010-06-03 15:59:45.577356078 +0100
+++ quickfix-1.13.3-pyry-patched/test/cfg/Makefile.in 2010-05-25 18:32:50.800107437 +0100
@@ -116,9 +116,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -177,9 +181,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-1.13.3-autotools-bootstrap/test/definitions/Makefile.in quickfix-1.13.3-pyry-patched/test/definitions/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/test/definitions/Makefile.in 2010-06-03 15:59:45.654357165 +0100
+++ quickfix-1.13.3-pyry-patched/test/definitions/Makefile.in 2010-05-25 18:32:50.874106274 +0100
@@ -156,9 +156,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -217,9 +221,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-1.13.3-autotools-bootstrap/test/definitions/server/future/Makefile.in quickfix-1.13.3-pyry-patched/test/definitions/server/future/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/test/definitions/server/future/Makefile.in 2010-06-03 15:59:45.793357369 +0100
+++ quickfix-1.13.3-pyry-patched/test/definitions/server/future/Makefile.in 2010-05-25 18:32:51.018110278 +0100
@@ -116,9 +116,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -177,9 +181,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-1.13.3-autotools-bootstrap/test/definitions/server/Makefile.in quickfix-1.13.3-pyry-patched/test/definitions/server/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/test/definitions/server/Makefile.in 2010-06-03 15:59:45.727357037 +0100
+++ quickfix-1.13.3-pyry-patched/test/definitions/server/Makefile.in 2010-05-25 18:32:50.950110328 +0100
@@ -156,9 +156,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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@
@@ -217,9 +221,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-1.13.3-autotools-bootstrap/test/Makefile.in quickfix-1.13.3-pyry-patched/test/Makefile.in
--- quickfix-1.13.3-autotools-bootstrap/test/Makefile.in 2010-06-03 15:59:45.445357369 +0100
+++ quickfix-1.13.3-pyry-patched/test/Makefile.in 2010-05-25 18:32:50.665110423 +0100
@@ -158,9 +158,13 @@
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_INCLUDEDIR = @PYTHON_INCLUDEDIR@
+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 +223,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@