# HG changeset patch # User diego # Date 1162317354 0 # Node ID 82733372759fc3c1300b15e7b7e8595911804ae2 # Parent 4db6f615ca38a20fb3d38cf5070b501c5871dd75 Fix codec directory fallback, it was overriding the autodetection. diff -r 4db6f615ca38 -r 82733372759f configure --- a/configure Tue Oct 31 17:24:43 2006 +0000 +++ b/configure Tue Oct 31 17:55:54 2006 +0000 @@ -5972,10 +5972,12 @@ break; fi; done - _win32codecsdir="$_codecsdir" - # Fall back on a subfolder of the current dir on Windows - mingw32 && _win32codecsdir="codecs" fi + # Fall back on default directory. + if test -z "$_win32codecsdir" ; then + _win32codecsdir="$_codecsdir" + mingw32 && _win32codecsdir="codecs" + fi fi echocheck "Win32 codec DLL support" @@ -6027,6 +6029,9 @@ break; fi; done + fi + # Fall back on default directory. + if test -z "$_xanimcodecsdir" ; then _xanimcodecsdir="$_codecsdir" fi test "$_xanimcodecsdir" && _xanim=yes @@ -6063,11 +6068,13 @@ _realcodecsdir="$I" break fi - _realcodecsdir="$_codecsdir" - # Fall back on a subfolder of the current dir on Windows - mingw32 && _realcodecsdir="codecs" done fi + # Fall back on default directory. + if test -z "$_realcodecsdir" ; then + _realcodecsdir="$_codecsdir" + mingw32 && _realcodecsdir="codecs" + fi test "$_realcodecsdir" && _real=yes fi fi