[MPlayer-cvslog] r20570 - trunk/configure

[diego]

Author: diego
Date: Tue Oct 31 18:55:54 2006
New Revision: 20570

Modified:
   trunk/configure

Log:
Fix codec directory fallback, it was overriding the autodetection.


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Tue Oct 31 18:55:54 2006
@@ -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