comparison configure.ac @ 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
137 137
138 AC_CONFIG_FILES([config.pri]) 138 AC_CONFIG_FILES([config.pri])
139 139
140 AC_OUTPUT 140 AC_OUTPUT
141 141
142 if test -x vext ; then
143 if test -d .hg -o -d .git ; then
144 if ! ./vext install; then
145 AC_MSG_ERROR([Vext failed; please fix any reported errors and try again])
146 fi
147 else
148 AC_MSG_NOTICE([Vext executable found but not in an Hg or Git working-copy: not running it])
149 if ! test -d vamp-plugin-sdk ; then
150 AC_MSG_WARN([No vamp-plugin-sdk directory present, so external libraries might not have been updated])
151 fi
152 fi
153 else
154 AC_MSG_NOTICE([No Vext executable found: assuming external libraries are already here])
155 if ! test -d vamp-plugin-sdk ; then
156 AC_MSG_WARN([No vamp-plugin-sdk directory present, so external libraries might not have been updated])
157 fi
158 fi
159
142 if ! $QMAKE -r sonic-visualiser.pro; then 160 if ! $QMAKE -r sonic-visualiser.pro; then
143 AC_MSG_ERROR([qmake failed: Command was "$QMAKE -r"]) 161 AC_MSG_ERROR([qmake failed: Command was "$QMAKE -r"])
144 fi 162 fi
145 163
146 AC_MSG_NOTICE([ 164 AC_MSG_NOTICE([