Mercurial > hg > svcore
changeset 747:523e97d0f6eb
Merge from branch "coreaudio_tests"
| author | Chris Cannam |
|---|---|
| date | Mon, 03 Sep 2012 11:06:50 +0100 |
| parents | f5aeda36d5bd (diff) 964a20b5a747 (current diff) |
| children | c8ab5f63360d |
| files | |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jul 02 09:39:55 2012 +0100 +++ b/.hgtags Mon Sep 03 11:06:50 2012 +0100 @@ -28,3 +28,5 @@ 579b2da21e7ad4e661e865ba7104c286fac3d510 sv_v1.9 579b2da21e7ad4e661e865ba7104c286fac3d510 sv_v1.9 9a0272c2d596b144ab145466cd8752c196a2016d sv_v1.9 +aca6e61eaea35a9c3f865a68521820b17cce7d3d sv_v2.0 +383f0b9458d2910c0ad70759e1f44da39ef1b196 sonic-annotator-0.7
--- a/configure Mon Jul 02 09:39:55 2012 +0100 +++ b/configure Mon Sep 03 11:06:50 2012 +0100 @@ -624,7 +624,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS -CODENAME QMAKE_CONFIG HAVES CXXFLAGS_MINIMAL @@ -7032,10 +7031,9 @@ - - ac_config_files="$ac_config_files config.pri" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure
--- a/configure.ac Mon Jul 02 09:39:55 2012 +0100 +++ b/configure.ac Mon Sep 03 11:06:50 2012 +0100 @@ -111,9 +111,9 @@ AC_SUBST(QMAKE_CONFIG) -AC_SUBST(CODENAME) +AC_CONFIG_FILES([config.pri]) -AC_OUTPUT([config.pri]) +AC_OUTPUT if ! $QMAKE -r; then AC_MSG_ERROR([qmake failed: Command was "$QMAKE -r"])