patch::: 1.5.11.jcn1

1.5.11.jcn1
===========

* Add -p flag to package-diff.py's diff invocation, to show changed function.

* Add configure checks for python headers.

* Make midi module.

1.5.11
======

diff --git a/CHANGES b/CHANGES
index 397f031cf4ac700a8e6d99cc797aa32ab4c42a8e..a36a5782ce3bac15320bee986bd581c8538a651a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+1.5.11.jcn1
+===========
+
+* Add -p flag to package-diff.py's diff invocation, to show changed function.
+
+* Add configure checks for python headers.
+
+* Make midi module.
+
+1.5.11
+======
+
 1.5.10.jcn3
 ===========
 

diff --git a/VERSION b/VERSION
index d13210fa9aaba225f35c0bb337ebfd3618677660..cd50e05bad62c104a56a8b52eb90c95f0f10488c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=11
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/config.hh.in b/config.hh.in
index 04d22f741f250f8c4770d6e877b429633d6c7edb..388eea7e3dc3e06f8afd8cc71814cc889ba0960a 100644 (file)
--- a/config.hh.in
+++ b/config.hh.in
@@ -41,6 +41,15 @@
 /* define if you have kpse_find_tfm */
 #define HAVE_KPSE_FIND_TFM 0
 
+/* define if you have python2/Python.h header */
+#define HAVE_PYTHON2_PYTHON_H 0
+
+/* define if you have python/Python.h header */
+#define HAVE_PYTHON_PYTHON_H 0
+
+/* define if you have Python.h header */
+#define HAVE_PYTHON_H 0
+
 /* define if explicit instantiation is needed */
 #undef NEED_EXPLICIT_INSTANTIATION
 

diff --git a/configure.in b/configure.in
index 4cf095deb818adff7cb0e7d1e8e3a3787f2a9af1..1cca0ffe08d9f4aa3e0e56cc51809b0e26144000 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -49,6 +49,9 @@ AC_STEPMAKE_MAKEINFO
 
 AC_PATH_PROG(PERL, perl, error)
 
+AC_HAVE_HEADERS(python2/Python.h python/Python.h Python.h)
+
+
 AC_STEPMAKE_END
 
 test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc=""

diff --git a/modules/GNUmakefile b/modules/GNUmakefile
index bc69608d146b08887e10ae129142a5b87358211b..61cfea23e503734383843eb542840dffed698bce 100644 (file)
--- a/modules/GNUmakefile
+++ b/modules/GNUmakefile
@@ -5,7 +5,7 @@ NAME=midi
 
 
 # compile fucks up on without autoconf -I flag.
-STEPMAKE_TEMPLATES=c install # python-module
+STEPMAKE_TEMPLATES=c install python-module
 
 INSTALLATION_FILES=$(outdir)/midi.so
 INSTALLATION_DIR=$(datadir)/python

diff --git a/modules/midi.c b/modules/midi.c
index 11fdd25d4fa442521d3e4fe671882b7d55de179e..729599c817571aafea364f7eaa4644deb53d24a3 100644 (file)
--- a/modules/midi.c
+++ b/modules/midi.c
@@ -18,7 +18,20 @@ midi.parse (s)
 
 */
 
-#include <python2.0/Python.h>
+#include "config.h"
+
+/* urg */
+#if HAVE_PYTHON2_PYTHON_H
+#include <python2/Python.h>
+#elif HAVE_PYTHON_PYTHON_H
+#define assert(x)
+#include <python/Python.h>
+#elif HAVE_PYTHON_H
+#define assert(x)
+#include <Python.h>
+#else
+#error Need Python.h
+#endif
 
 #if 0
 int x = 0;

diff --git a/stepmake/bin/package-diff.py b/stepmake/bin/package-diff.py
index da16975bf0f926e417191dbb35eb534f54ebfaab..e07dd3ade3c95d2b43dde802c13b49c524ab427d 100644 (file)
--- a/stepmake/bin/package-diff.py
+++ b/stepmake/bin/package-diff.py
@@ -177,8 +177,8 @@ def makediff (fromdir, todir, patch_name):
                        
        sys.stderr.write ('diffing to %s... ' % patch_name)
        os.system ('pwd')
-       print ('diff -urN %s . >> %s' % (fromdir, patch_name))
-       os.system ('diff -urN %s . >> %s' % (fromdir, patch_name))
+       print ('diff -purN %s . >> %s' % (fromdir, patch_name))
+       os.system ('diff -purN %s . >> %s' % (fromdir, patch_name))
        os.system ('gzip --quiet -9f %s' % patch_name)