# HG changeset patch
# User Chris Cannam
# Date 1346666810 -3600
# Node ID 523e97d0f6eb5f6fc2d3394b04e641ec33c0f92c
# Parent  f5aeda36d5bdf922d73850a4f15dc240421935c4# Parent  964a20b5a747f148489ce807e346f3a96e302b75
Merge from branch "coreaudio_tests"

diff -r 964a20b5a747 -r 523e97d0f6eb .hgtags
--- 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
diff -r 964a20b5a747 -r 523e97d0f6eb configure
--- 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
diff -r 964a20b5a747 -r 523e97d0f6eb configure.ac
--- 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"])