X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=configure;h=21ee567e831f2f7a04cca783f272103474b2279f;hb=389fcb53035ac07383abf597eb86c55e18d34891;hp=b1b21e0631aad197b8d4c474442e2d618c92c956;hpb=3424c4914eb65244cc707b201f31b5c89631daf8;p=lilypond.git

diff --git a/configure b/configure
index b1b21e0631..21ee567e83 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,26 @@
 #!/bin/sh
 
+# script to setup library and auto generated files.
+
+function setversion() {
+    eval `sed -n 's/^\([A-Z]*\)=\([p0-9].*\)$/\1=\2/p' Variables.make`
+    NEWVER=$MAJVER.$MINVER.$PATCHLEVEL
+    echo
+    echo "Current  version ("`pwd`") is $NEWVER"
+    echo
+}
+
+MAKE=${MAKE:-make}
 PREFIX=${PREFIX:-.}
+NEEDFLOWERVER=1.1.1
+
 echo using PREFIX=$PREFIX
+echo I need Flower version $NEEDFLOWERVER
 
-NEEDFLOWERVER=1.0.27
 flowertar=flower-$NEEDFLOWERVER
 here=`pwd`
 cd ..
+
 if [ -x flower ]
 then
     echo Found flowerdir
@@ -19,14 +33,23 @@ else
     fi
     rm flower
     ln -s $flowertar flower
-
 fi
+
 echo Compiling Library
-(cd flower;make)
+{
+    cd flower;
+    setversion
+    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
+    $MAKE
+}
 
 cd $here
 
 echo '#define LIBDIR "'$PREFIX'/"'> hdr/config.hh
 touch Site.make
-make -f Initial.make
+$MAKE -f Initial.make