CVS: make all fails

[Graham Percival]

Recent CVS, OSX, make distclean before compiling.

...
rm -f ./out/simple-music-iterator.dep; 
DEPENDENCIES_OUTPUT="./out/simple-music-iterator.dep 
./out/simple-music-iterator.o" g++ -c   -DHAVE_CONFIG_H  
-DSTRING_UTILS_INLINED -Iinclude -I./out -I../flower/include 
-I../flower/./out -I../flower/include -O2 -finline-functions -g -pipe 
-I/sw/include/  -I/sw/include/python2.2 -I/sw/include      -O2 
-finline-functions -g -pipe -I/sw/include/  -I/sw/include/python2.2 
-I/sw/include  -W -Wall -Wconversion  -o out/simple-music-iterator.o 
simple-music-iterator.cc
rm -f ./out/simple-spacer.dep; 
DEPENDENCIES_OUTPUT="./out/simple-spacer.dep ./out/simple-spacer.o" g++ 
-c   -DHAVE_CONFIG_H  -DSTRING_UTILS_INLINED -Iinclude -I./out 
-I../flower/include -I../flower/./out -I../flower/include -O2 
-finline-functions -g -pipe -I/sw/include/  -I/sw/include/python2.2 
-I/sw/include      -O2 -finline-functions -g -pipe -I/sw/include/  
-I/sw/include/python2.2 -I/sw/include  -W -Wall -Wconversion  -o 
out/simple-spacer.o simple-spacer.cc
simple-spacer.cc: In function `scm_unused_struct*
   ly_solve_spring_rod_problem(scm_unused_struct*, scm_unused_struct*,
   scm_unused_struct*, scm_unused_struct*)':
simple-spacer.cc:230: error: `scm_to_double' undeclared (first use this
   function)
simple-spacer.cc:230: error: (Each undeclared identifier is reported 
only once
   for each function it appears in.)
simple-spacer.cc:239: error: `scm_to_int' undeclared (first use this 
function)
simple-spacer.cc:264: error: `scm_from_double' undeclared (first use 
this
   function)
make[1]: *** [out/simple-spacer.o] Error 1
make: *** [all] Error 2