From 114fa5bd06c4e3cc61e9c3ca9fb253cc185c427a Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 4 May 2009 18:29:55 +0000 Subject: CONFIG_QUICKTIME should be set depending on the state of QTX support. This fixes linking on Mac OS X with vo_quartz disabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29255 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 3e2f1526f6..413eeaca31 100755 --- a/configure +++ b/configure @@ -3842,11 +3842,9 @@ if test "$_quartz" = yes ; then extra_ldflags="$extra_ldflags -framework Carbon -framework QuickTime" def_quartz='#define CONFIG_QUARTZ 1' _vomodules="quartz $_vomodules" - def_quicktime='#define CONFIG_QUICKTIME 1' else def_quartz='#undef CONFIG_QUARTZ' _novomodules="quartz $_novomodules" - def_quicktime='#undef CONFIG_QUICKTIME' fi echores $_quartz @@ -6756,11 +6754,12 @@ echores "$_real" echocheck "QuickTime codecs" _qtx_emulation=no def_qtx_win32='#undef CONFIG_QTX_CODECS_WIN32' +def_quicktime='#undef CONFIG_QUICKTIME' if test "$_qtx" = auto ; then test "$_win32dll" = yes || darwin && _qtx=yes fi if test "$_qtx" = yes ; then - darwin && extra_ldflags="$extra_ldflags -framework QuickTime" + darwin && extra_ldflags="$extra_ldflags -framework QuickTime" && def_quicktime='#define CONFIG_QUICKTIME 1' def_qtx='#define CONFIG_QTX_CODECS 1' win32 && _qtx_codecs_win32=yes && def_qtx_win32='#define CONFIG_QTX_CODECS_WIN32 1' _codecmodules="qtx $_codecmodules" -- cgit v1.2.3