comparison configure.ac @ 288:fd4a6183482f kapoor_1202

Merge from branch piper-nopiper. The next release will be based on this.
author Chris Cannam
date Fri, 02 Dec 2016 10:04:44 +0000
parents 382f33b7f00e
children 523f8f1789b4
comparison
equal deleted inserted replaced
259:9e7d180be225 288:fd4a6183482f
108 AC_SUBST(CC) 108 AC_SUBST(CC)
109 AC_SUBST(CXX) 109 AC_SUBST(CXX)
110 110
111 AC_SUBST(QMAKE_CONFIG) 111 AC_SUBST(QMAKE_CONFIG)
112 112
113 AC_CONFIG_SUBDIRS([svcore])
114 AC_CONFIG_FILES([config.pri]) 113 AC_CONFIG_FILES([config.pri])
115 114
116 AC_OUTPUT 115 AC_OUTPUT
117 116
118 if ! $QMAKE -r sonic-annotator.pro; then 117 if ! $QMAKE -r sonic-annotator.pro; then