STEPMAKE_PYTHON(): clear cached value since

arg 2 might point us to a new binary (patch by Karl Hammar)

diff --git a/ChangeLog b/ChangeLog
index ffe111560f184daa0637842146ed02fbd94661a9..47f0181aa671f218258ae5e1be92debf6593e4c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-25  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * stepmake/aclocal.m4: STEPMAKE_PYTHON(): clear cached value since
+       arg 2 might point us to a new binary (patch by Karl Hammar)
+       
 2006-05-24  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * VERSION (PACKAGE_NAME): release 2.9.6
@@ -23,8 +28,8 @@
        everywhere.
 
        * GNUmakefile.in: fix wildcarding for scrips/out/ links. Thanks
-       Karl Hammar.
-
+       Karl Hammar. Backportme.
+ 
        * Documentation/user/advanced-notation.itely (Balloon help): idem.
 
        * Documentation/user/changing-defaults.itely (Creating contexts): idem.
@@ -39,7 +44,7 @@
        remove debugging hook.
 
        * configure.in (LINK_GXX_STATICALLY): use "" to allow $
-       expansion. Backportme.
+       expansion. 
 
        * Documentation/user/GNUmakefile (TEXI2DVI_FLAGS): add -E.
 
@@ -119,7 +124,7 @@
 2006-05-20  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * lily/stencil-expression.cc (register_stencil_head): opps, append
-       to cdr of static SCM object. Backportme.
+       to cdr of static SCM object.
 
 2006-05-19  Graham Percival  <gpermus@gmail.com>
 
@@ -132,7 +137,7 @@
 2006-05-19  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * lily/beam.cc (set_stem_lengths): trigger 'beaming callback, in
-       case positions is set manually. Backportme.
+       case positions is set manually. 
 
 2006-05-18  Erik Sandberg  <mandolaerik@gmail.com>
        

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 3ae4f92df6f0e8299848ee76a54166bb4f78dcdd..5a9e739ad98b0c5c1cae48c71f76f66da272e5d5 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -994,6 +994,9 @@ AC_DEFUN(STEPMAKE_PYTHON, [
     if test -n "$pv"; then
        STEPMAKE_ADD_ENTRY($1, $pv)
     fi
+    # clear cached value since arg 2 might point us to a new binary
+    unset ac_cv_path_PYTHON
+
     AC_PATH_PROG(PYTHON, $PYTHON)
     AC_SUBST(PYTHON)
 ])