comparison configure @ 1733:d6d7c74c7eb7

Merge from branch "vext"
author Chris Cannam
date Mon, 10 Jul 2017 14:04:44 +0100
parents 41a64dc57066
children e4cf3ec06955
comparison
equal deleted inserted replaced
1714:b693b9218f66 1733:d6d7c74c7eb7
8519 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 8519 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
8520 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} 8520 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
8521 fi 8521 fi
8522 8522
8523 8523
8524 if test -x vext ; then
8525 if test -d .hg -o -d .git ; then
8526 if ! ./vext install; then
8527 as_fn_error $? "Vext failed; please fix any reported errors and try again" "$LINENO" 5
8528 fi
8529 else
8530 { $as_echo "$as_me:${as_lineno-$LINENO}: Vext executable found but not in an Hg or Git working-copy: not running it" >&5
8531 $as_echo "$as_me: Vext executable found but not in an Hg or Git working-copy: not running it" >&6;}
8532 if ! test -d vamp-plugin-sdk ; then
8533 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No vamp-plugin-sdk directory present, so external libraries might not have been updated" >&5
8534 $as_echo "$as_me: WARNING: No vamp-plugin-sdk directory present, so external libraries might not have been updated" >&2;}
8535 fi
8536 fi
8537 else
8538 { $as_echo "$as_me:${as_lineno-$LINENO}: No Vext executable found: assuming external libraries are already here" >&5
8539 $as_echo "$as_me: No Vext executable found: assuming external libraries are already here" >&6;}
8540 if ! test -d vamp-plugin-sdk ; then
8541 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No vamp-plugin-sdk directory present, so external libraries might not have been updated" >&5
8542 $as_echo "$as_me: WARNING: No vamp-plugin-sdk directory present, so external libraries might not have been updated" >&2;}
8543 fi
8544 fi
8545
8524 if ! $QMAKE -r sonic-visualiser.pro; then 8546 if ! $QMAKE -r sonic-visualiser.pro; then
8525 as_fn_error $? "qmake failed: Command was \"$QMAKE -r\"" "$LINENO" 5 8547 as_fn_error $? "qmake failed: Command was \"$QMAKE -r\"" "$LINENO" 5
8526 fi 8548 fi
8527 8549
8528 { $as_echo "$as_me:${as_lineno-$LINENO}: 8550 { $as_echo "$as_me:${as_lineno-$LINENO}: