XBMC Media Center

Revision: 18674
          http://xbmc.svn.sourceforge.net/xbmc/?rev=18674&view=rev
Author:   elupus
Date:     2009-03-18 23:40:51 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
changed: read codec name from decoder instead of special casing vdpau

Modified Paths:
--------------
    branches/xbmc-vdpau/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
    branches/xbmc-vdpau/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
    branches/xbmc-vdpau/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
    branches/xbmc-vdpau/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.h

Modified: branches/xbmc-vdpau/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
===================================================================
--- branches/xbmc-vdpau/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp	2009-03-18 23:40:23 UTC (rev 18673)
+++ branches/xbmc-vdpau/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp	2009-03-18 23:40:51 UTC (rev 18674)
@@ -183,6 +183,11 @@
   m_pFrame = m_dllAvCodec.avcodec_alloc_frame();
   if (!m_pFrame) return false;
 
+  if(pCodec->name)
+    m_name = CStdString("ff-") + pCodec->name;
+  else
+    m_name = "ffmpeg";
+
   return true;
 }
 

Modified: branches/xbmc-vdpau/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
===================================================================
--- branches/xbmc-vdpau/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h	2009-03-18 23:40:23 UTC (rev 18673)
+++ branches/xbmc-vdpau/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h	2009-03-18 23:40:51 UTC (rev 18674)
@@ -43,7 +43,7 @@
   virtual void Reset();
   virtual bool GetPicture(DVDVideoPicture* pDvdVideoPicture);
   virtual void SetDropState(bool bDrop);
-  virtual const char* GetName() { return "FFmpeg"; };
+  virtual const char* GetName() { return m_name.c_str(); }; // m_name is never changed after open
 
 #ifdef HAVE_LIBVDPAU
   CDVDVideoCodecVDPAU* GetContextVDPAU();
@@ -67,5 +67,6 @@
   DllAvCodec m_dllAvCodec;
   DllAvUtil  m_dllAvUtil;
   DllSwScale m_dllSwScale;
+  std::string m_name;
 };
 

Modified: branches/xbmc-vdpau/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
===================================================================
--- branches/xbmc-vdpau/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp	2009-03-18 23:40:23 UTC (rev 18673)
+++ branches/xbmc-vdpau/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp	2009-03-18 23:40:51 UTC (rev 18674)
@@ -200,6 +200,7 @@
 
   m_stalled = false;
   m_started = false;
+  m_codecname = m_pVideoCodec->GetName();
 
   m_messageQueue.Init();
 
@@ -958,12 +959,8 @@
 {
   std::ostringstream s;
   s << "vq:" << std::setw(3) << min(99,100 * m_messageQueue.GetDataSize() / m_messageQueue.GetMaxDataSize()) << "%";
-  s << ", ";
-  s << "cpu: " << (int)(100 * CThread::GetRelativeUsage()) << "%";
-#ifdef HAVE_LIBVDPAU
-  if (g_VDPAU && g_VDPAU->usingVDPAU) 
-    s << "(vdpau accelerated)";
-#endif
+  s << ", dc: " << m_codecname;
+  s << ", cpu: " << (int)(100 * CThread::GetRelativeUsage()) << "%";
   s << ", bitrate: " << std::setprecision(4) << (double)GetVideoBitrate() / (1024.0*1024.0) << " MBit/s";
   return s.str();
 }

Modified: branches/xbmc-vdpau/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.h
===================================================================
--- branches/xbmc-vdpau/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.h	2009-03-18 23:40:23 UTC (rev 18673)
+++ branches/xbmc-vdpau/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.h	2009-03-18 23:40:51 UTC (rev 18674)
@@ -152,6 +152,7 @@
 
   bool m_stalled;
   bool m_started;
+  std::string m_codecname;
 
   /* autosync decides on how much of clock we should use when deciding sleep time */
   /* the value is the same as 63% timeconstant, ie that the step response of */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 18667
          http://xbmc.svn.sourceforge.net/xbmc/?rev=18667&view=rev
Author:   motd2k
Date:     2009-03-18 20:17:53 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
added option <Safe fullscreen mode> which fixes issues with stutturing on NVIDIA integrated GPUs

Modified Paths:
--------------
    branches/xbmc-vdpau/XBMC/XBMC.kdevelop
    branches/xbmc-vdpau/XBMC/configure
    branches/xbmc-vdpau/XBMC/language/English/strings.xml
    branches/xbmc-vdpau/XBMC/xbmc/Application.cpp
    branches/xbmc-vdpau/XBMC/xbmc/GUISettings.cpp

Modified: branches/xbmc-vdpau/XBMC/XBMC.kdevelop
===================================================================
--- branches/xbmc-vdpau/XBMC/XBMC.kdevelop	2009-03-18 19:32:40 UTC (rev 18666)
+++ branches/xbmc-vdpau/XBMC/XBMC.kdevelop	2009-03-18 20:17:53 UTC (rev 18667)
@@ -16,7 +16,7 @@
   </general>
   <kdevcustomproject>
     <run>
-      <mainprogram>/home/david/xbmc-vdpau-clean/XBMC/xbmc.bin</mainprogram>
+      <mainprogram>xbmc.bin</mainprogram>
       <directoryradio>executable</directoryradio>
       <programargs>-p</programargs>
       <globaldebugarguments>-p</globaldebugarguments>
@@ -145,7 +145,7 @@
       <includestyle>3</includestyle>
       <root></root>
       <designerintegration>EmbeddedKDevDesigner</designerintegration>
-      <qmake>/usr/bin/qmake</qmake>
+      <qmake></qmake>
       <designer></designer>
       <designerpluginpaths/>
     </qt>

Modified: branches/xbmc-vdpau/XBMC/configure
===================================================================
--- branches/xbmc-vdpau/XBMC/configure	2009-03-18 19:32:40 UTC (rev 18666)
+++ branches/xbmc-vdpau/XBMC/configure	2009-03-18 20:17:53 UTC (rev 18667)
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for "xbmc" 8.10.
+# Generated by GNU Autoconf 2.63 for "xbmc" 8.10.
 #
 # Report bugs to <bugs@...>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -17,7 +17,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -39,19 +39,47 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
 fi
 
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
@@ -65,8 +93,6 @@
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -89,7 +115,7 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -102,17 +128,10 @@
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -134,7 +153,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -160,7 +179,7 @@
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -242,7 +261,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -263,7 +282,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -343,10 +362,10 @@
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -415,9 +434,10 @@
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf@... about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf@... about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -453,7 +473,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -481,7 +501,6 @@
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -494,19 +513,22 @@
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
 fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -531,10 +553,10 @@
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -616,85 +638,100 @@
 
 ac_header_list=
 ac_func_list=
-ac_subst_vars='SHELL
+ac_subst_vars='LTLIBOBJS
+BUILD_DVDCSS
+SDL_DEFINES
+DEBUG_FLAGS
+INCLUDES
+POW_LIB
+LIBOBJS
+ALLOCA
+HAVE_NASM
+HAVE_UNZIP
+HAVE_GPERF
+HAVE_CMAKE
+HAVE_GAWK
+EGREP
+GREP
+CPP
+MACOSX_DEPLOYMENT_TARGET
+SET_MAKE
+LN_S
+AWK
+ac_ct_CC
+CFLAGS
+CC
+OBJEXT
+EXEEXT
+ac_ct_CXX
+CPPFLAGS
+LDFLAGS
+CXXFLAGS
+CXX
+CCACHE
+ARCH
+ARCH_DEFINES
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
 PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-ARCH_DEFINES
-ARCH
-CCACHE
-CXX
-CXXFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CXX
-EXEEXT
-OBJEXT
-CC
-CFLAGS
-ac_ct_CC
-AWK
-LN_S
-SET_MAKE
-MACOSX_DEPLOYMENT_TARGET
-CPP
-GREP
-EGREP
-HAVE_GAWK
-HAVE_CMAKE
-HAVE_GPERF
-HAVE_UNZIP
-HAVE_NASM
-ALLOCA
-LIBOBJS
-POW_LIB
-INCLUDES
-DEBUG_FLAGS
-SDL_DEFINES
-BUILD_DVDCSS
-LTLIBOBJS'
+SHELL'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_debug
+enable_optimizations
+enable_gl
+enable_vdpau
+enable_profiling
+enable_joystick
+enable_xrandr
+enable_ccache
+enable_pulse
+enable_faac
+enable_dvdcss
+enable_mid
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -712,6 +749,8 @@
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -810,13 +849,21 @@
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -829,13 +876,21 @@
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1026,22 +1081,38 @@
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1061,7 +1132,7 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1070,16 +1141,16 @@
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1088,22 +1159,38 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
   case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1118,7 +1205,7 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1134,10 +1221,10 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1145,12 +1232,12 @@
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1177,12 +1264,12 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1231,9 +1318,9 @@
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1243,25 +1330,25 @@
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/-xbmc-]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/-xbmc-]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1279,6 +1366,7 @@
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-debug          enable debugging information (default is yes)
@@ -1318,15 +1406,17 @@
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1362,7 +1452,7 @@
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1372,10 +1462,10 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 "xbmc" configure 8.10
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1386,7 +1476,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by "xbmc" $as_me 8.10, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
 
@@ -1422,7 +1512,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1457,7 +1547,7 @@
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1509,11 +1599,12 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1543,9 +1634,9 @@
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1560,9 +1651,9 @@
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1578,8 +1669,8 @@
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1621,21 +1712,24 @@
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1645,16 +1739,16 @@
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1672,29 +1766,38 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1704,10 +1807,12 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1747,8 +1852,8 @@
 
 # Ensure config.guess and config.sub exist and is executable
 # Also install latest version of these files if available
-{ echo "$as_me:$LINENO: Ensuring config.guess and config.sub exist and is executable" >&5
-echo "$as_me: Ensuring config.guess and config.sub exist and is executable" >&6;}
+{ $as_echo "$as_me:$LINENO: Ensuring config.guess and config.sub exist and is executable" >&5
+$as_echo "$as_me: Ensuring config.guess and config.sub exist and is executable" >&6;}
 test -f config.guess && chmod a+x config.guess
 if [ -x /usr/share/misc/config.guess ] && \
     [ $($PWD/config.guess -t | sed 's/-//g') -lt \
@@ -1779,8 +1884,8 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1795,34 +1900,34 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
 if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -1839,27 +1944,27 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
 if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -1919,8 +2024,8 @@
 
        ;;
     *)
-       { { echo "$as_me:$LINENO: error: unsupported host ($host)" >&5
-echo "$as_me: error: unsupported host ($host)" >&2;}
+       { { $as_echo "$as_me:$LINENO: error: unsupported host ($host)" >&5
+$as_echo "$as_me: error: unsupported host ($host)" >&2;}
    { (exit 1); exit 1; }; }
 esac
 
@@ -1983,10 +2088,10 @@
 
 # Extract the first word of "ccache", so it can be a program name with args.
 set dummy ccache; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_CCACHE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $CCACHE in
   [\\/]* | ?:[\\/]*)
@@ -2001,7 +2106,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CCACHE="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2014,11 +2119,11 @@
 fi
 CCACHE=$ac_cv_path_CCACHE
 if test -n "$CCACHE"; then
-  { echo "$as_me:$LINENO: result: $CCACHE" >&5
-echo "${ECHO_T}$CCACHE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CCACHE" >&5
+$as_echo "$CCACHE" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2081,10 +2186,10 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -2097,7 +2202,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2108,11 +2213,11 @@
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2125,10 +2230,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -2141,7 +2246,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2152,11 +2257,11 @@
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2168,12 +2273,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@...." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@...." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -2183,37 +2284,41 @@
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2232,27 +2337,22 @@
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
-echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
+$as_echo_n "checking for C++ compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -2263,10 +2363,11 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2277,7 +2378,7 @@
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2304,25 +2405,27 @@
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C++ compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C++ compiler cannot create executables
+$as_echo "$as_me: error: C++ compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
-echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
+$as_echo_n "checking whether the C++ compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2331,49 +2434,53 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C++ compiled programs.
+$as_echo "$as_me: error: cannot run C++ compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2382,31 +2489,33 @@
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2429,40 +2538,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2488,20 +2600,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2511,15 +2624,19 @@
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
@@ -2546,20 +2663,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CXXFLAGS=""
@@ -2584,20 +2702,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -2623,20 +2742,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2651,8 +2771,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -2684,10 +2804,10 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2700,7 +2820,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2711,11 +2831,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2724,10 +2844,10 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2740,7 +2860,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2751,11 +2871,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2763,12 +2883,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@...." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@...." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2781,10 +2897,10 @@
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2797,7 +2913,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2808,11 +2924,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2821,10 +2937,10 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2842,7 +2958,7 @@
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2865,11 +2981,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2880,10 +2996,10 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2896,7 +3012,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2907,11 +3023,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2924,10 +3040,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2940,7 +3056,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2951,11 +3067,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2967,12 +3083,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@...." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@...." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2982,50 +3094,56 @@
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3051,20 +3169,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -3074,15 +3193,19 @@
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -3109,20 +3232,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -3147,20 +3271,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -3186,20 +3311,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3214,8 +3340,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3231,10 +3357,10 @@
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -3305,20 +3431,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3334,15 +3461,15 @@
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -3357,10 +3484,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -3373,7 +3500,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3384,33 +3511,34 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -3427,12 +3555,12 @@
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -3486,15 +3614,15 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -3526,20 +3654,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3563,13 +3692,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3577,7 +3707,7 @@
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -3602,8 +3732,8 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -3631,20 +3761,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3668,13 +3799,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3682,7 +3814,7 @@
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -3698,11 +3830,13 @@
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=c
@@ -3712,42 +3846,37 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3762,74 +3891,60 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3844,40 +3959,31 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3904,20 +4010,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -4009,37 +4116,40 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -4061,11 +4171,11 @@
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4083,20 +4193,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -4104,12 +4215,15 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4118,17 +4232,17 @@
 
 
 if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
-  { echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5
-echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5
+$as_echo_n "checking for boost/shared_ptr.hpp... " >&6; }
 if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5
-echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5
+$as_echo "$ac_cv_header_boost_shared_ptr_hpp" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5
-echo $ECHO_N "checking boost/shared_ptr.hpp usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5
+$as_echo_n "checking boost/shared_ptr.hpp usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4144,32 +4258,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5
-echo $ECHO_N "checking boost/shared_ptr.hpp presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5
+$as_echo_n "checking boost/shared_ptr.hpp presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4183,51 +4298,52 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 18670
          http://xbmc.svn.sourceforge.net/xbmc/?rev=18670&view=rev
Author:   motd2k
Date:     2009-03-18 21:19:57 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
further changes for 8200s

Modified Paths:
--------------
    branches/xbmc-vdpau/XBMC/guilib/GUIWindowManager.cpp
    branches/xbmc-vdpau/XBMC/xbmc/GUIWindowFullScreen.cpp

Modified: branches/xbmc-vdpau/XBMC/guilib/GUIWindowManager.cpp
===================================================================
--- branches/xbmc-vdpau/XBMC/guilib/GUIWindowManager.cpp	2009-03-18 20:40:54 UTC (rev 18669)
+++ branches/xbmc-vdpau/XBMC/guilib/GUIWindowManager.cpp	2009-03-18 21:19:57 UTC (rev 18670)
@@ -220,6 +220,9 @@
 
 void CGUIWindowManager::PreviousWindow()
 {
+  BOOL safeFull = false;
+  if (g_guiSettings.GetBool("videoscreen.safefull"))
+    safeFull = true;
   // deactivate any window
   CLog::Log(LOGDEBUG,"CGUIWindowManager::PreviousWindow: Deactivate");
   DWORD currentWindow = GetActiveWindow();
@@ -270,7 +273,7 @@
   HideOverlay(pNewWindow->GetOverlayState());
 
   // deinitialize our window
-  g_audioManager.PlayWindowSound(pCurrentWindow->GetID(), SOUND_DEINIT);
+  if (!safeFull) g_audioManager.PlayWindowSound(pCurrentWindow->GetID(), SOUND_DEINIT);
   CGUIMessage msg(GUI_MSG_WINDOW_DEINIT, 0, 0);
   pCurrentWindow->OnMessage(msg);
 
@@ -282,10 +285,10 @@
 
   // ok, initialize the new window
   CLog::Log(LOGDEBUG,"CGUIWindowManager::PreviousWindow: Activate new");
-  g_audioManager.PlayWindowSound(pNewWindow->GetID(), SOUND_INIT);
+  if (!safeFull) g_audioManager.PlayWindowSound(pNewWindow->GetID(), SOUND_INIT);
   CGUIMessage msg2(GUI_MSG_WINDOW_INIT, 0, 0, WINDOW_INVALID, GetActiveWindow());
   pNewWindow->OnMessage(msg2);
-
+  if (safeFull) g_graphicsContext.SetFullScreenRoot(true);
   g_infoManager.SetPreviousWindow(WINDOW_INVALID);
   return;
 }

Modified: branches/xbmc-vdpau/XBMC/xbmc/GUIWindowFullScreen.cpp
===================================================================
--- branches/xbmc-vdpau/XBMC/xbmc/GUIWindowFullScreen.cpp	2009-03-18 20:40:54 UTC (rev 18669)
+++ branches/xbmc-vdpau/XBMC/xbmc/GUIWindowFullScreen.cpp	2009-03-18 21:19:57 UTC (rev 18670)
@@ -187,8 +187,6 @@
       // switch back to the menu
       OutputDebugString("Switching to GUI\n");
       m_gWindowManager.PreviousWindow();
-      if (g_guiSettings.GetBool("videoscreen.safefull"))
-        g_graphicsContext.ToggleFullScreenRoot();
       OutputDebugString("Now in GUI\n");
       return true;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 18672
          http://xbmc.svn.sourceforge.net/xbmc/?rev=18672&view=rev
Author:   elupus
Date:     2009-03-18 23:40:05 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
revert: safe fullscreen fixes

Modified Paths:
--------------
    branches/xbmc-vdpau/XBMC/XBMC.kdevelop
    branches/xbmc-vdpau/XBMC/configure
    branches/xbmc-vdpau/XBMC/guilib/GUIWindowManager.cpp
    branches/xbmc-vdpau/XBMC/language/English/strings.xml
    branches/xbmc-vdpau/XBMC/xbmc/Application.cpp
    branches/xbmc-vdpau/XBMC/xbmc/GUISettings.cpp

Modified: branches/xbmc-vdpau/XBMC/XBMC.kdevelop
===================================================================
--- branches/xbmc-vdpau/XBMC/XBMC.kdevelop	2009-03-18 22:37:56 UTC (rev 18671)
+++ branches/xbmc-vdpau/XBMC/XBMC.kdevelop	2009-03-18 23:40:05 UTC (rev 18672)
@@ -16,7 +16,7 @@
   </general>
   <kdevcustomproject>
     <run>
-      <mainprogram>xbmc.bin</mainprogram>
+      <mainprogram>/home/david/xbmc-vdpau-clean/XBMC/xbmc.bin</mainprogram>
       <directoryradio>executable</directoryradio>
       <programargs>-p</programargs>
       <globaldebugarguments>-p</globaldebugarguments>
@@ -145,7 +145,7 @@
       <includestyle>3</includestyle>
       <root></root>
       <designerintegration>EmbeddedKDevDesigner</designerintegration>
-      <qmake></qmake>
+      <qmake>/usr/bin/qmake</qmake>
       <designer></designer>
       <designerpluginpaths/>
     </qt>

Modified: branches/xbmc-vdpau/XBMC/configure
===================================================================
--- branches/xbmc-vdpau/XBMC/configure	2009-03-18 22:37:56 UTC (rev 18671)
+++ branches/xbmc-vdpau/XBMC/configure	2009-03-18 23:40:05 UTC (rev 18672)
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for "xbmc" 8.10.
+# Generated by GNU Autoconf 2.61 for "xbmc" 8.10.
 #
 # Report bugs to <bugs@...>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -17,7 +17,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -39,47 +39,19 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
   else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
+    PATH_SEPARATOR=:
   fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
+  rm -f conf$$.sh
 fi
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
@@ -93,6 +65,8 @@
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
+as_nl='
+'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -115,7 +89,7 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -128,10 +102,17 @@
 PS4='+ '
 
 # NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+  fi
+done
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -153,7 +134,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -179,7 +160,7 @@
   as_have_required=no
 fi
 
-  if test $as_have_required = yes &&	 (eval ":
+  if test $as_have_required = yes && 	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -261,7 +242,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -282,7 +263,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -362,10 +343,10 @@
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-	done
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+        done
+        export CONFIG_SHELL
+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -434,10 +415,9 @@
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell bug-autoconf@... about your system,
-  echo including any error possibly output before this message.
-  echo This can help us improve future autoconf versions.
-  echo Configuration will now proceed without shell functions.
+  echo Please tell autoconf@... about your system,
+  echo including any error possibly output before this
+  echo message
 }
 
 
@@ -473,7 +453,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -501,6 +481,7 @@
 *)
   ECHO_N='-n';;
 esac
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -513,22 +494,19 @@
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
+  mkdir conf$$.dir
 fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     as_ln_s='cp -p'
-  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
@@ -553,10 +531,10 @@
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-	test -d "$1/.";
+        test -d "$1/.";
       else
 	case $1 in
-	-*)set "./$1";;
+        -*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -638,100 +616,85 @@
 
 ac_header_list=
 ac_func_list=
-ac_subst_vars='LTLIBOBJS
-BUILD_DVDCSS
-SDL_DEFINES
-DEBUG_FLAGS
-INCLUDES
-POW_LIB
-LIBOBJS
-ALLOCA
-HAVE_NASM
-HAVE_UNZIP
-HAVE_GPERF
-HAVE_CMAKE
-HAVE_GAWK
-EGREP
-GREP
-CPP
-MACOSX_DEPLOYMENT_TARGET
-SET_MAKE
-LN_S
-AWK
-ac_ct_CC
-CFLAGS
-CC
-OBJEXT
-EXEEXT
-ac_ct_CXX
-CPPFLAGS
-LDFLAGS
-CXXFLAGS
-CXX
-CCACHE
-ARCH
-ARCH_DEFINES
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
+ac_subst_vars='SHELL
 PATH_SEPARATOR
-SHELL'
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+ARCH_DEFINES
+ARCH
+CCACHE
+CXX
+CXXFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CXX
+EXEEXT
+OBJEXT
+CC
+CFLAGS
+ac_ct_CC
+AWK
+LN_S
+SET_MAKE
+MACOSX_DEPLOYMENT_TARGET
+CPP
+GREP
+EGREP
+HAVE_GAWK
+HAVE_CMAKE
+HAVE_GPERF
+HAVE_UNZIP
+HAVE_NASM
+ALLOCA
+LIBOBJS
+POW_LIB
+INCLUDES
+DEBUG_FLAGS
+SDL_DEFINES
+BUILD_DVDCSS
+LTLIBOBJS'
 ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_debug
-enable_optimizations
-enable_gl
-enable_vdpau
-enable_profiling
-enable_joystick
-enable_xrandr
-enable_ccache
-enable_pulse
-enable_faac
-enable_dvdcss
-enable_mid
-'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -749,8 +712,6 @@
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -849,21 +810,13 @@
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -876,21 +829,13 @@
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1081,38 +1026,22 @@
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1132,7 +1061,7 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1141,16 +1070,16 @@
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1159,38 +1088,22 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+  { echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-   { (exit 1); exit 1; }; } ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
+# Be sure to have absolute directory names.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
-  # Remove trailing slashes.
   case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1205,7 +1118,7 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1221,10 +1134,10 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
