# HG changeset patch
# User Chris Cannam
# Date 1286541056 -3600
# Node ID 70b2681665a763020b054388ffdee10b0dad167a
# Parent  bf90b28b78d453d0f4c87348c97268d8c83ee15e
* Add qmake config (debug or release) corresponding to configure invocation

diff -r bf90b28b78d4 -r 70b2681665a7 config.pri.in
--- a/config.pri.in	Fri Oct 08 12:05:48 2010 +0100
+++ b/config.pri.in	Fri Oct 08 13:30:56 2010 +0100
@@ -1,8 +1,11 @@
+
+CONFIG += @QMAKE_CONFIG@
 
 DEFINES += @HAVES@
 
 QMAKE_CC = @CC@
 QMAKE_CXX = @CXX@
+QMAKE_LINK = @CXX@
 
 QMAKE_CFLAGS += @CFLAGS@
 QMAKE_CXXFLAGS += @CXXFLAGS@
@@ -10,7 +13,7 @@
 linux*:LIBS += -lasound
 
 macx*:DEFINES += HAVE_QUICKTIME
-macx*:LIBS += -framework QuickTime -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox
+macx*:LIBS += -framework QuickTime -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices
 
 LIBS += @LIBS@
 
diff -r bf90b28b78d4 -r 70b2681665a7 configure
--- a/configure	Fri Oct 08 12:05:48 2010 +0100
+++ b/configure	Fri Oct 08 13:30:56 2010 +0100
@@ -597,6 +597,7 @@
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 CODENAME
+QMAKE_CONFIG
 HAVES
 CXXFLAGS_MINIMAL
 CUT
@@ -4183,10 +4184,13 @@
 CXXFLAGS_BUILD="$CXXFLAGS_RELEASE"
 SV_DEFINES_BUILD="$SV_DEFINES_RELEASE"
 
+QMAKE_CONFIG="release"
+
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug; { $as_echo "$as_me:${as_lineno-$LINENO}: enabling debug build" >&5
 $as_echo "$as_me: enabling debug build" >&6;}
+QMAKE_CONFIG="debug"
 CXXFLAGS_BUILD="$CXXFLAGS_DEBUG"
 SV_DEFINES_BUILD="$SV_DEFINES_DEBUG"
 fi
@@ -7196,6 +7200,8 @@
 
 
 
+
+
 ac_config_files="$ac_config_files config.pri"
 
 cat >confcache <<\_ACEOF
diff -r bf90b28b78d4 -r 70b2681665a7 configure.ac
--- a/configure.ac	Fri Oct 08 12:05:48 2010 +0100
+++ b/configure.ac	Fri Oct 08 13:30:56 2010 +0100
@@ -51,7 +51,10 @@
 CXXFLAGS_BUILD="$CXXFLAGS_RELEASE"
 SV_DEFINES_BUILD="$SV_DEFINES_RELEASE"
 
+QMAKE_CONFIG="release"
+
 AC_ARG_ENABLE(debug, [AS_HELP_STRING([--enable-debug],[enable debug support [default=no]])],[AC_MSG_NOTICE([enabling debug build])
+QMAKE_CONFIG="debug"
 CXXFLAGS_BUILD="$CXXFLAGS_DEBUG"
 SV_DEFINES_BUILD="$SV_DEFINES_DEBUG"])
 
@@ -101,6 +104,8 @@
 AC_SUBST(CC)
 AC_SUBST(CXX)
 
+AC_SUBST(QMAKE_CONFIG)
+
 AC_SUBST(CODENAME)
 
 AC_OUTPUT([config.pri])