Mercurial > hg > sonic-visualiser
changeset 1707:a4da817dc221 vext
Use vext only if we are in a Mercurial checkout
author | Chris Cannam |
---|---|
date | Wed, 07 Jun 2017 09:54:57 +0100 |
parents | d60b30ea9b80 |
children | 975dee07ff5c |
files | configure configure.ac |
diffstat | 2 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Wed Jun 07 09:00:47 2017 +0100 +++ b/configure Wed Jun 07 09:54:57 2017 +0100 @@ -8521,10 +8521,11 @@ fi -if ! ./vext install; then - as_fn_error $? "vext failed to run" "$LINENO" 5 -fi - +if test -d .hg ; then + if ! ./vext install; then + as_fn_error $? "Vext failed; please fix any reported errors and try again" "$LINENO" 5 + fi +fi if ! $QMAKE -r sonic-visualiser.pro; then as_fn_error $? "qmake failed: Command was \"$QMAKE -r\"" "$LINENO" 5 fi
--- a/configure.ac Wed Jun 07 09:00:47 2017 +0100 +++ b/configure.ac Wed Jun 07 09:54:57 2017 +0100 @@ -139,10 +139,11 @@ AC_OUTPUT -if ! ./vext install; then - AC_MSG_ERROR([vext failed to run]) +if test -d .hg ; then + if ! ./vext install; then + AC_MSG_ERROR([Vext failed; please fix any reported errors and try again]) + fi fi - if ! $QMAKE -r sonic-visualiser.pro; then AC_MSG_ERROR([qmake failed: Command was "$QMAKE -r"]) fi