X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=smart-configure.sh;h=8ba39eb7dc9237939fa74d1210971bb51419f960;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=fa27ed846275b07293ad4c59aaaf6a6b75549348;hpb=b6ba138a2e5f8542b1278721c70f28f3a0400b3c;p=lilypond.git

diff --git a/smart-configure.sh b/smart-configure.sh
index fa27ed8462..8ba39eb7dc 100755
--- a/smart-configure.sh
+++ b/smart-configure.sh
@@ -5,19 +5,15 @@ set -ux
 
 MAKEFILE_MD5=`find $srcdir -name GNUmakefile | grep -v '^./GNUmakefile$' | sort | md5sum | cut -b 1-32`
 CONFIGURE_INPUT_MD5=`cat $srcdir/config.make.in $srcdir/config.hh.in $srcdir/GNUmakefile.in | md5sum | cut -b 1-32`
-
+CONFIGURE_OPTIONS_MD5=`echo "$@" | tr ' ' '\n' | sed 's/  */ /g' | grep '.' | sort -u | md5sum | cut -b 1-32`
 
 CONFIGURE_CHECKSUM_FILE=configure.checksum
-CONFIGURE_CHECKSUM="$MAKEFILE_MD5$CONFIGURE_INPUT_MD5"
+CONFIGURE_CHECKSUM="$MAKEFILE_MD5$CONFIGURE_INPUT_MD5$CONFIGURE_OPTIONS_MD5"
 
 if test `cat $CONFIGURE_CHECKSUM_FILE` = "$CONFIGURE_CHECKSUM" ; then
   exit 0
 fi
 
-set -e
-$srcdir/configure "$@"
-echo -n $CONFIGURE_CHECKSUM > $CONFIGURE_CHECKSUM_FILE
-
-
-
+( set +ux; echo Invoking configure...; $srcdir/configure "$@" ) || exit 1
+printf "%s" $CONFIGURE_CHECKSUM > $CONFIGURE_CHECKSUM_FILE