Merge remote-tracking branch 'origin/master' into fsharp

Conflicts:
	version-checks

1 files changed, 3 insertions, 5 deletions

diff --git a/configure b/configure
index 98dabd5280..e48c16c989 100755
--- a/configure
+++ b/configure
@@ -191,11 +191,9 @@ configure_packages ()
 
 create_local_config ()
 {
-	# Get the version from configure.in, if it exists
-	if test -a $path/configure.in; then
-		ver=`grep AC_INIT $path/configure.in | cut -d "," -f 2 | sed "s/ //"`
-	elif test -a $path/configure; then
-		ver=`grep ^VERSION= $path/configure | cut -d "=" -f 2 | sed "s/ //"`
+	# Get the version from the version.config file, if it exists
+	if test -a version.config; then
+		ver=`grep ^Version version.config|cut -d '=' -f 2|tr -d '\n'`
 	else
 		ver=VERSION
 	fi