2014-01-22: merge default into stable stable v0.5.8

merge default into stable

diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 wisp = wisp.scm language/wisp/spec.scm
 wisp_SOURCES = wisp-guile.w wisp-reader.w
-EXTRA_DIST = $(wisp_SOURCES) $(wisp_DATA) bootstrap.sh wisp.py examples tests runtests.sh
+EXTRA_DIST = $(wisp_SOURCES) $(wisp_DATA) bootstrap.sh wisp.py examples tests runtests.sh wisp-repl-guile.sh
 CLEANFILES = ${wisp} ChangeLog
 DISTCLEANFILES = ${CLEANFILES} @abs_top_builddir@/1 @abs_top_builddir@/2 @abs_top_builddir@/test.sh
 
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl run `autoreconf -i` to generate a configure script. 
 dnl Then run ./configure to generate a Makefile.
 dnl Finally run make to generate the project.
-AC_INIT([wisp], [0.5.7],
+AC_INIT([wisp], [0.5.8],
         [arne_bab@web.de])
 # Check for programs I need for my build
 AC_CANONICAL_TARGET
diff --git a/wisp-repl-guile.sh b/wisp-repl-guile.sh
--- a/wisp-repl-guile.sh
+++ b/wisp-repl-guile.sh
@@ -2,7 +2,13 @@
 
 # if the spec file does not exist yet, run the build chain
 if test ! -f language/wisp/spec.scm; then
-    autoreconf -i && ./configure && make check
+    # if we are in a distribution tarball, just run configure
+    if test -f ./configure; then
+        ./configure && make check
+    # otherwise run the full autoconf chain
+    else
+        autoreconf -i && ./configure && make check
+    fi
 fi
 
 # if the file still does not exist, our chain is broken