lilypond-0.0.40

diff --git a/configure b/configure
index 0c647c284df217537f3e74e0821c548c7fec650b..2e50a3fbf4eca38774f10f5909562a51a397f981 100755 (executable)
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
 #
 # project  LilyPond -- the musical typesetter
 # title           (bash/sh/ksh) script to setup library and auto generated files
-# file    bin/configure
+# file    configure
 #
 # Copyright (c) 1997 by    
 #      Han-Wen Nienhuys <hanwen@stack.nl>
@@ -10,24 +10,25 @@
 # 
 
 MAKE=${MAKE:-make}
-NEEDFLOWERVER=1.1.6
 PREFIX=${PREFIX:-.}
 
+# this whole script sux, but here we go:
+opt="`echo $1 | cut -c 1-3`"
+if [ "$opt" = "-h" -o "$opt" = "--h" ]
+then
+       echo "Usage:"
+       echo "  [MAKE=make] configure [options]"
+       echo
+       echo "options:"
+       echo "  -h, --help      this text"
+       echo
+       echo "e.g.: MAKE=gmake configure"
+       exit
+fi
 
 #############
 #############
 
-# without "function" ok for ksh, bash
-setversion() {
-       eval `sed -n 's/^\([A-Z_]*\)[   ]*=[     ]*\([^         \#]*\).*$/\1=\2/p' $1`
-#      NEWVER=$TOPLEVEL_MAJOR_VERSION.$TOPLEVEL_MINOR_VERSION.$TOPLEVEL_PATCH_LEVEL$TOPLEVEL_MY_PATCH_LEVEL
-       NEWVER=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL$MY_PATCH_LEVEL
-       echo
-       echo "Current  version ("`pwd`") is:"
-       echo "  $NEWVER"
-       echo
-}
-
 do_outdir() {
        if [ \! -d $1/out ]
        then
@@ -37,46 +38,19 @@ do_outdir() {
 }
 
 echo using PREFIX=$PREFIX
-echo I need Flower version $NEEDFLOWERVER
-
-flowertar=flower-$NEEDFLOWERVER
 
-#ugh
-do_outdir flower/lib
-do_outdir Documentation
-do_outdir lib
-do_outdir lily
-do_outdir m2m
-
-# mmm
-if [ -x flower ]
-then
-       echo Found flowerdir
-else
-       if [ -d $flowertar ]
-       then
-               ln -fs $flowertar flower
-       elif [ -d ../$flowertar ]
-       then
-               ln -fs ../$flowertar flower
-       else
-               echo "can't find $flowertar"
-               exit 1;
-       fi
-fi
+#ugh # dist ze dan!, nou stiekem wordt "out" later toch "loes" of "doze"
+# do_outdir flower/lib
+# now all make rules!
 
 echo Configuring Flower Library
-setversion ./flower/.version
-if [ $NEWVER != $NEEDFLOWERVER ]; then
-       echo "You seem to be having an incorrect version of the Flower library"
-else
-       echo "You got the correct Flower version."
-fi
 
-#ugh
-echo '#define LIBDIR "'$PREFIX'/"'> lib/out/config.hh
-touch flower/lib/out/flower-config.hh
-touch make/Site.make
+#ugh, now all make rules
+# the _real_ config stuff should be generated here, though.
+# echo '#define LIBDIR "'$PREFIX'/"'> lib/out/config.hh
+# touch flower/lib/out/flower-config.hh
+# touch make/out/Site.make
+
 $MAKE -C make -f Initial.make
 
 echo "The sources are ready for compiling. "