- remove AM_PYTHON_PATH from acinclude.m4, the macro provided by automake

  is much better (detects python 2.3b1 properly)

Changed files:
    diacanvas-python.patch -> 1.1

diff --git a/diacanvas-python.patch b/diacanvas-python.patch
new file mode 100644 (file)
index 0000000..814c977
--- /dev/null
+++ b/diacanvas-python.patch
@@ -0,0 +1,137 @@
+diff -Nur diacanvas2-0.9.2.orig/acinclude.m4 diacanvas2-0.9.2/acinclude.m4
+--- diacanvas2-0.9.2.orig/acinclude.m4 Sun Dec 29 09:34:15 2002
++++ diacanvas2-0.9.2/acinclude.m4      Wed Jun 11 07:56:32 2003
+@@ -5,133 +5,6 @@
+ ## Hacked by Arjan Molenaar for Python2.2 usage
+ ## ------------------------
+ 
+-# AM_PATH_PYTHON
+-
+-# 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 MINIUMUM-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 version of Python.  I could check for python versions 1.4
+-  dnl or earlier, but the default installation locations changed from
+-  dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
+-  dnl in 1.5, and I don't want to maintain that logic.
+-
+-  AC_PATH_PROGS(PYTHON, python2.2 python2 python)
+-
+-  dnl should we do the version check?
+-  AC_MSG_CHECKING(if Python version >= 2.2)
+-  changequote(<<, >>)dnl
+-  prog="
+-import sys, string
+-minver = '2.2'
+-pyver = string.split(sys.version)[0]  # first word is version string
+-# split strings by '.' and convert to numeric
+-minver = map(string.atoi, string.split(minver, '.'))
+-pyver = map(string.atoi, string.split(pyver, '.'))
+-# we can now do comparisons on the two lists:
+-if pyver >= minver:
+-      sys.exit(0)
+-else:
+-      sys.exit(1)"
+-  changequote([, ])dnl
+-  if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+-  then
+-    AC_MSG_RESULT(okay)
+-  else
+-    AC_MSG_RESULT(too old)
+-    PYTHON=""
+-  fi
+-
+-  if test "x$PYTHON" != "x"
+-  then
+-    AC_MSG_CHECKING([local Python configuration])
+-
+-    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.  Need to change quote character because of [:3]
+-
+-    AC_SUBST(PYTHON_VERSION)
+-    changequote(<<, >>)dnl
+-    PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"`
+-    changequote([, ])dnl
+-
+-
+-    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)
+-    PYTHON_PREFIX='${prefix}'
+-
+-    AC_SUBST(PYTHON_EXEC_PREFIX)
+-    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_SUBST(PYTHON_PLATFORM)
+-    PYTHON_PLATFORM=`$PYTHON -c "import sys; print sys.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 behaviour
+-    dnl   is more consistent with lispdir.m4 for example.
+-    dnl
+-    dnl Also, if the package prefix isn't the same as python's prefix,
+-    dnl then the old $(pythondir) was pretty useless.
+-
+-    AC_SUBST(pythondir)
+-    pythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION/site-packages
+-
+-    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.
+-    dnl   Maybe this should be put in python.am?
+-
+-    AC_SUBST(pkgpythondir)
+-    pkgpythondir=\${pythondir}/$PACKAGE
+-
+-    dnl pyexecdir -- directory for installing python extension modules
+-    dnl   (shared libraries)  Was PYTHON_SITE_EXEC in previous betas.
+-
+-    AC_SUBST(pyexecdir)
+-    pyexecdir=$PYTHON_EXEC_PREFIX"/lib/python"$PYTHON_VERSION/site-packages
+-
+-    dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
+-    dnl   Maybe this should be put in python.am?
+-
+-    AC_SUBST(pkgpyexecdir)
+-    pkgpyexecdir=\${pyexecdir}/$PACKAGE
+-
+-    AC_MSG_RESULT([looks good])
+-  fi
+-])
+-
+-
+ dnl a macro to check for ability to create python extensions
+ dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+ dnl function also defines PYTHON_INCLUDES