+  { echo "$as_me: error: Working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+  { echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1232,12 +1145,12 @@
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+  ac_confdir=`$as_dirname -- "$0" ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$0" : 'X\(//\)[^/]' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$0" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1264,12 +1177,12 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1318,9 +1231,9 @@
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
+			  [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
+			  [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1330,25 +1243,25 @@
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/-xbmc-]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR          info documentation [DATAROOTDIR/info]
+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR           man documentation [DATAROOTDIR/man]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/-xbmc-]
+  --htmldir=DIR          html documentation [DOCDIR]
+  --dvidir=DIR           dvi documentation [DOCDIR]
+  --pdfdir=DIR           pdf documentation [DOCDIR]
+  --psdir=DIR            ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1366,7 +1279,6 @@
   cat <<\_ACEOF
 
 Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-debug          enable debugging information (default is yes)
@@ -1406,17 +1318,15 @@
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
+    test -d "$ac_dir" || continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1452,7 +1362,7 @@
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1462,10 +1372,10 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 "xbmc" configure 8.10
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1476,7 +1386,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by "xbmc" $as_me 8.10, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
 
@@ -1512,7 +1422,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  $as_echo "PATH: $as_dir"
+  echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1547,7 +1457,7 @@
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1599,12 +1509,11 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1634,9 +1543,9 @@
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      $as_echo "$ac_var='\''$ac_val'\''"
+      echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1651,9 +1560,9 @@
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
+	echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1669,8 +1578,8 @@
       echo
     fi
     test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
+      echo "$as_me: caught signal $ac_signal"
+    echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1712,24 +1621,21 @@
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
+# Prefer explicitly selected file to automatically selected ones.
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  set x "$CONFIG_SITE"
 elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
 else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+  set x "$ac_default_prefix/share/config.site" \
+	"$ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+shift
+for ac_site_file
 do
-  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1739,16 +1645,16 @@
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1766,38 +1672,29 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+	ac_cache_corrupted=:
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1807,12 +1704,10 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1852,8 +1747,8 @@
 
 # Ensure config.guess and config.sub exist and is executable
 # Also install latest version of these files if available
-{ $as_echo "$as_me:$LINENO: Ensuring config.guess and config.sub exist and is executable" >&5
-$as_echo "$as_me: Ensuring config.guess and config.sub exist and is executable" >&6;}
+{ echo "$as_me:$LINENO: Ensuring config.guess and config.sub exist and is executable" >&5
+echo "$as_me: Ensuring config.guess and config.sub exist and is executable" >&6;}
 test -f config.guess && chmod a+x config.guess
 if [ -x /usr/share/misc/config.guess ] && \
     [ $($PWD/config.guess -t | sed 's/-//g') -lt \
@@ -1884,8 +1779,8 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1900,34 +1795,34 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
 if test "${ac_cv_build+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -1944,27 +1839,27 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
 if test "${ac_cv_host+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -2024,8 +1919,8 @@
 
        ;;
     *)
-       { { $as_echo "$as_me:$LINENO: error: unsupported host ($host)" >&5
-$as_echo "$as_me: error: unsupported host ($host)" >&2;}
+       { { echo "$as_me:$LINENO: error: unsupported host ($host)" >&5
+echo "$as_me: error: unsupported host ($host)" >&2;}
    { (exit 1); exit 1; }; }
 esac
 
@@ -2088,10 +1983,10 @@
 
 # Extract the first word of "ccache", so it can be a program name with args.
 set dummy ccache; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_CCACHE+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $CCACHE in
   [\\/]* | ?:[\\/]*)
@@ -2106,7 +2001,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CCACHE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2119,11 +2014,11 @@
 fi
 CCACHE=$ac_cv_path_CCACHE
 if test -n "$CCACHE"; then
-  { $as_echo "$as_me:$LINENO: result: $CCACHE" >&5
-$as_echo "$CCACHE" >&6; }
+  { echo "$as_me:$LINENO: result: $CCACHE" >&5
+echo "${ECHO_T}$CCACHE" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -2186,10 +2081,10 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -2202,7 +2097,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2213,11 +2108,11 @@
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -2230,10 +2125,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -2246,7 +2141,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2257,11 +2152,11 @@
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -2273,8 +2168,12 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@...." >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -2284,41 +2183,37 @@
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2337,22 +2232,27 @@
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
-$as_echo_n "checking for C++ compiler default output file name... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
+{ echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
+echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6; }
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+#
+# List of possible output files, starting from the most likely.
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+# only as a last resort.  b.out is created by i960 compilers.
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+#
+# The IRIX 6 linker writes into existing files which may not be
+# executable, retaining their permissions.  Remove them first so a
+# subsequent execution test works.
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -2363,11 +2263,10 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2378,7 +2277,7 @@
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2405,27 +2304,25 @@
   ac_file=''
 fi
 
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
 if test -z "$ac_file"; then
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C++ compiler cannot create executables
+{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C++ compiler cannot create executables
+echo "$as_me: error: C++ compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+   { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
-$as_echo_n "checking whether the C++ compiler works... " >&6; }
+{ echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
+echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2434,53 +2331,49 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
+	{ { echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C++ compiled programs.
+echo "$as_me: error: cannot run C++ compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
     fi
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2489,33 +2382,31 @@
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2538,43 +2429,40 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2600,21 +2488,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2624,19 +2511,15 @@
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
+GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
@@ -2663,21 +2546,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CXXFLAGS=""
@@ -2702,21 +2584,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -2742,21 +2623,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2771,8 +2651,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -2804,10 +2684,10 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2820,7 +2700,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2831,11 +2711,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -2844,10 +2724,10 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2860,7 +2740,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2871,11 +2751,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2883,8 +2763,12 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@...." >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2897,10 +2781,10 @@
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2913,7 +2797,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2924,11 +2808,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -2937,10 +2821,10 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2958,7 +2842,7 @@
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2981,11 +2865,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -2996,10 +2880,10 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3012,7 +2896,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3023,11 +2907,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -3040,10 +2924,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3056,7 +2940,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3067,11 +2951,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -3083,8 +2967,12 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@...." >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3094,56 +2982,50 @@
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
+echo "$as_me:$LINENO: checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3169,21 +3051,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -3193,19 +3074,15 @@
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -3232,21 +3109,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -3271,21 +3147,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -3311,21 +3186,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3340,8 +3214,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3357,10 +3231,10 @@
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -3431,21 +3305,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3461,15 +3334,15 @@
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
+    { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
+    { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -3484,10 +3357,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -3500,7 +3373,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3511,34 +3384,33 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
+  { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
+  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6; }
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -3555,12 +3427,12 @@
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -3614,15 +3486,15 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -3654,21 +3526,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3692,14 +3563,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3707,7 +3577,7 @@
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -3732,8 +3602,8 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -3761,21 +3631,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3799,14 +3668,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3814,7 +3682,7 @@
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -3830,13 +3698,11 @@
 if $ac_preproc_ok; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+   { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
@@ -3846,37 +3712,42 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -z "$GREP"; then
+  # Extract the first word of "grep ggrep" to use in msg output
+if test -z "$GREP"; then
+set dummy grep ggrep; ac_prog_name=$2
+if test "${ac_cv_path_GREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
   ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+    # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
+    echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3891,60 +3762,74 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-      $ac_path_GREP_found && break 3
-    done
+
+    $ac_path_GREP_found && break 3
   done
 done
+
+done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+
+
+fi
+
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-  fi
+fi
+
 else
   ac_cv_path_GREP=$GREP
 fi
 
+
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     if test -z "$EGREP"; then
+     # Extract the first word of "egrep" to use in msg output
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
   ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+    # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
+    echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3959,31 +3844,40 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-      $ac_path_EGREP_found && break 3
-    done
+
+    $ac_path_EGREP_found && break 3
   done
 done
+
+done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+
+
+fi
+
+EGREP="$ac_cv_path_EGREP"
+if test -z "$EGREP"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-  fi
+fi
+
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
+
    fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4010,21 +3904,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -4116,40 +4009,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -4171,11 +4061,11 @@
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4193,21 +4083,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -4215,15 +4104,12 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4232,17 +4118,17 @@
 
 
 if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5
-$as_echo_n "checking for boost/shared_ptr.hpp... " >&6; }
+  { echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5
+echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6; }
 if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5
-$as_echo "$ac_cv_header_boost_shared_ptr_hpp" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5
+echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5
-$as_echo_n "checking boost/shared_ptr.hpp usability... " >&6; }
+{ echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5
+echo $ECHO_N "checking boost/shared_ptr.hpp usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4258,33 +4144,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5
-$as_echo_n "checking boost/shared_ptr.hpp presence... " >&6; }
+{ echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5
+echo $ECHO_N "checking boost/shared_ptr.hpp presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4298,52 +4183,51 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 18656
          http://xbmc.svn.sourceforge.net/xbmc/?rev=18656&view=rev
Author:   Alcoheca
Date:     2009-03-18 06:27:48 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
fixed: win32 build.
removed: old GUIDialogPVRClientSettings files

Modified Paths:
--------------
    branches/unified-pvr/XBMC/project/VS2008Express/XBMC.vcproj
    branches/unified-pvr/XBMC/xbmc/GUIWindowEPG.cpp
    branches/unified-pvr/XBMC/xbmc/utils/TVChannel.cpp
    branches/unified-pvr/XBMC/xbmc/utils/TVChannel.h

Removed Paths:
-------------
    branches/unified-pvr/XBMC/xbmc/GUIDialogPVRClientSettings.cpp
    branches/unified-pvr/XBMC/xbmc/GUIDialogPVRClientSettings.h

Modified: branches/unified-pvr/XBMC/project/VS2008Express/XBMC.vcproj
===================================================================
--- branches/unified-pvr/XBMC/project/VS2008Express/XBMC.vcproj	2009-03-18 06:23:31 UTC (rev 18655)
+++ branches/unified-pvr/XBMC/project/VS2008Express/XBMC.vcproj	2009-03-18 06:27:48 UTC (rev 18656)
@@ -3026,10 +3026,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\xbmc\utils\TVRecordInfoTag.cpp"
-					>
-				</File>
-				<File
 					RelativePath="..\..\xbmc\utils\TVTimerInfoTag.cpp"
 					>
 				</File>
@@ -3322,14 +3318,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\xbmc\GUIDialogPVRClientSettings.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\xbmc\GUIDialogPVRClientSettings.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\xbmc\GUIDialogSeekBar.cpp"
 					>
 				</File>

Deleted: branches/unified-pvr/XBMC/xbmc/GUIDialogPVRClientSettings.cpp
===================================================================
--- branches/unified-pvr/XBMC/xbmc/GUIDialogPVRClientSettings.cpp	2009-03-18 06:23:31 UTC (rev 18655)
+++ branches/unified-pvr/XBMC/xbmc/GUIDialogPVRClientSettings.cpp	2009-03-18 06:27:48 UTC (rev 18656)
@@ -1,242 +0,0 @@
-/*
-*      Copyright (C) 2005-2008 Team XBMC
-*      http://www.xbmc.org
-*
-*  This Program is free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2, or (at your option)
-*  any later version.
-*
-*  This Program is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-*  GNU General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with XBMC; see the file COPYING.  If not, write to
-*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*  http://www.gnu.org/copyleft/gpl.html
-*
-*/
-
-#include "stdafx.h"
-#include "GUIDialogPVRClientSettings.h"
-#include "GUIWindowSettingsCategory.h"
-#include "GUIControlGroupList.h"
-#include "utils/GUIInfoManager.h"
-
-#define CONTROL_SETTINGS_LABEL      2
-#define CONTROL_NONE_AVAILABLE      3
-#define CONTROL_GROUP_LIST          5
-#ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
-#define CONTROL_AREA                5
-#define CONTROL_GAP                 6
-#endif
-#define CONTROL_DEFAULT_BUTTON      7
-#define CONTROL_DEFAULT_RADIOBUTTON 8
-#define CONTROL_DEFAULT_SPIN        9
-#define CONTROL_START              50
-#define CONTROL_PAGE               60
-
-CGUIDialogPVRClientSettings::CGUIDialogPVRClientSettings(void)
-: CGUIDialog(WINDOW_DIALOG_PVRCLIENT_SETTINGS, "PVRClientSettings.xml")
-{
-  m_pOriginalSpin = NULL;
-  m_pOriginalRadioButton = NULL;
-  m_pOriginalSettingsButton = NULL;
-  m_pClient = NULL;
-  m_pSettings = NULL;
-  LoadOnDemand(true);    // we must query which client we are configuring
-}
-
-CGUIDialogPVRClientSettings::~CGUIDialogPVRClientSettings(void)
-{
-}
-
-bool CGUIDialogPVRClientSettings::OnMessage(CGUIMessage &message)
-{
-  switch (message.GetMessage())
-  {
-  case GUI_MSG_CLICKED:
-    {
-      unsigned int iControl = message.GetSenderId();
-      if (iControl >= CONTROL_START && iControl < CONTROL_PAGE)
-        OnClick(iControl);
-      return true;
-    }
-    break;
-  case GUI_MSG_WINDOW_DEINIT:
-  case GUI_MSG_VISUALISATION_UNLOADING:
-    {
-      FreeControls();
-      m_pClient = NULL;
-      m_pSettings = NULL;
-    }
-    break;
-  case GUI_MSG_VISUALISATION_LOADED:
-    {
-      SetClient((CPVRClient *)message.GetLPVOID());
-      SetupPage();
-      SET_CONTROL_FOCUS(CONTROL_START, 0);
-    }
-  }
-  return CGUIDialog::OnMessage(message);
-}
-
-void CGUIDialogPVRClientSettings::SetupPage()
-{
-  // cleanup first, if necessary
-  FreeControls();
-  m_pOriginalSpin = (CGUISpinControlEx*)GetControl(CONTROL_DEFAULT_SPIN);
-  m_pOriginalRadioButton = (CGUIRadioButtonControl *)GetControl(CONTROL_DEFAULT_RADIOBUTTON);
-  m_pOriginalSettingsButton = (CGUIButtonControl *)GetControl(CONTROL_DEFAULT_BUTTON);
-  if (!m_pOriginalSpin || !m_pOriginalRadioButton || !m_pOriginalSettingsButton)
-    return;
-  m_pOriginalSpin->SetVisible(false);
-  m_pOriginalRadioButton->SetVisible(false);
-  m_pOriginalSettingsButton->SetVisible(false);
-
-  CGUIControlGroupList *group = (CGUIControlGroupList *)GetControl(CONTROL_GROUP_LIST);
-#ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
-  if (!group || group->GetControlType() != CGUIControl::GUICONTROL_GROUPLIST)
-  {
-    // our controls for layout...
-    CGUIControl *pArea = (CGUIControl *)GetControl(CONTROL_AREA);
-    const CGUIControl *pGap = GetControl(CONTROL_GAP);
-    if (!pArea || !pGap)
-      return;
-    Remove(pArea);
-    group = new CGUIControlGroupList(GetID(), CONTROL_GROUP_LIST, pArea->GetXPosition(), pArea->GetYPosition(),
-      pArea->GetWidth(), pArea->GetHeight(), pGap->GetHeight() - m_pOriginalSettingsButton->GetHeight(),
-      0, VERTICAL, false);
-    group->SetNavigation(CONTROL_GROUP_LIST, CONTROL_GROUP_LIST, CONTROL_GROUP_LIST, CONTROL_GROUP_LIST);
-    Insert(group, pGap);
-    pArea->FreeResources();
-    delete pArea;
-    SET_CONTROL_HIDDEN(CONTROL_PAGE);
-  }
-#endif
-  if (!group)
-    return;
-
-  if (!m_pSettings || !m_pSettings->size())
-  { // no settings available
-    SET_CONTROL_VISIBLE(CONTROL_NONE_AVAILABLE);
-    return;
-  }
-  else
-  {
-    SET_CONTROL_HIDDEN(CONTROL_NONE_AVAILABLE);
-  }
-
-
-  // run through and create our controls
-  for (unsigned int i = 0; i < m_pSettings->size(); i++)
-  {
-    PVRSetting &setting = m_pSettings->at(i);
-    AddSetting(setting, group->GetWidth(), CONTROL_START + i);
-  }
-  UpdateSettings();
-}
-
-
-void CGUIDialogPVRClientSettings::UpdateSettings()
-{
-}
-
-void CGUIDialogPVRClientSettings::OnClick(int iID)
-{
-  if (!m_pSettings || !m_pClient) return;
-  unsigned int settingNum = iID - CONTROL_START;
-  if (settingNum >= m_pSettings->size()) return;
-  PVRSetting &setting = m_pSettings->at(settingNum);
-  if (setting.type == PVRSetting::SPIN)
-  {
-    CGUISpinControlEx *pControl = (CGUISpinControlEx *)GetControl(iID);
-    setting.current = pControl->GetValue();
-  }
-  else if (setting.type == PVRSetting::CHECK)
-  {
-    CGUIRadioButtonControl *pControl = (CGUIRadioButtonControl *)GetControl(iID);
-    setting.current = pControl->IsSelected() ? 1 : 0;
-  }
-  m_pClient->UpdateSetting(settingNum);
-  UpdateSettings();
-}
-
-void CGUIDialogPVRClientSettings::FreeControls()
-{
-  // just clear our group list
-  CGUIControlGroupList *group = (CGUIControlGroupList *)GetControl(CONTROL_GROUP_LIST);
-#ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
-  if (group && group->GetControlType() == CGUIControl::GUICONTROL_GROUPLIST)
-#else
-  if (group)
-#endif
-  {
-    group->FreeResources();
-    group->ClearAll();
-  }
-}
-
-void CGUIDialogPVRClientSettings::AddSetting(PVRSetting &setting, float width, int iControlID)
-{
-  CGUIControl *pControl = NULL;
-  if (setting.type == PVRSetting::CHECK)
-  {
-    pControl = new CGUIRadioButtonControl(*m_pOriginalRadioButton);
-    if (!pControl) return ;
-    ((CGUIRadioButtonControl *)pControl)->SetLabel(setting.name);
-    pControl->SetWidth(width);
-    ((CGUIRadioButtonControl *)pControl)->SetSelected(setting.current == 1);
-  }
-  else if (setting.type == PVRSetting::SPIN && setting.entry.size() > 0)
-  {
-    pControl = new CGUISpinControlEx(*m_pOriginalSpin);
-    if (!pControl) return ;
-    pControl->SetWidth(width);
-    ((CGUISpinControlEx *)pControl)->SetText(setting.name);
-    pControl->SetWidth(width);
-    for (unsigned int i = 0; i < setting.entry.size(); i++)
-      ((CGUISpinControlEx *)pControl)->AddLabel(setting.entry[i], i);
-    ((CGUISpinControlEx *)pControl)->SetValue(setting.current);
-  }
-  if (!pControl) return;
-  pControl->SetID(iControlID);
-  pControl->SetVisible(true);
-  CGUIControlGroupList *group = (CGUIControlGroupList *)GetControl(CONTROL_GROUP_LIST);
-  if (group)
-  {
-    pControl->AllocResources();
-    group->AddControl(pControl);
-  }
-  else
-    delete pControl;
-}
-
-void CGUIDialogPVRClientSettings::Render()
-{
-  CGUIDialog::Render();
-}
-
-void CGUIDialogPVRClientSettings::SetClient(CPVRClient *pClient)
-{
-  m_pClient = pClient;
-  if (m_pClient)
-  {
-    m_pClient->GetSettings(&m_pSettings);
-  }
-}
-
-void CGUIDialogPVRClientSettings::OnInitWindow()
-{
- /* CGUIMessage msg(GUI_MSG_GET_VISUALISATION, 0, 0);
-  g_graphicsContext.SendMessage(msg);
-  SetClient((CPVRClient *)msg.GetLPVOID());*/
-
-  SetupPage();
-  // reset the default control
-  m_lastControlID = CONTROL_START;
-  CGUIDialog::OnInitWindow();
-}
-

Deleted: branches/unified-pvr/XBMC/xbmc/GUIDialogPVRClientSettings.h
===================================================================
--- branches/unified-pvr/XBMC/xbmc/GUIDialogPVRClientSettings.h	2009-03-18 06:23:31 UTC (rev 18655)
+++ branches/unified-pvr/XBMC/xbmc/GUIDialogPVRClientSettings.h	2009-03-18 06:27:48 UTC (rev 18656)
@@ -1,53 +0,0 @@
-#pragma once
-
-/*
-*      Copyright (C) 2005-2008 Team XBMC
-*      http://www.xbmc.org
-*
-*  This Program is free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2, or (at your option)
-*  any later version.
-*
-*  This Program is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-*  GNU General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with XBMC; see the file COPYING.  If not, write to
-*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*  http://www.gnu.org/copyleft/gpl.html
-*
-*/
-
-#include "GUIDialog.h"
-#include "pvrclients/PVRClient.h"
-#include "GUISpinControlEx.h"
-#include "GUIRadioButtonControl.h"
-#include "GUIButtonControl.h"
-
-class CGUIDialogPVRClientSettings :
-  public CGUIDialog
-{
-public:
-  CGUIDialogPVRClientSettings(void);
-  virtual ~CGUIDialogPVRClientSettings(void);
-  virtual bool OnMessage(CGUIMessage &message);
-  virtual void Render();
-protected:
-  virtual void OnInitWindow();
-  void SetClient(CPVRClient *pClient);
-  virtual void SetupPage();
-  void UpdateSettings();
-  virtual void FreeControls();
-  void OnClick(int iControl);
-  void AddSetting(PVRSetting &setting, float width, int iControlID);
-
-  CGUISpinControlEx *m_pOriginalSpin;
-  CGUIRadioButtonControl *m_pOriginalRadioButton;
-  CGUIButtonControl *m_pOriginalSettingsButton;
-
-  CPVRClient *m_pClient;
-  std::vector<PVRSetting> *m_pSettings;
-};

Modified: branches/unified-pvr/XBMC/xbmc/GUIWindowEPG.cpp
===================================================================
--- branches/unified-pvr/XBMC/xbmc/GUIWindowEPG.cpp	2009-03-18 06:23:31 UTC (rev 18655)
+++ branches/unified-pvr/XBMC/xbmc/GUIWindowEPG.cpp	2009-03-18 06:27:48 UTC (rev 18656)
@@ -232,7 +232,7 @@
   /// ShowInfo can kill the item as this window can be closed while we do it, can it?
   /// so take a copy of the item now
   CFileItem item(*pItem);
-  if (!item.IsTVDb()) //TODO
+  if (!item.IsPVR()) //TODO
     return;
   
   ShowEPGInfo(&item);

Modified: branches/unified-pvr/XBMC/xbmc/utils/TVChannel.cpp
===================================================================
--- branches/unified-pvr/XBMC/xbmc/utils/TVChannel.cpp	2009-03-18 06:23:31 UTC (rev 18655)
+++ branches/unified-pvr/XBMC/xbmc/utils/TVChannel.cpp	2009-03-18 06:27:48 UTC (rev 18656)
@@ -21,13 +21,3 @@
 
 #include "stdafx.h"
 #include "TVChannel.h"
-
-CTVChannel::CTVChannel(PVR_CHANNEL &clientChannel)
-{
-
-}
-
-CTVChannel::~CTVChannel()
-{
-
-}
\ No newline at end of file

Modified: branches/unified-pvr/XBMC/xbmc/utils/TVChannel.h
===================================================================
--- branches/unified-pvr/XBMC/xbmc/utils/TVChannel.h	2009-03-18 06:23:31 UTC (rev 18655)
+++ branches/unified-pvr/XBMC/xbmc/utils/TVChannel.h	2009-03-18 06:27:48 UTC (rev 18656)
@@ -28,10 +28,8 @@
   
 public:
   CTVChannel(long clientID, int number, int clientnumber, CStdString name, CStdString callsign, CStdString iconPath);
+  ~CTVChannel() {};
 
-  CTVChannel(CTVChannel &oldChannel);
-  ~CTVChannel();
-
   bool GetEPGNowInfo(CTVEPGInfoTag *result);
   bool GetEPGNextInfo(CTVEPGInfoTag *result);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 18657
          http://xbmc.svn.sourceforge.net/xbmc/?rev=18657&view=rev
Author:   Alcoheca
Date:     2009-03-18 08:35:54 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
Merged: changes from linuxport. @ rev 18656

Revision Links:
--------------
    http://xbmc.svn.sourceforge.net/xbmc/?rev=18656&view=rev

Modified Paths:
--------------
    branches/unified-pvr/XBMC/Makefile.in
    branches/unified-pvr/XBMC/Makefile.include.in
    branches/unified-pvr/XBMC/README.linux
    branches/unified-pvr/XBMC/README.osx
    branches/unified-pvr/XBMC/XBMC.xcodeproj/project.pbxproj
    branches/unified-pvr/XBMC/configure
    branches/unified-pvr/XBMC/configure.in
    branches/unified-pvr/XBMC/guilib/ActionManager.h
    branches/unified-pvr/XBMC/guilib/AnimatedGif.cpp
    branches/unified-pvr/XBMC/guilib/AnimatedGif.h
    branches/unified-pvr/XBMC/guilib/AudioContext.cpp
    branches/unified-pvr/XBMC/guilib/AudioContext.h
    branches/unified-pvr/XBMC/guilib/DirectXGraphics.cpp
    branches/unified-pvr/XBMC/guilib/GUIAudioManager.cpp
    branches/unified-pvr/XBMC/guilib/GUIAudioManager.h
    branches/unified-pvr/XBMC/guilib/GUIBaseContainer.cpp
    branches/unified-pvr/XBMC/guilib/GUIBaseContainer.h
    branches/unified-pvr/XBMC/guilib/GUIBorderedImage.h
    branches/unified-pvr/XBMC/guilib/GUIButtonControl.cpp
    branches/unified-pvr/XBMC/guilib/GUIButtonControl.h
    branches/unified-pvr/XBMC/guilib/GUIButtonScroller.cpp
    branches/unified-pvr/XBMC/guilib/GUIButtonScroller.h
    branches/unified-pvr/XBMC/guilib/GUICallback.h
    branches/unified-pvr/XBMC/guilib/GUICheckMarkControl.cpp
    branches/unified-pvr/XBMC/guilib/GUICheckMarkControl.h
    branches/unified-pvr/XBMC/guilib/GUIColorManager.h
    branches/unified-pvr/XBMC/guilib/GUIControl.cpp
    branches/unified-pvr/XBMC/guilib/GUIControl.h
    branches/unified-pvr/XBMC/guilib/GUIControlFactory.cpp
    branches/unified-pvr/XBMC/guilib/GUIControlFactory.h
    branches/unified-pvr/XBMC/guilib/GUIControlGroup.cpp
    branches/unified-pvr/XBMC/guilib/GUIControlGroup.h
    branches/unified-pvr/XBMC/guilib/GUIControlGroupList.h
    branches/unified-pvr/XBMC/guilib/GUIDialog.cpp
    branches/unified-pvr/XBMC/guilib/GUIDialog.h
    branches/unified-pvr/XBMC/guilib/GUIEditControl.cpp
    branches/unified-pvr/XBMC/guilib/GUIEditControl.h
    branches/unified-pvr/XBMC/guilib/GUIFadeLabelControl.cpp
    branches/unified-pvr/XBMC/guilib/GUIFadeLabelControl.h
    branches/unified-pvr/XBMC/guilib/GUIFixedListContainer.h
    branches/unified-pvr/XBMC/guilib/GUIFont.cpp
    branches/unified-pvr/XBMC/guilib/GUIFont.h
    branches/unified-pvr/XBMC/guilib/GUIFontManager.cpp
    branches/unified-pvr/XBMC/guilib/GUIFontManager.h
    branches/unified-pvr/XBMC/guilib/GUIFontTTF.cpp
    branches/unified-pvr/XBMC/guilib/GUIFontTTF.h
    branches/unified-pvr/XBMC/guilib/GUIImage.cpp
    branches/unified-pvr/XBMC/guilib/GUIImage.h
    branches/unified-pvr/XBMC/guilib/GUIIncludes.cpp
    branches/unified-pvr/XBMC/guilib/GUIInfoColor.h
    branches/unified-pvr/XBMC/guilib/GUILabelControl.cpp
    branches/unified-pvr/XBMC/guilib/GUILabelControl.h
    branches/unified-pvr/XBMC/guilib/GUIListContainer.cpp
    branches/unified-pvr/XBMC/guilib/GUIListContainer.h
    branches/unified-pvr/XBMC/guilib/GUIListGroup.h
    branches/unified-pvr/XBMC/guilib/GUIListItem.h
    branches/unified-pvr/XBMC/guilib/GUIListLabel.cpp
    branches/unified-pvr/XBMC/guilib/GUIListLabel.h
    branches/unified-pvr/XBMC/guilib/GUIMessage.h
    branches/unified-pvr/XBMC/guilib/GUIMoverControl.cpp
    branches/unified-pvr/XBMC/guilib/GUIMoverControl.h
    branches/unified-pvr/XBMC/guilib/GUIMultiImage.cpp
    branches/unified-pvr/XBMC/guilib/GUIMultiImage.h
    branches/unified-pvr/XBMC/guilib/GUIMultiSelectText.cpp
    branches/unified-pvr/XBMC/guilib/GUIMultiSelectText.h
    branches/unified-pvr/XBMC/guilib/GUIPanelContainer.cpp
    branches/unified-pvr/XBMC/guilib/GUIPanelContainer.h
    branches/unified-pvr/XBMC/guilib/GUIProgressControl.cpp
    branches/unified-pvr/XBMC/guilib/GUIProgressControl.h
    branches/unified-pvr/XBMC/guilib/GUIRSSControl.cpp
    branches/unified-pvr/XBMC/guilib/GUIRSSControl.h
    branches/unified-pvr/XBMC/guilib/GUIRadioButtonControl.cpp
    branches/unified-pvr/XBMC/guilib/GUIRadioButtonControl.h
    branches/unified-pvr/XBMC/guilib/GUIResizeControl.cpp
    branches/unified-pvr/XBMC/guilib/GUIResizeControl.h
    branches/unified-pvr/XBMC/guilib/GUIScrollBarControl.cpp
    branches/unified-pvr/XBMC/guilib/GUIScrollBarControl.h
    branches/unified-pvr/XBMC/guilib/GUISelectButtonControl.cpp
    branches/unified-pvr/XBMC/guilib/GUISelectButtonControl.h
    branches/unified-pvr/XBMC/guilib/GUISettingsSliderControl.cpp
    branches/unified-pvr/XBMC/guilib/GUISettingsSliderControl.h
    branches/unified-pvr/XBMC/guilib/GUISliderControl.cpp
    branches/unified-pvr/XBMC/guilib/GUISliderControl.h
    branches/unified-pvr/XBMC/guilib/GUISound.cpp
    branches/unified-pvr/XBMC/guilib/GUISound.h
    branches/unified-pvr/XBMC/guilib/GUISpinControl.cpp
    branches/unified-pvr/XBMC/guilib/GUISpinControl.h
    branches/unified-pvr/XBMC/guilib/GUISpinControlEx.cpp
    branches/unified-pvr/XBMC/guilib/GUISpinControlEx.h
    branches/unified-pvr/XBMC/guilib/GUITextBox.cpp
    branches/unified-pvr/XBMC/guilib/GUITextBox.h
    branches/unified-pvr/XBMC/guilib/GUITexture.cpp
    branches/unified-pvr/XBMC/guilib/GUITexture.h
    branches/unified-pvr/XBMC/guilib/GUITextureD3D.cpp
    branches/unified-pvr/XBMC/guilib/GUITextureGL.cpp
    branches/unified-pvr/XBMC/guilib/GUITextureSDL.cpp
    branches/unified-pvr/XBMC/guilib/GUITextureSDL.h
    branches/unified-pvr/XBMC/guilib/GUIToggleButtonControl.cpp
    branches/unified-pvr/XBMC/guilib/GUIToggleButtonControl.h
    branches/unified-pvr/XBMC/guilib/GUIVideoControl.h
    branches/unified-pvr/XBMC/guilib/GUIVisualisationControl.cpp
    branches/unified-pvr/XBMC/guilib/GUIWindow.cpp
    branches/unified-pvr/XBMC/guilib/GUIWindow.h
    branches/unified-pvr/XBMC/guilib/GUIWindowManager.cpp
    branches/unified-pvr/XBMC/guilib/GUIWindowManager.h
    branches/unified-pvr/XBMC/guilib/GUIWrappingListContainer.h
    branches/unified-pvr/XBMC/guilib/Geometry.h
    branches/unified-pvr/XBMC/guilib/GraphicContext.cpp
    branches/unified-pvr/XBMC/guilib/GraphicContext.h
    branches/unified-pvr/XBMC/guilib/IMsgSenderCallback.h
    branches/unified-pvr/XBMC/guilib/IMsgTargetCallback.h
    branches/unified-pvr/XBMC/guilib/IWindowManagerCallback.h
    branches/unified-pvr/XBMC/guilib/Key.cpp
    branches/unified-pvr/XBMC/guilib/Key.h
    branches/unified-pvr/XBMC/guilib/LocalizeStrings.cpp
    branches/unified-pvr/XBMC/guilib/LocalizeStrings.h
    branches/unified-pvr/XBMC/guilib/Shader.cpp
    branches/unified-pvr/XBMC/guilib/SkinInfo.h
    branches/unified-pvr/XBMC/guilib/StdString.h
    branches/unified-pvr/XBMC/guilib/Surface.cpp
    branches/unified-pvr/XBMC/guilib/Surface.h
    branches/unified-pvr/XBMC/guilib/TextureBundle.cpp
    branches/unified-pvr/XBMC/guilib/TextureBundle.h
    branches/unified-pvr/XBMC/guilib/TextureManager.cpp
    branches/unified-pvr/XBMC/guilib/TextureManager.h
    branches/unified-pvr/XBMC/guilib/Tween.h
    branches/unified-pvr/XBMC/guilib/VisibleEffect.cpp
    branches/unified-pvr/XBMC/guilib/common/DirectInput.cpp
    branches/unified-pvr/XBMC/guilib/common/DirectInputKeyboard.cpp
    branches/unified-pvr/XBMC/guilib/common/DirectInputKeyboard.h
    branches/unified-pvr/XBMC/guilib/common/DirectInputMouse.cpp
    branches/unified-pvr/XBMC/guilib/common/Keyboard.cpp
    branches/unified-pvr/XBMC/guilib/common/Keyboard.h
    branches/unified-pvr/XBMC/guilib/common/LIRC.cpp
    branches/unified-pvr/XBMC/guilib/common/Makefile.in
    branches/unified-pvr/XBMC/guilib/common/Mouse.h
    branches/unified-pvr/XBMC/guilib/common/SDLJoystick.cpp
    branches/unified-pvr/XBMC/guilib/common/SDLJoystick.h
    branches/unified-pvr/XBMC/guilib/common/SDLKeyboard.cpp
    branches/unified-pvr/XBMC/guilib/common/SDLKeyboard.h
    branches/unified-pvr/XBMC/guilib/common/SDLMouse.cpp
    branches/unified-pvr/XBMC/guilib/gui3d.h
    branches/unified-pvr/XBMC/guilib/system.h
    branches/unified-pvr/XBMC/language/Czech/strings.xml
    branches/unified-pvr/XBMC/language/English/strings.xml
    branches/unified-pvr/XBMC/language/Finnish/strings.xml
    branches/unified-pvr/XBMC/language/French/strings.xml
    branches/unified-pvr/XBMC/language/German/strings.xml
    branches/unified-pvr/XBMC/language/German (Austria)/strings.xml
    branches/unified-pvr/XBMC/language/Greek/strings.xml
    branches/unified-pvr/XBMC/language/Italian/strings.xml
    branches/unified-pvr/XBMC/language/Korean/strings.xml
    branches/unified-pvr/XBMC/language/Russian/strings.xml
    branches/unified-pvr/XBMC/language/Swedish/strings.xml
    branches/unified-pvr/XBMC/project/VS2003/XBMC_PC.vcproj
    branches/unified-pvr/XBMC/project/VS2008Express/XBMC.vcproj
    branches/unified-pvr/XBMC/pvrclients/VDR/info.xml
    branches/unified-pvr/XBMC/scripts/examples.zip
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/DialogAddonBrowser.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/DialogVideoInfo.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/MyGameSaves.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/MyMusicNav.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/MyMusicPlaylist.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/MyMusicSongs.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/MyPics.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/MyPrograms.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/MyScripts.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/MyVideo.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/MyVideoNav.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/MyVideoPlaylist.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/MyWeather.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/Settings.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/SettingsCategory.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/SettingsProfile.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/SettingsSystemInfo.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/ViewsVideoLibrary.xml
    branches/unified-pvr/XBMC/skin/PM3.HD/720p/includes.xml
    branches/unified-pvr/XBMC/skin/Project Mayhem III/PAL/DialogVideoInfo.xml
    branches/unified-pvr/XBMC/system/Keymap.xml
    branches/unified-pvr/XBMC/system/players/dvdplayer/avcodec-52.dll
    branches/unified-pvr/XBMC/system/players/dvdplayer/avformat-52.dll
    branches/unified-pvr/XBMC/system/players/dvdplayer/avutil-49.dll
    branches/unified-pvr/XBMC/system/players/dvdplayer/postproc-51.dll
    branches/unified-pvr/XBMC/system/players/dvdplayer/swscale-0.6.1.dll
    branches/unified-pvr/XBMC/system/scrapers/music/allmusic.xml
    branches/unified-pvr/XBMC/system/scrapers/video/KinoPoisk.xml
    branches/unified-pvr/XBMC/system/scrapers/video/adultdvdempire.xml
    branches/unified-pvr/XBMC/system/scrapers/video/filmstarts.xml
    branches/unified-pvr/XBMC/system/scrapers/video/moviemaze.xml
    branches/unified-pvr/XBMC/system/scrapers/video/naver.xml
    branches/unified-pvr/XBMC/system/scrapers/video/tvcom.xml
    branches/unified-pvr/XBMC/tools/EventClients/Clients/WiiRemote/WiiUse_README
    branches/unified-pvr/XBMC/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.cpp
    branches/unified-pvr/XBMC/tools/Linux/xbmc.sh.in
    branches/unified-pvr/XBMC/tools/Mach5/mach5.rb
    branches/unified-pvr/XBMC/tools/Mach5/wrapper.rb
    branches/unified-pvr/XBMC/tools/XBMCLive/BootCD/cdimage/boot/grub/menu.lst
    branches/unified-pvr/XBMC/tools/XBMCLive/Creator/platforms/i386-intrepid-xbmc/fsets/custom.fset
    branches/unified-pvr/XBMC/tools/XBMCLive/Creator/platforms/i386-intrepid-xbmc/initramfs/cd
    branches/unified-pvr/XBMC/tools/XBMCLive/Creator/platforms/i386-intrepid-xbmc/initramfs/disk
    branches/unified-pvr/XBMC/tools/XBMCLive/Creator/platforms/i386-intrepid-xbmc/initramfs/usb
    branches/unified-pvr/XBMC/tools/XBMCLive/Creator/platforms/i386-jaunty-xbmc/fsets/custom.fset
    branches/unified-pvr/XBMC/tools/XBMCLive/Creator/platforms/i386-jaunty-xbmc/initramfs/cd
    branches/unified-pvr/XBMC/tools/XBMCLive/Creator/platforms/i386-jaunty-xbmc/initramfs/disk
    branches/unified-pvr/XBMC/tools/XBMCLive/Creator/platforms/i386-jaunty-xbmc/initramfs/usb
    branches/unified-pvr/XBMC/tools/XBMCLive/runXBMC.sh
    branches/unified-pvr/XBMC/tools/XBMCLive/xbmc
    branches/unified-pvr/XBMC/tools/XBMCTex/AnimatedGif.cpp
    branches/unified-pvr/XBMC/tools/XBMCTex/SurfaceSDL.cpp
    branches/unified-pvr/XBMC/tools/XBMCTex/SurfaceSDL.h
    branches/unified-pvr/XBMC/tools/XBMCTex/XBMCTex.cpp
    branches/unified-pvr/XBMC/visualisations/ProjectM_win32.vis
    branches/unified-pvr/XBMC/visualisations/Waveform_win32.vis
    branches/unified-pvr/XBMC/visualisations/goom_win32.vis
    branches/unified-pvr/XBMC/visualisations/opengl_spectrum_win32.vis
    branches/unified-pvr/XBMC/visualisations/xbmc_vis.h
    branches/unified-pvr/XBMC/xbmc/Album.cpp
    branches/unified-pvr/XBMC/xbmc/Application.cpp
    branches/unified-pvr/XBMC/xbmc/Application.h
    branches/unified-pvr/XBMC/xbmc/ApplicationMessenger.cpp
    branches/unified-pvr/XBMC/xbmc/ApplicationMessenger.h
    branches/unified-pvr/XBMC/xbmc/ApplicationRenderer.cpp
    branches/unified-pvr/XBMC/xbmc/Artist.cpp
    branches/unified-pvr/XBMC/xbmc/BackgroundInfoLoader.cpp
    branches/unified-pvr/XBMC/xbmc/DetectDVDType.cpp
    branches/unified-pvr/XBMC/xbmc/DetectDVDType.h
    branches/unified-pvr/XBMC/xbmc/Favourites.cpp
    branches/unified-pvr/XBMC/xbmc/FileItem.cpp
    branches/unified-pvr/XBMC/xbmc/FileItem.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/ASAPFileDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/ASAPFileDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/CMythDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/CMythFile.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/CMythFile.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/CMythSession.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/CacheMemBuffer.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/CacheMemBuffer.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/CacheStrategy.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/CacheStrategy.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/DAAPDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/DAAPDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/Directory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/Directory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/DirectoryCache.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/DirectoryCache.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/DirectoryTuxBox.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/DllLibCMyth.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/DllLibCurl.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/DllLibCurl.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/FTPDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/FTPDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/FTPParse.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/FTPParse.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/FactoryDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/FactoryDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/FactoryFileDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/File.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/File.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileCache.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileCache.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileCurl.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileCurl.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileDAAP.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileDAAP.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileFactory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileFileReader.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileFileReader.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileHD.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileISO.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileRTV.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileRar.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileRar.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileShoutcast.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileSmb.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileSmb.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileXBMSP.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileZip.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/FileZip.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/HDDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/HDDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/HDHomeRun.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/HDHomeRun.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/HTTPDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/IDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/IDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/IFile.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/LastFMDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/LastFMDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/MultiPathDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNode.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayed.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/MusicDatabaseDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/MusicFileDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/MusicFileDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/NSFFileDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/PlaylistFileDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/PlaylistFileDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/PluginDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/PluginDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/RSSDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/RarDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/RarDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/RarManager.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/RarManager.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/RingBuffer.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/SAPDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/SAPFile.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/SIDFileDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/SMBDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/SMBDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/ShoutcastDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/SmartPlaylistDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/SmartPlaylistDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/SpecialProtocol.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/SpecialProtocolDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/StackDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/StackDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/UPnPDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/UPnPVirtualPathDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/UPnPVirtualPathDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/VTPFile.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/VTPSession.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNode.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/VideoDatabaseDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/VirtualDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/VirtualDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/VirtualPathDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/XBMSDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/XBMSDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/ZipDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/ZipDirectory.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/ZipManager.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/ZipManager.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/cddb.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/cdioSupport.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/curl/curlbuild.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/iso9660.cpp
    branches/unified-pvr/XBMC/xbmc/FileSystem/iso9660.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/zconf.h
    branches/unified-pvr/XBMC/xbmc/FileSystem/zlib.h
    branches/unified-pvr/XBMC/xbmc/GUIDialogAddonBrowser.cpp
    branches/unified-pvr/XBMC/xbmc/GUIDialogAddonBrowser.h
    branches/unified-pvr/XBMC/xbmc/GUIDialogAudioSubtitleSettings.cpp
    branches/unified-pvr/XBMC/xbmc/GUIDialogContentSettings.cpp
    branches/unified-pvr/XBMC/xbmc/GUIDialogContextMenu.cpp
    branches/unified-pvr/XBMC/xbmc/GUIDialogContextMenu.h
    branches/unified-pvr/XBMC/xbmc/GUIDialogFavourites.cpp
    branches/unified-pvr/XBMC/xbmc/GUIDialogFileBrowser.cpp
    branches/unified-pvr/XBMC/xbmc/GUIDialogProfileSettings.cpp
    branches/unified-pvr/XBMC/xbmc/GUIDialogSmartPlaylistRule.cpp
    branches/unified-pvr/XBMC/xbmc/GUIDialogVideoBookmarks.cpp
    branches/unified-pvr/XBMC/xbmc/GUIDialogVisualisationSettings.cpp
    branches/unified-pvr/XBMC/xbmc/GUILargeTextureManager.cpp
    branches/unified-pvr/XBMC/xbmc/GUILargeTextureManager.h
    branches/unified-pvr/XBMC/xbmc/GUIMediaWindow.cpp
    branches/unified-pvr/XBMC/xbmc/GUISettings.cpp
    branches/unified-pvr/XBMC/xbmc/GUISettings.h
    branches/unified-pvr/XBMC/xbmc/GUIViewStateMusic.cpp
    branches/unified-pvr/XBMC/xbmc/GUIViewStatePictures.cpp
    branches/unified-pvr/XBMC/xbmc/GUIViewStatePrograms.cpp
    branches/unified-pvr/XBMC/xbmc/GUIViewStateVideo.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowFileManager.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowFullScreen.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowLoginScreen.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowMusicBase.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowMusicInfo.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowMusicNav.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowMusicPlaylist.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowMusicSongs.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowPictures.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowPrograms.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowSettingsProfile.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowSlideShow.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowTestPattern.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowVideoBase.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowVideoFiles.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowVideoInfo.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowVideoNav.cpp
    branches/unified-pvr/XBMC/xbmc/GUIWindowVideoNav.h
    branches/unified-pvr/XBMC/xbmc/LastFmManager.cpp
    branches/unified-pvr/XBMC/xbmc/Makefile
    branches/unified-pvr/XBMC/xbmc/MediaManager.cpp
    branches/unified-pvr/XBMC/xbmc/MediaManager.h
    branches/unified-pvr/XBMC/xbmc/MusicDatabase.cpp
    branches/unified-pvr/XBMC/xbmc/MusicInfoScanner.cpp
    branches/unified-pvr/XBMC/xbmc/MusicInfoTagLoaderMidi.cpp
    branches/unified-pvr/XBMC/xbmc/MusicInfoTagLoaderMod.h
    branches/unified-pvr/XBMC/xbmc/NfoFile.cpp
    branches/unified-pvr/XBMC/xbmc/Picture.cpp
    branches/unified-pvr/XBMC/xbmc/PictureInfoTag.cpp
    branches/unified-pvr/XBMC/xbmc/PlayList.cpp
    branches/unified-pvr/XBMC/xbmc/PlayListFactory.cpp
    branches/unified-pvr/XBMC/xbmc/PlayListPLS.cpp
    branches/unified-pvr/XBMC/xbmc/PlayListXML.cpp
    branches/unified-pvr/XBMC/xbmc/Settings.cpp
    branches/unified-pvr/XBMC/xbmc/Settings.h
    branches/unified-pvr/XBMC/xbmc/StringUtils.cpp
    branches/unified-pvr/XBMC/xbmc/ThumbLoader.cpp
    branches/unified-pvr/XBMC/xbmc/UPnP.cpp
    branches/unified-pvr/XBMC/xbmc/UPnP.h
    branches/unified-pvr/XBMC/xbmc/URL.cpp
    branches/unified-pvr/XBMC/xbmc/Util.cpp
    branches/unified-pvr/XBMC/xbmc/Util.h
    branches/unified-pvr/XBMC/xbmc/VideoDatabase.cpp
    branches/unified-pvr/XBMC/xbmc/VideoDatabase.h
    branches/unified-pvr/XBMC/xbmc/VideoInfoScanner.cpp
    branches/unified-pvr/XBMC/xbmc/VideoInfoScanner.h
    branches/unified-pvr/XBMC/xbmc/VideoInfoTag.cpp
    branches/unified-pvr/XBMC/xbmc/XBApplicationEx.cpp
    branches/unified-pvr/XBMC/xbmc/XBVideoConfig.cpp
    branches/unified-pvr/XBMC/xbmc/cores/AudioRenderers/ALSADirectSound.cpp
    branches/unified-pvr/XBMC/xbmc/cores/AudioRenderers/ALSADirectSound.h
    branches/unified-pvr/XBMC/xbmc/cores/AudioRenderers/AudioRendererFactory.cpp
    branches/unified-pvr/XBMC/xbmc/cores/AudioRenderers/AudioRendererFactory.h
    branches/unified-pvr/XBMC/xbmc/cores/AudioRenderers/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/AudioRenderers/NullDirectSound.h
    branches/unified-pvr/XBMC/xbmc/cores/AudioRenderers/PortaudioDirectSound.h
    branches/unified-pvr/XBMC/xbmc/cores/AudioRenderers/PulseAudioDirectSound.h
    branches/unified-pvr/XBMC/xbmc/cores/AudioRenderers/Win32DirectSound.h
    branches/unified-pvr/XBMC/xbmc/cores/DllLoader/Win32DllLoader.cpp
    branches/unified-pvr/XBMC/xbmc/cores/DllLoader/exports/emu_dx8.cpp
    branches/unified-pvr/XBMC/xbmc/cores/DllLoader/ldt_keeper.c
    branches/unified-pvr/XBMC/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp
    branches/unified-pvr/XBMC/xbmc/cores/ExternalPlayer/ExternalPlayer.h
    branches/unified-pvr/XBMC/xbmc/cores/PlayerCoreFactory.cpp
    branches/unified-pvr/XBMC/xbmc/cores/VideoRenderers/LinuxRenderer.cpp
    branches/unified-pvr/XBMC/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
    branches/unified-pvr/XBMC/xbmc/cores/VideoRenderers/LinuxRendererGL.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/Changelog
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/MAINTAINERS
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/Makefile
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/README
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/cmdutils.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/configure
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/ffmpeg-doc.texi
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/ffplay-doc.texi
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/general.texi
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffmpeg.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffplay.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffserver.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/4xm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/Makefile
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aac.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aac.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aac_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ac3dec.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ac3enc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/adpcm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/adxdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/adxenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/allcodecs.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/alpha/asm.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/h264dsp_neon.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/mathops.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/atrac3.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/avcodec.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bfi.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bmp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/cavsdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/celp_filters.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/cook.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dpcm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dsputil.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dsputil.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dvbsubdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dvdsub_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dvdsubdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/eacmv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/eatgq.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/eatgv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/error_resilience.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/fft.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/flac.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/flacdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/golomb.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h263.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h263dec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h264.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h264.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h264_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/huffyuv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/imgconvert.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/imgresample.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/indeo3.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/internal.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/interplayvideo.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libamr.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libdiracdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libdiracenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libfaad.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libschroedingerdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libtheoraenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libvorbis.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mimic.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mlpdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/motionpixels.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpc8data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpeg12.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpeg4video_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegaudio_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegaudiodec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegvideo.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegvideo.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegvideo_enc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegvideo_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegvideo_xvmc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/msmpeg4.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/nellymoserenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/nuv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/options.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/pcm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/pnm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/pnmenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/qcelp_lsp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/qdm2.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ra144.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ra288.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rawdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/resample.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/roqaudioenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rv10.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rv30.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rv34.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rv40.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/svq3.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/tta.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/utils.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vc1.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vc1_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vdpau.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vp3.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/wmaenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/wmv2dec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/cpuid.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/h264_deblock_sse2.asm
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/h264_idct_sse2.asm
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/xvmc.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/v4l2.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavfilter/avfilter.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavfilter/avfiltergraph.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavfilter/avfiltergraph.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavfilter/graphparser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavfilter/graphparser.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/Makefile
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/allformats.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/ape.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/asf.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/asf.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/audiointerleave.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avformat.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avidec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avienc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avio.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avio.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/dv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/flvdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/ipmovie.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/isom.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/matroska.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/matroska.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/matroskadec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/matroskaenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/metadata.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/metadata.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/metadata_compat.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mov.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/movenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mp3.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpegts.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpegts.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpegtsenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mxfenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/nsvdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/nutdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/nutenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/oggenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/options.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/r3d.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/raw.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/raw.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rdt.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/riff.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rm.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rmdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rmenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rpl.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtp.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtpdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtpdec.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtpenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtsp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtsp.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/sdp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/sierravmd.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/utils.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/wc3movie.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/Makefile
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/avutil.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/common.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/internal.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/log.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/mem.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/Makefile
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/rgb2rgb.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/rgb2rgb_template.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/swscale.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/swscale.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/swscale_internal.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/swscale_template.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/yuv2rgb.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/yuv2rgb_altivec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/yuv2rgb_template.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/yuv2rgb_vis.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/output_example.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/audiogen.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/libav.regression.ref
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/rotozoom.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/seek.regression.ref
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/videogen.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tools/patcheck
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/version.sh
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/vhook/fish.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/vhook/imlib2.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/vhook/ppm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDAudio.cpp
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDAudio.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLiba52.cpp
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.cpp
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.cpp
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/Makefile
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/Makefile
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDMessage.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDMessageQueue.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDPlayerAudio.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.cpp
    branches/unified-pvr/XBMC/xbmc/cores/ffmpeg/avcodec.h
    branches/unified-pvr/XBMC/xbmc/cores/ffmpeg/avformat.h
    branches/unified-pvr/XBMC/xbmc/cores/ffmpeg/avio.h
    branches/unified-pvr/XBMC/xbmc/cores/ffmpeg/avutil.h
    branches/unified-pvr/XBMC/xbmc/cores/ffmpeg/common.h
    branches/unified-pvr/XBMC/xbmc/cores/ffmpeg/rtsp.h
    branches/unified-pvr/XBMC/xbmc/cores/ffmpeg/xvmc.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/AACCodec/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/Makefile
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/Makefile
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/AACcodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/AACcodec.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/AC3CDDACodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/AC3Codec/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/AC3Codec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/AC3Codec.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/ADPCMCodec/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/ADPCMCodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/AIFFcodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/APEcodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/AdplugCodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/AudioDecoder.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/CDDAcodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/CDDAcodec.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/CodecFactory.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/DTSCDDACodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/DllDCACodec.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/DllLibFlac.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/DllLibshnplay.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/DllMACDll.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/DllTimidity.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/DllVorbisfile.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/FLACcodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/GYMCodec/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/GYMCodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/MACDll/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/NoWindows.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/MP3Codec/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/MP3codec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/MP3codec.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/MPCCodec/xbmc/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/MPCcodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/ModuleCodec/vc6/dumb/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/ModuleCodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/NSFCodec/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/NSFCodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/OGGcodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/RingHoldBuffer.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/SHNcodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/SIDCodec/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/SIDCodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/SPCCodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/SPCCodec.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/TimidityCodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/TimidityCodec.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/VGMCodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/WAVPackcodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/WAVPackcodec.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/WMACodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/WMACodec.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/WavPackCodec/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/YMCodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/dec_if.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/flac-1.2.1/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/paplayer.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/paplayer_linux.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/paplayer_osx.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/paplayer_win32.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/timidity/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/timidity/timidity/timidity.c
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/vgmstream/Makefile.in
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/vorbisfile/Makefile.in
    branches/unified-pvr/XBMC/xbmc/karaoke/GUIDialogKaraokeSongSelector.cpp
    branches/unified-pvr/XBMC/xbmc/karaoke/GUIWindowKaraokeLyrics.cpp
    branches/unified-pvr/XBMC/xbmc/karaoke/GUIWindowKaraokeLyrics.h
    branches/unified-pvr/XBMC/xbmc/karaoke/karaokelyrics.cpp
    branches/unified-pvr/XBMC/xbmc/karaoke/karaokelyrics.h
    branches/unified-pvr/XBMC/xbmc/karaoke/karaokelyricscdg.cpp
    branches/unified-pvr/XBMC/xbmc/karaoke/karaokelyricscdg.h
    branches/unified-pvr/XBMC/xbmc/karaoke/karaokelyricsfactory.cpp
    branches/unified-pvr/XBMC/xbmc/karaoke/karaokelyricsfactory.h
    branches/unified-pvr/XBMC/xbmc/karaoke/karaokelyricsmanager.cpp
    branches/unified-pvr/XBMC/xbmc/karaoke/karaokelyricsmanager.h
    branches/unified-pvr/XBMC/xbmc/karaoke/karaokelyricstext.cpp
    branches/unified-pvr/XBMC/xbmc/karaoke/karaokelyricstext.h
    branches/unified-pvr/XBMC/xbmc/karaoke/karaokelyricstextkar.cpp
    branches/unified-pvr/XBMC/xbmc/karaoke/karaokelyricstextkar.h
    branches/unified-pvr/XBMC/xbmc/karaoke/karaokelyricstextlrc.cpp
    branches/unified-pvr/XBMC/xbmc/karaoke/karaokelyricstextlrc.h
    branches/unified-pvr/XBMC/xbmc/karaoke/karaokewindowbackground.cpp
    branches/unified-pvr/XBMC/xbmc/karaoke/karaokewindowbackground.h
    branches/unified-pvr/XBMC/xbmc/lib/cximage-6.0/CxImage/Makefile
    branches/unified-pvr/XBMC/xbmc/lib/cximage-6.0/Makefile.in
    branches/unified-pvr/XBMC/xbmc/lib/cximage-6.0/Makefile.include
    branches/unified-pvr/XBMC/xbmc/lib/cximage-6.0/jasper/Makefile
    branches/unified-pvr/XBMC/xbmc/lib/cximage-6.0/jbig/Makefile
    branches/unified-pvr/XBMC/xbmc/lib/cximage-6.0/jpeg/Makefile
    branches/unified-pvr/XBMC/xbmc/lib/cximage-6.0/png/Makefile
    branches/unified-pvr/XBMC/xbmc/lib/cximage-6.0/raw/Makefile
    branches/unified-pvr/XBMC/xbmc/lib/cximage-6.0/tiff/Makefile
    branches/unified-pvr/XBMC/xbmc/lib/libGoAhead/WebServer.cpp
    branches/unified-pvr/XBMC/xbmc/lib/libGoAhead/WebServer.h
    branches/unified-pvr/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp
    branches/unified-pvr/XBMC/xbmc/lib/libGoAhead/XBMChttp.h
    branches/unified-pvr/XBMC/xbmc/lib/libPython/XBPyThread.cpp
    branches/unified-pvr/XBMC/xbmc/lib/libPython/XBPython.cpp
    branches/unified-pvr/XBMC/xbmc/lib/libPython/XBPython.h
    branches/unified-pvr/XBMC/xbmc/lib/libPython/XBPythonDllFuncs.S
    branches/unified-pvr/XBMC/xbmc/lib/libPython/linux/Makefile.in
    branches/unified-pvr/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.cpp
    branches/unified-pvr/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp
    branches/unified-pvr/XBMC/xbmc/lib/libPython/xbmcmodule/PythonPlayer.cpp
    branches/unified-pvr/XBMC/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp
    branches/unified-pvr/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp
    branches/unified-pvr/XBMC/xbmc/lib/libSDL-OSX/buildSDL-osx.sh
    branches/unified-pvr/XBMC/xbmc/lib/libass/xbmc/Makefile.in
    branches/unified-pvr/XBMC/xbmc/lib/libcdio/libcdio/make-xbmc-lib-osx.sh
    branches/unified-pvr/XBMC/xbmc/lib/libcurl/build-libcurl-osx.sh
    branches/unified-pvr/XBMC/xbmc/lib/libexif/Makefile.in
    branches/unified-pvr/XBMC/xbmc/lib/libhdhomerun/Makefile.in
    branches/unified-pvr/XBMC/xbmc/lib/libid3tag/Makefile.in
    branches/unified-pvr/XBMC/xbmc/linux/HalManager.cpp
    branches/unified-pvr/XBMC/xbmc/linux/HalManager.h
    branches/unified-pvr/XBMC/xbmc/linux/LinuxFileSystem.cpp
    branches/unified-pvr/XBMC/xbmc/linux/LinuxTimezone.cpp
    branches/unified-pvr/XBMC/xbmc/linux/Makefile.in
    branches/unified-pvr/XBMC/xbmc/linux/PlatformDefs.h
    branches/unified-pvr/XBMC/xbmc/osx/CocoaUtils.h
    branches/unified-pvr/XBMC/xbmc/osx/CocoaUtils.m
    branches/unified-pvr/XBMC/xbmc/osx/Makefile
    branches/unified-pvr/XBMC/xbmc/screensavers/Makefile.in
    branches/unified-pvr/XBMC/xbmc/screensavers/rsxs-0.9/xbmc/Makefile
    branches/unified-pvr/XBMC/xbmc/utils/CharsetConverter.cpp
    branches/unified-pvr/XBMC/xbmc/utils/CriticalSection.cpp
    branches/unified-pvr/XBMC/xbmc/utils/Fanart.cpp
    branches/unified-pvr/XBMC/xbmc/utils/GUIInfoManager.cpp
    branches/unified-pvr/XBMC/xbmc/utils/GUIInfoManager.h
    branches/unified-pvr/XBMC/xbmc/utils/Makefile
    branches/unified-pvr/XBMC/xbmc/utils/Network.cpp
    branches/unified-pvr/XBMC/xbmc/utils/PCMAmplifier.cpp
    branches/unified-pvr/XBMC/xbmc/utils/RegExp.cpp
    branches/unified-pvr/XBMC/xbmc/utils/RegExp.h
    branches/unified-pvr/XBMC/xbmc/utils/ScraperUrl.cpp
    branches/unified-pvr/XBMC/xbmc/utils/SystemInfo.cpp
    branches/unified-pvr/XBMC/xbmc/utils/md5.cpp
    branches/unified-pvr/XBMC/xbmc/utils/md5.h
    branches/unified-pvr/XBMC/xbmc/visualizations/Goom/Main.cpp
    branches/unified-pvr/XBMC/xbmc/visualizations/Goom/Makefile
    branches/unified-pvr/XBMC/xbmc/visualizations/Goom/build_xbmc_win32.sh
    branches/unified-pvr/XBMC/xbmc/visualizations/OpenGLSpectrum/Makefile
    branches/unified-pvr/XBMC/xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.cpp
    branches/unified-pvr/XBMC/xbmc/visualizations/Visualisation.cpp
    branches/unified-pvr/XBMC/xbmc/visualizations/Visualisation.h
    branches/unified-pvr/XBMC/xbmc/visualizations/VisualisationTypes.h
    branches/unified-pvr/XBMC/xbmc/visualizations/WaveForm/Main.cpp
    branches/unified-pvr/XBMC/xbmc/visualizations/WaveForm/Makefile
    branches/unified-pvr/XBMC/xbmc/visualizations/XBMCProjectM/Main.cpp
    branches/unified-pvr/XBMC/xbmc/visualizations/XBMCProjectM/Makefile
    branches/unified-pvr/XBMC/xbmc/visualizations/XBMCProjectM/build_projectM_win32.sh
    branches/unified-pvr/XBMC/xbmc/visualizations/iTunes/Main.cpp
    branches/unified-pvr/XBMC/xbmc/visualizations/iTunes/Makefile
    branches/unified-pvr/XBMC/xbmc/win32/PlatformDefs.h
    branches/unified-pvr/XBMC/xbmc/win32/WINSMBDirectory.h
    branches/unified-pvr/XBMC/xbmc/win32/XBMC_PC.cpp
    branches/unified-pvr/XBMC/xbmc/xbox/IoSupport.cpp
    branches/unified-pvr/XBMC/xbmc/xbox/IoSupport.h

Added Paths:
-----------
    branches/unified-pvr/XBMC/skin/PM3.HD/language/Czech/
    branches/unified-pvr/XBMC/skin/PM3.HD/language/Czech/strings.xml
    branches/unified-pvr/XBMC/system/cdrip/lame_enc-x86-osx.so
    branches/unified-pvr/XBMC/system/libcurl-x86-osx.so
    branches/unified-pvr/XBMC/system/scrapers/video/daum.png
    branches/unified-pvr/XBMC/system/scrapers/video/daum.xml
    branches/unified-pvr/XBMC/tools/Linux/FEH.py
    branches/unified-pvr/XBMC/tools/XBMCLive/Creator/platforms/i386-intrepid-xbmc/fstab
    branches/unified-pvr/XBMC/tools/XBMCLive/Creator/platforms/i386-jaunty-xbmc/fstab
    branches/unified-pvr/XBMC/tools/XBMCLive/installXBMC.py
    branches/unified-pvr/XBMC/tools/XBMCLive/installXBMCFromISO.sh
    branches/unified-pvr/XBMC/tools/XBMCLive/setAlsaVolumes.py
    branches/unified-pvr/XBMC/xbmc/PowerManager.cpp
    branches/unified-pvr/XBMC/xbmc/PowerManager.h
    branches/unified-pvr/XBMC/xbmc/cores/AudioRenderers/IAudioRenderer.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/RELEASE
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/APIchanges
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/pixdesc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/pixdesc.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/xvmc_internal.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/asfdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/asfenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/flacdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/flacenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/flacenc.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/pixfmt.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.cpp
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h
    branches/unified-pvr/XBMC/xbmc/cores/ffmpeg/pixfmt.h
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/DTSCodec.cpp
    branches/unified-pvr/XBMC/xbmc/cores/paplayer/DTSCodec.h
    branches/unified-pvr/XBMC/xbmc/lib/libSDL-OSX/SDL_SetWidthHeight.diff
    branches/unified-pvr/XBMC/xbmc/lib/libSDL-OSX/libSDL-x86-osx.a
    branches/unified-pvr/XBMC/xbmc/lib/libSDL-OSX/libSDL_image-x86-osx.a
    branches/unified-pvr/XBMC/xbmc/lib/libSDL-OSX/libSDL_mixer-x86-osx.a
    branches/unified-pvr/XBMC/xbmc/lib/libSDL-OSX/libSDLmain-x86-osx.a
    branches/unified-pvr/XBMC/xbmc/lib/libcdio/libcdio-x86-osx.a
    branches/unified-pvr/XBMC/xbmc/lib/libhts/
    branches/unified-pvr/XBMC/xbmc/lib/libhts/Makefile
    branches/unified-pvr/XBMC/xbmc/lib/libhts/config.h
    branches/unified-pvr/XBMC/xbmc/lib/libhts/hts_strtab.h
    branches/unified-pvr/XBMC/xbmc/lib/libhts/htsatomic.c
    branches/unified-pvr/XBMC/xbmc/lib/libhts/htsatomic.h
    branches/unified-pvr/XBMC/xbmc/lib/libhts/htsbuf.c
    branches/unified-pvr/XBMC/xbmc/lib/libhts/htsbuf.h
    branches/unified-pvr/XBMC/xbmc/lib/libhts/htsmsg.c
    branches/unified-pvr/XBMC/xbmc/lib/libhts/htsmsg.h
    branches/unified-pvr/XBMC/xbmc/lib/libhts/htsmsg_binary.c
    branches/unified-pvr/XBMC/xbmc/lib/libhts/htsmsg_binary.h
    branches/unified-pvr/XBMC/xbmc/lib/libhts/htsq.h
    branches/unified-pvr/XBMC/xbmc/lib/libhts/htsstr.c
    branches/unified-pvr/XBMC/xbmc/lib/libhts/htsstr.h
    branches/unified-pvr/XBMC/xbmc/lib/libhts/htsthreads.h
    branches/unified-pvr/XBMC/xbmc/lib/libhts/net.h
    branches/unified-pvr/XBMC/xbmc/lib/libhts/net_posix.c
    branches/unified-pvr/XBMC/xbmc/lib/libhts/sha1.c
    branches/unified-pvr/XBMC/xbmc/lib/libhts/sha1.h
    branches/unified-pvr/XBMC/xbmc/linux/DBusPowerSyscall.cpp
    branches/unified-pvr/XBMC/xbmc/linux/DBusPowerSyscall.h
    branches/unified-pvr/XBMC/xbmc/osx/CPortAudio.cpp
    branches/unified-pvr/XBMC/xbmc/osx/CPortAudio.h
    branches/unified-pvr/XBMC/xbmc/osx/CocoaPowerSyscall.cpp
    branches/unified-pvr/XBMC/xbmc/osx/CocoaPowerSyscall.h
    branches/unified-pvr/XBMC/xbmc/osx/OSXGNUReplacements.c
    branches/unified-pvr/XBMC/xbmc/osx/OSXGNUReplacements.h
    branches/unified-pvr/XBMC/xbmc/utils/DbusServer.cpp
    branches/unified-pvr/XBMC/xbmc/utils/DbusServer.h
    branches/unified-pvr/XBMC/xbmc/win32/Win32PowerSyscall.cpp
    branches/unified-pvr/XBMC/xbmc/win32/Win32PowerSyscall.h
    branches/unified-pvr/XBMC/xbmc/xbmc.cpp

Removed Paths:
-------------
    branches/unified-pvr/XBMC/system/cdrip/lame_enc-osx.so
    branches/unified-pvr/XBMC/system/libcurl-osx.so
    branches/unified-pvr/XBMC/system/players/paplayer/DCACodec.dll
    branches/unified-pvr/XBMC/tools/XBMCLive/installXBMC.sh
    branches/unified-pvr/XBMC/xbmc/XboxMediaCenter.cpp
    branches/unified-pvr/XBMC/xbmc/cores/AudioRenderers/IDirectSoundRenderer.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/asf-enc.c
    branches/unified-pvr/XBMC/xbmc/lib/libSDL-OSX/SDL-1.2.13-xbmc.patch
    branches/unified-pvr/XBMC/xbmc/lib/libSDL-OSX/libSDL-osx.a
    branches/unified-pvr/XBMC/xbmc/lib/libSDL-OSX/libSDL_image-osx.a
    branches/unified-pvr/XBMC/xbmc/lib/libSDL-OSX/libSDL_mixer-osx.a
    branches/unified-pvr/XBMC/xbmc/lib/libSDL-OSX/libSDLmain-osx.a
    branches/unified-pvr/XBMC/xbmc/lib/libcdio/libcdio-osx.a
    branches/unified-pvr/XBMC/xbmc/lib/libportaudio/libportaudio-osx.a
    branches/unified-pvr/XBMC/xbmc/linux/CPortAudio.cpp
    branches/unified-pvr/XBMC/xbmc/linux/CPortAudio.h
    branches/unified-pvr/XBMC/xbmc/linux/getdelim.c
    branches/unified-pvr/XBMC/xbmc/linux/getdelim.h
    branches/unified-pvr/XBMC/xbmc/osx/SDL_private.h

Property Changed:
----------------
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/COPYING.GPL
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/COPYING.LGPL
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/CREDITS
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/Changelog
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/Doxyfile
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/INSTALL
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/MAINTAINERS
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/Makefile
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/README
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/build_xbmc.sh
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/build_xbmc_win32.sh
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/cmdutils.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/cmdutils.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/common.mak
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/configure
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/TODO
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/avutil.txt
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/faq.texi
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/ffmpeg-doc.texi
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/ffmpeg_powerpc_performance_evaluation_howto.txt
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/ffplay-doc.texi
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/ffserver-doc.texi
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/ffserver.conf
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/general.texi
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/hooks.texi
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/issue_tracker.txt
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/optimization.txt
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/snow.txt
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/soc.txt
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/swscale.txt
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/doc/texi2pod.pl
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffmpeg.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffplay.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/libx264-baseline.ffpreset
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/libx264-default.ffpreset
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/libx264-fastfirstpass.ffpreset
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/libx264-hq.ffpreset
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/libx264-ipod320.ffpreset
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/libx264-ipod640.ffpreset
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/libx264-lossless_fast.ffpreset
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/libx264-lossless_max.ffpreset
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/libx264-lossless_medium.ffpreset
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/libx264-lossless_slow.ffpreset
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/libx264-lossless_slower.ffpreset
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/libx264-lossless_ultrafast.ffpreset
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/libx264-main.ffpreset
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/libx264-max.ffpreset
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/libx264-normal.ffpreset
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffpresets/libx264-slowfirstpass.ffpreset
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffserver.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/ffserver.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/4xm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/8bps.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/8svx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/Makefile
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aac.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aac.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aac_ac3_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aac_ac3_parser.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aac_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aac_parser.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aacdectab.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aacenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aacpsy.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aacpsy.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aactab.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aactab.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aandcttab.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aandcttab.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/aasc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ac3.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ac3.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ac3_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ac3_parser.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ac3dec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ac3dec.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ac3dec_data.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ac3dec_data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ac3enc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ac3tab.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ac3tab.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/acelp_filters.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/acelp_filters.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/acelp_pitch_delay.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/acelp_pitch_delay.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/acelp_vectors.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/acelp_vectors.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/adpcm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/adx.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/adxdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/adxenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/alac.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/alacenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/allcodecs.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/alpha/asm.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/alpha/dsputil_alpha.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/alpha/dsputil_alpha_asm.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/alpha/motion_est_alpha.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/alpha/motion_est_mvi_asm.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/alpha/mpegvideo_alpha.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/alpha/regdef.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/alpha/simple_idct_alpha.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/apedec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/apiexample.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/asm.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/dsputil_arm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/dsputil_arm_s.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/dsputil_iwmmxt.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/dsputil_iwmmxt_rnd_template.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/dsputil_neon.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/dsputil_neon_s.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/dsputil_vfp.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/float_arm_vfp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/h264dsp_neon.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/h264idct_neon.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/jrevdct_arm.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/mathops.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/mpegvideo_arm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/mpegvideo_armv5te.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/mpegvideo_armv5te_s.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/mpegvideo_iwmmxt.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/simple_idct_arm.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/simple_idct_armv5te.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/simple_idct_armv6.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/arm/simple_idct_neon.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/asv1.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/atrac3.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/atrac3data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/audioconvert.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/audioconvert.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/avcodec.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/avs.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/beosthread.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bethsoftvideo.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bethsoftvideo.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bfi.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bfin/config_bfin.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bfin/dsputil_bfin.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bfin/dsputil_bfin.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bfin/fdct_bfin.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bfin/idct_bfin.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bfin/mathops.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bfin/mpegvideo_bfin.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bfin/pixels_bfin.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bfin/vp3_bfin.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bfin/vp3_idct_bfin.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bitstream.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bitstream.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bitstream_filter.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bmp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bmp.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bmpenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/bytestream.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/c93.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/cabac.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/cabac.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/cavs.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/cavs.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/cavs_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/cavsdata.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/cavsdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/cavsdsp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/celp_filters.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/celp_filters.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/celp_math.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/celp_math.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/cinepak.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/cljr.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/colorspace.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/cook.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/cookdata.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/cscd.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/cyuv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dca.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dca.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dca_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dcadata.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dcahuff.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dct-test.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dirac_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dnxhd_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dnxhddata.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dnxhddata.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dnxhddec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dnxhdenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dnxhdenc.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dpcm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dsicinav.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dsputil.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dsputil.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dump_extradata_bsf.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dvbsub.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dvbsub_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dvbsubdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dvdata.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dvdsub_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dvdsubdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dvdsubenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/dxa.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/eac3dec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/eacmv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/eaidct.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/eatgq.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/eatgv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/eatqi.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/elbg.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/elbg.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/error_resilience.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/escape124.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/eval.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/eval.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/faandct.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/faandct.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/faanidct.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/faanidct.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/faxcompr.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/faxcompr.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/fdctref.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/fft-test.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/fft.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ffv1.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/flac.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/flacdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/flacenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/flashsv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/flashsvenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/flicvideo.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/fraps.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/g726.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/g729.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/g729data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/g729dec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/gif.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/gifdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/golomb.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/golomb.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h261.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h261.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h261_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h261data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h261dec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h261enc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h263.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h263.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h263_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h263_parser.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h263data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h263dec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h264.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h264.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h264_mp4toannexb_bsf.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h264_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h264_parser.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h264data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h264dspenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h264enc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h264idct.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h264pred.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/h264pred.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/huffman.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/huffman.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/huffyuv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/idcinvideo.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/iirfilter.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/iirfilter.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/imc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/imcdata.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/imgconvert.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/imgconvert.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/imgconvert_template.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/imgresample.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/imx_dump_header_bsf.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/indeo2.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/indeo2data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/indeo3.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/indeo3data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/internal.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/interplayvideo.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/intrax8.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/intrax8.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/intrax8dsp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/intrax8huf.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/jfdctfst.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/jfdctint.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/jpegls.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/jpegls.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/jpeglsdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/jpeglsdec.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/jpeglsenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/jrevdct.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/kmvc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/lcl.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/lcldec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/lclenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libamr.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libdirac.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libdirac_libschro.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libdirac_libschro.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libdiracdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libdiracenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libfaac.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libfaad.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libgsm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libmp3lame.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libopenjpeg.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libschroedinger.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libschroedinger.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libschroedingerdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libschroedingerenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libspeexdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libtheoraenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libvorbis.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libx264.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libxvid_internal.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libxvid_rc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/libxvidff.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ljpegenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/loco.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/lpc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/lpc.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/lsp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/lsp.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/lzw.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/lzw.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/lzwenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mace.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mathops.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mdct.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mimic.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mjpeg.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mjpeg.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mjpeg_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mjpega_dump_header_bsf.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mjpegbdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mjpegdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mjpegdec.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mjpegenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mjpegenc.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mlib/dsputil_mlib.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mlp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mlp.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mlp_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mlp_parser.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mlpdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mmvideo.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/motion-test.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/motion_est.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/motion_est_template.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/motionpixels.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/movsub_bsf.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mp3_header_compress_bsf.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mp3_header_decompress_bsf.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpc.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpc7.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpc7data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpc8.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpc8data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpc8huff.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpcdata.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpeg12.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpeg12.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpeg12data.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpeg12data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpeg12decdata.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpeg12enc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpeg4audio.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpeg4audio.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpeg4data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpeg4video_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpeg4video_parser.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegaudio.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegaudio.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegaudio_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegaudiodata.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegaudiodata.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegaudiodec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegaudiodecheader.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegaudiodecheader.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegaudiodectab.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegaudioenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegaudiotab.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegvideo.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegvideo.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegvideo_common.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegvideo_enc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegvideo_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpegvideo_xvmc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/msmpeg4.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/msmpeg4.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/msmpeg4data.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/msmpeg4data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/msrle.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/msrledec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/msrledec.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/msvideo1.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/nellymoser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/nellymoser.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/nellymoserdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/nellymoserenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/noise_bsf.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/nuv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/opt.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/opt.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/options.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/os2thread.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/parser.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/pcm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/pcx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/png.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/png.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/pngdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/pngenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/pnm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/pnm.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/pnm_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/pnmenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/check_altivec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/dsputil_altivec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/dsputil_altivec.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/dsputil_ppc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/dsputil_ppc.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/fdct_altivec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/fft_altivec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/float_altivec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/gcc_fixes.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/gmc_altivec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/h264_altivec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/h264_template_altivec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/idct_altivec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/imgresample_altivec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/imgresample_altivec.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/int_altivec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/mathops.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/mpegvideo_altivec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/snow_altivec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/types_altivec.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/util_altivec.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ppc/vc1dsp_altivec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ps2/dsputil_mmi.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ps2/idct_mmi.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ps2/mmi.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ps2/mpegvideo_mmi.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/pthread.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ptx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/qcelp_lsp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/qcelpdata.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/qcelpdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/qdm2.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/qdm2data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/qdrw.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/qpeg.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/qtrle.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/qtrleenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ra144.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ra144.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ra288.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ra288.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rangecoder.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rangecoder.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ratecontrol.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ratecontrol.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/raw.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/raw.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rawdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rawenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rdft.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rectangle.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/remove_extradata_bsf.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/resample.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/resample2.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rl.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rl2.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rle.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rle.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/roqaudioenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/roqvideo.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/roqvideo.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/roqvideodec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/roqvideoenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rpza.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rtjpeg.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rtjpeg.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rv10.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rv30.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rv30data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rv30dsp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rv34.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rv34.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rv34data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rv34vlc.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rv40.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rv40data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rv40dsp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/rv40vlc2.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/s3tc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/s3tc.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/sgi.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/sgidec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/sgienc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/sh4/dsputil_align.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/sh4/dsputil_sh4.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/sh4/idct_sh4.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/sh4/qpel.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/sh4/sh4.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/shorten.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/simple_idct.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/simple_idct.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/smacker.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/smc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/snow.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/snow.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/sonic.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/sp5x.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/sp5xdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/sparc/dsputil_vis.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/sparc/simple_idct_vis.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/sparc/vis.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/sunrast.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/svq1.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/svq1.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/svq1_cb.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/svq1_vlc.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/svq1dec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/svq1enc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/svq1enc_cb.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/svq3.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/targa.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/targaenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/tiertexseqv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/tiff.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/tiff.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/tiffenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/truemotion1.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/truemotion1data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/truemotion2.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/truespeech.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/truespeech_data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/tscc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/tta.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/txd.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ulti.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ulti_cb.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/unary.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/utils.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vb.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vc1.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vc1.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vc1_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vc1acdata.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vc1data.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vc1data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vc1dsp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vcr1.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vdpau.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vdpau.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vdpau_internal.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vmdav.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vmnc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vorbis.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vorbis.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vorbis_data.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vorbis_dec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vorbis_enc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vorbis_enc_data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vp3.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vp3_parser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vp3data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vp3dsp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vp5.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vp56.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vp56.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vp56data.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vp56data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vp5data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vp6.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vp6data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vp6dsp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vqavideo.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/w32thread.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/wavpack.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/wma.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/wma.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/wma3.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/wma3data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/wma3dec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/wmadata.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/wmadec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/wmaenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/wmv2.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/wmv2.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/wmv2dec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/wmv2enc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/wnv1.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/ws-snd1.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/cavsdsp_mmx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/cpuid.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/dnxhd_mmx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/dsputil_h264_template_mmx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/dsputil_h264_template_ssse3.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/dsputil_mmx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/dsputil_mmx.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/dsputil_mmx_avg_template.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/dsputil_mmx_qns_template.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/dsputil_mmx_rnd_template.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/dsputil_yasm.asm
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/dsputilenc_mmx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/fdct_mmx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/fft_3dn.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/fft_3dn2.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/fft_mmx.asm
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/fft_sse.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/flacdsp_mmx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/h264_deblock_sse2.asm
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/h264_i386.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/h264_idct_sse2.asm
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/h264dsp_mmx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/idct_mmx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/idct_mmx_xvid.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/idct_sse2_xvid.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/idct_xvid.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/mathops.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/mmx.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/motion_est_mmx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/mpegvideo_mmx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/mpegvideo_mmx_template.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/rv40dsp_mmx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/simple_idct_mmx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/snowdsp_mmx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/vc1dsp_mmx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/vp3dsp_mmx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/vp3dsp_mmx.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/vp3dsp_sse2.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/vp3dsp_sse2.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/vp6dsp_mmx.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/vp6dsp_mmx.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/vp6dsp_sse2.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/vp6dsp_sse2.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/x86inc.asm
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/x86/x86util.asm
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/xan.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/xiph.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/xiph.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/xl.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/xsubdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/xvmc.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/zmbv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/zmbvenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/Makefile
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/alldevices.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/alsa-audio-common.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/alsa-audio-dec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/alsa-audio-enc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/alsa-audio.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/avdevice.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/beosaudio.cpp
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/bktr.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/dv1394.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/dv1394.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/libdc1394.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/oss_audio.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/v4l.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/v4l2.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/vfwcap.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavdevice/x11grab.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavfilter/Makefile
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavfilter/allfilters.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavfilter/avfilter.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavfilter/avfilter.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavfilter/avfiltergraph.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavfilter/avfiltergraph.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavfilter/defaults.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavfilter/formats.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavfilter/graphparser.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavfilter/graphparser.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/4xm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/Makefile
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/adtsenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/aiff.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/allformats.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/amr.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/apc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/ape.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/asf.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/asf.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/asfcrypt.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/asfcrypt.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/assdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/assenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/au.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/audiointerleave.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/audiointerleave.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avc.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avformat.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avi.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avidec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avienc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avio.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avio.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/aviobuf.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avisynth.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avs.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/bethsoftvid.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/bfi.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/c93.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/crcenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/cutils.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/daud.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/dsicin.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/dv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/dv.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/dvenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/dxa.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/eacdata.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/electronicarts.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/ffm.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/ffmdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/ffmenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/file.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/flic.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/flv.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/flvdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/flvenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/framecrcenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/framehook.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/framehook.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/gif.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/gopher.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/gxf.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/gxf.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/gxfenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/http.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/id3v2.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/id3v2.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/idcin.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/idroq.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/iff.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/img2.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/internal.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/ipmovie.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/isom.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/isom.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/iss.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/libnut.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/lmlm4.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/matroska.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/matroska.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/matroskadec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/matroskaenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/metadata.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/metadata.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/metadata_compat.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mmf.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mov.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/movenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mp3.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpc8.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpeg.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpeg.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpegenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpegts.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpegts.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpegtsenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpjpeg.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/msnwc_tcp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mtv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mvi.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mxf.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mxf.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mxfdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mxfenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/ncdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/network.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/nsvdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/nut.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/nut.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/nutdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/nutenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/nuv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/oggdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/oggdec.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/oggenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/oggparseflac.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/oggparseogm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/oggparsespeex.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/oggparsetheora.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/oggparsevorbis.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/oma.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/options.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/os_support.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/os_support.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/psxstr.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/pva.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/qtpalette.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/r3d.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/raw.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/raw.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rdt.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rdt.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/riff.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/riff.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rl2.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rm.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rmdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rmenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rpl.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtp.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtp_aac.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtp_h264.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtp_h264.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtp_mpv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtpdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtpdec.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtpenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtpenc.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtpenc_h264.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtpproto.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtsp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtsp.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/rtspcodes.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/sdp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/segafilm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/sierravmd.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/siff.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/smacker.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/sol.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/swf.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/swfdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/swfenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/tcp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/thp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/tiertexseq.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/tta.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/txd.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/udp.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/utils.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/vc1test.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/vc1testenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/voc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/voc.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/vocdec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/vocenc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/wav.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/wc3movie.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/westwood.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/wv.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/xa.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/yuv4mpeg.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/Makefile
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/adler32.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/adler32.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/aes.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/aes.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/arm/
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/arm/bswap.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/avstring.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/avstring.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/avutil.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/base64.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/base64.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/bfin/
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/bfin/bswap.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/bswap.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/common.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/crc.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/crc.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/crc_data.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/des.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/des.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/fifo.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/fifo.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/integer.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/integer.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/internal.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/intfloat_readwrite.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/intfloat_readwrite.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/intreadwrite.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/lfg.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/lfg.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/lls.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/lls.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/log.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/log.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/lzo.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/lzo.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/mathematics.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/mathematics.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/md5.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/md5.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/mem.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/mem.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/pca.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/pca.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/random.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/random.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/rational.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/rational.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/rc4.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/rc4.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/sh4/
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/sh4/bswap.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/sha1.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/sha1.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/softfloat.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/softfloat.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/timer.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/tree.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/tree.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/utils.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/x86/
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/x86/bswap.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavutil/x86_cpu.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libpostproc/Makefile
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libpostproc/postprocess.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libpostproc/postprocess.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libpostproc/postprocess_altivec_template.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libpostproc/postprocess_internal.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libpostproc/postprocess_template.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/Makefile
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/cs_test.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/internal_bfin.S
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/rgb2rgb.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/rgb2rgb.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/rgb2rgb_template.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/swscale-example.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/swscale.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/swscale.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/swscale_altivec_template.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/swscale_avoption.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/swscale_bfin.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/swscale_internal.h
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/swscale_template.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/yuv2rgb.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/yuv2rgb_altivec.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/yuv2rgb_bfin.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/yuv2rgb_mlib.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/yuv2rgb_template.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/libswscale/yuv2rgb_vis.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/output_example.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/subdir.mak
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/audiogen.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/ffmpeg.regression.ref
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/ffserver.regression.ref
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/libav.regression.ref
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/regression.sh
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/rotozoom.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/rotozoom.regression.ref
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/seek.regression.ref
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/seek_test.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/seek_test.sh
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/server-regression.sh
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/test.conf
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/tiny_psnr.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tests/videogen.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tools/build_avopt
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tools/clean-diff
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tools/cws2fws.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tools/patcheck
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tools/pktdumper.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tools/qt-faststart.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tools/trasher.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/tools/unwrap-diff
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/version.sh
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/vhook/drawtext.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/vhook/fish.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/vhook/imlib2.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/vhook/null.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/vhook/ppm.c
    branches/unified-pvr/XBMC/xbmc/cores/dvdplayer/Codecs/ffmpeg/vhook/watermark.c

Modified: branches/unified-pvr/XBMC/Makefile.in
===================================================================
--- branches/unified-pvr/XBMC/Makefile.in	2009-03-18 06:27:48 UTC (rev 18656)
+++ branches/unified-pvr/XBMC/Makefile.in	2009-03-18 08:35:54 UTC (rev 18657)
@@ -18,6 +18,7 @@
 	xbmc/FileSystem/MusicDatabaseDirectory \
 	xbmc/FileSystem/VideoDatabaseDirectory \
 	xbmc/lib/libcmyth \
+	xbmc/lib/libhts \
 	xbmc/lib/libGoAhead \
 	xbmc/lib/libPython \
 	xbmc/lib/libPython/xbmcmodule \
@@ -134,7 +135,7 @@
 	$(MAKE) -C xbmc/cores/DllLoader/exports
 	$(MAKE) -C xbmc/cores/DllLoader/exports/util
 osx: 
-ifeq ($(ARCH), osx)
+ifeq ($(findstring osx,$(ARCH)), osx)
 	$(MAKE) -C xbmc/osx
 endif
 xbox: 
@@ -170,7 +171,7 @@
 libpython: dllloader
 	$(MAKE) -C xbmc/lib/libPython
 	$(MAKE) -C xbmc/lib/libPython/xbmcmodule
-python:
+python: dllloader
 	$(MAKE) -C xbmc/lib/libPython/linux
 libgoahead: 
 	$(MAKE) -C xbmc/lib/libGoAhead
@@ -187,8 +188,10 @@
 	$(MAKE) -C xbmc/cdrip
 libcmyth: dllloader 
 	$(MAKE) -C xbmc/lib/libcmyth
+libhts:
+	$(MAKE) -C xbmc/lib/libhts
 eventclients:
-ifeq ($(ARCH), osx)
+ifeq ($(findstring osx,$(ARCH)), osx)
 	$(MAKE) -C tools/EventClients/Clients/AppleRemote
 else
 	$(MAKE) -C tools/EventClients
@@ -203,7 +206,7 @@
 	$(MAKE) -C xbmc/lib/libRTV
 libxdaap:
 	$(MAKE) -C xbmc/lib/libXDAAP
-libhdhomerun:
+libhdhomerun: dllloader
 	$(MAKE) -C xbmc/lib/libhdhomerun
 libshout:
 	$(MAKE) -C xbmc/lib/libshout
@@ -277,6 +280,7 @@
 	xbmc/lib/libcdio/libcdio/lib/paranoia/*.o \
 	xbmc/lib/libcdio/libcdio/lib/udf/*.o \
 	xbmc/lib/libcmyth/*.o \
+	xbmc/lib/libhts/*.o \
 	xbmc/lib/libPython/*.o \
 	xbmc/lib/libPython/xbmcmodule/*.o \
 	xbmc/lib/libRTMP/*.o \
@@ -298,18 +302,18 @@
 	xbmc/xbox/*.o
 
 # platform dependend objects
-ifeq ($(ARCH), osx)
+ifeq ($(findstring osx,$(ARCH)), osx)
 OBJSXBMC += \
 	xbmc/osx/*.o \
-	xbmc/lib/libSDL-OSX/libSDL-osx.a \
-	xbmc/lib/libSDL-OSX/libSDLmain-osx.a \
-	xbmc/lib/libSDL-OSX/libSDL_image-osx.a \
-	xbmc/lib/libSDL-OSX/libSDL_mixer-osx.a \
-	system/players/dvdplayer/avutil-49-osx.a \
-	system/players/dvdplayer/avcodec-52-osx.a \
-	system/players/dvdplayer/swscale-0.6.1-osx.a \
-	system/players/dvdplayer/avformat-52-osx.a \
-	system/players/dvdplayer/postproc-51-osx.a
+	xbmc/lib/libSDL-OSX/libSDL-@... \
+	xbmc/lib/libSDL-OSX/libSDLmain-@... \
+	xbmc/lib/libSDL-OSX/libSDL_image-@... \
+	xbmc/lib/libSDL-OSX/libSDL_mixer-@... \
+	system/players/dvdplayer/avutil-49-@... \
+	system/players/dvdplayer/avcodec-52-@... \
+	system/players/dvdplayer/swscale-0.6.1-@... \
+	system/players/dvdplayer/avformat-52-@... \
+	system/players/dvdplayer/postproc-51-@...
 
 else
 OBJSXBMC += \
@@ -324,13 +328,18 @@
 	LIBS += -lpython2.4
 endif
 
+# TODO: XBPythonDLLFuncs.S not implemented on PowerPC
+ifeq ($(ARCH), powerpc-osx)
+	OBJSXBMC += xbmc/lib/libPython/Python/libpython2.4.a
+endif
+
 $(wildcard $(OBJSXBMC)) :| compile
 
 xbmc.bin: $(wildcard $(OBJSXBMC)) | compile
 	$(CXX) $(CXXFLAGS) $(DEBUG_FLAGS) -o xbmc.bin $(OBJSXBMC) $(LIBS) $(LDFLAGS) -rdynamic
 
 xbmc-xrandr: xbmc-xrandr.c
-ifeq ($(ARCH), osx)
+ifeq ($(findstring osx,$(ARCH)), osx)
 	# xbmc-xrandr.c gets picked up by the default make rules
 	#  so only exclude it for osx builds
 	@echo "excluding xbmc-xrandr"
@@ -339,7 +348,7 @@
 endif
 
 tools/XBMCTex/XBMCTex:
-ifeq ($(ARCH), osx)
+ifeq ($(findstring osx,$(ARCH)), osx)
 	# hack this for now
 	$(MAKE) -C tools/XBMCTex -f Makefile.osx
 else
@@ -349,7 +358,7 @@
 install-bin: xbmc.bin # developement convenience target
 	sudo cp -f xbmc.bin $(prefix)/share/xbmc
 
-ifeq ($(ARCH), osx)
+ifeq ($(findstring osx,$(ARCH)), osx)
 	# TODO: add osx install
 else
 install: install-datas install-web
@@ -357,6 +366,7 @@
 	@cp -f xbmc.bin $(prefix)/share/xbmc/xbmc.bin
 	@mkdir -p $(prefix)/bin
 	@cp tools/Linux/xbmc.sh $(prefix)/bin/xbmc
+	@cp tools/Linux/FEH.py $(prefix)/share/xbmc/FEH.py
 	@chmod 755 $(prefix)/bin/xbmc
 	@echo "Copying support and legal files,,,"
 	@cp README.linux LICENSE.GPL *.txt xbmc-xrandr $(prefix)/share/xbmc/
@@ -396,9 +406,11 @@
 	 read -n1 PROMPT; \
 	 if [[ "$$PROMPT" = "Y" ]]; then \
 		SVNV=$$(svnversion -n | cut -d':' -f1); _IFS=$$IFS; IFS=$$'\t\n'; \
-		for i in `svn st --no-ignore | grep ^[I\?] | cut -d' ' -f7-`; \
-			do echo "  Deleting $$i"; \
-			rm -rf "$$i"; \
+		for i in `svn st --no-ignore | grep ^[I\?] | cut -d' ' -f7-`; do \
+			if [[ $${i:(-4)} != "diff" && $${i:(-5)} != "patch" ]]; then \
+				echo "  Deleting $$i"; \
+				rm -rf "$$i"; \
+			fi; \
 		done; \
 		IFS=$$_IFS; \
 		echo " Recovering any missing files."; \

Modified: branches/unified-pvr/XBMC/Makefile.include.in
===================================================================
--- branches/unified-pvr/XBMC/Makefile.include.in	2009-03-18 06:27:48 UTC (rev 18656)
+++ branches/unified-pvr/XBMC/Makefile.include.in	2009-03-18 08:35:54 UTC (rev 18657)
@@ -29,10 +29,14 @@
 	DEFINES+=-DDLL_PATH_LIBCURL="\"/usr/lib/libcurl.so\""
 endif
 endif
-ifeq ($(ARCH), osx)
+ifeq ($(findstring osx,$(ARCH)), osx)
 	export MACOSX_DEPLOYMENT_TARGET=10.4
 endif
 
+ifeq ($(ARCH), powerpc-osx)
+	BUNDLE1_O=-lbundle1.o
+endif
+
 .cpp.o:
 	@rm -f ${<:.cpp=.o}
 	$(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.cpp=.o}
@@ -79,11 +83,19 @@
 	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
 	      -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
 	  rm -f $*.d
-	#$(CXX) -c $(CFLAGS) $<
 
+.mm.o:
+	@rm -f ${<:.mm=.o}
+	$(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.mm=.o}
+	@cp $*.d $*.P; \
+	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+	      -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
+	  rm -f $*.d
+
 OBJS+=$(filter %.o,$(SRCS:.cpp=.o))
 OBJS+=$(filter %.o,$(SRCS:.c=.o))
 OBJS+=$(filter %.o,$(SRCS:.S=.o))
+OBJS+=$(filter %.o,$(SRCS:.mm=.o))
 OBJS+=$(filter %.o,$(SRCS:.m=.o))
 
 .PHONY : lib pch clean distclean distclean_evil

Modified: branches/unified-pvr/XBMC/README.linux
===================================================================
--- branches/unified-pvr/XBMC/README.linux	2009-03-18 06:27:48 UTC (rev 18656)
+++ branches/unified-pvr/XBMC/README.linux	2009-03-18 08:35:54 UTC (rev 18657)
@@ -48,7 +48,7 @@
 
 For Ubuntu (all versions >= 7.04):
 
-   # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm automake cmake gperf unzip bison libsdl1.2-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libsdl-sound1.2-dev libsdl-stretch-dev libfribidi-dev liblzo-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl4-gnutls-dev x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmad0-dev libtre-dev libogg-dev libvorbis-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libfaac-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev
+   # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm automake cmake gperf unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libsdl-sound1.2-dev libsdl-stretch-dev libfribidi-dev liblzo-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl4-dev x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbis-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libfaac-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils
 
 --------------------------------------------------------------
 3.2. Use a single command to get all build dependencies

Modified: branches/unified-pvr/XBMC/README.osx
===================================================================
--- branches/unified-pvr/XBMC/README.osx	2009-03-18 06:27:48 UTC (rev 18656)
+++ branches/unified-pvr/XBMC/README.osx	2009-03-18 08:35:54 UTC (rev 18657)
@@ -14,7 +14,7 @@
 
 This is a platform port of XBMC for the Apple OSX operating system. Both 10.5
 and 10.4 Intel platforms are supported. The current build system is Xcode 2.5
-or Xcode 3.x. There are two ways to build XBMC for Mac. 1) command-line or
+or Xcode 3.1.2 There are two ways to build XBMC for Mac. 1) command-line or
 2) Xcode. Generally, Xcode is the easiest as it presents the build system
 in a GUI environment.
 
@@ -115,15 +115,14 @@
  $ autoconf
  $ ./configure
  $ make clean
+ $ make externals more_libs
 
 The configure operation will setup the build environment for codecs and
 internal libraries that are used by XBMC. This step is required for both Xcode
-and command-line building. The last step "make clean" ensures that there are
-no stale binaries from svn that might cause problems
+and command-line building. The "make clean" ensures that there areno stale 
+binaries from svn that might cause problems The last step will pre-build 
+the majority of the codecs and libs:
 
-If you want to pre-build the majority of the codecs and libs:
-
- $ make externals more_libs
  
 The configure operation will default to building "debug". To build "release"
 codecs and libraries for Xcode, do the configure step with "--disable-debug"
@@ -171,7 +170,7 @@
 You can specify "Release" instead of "Debug" as a configuration.
 
 -----------------------------------------------------------------------------
-4.3 Using Terminal (command-line)
+4.2 Using Terminal (command-line) (this is a work in progress and might fail)
 -----------------------------------------------------------------------------
  $ cd $HOME/XBMC
  $ make externals more_libs

Modified: branches/unified-pvr/XBMC/XBMC.xcodeproj/project.pbxproj
===================================================================
--- branches/unified-pvr/XBMC/XBMC.xcodeproj/project.pbxproj	2009-03-18 06:27:48 UTC (rev 18656)
+++ branches/unified-pvr/XBMC/XBMC.xcodeproj/project.pbxproj	2009-03-18 08:35:54 UTC (rev 18657)
@@ -21,6 +21,20 @@
 			name = XBMC.app;
 			productName = XBMC.app;
 		};
+		F5A1CBDB0F6B0B4700A96ABD /* XBMC_ppc.app */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = F5A1CBE10F6B0B4700A96ABD /* Build configuration list for PBXAggregateTarget "XBMC_ppc.app" */;
+			buildPhases = (
+				F5A1CBDE0F6B0B4700A96ABD /* copy root files */,
+				F5A1CBDF0F6B0B4700A96ABD /* copy frameworks */,
+				F5A1CBE00F6B0B4700A96ABD /* update version info */,
+			);
+			dependencies = (
+				F5A1CBE60F6B0BFB00A96ABD /* PBXTargetDependency */,
+			);
+			name = XBMC_ppc.app;
+			productName = XBMC.app;
+		};
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
@@ -55,15 +69,15 @@
 		810C9F9E0D67BDE20095F5DD /* timestamp.c in Sources */ = {isa = PBXBuildFile; fileRef = 810C9F870D67BDE20095F5DD /* timestamp.c */; };
 		810C9FA90D67D1FB0095F5DD /* CMythDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 810C9FA50D67D1FB0095F5DD /* CMythDirectory.cpp */; };
 		810C9FAA0D67D1FB0095F5DD /* CMythFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 810C9FA70D67D1FB0095F5DD /* CMythFile.cpp */; };
-		810CA01C0D68A6E20095F5DD /* libShout-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E30B3E8E0D5D59290030A311 /* libShout-osx.a */; };
+		810CA01C0D68A6E20095F5DD /* libshout-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E30B3E8E0D5D59290030A311 /* libshout-x86-osx.a */; };
 		815EE62D0E176F75009FBE3C /* AMFObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 815EE62A0E176F75009FBE3C /* AMFObject.cpp */; };
 		815EE62E0E176F75009FBE3C /* rtmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 815EE62B0E176F75009FBE3C /* rtmp.cpp */; };
 		815EE62F0E176F75009FBE3C /* rtmppacket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 815EE62C0E176F75009FBE3C /* rtmppacket.cpp */; };
 		815EE6350E17F1DC009FBE3C /* DVDInputStreamRTMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 815EE6330E17F1DC009FBE3C /* DVDInputStreamRTMP.cpp */; };
-		81F064100E9B5FE400C203A6 /* libxbms-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 81F0640F0E9B5FE400C203A6 /* libxbms-osx.a */; };
+		81F064100E9B5FE400C203A6 /* libxbms-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 81F0640F0E9B5FE400C203A6 /* libxbms-x86-osx.a */; };
 		81F064130E9B608800C203A6 /* FileXBMSP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81F064110E9B608800C203A6 /* FileXBMSP.cpp */; };
 		81F064260E9BB99800C203A6 /* XBMSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81F064240E9BB99800C203A6 /* XBMSDirectory.cpp */; };
-		8800B9120E5C9D4E005F98A4 /* libcdio-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8800B9110E5C9D4E005F98A4 /* libcdio-osx.a */; };
+		8800B9120E5C9D4E005F98A4 /* libcdio-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8800B9110E5C9D4E005F98A4 /* libcdio-x86-osx.a */; };
 		880DBE4E0DC223FF00E26B71 /* MediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 880DBE4B0DC223FF00E26B71 /* MediaSource.cpp */; };
 		880DBE550DC224A100E26B71 /* MusicFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 880DBE530DC224A100E26B71 /* MusicFileDirectory.cpp */; };
 		8863281D0E07B37200BB3DAB /* GUIDialogFullScreenInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 886328150E07B37200BB3DAB /* GUIDialogFullScreenInfo.cpp */; };
@@ -620,7 +634,6 @@
 		E38E22680D25F9FE00618676 /* volume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1D5E0D25F9FC00618676 /* volume.cpp */; settings = {COMPILER_FLAGS = "-DSILENT"; }; };
 		E38E226D0D25F9FE00618676 /* ConvUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1D6A0D25F9FD00618676 /* ConvUtils.cpp */; };
 		E38E226E0D25F9FE00618676 /* CPortAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1D6C0D25F9FD00618676 /* CPortAudio.cpp */; };
-		E38E226F0D25F9FE00618676 /* getdelim.c in Sources */ = {isa = PBXBuildFile; fileRef = E38E1D6E0D25F9FD00618676 /* getdelim.c */; };
 		E38E22700D25F9FE00618676 /* LinuxResourceCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1D700D25F9FD00618676 /* LinuxResourceCounter.cpp */; };
 		E38E22710D25F9FE00618676 /* LinuxTimezone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1D720D25F9FD00618676 /* LinuxTimezone.cpp */; };
 		E38E22730D25F9FE00618676 /* NetworkLinux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1D760D25F9FD00618676 /* NetworkLinux.cpp */; };
@@ -746,7 +759,7 @@
 		E38E23050D25F9FE00618676 /* XBAudioConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1EA90D25F9FD00618676 /* XBAudioConfig.cpp */; };
 		E38E23070D25F9FE00618676 /* IoSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1EB00D25F9FD00618676 /* IoSupport.cpp */; };
 		E38E23100D25F9FE00618676 /* XKGeneral.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1EC70D25F9FD00618676 /* XKGeneral.cpp */; };
-		E38E23150D25F9FE00618676 /* XboxMediaCenter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1ED10D25F9FD00618676 /* XboxMediaCenter.cpp */; };
+		E38E23150D25F9FE00618676 /* xbmc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1ED10D25F9FD00618676 /* xbmc.cpp */; };
 		E38E23170D25F9FE00618676 /* XBVideoConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1ED40D25F9FD00618676 /* XBVideoConfig.cpp */; };
 		E38E23920D2626E600618676 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E238B0D2626E600618676 /* AudioToolbox.framework */; };
 		E38E23930D2626E600618676 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E238C0D2626E600618676 /* AudioUnit.framework */; };
@@ -761,8 +774,8 @@
 		E38E242F0D26317D00618676 /* liblzo.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E24270D26317D00618676 /* liblzo.dylib */; };
 		E38E25350D26365C00618676 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E25330D26365C00618676 /* AppKit.framework */; };
 		E38E25360D26365C00618676 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E25340D26365C00618676 /* ApplicationServices.framework */; };
-		E38E25690D2639F100618676 /* libxdaap-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E25680D2639F100618676 /* libxdaap-osx.a */; };
-		E38E256D0D263A1C00618676 /* librtv-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E256C0D263A1C00618676 /* librtv-osx.a */; };
+		E38E25690D2639F100618676 /* libxdaap-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E25680D2639F100618676 /* libxdaap-x86-osx.a */; };
+		E38E256D0D263A1C00618676 /* librtv-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E256C0D263A1C00618676 /* librtv-x86-osx.a */; };
 		E38E25780D263BF600618676 /* unpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25770D263BF600618676 /* unpack.cpp */; };
 		E38E257C0D263C4400618676 /* rar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E257B0D263C4400618676 /* rar.cpp */; };
 		E38E259D0D263CE000618676 /* action.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E257E0D263CE000618676 /* action.cpp */; };
@@ -799,7 +812,7 @@
 		E38E25C00D263DC100618676 /* DVDFactoryDemuxer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25BF0D263DC100618676 /* DVDFactoryDemuxer.cpp */; settings = {COMPILER_FLAGS = "-D__STDC_CONSTANT_MACROS"; }; };
 		E38E25C30D263DE200618676 /* DVDDemuxFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25C20D263DE200618676 /* DVDDemuxFFmpeg.cpp */; settings = {COMPILER_FLAGS = "-D__STDC_CONSTANT_MACROS"; }; };
 		E38F12C20D29FF200035C331 /* FileShoutcast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38F12C10D29FF200035C331 /* FileShoutcast.cpp */; };
-		E38F12EA0D2A17B30035C331 /* libGoAhead-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E38F12E90D2A17B30035C331 /* libGoAhead-osx.a */; };
+		E38F12EA0D2A17B30035C331 /* libGoAhead-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E38F12E90D2A17B30035C331 /* libGoAhead-x86-osx.a */; };
 		E3A4780A0D29029A00F3C3A6 /* dlgcache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3A478090D29029A00F3C3A6 /* dlgcache.cpp */; };
 		E3A478160D29030100F3C3A6 /* GUIMultiSelectText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3A478150D29030100F3C3A6 /* GUIMultiSelectText.cpp */; };
 		E3A4781A0D29032C00F3C3A6 /* GUIDialogAccessPoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3A478190D29032C00F3C3A6 /* GUIDialogAccessPoints.cpp */; };
@@ -824,24 +837,19 @@
 		E46465180E7E4D20003CB291 /* NptPosixFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E46465160E7E4D20003CB291 /* NptPosixFile.cpp */; };
 		E4E91BB80E7F7338001F0546 /* NptXbmcFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4E91BB70E7F7338001F0546 /* NptXbmcFile.cpp */; };
 		F506297A0E57B9680066625A /* MultiPathFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F50629780E57B9680066625A /* MultiPathFile.cpp */; };
-		F5174D830EDDD55600BD047B /* GUIWindowEPGProgInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5174D800EDDD55600BD047B /* GUIWindowEPGProgInfo.cpp */; };
-		F5174D840EDDD55600BD047B /* GUIWindowEPG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5174D820EDDD55600BD047B /* GUIWindowEPG.cpp */; };
-		F5174D8A0EDDD65000BD047B /* PVRManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5174D890EDDD65000BD047B /* PVRManager.cpp */; };
-		F5174D8D0EDDD6EF00BD047B /* GUIEPGGridContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5174D8B0EDDD6EF00BD047B /* GUIEPGGridContainer.cpp */; };
-		F5174D910EDDD84F00BD047B /* TVDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5174D900EDDD84F00BD047B /* TVDatabase.cpp */; };
-		F5174D950EDDD8E900BD047B /* PVRClient-mythtv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5174D940EDDD8E900BD047B /* PVRClient-mythtv.cpp */; };
-		F5174D9C0EDDDA4200BD047B /* EPG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5174D980EDDDA4200BD047B /* EPG.cpp */; };
-		F5174D9D0EDDDA4200BD047B /* EPGInfoTag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5174D9A0EDDDA4200BD047B /* EPGInfoTag.cpp */; };
+		F51CEEEF0F5C5D20004F4602 /* OSXGNUReplacements.c in Sources */ = {isa = PBXBuildFile; fileRef = F51CEEEE0F5C5D20004F4602 /* OSXGNUReplacements.c */; };
+		F51CEF880F5C64A5004F4602 /* DVDInputStreamHTSP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F51CEF860F5C64A5004F4602 /* DVDInputStreamHTSP.cpp */; };
+		F51CF2D00F6055A4004F4602 /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = F51CF2CE0F6055A4004F4602 /* sha1.c */; };
 		F51E5BB70E68BE3A00E24093 /* libmad.0.2.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E3EB8F030D5D5C0300FFF489 /* libmad.0.2.1.dylib */; };
-		F527E8330F293DD70046DBD3 /* libSDL-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 810CA0050D683DEF0095F5DD /* libSDL-osx.a */; };
-		F527E8370F293F3C0046DBD3 /* libSDL_image-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8806941E0DCF67A500836761 /* libSDL_image-osx.a */; };
-		F527E8380F293F420046DBD3 /* libSDL_mixer-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 810CA0080D683DEF0095F5DD /* libSDL_mixer-osx.a */; };
-		F527E83C0F293FA90046DBD3 /* libSDLmain-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 810CA0190D68A6820095F5DD /* libSDLmain-osx.a */; };
+		F527E8330F293DD70046DBD3 /* libSDL-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 810CA0050D683DEF0095F5DD /* libSDL-x86-osx.a */; };
+		F527E8370F293F3C0046DBD3 /* libSDL_image-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8806941E0DCF67A500836761 /* libSDL_image-x86-osx.a */; };
+		F527E8380F293F420046DBD3 /* libSDL_mixer-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 810CA0080D683DEF0095F5DD /* libSDL_mixer-x86-osx.a */; };
+		F527E83C0F293FA90046DBD3 /* libSDLmain-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 810CA0190D68A6820095F5DD /* libSDLmain-x86-osx.a */; };
 		F5290C220EDF142A001167F0 /* PlayListURL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5290C210EDF142A001167F0 /* PlayListURL.cpp */; };
 		F5290F6A0EE1B113001167F0 /* paplayer_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5290F690EE1B113001167F0 /* paplayer_osx.cpp */; };
 		F52910140EE1D5F0001167F0 /* DirectoryNodeMusicVideoAlbum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F52910130EE1D5F0001167F0 /* DirectoryNodeMusicVideoAlbum.cpp */; };
 		F5390F7A0F2BB7080081BAE0 /* Cdg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5D879D10EF4BE53007C68A9 /* Cdg.cpp */; };
-		F54C4BD40F19B79C00D46E3C /* postproc-51-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F54C4BD30F19B79C00D46E3C /* postproc-51-osx.a */; };
+		F54C4BD40F19B79C00D46E3C /* postproc-51-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F54C4BD30F19B79C00D46E3C /* postproc-51-x86-osx.a */; };
 		F54C51300F1C65D100D46E3C /* libportaudio.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F54C512F0F1C65D100D46E3C /* libportaudio.dylib */; };
 		F54C51D20F1E783200D46E3C /* GUIDialogKaraokeSongSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F54C51D00F1E783200D46E3C /* GUIDialogKaraokeSongSelector.cpp */; };
 		F54C51D50F1E784800D46E3C /* karaokelyricscdg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F54C51D40F1E784800D46E3C /* karaokelyricscdg.cpp */; };
@@ -851,22 +859,892 @@
 		F54C51E70F1E787700D46E3C /* karaokelyricsfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F54C51E20F1E787700D46E3C /* karaokelyricsfactory.cpp */; };
 		F54C51E80F1E787700D46E3C /* karaokelyricstextlrc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F54C51E30F1E787700D46E3C /* karaokelyricstextlrc.cpp */; };
 		F54C51E90F1E787700D46E3C /* karaokelyricstext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F54C51E40F1E787700D46E3C /* karaokelyricstext.cpp */; };
+		F55110450F5C3C0100955236 /* DVDDemuxHTSP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F55110440F5C3C0000955236 /* DVDDemuxHTSP.cpp */; };
+		F551107C0F5C424700955236 /* htsatomic.c in Sources */ = {isa = PBXBuildFile; fileRef = F551106D0F5C424700955236 /* htsatomic.c */; };
+		F551107D0F5C424700955236 /* htsbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = F551106F0F5C424700955236 /* htsbuf.c */; };
+		F551107E0F5C424700955236 /* htsmsg.c in Sources */ = {isa = PBXBuildFile; fileRef = F55110710F5C424700955236 /* htsmsg.c */; };
+		F551107F0F5C424700955236 /* htsmsg_binary.c in Sources */ = {isa = PBXBuildFile; fileRef = F55110730F5C424700955236 /* htsmsg_binary.c */; };
+		F55110800F5C424700955236 /* htsstr.c in Sources */ = {isa = PBXBuildFile; fileRef = F55110760F5C424700955236 /* htsstr.c */; };
+		F55110820F5C424700955236 /* net_posix.c in Sources */ = {isa = PBXBuildFile; fileRef = F551107B0F5C424700955236 /* net_posix.c */; };
 		F56A084B0F4A18FB003F9F87 /* karaokewindowbackground.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56A084A0F4A18FB003F9F87 /* karaokewindowbackground.cpp */; };
 		F56A08E00F4D3C20003F9F87 /* GUITexture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56A08DF0F4D3C20003F9F87 /* GUITexture.cpp */; };
 		F56A08E50F4D3C2E003F9F87 /* GUITextureGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56A08E20F4D3C2E003F9F87 /* GUITextureGL.cpp */; };
 		F56A08E60F4D3C2E003F9F87 /* GUITextureSDL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56A08E40F4D3C2E003F9F87 /* GUITextureSDL.cpp */; };
 		F57E213F0E3C3AB300700C9D /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F57E213E0E3C3AB200700C9D /* libiconv.dylib */; };
 		F57E21410E3C3AD400700C9D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F57E21400E3C3AD400700C9D /* libz.dylib */; };
-		F583FE9D0F019C1E00E181F2 /* avutil-49-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F583FE9C0F019C1E00E181F2 /* avutil-49-osx.a */; };
-		F583FE9F0F019C3200E181F2 /* avcodec-52-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F583FE9E0F019C3200E181F2 /* avcodec-52-osx.a */; };
-		F583FEA10F019C3D00E181F2 /* swscale-0.6.1-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F583FEA00F019C3D00E181F2 /* swscale-0.6.1-osx.a */; };
-		F583FEA30F019C4500E181F2 /* avformat-52-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F583FEA20F019C4500E181F2 /* avformat-52-osx.a */; };
+		F583FE9D0F019C1E00E181F2 /* avutil-49-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F583FE9C0F019C1E00E181F2 /* avutil-49-x86-osx.a */; };
+		F583FE9F0F019C3200E181F2 /* avcodec-52-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F583FE9E0F019C3200E181F2 /* avcodec-52-x86-osx.a */; };
+		F583FEA10F019C3D00E181F2 /* swscale-0.6.1-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F583FEA00F019C3D00E181F2 /* swscale-0.6.1-x86-osx.a */; };
+		F583FEA30F019C4500E181F2 /* avformat-52-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F583FEA20F019C4500E181F2 /* avformat-52-x86-osx.a */; };
 		F584E0FC0F25427500DB26A5 /* MusicInfoTagLoaderMidi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F584E0FB0F25427500DB26A5 /* MusicInfoTagLoaderMidi.cpp */; };
 		F584E1290F257BD800DB26A5 /* FileSpecialProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F584E1270F257BD800DB26A5 /* FileSpecialProtocol.cpp */; };
 		F584E12E0F257C5100DB26A5 /* HTTPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F584E12D0F257C5100DB26A5 /* HTTPDirectory.cpp */; };
 		F5A00B080EFDDDFC00CD59F3 /* AudioRendererFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A00B070EFDDDFC00CD59F3 /* AudioRendererFactory.cpp */; };
 		F5A00B260EFDE44100CD59F3 /* NullDirectSound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A00B240EFDE44100CD59F3 /* NullDirectSound.cpp */; };
+		F5A1C8740F6B06CF00A96ABD /* ActionManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E138A0D25F9F900618676 /* ActionManager.cpp */; };
+		F5A1C8750F6B06CF00A96ABD /* AnimatedGif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E138C0D25F9F900618676 /* AnimatedGif.cpp */; };
+		F5A1C8760F6B06CF00A96ABD /* AudioContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E138E0D25F9F900618676 /* AudioContext.cpp */; };
+		F5A1C8770F6B06CF00A96ABD /* Keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13970D25F9F900618676 /* Keyboard.cpp */; };
+		F5A1C8780F6B06CF00A96ABD /* Mouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E139D0D25F9F900618676 /* Mouse.cpp */; };
+		F5A1C8790F6B06CF00A96ABD /* SDLJoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E139F0D25F9F900618676 /* SDLJoystick.cpp */; };
+		F5A1C87A0F6B06CF00A96ABD /* SDLKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13A10D25F9F900618676 /* SDLKeyboard.cpp */; };
+		F5A1C87B0F6B06CF00A96ABD /* SDLMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13A30D25F9F900618676 /* SDLMouse.cpp */; };
+		F5A1C87C0F6B06CF00A96ABD /* DirectXGraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13A90D25F9F900618676 /* DirectXGraphics.cpp */; };
+		F5A1C87D0F6B06CF00A96ABD /* FrameBufferObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13AB0D25F9F900618676 /* FrameBufferObject.cpp */; };
+		F5A1C87E0F6B06CF00A96ABD /* GraphicContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13C20D25F9F900618676 /* GraphicContext.cpp */; };
+		F5A1C87F0F6B06CF00A96ABD /* GUIAudioManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13C50D25F9F900618676 /* GUIAudioManager.cpp */; };
+		F5A1C8800F6B06CF00A96ABD /* GUIBaseContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13C70D25F9F900618676 /* GUIBaseContainer.cpp */; };
+		F5A1C8810F6B06CF00A96ABD /* GUIBorderedImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13C90D25F9F900618676 /* GUIBorderedImage.cpp */; };
+		F5A1C8820F6B06CF00A96ABD /* GUIButtonControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13CB0D25F9F900618676 /* GUIButtonControl.cpp */; };
+		F5A1C8830F6B06CF00A96ABD /* GUIButtonScroller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13CD0D25F9F900618676 /* GUIButtonScroller.cpp */; };
+		F5A1C8840F6B06CF00A96ABD /* GUICheckMarkControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13D00D25F9F900618676 /* GUICheckMarkControl.cpp */; };
+		F5A1C8850F6B06CF00A96ABD /* GUIColorManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13D20D25F9F900618676 /* GUIColorManager.cpp */; };
+		F5A1C8860F6B06CF00A96ABD /* GUIControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13D60D25F9F900618676 /* GUIControl.cpp */; };
+		F5A1C8870F6B06CF00A96ABD /* GuiControlFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13D80D25F9F900618676 /* GuiControlFactory.cpp */; };
+		F5A1C8880F6B06CF00A96ABD /* GUIControlGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13DA0D25F9F900618676 /* GUIControlGroup.cpp */; };
+		F5A1C8890F6B06CF00A96ABD /* GUIControlGroupList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13DC0D25F9F900618676 /* GUIControlGroupList.cpp */; };
+		F5A1C88A0F6B06CF00A96ABD /* GUIDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13DE0D25F9F900618676 /* GUIDialog.cpp */; };
+		F5A1C88B0F6B06CF00A96ABD /* GUIEditControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13E00D25F9F900618676 /* GUIEditControl.cpp */; };
+		F5A1C88C0F6B06CF00A96ABD /* GUIFadeLabelControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13E20D25F9F900618676 /* GUIFadeLabelControl.cpp */; };
+		F5A1C88D0F6B06CF00A96ABD /* GUIFixedListContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13E40D25F9F900618676 /* GUIFixedListContainer.cpp */; };
+		F5A1C88E0F6B06CF00A96ABD /* GUIFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13E60D25F9F900618676 /* GUIFont.cpp */; };
+		F5A1C88F0F6B06CF00A96ABD /* GUIFontManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13E80D25F9F900618676 /* GUIFontManager.cpp */; };
+		F5A1C8900F6B06CF00A96ABD /* GUIFontTTF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13EA0D25F9F900618676 /* GUIFontTTF.cpp */; };
+		F5A1C8910F6B06CF00A96ABD /* guiImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13EC0D25F9F900618676 /* guiImage.cpp */; };
+		F5A1C8920F6B06CF00A96ABD /* GUIIncludes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13EE0D25F9F900618676 /* GUIIncludes.cpp */; };
+		F5A1C8930F6B06CF00A96ABD /* GUILabelControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13F20D25F9F900618676 /* GUILabelControl.cpp */; };
+		F5A1C8940F6B06CF00A96ABD /* GUIListContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E13FA0D25F9F900618676 /* GUIListContainer.cpp */; };
+		F5A1C8950F6B06CF00A96ABD /* GUIListItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14000D25F9F900618676 /* GUIListItem.cpp */; };
+		F5A1C8960F6B06CF00A96ABD /* GUIListItemLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14020D25F9F900618676 /* GUIListItemLayout.cpp */; };
+		F5A1C8970F6B06CF00A96ABD /* GUIListLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14040D25F9F900618676 /* GUIListLabel.cpp */; };
+		F5A1C8980F6B06CF00A96ABD /* GUIMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14060D25F9F900618676 /* GUIMessage.cpp */; };
+		F5A1C8990F6B06CF00A96ABD /* GUIMoverControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14080D25F9F900618676 /* GUIMoverControl.cpp */; };
+		F5A1C89A0F6B06CF00A96ABD /* GUIMultiImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E140A0D25F9F900618676 /* GUIMultiImage.cpp */; };
+		F5A1C89B0F6B06CF00A96ABD /* GUIPanelContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E140C0D25F9F900618676 /* GUIPanelContainer.cpp */; };
+		F5A1C89C0F6B06CF00A96ABD /* GUIProgressControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E140E0D25F9F900618676 /* GUIProgressControl.cpp */; };
+		F5A1C89D0F6B06CF00A96ABD /* GUIRadioButtonControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14100D25F9F900618676 /* GUIRadioButtonControl.cpp */; };
+		F5A1C89E0F6B06CF00A96ABD /* GUIResizeControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14120D25F9F900618676 /* GUIResizeControl.cpp */; };
+		F5A1C89F0F6B06CF00A96ABD /* GUIRSSControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14140D25F9F900618676 /* GUIRSSControl.cpp */; };
+		F5A1C8A00F6B06CF00A96ABD /* GUIScrollBarControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14160D25F9F900618676 /* GUIScrollBarControl.cpp */; };
+		F5A1C8A10F6B06CF00A96ABD /* GUISelectButtonControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14180D25F9F900618676 /* GUISelectButtonControl.cpp */; };
+		F5A1C8A20F6B06CF00A96ABD /* GUISettingsSliderControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E141A0D25F9F900618676 /* GUISettingsSliderControl.cpp */; };
+		F5A1C8A30F6B06CF00A96ABD /* GUISliderControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E141C0D25F9F900618676 /* GUISliderControl.cpp */; };
+		F5A1C8A40F6B06CF00A96ABD /* GUISound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E141E0D25F9F900618676 /* GUISound.cpp */; };
+		F5A1C8A50F6B06CF00A96ABD /* GUISpinControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14200D25F9F900618676 /* GUISpinControl.cpp */; };
+		F5A1C8A60F6B06CF00A96ABD /* GUISpinControlEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14220D25F9F900618676 /* GUISpinControlEx.cpp */; };
+		F5A1C8A70F6B06CF00A96ABD /* GUIStandardWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14240D25F9F900618676 /* GUIStandardWindow.cpp */; };
+		F5A1C8A80F6B06CF00A96ABD /* GUITextBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14260D25F9F900618676 /* GUITextBox.cpp */; };
+		F5A1C8A90F6B06CF00A96ABD /* GUITextLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14280D25F9F900618676 /* GUITextLayout.cpp */; };
+		F5A1C8AA0F6B06CF00A96ABD /* GUIToggleButtonControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E142A0D25F9F900618676 /* GUIToggleButtonControl.cpp */; };
+		F5A1C8AB0F6B06CF00A96ABD /* GUIVideoControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E142C0D25F9F900618676 /* GUIVideoControl.cpp */; };
+		F5A1C8AC0F6B06CF00A96ABD /* GUIVisualisationControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E142E0D25F9F900618676 /* GUIVisualisationControl.cpp */; };
+		F5A1C8AD0F6B06CF00A96ABD /* GUIWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14300D25F9F900618676 /* GUIWindow.cpp */; };
+		F5A1C8AE0F6B06CF00A96ABD /* GUIWindowManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14320D25F9F900618676 /* GUIWindowManager.cpp */; };
+		F5A1C8AF0F6B06CF00A96ABD /* GUIWrappingListContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14340D25F9F900618676 /* GUIWrappingListContainer.cpp */; };
+		F5A1C8B00F6B06CF00A96ABD /* include.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14390D25F9F900618676 /* include.cpp */; };
+		F5A1C8B10F6B06CF00A96ABD /* IWindowManagerCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E143B0D25F9F900618676 /* IWindowManagerCallback.cpp */; };
+		F5A1C8B20F6B06CF00A96ABD /* Key.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E143D0D25F9F900618676 /* Key.cpp */; };
+		F5A1C8B30F6B06CF00A96ABD /* LocalizeStrings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E143F0D25F9F900618676 /* LocalizeStrings.cpp */; };
+		F5A1C8B40F6B06CF00A96ABD /* Shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14460D25F9F900618676 /* Shader.cpp */; };
+		F5A1C8B50F6B06CF00A96ABD /* SkinInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14480D25F9F900618676 /* SkinInfo.cpp */; };
+		F5A1C8B60F6B06CF00A96ABD /* Surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E144B0D25F9F900618676 /* Surface.cpp */; };
+		F5A1C8B70F6B06CF00A96ABD /* TextureBundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E144E0D25F9F900618676 /* TextureBundle.cpp */; };
+		F5A1C8B80F6B06CF00A96ABD /* TextureManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14500D25F9F900618676 /* TextureManager.cpp */; };
+		F5A1C8B90F6B06CF00A96ABD /* tinystr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14550D25F9F900618676 /* tinystr.cpp */; };
+		F5A1C8BA0F6B06CF00A96ABD /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14570D25F9F900618676 /* tinyxml.cpp */; };
+		F5A1C8BB0F6B06CF00A96ABD /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14590D25F9F900618676 /* tinyxmlerror.cpp */; };
+		F5A1C8BC0F6B06CF00A96ABD /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E145A0D25F9F900618676 /* tinyxmlparser.cpp */; };
+		F5A1C8BD0F6B06CF00A96ABD /* VisibleEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E145D0D25F9F900618676 /* VisibleEffect.cpp */; };
+		F5A1C8BE0F6B06CF00A96ABD /* XMLUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E145F0D25F9F900618676 /* XMLUtils.cpp */; };
+		F5A1C8BF0F6B06CF00A96ABD /* APEv2Tag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14620D25F9F900618676 /* APEv2Tag.cpp */; };
+		F5A1C8C00F6B06CF00A96ABD /* Application.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14640D25F9F900618676 /* Application.cpp */; };
+		F5A1C8C10F6B06CF00A96ABD /* ApplicationMessenger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14660D25F9F900618676 /* ApplicationMessenger.cpp */; };
+		F5A1C8C20F6B06CF00A96ABD /* ApplicationRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14680D25F9F900618676 /* ApplicationRenderer.cpp */; };
+		F5A1C8C30F6B06CF00A96ABD /* AutoPtrHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E146C0D25F9F900618676 /* AutoPtrHandle.cpp */; };
+		F5A1C8C40F6B06CF00A96ABD /* Autorun.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E146E0D25F9F900618676 /* Autorun.cpp */; };
+		F5A1C8C50F6B06CF00A96ABD /* AutoSwitch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14700D25F9F900618676 /* AutoSwitch.cpp */; };
+		F5A1C8C60F6B06CF00A96ABD /* BackgroundInfoLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14720D25F9F900618676 /* BackgroundInfoLoader.cpp */; };
+		F5A1C8C70F6B06CF00A96ABD /* ButtonTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14770D25F9F900618676 /* ButtonTranslator.cpp */; };
+		F5A1C8C80F6B06CF00A96ABD /* CDDAReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14800D25F9F900618676 /* CDDAReader.cpp */; };
+		F5A1C8C90F6B06CF00A96ABD /* CDDARipper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14820D25F9F900618676 /* CDDARipper.cpp */; };
+		F5A1C8CA0F6B06CF00A96ABD /* Encoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14880D25F9F900618676 /* Encoder.cpp */; };
+		F5A1C8CB0F6B06CF00A96ABD /* EncoderLame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E148A0D25F9F900618676 /* EncoderLame.cpp */; };
+		F5A1C8CC0F6B06CF00A96ABD /* EncoderVorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E148C0D25F9F900618676 /* EncoderVorbis.cpp */; };
+		F5A1C8CD0F6B06CF00A96ABD /* EncoderWav.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E148E0D25F9F900618676 /* EncoderWav.cpp */; };
+		F5A1C8CE0F6B06CF00A96ABD /* coff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E149E0D25F9F900618676 /* coff.cpp */; };
+		F5A1C8CF0F6B06CF00A96ABD /* dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14A30D25F9F900618676 /* dll.cpp */; };
+		F5A1C8D00F6B06CF00A96ABD /* dll_tracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14A50D25F9F900618676 /* dll_tracker.cpp */; };
+		F5A1C8D10F6B06CF00A96ABD /* dll_tracker_critical_section.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14A70D25F9F900618676 /* dll_tracker_critical_section.cpp */; };
+		F5A1C8D20F6B06CF00A96ABD /* dll_tracker_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14A90D25F9F900618676 /* dll_tracker_file.cpp */; };
+		F5A1C8D30F6B06CF00A96ABD /* dll_tracker_library.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14AB0D25F9F900618676 /* dll_tracker_library.cpp */; };
+		F5A1C8D40F6B06CF00A96ABD /* dll_tracker_memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14AD0D25F9F900618676 /* dll_tracker_memory.cpp */; };
+		F5A1C8D50F6B06CF00A96ABD /* dll_util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14B10D25F9F900618676 /* dll_util.cpp */; };
+		F5A1C8D60F6B06CF00A96ABD /* DllLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14B40D25F9F900618676 /* DllLoader.cpp */; };
+		F5A1C8D70F6B06CF00A96ABD /* DllLoaderContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14B60D25F9F900618676 /* DllLoaderContainer.cpp */; };
+		F5A1C8D80F6B06CF00A96ABD /* emu_dummy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14B90D25F9F900618676 /* emu_dummy.cpp */; };
+		F5A1C8D90F6B06CF00A96ABD /* emu_dx8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14BB0D25F9F900618676 /* emu_dx8.cpp */; };
+		F5A1C8DA0F6B06CF00A96ABD /* emu_kernel32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14BD0D25F9F900618676 /* emu_kernel32.cpp */; };
+		F5A1C8DB0F6B06CF00A96ABD /* emu_msvcrt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14C10D25F9F900618676 /* emu_msvcrt.cpp */; };
+		F5A1C8DC0F6B06CF00A96ABD /* exports_kernel32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14D40D25F9F900618676 /* exports_kernel32.cpp */; };
+		F5A1C8DD0F6B06CF00A96ABD /* exports_msvcrt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14D60D25F9F900618676 /* exports_msvcrt.cpp */; };
+		F5A1C8DE0F6B06CF00A96ABD /* exports_python_linux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14D90D25F9F900618676 /* exports_python_linux.cpp */; };
+		F5A1C8DF0F6B06CF00A96ABD /* EmuFileWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14E30D25F9F900618676 /* EmuFileWrapper.cpp */; };
+		F5A1C8E00F6B06CF00A96ABD /* wrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = E38E14E80D25F9F900618676 /* wrapper.c */; };
+		F5A1C8E10F6B06CF00A96ABD /* ldt_keeper.c in Sources */ = {isa = PBXBuildFile; fileRef = E38E14EB0D25F9F900618676 /* ldt_keeper.c */; };
+		F5A1C8E20F6B06CF00A96ABD /* LibraryLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14ED0D25F9F900618676 /* LibraryLoader.cpp */; };
+		F5A1C8E30F6B06CF00A96ABD /* mmap_anon.c in Sources */ = {isa = PBXBuildFile; fileRef = E38E14F10D25F9F900618676 /* mmap_anon.c */; };
+		F5A1C8E40F6B06CF00A96ABD /* SoLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14F40D25F9F900618676 /* SoLoader.cpp */; };
+		F5A1C8E50F6B06CF00A96ABD /* DummyVideoPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14F60D25F9F900618676 /* DummyVideoPlayer.cpp */; };
+		F5A1C8E60F6B06CF00A96ABD /* ALSADirectSound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14F90D25F9F900618676 /* ALSADirectSound.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8E70F6B06CF00A96ABD /* DVDAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14FC0D25F9F900618676 /* DVDAudio.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8E80F6B06CF00A96ABD /* DVDClock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E14FE0D25F9F900618676 /* DVDClock.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8E90F6B06CF00A96ABD /* DVDAudioCodecFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15070D25F9F900618676 /* DVDAudioCodecFFmpeg.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8EA0F6B06CF00A96ABD /* DVDAudioCodecLiba52.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15090D25F9F900618676 /* DVDAudioCodecLiba52.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8EB0F6B06CF00A96ABD /* DVDAudioCodecLibDts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E150B0D25F9F900618676 /* DVDAudioCodecLibDts.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8EC0F6B06CF00A96ABD /* DVDAudioCodecLibFaad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E150D0D25F9F900618676 /* DVDAudioCodecLibFaad.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8ED0F6B06CF00A96ABD /* DVDAudioCodecLibMad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E150F0D25F9F900618676 /* DVDAudioCodecLibMad.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8EE0F6B06CF00A96ABD /* DVDAudioCodecLPcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15110D25F9F900618676 /* DVDAudioCodecLPcm.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8EF0F6B06CF00A96ABD /* DVDAudioCodecPassthrough.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15130D25F9F900618676 /* DVDAudioCodecPassthrough.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8F00F6B06CF00A96ABD /* DVDAudioCodecPcm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15150D25F9F900618676 /* DVDAudioCodecPcm.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8F10F6B06CF00A96ABD /* DVDCodecUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15220D25F9F900618676 /* DVDCodecUtils.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8F20F6B06CF00A96ABD /* DVDFactoryCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15240D25F9F900618676 /* DVDFactoryCodec.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8F30F6B06CF00A96ABD /* DVDOverlayCodecCC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E152B0D25F9F900618676 /* DVDOverlayCodecCC.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8F40F6B06CF00A96ABD /* DVDOverlayCodecFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E152D0D25F9F900618676 /* DVDOverlayCodecFFmpeg.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8F50F6B06CF00A96ABD /* DVDOverlayCodecText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E152F0D25F9F900618676 /* DVDOverlayCodecText.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8F60F6B06CF00A96ABD /* cc_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = E38E15350D25F9F900618676 /* cc_decoder.c */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8F70F6B06CF00A96ABD /* DVDVideoCodecFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E153D0D25F9F900618676 /* DVDVideoCodecFFmpeg.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8F80F6B06CF00A96ABD /* DVDVideoCodecLibMpeg2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E153F0D25F9F900618676 /* DVDVideoCodecLibMpeg2.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8F90F6B06CF00A96ABD /* DVDVideoPPFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15410D25F9F900618676 /* DVDVideoPPFFmpeg.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8FA0F6B06CF00A96ABD /* DVDDemux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15490D25F9F900618676 /* DVDDemux.cpp */; settings = {COMPILER_FLAGS = "-D__STDC_CONSTANT_MACROS"; }; };
+		F5A1C8FB0F6B06CF00A96ABD /* DVDDemuxShoutcast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E154D0D25F9F900618676 /* DVDDemuxShoutcast.cpp */; settings = {COMPILER_FLAGS = "-D__STDC_CONSTANT_MACROS"; }; };
+		F5A1C8FC0F6B06CF00A96ABD /* DVDDemuxUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E154F0D25F9F900618676 /* DVDDemuxUtils.cpp */; settings = {COMPILER_FLAGS = "-D__STDC_CONSTANT_MACROS"; }; };
+		F5A1C8FD0F6B06CF00A96ABD /* DVDDemuxSPU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15550D25F9FA00618676 /* DVDDemuxSPU.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8FE0F6B06CF00A96ABD /* DVDFactoryInputStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15590D25F9FA00618676 /* DVDFactoryInputStream.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C8FF0F6B06CF00A96ABD /* DVDInputStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E155B0D25F9FA00618676 /* DVDInputStream.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C9000F6B06CF00A96ABD /* DVDInputStreamFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E155D0D25F9FA00618676 /* DVDInputStreamFFmpeg.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C9010F6B06CF00A96ABD /* DVDInputStreamFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E155F0D25F9FA00618676 /* DVDInputStreamFile.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C9020F6B06CF00A96ABD /* DVDInputStreamHttp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15610D25F9FA00618676 /* DVDInputStreamHttp.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C9030F6B06CF00A96ABD /* DVDInputStreamMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15630D25F9FA00618676 /* DVDInputStreamMemory.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C9040F6B06CF00A96ABD /* DVDInputStreamNavigator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15650D25F9FA00618676 /* DVDInputStreamNavigator.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C9050F6B06CF00A96ABD /* DVDStateSerializer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15740D25F9FA00618676 /* DVDStateSerializer.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C9060F6B06CF00A96ABD /* DVDMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15780D25F9FA00618676 /* DVDMessage.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C9070F6B06CF00A96ABD /* DVDMessageQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157A0D25F9FA00618676 /* DVDMessageQueue.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C9080F6B06CF00A96ABD /* DVDMessageTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157C0D25F9FA00618676 /* DVDMessageTracker.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C9090F6B06CF00A96ABD /* DVDOverlayContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E157E0D25F9FA00618676 /* DVDOverlayContainer.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C90A0F6B06CF00A96ABD /* DVDOverlayRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15800D25F9FA00618676 /* DVDOverlayRenderer.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C90B0F6B06CF00A96ABD /* DVDPerformanceCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15820D25F9FA00618676 /* DVDPerformanceCounter.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C90C0F6B06CF00A96ABD /* DVDPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15840D25F9FA00618676 /* DVDPlayer.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C90D0F6B06CF00A96ABD /* DVDPlayerAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15860D25F9FA00618676 /* DVDPlayerAudio.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C90E0F6B06CF00A96ABD /* DVDPlayerSubtitle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15880D25F9FA00618676 /* DVDPlayerSubtitle.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C90F0F6B06CF00A96ABD /* DVDPlayerVideo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E158A0D25F9FA00618676 /* DVDPlayerVideo.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C9100F6B06CF00A96ABD /* DVDStreamInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E158C0D25F9FA00618676 /* DVDStreamInfo.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C9110F6B06CF00A96ABD /* DVDFactorySubtitle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E158F0D25F9FA00618676 /* DVDFactorySubtitle.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C9120F6B06CF00A96ABD /* DVDSubtitleLineCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15910D25F9FA00618676 /* DVDSubtitleLineCollection.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C9130F6B06CF00A96ABD /* DVDSubtitleParserSubrip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15940D25F9FA00618676 /* DVDSubtitleParserSubrip.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C9140F6B06CF00A96ABD /* DVDSubtitleStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15960D25F9FA00618676 /* DVDSubtitleStream.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C9150F6B06CF00A96ABD /* PortaudioDirectSound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E159D0D25F9FA00618676 /* PortaudioDirectSound.cpp */; settings = {COMPILER_FLAGS = "-DHAS_VIDEO_PLAYBACK"; }; };
+		F5A1C9160F6B06CF00A96ABD /* AACcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15D50D25F9FA00618676 /* AACcodec.cpp */; };
+		F5A1C9170F6B06CF00A96ABD /* AC3CDDACodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15D70D25F9FA00618676 /* AC3CDDACodec.cpp */; };
+		F5A1C9180F6B06CF00A96ABD /* AC3Codec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15D90D25F9FA00618676 /* AC3Codec.cpp */; };
+		F5A1C9190F6B06CF00A96ABD /* ADPCMCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15DB0D25F9FA00618676 /* ADPCMCodec.cpp */; };
+		F5A1C91A0F6B06CF00A96ABD /* AdplugCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15DD0D25F9FA00618676 /* AdplugCodec.cpp */; };
+		F5A1C91B0F6B06CF00A96ABD /* AIFFcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15DF0D25F9FA00618676 /* AIFFcodec.cpp */; };
+		F5A1C91C0F6B06CF00A96ABD /* APEcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15E10D25F9FA00618676 /* APEcodec.cpp */; };
+		F5A1C91D0F6B06CF00A96ABD /* AudioDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15E30D25F9FA00618676 /* AudioDecoder.cpp */; };
+		F5A1C91E0F6B06CF00A96ABD /* CDDAcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15E60D25F9FA00618676 /* CDDAcodec.cpp */; };
+		F5A1C91F0F6B06CF00A96ABD /* CodecFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15E80D25F9FA00618676 /* CodecFactory.cpp */; };
+		F5A1C9200F6B06CF00A96ABD /* FLACcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E160A0D25F9FA00618676 /* FLACcodec.cpp */; };
+		F5A1C9210F6B06CF00A96ABD /* GYMCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E160C0D25F9FA00618676 /* GYMCodec.cpp */; };
+		F5A1C9220F6B06CF00A96ABD /* ModuleCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16110D25F9FA00618676 /* ModuleCodec.cpp */; };
+		F5A1C9230F6B06CF00A96ABD /* MP3codec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16130D25F9FA00618676 /* MP3codec.cpp */; };
+		F5A1C9240F6B06CF00A96ABD /* MPCcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16190D25F9FA00618676 /* MPCcodec.cpp */; };
+		F5A1C9250F6B06CF00A96ABD /* NSFCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E161B0D25F9FA00618676 /* NSFCodec.cpp */; };
+		F5A1C9260F6B06CF00A96ABD /* OGGcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16230D25F9FA00618676 /* OGGcodec.cpp */; };
+		F5A1C9270F6B06CF00A96ABD /* ReplayGain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E162A0D25F9FA00618676 /* ReplayGain.cpp */; };
+		F5A1C9280F6B06CF00A96ABD /* SHNcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E162F0D25F9FA00618676 /* SHNcodec.cpp */; };
+		F5A1C9290F6B06CF00A96ABD /* SIDCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16310D25F9FA00618676 /* SIDCodec.cpp */; };
+		F5A1C92A0F6B06CF00A96ABD /* SPCCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16350D25F9FA00618676 /* SPCCodec.cpp */; };
+		F5A1C92B0F6B06CF00A96ABD /* TimidityCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16370D25F9FA00618676 /* TimidityCodec.cpp */; };
+		F5A1C92C0F6B06CF00A96ABD /* WAVcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16390D25F9FA00618676 /* WAVcodec.cpp */; };
+		F5A1C92D0F6B06CF00A96ABD /* WAVPackcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E163D0D25F9FA00618676 /* WAVPackcodec.cpp */; };
+		F5A1C92E0F6B06CF00A96ABD /* WMACodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E163F0D25F9FA00618676 /* WMACodec.cpp */; };
+		F5A1C92F0F6B06CF00A96ABD /* YMCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16410D25F9FA00618676 /* YMCodec.cpp */; };
+		F5A1C9300F6B06CF00A96ABD /* PlayerCoreFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16430D25F9FA00618676 /* PlayerCoreFactory.cpp */; };
+		F5A1C9310F6B06CF00A96ABD /* ssrc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16560D25F9FA00618676 /* ssrc.cpp */; };
+		F5A1C9320F6B06CF00A96ABD /* LinuxRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E165B0D25F9FA00618676 /* LinuxRenderer.cpp */; };
+		F5A1C9330F6B06CF00A96ABD /* LinuxRendererATI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E165D0D25F9FA00618676 /* LinuxRendererATI.cpp */; };
+		F5A1C9340F6B06CF00A96ABD /* LinuxRendererGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E165F0D25F9FA00618676 /* LinuxRendererGL.cpp */; };
+		F5A1C9350F6B06CF00A96ABD /* RenderManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16650D25F9FA00618676 /* RenderManager.cpp */; };
+		F5A1C9360F6B06CF00A96ABD /* VideoFilterShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E166F0D25F9FA00618676 /* VideoFilterShader.cpp */; };
+		F5A1C9370F6B06CF00A96ABD /* YUV2RGBShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16710D25F9FA00618676 /* YUV2RGBShader.cpp */; };
+		F5A1C9380F6B06CF00A96ABD /* Crc32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16790D25F9FA00618676 /* Crc32.cpp */; };
+		F5A1C9390F6B06CF00A96ABD /* CueDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E167E0D25F9FA00618676 /* CueDocument.cpp */; };
+		F5A1C93A0F6B06CF00A96ABD /* Database.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16800D25F9FA00618676 /* Database.cpp */; };
+		F5A1C93B0F6B06CF00A96ABD /* DateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16820D25F9FA00618676 /* DateTime.cpp */; };
+		F5A1C93C0F6B06CF00A96ABD /* DetectDVDType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16840D25F9FA00618676 /* DetectDVDType.cpp */; };
+		F5A1C93D0F6B06CF00A96ABD /* DNSNameCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16890D25F9FA00618676 /* DNSNameCache.cpp */; };
+		F5A1C93E0F6B06CF00A96ABD /* DynamicDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E168C0D25F9FA00618676 /* DynamicDll.cpp */; };
+		F5A1C93F0F6B06CF00A96ABD /* Edl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E168E0D25F9FA00618676 /* Edl.cpp */; };
+		F5A1C9400F6B06CF00A96ABD /* Favourites.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16900D25F9FA00618676 /* Favourites.cpp */; };
+		F5A1C9410F6B06CF00A96ABD /* FileItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16920D25F9FA00618676 /* FileItem.cpp */; };
+		F5A1C9420F6B06CF00A96ABD /* CacheMemBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16970D25F9FA00618676 /* CacheMemBuffer.cpp */; };
+		F5A1C9430F6B06CF00A96ABD /* CacheStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16990D25F9FA00618676 /* CacheStrategy.cpp */; };
+		F5A1C9440F6B06CF00A96ABD /* CDDADirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E169B0D25F9FA00618676 /* CDDADirectory.cpp */; };
+		F5A1C9450F6B06CF00A96ABD /* cddb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E169D0D25F9FA00618676 /* cddb.cpp */; };
+		F5A1C9460F6B06CF00A96ABD /* cdioSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E169F0D25F9FA00618676 /* cdioSupport.cpp */; };
+		F5A1C9470F6B06CF00A96ABD /* DAAPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16AA0D25F9FA00618676 /* DAAPDirectory.cpp */; };
+		F5A1C9480F6B06CF00A96ABD /* Directory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16AC0D25F9FA00618676 /* Directory.cpp */; };
+		F5A1C9490F6B06CF00A96ABD /* DirectoryCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16AE0D25F9FA00618676 /* DirectoryCache.cpp */; };
+		F5A1C94A0F6B06CF00A96ABD /* DirectoryHistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16B00D25F9FA00618676 /* DirectoryHistory.cpp */; };
+		F5A1C94B0F6B06CF00A96ABD /* DirectoryTuxBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16B20D25F9FA00618676 /* DirectoryTuxBox.cpp */; };
+		F5A1C94C0F6B06CF00A96ABD /* DllLibCurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16B40D25F9FA00618676 /* DllLibCurl.cpp */; };
+		F5A1C94D0F6B06CF00A96ABD /* FactoryDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16B60D25F9FA00618676 /* FactoryDirectory.cpp */; };
+		F5A1C94E0F6B06CF00A96ABD /* FactoryFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16B80D25F9FA00618676 /* FactoryFileDirectory.cpp */; };
+		F5A1C94F0F6B06CF00A96ABD /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16BA0D25F9FA00618676 /* File.cpp */; };
+		F5A1C9500F6B06CF00A96ABD /* FileCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16BC0D25F9FA00618676 /* FileCache.cpp */; };
+		F5A1C9510F6B06CF00A96ABD /* FileCDDA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16BE0D25F9FA00618676 /* FileCDDA.cpp */; };
+		F5A1C9520F6B06CF00A96ABD /* FileCurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16C00D25F9FA00618676 /* FileCurl.cpp */; };
+		F5A1C9530F6B06CF00A96ABD /* FileDAAP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16C20D25F9FA00618676 /* FileDAAP.cpp */; };
+		F5A1C9540F6B06CF00A96ABD /* FileFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16C40D25F9FA00618676 /* FileFactory.cpp */; };
+		F5A1C9550F6B06CF00A96ABD /* FileFileReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16C60D25F9FA00618676 /* FileFileReader.cpp */; };
+		F5A1C9560F6B06CF00A96ABD /* FileHD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16CA0D25F9FA00618676 /* FileHD.cpp */; };
+		F5A1C9570F6B06CF00A96ABD /* FileISO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16CC0D25F9FA00618676 /* FileISO.cpp */; };
+		F5A1C9580F6B06CF00A96ABD /* FileLastFM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16CE0D25F9FA00618676 /* FileLastFM.cpp */; };
+		F5A1C9590F6B06CF00A96ABD /* FileMusicDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16D20D25F9FA00618676 /* FileMusicDatabase.cpp */; };
+		F5A1C95A0F6B06CF00A96ABD /* FileRar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16D40D25F9FA00618676 /* FileRar.cpp */; };
+		F5A1C95B0F6B06CF00A96ABD /* FileRTV.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16D60D25F9FA00618676 /* FileRTV.cpp */; };
+		F5A1C95C0F6B06CF00A96ABD /* FileTuxBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16DE0D25F9FA00618676 /* FileTuxBox.cpp */; };
+		F5A1C95D0F6B06CF00A96ABD /* FileZip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16E20D25F9FA00618676 /* FileZip.cpp */; };
+		F5A1C95E0F6B06CF00A96ABD /* FTPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16E40D25F9FA00618676 /* FTPDirectory.cpp */; };
+		F5A1C95F0F6B06CF00A96ABD /* FTPParse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16E60D25F9FA00618676 /* FTPParse.cpp */; };
+		F5A1C9600F6B06CF00A96ABD /* HDDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16E80D25F9FA00618676 /* HDDirectory.cpp */; };
+		F5A1C9610F6B06CF00A96ABD /* HDHomeRun.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16EA0D25F9FA00618676 /* HDHomeRun.cpp */; };
+		F5A1C9620F6B06CF00A96ABD /* IDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16EC0D25F9FA00618676 /* IDirectory.cpp */; };
+		F5A1C9630F6B06CF00A96ABD /* IFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16EE0D25F9FA00618676 /* IFile.cpp */; };
+		F5A1C9640F6B06CF00A96ABD /* iso9660.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16F10D25F9FA00618676 /* iso9660.cpp */; };
+		F5A1C9650F6B06CF00A96ABD /* ISO9660Directory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16F30D25F9FA00618676 /* ISO9660Directory.cpp */; };
+		F5A1C9660F6B06CF00A96ABD /* LastFMDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16F50D25F9FA00618676 /* LastFMDirectory.cpp */; };
+		F5A1C9670F6B06CF00A96ABD /* MultiPathDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17080D25F9FA00618676 /* MultiPathDirectory.cpp */; };
+		F5A1C9680F6B06CF00A96ABD /* DirectoryNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E170B0D25F9FA00618676 /* DirectoryNode.cpp */; };
+		F5A1C9690F6B06CF00A96ABD /* DirectoryNodeAlbum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E170D0D25F9FA00618676 /* DirectoryNodeAlbum.cpp */; };
+		F5A1C96A0F6B06CF00A96ABD /* DirectoryNodeAlbumCompilations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E170F0D25F9FA00618676 /* DirectoryNodeAlbumCompilations.cpp */; };
+		F5A1C96B0F6B06CF00A96ABD /* DirectoryNodeAlbumCompilationsSongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17110D25F9FA00618676 /* DirectoryNodeAlbumCompilationsSongs.cpp */; };
+		F5A1C96C0F6B06CF00A96ABD /* DirectoryNodeAlbumRecentlyAdded.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17130D25F9FA00618676 /* DirectoryNodeAlbumRecentlyAdded.cpp */; };
+		F5A1C96D0F6B06CF00A96ABD /* DirectoryNodeAlbumRecentlyAddedSong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17150D25F9FA00618676 /* DirectoryNodeAlbumRecentlyAddedSong.cpp */; };
+		F5A1C96E0F6B06CF00A96ABD /* DirectoryNodeAlbumRecentlyPlayed.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17170D25F9FA00618676 /* DirectoryNodeAlbumRecentlyPlayed.cpp */; };
+		F5A1C96F0F6B06CF00A96ABD /* DirectoryNodeAlbumRecentlyPlayedSong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17190D25F9FA00618676 /* DirectoryNodeAlbumRecentlyPlayedSong.cpp */; };
+		F5A1C9700F6B06CF00A96ABD /* DirectoryNodeAlbumTop100.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E171B0D25F9FA00618676 /* DirectoryNodeAlbumTop100.cpp */; };
+		F5A1C9710F6B06CF00A96ABD /* DirectoryNodeAlbumTop100Song.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E171D0D25F9FA00618676 /* DirectoryNodeAlbumTop100Song.cpp */; };
+		F5A1C9720F6B06CF00A96ABD /* DirectoryNodeArtist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E171F0D25F9FA00618676 /* DirectoryNodeArtist.cpp */; };
+		F5A1C9730F6B06CF00A96ABD /* DirectoryNodeGenre.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17210D25F9FA00618676 /* DirectoryNodeGenre.cpp */; };
+		F5A1C9740F6B06CF00A96ABD /* DirectoryNodeOverview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17230D25F9FA00618676 /* DirectoryNodeOverview.cpp */; };
+		F5A1C9750F6B06CF00A96ABD /* DirectoryNodeRoot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17250D25F9FA00618676 /* DirectoryNodeRoot.cpp */; };
+		F5A1C9760F6B06CF00A96ABD /* DirectoryNodeSong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17270D25F9FA00618676 /* DirectoryNodeSong.cpp */; };
+		F5A1C9770F6B06CF00A96ABD /* DirectoryNodeSongTop100.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17290D25F9FA00618676 /* DirectoryNodeSongTop100.cpp */; };
+		F5A1C9780F6B06CF00A96ABD /* DirectoryNodeTop100.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E172B0D25F9FA00618676 /* DirectoryNodeTop100.cpp */; };
+		F5A1C9790F6B06CF00A96ABD /* DirectoryNodeYear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E172D0D25F9FA00618676 /* DirectoryNodeYear.cpp */; };
+		F5A1C97A0F6B06CF00A96ABD /* DirectoryNodeYearAlbum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E172F0D25F9FA00618676 /* DirectoryNodeYearAlbum.cpp */; };
+		F5A1C97B0F6B06CF00A96ABD /* DirectoryNodeYearSong.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17310D25F9FA00618676 /* DirectoryNodeYearSong.cpp */; };
+		F5A1C97C0F6B06CF00A96ABD /* QueryParams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17350D25F9FA00618676 /* QueryParams.cpp */; };
+		F5A1C97D0F6B06CF00A96ABD /* MusicDatabaseDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17370D25F9FA00618676 /* MusicDatabaseDirectory.cpp */; };
+		F5A1C97E0F6B06CF00A96ABD /* MusicSearchDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17390D25F9FA00618676 /* MusicSearchDirectory.cpp */; };
+		F5A1C97F0F6B06CF00A96ABD /* NSFFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E173C0D25F9FA00618676 /* NSFFileDirectory.cpp */; };
+		F5A1C9800F6B06CF00A96ABD /* OGGFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E173E0D25F9FA00618676 /* OGGFileDirectory.cpp */; };
+		F5A1C9810F6B06CF00A96ABD /* PlaylistDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17400D25F9FA00618676 /* PlaylistDirectory.cpp */; };
+		F5A1C9820F6B06CF00A96ABD /* PlaylistFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17420D25F9FA00618676 /* PlaylistFileDirectory.cpp */; };
+		F5A1C9830F6B06CF00A96ABD /* PluginDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17440D25F9FA00618676 /* PluginDirectory.cpp */; };
+		F5A1C9840F6B06CF00A96ABD /* RarDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17460D25F9FA00618676 /* RarDirectory.cpp */; };
+		F5A1C9850F6B06CF00A96ABD /* RarManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17480D25F9FA00618676 /* RarManager.cpp */; };
+		F5A1C9860F6B06CF00A96ABD /* RTVDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E174B0D25F9FA00618676 /* RTVDirectory.cpp */; };
+		F5A1C9870F6B06CF00A96ABD /* ShoutcastDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E174D0D25F9FA00618676 /* ShoutcastDirectory.cpp */; };
+		F5A1C9880F6B06CF00A96ABD /* ShoutcastRipFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E174F0D25F9FA00618676 /* ShoutcastRipFile.cpp */; };
+		F5A1C9890F6B06CF00A96ABD /* SIDFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17510D25F9FA00618676 /* SIDFileDirectory.cpp */; };
+		F5A1C98A0F6B06CF00A96ABD /* SmartPlaylistDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17530D25F9FA00618676 /* SmartPlaylistDirectory.cpp */; };
+		F5A1C98B0F6B06CF00A96ABD /* StackDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17590D25F9FA00618676 /* StackDirectory.cpp */; };
+		F5A1C98C0F6B06CF00A96ABD /* UPnPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E175B0D25F9FA00618676 /* UPnPDirectory.cpp */; };
+		F5A1C98D0F6B06CF00A96ABD /* UPnPVirtualPathDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E175D0D25F9FA00618676 /* UPnPVirtualPathDirectory.cpp */; };
+		F5A1C98E0F6B06CF00A96ABD /* DirectoryNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17600D25F9FA00618676 /* DirectoryNode.cpp */; };
+		F5A1C98F0F6B06CF00A96ABD /* DirectoryNodeActor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17620D25F9FA00618676 /* DirectoryNodeActor.cpp */; };
+		F5A1C9900F6B06CF00A96ABD /* DirectoryNodeDirector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17640D25F9FA00618676 /* DirectoryNodeDirector.cpp */; };
+		F5A1C9910F6B06CF00A96ABD /* DirectoryNodeEpisodes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17660D25F9FA00618676 /* DirectoryNodeEpisodes.cpp */; };
+		F5A1C9920F6B06CF00A96ABD /* DirectoryNodeGenre.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17680D25F9FA00618676 /* DirectoryNodeGenre.cpp */; };
+		F5A1C9930F6B06CF00A96ABD /* DirectoryNodeMoviesOverview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E176A0D25F9FA00618676 /* DirectoryNodeMoviesOverview.cpp */; };
+		F5A1C9940F6B06CF00A96ABD /* DirectoryNodeMusicVideosOverview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E176C0D25F9FA00618676 /* DirectoryNodeMusicVideosOverview.cpp */; };
+		F5A1C9950F6B06CF00A96ABD /* DirectoryNodeOverview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E176E0D25F9FA00618676 /* DirectoryNodeOverview.cpp */; };
+		F5A1C9960F6B06CF00A96ABD /* DirectoryNodeRecentlyAddedEpisodes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17700D25F9FA00618676 /* DirectoryNodeRecentlyAddedEpisodes.cpp */; };
+		F5A1C9970F6B06CF00A96ABD /* DirectoryNodeRecentlyAddedMovies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17720D25F9FA00618676 /* DirectoryNodeRecentlyAddedMovies.cpp */; };
+		F5A1C9980F6B06CF00A96ABD /* DirectoryNodeRecentlyAddedMusicVideos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17740D25F9FA00618676 /* DirectoryNodeRecentlyAddedMusicVideos.cpp */; };
+		F5A1C9990F6B06CF00A96ABD /* DirectoryNodeRoot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17760D25F9FA00618676 /* DirectoryNodeRoot.cpp */; };
+		F5A1C99A0F6B06CF00A96ABD /* DirectoryNodeSeasons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17780D25F9FA00618676 /* DirectoryNodeSeasons.cpp */; };
+		F5A1C99B0F6B06CF00A96ABD /* DirectoryNodeStudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E177A0D25F9FA00618676 /* DirectoryNodeStudio.cpp */; };
+		F5A1C99C0F6B06CF00A96ABD /* DirectoryNodeTitleMovies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E177C0D25F9FA00618676 /* DirectoryNodeTitleMovies.cpp */; };
+		F5A1C99D0F6B06CF00A96ABD /* DirectoryNodeTitleMusicVideos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E177E0D25F9FA00618676 /* DirectoryNodeTitleMusicVideos.cpp */; };
+		F5A1C99E0F6B06CF00A96ABD /* DirectoryNodeTitleTvShows.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17800D25F9FA00618676 /* DirectoryNodeTitleTvShows.cpp */; };
+		F5A1C99F0F6B06CF00A96ABD /* DirectoryNodeTvShowsOverview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17820D25F9FA00618676 /* DirectoryNodeTvShowsOverview.cpp */; };
+		F5A1C9A00F6B06CF00A96ABD /* DirectoryNodeYear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17840D25F9FA00618676 /* DirectoryNodeYear.cpp */; };
+		F5A1C9A10F6B06CF00A96ABD /* QueryParams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17880D25F9FA00618676 /* QueryParams.cpp */; };
+		F5A1C9A20F6B06CF00A96ABD /* VideoDatabaseDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178A0D25F9FA00618676 /* VideoDatabaseDirectory.cpp */; };
+		F5A1C9A30F6B06CF00A96ABD /* VirtualDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178C0D25F9FA00618676 /* VirtualDirectory.cpp */; };
+		F5A1C9A40F6B06CF00A96ABD /* VirtualPathDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178E0D25F9FA00618676 /* VirtualPathDirectory.cpp */; };
+		F5A1C9A50F6B06CF00A96ABD /* ZipDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17930D25F9FA00618676 /* ZipDirectory.cpp */; };
+		F5A1C9A60F6B06CF00A96ABD /* ZipManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17950D25F9FA00618676 /* ZipManager.cpp */; };
+		F5A1C9A70F6B06CF00A96ABD /* FlacTag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17980D25F9FA00618676 /* FlacTag.cpp */; };
+		F5A1C9A80F6B06CF00A96ABD /* GUIDialogAudioSubtitleSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E179A0D25F9FA00618676 /* GUIDialogAudioSubtitleSettings.cpp */; };
+		F5A1C9A90F6B06CF00A96ABD /* GUIDialogBoxBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E179C0D25F9FA00618676 /* GUIDialogBoxBase.cpp */; };
+		F5A1C9AA0F6B06CF00A96ABD /* GUIDialogBusy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E179E0D25F9FA00618676 /* GUIDialogBusy.cpp */; };
+		F5A1C9AB0F6B06CF00A96ABD /* GUIDialogButtonMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17A00D25F9FA00618676 /* GUIDialogButtonMenu.cpp */; };
+		F5A1C9AC0F6B06CF00A96ABD /* GUIDialogContentSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17A20D25F9FA00618676 /* GUIDialogContentSettings.cpp */; };
+		F5A1C9AD0F6B06CF00A96ABD /* GUIDialogContextMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17A40D25F9FA00618676 /* GUIDialogContextMenu.cpp */; };
+		F5A1C9AE0F6B06CF00A96ABD /* GUIDialogFavourites.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17A60D25F9FA00618676 /* GUIDialogFavourites.cpp */; };
+		F5A1C9AF0F6B06CF00A96ABD /* GUIDialogFileBrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17A80D25F9FA00618676 /* GUIDialogFileBrowser.cpp */; };
+		F5A1C9B00F6B06CF00A96ABD /* GUIDialogFileStacking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17AA0D25F9FA00618676 /* GUIDialogFileStacking.cpp */; };
+		F5A1C9B10F6B06CF00A96ABD /* GUIDialogGamepad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17AC0D25F9FA00618676 /* GUIDialogGamepad.cpp */; };
+		F5A1C9B20F6B06CF00A96ABD /* GUIDialogKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17B40D25F9FA00618676 /* GUIDialogKeyboard.cpp */; };
+		F5A1C9B30F6B06CF00A96ABD /* GUIDialogLockSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17B60D25F9FA00618676 /* GUIDialogLockSettings.cpp */; };
+		F5A1C9B40F6B06CF00A96ABD /* GUIDialogMediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17B80D25F9FA00618676 /* GUIDialogMediaSource.cpp */; };
+		F5A1C9B50F6B06CF00A96ABD /* GUIDialogMusicOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17BA0D25F9FA00618676 /* GUIDialogMusicOSD.cpp */; };
+		F5A1C9B60F6B06CF00A96ABD /* GUIDialogMusicScan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17BC0D25F9FA00618676 /* GUIDialogMusicScan.cpp */; };
+		F5A1C9B70F6B06CF00A96ABD /* GUIDialogMuteBug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17BE0D25F9FA00618676 /* GUIDialogMuteBug.cpp */; };
+		F5A1C9B80F6B06CF00A96ABD /* GUIDialogNetworkSetup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17C00D25F9FA00618676 /* GUIDialogNetworkSetup.cpp */; };
+		F5A1C9B90F6B06CF00A96ABD /* GUIDialogNumeric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17C20D25F9FA00618676 /* GUIDialogNumeric.cpp */; };
+		F5A1C9BA0F6B06CF00A96ABD /* GUIDialogOK.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17C40D25F9FA00618676 /* GUIDialogOK.cpp */; };
+		F5A1C9BB0F6B06CF00A96ABD /* GUIDialogPictureInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17C60D25F9FA00618676 /* GUIDialogPictureInfo.cpp */; };
+		F5A1C9BC0F6B06CF00A96ABD /* GUIDialogPlayerControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17C80D25F9FA00618676 /* GUIDialogPlayerControls.cpp */; };
+		F5A1C9BD0F6B06CF00A96ABD /* GUIDialogPluginSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17CA0D25F9FA00618676 /* GUIDialogPluginSettings.cpp */; };
+		F5A1C9BE0F6B06CF00A96ABD /* GUIDialogProfileSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17CC0D25F9FA00618676 /* GUIDialogProfileSettings.cpp */; };
+		F5A1C9BF0F6B06CF00A96ABD /* GUIDialogProgress.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17CE0D25F9FA00618676 /* GUIDialogProgress.cpp */; };
+		F5A1C9C00F6B06CF00A96ABD /* GUIDialogSeekBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17D00D25F9FA00618676 /* GUIDialogSeekBar.cpp */; };
+		F5A1C9C10F6B06CF00A96ABD /* GUIDialogSelect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17D20D25F9FA00618676 /* GUIDialogSelect.cpp */; };
+		F5A1C9C20F6B06CF00A96ABD /* GUIDialogSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17D40D25F9FA00618676 /* GUIDialogSettings.cpp */; };
+		F5A1C9C30F6B06CF00A96ABD /* GUIDialogSmartPlaylistEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17D60D25F9FA00618676 /* GUIDialogSmartPlaylistEditor.cpp */; };
+		F5A1C9C40F6B06CF00A96ABD /* GUIDialogSmartPlaylistRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17D80D25F9FA00618676 /* GUIDialogSmartPlaylistRule.cpp */; };
+		F5A1C9C50F6B06CF00A96ABD /* GUIDialogSongInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17DA0D25F9FA00618676 /* GUIDialogSongInfo.cpp */; };
+		F5A1C9C60F6B06CF00A96ABD /* GUIDialogSubMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17DC0D25F9FA00618676 /* GUIDialogSubMenu.cpp */; };
+		F5A1C9C70F6B06CF00A96ABD /* GUIDialogVideoBookmarks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17E00D25F9FA00618676 /* GUIDialogVideoBookmarks.cpp */; };
+		F5A1C9C80F6B06CF00A96ABD /* GUIDialogVideoScan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17E20D25F9FA00618676 /* GUIDialogVideoScan.cpp */; };
+		F5A1C9C90F6B06CF00A96ABD /* GUIDialogVideoSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17E40D25F9FA00618676 /* GUIDialogVideoSettings.cpp */; };
+		F5A1C9CA0F6B06CF00A96ABD /* GUIDialogVisualisationPresetList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17E60D25F9FA00618676 /* GUIDialogVisualisationPresetList.cpp */; };
+		F5A1C9CB0F6B06CF00A96ABD /* GUIDialogVisualisationSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17E80D25F9FA00618676 /* GUIDialogVisualisationSettings.cpp */; };
+		F5A1C9CC0F6B06CF00A96ABD /* GUIDialogVolumeBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17EA0D25F9FA00618676 /* GUIDialogVolumeBar.cpp */; };
+		F5A1C9CD0F6B06CF00A96ABD /* GUIDialogYesNo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17EC0D25F9FA00618676 /* GUIDialogYesNo.cpp */; };
+		F5A1C9CE0F6B06CF00A96ABD /* GUILargeTextureManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17EE0D25F9FA00618676 /* GUILargeTextureManager.cpp */; };
+		F5A1C9CF0F6B06CF00A96ABD /* GUIMediaWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17F00D25F9FA00618676 /* GUIMediaWindow.cpp */; };
+		F5A1C9D00F6B06CF00A96ABD /* GUIPassword.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17F20D25F9FA00618676 /* GUIPassword.cpp */; };
+		F5A1C9D10F6B06CF00A96ABD /* GUISettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17F40D25F9FA00618676 /* GUISettings.cpp */; };
+		F5A1C9D20F6B06CF00A96ABD /* GUIViewControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17F70D25F9FA00618676 /* GUIViewControl.cpp */; };
+		F5A1C9D30F6B06CF00A96ABD /* GUIViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17F90D25F9FA00618676 /* GUIViewState.cpp */; };
+		F5A1C9D40F6B06CF00A96ABD /* GUIViewStateMusic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17FB0D25F9FA00618676 /* GUIViewStateMusic.cpp */; };
+		F5A1C9D50F6B06CF00A96ABD /* GUIViewStateVideo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17FF0D25F9FA00618676 /* GUIViewStateVideo.cpp */; };
+		F5A1C9D60F6B06CF00A96ABD /* GUIWindowFileManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18030D25F9FA00618676 /* GUIWindowFileManager.cpp */; };
+		F5A1C9D70F6B06CF00A96ABD /* GUIWindowFullScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18050D25F9FA00618676 /* GUIWindowFullScreen.cpp */; };
+		F5A1C9D80F6B06CF00A96ABD /* GUIWindowHome.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18090D25F9FA00618676 /* GUIWindowHome.cpp */; };
+		F5A1C9D90F6B06CF00A96ABD /* GUIWindowLoginScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E180B0D25F9FA00618676 /* GUIWindowLoginScreen.cpp */; };
+		F5A1C9DA0F6B06CF00A96ABD /* GUIWindowMusicBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E180D0D25F9FA00618676 /* GUIWindowMusicBase.cpp */; };
+		F5A1C9DB0F6B06CF00A96ABD /* GUIWindowMusicInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E180F0D25F9FA00618676 /* GUIWindowMusicInfo.cpp */; };
+		F5A1C9DC0F6B06CF00A96ABD /* GUIWindowMusicNav.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18110D25F9FA00618676 /* GUIWindowMusicNav.cpp */; };
+		F5A1C9DD0F6B06CF00A96ABD /* GUIWindowMusicOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18130D25F9FA00618676 /* GUIWindowMusicOverlay.cpp */; };
+		F5A1C9DE0F6B06CF00A96ABD /* GUIWindowMusicPlaylist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18150D25F9FA00618676 /* GUIWindowMusicPlaylist.cpp */; };
+		F5A1C9DF0F6B06CF00A96ABD /* GUIWindowMusicPlaylistEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18170D25F9FA00618676 /* GUIWindowMusicPlaylistEditor.cpp */; };
+		F5A1C9E00F6B06CF00A96ABD /* GUIWindowMusicSongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18190D25F9FA00618676 /* GUIWindowMusicSongs.cpp */; };
+		F5A1C9E10F6B06CF00A96ABD /* GUIWindowOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E181D0D25F9FA00618676 /* GUIWindowOSD.cpp */; };
+		F5A1C9E20F6B06CF00A96ABD /* GUIWindowPictures.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E181F0D25F9FA00618676 /* GUIWindowPictures.cpp */; };
+		F5A1C9E30F6B06CF00A96ABD /* GUIWindowPointer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18210D25F9FA00618676 /* GUIWindowPointer.cpp */; };
+		F5A1C9E40F6B06CF00A96ABD /* GUIWindowPrograms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18230D25F9FA00618676 /* GUIWindowPrograms.cpp */; };
+		F5A1C9E50F6B06CF00A96ABD /* GUIWindowScreensaver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18250D25F9FA00618676 /* GUIWindowScreensaver.cpp */; };
+		F5A1C9E60F6B06CF00A96ABD /* GUIWindowScripts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18270D25F9FA00618676 /* GUIWindowScripts.cpp */; };
+		F5A1C9E70F6B06CF00A96ABD /* GUIWindowScriptsInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18290D25F9FA00618676 /* GUIWindowScriptsInfo.cpp */; };
+		F5A1C9E80F6B06CF00A96ABD /* GUIWindowSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E182B0D25F9FA00618676 /* GUIWindowSettings.cpp */; };
+		F5A1C9E90F6B06CF00A96ABD /* GUIWindowSettingsCategory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E182D0D25F9FA00618676 /* GUIWindowSettingsCategory.cpp */; };
+		F5A1C9EA0F6B06CF00A96ABD /* GUIWindowSettingsProfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E182F0D25F9FA00618676 /* GUIWindowSettingsProfile.cpp */; };
+		F5A1C9EB0F6B06CF00A96ABD /* GUIWindowSettingsScreenCalibration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18310D25F9FA00618676 /* GUIWindowSettingsScreenCalibration.cpp */; };
+		F5A1C9EC0F6B06CF00A96ABD /* GUIWindowSlideShow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18350D25F9FA00618676 /* GUIWindowSlideShow.cpp */; };
+		F5A1C9ED0F6B06CF00A96ABD /* GUIWindowStartup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18370D25F9FA00618676 /* GUIWindowStartup.cpp */; };
+		F5A1C9EE0F6B06CF00A96ABD /* GUIWindowSystemInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18390D25F9FA00618676 /* GUIWindowSystemInfo.cpp */; };
+		F5A1C9EF0F6B06CF00A96ABD /* GUIWindowVideoBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E183B0D25F9FA00618676 /* GUIWindowVideoBase.cpp */; };
+		F5A1C9F00F6B06CF00A96ABD /* GUIWindowVideoFiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E183D0D25F9FA00618676 /* GUIWindowVideoFiles.cpp */; };
+		F5A1C9F10F6B06CF00A96ABD /* GUIWindowVideoInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E183F0D25F9FA00618676 /* GUIWindowVideoInfo.cpp */; };
+		F5A1C9F20F6B06CF00A96ABD /* GUIWindowVideoNav.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18410D25F9FA00618676 /* GUIWindowVideoNav.cpp */; };
+		F5A1C9F30F6B06CF00A96ABD /* GUIWindowVideoOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18430D25F9FA00618676 /* GUIWindowVideoOverlay.cpp */; };
+		F5A1C9F40F6B06CF00A96ABD /* GUIWindowVideoPlaylist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18450D25F9FA00618676 /* GUIWindowVideoPlaylist.cpp */; };
+		F5A1C9F50F6B06CF00A96ABD /* GUIWindowVisualisation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18470D25F9FA00618676 /* GUIWindowVisualisation.cpp */; };
+		F5A1C9F60F6B06CF00A96ABD /* GUIWindowWeather.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18490D25F9FA00618676 /* GUIWindowWeather.cpp */; };
+		F5A1C9F70F6B06CF00A96ABD /* Id3Tag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E184B0D25F9FA00618676 /* Id3Tag.cpp */; };
+		F5A1C9F80F6B06CF00A96ABD /* KeyboardLayoutConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18540D25F9FA00618676 /* KeyboardLayoutConfiguration.cpp */; };
+		F5A1C9F90F6B06CF00A96ABD /* LangCodeExpander.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18560D25F9FA00618676 /* LangCodeExpander.cpp */; };
+		F5A1C9FA0F6B06CF00A96ABD /* LangInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18580D25F9FA00618676 /* LangInfo.cpp */; };
+		F5A1C9FB0F6B06CF00A96ABD /* LastFmManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E185A0D25F9FA00618676 /* LastFmManager.cpp */; };
+		F5A1C9FC0F6B06CF00A96ABD /* SpyceModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E195D0D25F9FB00618676 /* SpyceModule.cpp */; };
+		F5A1C9FD0F6B06CF00A96ABD /* WebServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E19630D25F9FB00618676 /* WebServer.cpp */; };
+		F5A1C9FE0F6B06CF00A96ABD /* XBMCConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E19670D25F9FB00618676 /* XBMCConfiguration.cpp */; };
+		F5A1C9FF0F6B06CF00A96ABD /* XBMChttp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E19690D25F9FB00618676 /* XBMChttp.cpp */; };
+		F5A1CA000F6B06CF00A96ABD /* XBMCweb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E196B0D25F9FB00618676 /* XBMCweb.cpp */; };
+		F5A1CA010F6B06CF00A96ABD /* XBPython.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A0D0D25F9FB00618676 /* XBPython.cpp */; };
+		F5A1CA020F6B06CF00A96ABD /* XBPythonDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A0F0D25F9FB00618676 /* XBPythonDll.cpp */; };
+		F5A1CA030F6B06CF00A96ABD /* XBPyThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A110D25F9FB00618676 /* XBPyThread.cpp */; };
+		F5A1CA040F6B06CF00A96ABD /* scrobbler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1A250D25F9FB00618676 /* scrobbler.cpp */; };
+		F5A1CA050F6B06CF00A96ABD /* MediaCrawler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1ABD0D25F9FB00618676 /* MediaCrawler.cpp */; };
+		F5A1CA060F6B06CF00A96ABD /* PltMicroMediaController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AC20D25F9FB00618676 /* PltMicroMediaController.cpp */; };
+		F5A1CA070F6B06CF00A96ABD /* Platinum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AC50D25F9FB00618676 /* Platinum.cpp */; };
+		F5A1CA080F6B06CF00A96ABD /* PltAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AC70D25F9FB00618676 /* PltAction.cpp */; };
+		F5A1CA090F6B06CF00A96ABD /* PltArgument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AC90D25F9FB00618676 /* PltArgument.cpp */; };
+		F5A1CA0A0F6B06CF00A96ABD /* PltCtrlPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1ACB0D25F9FB00618676 /* PltCtrlPoint.cpp */; };
+		F5A1CA0B0F6B06CF00A96ABD /* PltCtrlPointTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1ACD0D25F9FB00618676 /* PltCtrlPointTask.cpp */; };
+		F5A1CA0C0F6B06CF00A96ABD /* PltDatagramStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1ACF0D25F9FB00618676 /* PltDatagramStream.cpp */; };
+		F5A1CA0D0F6B06CF00A96ABD /* PltDeviceData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AD10D25F9FB00618676 /* PltDeviceData.cpp */; };
+		F5A1CA0E0F6B06CF00A96ABD /* PltDeviceHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AD30D25F9FB00618676 /* PltDeviceHost.cpp */; };
+		F5A1CA0F0F6B06CF00A96ABD /* PltDownloader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AD50D25F9FB00618676 /* PltDownloader.cpp */; };
+		F5A1CA100F6B06CF00A96ABD /* PltEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AD70D25F9FB00618676 /* PltEvent.cpp */; };
+		F5A1CA110F6B06CF00A96ABD /* PltHttp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AD90D25F9FB00618676 /* PltHttp.cpp */; };
+		F5A1CA120F6B06CF00A96ABD /* PltHttpClientTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1ADB0D25F9FB00618676 /* PltHttpClientTask.cpp */; };
+		F5A1CA130F6B06CF00A96ABD /* PltHttpServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1ADD0D25F9FB00618676 /* PltHttpServer.cpp */; };
+		F5A1CA140F6B06CF00A96ABD /* PltHttpServerTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AE00D25F9FB00618676 /* PltHttpServerTask.cpp */; };
+		F5A1CA150F6B06CF00A96ABD /* PltLeaks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AE20D25F9FB00618676 /* PltLeaks.cpp */; };
+		F5A1CA160F6B06CF00A96ABD /* PltMetadataHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AE60D25F9FB00618676 /* PltMetadataHandler.cpp */; };
+		F5A1CA170F6B06CF00A96ABD /* PltRingBufferStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AE80D25F9FB00618676 /* PltRingBufferStream.cpp */; };
+		F5A1CA180F6B06CF00A96ABD /* PltService.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AEA0D25F9FB00618676 /* PltService.cpp */; };
+		F5A1CA190F6B06CF00A96ABD /* PltSsdp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AEC0D25F9FB00618676 /* PltSsdp.cpp */; };
+		F5A1CA1A0F6B06CF00A96ABD /* PltStateVariable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AEF0D25F9FB00618676 /* PltStateVariable.cpp */; };
+		F5A1CA1B0F6B06CF00A96ABD /* PltStreamPump.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AF10D25F9FB00618676 /* PltStreamPump.cpp */; };
+		F5A1CA1C0F6B06CF00A96ABD /* PltTaskManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AF30D25F9FB00618676 /* PltTaskManager.cpp */; };
+		F5A1CA1D0F6B06CF00A96ABD /* PltThreadTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AF50D25F9FB00618676 /* PltThreadTask.cpp */; };
+		F5A1CA1E0F6B06CF00A96ABD /* PltUPnP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1AF70D25F9FB00618676 /* PltUPnP.cpp */; };
+		F5A1CA1F0F6B06CF00A96ABD /* PltMediaController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1B000D25F9FB00618676 /* PltMediaController.cpp */; };
+		F5A1CA200F6B06CF00A96ABD /* PltMediaRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1B030D25F9FB00618676 /* PltMediaRenderer.cpp */; };
+		F5A1CA210F6B06CF00A96ABD /* PltMediaRendererSCPDs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1B050D25F9FB00618676 /* PltMediaRendererSCPDs.cpp */; };
+		F5A1CA220F6B06CF00A96ABD /* PltDidl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1B0B0D25F9FB00618676 /* PltDidl.cpp */; };
+		F5A1CA230F6B06CF00A96ABD /* PltFileMediaServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1B0D0D25F9FB00618676 /* PltFileMediaServer.cpp */; };
+		F5A1CA240F6B06CF00A96ABD /* PltMediaBrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1B0F0D25F9FB00618676 /* PltMediaBrowser.cpp */; };
+		F5A1CA250F6B06CF00A96ABD /* PltMediaCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1B120D25F9FB00618676 /* PltMediaCache.cpp */; };
+		F5A1CA260F6B06CF00A96ABD /* PltMediaItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1B140D25F9FB00618676 /* PltMediaItem.cpp */; };
+		F5A1CA270F6B06CF00A96ABD /* PltMediaPlaylist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1B160D25F9FB00618676 /* PltMediaPlaylist.cpp */; };
+		F5A1CA280F6B06CF00A96ABD /* PltMediaServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1B180D25F9FB00618676 /* PltMediaServer.cpp */; };
+		F5A1CA290F6B06CF00A96ABD /* PltMediaServerSCPDs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1B1A0D25F9FB00618676 /* PltMediaServerSCPDs.cpp */; };
+		F5A1CA2A0F6B06CF00A96ABD /* PltSyncMediaBrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1B1B0D25F9FB00618676 /* PltSyncMediaBrowser.cpp */; };
+		F5A1CA2B0F6B06CF00A96ABD /* PltLightSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1B250D25F9FB00618676 /* PltLightSample.cpp */; };
+		F5A1CA2C0F6B06CF00A96ABD /* Neptune.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1BE40D25F9FC00618676 /* Neptune.cpp */; };
+		F5A1CA2D0F6B06CF00A96ABD /* NptBase64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1BE70D25F9FC00618676 /* NptBase64.cpp */; };
+		F5A1CA2E0F6B06CF00A96ABD /* NptBufferedStreams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1BE90D25F9FC00618676 /* NptBufferedStreams.cpp */; };
+		F5A1CA2F0F6B06CF00A96ABD /* NptCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1BEB0D25F9FC00618676 /* NptCommon.cpp */; };
+		F5A1CA300F6B06CF00A96ABD /* NptConsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1BEE0D25F9FC00618676 /* NptConsole.cpp */; };
+		F5A1CA310F6B06CF00A96ABD /* NptDataBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1BF10D25F9FC00618676 /* NptDataBuffer.cpp */; };
+		F5A1CA320F6B06CF00A96ABD /* NptDebug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1BF30D25F9FC00618676 /* NptDebug.cpp */; };
+		F5A1CA330F6B06CF00A96ABD /* NptFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1BF70D25F9FC00618676 /* NptFile.cpp */; };
+		F5A1CA340F6B06CF00A96ABD /* NptHttp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1BF90D25F9FC00618676 /* NptHttp.cpp */; };
+		F5A1CA350F6B06CF00A96ABD /* NptList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1BFC0D25F9FC00618676 /* NptList.cpp */; };
+		F5A1CA360F6B06CF00A96ABD /* NptLogging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1BFE0D25F9FC00618676 /* NptLogging.cpp */; };
+		F5A1CA370F6B06CF00A96ABD /* NptMessaging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1C010D25F9FC00618676 /* NptMessaging.cpp */; };
+		F5A1CA380F6B06CF00A96ABD /* NptNetwork.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1C030D25F9FC00618676 /* NptNetwork.cpp */; };
+		F5A1CA390F6B06CF00A96ABD /* NptQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1C050D25F9FC00618676 /* NptQueue.cpp */; };
+		F5A1CA3A0F6B06CF00A96ABD /* NptRingBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1C090D25F9FC00618676 /* NptRingBuffer.cpp */; };
+		F5A1CA3B0F6B06CF00A96ABD /* NptSimpleMessageQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1C0C0D25F9FC00618676 /* NptSimpleMessageQueue.cpp */; };
+		F5A1CA3C0F6B06CF00A96ABD /* NptSockets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1C0E0D25F9FC00618676 /* NptSockets.cpp */; };
+		F5A1CA3D0F6B06CF00A96ABD /* NptStreams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1C110D25F9FC00618676 /* NptStreams.cpp */; };
+		F5A1CA3E0F6B06CF00A96ABD /* NptStrings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1C130D25F9FC00618676 /* NptStrings.cpp */; };
+		F5A1CA3F0F6B06CF00A96ABD /* NptSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1C150D25F9FC00618676 /* NptSystem.cpp */; };

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 18661
          http://xbmc.svn.sourceforge.net/xbmc/?rev=18661&view=rev
Author:   alcoheca
Date:     2009-03-18 15:55:56 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
fixed: building in linux (definitely the last time...)

Modified Paths:
--------------
    branches/unified-pvr/XBMC/Makefile.in
    branches/unified-pvr/XBMC/xbmc/FileSystem/PluginDirectory.cpp
    branches/unified-pvr/XBMC/xbmc/GUIDialogAddonBrowser.cpp
    branches/unified-pvr/XBMC/xbmc/GUIDialogAddonBrowser.h
    branches/unified-pvr/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    branches/unified-pvr/XBMC/xbmc/Settings.h
    branches/unified-pvr/XBMC/xbmc/utils/Addon.cpp
    branches/unified-pvr/XBMC/xbmc/utils/Addon.h
    branches/unified-pvr/XBMC/xbmc/utils/Makefile

Modified: branches/unified-pvr/XBMC/Makefile.in
===================================================================
--- branches/unified-pvr/XBMC/Makefile.in	2009-03-18 14:23:12 UTC (rev 18660)
+++ branches/unified-pvr/XBMC/Makefile.in	2009-03-18 15:55:56 UTC (rev 18661)
@@ -103,7 +103,7 @@
 
 include Makefile.include
 
-.PHONY : guilib xbmc filesystem musicdatabase videodatabase cores paplayer dllloader exports osx xbox linux pvrclient-interface visualization-interface visualizations screensaver-interface screensavers utils common tinyxml sqllite libscrobbler unrarxlib libpython libgoahead compile dvdplayer libupnp libcmyth eventclients librtmp papcodecs dvdpcodecs imagelib codecs externals cdrip externalplayer libkaraoke
+.PHONY : guilib xbmc filesystem musicdatabase videodatabase cores paplayer dllloader exports osx xbox linux pvrclient-interface visualization-interface visualizations screensaver-interface screensavers utils common tinyxml sqllite libscrobbler unrarxlib libpython libgoahead compile dvdplayer libupnp libcmyth eventclients librtmp papcodecs dvdpcodecs imagelib codecs externals cdrip externalplayer libkaraoke libhts
 
 $(PM3_MEDIA)/Textures.xpr: tools/XBMCTex/XBMCTex $(PM3_MEDIA)/*.png $(PM3_MEDIA)/*/*.png
 	 tools/XBMCTex/XBMCTex -input \"$(PM3_MEDIA)\" -output \"$(PM3_MEDIA)/Textures.xpr\"
@@ -155,7 +155,6 @@
 	$(MAKE) -C xbmc/screensavers
 screensavers: exports
 	$(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc
-
 utils: 
 	$(MAKE) -C xbmc/utils
 common: 
@@ -250,7 +249,7 @@
 	paplayer dllloader exports osx xbox linux utils common tinyxml sqllite \
 	libscrobbler libgoahead unrarxlib libpython dvdplayer libupnp libcmyth \
 	librtmp libxbms librtv libxdaap libshout screensaver-interface \
-	visualization-interface pvrclient-interface libcdio externalplayer libkaraoke
+	visualization-interface pvrclient-interface libcdio externalplayer libkaraoke libhts
 
 # platform independend objects
 OBJSXBMC=	\

Modified: branches/unified-pvr/XBMC/xbmc/FileSystem/PluginDirectory.cpp
===================================================================
--- branches/unified-pvr/XBMC/xbmc/FileSystem/PluginDirectory.cpp	2009-03-18 14:23:12 UTC (rev 18660)
+++ branches/unified-pvr/XBMC/xbmc/FileSystem/PluginDirectory.cpp	2009-03-18 15:55:56 UTC (rev 18661)
@@ -35,6 +35,7 @@
 
 using namespace DIRECTORY;
 using namespace std;
+using namespace ADDON;
 
 vector<CPluginDirectory *> CPluginDirectory::globalHandles;
 CCriticalSection CPluginDirectory::m_handleLock;

Modified: branches/unified-pvr/XBMC/xbmc/GUIDialogAddonBrowser.cpp
===================================================================
--- branches/unified-pvr/XBMC/xbmc/GUIDialogAddonBrowser.cpp	2009-03-18 14:23:12 UTC (rev 18660)
+++ branches/unified-pvr/XBMC/xbmc/GUIDialogAddonBrowser.cpp	2009-03-18 15:55:56 UTC (rev 18661)
@@ -20,6 +20,7 @@
 */
 
 #include "stdafx.h"
+#include "utils/Addon.h"
 #include "GUIDialogAddonBrowser.h"
 #include "GUISpinControlEx.h"
 #include "GUIDialogContextMenu.h"
@@ -42,7 +43,6 @@
 
 using namespace ADDON;
 
-
 CGUIDialogAddonBrowser::CGUIDialogAddonBrowser(void)
 : CGUIDialog(WINDOW_DIALOG_ADDON_BROWSER, "DialogAddonBrowser.xml")
 {
@@ -171,7 +171,7 @@
       //TODO add-on manager should do all this
       bool skip(false);
       VECADDONS *addons = g_settings.GetAddonsFromType(m_type);
-      for (int i = 0; i < addons->size(); i++)
+      for (unsigned i = 0; i < addons->size(); i++)
       {
         CAddon found = addons->at(i);
         if (found.m_guid = addon.m_guid)
@@ -235,7 +235,6 @@
   else
   {
     /* open up settings dialog */
-    int i = 0;
 
   }
 }
@@ -286,6 +285,9 @@
     case ADDON_PVRDLL:
       heading = g_localizeStrings.Get(18028); // "Manage PVR clients"
       break;
+
+    default:
+      break;
     }
   }
   
@@ -387,3 +389,4 @@
 {
   return CFileItemPtr();
 }
+

Modified: branches/unified-pvr/XBMC/xbmc/GUIDialogAddonBrowser.h
===================================================================
--- branches/unified-pvr/XBMC/xbmc/GUIDialogAddonBrowser.h	2009-03-18 14:23:12 UTC (rev 18660)
+++ branches/unified-pvr/XBMC/xbmc/GUIDialogAddonBrowser.h	2009-03-18 15:55:56 UTC (rev 18661)
@@ -21,16 +21,13 @@
 *
 */
 
+#include "Addon.h"
 #include "GUIDialog.h"
 #include "GUIViewControl.h"
-#include "Addon.h"
 
 class CFileItem;
 class CFileItemList;
 
-namespace ADDON
-{
-
 class CGUIDialogAddonBrowser : public CGUIDialog
 {
 public:
@@ -44,9 +41,9 @@
   bool IsConfirmed() { return m_confirmed; };
   void SetHeading(const CStdString &heading);
 
-  static bool ShowAndGetAddons(const AddonType &type, const bool activeOnly);
+  static bool ShowAndGetAddons(const ADDON::AddonType &type, const bool activeOnly);
 
-  void SetAddonType(const AddonType &type);
+  void SetAddonType(const ADDON::AddonType &type);
 
   virtual bool HasListItems() const { return true; };
   virtual CFileItemPtr GetCurrentListItem(int offset = 0);
@@ -57,9 +54,9 @@
   void ClearFileItems();
   void Update();
   bool OnContextMenu(int iItem);
-  void OnGetAddons(const AddonType &type);
+  void OnGetAddons(const ADDON::AddonType &type);
   
-  AddonType m_type;
+  ADDON::AddonType m_type;
   CFileItemList* m_vecItems;
 
   bool m_confirmed;
@@ -69,4 +66,3 @@
   CGUIViewControl m_viewControl;
 };
 
-};

Modified: branches/unified-pvr/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/unified-pvr/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2009-03-18 14:23:12 UTC (rev 18660)
+++ branches/unified-pvr/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2009-03-18 15:55:56 UTC (rev 18661)
@@ -2306,7 +2306,7 @@
   }
   else if (strSetting.Equals("pvr.pvrsources"))
   {
-    if (ADDON::CGUIDialogAddonBrowser::ShowAndGetAddons(ADDON::ADDON_PVRDLL, true))
+    if (CGUIDialogAddonBrowser::ShowAndGetAddons(ADDON::ADDON_PVRDLL, true))
     { // save the new list
       g_settings.SaveAddons();
     }

Modified: branches/unified-pvr/XBMC/xbmc/Settings.h
===================================================================
--- branches/unified-pvr/XBMC/xbmc/Settings.h	2009-03-18 14:23:12 UTC (rev 18660)
+++ branches/unified-pvr/XBMC/xbmc/Settings.h	2009-03-18 15:55:56 UTC (rev 18661)
@@ -39,7 +39,7 @@
 #include "GUISettings.h"
 #include "Profile.h"
 #include "MediaSource.h"
-#include "Addon.h"
+#include "utils/Addon.h"
 #include "XBVideoConfig.h"
 #include "ViewState.h"
 

Modified: branches/unified-pvr/XBMC/xbmc/utils/Addon.cpp
===================================================================
--- branches/unified-pvr/XBMC/xbmc/utils/Addon.cpp	2009-03-18 14:23:12 UTC (rev 18660)
+++ branches/unified-pvr/XBMC/xbmc/utils/Addon.cpp	2009-03-18 15:55:56 UTC (rev 18661)
@@ -1,86 +1,87 @@
-/*
-*      Copyright (C) 2005-2008 Team XBMC
-*      http://www.xbmc.org
-*
-*  This Program is free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2, or (at your option)
-*  any later version.
-*
-*  This Program is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-*  GNU General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with XBMC; see the file COPYING.  If not, write to
-*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*  http://www.gnu.org/copyleft/gpl.html
-*
-*/
-
-#include "stdafx.h"
-#include "Addon.h"
-#include "Settings.h"
-#include "Util.h"
-#include "URL.h"
-
-namespace ADDON
-{
-
-CAddon::CAddon()
-{
-  m_guid = "";
-  m_addonType = ADDON_UNKNOWN;
-  m_strPath = "";
-  m_disabled = false;
-  m_stars = -1;
-  m_strVersion = "";
-  m_strName = "";
-  m_summary = "";
-  m_strDesc = "";
-  m_disclaimer = "";
-}
-
-bool CAddon::operator==(const CAddon &rhs) const {
-  return (m_guid == rhs.m_guid);
-}
-
-void CAddon::LoadAddonStrings(const CURL &url)
-{
-  // Path where the addon resides
-  CStdString pathToAddon;
-  
+/*
+*      Copyright (C) 2005-2008 Team XBMC
+*      http://www.xbmc.org
+*
+*  This Program is free software; you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 2, or (at your option)
+*  any later version.
+*
+*  This Program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with XBMC; see the file COPYING.  If not, write to
+*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*  http://www.gnu.org/copyleft/gpl.html
+*
+*/
+
+#include "stdafx.h"
+#include "Addon.h"
+#include "Settings.h"
+#include "Util.h"
+#include "URL.h"
+
+namespace ADDON
+{
+
+CAddon::CAddon()
+{
+  m_guid = "";
+  m_addonType = ADDON_UNKNOWN;
+  m_strPath = "";
+  m_disabled = false;
+  m_stars = -1;
+  m_strVersion = "";
+  m_strName = "";
+  m_summary = "";
+  m_strDesc = "";
+  m_disclaimer = "";
+}
+
+bool CAddon::operator==(const CAddon &rhs) const {
+  return (m_guid == rhs.m_guid);
+}
+
+void CAddon::LoadAddonStrings(const CURL &url)
+{
+  // Path where the addon resides
+  CStdString pathToAddon;
+  
   //TODO fix all Addon paths
   if (url.GetProtocol() == "plugin")
     pathToAddon = "special://home/plugins/";
   else
-    pathToAddon = "special://xbmc/";
-
-  // Build the addon's path
-  CUtil::AddFileToFolder(pathToAddon, url.GetHostName(), pathToAddon);
-  CUtil::AddFileToFolder(pathToAddon, url.GetFileName(), pathToAddon);
-
-  // Path where the language strings reside
-  CStdString pathToLanguageFile = pathToAddon;
-  CStdString pathToFallbackLanguageFile = pathToAddon;
-  CUtil::AddFileToFolder(pathToLanguageFile, "resources", pathToLanguageFile);
-  CUtil::AddFileToFolder(pathToFallbackLanguageFile, "resources", pathToFallbackLanguageFile);
-  CUtil::AddFileToFolder(pathToLanguageFile, "language", pathToLanguageFile);
-  CUtil::AddFileToFolder(pathToFallbackLanguageFile, "language", pathToFallbackLanguageFile);
-  CUtil::AddFileToFolder(pathToLanguageFile, g_guiSettings.GetString("locale.language"), pathToLanguageFile);
-  CUtil::AddFileToFolder(pathToFallbackLanguageFile, "english", pathToFallbackLanguageFile);
-  CUtil::AddFileToFolder(pathToLanguageFile, "strings.xml", pathToLanguageFile);
-  CUtil::AddFileToFolder(pathToFallbackLanguageFile, "strings.xml", pathToFallbackLanguageFile);
-
-  // Load language strings temporarily
-  g_localizeStringsTemp.Load(pathToLanguageFile, pathToFallbackLanguageFile);
-}
-
-void CAddon::ClearAddonStrings()
-{
-  // Unload temporary language strings
-  g_localizeStringsTemp.Clear();
-}
-
-} /* namespace ADDON */
\ No newline at end of file
+    pathToAddon = "special://xbmc/";
+
+  // Build the addon's path
+  CUtil::AddFileToFolder(pathToAddon, url.GetHostName(), pathToAddon);
+  CUtil::AddFileToFolder(pathToAddon, url.GetFileName(), pathToAddon);
+
+  // Path where the language strings reside
+  CStdString pathToLanguageFile = pathToAddon;
+  CStdString pathToFallbackLanguageFile = pathToAddon;
+  CUtil::AddFileToFolder(pathToLanguageFile, "resources", pathToLanguageFile);
+  CUtil::AddFileToFolder(pathToFallbackLanguageFile, "resources", pathToFallbackLanguageFile);
+  CUtil::AddFileToFolder(pathToLanguageFile, "language", pathToLanguageFile);
+  CUtil::AddFileToFolder(pathToFallbackLanguageFile, "language", pathToFallbackLanguageFile);
+  CUtil::AddFileToFolder(pathToLanguageFile, g_guiSettings.GetString("locale.language"), pathToLanguageFile);
+  CUtil::AddFileToFolder(pathToFallbackLanguageFile, "english", pathToFallbackLanguageFile);
+  CUtil::AddFileToFolder(pathToLanguageFile, "strings.xml", pathToLanguageFile);
+  CUtil::AddFileToFolder(pathToFallbackLanguageFile, "strings.xml", pathToFallbackLanguageFile);
+
+  // Load language strings temporarily
+  g_localizeStringsTemp.Load(pathToLanguageFile, pathToFallbackLanguageFile);
+}
+
+void CAddon::ClearAddonStrings()
+{
+  // Unload temporary language strings
+  g_localizeStringsTemp.Clear();
+}
+
+} /* namespace ADDON */
+

Modified: branches/unified-pvr/XBMC/xbmc/utils/Addon.h
===================================================================
--- branches/unified-pvr/XBMC/xbmc/utils/Addon.h	2009-03-18 14:23:12 UTC (rev 18660)
+++ branches/unified-pvr/XBMC/xbmc/utils/Addon.h	2009-03-18 15:55:56 UTC (rev 18661)
@@ -1,100 +1,101 @@
-#pragma once
-/*
-*      Copyright (C) 2005-2009 Team XBMC
-*      http://www.xbmc.org
-*
-*  This Program is free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2, or (at your option)
-*  any later version.
-*
-*  This Program is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-*  GNU General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with XBMC; see the file COPYING.  If not, write to
-*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*  http://www.gnu.org/copyleft/gpl.html
-*
-*/
-
-#include "StdString.h"
-#include "FileSystem/Directory.h"
-#include <vector>
-
-class CURL;
-
-namespace ADDON
-{
-
-enum AddonType
-{
-  ADDON_UNKNOWN           = -1,
-  ADDON_MULTITYPE         = 0,
-  ADDON_VIZ               = 1,
-  ADDON_SKIN              = 2,
-  ADDON_PVRDLL            = 3,
-  ADDON_SCRIPT            = 4,
-  ADDON_SCRAPER           = 5,
-  ADDON_SCREENSAVER       = 6,
-  ADDON_PLUGIN_PVR        = 7,
-  ADDON_PLUGIN_MUSIC      = 8,
-  ADDON_PLUGIN_VIDEO      = 9,
-  ADDON_PLUGIN_PROGRAM    = 10,
-  ADDON_PLUGIN_PICTURES   = 11
-};
-
-const CStdString ADDON_PVRDLL_EXT = "*.pvr";
-const CStdString ADDON_GUID_RE = "^(\\{){0,1}[0-9a-fA-F]{8}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{12}(\\}){0,1}$";
-const CStdString ADDON_VERSION_RE = "(?<Major>\\d*)\\.?(?<Minor>\\d*)?\\.?(?<Build>\\d*)?\\.?(?<Revision>\\d*)?";
-
-
-/*!
-\